diff --git a/.github/actions/build-jtreg/action.yml b/.github/actions/build-jtreg/action.yml
index 0ba9937fb45..a9c046e9dd9 100644
--- a/.github/actions/build-jtreg/action.yml
+++ b/.github/actions/build-jtreg/action.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/.github/actions/get-bundles/action.yml b/.github/actions/get-bundles/action.yml
index 270d15159a0..a356aa9fd8d 100644
--- a/.github/actions/get-bundles/action.yml
+++ b/.github/actions/get-bundles/action.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/.github/actions/get-gtest/action.yml b/.github/actions/get-gtest/action.yml
index d38d33eabd8..7a329460a6e 100644
--- a/.github/actions/get-gtest/action.yml
+++ b/.github/actions/get-gtest/action.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/.github/actions/get-jtreg/action.yml b/.github/actions/get-jtreg/action.yml
index 4bb671d25d1..36c895fc59d 100644
--- a/.github/actions/get-jtreg/action.yml
+++ b/.github/actions/get-jtreg/action.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/.github/actions/get-msys2/action.yml b/.github/actions/get-msys2/action.yml
index d93b6e3763b..308230ebf2e 100644
--- a/.github/actions/get-msys2/action.yml
+++ b/.github/actions/get-msys2/action.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/.github/actions/upload-bundles/action.yml b/.github/actions/upload-bundles/action.yml
index ca5366f3d6c..78fb0a94bfd 100644
--- a/.github/actions/upload-bundles/action.yml
+++ b/.github/actions/upload-bundles/action.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/.github/workflows/build-alpine-linux.yml b/.github/workflows/build-alpine-linux.yml
index a39b342a248..c356a8a0f2a 100644
--- a/.github/workflows/build-alpine-linux.yml
+++ b/.github/workflows/build-alpine-linux.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -96,6 +96,7 @@ jobs:
           --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
           --with-zlib=system
           --with-jmod-compress=zip-1
+          --with-external-symbols-in-bundles=none
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&
diff --git a/.github/workflows/build-cross-compile.yml b/.github/workflows/build-cross-compile.yml
index e70937f57b6..c2ed63aa439 100644
--- a/.github/workflows/build-cross-compile.yml
+++ b/.github/workflows/build-cross-compile.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -179,6 +179,7 @@ jobs:
           --openjdk-target=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}
           --with-sysroot=sysroot
           --with-jmod-compress=zip-1
+          --with-external-symbols-in-bundles=none
           CC=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-gcc-${{ inputs.gcc-major-version }}
           CXX=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-g++-${{ inputs.gcc-major-version }}
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index 0680dea6bbe..a668cb5a0f9 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -143,6 +143,7 @@ jobs:
           --with-gtest=${{ steps.gtest.outputs.path }}
           --with-zlib=system
           --with-jmod-compress=zip-1
+          --with-external-symbols-in-bundles=none
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 0a12df668e5..4535d0dd760 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -110,6 +110,7 @@ jobs:
           --with-gtest=${{ steps.gtest.outputs.path }}
           --with-zlib=system
           --with-jmod-compress=zip-1
+          --with-external-symbols-in-bundles=none
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index a3091b94cef..4dafc016a99 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -134,6 +134,7 @@ jobs:
           --with-gtest=${{ steps.gtest.outputs.path }}
           --with-msvc-toolset-version=${{ inputs.msvc-toolset-version }}
           --with-jmod-compress=zip-1
+          --with-external-symbols-in-bundles=none
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 09e6ed65a47..85ec75f343c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f2c8916a369..8f33454305e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/make/Bundles.gmk b/make/Bundles.gmk
index 8161b3b0362..0b324e7e3f3 100644
--- a/make/Bundles.gmk
+++ b/make/Bundles.gmk
@@ -185,77 +185,30 @@ endif
 
 ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
 
-  SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.map
-
-  # There may be files with spaces in the names, so use ShellFindFiles
-  # explicitly.
+  # There may be files with spaces in the names, so use ShellFindFiles explicitly.
   ALL_JDK_FILES := $(call ShellFindFiles, $(JDK_IMAGE_DIR))
-  ifneq ($(JDK_IMAGE_DIR), $(JDK_SYMBOLS_IMAGE_DIR))
-    ALL_JDK_SYMBOLS_FILES := $(call ShellFindFiles, $(JDK_SYMBOLS_IMAGE_DIR))
-  else
-    ALL_JDK_SYMBOLS_FILES := $(ALL_JDK_FILES)
-  endif
   ifneq ($(JDK_IMAGE_DIR), $(JDK_DEMOS_IMAGE_DIR))
     ALL_JDK_DEMOS_FILES := $(call ShellFindFiles, $(JDK_DEMOS_IMAGE_DIR))
   else
     ALL_JDK_DEMOS_FILES := $(ALL_JDK_FILES)
   endif
 
-  # Create special filter rules when dealing with unzipped .dSYM directories on
-  # macosx
-  ifeq ($(call isTargetOs, macosx), true)
-    ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
-      JDK_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
-          $(call containing, .dSYM/, $(patsubst $(JDK_IMAGE_DIR)/%, %, \
-          $(ALL_JDK_SYMBOLS_FILES))))
-    endif
-  endif
-
-  # Create special filter rules when dealing with debug symbols on windows
-  ifeq ($(call isTargetOs, windows), true)
-    ifeq ($(SHIP_DEBUG_SYMBOLS), )
-      JDK_SYMBOLS_EXCLUDE_PATTERN := %.pdb
-    endif
-  endif
-
   JDK_BUNDLE_FILES := \
       $(filter-out \
-          $(JDK_SYMBOLS_EXCLUDE_PATTERN) \
           $(JDK_EXTRA_EXCLUDES) \
-          $(SYMBOLS_EXCLUDE_PATTERN) \
           $(JDK_IMAGE_HOMEDIR)/demo/% \
           , \
           $(ALL_JDK_FILES) \
       )
 
-  JDK_SYMBOLS_BUNDLE_FILES := \
-      $(call FindFiles, $(SYMBOLS_IMAGE_DIR))
+  JDK_SYMBOLS_BUNDLE_FILES := $(call FindFiles, $(SYMBOLS_IMAGE_DIR))
 
   TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_DEMOS_IMAGE_HOMEDIR)/demo/%, \
       $(ALL_JDK_DEMOS_FILES))
 
   ALL_JRE_FILES := $(call ShellFindFiles, $(JRE_IMAGE_DIR))
 
-  # Create special filter rules when dealing with unzipped .dSYM directories on
-  # macosx
-  ifeq ($(OPENJDK_TARGET_OS), macosx)
-    ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
-      JRE_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
-          $(call containing, .dSYM/, $(patsubst $(JRE_IMAGE_DIR)/%, %, $(ALL_JRE_FILES))))
-    endif
-  endif
-
-  # Create special filter rules when dealing with debug symbols on windows
-  ifeq ($(call isTargetOs, windows), true)
-    ifeq ($(SHIP_DEBUG_SYMBOLS), )
-      JRE_SYMBOLS_EXCLUDE_PATTERN := %.pdb
-    endif
-  endif
-
-  JRE_BUNDLE_FILES := $(filter-out \
-      $(JRE_SYMBOLS_EXCLUDE_PATTERN) \
-      $(SYMBOLS_EXCLUDE_PATTERN), \
-      $(ALL_JRE_FILES))
+  JRE_BUNDLE_FILES := $(ALL_JRE_FILES)
 
   ifeq ($(MACOSX_CODESIGN_MODE), hardened)
     # Macosx release build and code signing available.
diff --git a/make/CreateJmods.gmk b/make/CreateJmods.gmk
index 3280b24924a..32f107b6bb6 100644
--- a/make/CreateJmods.gmk
+++ b/make/CreateJmods.gmk
@@ -218,10 +218,14 @@ ifeq ($(call isTargetOs, windows), true)
   ifeq ($(SHIP_DEBUG_SYMBOLS), )
     JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.pdb,*.map}'
   else
-    JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.map}'
+    JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.map}'
   endif
 else
-  JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM}'
+  ifeq ($(SHIP_DEBUG_SYMBOLS), )
+    JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM}'
+  else
+    JMOD_FLAGS += --exclude '**{_the.*,_*.marker*}'
+  endif
 endif
 
 # Unless we are creating a very large module, use the small tool JVM options
diff --git a/make/Docs.gmk b/make/Docs.gmk
index b105e1d8683..a8d40e078e2 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -93,16 +93,19 @@ JAVADOC_DISABLED_DOCLINT_WARNINGS := missing
 JAVADOC_DISABLED_DOCLINT_PACKAGES := org.w3c.* javax.smartcardio
 
 # The initial set of options for javadoc
+# -XDaccessInternalAPI is a temporary workaround, see 8373909
 JAVADOC_OPTIONS := -use -keywords -notimestamp \
     -serialwarn -encoding utf-8 -docencoding utf-8 -breakiterator \
     -splitIndex --system none -javafx --expand-requires transitive \
-    --override-methods=summary
+    --override-methods=summary \
+    -XDaccessInternalAPI
 
 # The reference options must stay stable to allow for comparisons across the
 # development cycle.
 REFERENCE_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
     -serialwarn -encoding utf-8 -breakiterator -splitIndex --system none \
-    -html5 -javafx --expand-requires transitive
+    -html5 -javafx --expand-requires transitive \
+    -XDaccessInternalAPI
 
 # Should we add DRAFT stamps to the generated javadoc?
 ifeq ($(VERSION_IS_GA), true)
diff --git a/make/RunTestsPrebuiltSpec.gmk b/make/RunTestsPrebuiltSpec.gmk
index e9fd901c9e1..5fe559eafad 100644
--- a/make/RunTestsPrebuiltSpec.gmk
+++ b/make/RunTestsPrebuiltSpec.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/make/autoconf/bootcycle-spec.gmk.template b/make/autoconf/bootcycle-spec.gmk.template
index d17a95e190a..eb564f40e3f 100644
--- a/make/autoconf/bootcycle-spec.gmk.template
+++ b/make/autoconf/bootcycle-spec.gmk.template
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/make/autoconf/buildjdk-spec.gmk.template b/make/autoconf/buildjdk-spec.gmk.template
index 924389b94e8..bb020842d59 100644
--- a/make/autoconf/buildjdk-spec.gmk.template
+++ b/make/autoconf/buildjdk-spec.gmk.template
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/make/autoconf/compare.sh.template b/make/autoconf/compare.sh.template
index 84421035ab9..b17ddc16827 100644
--- a/make/autoconf/compare.sh.template
+++ b/make/autoconf/compare.sh.template
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
index b0dc565b39f..466ff1beaf4 100644
--- a/make/autoconf/flags-ldflags.m4
+++ b/make/autoconf/flags-ldflags.m4
@@ -63,7 +63,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     fi
 
     BASIC_LDFLAGS_JVM_ONLY=""
-    LDFLAGS_LTO="-flto=auto -fuse-linker-plugin -fno-strict-aliasing"
+    LDFLAGS_LTO="-flto=auto -fuse-linker-plugin -fno-strict-aliasing $DEBUG_PREFIX_CFLAGS"
 
     LDFLAGS_CXX_PARTIAL_LINKING="$MACHINE_FLAG -r"
 
@@ -71,7 +71,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     BASIC_LDFLAGS_JVM_ONLY="-mno-omit-leaf-frame-pointer -mstack-alignment=16 \
         -fPIC"
 
-    LDFLAGS_LTO="-flto=auto -fuse-linker-plugin -fno-strict-aliasing"
+    LDFLAGS_LTO="-flto=auto -fuse-linker-plugin -fno-strict-aliasing $DEBUG_PREFIX_CFLAGS"
     LDFLAGS_CXX_PARTIAL_LINKING="$MACHINE_FLAG -r"
 
     if test "x$OPENJDK_TARGET_OS" = xlinux; then
diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
index 6dc46d17aa3..3adb1333fe5 100644
--- a/make/autoconf/hotspot.m4
+++ b/make/autoconf/hotspot.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index bb188778001..87d147d4f07 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -316,23 +316,36 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
   AC_MSG_CHECKING([if we should add external native debug symbols to the shipped bundles])
   AC_ARG_WITH([external-symbols-in-bundles],
       [AS_HELP_STRING([--with-external-symbols-in-bundles],
-      [which type of external native debug symbol information shall be shipped in product bundles (none, public, full)
-      (e.g. ship full/stripped pdbs on Windows) @<:@none@:>@])])
+      [which type of external native debug symbol information shall be shipped with bundles/images (none, public, full).
+      @<:@none in release builds, full otherwise. --with-native-debug-symbols=external/zipped is a prerequisite. public is only supported on Windows@:>@])],
+      [],
+      [with_external_symbols_in_bundles=default])
 
   if test "x$with_external_symbols_in_bundles" = x || test "x$with_external_symbols_in_bundles" = xnone ; then
     AC_MSG_RESULT([no])
   elif test "x$with_external_symbols_in_bundles" = xfull || test "x$with_external_symbols_in_bundles" = xpublic ; then
-    if test "x$OPENJDK_TARGET_OS" != xwindows ; then
-      AC_MSG_ERROR([--with-external-symbols-in-bundles currently only works on windows!])
-    elif test "x$COPY_DEBUG_SYMBOLS" != xtrue ; then
-      AC_MSG_ERROR([--with-external-symbols-in-bundles only works when --with-native-debug-symbols=external is used!])
-    elif test "x$with_external_symbols_in_bundles" = xfull ; then
+    if test "x$COPY_DEBUG_SYMBOLS" != xtrue ; then
+      AC_MSG_ERROR([--with-external-symbols-in-bundles only works when --with-native-debug-symbols=external/zipped is used!])
+    elif test "x$with_external_symbols_in_bundles" = xpublic && test "x$OPENJDK_TARGET_OS" != xwindows ; then
+      AC_MSG_ERROR([--with-external-symbols-in-bundles=public is only supported on Windows!])
+    fi
+
+    if test "x$with_external_symbols_in_bundles" = xfull ; then
       AC_MSG_RESULT([full])
       SHIP_DEBUG_SYMBOLS=full
     else
       AC_MSG_RESULT([public])
       SHIP_DEBUG_SYMBOLS=public
     fi
+  elif test "x$with_external_symbols_in_bundles" = xdefault ; then
+    if test "x$DEBUG_LEVEL" = xrelease ; then
+      AC_MSG_RESULT([no (default)])
+    elif test "x$COPY_DEBUG_SYMBOLS" = xtrue ; then
+      AC_MSG_RESULT([full (default)])
+      SHIP_DEBUG_SYMBOLS=full
+    else
+      AC_MSG_RESULT([no (default, native debug symbols are not external/zipped)])
+    fi
   else
     AC_MSG_ERROR([$with_external_symbols_in_bundles is an unknown value for --with-external-symbols-in-bundles])
   fi
diff --git a/make/autoconf/lib-bundled.m4 b/make/autoconf/lib-bundled.m4
index 3246697663c..a6266bec014 100644
--- a/make/autoconf/lib-bundled.m4
+++ b/make/autoconf/lib-bundled.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4
index 31451d0c37f..1b247e159ac 100644
--- a/make/autoconf/platform.m4
+++ b/make/autoconf/platform.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/make/devkit/createWindowsDevkit.sh b/make/devkit/createWindowsDevkit.sh
index 7c55605c776..b21557ed498 100644
--- a/make/devkit/createWindowsDevkit.sh
+++ b/make/devkit/createWindowsDevkit.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/make/jdk/src/classes/build/tools/pandocfilter/PandocFilter.java b/make/jdk/src/classes/build/tools/pandocfilter/PandocFilter.java
index ebb49613e53..9f4d84ac95b 100644
--- a/make/jdk/src/classes/build/tools/pandocfilter/PandocFilter.java
+++ b/make/jdk/src/classes/build/tools/pandocfilter/PandocFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/make/jdk/src/classes/build/tools/taglet/JSpec.java b/make/jdk/src/classes/build/tools/taglet/JSpec.java
index ca45104e086..1c301e94a8a 100644
--- a/make/jdk/src/classes/build/tools/taglet/JSpec.java
+++ b/make/jdk/src/classes/build/tools/taglet/JSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,10 +31,9 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.lang.reflect.Field;
 
 import javax.lang.model.element.Element;
-import javax.lang.model.element.PackageElement;
-import javax.lang.model.element.TypeElement;
 
 import com.sun.source.doctree.DocTree;
 import com.sun.source.doctree.LiteralTree;
@@ -160,9 +159,10 @@ public class JSpec implements Taglet  {
             if (m.find()) {
                 String chapter = m.group("chapter");
                 String section = m.group("section");
+                String rootParent = currentPath().replaceAll("[^/]+", "..");
 
-                String url = String.format("%1$s/../specs/%2$s/%2$s-%3$s.html#%2$s-%3$s%4$s",
-                        docRoot(elem), idPrefix, chapter, section);
+                String url = String.format("%1$s/specs/%2$s/%2$s-%3$s.html#%2$s-%3$s%4$s",
+                        rootParent, idPrefix, chapter, section);
 
                 sb.append("<a href=\"")
                         .append(url)
@@ -183,6 +183,22 @@ public class JSpec implements Taglet  {
         return sb.toString();
     }
 
+    private static ThreadLocal<String> CURRENT_PATH = null;
+
+    private String currentPath() {
+        if (CURRENT_PATH == null) {
+            try {
+                Field f = Class.forName("jdk.javadoc.internal.doclets.formats.html.HtmlDocletWriter")
+                               .getField("CURRENT_PATH");
+                @SuppressWarnings("unchecked")
+                ThreadLocal<String> tl = (ThreadLocal<String>) f.get(null);
+                CURRENT_PATH = tl;
+            } catch (ReflectiveOperationException e) {
+                throw new RuntimeException("Cannot determine current path", e);
+            }
+        }
+        return CURRENT_PATH.get();
+    }
 
     private String expand(List<? extends DocTree> trees) {
         return (new SimpleDocTreeVisitor<StringBuilder, StringBuilder>() {
@@ -209,34 +225,4 @@ public class JSpec implements Taglet  {
         }).visit(trees, new StringBuilder()).toString();
     }
 
-    private String docRoot(Element elem) {
-        switch (elem.getKind()) {
-            case MODULE:
-                return "..";
-
-            case PACKAGE:
-                PackageElement pe = (PackageElement)elem;
-                String pkgPart = pe.getQualifiedName()
-                        .toString()
-                        .replace('.', '/')
-                        .replaceAll("[^/]+", "..");
-                return pe.getEnclosingElement() != null
-                        ? "../" + pkgPart
-                        : pkgPart;
-
-            case CLASS, ENUM, RECORD, INTERFACE, ANNOTATION_TYPE:
-                TypeElement te = (TypeElement)elem;
-                return te.getQualifiedName()
-                        .toString()
-                        .replace('.', '/')
-                        .replaceAll("[^/]+", "..");
-
-            default:
-                var enclosing = elem.getEnclosingElement();
-                if (enclosing == null)
-                    throw new IllegalArgumentException(elem.getKind().toString());
-                return docRoot(enclosing);
-        }
-    }
-
 }
diff --git a/make/jdk/src/classes/build/tools/taglet/ToolGuide.java b/make/jdk/src/classes/build/tools/taglet/ToolGuide.java
index 72a8ab05b3b..8db2aee3092 100644
--- a/make/jdk/src/classes/build/tools/taglet/ToolGuide.java
+++ b/make/jdk/src/classes/build/tools/taglet/ToolGuide.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,10 +31,9 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.lang.reflect.Field;
 
 import javax.lang.model.element.Element;
-import javax.lang.model.element.PackageElement;
-import javax.lang.model.element.TypeElement;
 
 import com.sun.source.doctree.DocTree;
 import com.sun.source.doctree.UnknownBlockTagTree;
@@ -68,7 +67,7 @@ public class ToolGuide implements Taglet {
 
     static final String TAG_NAME = "toolGuide";
 
-    static final String BASE_URL = "../specs/man";
+    static final String BASE_URL = "specs/man";
 
     static final Pattern TAG_PATTERN = Pattern.compile("(?s)(?<name>[A-Za-z0-9]+)\\s*(?<label>.*)$");
 
@@ -119,9 +118,10 @@ public class ToolGuide implements Taglet {
                 if (label.isEmpty()) {
                     label = name;
                 }
+                String rootParent = currentPath().replaceAll("[^/]+", "..");
 
                 String url = String.format("%s/%s/%s.html",
-                        docRoot(elem), BASE_URL, name);
+                        rootParent, BASE_URL, name);
 
                 if (needComma) {
                     sb.append(",\n");
@@ -142,33 +142,21 @@ public class ToolGuide implements Taglet {
         return sb.toString();
     }
 
-    private String docRoot(Element elem) {
-        switch (elem.getKind()) {
-            case MODULE:
-                return "..";
+    private static ThreadLocal<String> CURRENT_PATH = null;
 
-            case PACKAGE:
-                PackageElement pe = (PackageElement)elem;
-                String pkgPart = pe.getQualifiedName()
-                        .toString()
-                        .replace('.', '/')
-                        .replaceAll("[^/]+", "..");
-                return pe.getEnclosingElement() != null
-                        ? "../" + pkgPart
-                        : pkgPart;
-
-            case CLASS, ENUM, RECORD, INTERFACE, ANNOTATION_TYPE:
-                TypeElement te = (TypeElement)elem;
-                return te.getQualifiedName()
-                        .toString()
-                        .replace('.', '/')
-                        .replaceAll("[^/]+", "..");
-
-            default:
-                var enclosing = elem.getEnclosingElement();
-                if (enclosing == null)
-                    throw new IllegalArgumentException(elem.getKind().toString());
-                return docRoot(enclosing);
+    private String currentPath() {
+        if (CURRENT_PATH == null) {
+            try {
+                Field f = Class.forName("jdk.javadoc.internal.doclets.formats.html.HtmlDocletWriter")
+                               .getField("CURRENT_PATH");
+                @SuppressWarnings("unchecked")
+                ThreadLocal<String> tl = (ThreadLocal<String>) f.get(null);
+                CURRENT_PATH = tl;
+            } catch (ReflectiveOperationException e) {
+                throw new RuntimeException("Cannot determine current path", e);
+            }
         }
+        return CURRENT_PATH.get();
     }
+
 }
diff --git a/make/langtools/tools/propertiesparser/parser/Message.java b/make/langtools/tools/propertiesparser/parser/Message.java
index fb0809fb1bd..cbd1093a161 100644
--- a/make/langtools/tools/propertiesparser/parser/Message.java
+++ b/make/langtools/tools/propertiesparser/parser/Message.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/make/modules/java.desktop/lib/ClientLibraries.gmk b/make/modules/java.desktop/lib/ClientLibraries.gmk
index 499d5bef841..b76cb8dc4e3 100644
--- a/make/modules/java.desktop/lib/ClientLibraries.gmk
+++ b/make/modules/java.desktop/lib/ClientLibraries.gmk
@@ -164,7 +164,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
 
   ifeq ($(USE_EXTERNAL_LIBPNG), false)
     LIBSPLASHSCREEN_HEADER_DIRS += libsplashscreen/libpng
-    LIBSPLASHSCREEN_CFLAGS += -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0
+    LIBSPLASHSCREEN_CFLAGS += -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 \
       -DPNG_ARM_NEON_IMPLEMENTATION=0 -DPNG_LOONGARCH_LSX_OPT=0
 
     ifeq ($(call isTargetOs, linux)+$(call isTargetCpuArch, ppc), true+true)
@@ -226,6 +226,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
       EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
       EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
       OPTIMIZATION := SIZE, \
+      LINK_TIME_OPTIMIZATION := true, \
       CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) \
           $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS) \
           $(ICONV_CFLAGS), \
diff --git a/make/modules/jdk.jdwp.agent/Lib.gmk b/make/modules/jdk.jdwp.agent/Lib.gmk
index 6ae053d4bec..ce58e145f59 100644
--- a/make/modules/jdk.jdwp.agent/Lib.gmk
+++ b/make/modules/jdk.jdwp.agent/Lib.gmk
@@ -54,21 +54,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \
     NAME := jdwp, \
     OPTIMIZATION := LOW, \
     CFLAGS := -DJDWP_LOGGING $(ICONV_CFLAGS), \
-    DISABLED_WARNINGS_gcc_eventFilter.c := unused-variable, \
-    DISABLED_WARNINGS_gcc_SDE.c := unused-function, \
-    DISABLED_WARNINGS_gcc_threadControl.c := unused-but-set-variable \
-        unused-variable, \
-    DISABLED_WARNINGS_gcc_utf_util.c := unused-but-set-variable, \
-    DISABLED_WARNINGS_clang_error_messages.c := format-nonliteral, \
-    DISABLED_WARNINGS_clang_eventFilter.c := unused-variable, \
-    DISABLED_WARNINGS_clang_EventRequestImpl.c := self-assign, \
-    DISABLED_WARNINGS_clang_inStream.c := sometimes-uninitialized, \
-    DISABLED_WARNINGS_clang_log_messages.c := format-nonliteral, \
-    DISABLED_WARNINGS_clang_SDE.c := unused-function, \
-    DISABLED_WARNINGS_clang_threadControl.c := unused-but-set-variable \
-        unused-variable, \
-    DISABLED_WARNINGS_clang_utf_util.c := unused-but-set-variable, \
-    DISABLED_WARNINGS_microsoft_debugInit.c := 5287, \
     LDFLAGS := $(ICONV_LDFLAGS), \
     EXTRA_HEADER_DIRS := \
         include \
diff --git a/make/scripts/compare-logger.sh b/make/scripts/compare-logger.sh
index 0a7d8b99f6f..930936f7ac0 100644
--- a/make/scripts/compare-logger.sh
+++ b/make/scripts/compare-logger.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/make/scripts/compare.sh b/make/scripts/compare.sh
index 250b5a37b9f..777db4b8242 100644
--- a/make/scripts/compare.sh
+++ b/make/scripts/compare.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/demo/share/java2d/J2DBench/Makefile b/src/demo/share/java2d/J2DBench/Makefile
index f8949845b4f..b5996ae4d6d 100644
--- a/src/demo/share/java2d/J2DBench/Makefile
+++ b/src/demo/share/java2d/J2DBench/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/src/demo/share/java2d/J2DBench/build.xml b/src/demo/share/java2d/J2DBench/build.xml
index d48b446d0f3..748673b5fed 100644
--- a/src/demo/share/java2d/J2DBench/build.xml
+++ b/src/demo/share/java2d/J2DBench/build.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
diff --git a/src/demo/share/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java b/src/demo/share/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java
index 68016ffa86d..245d521b8c3 100644
--- a/src/demo/share/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java
+++ b/src/demo/share/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethodDescriptor.java b/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethodDescriptor.java
index b608c924942..75ff7392c69 100644
--- a/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethodDescriptor.java
+++ b/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethodDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/src/demo/share/jfc/J2Ddemo/java2d/RunWindow.java b/src/demo/share/jfc/J2Ddemo/java2d/RunWindow.java
index 21cef121b61..0910cb6c37a 100644
--- a/src/demo/share/jfc/J2Ddemo/java2d/RunWindow.java
+++ b/src/demo/share/jfc/J2Ddemo/java2d/RunWindow.java
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/src/demo/share/jfc/J2Ddemo/java2d/Tools.java b/src/demo/share/jfc/J2Ddemo/java2d/Tools.java
index 9535b8c741e..0c095a727a0 100644
--- a/src/demo/share/jfc/J2Ddemo/java2d/Tools.java
+++ b/src/demo/share/jfc/J2Ddemo/java2d/Tools.java
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/src/demo/share/jfc/Stylepad/HelloWorld.java b/src/demo/share/jfc/Stylepad/HelloWorld.java
index 59ea1b45335..0df80d611cc 100644
--- a/src/demo/share/jfc/Stylepad/HelloWorld.java
+++ b/src/demo/share/jfc/Stylepad/HelloWorld.java
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/src/demo/share/jfc/SwingSet2/SwingSet2.java b/src/demo/share/jfc/SwingSet2/SwingSet2.java
index fa78d5b6edc..27ded49ef2e 100644
--- a/src/demo/share/jfc/SwingSet2/SwingSet2.java
+++ b/src/demo/share/jfc/SwingSet2/SwingSet2.java
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties b/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties
index c5d1d682fe1..00bff095b26 100644
--- a/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties
+++ b/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector.ad b/src/hotspot/cpu/aarch64/aarch64_vector.ad
index 842784d1a29..78ef121bd29 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_vector.ad
@@ -346,8 +346,14 @@ source %{
   }
 
   bool Matcher::vector_needs_partial_operations(Node* node, const TypeVect* vt) {
-    // Only SVE has partial vector operations
-    if (UseSVE == 0) {
+    // 1. Only SVE requires partial vector operations.
+    // 2. The vector size in bytes must be smaller than MaxVectorSize.
+    // 3. Predicated vectors have a mask input, which guarantees that
+    //    out-of-bounds lanes remain inactive.
+    int length_in_bytes = vt->length_in_bytes();
+    if (UseSVE == 0 ||
+        length_in_bytes == MaxVectorSize ||
+        node->is_predicated_vector()) {
       return false;
     }
 
@@ -370,21 +376,22 @@ source %{
         return !node->in(1)->is_Con();
       case Op_LoadVector:
       case Op_StoreVector:
-        // We use NEON load/store instructions if the vector length is <= 128 bits.
-        return vt->length_in_bytes() > 16;
       case Op_AddReductionVI:
       case Op_AddReductionVL:
-        // We may prefer using NEON instructions rather than SVE partial operations.
-        return !VM_Version::use_neon_for_vector(vt->length_in_bytes());
+        // For these ops, we prefer using NEON instructions rather than SVE
+        // predicated instructions for better performance.
+        return !VM_Version::use_neon_for_vector(length_in_bytes);
       case Op_MinReductionV:
       case Op_MaxReductionV:
-        // For BYTE/SHORT/INT/FLOAT/DOUBLE types, we may prefer using NEON
-        // instructions rather than SVE partial operations.
+        // For BYTE/SHORT/INT/FLOAT/DOUBLE types, we prefer using NEON
+        // instructions rather than SVE predicated instructions for
+        // better performance.
         return vt->element_basic_type() == T_LONG ||
-               !VM_Version::use_neon_for_vector(vt->length_in_bytes());
+               !VM_Version::use_neon_for_vector(length_in_bytes);
       default:
-        // For other ops whose vector size is smaller than the max vector size, a
-        // full-sized unpredicated operation does not impact the final vector result.
+        // For other ops whose vector size is smaller than the max vector
+        // size, a full-sized unpredicated operation does not impact the
+        // vector result.
         return false;
     }
   }
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
index dff82ce95ac..66dc22c3758 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
@@ -336,8 +336,14 @@ source %{
   }
 
   bool Matcher::vector_needs_partial_operations(Node* node, const TypeVect* vt) {
-    // Only SVE has partial vector operations
-    if (UseSVE == 0) {
+    // 1. Only SVE requires partial vector operations.
+    // 2. The vector size in bytes must be smaller than MaxVectorSize.
+    // 3. Predicated vectors have a mask input, which guarantees that
+    //    out-of-bounds lanes remain inactive.
+    int length_in_bytes = vt->length_in_bytes();
+    if (UseSVE == 0 ||
+        length_in_bytes == MaxVectorSize ||
+        node->is_predicated_vector()) {
       return false;
     }
 
@@ -360,21 +366,22 @@ source %{
         return !node->in(1)->is_Con();
       case Op_LoadVector:
       case Op_StoreVector:
-        // We use NEON load/store instructions if the vector length is <= 128 bits.
-        return vt->length_in_bytes() > 16;
       case Op_AddReductionVI:
       case Op_AddReductionVL:
-        // We may prefer using NEON instructions rather than SVE partial operations.
-        return !VM_Version::use_neon_for_vector(vt->length_in_bytes());
+        // For these ops, we prefer using NEON instructions rather than SVE
+        // predicated instructions for better performance.
+        return !VM_Version::use_neon_for_vector(length_in_bytes);
       case Op_MinReductionV:
       case Op_MaxReductionV:
-        // For BYTE/SHORT/INT/FLOAT/DOUBLE types, we may prefer using NEON
-        // instructions rather than SVE partial operations.
+        // For BYTE/SHORT/INT/FLOAT/DOUBLE types, we prefer using NEON
+        // instructions rather than SVE predicated instructions for
+        // better performance.
         return vt->element_basic_type() == T_LONG ||
-               !VM_Version::use_neon_for_vector(vt->length_in_bytes());
+               !VM_Version::use_neon_for_vector(length_in_bytes);
       default:
-        // For other ops whose vector size is smaller than the max vector size, a
-        // full-sized unpredicated operation does not impact the final vector result.
+        // For other ops whose vector size is smaller than the max vector
+        // size, a full-sized unpredicated operation does not impact the
+        // vector result.
         return false;
     }
   }
diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp
index fb14d588f04..5138e796360 100644
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
index 729cd2827b7..21916a5f7dd 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
index 350b6f68196..449ad4f8a4c 100644
--- a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
@@ -310,7 +310,18 @@ static void restore_live_registers(StubAssembler* sasm, bool restore_fpu_registe
     __ add(sp, sp, 32 * wordSize);
   }
 
+#ifdef R18_RESERVED
+  /*
+  Do not modify r18_tls when restoring registers if it is a reserved register. On Windows,
+  for example, r18_tls is used to store the pointer to the current thread's TEB (where TLS
+  variables are stored). Therefore, modifying r18_tls would corrupt the TEB pointer.
+  */
+  __ pop(RegSet::range(r0, r17), sp);
+  __ ldp(zr, r19, Address(__ post(sp, 2 * wordSize)));
+  __ pop(RegSet::range(r20, r29), sp);
+#else
   __ pop(RegSet::range(r0, r29), sp);
+#endif
 }
 
 static void restore_live_registers_except_r0(StubAssembler* sasm, bool restore_fpu_registers = true)  {
@@ -323,8 +334,20 @@ static void restore_live_registers_except_r0(StubAssembler* sasm, bool restore_f
     __ add(sp, sp, 32 * wordSize);
   }
 
+#ifdef R18_RESERVED
+  /*
+  Do not modify r18_tls when restoring registers if it is a reserved register. On Windows,
+  for example, r18_tls is used to store the pointer to the current thread's TEB (where TLS
+  variables are stored). Therefore, modifying r18_tls would corrupt the TEB pointer.
+  */
+  __ ldp(zr, r1, Address(__ post(sp, 2 * wordSize)));
+  __ pop(RegSet::range(r2, r17), sp);
+  __ ldp(zr, r19, Address(__ post(sp, 2 * wordSize)));
+  __ pop(RegSet::range(r20, r29), sp);
+#else
   __ ldp(zr, r1, Address(__ post(sp, 16)));
   __ pop(RegSet::range(r2, r29), sp);
+#endif
 }
 
 
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
index 5e57044dcba..75897a16fe4 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
@@ -2547,26 +2547,22 @@ void C2_MacroAssembler::verify_int_in_range(uint idx, const TypeInt* t, Register
   if (t == TypeInt::INT) {
     return;
   }
+
   BLOCK_COMMENT("verify_int_in_range {");
   Label L_success, L_failure;
 
   jint lo = t->_lo;
   jint hi = t->_hi;
 
-  if (lo != min_jint && hi != max_jint) {
+  if (lo != min_jint) {
     subsw(rtmp, rval, lo);
     br(Assembler::LT, L_failure);
-    subsw(rtmp, rval, hi);
-    br(Assembler::LE, L_success);
-  } else if (lo != min_jint) {
-    subsw(rtmp, rval, lo);
-    br(Assembler::GE, L_success);
-  } else if (hi != max_jint) {
-    subsw(rtmp, rval, hi);
-    br(Assembler::LE, L_success);
-  } else {
-    ShouldNotReachHere();
   }
+  if (hi != max_jint) {
+    subsw(rtmp, rval, hi);
+    br(Assembler::GT, L_failure);
+  }
+  b(L_success);
 
   bind(L_failure);
   movw(c_rarg0, idx);
@@ -2590,26 +2586,22 @@ void C2_MacroAssembler::verify_long_in_range(uint idx, const TypeLong* t, Regist
   if (t == TypeLong::LONG) {
     return;
   }
+
   BLOCK_COMMENT("verify_long_in_range {");
   Label L_success, L_failure;
 
   jlong lo = t->_lo;
   jlong hi = t->_hi;
 
-  if (lo != min_jlong && hi != max_jlong) {
+  if (lo != min_jlong) {
     subs(rtmp, rval, lo);
     br(Assembler::LT, L_failure);
-    subs(rtmp, rval, hi);
-    br(Assembler::LE, L_success);
-  } else if (lo != min_jlong) {
-    subs(rtmp, rval, lo);
-    br(Assembler::GE, L_success);
-  } else if (hi != max_jlong) {
-    subs(rtmp, rval, hi);
-    br(Assembler::LE, L_success);
-  } else {
-    ShouldNotReachHere();
   }
+  if (hi != max_jlong) {
+    subs(rtmp, rval, hi);
+    br(Assembler::GT, L_failure);
+  }
+  b(L_success);
 
   bind(L_failure);
   movw(c_rarg0, idx);
diff --git a/src/hotspot/cpu/aarch64/continuationHelper_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/continuationHelper_aarch64.inline.hpp
index 19a892f5ff8..04a2d4e2bd5 100644
--- a/src/hotspot/cpu/aarch64/continuationHelper_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/continuationHelper_aarch64.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp
index 8de9b77d608..e69be999f00 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp
index cdad45b9ead..07dd8eb5565 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.hpp
index ae2819e78ca..487970ab0c5 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad b/src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad
index 8149c7e4c97..ad2e9243823 100644
--- a/src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad
+++ b/src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp b/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp
index a6e7d74f528..1b3453f3d9a 100644
--- a/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index 2ccc755be3c..b8a9afc123f 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -6259,14 +6259,10 @@ void MacroAssembler::fill_words(Register base, Register cnt, Register value)
 
 // Intrinsic for
 //
-// - sun.nio.cs.ISO_8859_1.Encoder#encodeISOArray0(byte[] sa, int sp, byte[] da, int dp, int len)
-//   Encodes char[] to byte[] in ISO-8859-1
-//
-// - java.lang.StringCoding#encodeISOArray0(byte[] sa, int sp, byte[] da, int dp, int len)
-//   Encodes byte[] (containing UTF-16) to byte[] in ISO-8859-1
-//
-// - java.lang.StringCoding#encodeAsciiArray0(char[] sa, int sp, byte[] da, int dp, int len)
-//   Encodes char[] to byte[] in ASCII
+// - sun/nio/cs/ISO_8859_1$Encoder.implEncodeISOArray
+//     return the number of characters copied.
+// - java/lang/StringUTF16.compress
+//     return index of non-latin1 character if copy fails, otherwise 'len'.
 //
 // This version always returns the number of characters copied, and does not
 // clobber the 'len' register. A successful copy will complete with the post-
diff --git a/src/hotspot/cpu/aarch64/methodHandles_aarch64.hpp b/src/hotspot/cpu/aarch64/methodHandles_aarch64.hpp
index e82f4d6237e..5d1041528f7 100644
--- a/src/hotspot/cpu/aarch64/methodHandles_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/methodHandles_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/aarch64/register_aarch64.hpp b/src/hotspot/cpu/aarch64/register_aarch64.hpp
index 108f0f34140..d1e0632c80b 100644
--- a/src/hotspot/cpu/aarch64/register_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/register_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2021, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/aarch64/smallRegisterMap_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/smallRegisterMap_aarch64.inline.hpp
index dd00e765eea..910dfa7504e 100644
--- a/src/hotspot/cpu/aarch64/smallRegisterMap_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/smallRegisterMap_aarch64.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/aarch64/stackChunkFrameStream_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/stackChunkFrameStream_aarch64.inline.hpp
index 8d2f013e116..18c24ad0543 100644
--- a/src/hotspot/cpu/aarch64/stackChunkFrameStream_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/stackChunkFrameStream_aarch64.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
index d6524f08680..e66953365b5 100644
--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp
+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/arm/c1_Defs_arm.hpp b/src/hotspot/cpu/arm/c1_Defs_arm.hpp
index 5145efd011a..3a11e1dcf39 100644
--- a/src/hotspot/cpu/arm/c1_Defs_arm.hpp
+++ b/src/hotspot/cpu/arm/c1_Defs_arm.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp
index 615d2f188ff..47e44158821 100644
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/arm/continuationFreezeThaw_arm.inline.hpp b/src/hotspot/cpu/arm/continuationFreezeThaw_arm.inline.hpp
index 05172ffeba3..6728f716caa 100644
--- a/src/hotspot/cpu/arm/continuationFreezeThaw_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/continuationFreezeThaw_arm.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp b/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp
index ce767754294..d17e72e9286 100644
--- a/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/arm/interp_masm_arm.hpp b/src/hotspot/cpu/arm/interp_masm_arm.hpp
index 578e191719e..530be1c577e 100644
--- a/src/hotspot/cpu/arm/interp_masm_arm.hpp
+++ b/src/hotspot/cpu/arm/interp_masm_arm.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/arm/matcher_arm.hpp b/src/hotspot/cpu/arm/matcher_arm.hpp
index 66fe8ac330e..6c818e1f20d 100644
--- a/src/hotspot/cpu/arm/matcher_arm.hpp
+++ b/src/hotspot/cpu/arm/matcher_arm.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/arm/smallRegisterMap_arm.inline.hpp b/src/hotspot/cpu/arm/smallRegisterMap_arm.inline.hpp
index 1223384d3b7..e3b6a5dae8b 100644
--- a/src/hotspot/cpu/arm/smallRegisterMap_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/smallRegisterMap_arm.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/arm/stackChunkFrameStream_arm.inline.hpp b/src/hotspot/cpu/arm/stackChunkFrameStream_arm.inline.hpp
index 2da68d6d5ee..259ed04ce29 100644
--- a/src/hotspot/cpu/arm/stackChunkFrameStream_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/stackChunkFrameStream_arm.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/arm/stubRoutines_arm.hpp b/src/hotspot/cpu/arm/stubRoutines_arm.hpp
index 838b3e6d378..45ab10d14f9 100644
--- a/src/hotspot/cpu/arm/stubRoutines_arm.hpp
+++ b/src/hotspot/cpu/arm/stubRoutines_arm.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/arm/vmreg_arm.hpp b/src/hotspot/cpu/arm/vmreg_arm.hpp
index f1dfd09a1e6..c8a02c5c660 100644
--- a/src/hotspot/cpu/arm/vmreg_arm.hpp
+++ b/src/hotspot/cpu/arm/vmreg_arm.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/arm/vmreg_arm.inline.hpp b/src/hotspot/cpu/arm/vmreg_arm.inline.hpp
index 3e5c18dbda0..826ba03d6d3 100644
--- a/src/hotspot/cpu/arm/vmreg_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/vmreg_arm.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp b/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp
index f322e548e21..e2183b49f2a 100644
--- a/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp
index 6a2f6264850..dea055710cd 100644
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/ppc/continuationFreezeThaw_ppc.inline.hpp b/src/hotspot/cpu/ppc/continuationFreezeThaw_ppc.inline.hpp
index e35bdae70d6..f7704ea5b14 100644
--- a/src/hotspot/cpu/ppc/continuationFreezeThaw_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/continuationFreezeThaw_ppc.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/ppc/continuationHelper_ppc.inline.hpp b/src/hotspot/cpu/ppc/continuationHelper_ppc.inline.hpp
index 7c6d19d442b..1471a6299ee 100644
--- a/src/hotspot/cpu/ppc/continuationHelper_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/continuationHelper_ppc.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp
index 390623f48a1..2bf26bd5010 100644
--- a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2022 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.hpp
index 261d6ef85d9..bc74be4ac24 100644
--- a/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2021 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp b/src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp
index 221a3c01341..dfc7301c43d 100644
--- a/src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/ppc/stackChunkFrameStream_ppc.inline.hpp b/src/hotspot/cpu/ppc/stackChunkFrameStream_ppc.inline.hpp
index a14ec9303f6..785f7e4b287 100644
--- a/src/hotspot/cpu/ppc/stackChunkFrameStream_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/stackChunkFrameStream_ppc.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index 711ae03bf27..b657c1f108d 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -2662,6 +2662,9 @@ enum Nf {
   INSN(vsha2ch_vv,  0b1110111, 0b010, 0b1, 0b101110);
   INSN(vsha2cl_vv,  0b1110111, 0b010, 0b1, 0b101111);
 
+  // Vector GHASH (Zvkg) Extension
+  INSN(vghsh_vv,    0b1110111, 0b010, 0b1, 0b101100);
+
 #undef INSN
 
 #define INSN(NAME, op, funct3, Vs1, funct6)                                    \
diff --git a/src/hotspot/cpu/riscv/assembler_riscv.inline.hpp b/src/hotspot/cpu/riscv/assembler_riscv.inline.hpp
index e85b64bd6ba..06f72ea5862 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/cpu/riscv/c1_Defs_riscv.hpp b/src/hotspot/cpu/riscv/c1_Defs_riscv.hpp
index 65113656601..6c93ce14ef0 100644
--- a/src/hotspot/cpu/riscv/c1_Defs_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c1_Defs_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
index ed2ab0c4861..1e466e90d37 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index dcf20752a21..824ea872935 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -2813,14 +2813,10 @@ void C2_MacroAssembler::char_array_compress_v(Register src, Register dst, Regist
 
 // Intrinsic for
 //
-// - sun.nio.cs.ISO_8859_1.Encoder#encodeISOArray0(byte[] sa, int sp, byte[] da, int dp, int len)
-//   Encodes char[] to byte[] in ISO-8859-1
-//
-// - java.lang.StringCoding#encodeISOArray0(byte[] sa, int sp, byte[] da, int dp, int len)
-//   Encodes byte[] (containing UTF-16) to byte[] in ISO-8859-1
-//
-// - java.lang.StringCoding#encodeAsciiArray0(char[] sa, int sp, byte[] da, int dp, int len)
-//   Encodes char[] to byte[] in ASCII
+// - sun/nio/cs/ISO_8859_1$Encoder.implEncodeISOArray
+//     return the number of characters copied.
+// - java/lang/StringUTF16.compress
+//     return index of non-latin1 character if copy fails, otherwise 'len'.
 //
 // This version always returns the number of characters copied. A successful
 // copy will complete with the post-condition: 'res' == 'len', while an
diff --git a/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp b/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp
index f541ac117eb..9fc157f9d8f 100644
--- a/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp
+++ b/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/cpu/riscv/continuationFreezeThaw_riscv.inline.hpp b/src/hotspot/cpu/riscv/continuationFreezeThaw_riscv.inline.hpp
index d6586617a63..2c2cb03b59e 100644
--- a/src/hotspot/cpu/riscv/continuationFreezeThaw_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/continuationFreezeThaw_riscv.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/riscv/continuationHelper_riscv.inline.hpp b/src/hotspot/cpu/riscv/continuationHelper_riscv.inline.hpp
index 918bf3db8cc..6aa6a3d7895 100644
--- a/src/hotspot/cpu/riscv/continuationHelper_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/continuationHelper_riscv.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
index bc0b14f1365..e50fa1dae36 100644
--- a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp
index cf97d0ff5cb..6f6e9065103 100644
--- a/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/riscv/gc/z/z_riscv.ad b/src/hotspot/cpu/riscv/gc/z/z_riscv.ad
index e3847019bb3..a408cf309d5 100644
--- a/src/hotspot/cpu/riscv/gc/z/z_riscv.ad
+++ b/src/hotspot/cpu/riscv/gc/z/z_riscv.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
 // Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
diff --git a/src/hotspot/cpu/riscv/globals_riscv.hpp b/src/hotspot/cpu/riscv/globals_riscv.hpp
index c78bfaa8ffd..390ed2daeb9 100644
--- a/src/hotspot/cpu/riscv/globals_riscv.hpp
+++ b/src/hotspot/cpu/riscv/globals_riscv.hpp
@@ -123,6 +123,7 @@ define_pd_global(intx, InlineSmallCode,          1000);
   product(bool, UseZvkn, false, EXPERIMENTAL,                                    \
           "Use Zvkn group extension, Zvkned, Zvknhb, Zvkb, Zvkt")                \
   product(bool, UseCtxFencei, false, EXPERIMENTAL,                               \
-          "Use PR_RISCV_CTX_SW_FENCEI_ON to avoid explicit icache flush")
+          "Use PR_RISCV_CTX_SW_FENCEI_ON to avoid explicit icache flush")        \
+  product(bool, UseZvkg, false, EXPERIMENTAL, "Use Zvkg instructions")
 
 #endif // CPU_RISCV_GLOBALS_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
index 89b2ed17291..a9df09d656a 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
  * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/cpu/riscv/javaFrameAnchor_riscv.hpp b/src/hotspot/cpu/riscv/javaFrameAnchor_riscv.hpp
index 6bf1230914a..65d67462d94 100644
--- a/src/hotspot/cpu/riscv/javaFrameAnchor_riscv.hpp
+++ b/src/hotspot/cpu/riscv/javaFrameAnchor_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/riscv/matcher_riscv.hpp b/src/hotspot/cpu/riscv/matcher_riscv.hpp
index 1b490a07f92..3d27a25e333 100644
--- a/src/hotspot/cpu/riscv/matcher_riscv.hpp
+++ b/src/hotspot/cpu/riscv/matcher_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, 2022, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/riscv/methodHandles_riscv.hpp b/src/hotspot/cpu/riscv/methodHandles_riscv.hpp
index ffc3b3ab676..51d51734f4a 100644
--- a/src/hotspot/cpu/riscv/methodHandles_riscv.hpp
+++ b/src/hotspot/cpu/riscv/methodHandles_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 96984ba9a42..730dd68dd88 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -8542,7 +8542,7 @@ instruct convD2F_reg(fRegF dst, fRegD src) %{
 
 // single <-> half precision
 
-instruct convHF2F_reg_reg(fRegF dst, iRegINoSp src, iRegINoSp tmp) %{
+instruct convHF2F_reg_reg(fRegF dst, iRegIorL2I src, iRegINoSp tmp) %{
   match(Set dst (ConvHF2F src));
   effect(TEMP tmp);
   format %{ "fmv.h.x $dst, $src\t# move source from $src to $dst\n\t"
diff --git a/src/hotspot/cpu/riscv/riscv_b.ad b/src/hotspot/cpu/riscv/riscv_b.ad
index beac10ec03d..a13efa96fc1 100644
--- a/src/hotspot/cpu/riscv/riscv_b.ad
+++ b/src/hotspot/cpu/riscv/riscv_b.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
 // Copyright (c) 2022, Huawei Technologies Co., Ltd. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index d162280106a..aeb8398f06f 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -114,12 +114,12 @@ source %{
       case Op_VectorCastHF2F:
       case Op_VectorCastF2HF:
       case Op_AddVHF:
+      case Op_SubVHF:
+      case Op_MulVHF:
       case Op_DivVHF:
       case Op_MaxVHF:
       case Op_MinVHF:
-      case Op_MulVHF:
       case Op_SqrtVHF:
-      case Op_SubVHF:
         return UseZvfh;
       case Op_FmaVHF:
         return UseZvfh && UseFMA;
@@ -147,13 +147,28 @@ source %{
     if (!UseRVV) {
       return false;
     }
+
     switch (opcode) {
       case Op_SelectFromTwoVector:
         // There is no masked version of selectFrom two vector, i.e. selectFrom(av, bv, mask) in vector API.
         return false;
+      // Currently, the masked versions of the following 8 Float16 operations are disabled.
+      // When the support for Float16 vector classes is added in VectorAPI and the masked
+      // Float16 IR can be generated, these masked operations will be enabled and relevant
+      // backend support added.
+      case Op_AddVHF:
+      case Op_SubVHF:
+      case Op_MulVHF:
+      case Op_DivVHF:
+      case Op_MaxVHF:
+      case Op_MinVHF:
+      case Op_SqrtVHF:
+      case Op_FmaVHF:
+        return false;
       default:
         break;
     }
+
     return match_rule_supported_vector(opcode, vlen, bt);
   }
 
diff --git a/src/hotspot/cpu/riscv/smallRegisterMap_riscv.inline.hpp b/src/hotspot/cpu/riscv/smallRegisterMap_riscv.inline.hpp
index ea5aef14ae1..58856d5f0ff 100644
--- a/src/hotspot/cpu/riscv/smallRegisterMap_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/smallRegisterMap_riscv.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/riscv/stackChunkFrameStream_riscv.inline.hpp b/src/hotspot/cpu/riscv/stackChunkFrameStream_riscv.inline.hpp
index 9e2b8003dc4..adff11c6a9f 100644
--- a/src/hotspot/cpu/riscv/stackChunkFrameStream_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/stackChunkFrameStream_riscv.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index d0cbe8ea347..127ac9f6951 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -2436,7 +2436,7 @@ class StubGenerator: public StubCodeGenerator {
     StubRoutines::_unsafe_setmemory    = generate_unsafe_setmemory();
   }
 
-  void generate_aes_loadkeys(const Register &key, VectorRegister *working_vregs, int rounds) {
+  void aes_load_keys(const Register &key, VectorRegister *working_vregs, int rounds) {
     const int step = 16;
     for (int i = 0; i < rounds; i++) {
       __ vle32_v(working_vregs[i], key);
@@ -2448,7 +2448,7 @@ class StubGenerator: public StubCodeGenerator {
     }
   }
 
-  void generate_aes_encrypt(const VectorRegister &res, VectorRegister *working_vregs, int rounds) {
+  void aes_encrypt(const VectorRegister &res, VectorRegister *working_vregs, int rounds) {
     assert(rounds <= 15, "rounds should be less than or equal to working_vregs size");
 
     __ vxor_vv(res, res, working_vregs[0]);
@@ -2499,8 +2499,8 @@ class StubGenerator: public StubCodeGenerator {
     // Else we fallthrough to the biggest case (256-bit key size)
 
     // Note: the following function performs key += 15*16
-    generate_aes_loadkeys(key, working_vregs, 15);
-    generate_aes_encrypt(res, working_vregs, 15);
+    aes_load_keys(key, working_vregs, 15);
+    aes_encrypt(res, working_vregs, 15);
     __ vse32_v(res, to);
     __ mv(c_rarg0, 0);
     __ leave();
@@ -2508,8 +2508,8 @@ class StubGenerator: public StubCodeGenerator {
 
   __ bind(L_aes192);
     // Note: the following function performs key += 13*16
-    generate_aes_loadkeys(key, working_vregs, 13);
-    generate_aes_encrypt(res, working_vregs, 13);
+    aes_load_keys(key, working_vregs, 13);
+    aes_encrypt(res, working_vregs, 13);
     __ vse32_v(res, to);
     __ mv(c_rarg0, 0);
     __ leave();
@@ -2517,8 +2517,8 @@ class StubGenerator: public StubCodeGenerator {
 
   __ bind(L_aes128);
     // Note: the following function performs key += 11*16
-    generate_aes_loadkeys(key, working_vregs, 11);
-    generate_aes_encrypt(res, working_vregs, 11);
+    aes_load_keys(key, working_vregs, 11);
+    aes_encrypt(res, working_vregs, 11);
     __ vse32_v(res, to);
     __ mv(c_rarg0, 0);
     __ leave();
@@ -2527,7 +2527,7 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
-  void generate_aes_decrypt(const VectorRegister &res, VectorRegister *working_vregs, int rounds) {
+  void aes_decrypt(const VectorRegister &res, VectorRegister *working_vregs, int rounds) {
     assert(rounds <= 15, "rounds should be less than or equal to working_vregs size");
 
     __ vxor_vv(res, res, working_vregs[rounds - 1]);
@@ -2578,8 +2578,8 @@ class StubGenerator: public StubCodeGenerator {
     // Else we fallthrough to the biggest case (256-bit key size)
 
     // Note: the following function performs key += 15*16
-    generate_aes_loadkeys(key, working_vregs, 15);
-    generate_aes_decrypt(res, working_vregs, 15);
+    aes_load_keys(key, working_vregs, 15);
+    aes_decrypt(res, working_vregs, 15);
     __ vse32_v(res, to);
     __ mv(c_rarg0, 0);
     __ leave();
@@ -2587,8 +2587,8 @@ class StubGenerator: public StubCodeGenerator {
 
   __ bind(L_aes192);
     // Note: the following function performs key += 13*16
-    generate_aes_loadkeys(key, working_vregs, 13);
-    generate_aes_decrypt(res, working_vregs, 13);
+    aes_load_keys(key, working_vregs, 13);
+    aes_decrypt(res, working_vregs, 13);
     __ vse32_v(res, to);
     __ mv(c_rarg0, 0);
     __ leave();
@@ -2596,8 +2596,8 @@ class StubGenerator: public StubCodeGenerator {
 
   __ bind(L_aes128);
     // Note: the following function performs key += 11*16
-    generate_aes_loadkeys(key, working_vregs, 11);
-    generate_aes_decrypt(res, working_vregs, 11);
+    aes_load_keys(key, working_vregs, 11);
+    aes_decrypt(res, working_vregs, 11);
     __ vse32_v(res, to);
     __ mv(c_rarg0, 0);
     __ leave();
@@ -2606,6 +2606,182 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+  void cipherBlockChaining_encryptAESCrypt(int round, Register from, Register to, Register key,
+                                           Register rvec, Register input_len) {
+    const Register len = x29;
+
+    VectorRegister working_vregs[] = {
+      v1, v2, v3, v4, v5, v6, v7, v8,
+      v9, v10, v11, v12, v13, v14, v15
+    };
+
+    const unsigned int BLOCK_SIZE = 16;
+
+    __ mv(len, input_len);
+    // load init rvec
+    __ vsetivli(x0, 4, Assembler::e32, Assembler::m1);
+    __ vle32_v(v16, rvec);
+
+    aes_load_keys(key, working_vregs, round);
+    Label L_enc_loop;
+    __ bind(L_enc_loop);
+    // Encrypt from source by block size
+      __ vle32_v(v17, from);
+      __ addi(from, from, BLOCK_SIZE);
+      __ vxor_vv(v16, v16, v17);
+      aes_encrypt(v16, working_vregs, round);
+      __ vse32_v(v16, to);
+      __ addi(to, to, BLOCK_SIZE);
+      __ subi(len, len, BLOCK_SIZE);
+      __ bnez(len, L_enc_loop);
+
+    // save current rvec and return
+    __ vse32_v(v16, rvec);
+    __ mv(x10, input_len);
+    __ leave();
+    __ ret();
+  }
+
+  // Arguments:
+  //
+  // Inputs:
+  //   c_rarg0   - source byte array address
+  //   c_rarg1   - destination byte array address
+  //   c_rarg2   - K (key) in little endian int array
+  //   c_rarg3   - r vector byte array address
+  //   c_rarg4   - input length
+  //
+  // Output:
+  //   x10       - input length
+  //
+  address generate_cipherBlockChaining_encryptAESCrypt() {
+    assert(UseAESIntrinsics, "need AES instructions (Zvkned extension) support");
+    __ align(CodeEntryAlignment);
+    StubId stub_id = StubId::stubgen_cipherBlockChaining_encryptAESCrypt_id;
+    StubCodeMark mark(this, stub_id);
+
+    const Register from       = c_rarg0;
+    const Register to         = c_rarg1;
+    const Register key        = c_rarg2;
+    const Register rvec       = c_rarg3;
+    const Register input_len  = c_rarg4;
+
+    const Register keylen     = x28;
+
+    address start = __ pc();
+    __ enter();
+
+    Label L_aes128, L_aes192;
+    // Compute #rounds for AES based on the length of the key array
+    __ lwu(keylen, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
+    __ mv(t0, 52);
+    __ bltu(keylen, t0, L_aes128);
+    __ beq(keylen, t0, L_aes192);
+    // Else we fallthrough to the biggest case (256-bit key size)
+
+    // Note: the following function performs key += 15*16
+    cipherBlockChaining_encryptAESCrypt(15, from, to, key, rvec, input_len);
+
+    // Note: the following function performs key += 11*16
+    __ bind(L_aes128);
+    cipherBlockChaining_encryptAESCrypt(11, from, to, key, rvec, input_len);
+
+    // Note: the following function performs key += 13*16
+    __ bind(L_aes192);
+    cipherBlockChaining_encryptAESCrypt(13, from, to, key, rvec, input_len);
+
+    return start;
+  }
+
+  void cipherBlockChaining_decryptAESCrypt(int round, Register from, Register to, Register key,
+                                           Register rvec, Register input_len) {
+    const Register len = x29;
+
+    VectorRegister working_vregs[] = {
+      v1, v2, v3, v4, v5, v6, v7, v8,
+      v9, v10, v11, v12, v13, v14, v15
+    };
+
+    const unsigned int BLOCK_SIZE = 16;
+
+    __ mv(len, input_len);
+    // load init rvec
+    __ vsetivli(x0, 4, Assembler::e32, Assembler::m1);
+    __ vle32_v(v16, rvec);
+
+    aes_load_keys(key, working_vregs, round);
+    Label L_dec_loop;
+    // Decrypt from source by block size
+    __ bind(L_dec_loop);
+      __ vle32_v(v17, from);
+      __ addi(from, from, BLOCK_SIZE);
+      __ vmv_v_v(v18, v17);
+      aes_decrypt(v17, working_vregs, round);
+      __ vxor_vv(v17, v17, v16);
+      __ vse32_v(v17, to);
+      __ vmv_v_v(v16, v18);
+      __ addi(to, to, BLOCK_SIZE);
+      __ subi(len, len, BLOCK_SIZE);
+      __ bnez(len, L_dec_loop);
+
+    // save current rvec and return
+    __ vse32_v(v16, rvec);
+    __ mv(x10, input_len);
+    __ leave();
+    __ ret();
+  }
+
+  // Arguments:
+  //
+  // Inputs:
+  //   c_rarg0   - source byte array address
+  //   c_rarg1   - destination byte array address
+  //   c_rarg2   - K (key) in little endian int array
+  //   c_rarg3   - r vector byte array address
+  //   c_rarg4   - input length
+  //
+  // Output:
+  //   x10       - input length
+  //
+  address generate_cipherBlockChaining_decryptAESCrypt() {
+    assert(UseAESIntrinsics, "need AES instructions (Zvkned extension) support");
+    __ align(CodeEntryAlignment);
+    StubId stub_id = StubId::stubgen_cipherBlockChaining_decryptAESCrypt_id;
+    StubCodeMark mark(this, stub_id);
+
+    const Register from        = c_rarg0;
+    const Register to          = c_rarg1;
+    const Register key         = c_rarg2;
+    const Register rvec        = c_rarg3;
+    const Register input_len   = c_rarg4;
+
+    const Register keylen      = x28;
+
+    address start = __ pc();
+    __ enter();
+
+    Label L_aes128, L_aes192, L_aes128_loop, L_aes192_loop, L_aes256_loop;
+    // Compute #rounds for AES based on the length of the key array
+    __ lwu(keylen, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
+    __ mv(t0, 52);
+    __ bltu(keylen, t0, L_aes128);
+    __ beq(keylen, t0, L_aes192);
+    // Else we fallthrough to the biggest case (256-bit key size)
+
+    // Note: the following function performs key += 15*16
+    cipherBlockChaining_decryptAESCrypt(15, from, to, key, rvec, input_len);
+
+    // Note: the following function performs key += 11*16
+    __ bind(L_aes128);
+    cipherBlockChaining_decryptAESCrypt(11, from, to, key, rvec, input_len);
+
+    // Note: the following function performs key += 13*16
+    __ bind(L_aes192);
+    cipherBlockChaining_decryptAESCrypt(13, from, to, key, rvec, input_len);
+
+    return start;
+  }
+
   // Load big-endian 128-bit from memory.
   void be_load_counter_128(Register counter_hi, Register counter_lo, Register counter) {
     __ ld(counter_lo, Address(counter, 8)); // Load 128-bits from counter
@@ -2635,7 +2811,7 @@ class StubGenerator: public StubCodeGenerator {
                             Register input_len,  Register saved_encrypted_ctr, Register used_ptr) {
     // Algorithm:
     //
-    //   generate_aes_loadkeys();
+    //   aes_load_keys();
     //   load_counter_128(counter_hi, counter_lo, counter);
     //
     //   L_next:
@@ -2649,7 +2825,7 @@ class StubGenerator: public StubCodeGenerator {
     //
     //   L_main_loop:
     //     if (len == 0) goto L_exit;
-    //     saved_encrypted_ctr = generate_aes_encrypt(counter);
+    //     saved_encrypted_ctr = aes_encrypt(counter);
     //
     //     add_counter_128(counter_hi, counter_lo);
     //     be_store_counter_128(counter_hi, counter_lo, counter);
@@ -2693,7 +2869,7 @@ class StubGenerator: public StubCodeGenerator {
     __ mv(block_size, BLOCK_SIZE);
 
     // load keys to working_vregs according to round
-    generate_aes_loadkeys(key, working_vregs, round);
+    aes_load_keys(key, working_vregs, round);
 
     // 128-bit big-endian load
     be_load_counter_128(counter_hi, counter_lo, counter);
@@ -2726,7 +2902,7 @@ class StubGenerator: public StubCodeGenerator {
     __ vle32_v(v16, counter);
 
     // encrypt counter according to round
-    generate_aes_encrypt(v16, working_vregs, round);
+    aes_encrypt(v16, working_vregs, round);
 
     __ vse32_v(v16, saved_encrypted_ctr);
 
@@ -2772,9 +2948,7 @@ class StubGenerator: public StubCodeGenerator {
   //   x10       - input length
   //
   address generate_counterMode_AESCrypt() {
-    assert(UseZvkn, "need AES instructions (Zvkned extension) support");
-    assert(UseAESCTRIntrinsics, "need AES instructions (Zvkned extension) support");
-    assert(UseZbb, "need basic bit manipulation (Zbb extension) support");
+    assert(UseAESCTRIntrinsics, "need AES instructions (Zvkned extension) and Zbb extension support");
 
     __ align(CodeEntryAlignment);
     StubId stub_id = StubId::stubgen_counterMode_AESCrypt_id;
@@ -2823,6 +2997,73 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+  void ghash_loop(Register state, Register subkeyH, Register data, Register blocks,
+                  VectorRegister vtmp1, VectorRegister vtmp2, VectorRegister vtmp3) {
+    VectorRegister partial_hash = vtmp1;
+    VectorRegister hash_subkey  = vtmp2;
+    VectorRegister cipher_text  = vtmp3;
+
+    const unsigned int BLOCK_SIZE = 16;
+
+    __ vsetivli(x0, 2, Assembler::e64, Assembler::m1);
+    __ vle64_v(hash_subkey, subkeyH);
+    __ vrev8_v(hash_subkey, hash_subkey);
+    __ vle64_v(partial_hash, state);
+    __ vrev8_v(partial_hash, partial_hash);
+
+    __ vsetivli(x0, 4, Assembler::e32, Assembler::m1);
+    Label L_ghash_loop;
+    __ bind(L_ghash_loop);
+      __ vle32_v(cipher_text, data);
+      __ addi(data, data, BLOCK_SIZE);
+      __ vghsh_vv(partial_hash, hash_subkey, cipher_text);
+      __ subi(blocks, blocks, 1);
+      __ bnez(blocks, L_ghash_loop);
+
+    __ vsetivli(x0, 2, Assembler::e64, Assembler::m1);
+    __ vrev8_v(partial_hash, partial_hash);
+    __ vse64_v(partial_hash, state);
+  }
+
+  /**
+   *  Arguments:
+   *
+   *  Input:
+   *  c_rarg0   - current state address
+   *  c_rarg1   - H key address
+   *  c_rarg2   - data address
+   *  c_rarg3   - number of blocks
+   *
+   *  Output:
+   *  Updated state at c_rarg0
+   */
+  address generate_ghash_processBlocks() {
+    assert(UseGHASHIntrinsics, "need GHASH instructions (Zvkg extension) and Zvbb support");
+
+    __ align(CodeEntryAlignment);
+    StubId stub_id = StubId::stubgen_ghash_processBlocks_id;
+    StubCodeMark mark(this, stub_id);
+
+    address start = __ pc();
+    __ enter();
+
+    Register state   = c_rarg0;
+    Register subkeyH = c_rarg1;
+    Register data    = c_rarg2;
+    Register blocks  = c_rarg3;
+
+    VectorRegister vtmp1 = v1;
+    VectorRegister vtmp2 = v2;
+    VectorRegister vtmp3 = v3;
+
+    ghash_loop(state, subkeyH, data, blocks, vtmp1, vtmp2, vtmp3);
+
+    __ leave();
+    __ ret();
+
+    return start;
+  }
+
   // code for comparing 8 characters of strings with Latin1 and Utf16 encoding
   void compare_string_8_x_LU(Register tmpL, Register tmpU,
                              Register strL, Register strU, Label& DIFF) {
@@ -7041,12 +7282,18 @@ static const int64_t right_3_bits = right_n_bits(3);
     if (UseAESIntrinsics) {
       StubRoutines::_aescrypt_encryptBlock = generate_aescrypt_encryptBlock();
       StubRoutines::_aescrypt_decryptBlock = generate_aescrypt_decryptBlock();
+      StubRoutines::_cipherBlockChaining_encryptAESCrypt = generate_cipherBlockChaining_encryptAESCrypt();
+      StubRoutines::_cipherBlockChaining_decryptAESCrypt = generate_cipherBlockChaining_decryptAESCrypt();
     }
 
     if (UseAESCTRIntrinsics) {
       StubRoutines::_counterMode_AESCrypt = generate_counterMode_AESCrypt();
     }
 
+    if (UseGHASHIntrinsics) {
+      StubRoutines::_ghash_processBlocks = generate_ghash_processBlocks();
+    }
+
     if (UsePoly1305Intrinsics) {
       StubRoutines::_poly1305_processBlocks = generate_poly1305_processBlocks();
     }
diff --git a/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp b/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp
index 0f90777ce64..2c4e7210413 100644
--- a/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp
+++ b/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index 75605f25759..22f19c4f5ea 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -457,6 +457,22 @@ void VM_Version::c2_initialize() {
       FLAG_SET_DEFAULT(UseAESCTRIntrinsics, false);
     }
   }
+
+  if (UseZvkg) {
+    if (FLAG_IS_DEFAULT(UseGHASHIntrinsics) && UseZvbb) {
+      FLAG_SET_DEFAULT(UseGHASHIntrinsics, true);
+    }
+
+    if (UseGHASHIntrinsics && !UseZvbb) {
+      warning("Cannot enable UseGHASHIntrinsics on cpu without UseZvbb support");
+      FLAG_SET_DEFAULT(UseGHASHIntrinsics, false);
+    }
+  } else {
+    if (UseGHASHIntrinsics) {
+      warning("Cannot enable UseGHASHIntrinsics on cpu without UseZvkg support");
+      FLAG_SET_DEFAULT(UseGHASHIntrinsics, false);
+    }
+  }
 }
 
 #endif // COMPILER2
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
index 168a3a576d0..03c843efc69 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
@@ -289,6 +289,8 @@ class VM_Version : public Abstract_VM_Version {
   decl(Zvfh        ,  RV_NO_FLAG_BIT,  true ,  UPDATE_DEFAULT_DEP(UseZvfh, &ext_v, &ext_Zfh, nullptr)) \
   /* Shorthand for Zvkned + Zvknhb + Zvkb + Zvkt */                                                    \
   decl(Zvkn        ,  RV_NO_FLAG_BIT,  true ,  UPDATE_DEFAULT_DEP(UseZvkn, &ext_v, nullptr))           \
+  /* Zvkg crypto extension for ghash and gcm */                                                        \
+  decl(Zvkg        ,  RV_NO_FLAG_BIT,  true ,  UPDATE_DEFAULT_DEP(UseZvkg, &ext_v, nullptr))           \
 
   #define DECLARE_RV_EXT_FEATURE(PRETTY, LINUX_BIT, FSTRING, FLAGF)                             \
   struct ext_##PRETTY##RVExtFeatureValue : public RVExtFeatureValue {                           \
diff --git a/src/hotspot/cpu/s390/assembler_s390.inline.hpp b/src/hotspot/cpu/s390/assembler_s390.inline.hpp
index 3bab60f0bb6..a36906b0d4a 100644
--- a/src/hotspot/cpu/s390/assembler_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/assembler_s390.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/s390/c1_Defs_s390.hpp b/src/hotspot/cpu/s390/c1_Defs_s390.hpp
index 31e0f85efcc..a96c06b191b 100644
--- a/src/hotspot/cpu/s390/c1_Defs_s390.hpp
+++ b/src/hotspot/cpu/s390/c1_Defs_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp b/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp
index 721995f41fe..c4eed289eff 100644
--- a/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp
+++ b/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/s390/continuationFreezeThaw_s390.inline.hpp b/src/hotspot/cpu/s390/continuationFreezeThaw_s390.inline.hpp
index 33ac17effa7..1102a745ac0 100644
--- a/src/hotspot/cpu/s390/continuationFreezeThaw_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/continuationFreezeThaw_s390.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/s390/disassembler_s390.cpp b/src/hotspot/cpu/s390/disassembler_s390.cpp
index a69851cfdba..90f2eb60e2e 100644
--- a/src/hotspot/cpu/s390/disassembler_s390.cpp
+++ b/src/hotspot/cpu/s390/disassembler_s390.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp
index 3e0b2be4873..65db915b672 100644
--- a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.hpp b/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.hpp
index eb64a09a51f..8d0c8b82b68 100644
--- a/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/s390/interp_masm_s390.hpp b/src/hotspot/cpu/s390/interp_masm_s390.hpp
index 94ad63b16c6..d981f9ea01e 100644
--- a/src/hotspot/cpu/s390/interp_masm_s390.hpp
+++ b/src/hotspot/cpu/s390/interp_masm_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp b/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp
index 307034ca0cd..5feba6dee65 100644
--- a/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp
+++ b/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/s390/matcher_s390.hpp b/src/hotspot/cpu/s390/matcher_s390.hpp
index e4c277c63a8..99461e33e3c 100644
--- a/src/hotspot/cpu/s390/matcher_s390.hpp
+++ b/src/hotspot/cpu/s390/matcher_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2017, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/s390/smallRegisterMap_s390.inline.hpp b/src/hotspot/cpu/s390/smallRegisterMap_s390.inline.hpp
index 43363ccd933..f338fb192ad 100644
--- a/src/hotspot/cpu/s390/smallRegisterMap_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/smallRegisterMap_s390.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/s390/stackChunkFrameStream_s390.inline.hpp b/src/hotspot/cpu/s390/stackChunkFrameStream_s390.inline.hpp
index 4fff0846a80..e598117fe7d 100644
--- a/src/hotspot/cpu/s390/stackChunkFrameStream_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/stackChunkFrameStream_s390.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/s390/stubRoutines_s390.hpp b/src/hotspot/cpu/s390/stubRoutines_s390.hpp
index 494d90cd85a..0a07efae46c 100644
--- a/src/hotspot/cpu/s390/stubRoutines_s390.hpp
+++ b/src/hotspot/cpu/s390/stubRoutines_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2017 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index 43471a88391..26c57fc2d80 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -449,8 +449,8 @@ const int FPUStateSizeInWords = 2688 / wordSize;
 // imm8[1:0]                =  00 (min) / 01 (max)
 //
 // [1] https://www.intel.com/content/www/us/en/content-details/856721/intel-advanced-vector-extensions-10-2-intel-avx10-2-architecture-specification.html?wapkw=AVX10
-const int AVX10_MINMAX_MAX_COMPARE_SIGN = 0x5;
-const int AVX10_MINMAX_MIN_COMPARE_SIGN = 0x4;
+const int AVX10_2_MINMAX_MAX_COMPARE_SIGN = 0x5;
+const int AVX10_2_MINMAX_MIN_COMPARE_SIGN = 0x4;
 
 // The Intel x86/Amd64 Assembler: Pure assembler doing NO optimizations on the instruction
 // level (e.g. mov rax, 0 is not translated into xor rax, rax!); i.e., what you write
diff --git a/src/hotspot/cpu/x86/assembler_x86.inline.hpp b/src/hotspot/cpu/x86/assembler_x86.inline.hpp
index 6fae9764306..6f4490d5e25 100644
--- a/src/hotspot/cpu/x86/assembler_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/c1_Defs_x86.hpp b/src/hotspot/cpu/x86/c1_Defs_x86.hpp
index bfb885a1b73..9e286eb0460 100644
--- a/src/hotspot/cpu/x86/c1_Defs_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_Defs_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp b/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp
index 08b872cb095..b84b70085b0 100644
--- a/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
index a2ea7af606d..37ee9451405 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
@@ -1261,29 +1261,9 @@ void LIR_Assembler::emit_alloc_array(LIR_OpAllocArray* op) {
 
 void LIR_Assembler::type_profile_helper(Register mdo,
                                         ciMethodData *md, ciProfileData *data,
-                                        Register recv, Label* update_done) {
-  for (uint i = 0; i < ReceiverTypeData::row_limit(); i++) {
-    Label next_test;
-    // See if the receiver is receiver[n].
-    __ cmpptr(recv, Address(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_offset(i))));
-    __ jccb(Assembler::notEqual, next_test);
-    Address data_addr(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_count_offset(i)));
-    __ addptr(data_addr, DataLayout::counter_increment);
-    __ jmp(*update_done);
-    __ bind(next_test);
-  }
-
-  // Didn't find receiver; find next empty slot and fill it in
-  for (uint i = 0; i < ReceiverTypeData::row_limit(); i++) {
-    Label next_test;
-    Address recv_addr(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_offset(i)));
-    __ cmpptr(recv_addr, NULL_WORD);
-    __ jccb(Assembler::notEqual, next_test);
-    __ movptr(recv_addr, recv);
-    __ movptr(Address(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_count_offset(i))), DataLayout::counter_increment);
-    __ jmp(*update_done);
-    __ bind(next_test);
-  }
+                                        Register recv) {
+  int mdp_offset = md->byte_offset_of_slot(data, in_ByteSize(0));
+  __ profile_receiver_type(recv, mdo, mdp_offset);
 }
 
 void LIR_Assembler::emit_typecheck_helper(LIR_OpTypeCheck *op, Label* success, Label* failure, Label* obj_is_null) {
@@ -1341,15 +1321,9 @@ void LIR_Assembler::emit_typecheck_helper(LIR_OpTypeCheck *op, Label* success, L
     __ jmp(*obj_is_null);
     __ bind(not_null);
 
-    Label update_done;
     Register recv = k_RInfo;
     __ load_klass(recv, obj, tmp_load_klass);
-    type_profile_helper(mdo, md, data, recv, &update_done);
-
-    Address nonprofiled_receiver_count_addr(mdo, md->byte_offset_of_slot(data, CounterData::count_offset()));
-    __ addptr(nonprofiled_receiver_count_addr, DataLayout::counter_increment);
-
-    __ bind(update_done);
+    type_profile_helper(mdo, md, data, recv);
   } else {
     __ jcc(Assembler::equal, *obj_is_null);
   }
@@ -1461,14 +1435,9 @@ void LIR_Assembler::emit_opTypeCheck(LIR_OpTypeCheck* op) {
       __ jmp(done);
       __ bind(not_null);
 
-      Label update_done;
       Register recv = k_RInfo;
       __ load_klass(recv, value, tmp_load_klass);
-      type_profile_helper(mdo, md, data, recv, &update_done);
-
-      Address counter_addr(mdo, md->byte_offset_of_slot(data, CounterData::count_offset()));
-      __ addptr(counter_addr, DataLayout::counter_increment);
-      __ bind(update_done);
+      type_profile_helper(mdo, md, data, recv);
     } else {
       __ jcc(Assembler::equal, done);
     }
@@ -2791,13 +2760,9 @@ void LIR_Assembler::emit_profile_call(LIR_OpProfileCall* op) {
     if (C1OptimizeVirtualCallProfiling && known_klass != nullptr) {
       // We know the type that will be seen at this call site; we can
       // statically update the MethodData* rather than needing to do
-      // dynamic tests on the receiver type
-
-      // NOTE: we should probably put a lock around this search to
-      // avoid collisions by concurrent compilations
+      // dynamic tests on the receiver type.
       ciVirtualCallData* vc_data = (ciVirtualCallData*) data;
-      uint i;
-      for (i = 0; i < VirtualCallData::row_limit(); i++) {
+      for (uint i = 0; i < VirtualCallData::row_limit(); i++) {
         ciKlass* receiver = vc_data->receiver(i);
         if (known_klass->equals(receiver)) {
           Address data_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_count_offset(i)));
@@ -2805,32 +2770,13 @@ void LIR_Assembler::emit_profile_call(LIR_OpProfileCall* op) {
           return;
         }
       }
-
-      // Receiver type not found in profile data; select an empty slot
-
-      // Note that this is less efficient than it should be because it
-      // always does a write to the receiver part of the
-      // VirtualCallData rather than just the first time
-      for (i = 0; i < VirtualCallData::row_limit(); i++) {
-        ciKlass* receiver = vc_data->receiver(i);
-        if (receiver == nullptr) {
-          Address recv_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_offset(i)));
-          __ mov_metadata(recv_addr, known_klass->constant_encoding(), rscratch1);
-          Address data_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_count_offset(i)));
-          __ addptr(data_addr, DataLayout::counter_increment);
-          return;
-        }
-      }
+      // Receiver type is not found in profile data.
+      // Fall back to runtime helper to handle the rest at runtime.
+      __ mov_metadata(recv, known_klass->constant_encoding());
     } else {
       __ load_klass(recv, recv, tmp_load_klass);
-      Label update_done;
-      type_profile_helper(mdo, md, data, recv, &update_done);
-      // Receiver did not match any saved receiver and there is no empty row for it.
-      // Increment total counter to indicate polymorphic case.
-      __ addptr(counter_addr, DataLayout::counter_increment);
-
-      __ bind(update_done);
     }
+    type_profile_helper(mdo, md, data, recv);
   } else {
     // Static call
     __ addptr(counter_addr, DataLayout::counter_increment);
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
index 33f7b063e77..c4a368b54d8 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
   // Record the type of the receiver in ReceiverTypeData
   void type_profile_helper(Register mdo,
                            ciMethodData *md, ciProfileData *data,
-                           Register recv, Label* update_done);
+                           Register recv);
 
   enum {
     _call_stub_size = 28,
diff --git a/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp b/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp
index dcc9a77765a..0220de99375 100644
--- a/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index 3de7f473fea..8fc3d18abb1 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -617,17 +617,16 @@ void C2_MacroAssembler::verify_int_in_range(uint idx, const TypeInt* t, Register
   BLOCK_COMMENT("CastII {");
   Label fail;
   Label succeed;
-  if (hi == max_jint) {
+
+  if (lo != min_jint) {
     cmpl(val, lo);
-    jccb(Assembler::greaterEqual, succeed);
-  } else {
-    if (lo != min_jint) {
-      cmpl(val, lo);
-      jccb(Assembler::less, fail);
-    }
-    cmpl(val, hi);
-    jccb(Assembler::lessEqual, succeed);
+    jccb(Assembler::less, fail);
   }
+  if (hi != max_jint) {
+    cmpl(val, hi);
+    jccb(Assembler::greater, fail);
+  }
+  jmpb(succeed);
 
   bind(fail);
   movl(c_rarg0, idx);
@@ -666,17 +665,15 @@ void C2_MacroAssembler::verify_long_in_range(uint idx, const TypeLong* t, Regist
     }
   };
 
-  if (hi == max_jlong) {
+  if (lo != min_jlong) {
     cmp_val(lo);
-    jccb(Assembler::greaterEqual, succeed);
-  } else {
-    if (lo != min_jlong) {
-      cmp_val(lo);
-      jccb(Assembler::less, fail);
-    }
-    cmp_val(hi);
-    jccb(Assembler::lessEqual, succeed);
+    jccb(Assembler::less, fail);
   }
+  if (hi != max_jlong) {
+    cmp_val(hi);
+    jccb(Assembler::greater, fail);
+  }
+  jmpb(succeed);
 
   bind(fail);
   movl(c_rarg0, idx);
@@ -1033,8 +1030,8 @@ void C2_MacroAssembler::vminmax_fp(int opc, BasicType elem_bt, XMMRegister dst,
   assert(opc == Op_MinV || opc == Op_MinReductionV ||
          opc == Op_MaxV || opc == Op_MaxReductionV, "sanity");
 
-  int imm8 = (opc == Op_MinV || opc == Op_MinReductionV) ? AVX10_MINMAX_MIN_COMPARE_SIGN
-                                                         : AVX10_MINMAX_MAX_COMPARE_SIGN;
+  int imm8 = (opc == Op_MinV || opc == Op_MinReductionV) ? AVX10_2_MINMAX_MIN_COMPARE_SIGN
+                                                         : AVX10_2_MINMAX_MAX_COMPARE_SIGN;
   if (elem_bt == T_FLOAT) {
     evminmaxps(dst, mask, src1, src2, true, imm8, vlen_enc);
   } else {
@@ -5163,7 +5160,7 @@ void C2_MacroAssembler::vector_castD2X_evex(BasicType to_elem_bt, XMMRegister ds
   }
 }
 
-void C2_MacroAssembler::vector_castF2X_avx10(BasicType to_elem_bt, XMMRegister dst, XMMRegister src, int vec_enc) {
+void C2_MacroAssembler::vector_castF2X_avx10_2(BasicType to_elem_bt, XMMRegister dst, XMMRegister src, int vec_enc) {
   switch(to_elem_bt) {
     case T_LONG:
       evcvttps2qqs(dst, src, vec_enc);
@@ -5183,7 +5180,7 @@ void C2_MacroAssembler::vector_castF2X_avx10(BasicType to_elem_bt, XMMRegister d
   }
 }
 
-void C2_MacroAssembler::vector_castF2X_avx10(BasicType to_elem_bt, XMMRegister dst, Address src, int vec_enc) {
+void C2_MacroAssembler::vector_castF2X_avx10_2(BasicType to_elem_bt, XMMRegister dst, Address src, int vec_enc) {
   switch(to_elem_bt) {
     case T_LONG:
       evcvttps2qqs(dst, src, vec_enc);
@@ -5203,7 +5200,7 @@ void C2_MacroAssembler::vector_castF2X_avx10(BasicType to_elem_bt, XMMRegister d
   }
 }
 
-void C2_MacroAssembler::vector_castD2X_avx10(BasicType to_elem_bt, XMMRegister dst, XMMRegister src, int vec_enc) {
+void C2_MacroAssembler::vector_castD2X_avx10_2(BasicType to_elem_bt, XMMRegister dst, XMMRegister src, int vec_enc) {
   switch(to_elem_bt) {
     case T_LONG:
       evcvttpd2qqs(dst, src, vec_enc);
@@ -5223,7 +5220,7 @@ void C2_MacroAssembler::vector_castD2X_avx10(BasicType to_elem_bt, XMMRegister d
   }
 }
 
-void C2_MacroAssembler::vector_castD2X_avx10(BasicType to_elem_bt, XMMRegister dst, Address src, int vec_enc) {
+void C2_MacroAssembler::vector_castD2X_avx10_2(BasicType to_elem_bt, XMMRegister dst, Address src, int vec_enc) {
   switch(to_elem_bt) {
     case T_LONG:
       evcvttpd2qqs(dst, src, vec_enc);
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
index cd5f0ceb900..6d8b0ceaebe 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
@@ -347,13 +347,13 @@ public:
                           XMMRegister xtmp2, XMMRegister xtmp3, XMMRegister xtmp4, XMMRegister xtmp5,
                           AddressLiteral float_sign_flip, Register rscratch, int vec_enc);
 
-  void vector_castF2X_avx10(BasicType to_elem_bt, XMMRegister dst, XMMRegister src, int vec_enc);
+  void vector_castF2X_avx10_2(BasicType to_elem_bt, XMMRegister dst, XMMRegister src, int vec_enc);
 
-  void vector_castF2X_avx10(BasicType to_elem_bt, XMMRegister dst, Address src, int vec_enc);
+  void vector_castF2X_avx10_2(BasicType to_elem_bt, XMMRegister dst, Address src, int vec_enc);
 
-  void vector_castD2X_avx10(BasicType to_elem_bt, XMMRegister dst, XMMRegister src, int vec_enc);
+  void vector_castD2X_avx10_2(BasicType to_elem_bt, XMMRegister dst, XMMRegister src, int vec_enc);
 
-  void vector_castD2X_avx10(BasicType to_elem_bt, XMMRegister dst, Address src, int vec_enc);
+  void vector_castD2X_avx10_2(BasicType to_elem_bt, XMMRegister dst, Address src, int vec_enc);
 
   void vector_cast_double_to_int_special_cases_avx(XMMRegister dst, XMMRegister src, XMMRegister xtmp1, XMMRegister xtmp2,
                                                    XMMRegister xtmp3, XMMRegister xtmp4, XMMRegister xtmp5, Register rscratch,
diff --git a/src/hotspot/cpu/x86/continuationHelper_x86.inline.hpp b/src/hotspot/cpu/x86/continuationHelper_x86.inline.hpp
index bb32e55db75..ffb1b733303 100644
--- a/src/hotspot/cpu/x86/continuationHelper_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/continuationHelper_x86.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp
index fd52379d2e2..c5bf17c3b4e 100644
--- a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp
index 6f71ec64218..0a36571c757 100644
--- a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
index 8bb653ec5fb..19902500f93 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/gc/z/z_x86_64.ad b/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
index e66b4b0da7a..0c640dde285 100644
--- a/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
+++ b/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/icache_x86.hpp b/src/hotspot/cpu/x86/icache_x86.hpp
index 805022fbb32..92e4fbf1569 100644
--- a/src/hotspot/cpu/x86/icache_x86.hpp
+++ b/src/hotspot/cpu/x86/icache_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp
index 36959ddfe1d..b2ea4143ac4 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.cpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp
@@ -580,17 +580,16 @@ void InterpreterMacroAssembler::load_resolved_klass_at_index(Register klass,
 //      Rsub_klass: subklass
 //
 // Kills:
-//      rcx, rdi
+//      rcx
 void InterpreterMacroAssembler::gen_subtype_check(Register Rsub_klass,
                                                   Label& ok_is_subtype) {
   assert(Rsub_klass != rax, "rax holds superklass");
   assert(Rsub_klass != r14, "r14 holds locals");
   assert(Rsub_klass != r13, "r13 holds bcp");
   assert(Rsub_klass != rcx, "rcx holds 2ndary super array length");
-  assert(Rsub_klass != rdi, "rdi holds 2ndary super array scan ptr");
 
   // Profile the not-null value's klass.
-  profile_typecheck(rcx, Rsub_klass, rdi); // blows rcx, reloads rdi
+  profile_typecheck(rcx, Rsub_klass); // blows rcx
 
   // Do the check.
   check_klass_subtype(Rsub_klass, rax, rcx, ok_is_subtype); // blows rcx
@@ -1394,7 +1393,6 @@ void InterpreterMacroAssembler::profile_final_call(Register mdp) {
 
 void InterpreterMacroAssembler::profile_virtual_call(Register receiver,
                                                      Register mdp,
-                                                     Register reg2,
                                                      bool receiver_can_be_null) {
   if (ProfileInterpreter) {
     Label profile_continue;
@@ -1414,7 +1412,7 @@ void InterpreterMacroAssembler::profile_virtual_call(Register receiver,
     }
 
     // Record the receiver type.
-    record_klass_in_profile(receiver, mdp, reg2, true);
+    profile_receiver_type(receiver, mdp, 0);
     bind(skip_receiver_profile);
 
     // The method data pointer needs to be updated to reflect the new target.
@@ -1423,135 +1421,6 @@ void InterpreterMacroAssembler::profile_virtual_call(Register receiver,
   }
 }
 
-// This routine creates a state machine for updating the multi-row
-// type profile at a virtual call site (or other type-sensitive bytecode).
-// The machine visits each row (of receiver/count) until the receiver type
-// is found, or until it runs out of rows.  At the same time, it remembers
-// the location of the first empty row.  (An empty row records null for its
-// receiver, and can be allocated for a newly-observed receiver type.)
-// Because there are two degrees of freedom in the state, a simple linear
-// search will not work; it must be a decision tree.  Hence this helper
-// function is recursive, to generate the required tree structured code.
-// It's the interpreter, so we are trading off code space for speed.
-// See below for example code.
-void InterpreterMacroAssembler::record_klass_in_profile_helper(
-                                        Register receiver, Register mdp,
-                                        Register reg2, int start_row,
-                                        Label& done, bool is_virtual_call) {
-  if (TypeProfileWidth == 0) {
-    increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
-  } else {
-    record_item_in_profile_helper(receiver, mdp, reg2, 0, done, TypeProfileWidth,
-                                  &VirtualCallData::receiver_offset, &VirtualCallData::receiver_count_offset);
-  }
-}
-
-void InterpreterMacroAssembler::record_item_in_profile_helper(Register item, Register mdp, Register reg2, int start_row,
-                                                              Label& done, int total_rows,
-                                                              OffsetFunction item_offset_fn,
-                                                              OffsetFunction item_count_offset_fn) {
-  int last_row = total_rows - 1;
-  assert(start_row <= last_row, "must be work left to do");
-  // Test this row for both the item and for null.
-  // Take any of three different outcomes:
-  //   1. found item => increment count and goto done
-  //   2. found null => keep looking for case 1, maybe allocate this cell
-  //   3. found something else => keep looking for cases 1 and 2
-  // Case 3 is handled by a recursive call.
-  for (int row = start_row; row <= last_row; row++) {
-    Label next_test;
-    bool test_for_null_also = (row == start_row);
-
-    // See if the item is item[n].
-    int item_offset = in_bytes(item_offset_fn(row));
-    test_mdp_data_at(mdp, item_offset, item,
-                     (test_for_null_also ? reg2 : noreg),
-                     next_test);
-    // (Reg2 now contains the item from the CallData.)
-
-    // The item is item[n].  Increment count[n].
-    int count_offset = in_bytes(item_count_offset_fn(row));
-    increment_mdp_data_at(mdp, count_offset);
-    jmp(done);
-    bind(next_test);
-
-    if (test_for_null_also) {
-      // Failed the equality check on item[n]...  Test for null.
-      testptr(reg2, reg2);
-      if (start_row == last_row) {
-        // The only thing left to do is handle the null case.
-        Label found_null;
-        jccb(Assembler::zero, found_null);
-        // Item did not match any saved item and there is no empty row for it.
-        // Increment total counter to indicate polymorphic case.
-        increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
-        jmp(done);
-        bind(found_null);
-        break;
-      }
-      Label found_null;
-      // Since null is rare, make it be the branch-taken case.
-      jcc(Assembler::zero, found_null);
-
-      // Put all the "Case 3" tests here.
-      record_item_in_profile_helper(item, mdp, reg2, start_row + 1, done, total_rows,
-                                    item_offset_fn, item_count_offset_fn);
-
-      // Found a null.  Keep searching for a matching item,
-      // but remember that this is an empty (unused) slot.
-      bind(found_null);
-    }
-  }
-
-  // In the fall-through case, we found no matching item, but we
-  // observed the item[start_row] is null.
-
-  // Fill in the item field and increment the count.
-  int item_offset = in_bytes(item_offset_fn(start_row));
-  set_mdp_data_at(mdp, item_offset, item);
-  int count_offset = in_bytes(item_count_offset_fn(start_row));
-  movl(reg2, DataLayout::counter_increment);
-  set_mdp_data_at(mdp, count_offset, reg2);
-  if (start_row > 0) {
-    jmp(done);
-  }
-}
-
-// Example state machine code for three profile rows:
-//   // main copy of decision tree, rooted at row[1]
-//   if (row[0].rec == rec) { row[0].incr(); goto done; }
-//   if (row[0].rec != nullptr) {
-//     // inner copy of decision tree, rooted at row[1]
-//     if (row[1].rec == rec) { row[1].incr(); goto done; }
-//     if (row[1].rec != nullptr) {
-//       // degenerate decision tree, rooted at row[2]
-//       if (row[2].rec == rec) { row[2].incr(); goto done; }
-//       if (row[2].rec != nullptr) { count.incr(); goto done; } // overflow
-//       row[2].init(rec); goto done;
-//     } else {
-//       // remember row[1] is empty
-//       if (row[2].rec == rec) { row[2].incr(); goto done; }
-//       row[1].init(rec); goto done;
-//     }
-//   } else {
-//     // remember row[0] is empty
-//     if (row[1].rec == rec) { row[1].incr(); goto done; }
-//     if (row[2].rec == rec) { row[2].incr(); goto done; }
-//     row[0].init(rec); goto done;
-//   }
-//   done:
-
-void InterpreterMacroAssembler::record_klass_in_profile(Register receiver,
-                                                        Register mdp, Register reg2,
-                                                        bool is_virtual_call) {
-  assert(ProfileInterpreter, "must be profiling");
-  Label done;
-
-  record_klass_in_profile_helper(receiver, mdp, reg2, 0, done, is_virtual_call);
-
-  bind (done);
-}
-
 void InterpreterMacroAssembler::profile_ret(Register return_bci,
                                             Register mdp) {
   if (ProfileInterpreter) {
@@ -1611,7 +1480,7 @@ void InterpreterMacroAssembler::profile_null_seen(Register mdp) {
 }
 
 
-void InterpreterMacroAssembler::profile_typecheck(Register mdp, Register klass, Register reg2) {
+void InterpreterMacroAssembler::profile_typecheck(Register mdp, Register klass) {
   if (ProfileInterpreter) {
     Label profile_continue;
 
@@ -1624,7 +1493,7 @@ void InterpreterMacroAssembler::profile_typecheck(Register mdp, Register klass,
       mdp_delta = in_bytes(VirtualCallData::virtual_call_data_size());
 
       // Record the object type.
-      record_klass_in_profile(klass, mdp, reg2, false);
+      profile_receiver_type(klass, mdp, 0);
     }
     update_mdp_by_constant(mdp, mdp_delta);
 
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.hpp b/src/hotspot/cpu/x86/interp_masm_x86.hpp
index 1d2080cd542..4114028f78e 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.hpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.hpp
@@ -234,16 +234,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
                         Register test_value_out,
                         Label& not_equal_continue);
 
-  void record_klass_in_profile(Register receiver, Register mdp,
-                               Register reg2, bool is_virtual_call);
-  void record_klass_in_profile_helper(Register receiver, Register mdp,
-                                      Register reg2, int start_row,
-                                      Label& done, bool is_virtual_call);
-  void record_item_in_profile_helper(Register item, Register mdp, Register reg2, int start_row,
-                                     Label& done, int total_rows,
-                                     OffsetFunction item_offset_fn,
-                                     OffsetFunction item_count_offset_fn);
-
   void update_mdp_by_offset(Register mdp_in, int offset_of_offset);
   void update_mdp_by_offset(Register mdp_in, Register reg, int offset_of_disp);
   void update_mdp_by_constant(Register mdp_in, int constant);
@@ -254,11 +244,10 @@ class InterpreterMacroAssembler: public MacroAssembler {
   void profile_call(Register mdp);
   void profile_final_call(Register mdp);
   void profile_virtual_call(Register receiver, Register mdp,
-                            Register scratch2,
                             bool receiver_can_be_null = false);
   void profile_ret(Register return_bci, Register mdp);
   void profile_null_seen(Register mdp);
-  void profile_typecheck(Register mdp, Register klass, Register scratch);
+  void profile_typecheck(Register mdp, Register klass);
 
   void profile_switch_default(Register mdp);
   void profile_switch_case(Register index_in_scratch, Register mdp,
diff --git a/src/hotspot/cpu/x86/interpreterRT_x86.hpp b/src/hotspot/cpu/x86/interpreterRT_x86.hpp
index 6875280d9f5..8ff4e54c38a 100644
--- a/src/hotspot/cpu/x86/interpreterRT_x86.hpp
+++ b/src/hotspot/cpu/x86/interpreterRT_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 44f1a35d443..be7deb884ce 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -4749,6 +4749,203 @@ Address MacroAssembler::argument_address(RegisterOrConstant arg_slot,
   return Address(rsp, scale_reg, scale_factor, offset);
 }
 
+// Handle the receiver type profile update given the "recv" klass.
+//
+// Normally updates the ReceiverData (RD) that starts at "mdp" + "mdp_offset".
+// If there are no matching or claimable receiver entries in RD, updates
+// the polymorphic counter.
+//
+// This code expected to run by either the interpreter or JIT-ed code, without
+// extra synchronization. For safety, receiver cells are claimed atomically, which
+// avoids grossly misrepresenting the profiles under concurrent updates. For speed,
+// counter updates are not atomic.
+//
+void MacroAssembler::profile_receiver_type(Register recv, Register mdp, int mdp_offset) {
+  int base_receiver_offset   = in_bytes(ReceiverTypeData::receiver_offset(0));
+  int end_receiver_offset    = in_bytes(ReceiverTypeData::receiver_offset(ReceiverTypeData::row_limit()));
+  int poly_count_offset      = in_bytes(CounterData::count_offset());
+  int receiver_step          = in_bytes(ReceiverTypeData::receiver_offset(1)) - base_receiver_offset;
+  int receiver_to_count_step = in_bytes(ReceiverTypeData::receiver_count_offset(0)) - base_receiver_offset;
+
+  // Adjust for MDP offsets. Slots are pointer-sized, so is the global offset.
+  assert(is_aligned(mdp_offset, BytesPerWord), "sanity");
+  base_receiver_offset += mdp_offset;
+  end_receiver_offset  += mdp_offset;
+  poly_count_offset    += mdp_offset;
+
+  // Scale down to optimize encoding. Slots are pointer-sized.
+  assert(is_aligned(base_receiver_offset,   BytesPerWord), "sanity");
+  assert(is_aligned(end_receiver_offset,    BytesPerWord), "sanity");
+  assert(is_aligned(poly_count_offset,      BytesPerWord), "sanity");
+  assert(is_aligned(receiver_step,          BytesPerWord), "sanity");
+  assert(is_aligned(receiver_to_count_step, BytesPerWord), "sanity");
+  base_receiver_offset   >>= LogBytesPerWord;
+  end_receiver_offset    >>= LogBytesPerWord;
+  poly_count_offset      >>= LogBytesPerWord;
+  receiver_step          >>= LogBytesPerWord;
+  receiver_to_count_step >>= LogBytesPerWord;
+
+#ifdef ASSERT
+  // We are about to walk the MDO slots without asking for offsets.
+  // Check that our math hits all the right spots.
+  for (uint c = 0; c < ReceiverTypeData::row_limit(); c++) {
+    int real_recv_offset  = mdp_offset + in_bytes(ReceiverTypeData::receiver_offset(c));
+    int real_count_offset = mdp_offset + in_bytes(ReceiverTypeData::receiver_count_offset(c));
+    int offset = base_receiver_offset + receiver_step*c;
+    int count_offset = offset + receiver_to_count_step;
+    assert((offset << LogBytesPerWord) == real_recv_offset, "receiver slot math");
+    assert((count_offset << LogBytesPerWord) == real_count_offset, "receiver count math");
+  }
+  int real_poly_count_offset = mdp_offset + in_bytes(CounterData::count_offset());
+  assert(poly_count_offset << LogBytesPerWord == real_poly_count_offset, "poly counter math");
+#endif
+
+  // Corner case: no profile table. Increment poly counter and exit.
+  if (ReceiverTypeData::row_limit() == 0) {
+    addptr(Address(mdp, poly_count_offset, Address::times_ptr), DataLayout::counter_increment);
+    return;
+  }
+
+  Register offset = rscratch1;
+
+  Label L_loop_search_receiver, L_loop_search_empty;
+  Label L_restart, L_found_recv, L_found_empty, L_polymorphic, L_count_update;
+
+  // The code here recognizes three major cases:
+  //   A. Fastest: receiver found in the table
+  //   B. Fast: no receiver in the table, and the table is full
+  //   C. Slow: no receiver in the table, free slots in the table
+  //
+  // The case A performance is most important, as perfectly-behaved code would end up
+  // there, especially with larger TypeProfileWidth. The case B performance is
+  // important as well, this is where bulk of code would land for normally megamorphic
+  // cases. The case C performance is not essential, its job is to deal with installation
+  // races, we optimize for code density instead. Case C needs to make sure that receiver
+  // rows are only claimed once. This makes sure we never overwrite a row for another
+  // receiver and never duplicate the receivers in the list, making profile type-accurate.
+  //
+  // It is very tempting to handle these cases in a single loop, and claim the first slot
+  // without checking the rest of the table. But, profiling code should tolerate free slots
+  // in the table, as class unloading can clear them. After such cleanup, the receiver
+  // we need might be _after_ the free slot. Therefore, we need to let at least full scan
+  // to complete, before trying to install new slots. Splitting the code in several tight
+  // loops also helpfully optimizes for cases A and B.
+  //
+  // This code is effectively:
+  //
+  // restart:
+  //   // Fastest: receiver is already installed
+  //   for (i = 0; i < receiver_count(); i++) {
+  //     if (receiver(i) == recv) goto found_recv(i);
+  //   }
+  //
+  //   // Fast: no receiver, but profile is full
+  //   for (i = 0; i < receiver_count(); i++) {
+  //     if (receiver(i) == null) goto found_null(i);
+  //   }
+  //   goto polymorphic
+  //
+  //   // Slow: try to install receiver
+  // found_null(i):
+  //   CAS(&receiver(i), null, recv);
+  //   goto restart
+  //
+  // polymorphic:
+  //   count++;
+  //   return
+  //
+  // found_recv(i):
+  //   *receiver_count(i)++
+  //
+
+  bind(L_restart);
+
+  // Fastest: receiver is already installed
+  movptr(offset, base_receiver_offset);
+  bind(L_loop_search_receiver);
+    cmpptr(recv, Address(mdp, offset, Address::times_ptr));
+    jccb(Assembler::equal, L_found_recv);
+  addptr(offset, receiver_step);
+  cmpptr(offset, end_receiver_offset);
+  jccb(Assembler::notEqual, L_loop_search_receiver);
+
+  // Fast: no receiver, but profile is full
+  movptr(offset, base_receiver_offset);
+  bind(L_loop_search_empty);
+    cmpptr(Address(mdp, offset, Address::times_ptr), NULL_WORD);
+    jccb(Assembler::equal, L_found_empty);
+  addptr(offset, receiver_step);
+  cmpptr(offset, end_receiver_offset);
+  jccb(Assembler::notEqual, L_loop_search_empty);
+  jmpb(L_polymorphic);
+
+  // Slow: try to install receiver
+  bind(L_found_empty);
+
+  // Atomically swing receiver slot: null -> recv.
+  //
+  // The update code uses CAS, which wants RAX register specifically, *and* it needs
+  // other important registers untouched, as they form the address. Therefore, we need
+  // to shift any important registers from RAX into some other spare register. If we
+  // have a spare register, we are forced to save it on stack here.
+
+  Register spare_reg = noreg;
+  Register shifted_mdp = mdp;
+  Register shifted_recv = recv;
+  if (recv == rax || mdp == rax) {
+    spare_reg = (recv != rbx && mdp != rbx) ? rbx :
+                (recv != rcx && mdp != rcx) ? rcx :
+                rdx;
+    assert_different_registers(mdp, recv, offset, spare_reg);
+
+    push(spare_reg);
+    if (recv == rax) {
+      movptr(spare_reg, recv);
+      shifted_recv = spare_reg;
+    } else {
+      assert(mdp == rax, "Remaining case");
+      movptr(spare_reg, mdp);
+      shifted_mdp = spare_reg;
+    }
+  } else {
+    push(rax);
+  }
+
+  // None of the important registers are in RAX after this shuffle.
+  assert_different_registers(rax, shifted_mdp, shifted_recv, offset);
+
+  xorptr(rax, rax);
+  cmpxchgptr(shifted_recv, Address(shifted_mdp, offset, Address::times_ptr));
+
+  // Unshift registers.
+  if (recv == rax || mdp == rax) {
+    movptr(rax, spare_reg);
+    pop(spare_reg);
+  } else {
+    pop(rax);
+  }
+
+  // CAS success means the slot now has the receiver we want. CAS failure means
+  // something had claimed the slot concurrently: it can be the same receiver we want,
+  // or something else. Since this is a slow path, we can optimize for code density,
+  // and just restart the search from the beginning.
+  jmpb(L_restart);
+
+  // Counter updates:
+
+  // Increment polymorphic counter instead of receiver slot.
+  bind(L_polymorphic);
+  movptr(offset, poly_count_offset);
+  jmpb(L_count_update);
+
+  // Found a receiver, convert its slot offset to corresponding count offset.
+  bind(L_found_recv);
+  addptr(offset, receiver_to_count_step);
+
+  bind(L_count_update);
+  addptr(Address(mdp, offset, Address::times_ptr), DataLayout::counter_increment);
+}
+
 void MacroAssembler::_verify_oop_addr(Address addr, const char* s, const char* file, int line) {
   if (!VerifyOops) return;
 
@@ -6054,46 +6251,32 @@ void MacroAssembler::evpbroadcast(BasicType type, XMMRegister dst, Register src,
   }
 }
 
-// Encode given char[]/byte[] to byte[] in ISO_8859_1 or ASCII
-//
-// @IntrinsicCandidate
-// int sun.nio.cs.ISO_8859_1.Encoder#encodeISOArray0(
-//         char[] sa, int sp, byte[] da, int dp, int len) {
-//     int i = 0;
-//     for (; i < len; i++) {
-//         char c = sa[sp++];
-//         if (c > '\u00FF')
-//             break;
-//         da[dp++] = (byte) c;
-//     }
-//     return i;
-// }
-//
-// @IntrinsicCandidate
-// int java.lang.StringCoding.encodeISOArray0(
-//         byte[] sa, int sp, byte[] da, int dp, int len) {
-//   int i = 0;
-//   for (; i < len; i++) {
-//     char c = StringUTF16.getChar(sa, sp++);
-//     if (c > '\u00FF')
-//       break;
-//     da[dp++] = (byte) c;
-//   }
-//   return i;
-// }
-//
-// @IntrinsicCandidate
-// int java.lang.StringCoding.encodeAsciiArray0(
-//         char[] sa, int sp, byte[] da, int dp, int len) {
-//   int i = 0;
-//   for (; i < len; i++) {
-//     char c = sa[sp++];
-//     if (c >= '\u0080')
-//       break;
-//     da[dp++] = (byte) c;
-//   }
-//   return i;
-// }
+// encode char[] to byte[] in ISO_8859_1 or ASCII
+   //@IntrinsicCandidate
+   //private static int implEncodeISOArray(byte[] sa, int sp,
+   //byte[] da, int dp, int len) {
+   //  int i = 0;
+   //  for (; i < len; i++) {
+   //    char c = StringUTF16.getChar(sa, sp++);
+   //    if (c > '\u00FF')
+   //      break;
+   //    da[dp++] = (byte)c;
+   //  }
+   //  return i;
+   //}
+   //
+   //@IntrinsicCandidate
+   //private static int implEncodeAsciiArray(char[] sa, int sp,
+   //    byte[] da, int dp, int len) {
+   //  int i = 0;
+   //  for (; i < len; i++) {
+   //    char c = sa[sp++];
+   //    if (c >= '\u0080')
+   //      break;
+   //    da[dp++] = (byte)c;
+   //  }
+   //  return i;
+   //}
 void MacroAssembler::encode_iso_array(Register src, Register dst, Register len,
   XMMRegister tmp1Reg, XMMRegister tmp2Reg,
   XMMRegister tmp3Reg, XMMRegister tmp4Reg,
@@ -8899,9 +9082,9 @@ void MacroAssembler::evpmins(BasicType type, XMMRegister dst, KRegister mask, XM
     case T_LONG:
       evpminsq(dst, mask, nds, src, merge, vector_len); break;
     case T_FLOAT:
-      evminmaxps(dst, mask, nds, src, merge, AVX10_MINMAX_MIN_COMPARE_SIGN, vector_len); break;
+      evminmaxps(dst, mask, nds, src, merge, AVX10_2_MINMAX_MIN_COMPARE_SIGN, vector_len); break;
     case T_DOUBLE:
-      evminmaxpd(dst, mask, nds, src, merge, AVX10_MINMAX_MIN_COMPARE_SIGN, vector_len); break;
+      evminmaxpd(dst, mask, nds, src, merge, AVX10_2_MINMAX_MIN_COMPARE_SIGN, vector_len); break;
     default:
       fatal("Unexpected type argument %s", type2name(type)); break;
   }
@@ -8918,9 +9101,9 @@ void MacroAssembler::evpmaxs(BasicType type, XMMRegister dst, KRegister mask, XM
     case T_LONG:
       evpmaxsq(dst, mask, nds, src, merge, vector_len); break;
     case T_FLOAT:
-      evminmaxps(dst, mask, nds, src, merge, AVX10_MINMAX_MAX_COMPARE_SIGN, vector_len); break;
+      evminmaxps(dst, mask, nds, src, merge, AVX10_2_MINMAX_MAX_COMPARE_SIGN, vector_len); break;
     case T_DOUBLE:
-      evminmaxpd(dst, mask, nds, src, merge, AVX10_MINMAX_MAX_COMPARE_SIGN, vector_len); break;
+      evminmaxpd(dst, mask, nds, src, merge, AVX10_2_MINMAX_MAX_COMPARE_SIGN, vector_len); break;
     default:
       fatal("Unexpected type argument %s", type2name(type)); break;
   }
@@ -8937,9 +9120,9 @@ void MacroAssembler::evpmins(BasicType type, XMMRegister dst, KRegister mask, XM
     case T_LONG:
       evpminsq(dst, mask, nds, src, merge, vector_len); break;
     case T_FLOAT:
-      evminmaxps(dst, mask, nds, src, merge, AVX10_MINMAX_MIN_COMPARE_SIGN, vector_len); break;
+      evminmaxps(dst, mask, nds, src, merge, AVX10_2_MINMAX_MIN_COMPARE_SIGN, vector_len); break;
     case T_DOUBLE:
-      evminmaxpd(dst, mask, nds, src, merge, AVX10_MINMAX_MIN_COMPARE_SIGN, vector_len); break;
+      evminmaxpd(dst, mask, nds, src, merge, AVX10_2_MINMAX_MIN_COMPARE_SIGN, vector_len); break;
     default:
       fatal("Unexpected type argument %s", type2name(type)); break;
   }
@@ -8956,9 +9139,9 @@ void MacroAssembler::evpmaxs(BasicType type, XMMRegister dst, KRegister mask, XM
     case T_LONG:
       evpmaxsq(dst, mask, nds, src, merge, vector_len); break;
     case T_FLOAT:
-      evminmaxps(dst, mask, nds, src, merge, AVX10_MINMAX_MAX_COMPARE_SIGN, vector_len); break;
+      evminmaxps(dst, mask, nds, src, merge, AVX10_2_MINMAX_MAX_COMPARE_SIGN, vector_len); break;
     case T_DOUBLE:
-      evminmaxps(dst, mask, nds, src, merge, AVX10_MINMAX_MAX_COMPARE_SIGN, vector_len); break;
+      evminmaxps(dst, mask, nds, src, merge, AVX10_2_MINMAX_MAX_COMPARE_SIGN, vector_len); break;
     default:
       fatal("Unexpected type argument %s", type2name(type)); break;
   }
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
index 695eea6ad03..93e3529ac1e 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -668,6 +668,8 @@ public:
   // method handles (JSR 292)
   Address argument_address(RegisterOrConstant arg_slot, int extra_slot_offset = 0);
 
+  void profile_receiver_type(Register recv, Register mdp, int mdp_offset);
+
   // Debugging
 
   // only if +VerifyOops
diff --git a/src/hotspot/cpu/x86/matcher_x86.hpp b/src/hotspot/cpu/x86/matcher_x86.hpp
index 41486c244b2..f7973a8564e 100644
--- a/src/hotspot/cpu/x86/matcher_x86.hpp
+++ b/src/hotspot/cpu/x86/matcher_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/methodHandles_x86.hpp b/src/hotspot/cpu/x86/methodHandles_x86.hpp
index 6ba9b5f6a4f..83b59834261 100644
--- a/src/hotspot/cpu/x86/methodHandles_x86.hpp
+++ b/src/hotspot/cpu/x86/methodHandles_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/nativeInst_x86.hpp b/src/hotspot/cpu/x86/nativeInst_x86.hpp
index ec7fc3b154a..aba4400515f 100644
--- a/src/hotspot/cpu/x86/nativeInst_x86.hpp
+++ b/src/hotspot/cpu/x86/nativeInst_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/peephole_x86_64.hpp b/src/hotspot/cpu/x86/peephole_x86_64.hpp
index 954297f555a..9152fe8abd0 100644
--- a/src/hotspot/cpu/x86/peephole_x86_64.hpp
+++ b/src/hotspot/cpu/x86/peephole_x86_64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/rdtsc_x86.hpp b/src/hotspot/cpu/x86/rdtsc_x86.hpp
index a6519c439d3..2506404d68e 100644
--- a/src/hotspot/cpu/x86/rdtsc_x86.hpp
+++ b/src/hotspot/cpu/x86/rdtsc_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/smallRegisterMap_x86.inline.hpp b/src/hotspot/cpu/x86/smallRegisterMap_x86.inline.hpp
index 78b604c16fc..772a5266585 100644
--- a/src/hotspot/cpu/x86/smallRegisterMap_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/smallRegisterMap_x86.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/stackChunkFrameStream_x86.inline.hpp b/src/hotspot/cpu/x86/stackChunkFrameStream_x86.inline.hpp
index ebdae8a7eac..24afb960e9c 100644
--- a/src/hotspot/cpu/x86/stackChunkFrameStream_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/stackChunkFrameStream_x86.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/stubRoutines_x86.hpp b/src/hotspot/cpu/x86/stubRoutines_x86.hpp
index 7d13c4f6e7a..3654b644131 100644
--- a/src/hotspot/cpu/x86/stubRoutines_x86.hpp
+++ b/src/hotspot/cpu/x86/stubRoutines_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/x86/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp
index 7065f653e19..42392b84833 100644
--- a/src/hotspot/cpu/x86/templateTable_x86.cpp
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp
@@ -3266,7 +3266,7 @@ void TemplateTable::invokevirtual_helper(Register index,
   __ load_klass(rax, recv, rscratch1);
 
   // profile this call
-  __ profile_virtual_call(rax, rlocals, rdx);
+  __ profile_virtual_call(rax, rlocals);
   // get target Method* & entry point
   __ lookup_virtual_method(rax, index, method);
 
@@ -3407,7 +3407,7 @@ void TemplateTable::invokeinterface(int byte_no) {
 
   // profile this call
   __ restore_bcp(); // rbcp was destroyed by receiver type check
-  __ profile_virtual_call(rdx, rbcp, rlocals);
+  __ profile_virtual_call(rdx, rbcp);
 
   // Get declaring interface class from method, and itable index
   __ load_method_holder(rax, rbx);
diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index 42d2e815e45..5958db5d1eb 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -7289,12 +7289,12 @@ instruct loadD(regD dst, memory mem)
 %}
 
 // max = java.lang.Math.max(float a, float b)
-instruct maxF_avx10_reg(regF dst, regF a, regF b) %{
+instruct maxF_reg_avx10_2(regF dst, regF a, regF b) %{
   predicate(VM_Version::supports_avx10_2());
   match(Set dst (MaxF a b));
   format %{ "maxF $dst, $a, $b" %}
   ins_encode %{
-    __ eminmaxss($dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, AVX10_MINMAX_MAX_COMPARE_SIGN);
+    __ eminmaxss($dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, AVX10_2_MINMAX_MAX_COMPARE_SIGN);
   %}
   ins_pipe( pipe_slow );
 %}
@@ -7325,12 +7325,12 @@ instruct maxF_reduction_reg(legRegF dst, legRegF a, legRegF b, legRegF xtmp, rRe
 %}
 
 // max = java.lang.Math.max(double a, double b)
-instruct maxD_avx10_reg(regD dst, regD a, regD b) %{
+instruct maxD_reg_avx10_2(regD dst, regD a, regD b) %{
   predicate(VM_Version::supports_avx10_2());
   match(Set dst (MaxD a b));
   format %{ "maxD $dst, $a, $b" %}
   ins_encode %{
-    __ eminmaxsd($dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, AVX10_MINMAX_MAX_COMPARE_SIGN);
+    __ eminmaxsd($dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, AVX10_2_MINMAX_MAX_COMPARE_SIGN);
   %}
   ins_pipe( pipe_slow );
 %}
@@ -7361,12 +7361,12 @@ instruct maxD_reduction_reg(legRegD dst, legRegD a, legRegD b, legRegD xtmp, rRe
 %}
 
 // max = java.lang.Math.min(float a, float b)
-instruct minF_avx10_reg(regF dst, regF a, regF b) %{
+instruct minF_reg_avx10_2(regF dst, regF a, regF b) %{
   predicate(VM_Version::supports_avx10_2());
   match(Set dst (MinF a b));
   format %{ "minF $dst, $a, $b" %}
   ins_encode %{
-    __ eminmaxss($dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, AVX10_MINMAX_MIN_COMPARE_SIGN);
+    __ eminmaxss($dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, AVX10_2_MINMAX_MIN_COMPARE_SIGN);
   %}
   ins_pipe( pipe_slow );
 %}
@@ -7397,12 +7397,12 @@ instruct minF_reduction_reg(legRegF dst, legRegF a, legRegF b, legRegF xtmp, rRe
 %}
 
 // max = java.lang.Math.min(double a, double b)
-instruct minD_avx10_reg(regD dst, regD a, regD b) %{
+instruct minD_reg_avx10_2(regD dst, regD a, regD b) %{
   predicate(VM_Version::supports_avx10_2());
   match(Set dst (MinD a b));
   format %{ "minD $dst, $a, $b" %}
   ins_encode %{
-    __ eminmaxsd($dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, AVX10_MINMAX_MIN_COMPARE_SIGN);
+    __ eminmaxsd($dst$$XMMRegister, $a$$XMMRegister, $b$$XMMRegister, AVX10_2_MINMAX_MIN_COMPARE_SIGN);
   %}
   ins_pipe( pipe_slow );
 %}
@@ -14586,7 +14586,7 @@ instruct convF2I_reg_reg(rRegI dst, regF src, rFlagsReg cr)
   ins_pipe(pipe_slow);
 %}
 
-instruct convF2I_reg_reg_avx10(rRegI dst, regF src)
+instruct convF2I_reg_reg_avx10_2(rRegI dst, regF src)
 %{
   predicate(VM_Version::supports_avx10_2());
   match(Set dst (ConvF2I src));
@@ -14597,7 +14597,7 @@ instruct convF2I_reg_reg_avx10(rRegI dst, regF src)
   ins_pipe(pipe_slow);
 %}
 
-instruct convF2I_reg_mem_avx10(rRegI dst, memory src)
+instruct convF2I_reg_mem_avx10_2(rRegI dst, memory src)
 %{
   predicate(VM_Version::supports_avx10_2());
   match(Set dst (ConvF2I (LoadF src)));
@@ -14620,7 +14620,7 @@ instruct convF2L_reg_reg(rRegL dst, regF src, rFlagsReg cr)
   ins_pipe(pipe_slow);
 %}
 
-instruct convF2L_reg_reg_avx10(rRegL dst, regF src)
+instruct convF2L_reg_reg_avx10_2(rRegL dst, regF src)
 %{
   predicate(VM_Version::supports_avx10_2());
   match(Set dst (ConvF2L src));
@@ -14631,7 +14631,7 @@ instruct convF2L_reg_reg_avx10(rRegL dst, regF src)
   ins_pipe(pipe_slow);
 %}
 
-instruct convF2L_reg_mem_avx10(rRegL dst, memory src)
+instruct convF2L_reg_mem_avx10_2(rRegL dst, memory src)
 %{
   predicate(VM_Version::supports_avx10_2());
   match(Set dst (ConvF2L (LoadF src)));
@@ -14654,7 +14654,7 @@ instruct convD2I_reg_reg(rRegI dst, regD src, rFlagsReg cr)
   ins_pipe(pipe_slow);
 %}
 
-instruct convD2I_reg_reg_avx10(rRegI dst, regD src)
+instruct convD2I_reg_reg_avx10_2(rRegI dst, regD src)
 %{
   predicate(VM_Version::supports_avx10_2());
   match(Set dst (ConvD2I src));
@@ -14665,7 +14665,7 @@ instruct convD2I_reg_reg_avx10(rRegI dst, regD src)
   ins_pipe(pipe_slow);
 %}
 
-instruct convD2I_reg_mem_avx10(rRegI dst, memory src)
+instruct convD2I_reg_mem_avx10_2(rRegI dst, memory src)
 %{
   predicate(VM_Version::supports_avx10_2());
   match(Set dst (ConvD2I (LoadD src)));
@@ -14688,7 +14688,7 @@ instruct convD2L_reg_reg(rRegL dst, regD src, rFlagsReg cr)
   ins_pipe(pipe_slow);
 %}
 
-instruct convD2L_reg_reg_avx10(rRegL dst, regD src)
+instruct convD2L_reg_reg_avx10_2(rRegL dst, regD src)
 %{
   predicate(VM_Version::supports_avx10_2());
   match(Set dst (ConvD2L src));
@@ -14699,7 +14699,7 @@ instruct convD2L_reg_reg_avx10(rRegL dst, regD src)
   ins_pipe(pipe_slow);
 %}
 
-instruct convD2L_reg_mem_avx10(rRegL dst, memory src)
+instruct convD2L_reg_mem_avx10_2(rRegL dst, memory src)
 %{
   predicate(VM_Version::supports_avx10_2());
   match(Set dst (ConvD2L (LoadD src)));
@@ -19660,7 +19660,7 @@ instruct minmax_reductionF_av(legRegF dst, legVec src, legVec tmp, legVec atmp,
   ins_pipe( pipe_slow );
 %}
 
-instruct minmax_reduction2F_avx10(regF dst, immF src1, vec src2, vec xtmp1) %{
+instruct minmax_reduction2F_avx10_2(regF dst, immF src1, vec src2, vec xtmp1) %{
   predicate(VM_Version::supports_avx10_2() && Matcher::vector_element_basic_type(n->in(2)) == T_FLOAT &&
             ((n->Opcode() == Op_MinReductionV && n->in(1)->bottom_type() == TypeF::POS_INF) ||
              (n->Opcode() == Op_MaxReductionV && n->in(1)->bottom_type() == TypeF::NEG_INF)) &&
@@ -19678,7 +19678,7 @@ instruct minmax_reduction2F_avx10(regF dst, immF src1, vec src2, vec xtmp1) %{
   ins_pipe( pipe_slow );
 %}
 
-instruct minmax_reductionF_avx10(regF dst, immF src1, vec src2, vec xtmp1, vec xtmp2) %{
+instruct minmax_reductionF_avx10_2(regF dst, immF src1, vec src2, vec xtmp1, vec xtmp2) %{
   predicate(VM_Version::supports_avx10_2() && Matcher::vector_element_basic_type(n->in(2)) == T_FLOAT &&
             ((n->Opcode() == Op_MinReductionV && n->in(1)->bottom_type() == TypeF::POS_INF) ||
              (n->Opcode() == Op_MaxReductionV && n->in(1)->bottom_type() == TypeF::NEG_INF)) &&
@@ -19696,7 +19696,7 @@ instruct minmax_reductionF_avx10(regF dst, immF src1, vec src2, vec xtmp1, vec x
   ins_pipe( pipe_slow );
 %}
 
-instruct minmax_reduction2F_avx10_av(regF dst, vec src, vec xtmp1) %{
+instruct minmax_reduction2F_av_avx10_2(regF dst, vec src, vec xtmp1) %{
   predicate(VM_Version::supports_avx10_2() && Matcher::vector_element_basic_type(n->in(2)) == T_FLOAT &&
             Matcher::vector_length(n->in(2)) == 2);
   match(Set dst (MinReductionV dst src));
@@ -19712,7 +19712,7 @@ instruct minmax_reduction2F_avx10_av(regF dst, vec src, vec xtmp1) %{
   ins_pipe( pipe_slow );
 %}
 
-instruct minmax_reductionF_avx10_av(regF dst, vec src, vec xtmp1, vec xtmp2) %{
+instruct minmax_reductionF_av_avx10_2(regF dst, vec src, vec xtmp1, vec xtmp2) %{
   predicate(VM_Version::supports_avx10_2() && Matcher::vector_element_basic_type(n->in(2)) == T_FLOAT &&
             Matcher::vector_length(n->in(2)) >= 4);
   match(Set dst (MinReductionV dst src));
@@ -19810,7 +19810,7 @@ instruct minmax_reductionD_av(legRegD dst, legVec src, legVec tmp1, legVec tmp2,
   ins_pipe( pipe_slow );
 %}
 
-instruct minmax_reduction2D_avx10(regD dst, immD src1, vec src2, vec xtmp1) %{
+instruct minmax_reduction2D_avx10_2(regD dst, immD src1, vec src2, vec xtmp1) %{
   predicate(VM_Version::supports_avx10_2() && Matcher::vector_element_basic_type(n->in(2)) == T_DOUBLE &&
             ((n->Opcode() == Op_MinReductionV && n->in(1)->bottom_type() == TypeD::POS_INF) ||
              (n->Opcode() == Op_MaxReductionV && n->in(1)->bottom_type() == TypeD::NEG_INF)) &&
@@ -19828,7 +19828,7 @@ instruct minmax_reduction2D_avx10(regD dst, immD src1, vec src2, vec xtmp1) %{
   ins_pipe( pipe_slow );
 %}
 
-instruct minmax_reductionD_avx10(regD dst, immD src1, vec src2, vec xtmp1, vec xtmp2) %{
+instruct minmax_reductionD_avx10_2(regD dst, immD src1, vec src2, vec xtmp1, vec xtmp2) %{
   predicate(VM_Version::supports_avx10_2() && Matcher::vector_element_basic_type(n->in(2)) == T_DOUBLE &&
             ((n->Opcode() == Op_MinReductionV && n->in(1)->bottom_type() == TypeD::POS_INF) ||
              (n->Opcode() == Op_MaxReductionV && n->in(1)->bottom_type() == TypeD::NEG_INF)) &&
@@ -19847,7 +19847,7 @@ instruct minmax_reductionD_avx10(regD dst, immD src1, vec src2, vec xtmp1, vec x
 %}
 
 
-instruct minmax_reduction2D_av_avx10(regD dst, vec src, vec xtmp1) %{
+instruct minmax_reduction2D_av_avx10_2(regD dst, vec src, vec xtmp1) %{
   predicate(VM_Version::supports_avx10_2() && Matcher::vector_element_basic_type(n->in(2)) == T_DOUBLE &&
             Matcher::vector_length(n->in(2)) == 2);
   match(Set dst (MinReductionV dst src));
@@ -19863,7 +19863,7 @@ instruct minmax_reduction2D_av_avx10(regD dst, vec src, vec xtmp1) %{
   ins_pipe( pipe_slow );
 %}
 
-instruct minmax_reductionD_av_avx10(regD dst, vec src, vec xtmp1, vec xtmp2) %{
+instruct minmax_reductionD_av_avx10_2(regD dst, vec src, vec xtmp1, vec xtmp2) %{
   predicate(VM_Version::supports_avx10_2() && Matcher::vector_element_basic_type(n->in(2)) == T_DOUBLE &&
             Matcher::vector_length(n->in(2)) >= 4);
   match(Set dst (MinReductionV dst src));
@@ -20766,7 +20766,7 @@ instruct vminmaxL_reg_evex(vec dst, vec src1, vec src2) %{
 %}
 
 // Float/Double vector Min/Max
-instruct minmaxFP_avx10_reg(vec dst, vec a, vec b) %{
+instruct minmaxFP_reg_avx10_2(vec dst, vec a, vec b) %{
   predicate(VM_Version::supports_avx10_2() &&
             is_floating_point_type(Matcher::vector_element_basic_type(n))); // T_FLOAT, T_DOUBLE
   match(Set dst (MinV a b));
@@ -22113,29 +22113,29 @@ instruct castFtoX_reg_evex(vec dst, vec src, vec xtmp1, vec xtmp2, kReg ktmp1, k
   ins_pipe( pipe_slow );
 %}
 
-instruct castFtoX_reg_avx10(vec dst, vec src) %{
+instruct castFtoX_reg_avx10_2(vec dst, vec src) %{
   predicate(VM_Version::supports_avx10_2() &&
             is_integral_type(Matcher::vector_element_basic_type(n)));
   match(Set dst (VectorCastF2X src));
-  format %{ "vector_cast_f2x_avx10 $dst, $src\t!" %}
+  format %{ "vector_cast_f2x_avx10_2 $dst, $src\t!" %}
   ins_encode %{
     BasicType to_elem_bt = Matcher::vector_element_basic_type(this);
     int vlen_enc = (to_elem_bt == T_LONG) ? vector_length_encoding(this) : vector_length_encoding(this, $src);
-    __ vector_castF2X_avx10(to_elem_bt, $dst$$XMMRegister, $src$$XMMRegister, vlen_enc);
+    __ vector_castF2X_avx10_2(to_elem_bt, $dst$$XMMRegister, $src$$XMMRegister, vlen_enc);
   %}
   ins_pipe( pipe_slow );
 %}
 
-instruct castFtoX_mem_avx10(vec dst, memory src) %{
+instruct castFtoX_mem_avx10_2(vec dst, memory src) %{
   predicate(VM_Version::supports_avx10_2() &&
             is_integral_type(Matcher::vector_element_basic_type(n)));
   match(Set dst (VectorCastF2X (LoadVector src)));
-  format %{ "vector_cast_f2x_avx10 $dst, $src\t!" %}
+  format %{ "vector_cast_f2x_avx10_2 $dst, $src\t!" %}
   ins_encode %{
     int vlen = Matcher::vector_length(this);
     BasicType to_elem_bt = Matcher::vector_element_basic_type(this);
     int vlen_enc = (to_elem_bt == T_LONG) ? vector_length_encoding(this) : vector_length_encoding(vlen * sizeof(jfloat));
-    __ vector_castF2X_avx10(to_elem_bt, $dst$$XMMRegister, $src$$Address, vlen_enc);
+    __ vector_castF2X_avx10_2(to_elem_bt, $dst$$XMMRegister, $src$$Address, vlen_enc);
   %}
   ins_pipe( pipe_slow );
 %}
@@ -22187,29 +22187,29 @@ instruct castDtoX_reg_evex(vec dst, vec src, vec xtmp1, vec xtmp2, kReg ktmp1, k
   ins_pipe( pipe_slow );
 %}
 
-instruct castDtoX_reg_avx10(vec dst, vec src) %{
+instruct castDtoX_reg_avx10_2(vec dst, vec src) %{
   predicate(VM_Version::supports_avx10_2() &&
             is_integral_type(Matcher::vector_element_basic_type(n)));
   match(Set dst (VectorCastD2X src));
-  format %{ "vector_cast_d2x_avx10 $dst, $src\t!" %}
+  format %{ "vector_cast_d2x_avx10_2 $dst, $src\t!" %}
   ins_encode %{
     int vlen_enc = vector_length_encoding(this, $src);
     BasicType to_elem_bt = Matcher::vector_element_basic_type(this);
-    __ vector_castD2X_avx10(to_elem_bt, $dst$$XMMRegister, $src$$XMMRegister, vlen_enc);
+    __ vector_castD2X_avx10_2(to_elem_bt, $dst$$XMMRegister, $src$$XMMRegister, vlen_enc);
   %}
   ins_pipe( pipe_slow );
 %}
 
-instruct castDtoX_mem_avx10(vec dst, memory src) %{
+instruct castDtoX_mem_avx10_2(vec dst, memory src) %{
   predicate(VM_Version::supports_avx10_2() &&
             is_integral_type(Matcher::vector_element_basic_type(n)));
   match(Set dst (VectorCastD2X (LoadVector src)));
-  format %{ "vector_cast_d2x_avx10 $dst, $src\t!" %}
+  format %{ "vector_cast_d2x_avx10_2 $dst, $src\t!" %}
   ins_encode %{
     int vlen = Matcher::vector_length(this);
     int vlen_enc = vector_length_encoding(vlen * sizeof(jdouble));
     BasicType to_elem_bt = Matcher::vector_element_basic_type(this);
-    __ vector_castD2X_avx10(to_elem_bt, $dst$$XMMRegister, $src$$Address, vlen_enc);
+    __ vector_castD2X_avx10_2(to_elem_bt, $dst$$XMMRegister, $src$$Address, vlen_enc);
   %}
   ins_pipe( pipe_slow );
 %}
@@ -25181,14 +25181,14 @@ instruct scalar_binOps_HF_reg(regF dst, regF src1, regF src2)
   ins_pipe(pipe_slow);
 %}
 
-instruct scalar_minmax_HF_avx10_reg(regF dst, regF src1, regF src2)
+instruct scalar_minmax_HF_reg_avx10_2(regF dst, regF src1, regF src2)
 %{
   predicate(VM_Version::supports_avx10_2());
   match(Set dst (MaxHF src1 src2));
   match(Set dst (MinHF src1 src2));
   format %{ "scalar_min_max_fp16 $dst, $src1, $src2" %}
   ins_encode %{
-    int function = this->ideal_Opcode() == Op_MinHF ? AVX10_MINMAX_MIN_COMPARE_SIGN : AVX10_MINMAX_MAX_COMPARE_SIGN;
+    int function = this->ideal_Opcode() == Op_MinHF ? AVX10_2_MINMAX_MIN_COMPARE_SIGN : AVX10_2_MINMAX_MAX_COMPARE_SIGN;
     __ eminmaxsh($dst$$XMMRegister, $src1$$XMMRegister, $src2$$XMMRegister, function);
   %}
   ins_pipe( pipe_slow );
@@ -25296,7 +25296,7 @@ instruct vector_fma_HF_mem(vec dst, memory src1, vec src2)
   ins_pipe( pipe_slow );
 %}
 
-instruct vector_minmax_HF_avx10_mem(vec dst, vec src1, memory src2)
+instruct vector_minmax_HF_mem_avx10_2(vec dst, vec src1, memory src2)
 %{
   predicate(VM_Version::supports_avx10_2());
   match(Set dst (MinVHF src1 (VectorReinterpret (LoadVector src2))));
@@ -25304,13 +25304,13 @@ instruct vector_minmax_HF_avx10_mem(vec dst, vec src1, memory src2)
   format %{ "vector_min_max_fp16_mem $dst, $src1, $src2" %}
   ins_encode %{
     int vlen_enc = vector_length_encoding(this);
-    int function =  this->ideal_Opcode() == Op_MinVHF ? AVX10_MINMAX_MIN_COMPARE_SIGN : AVX10_MINMAX_MAX_COMPARE_SIGN;
+    int function =  this->ideal_Opcode() == Op_MinVHF ? AVX10_2_MINMAX_MIN_COMPARE_SIGN : AVX10_2_MINMAX_MAX_COMPARE_SIGN;
     __ evminmaxph($dst$$XMMRegister, k0, $src1$$XMMRegister, $src2$$Address, true, function, vlen_enc);
   %}
   ins_pipe( pipe_slow );
 %}
 
-instruct vector_minmax_HF_avx10_reg(vec dst, vec src1, vec src2)
+instruct vector_minmax_HF_reg_avx10_2(vec dst, vec src1, vec src2)
 %{
   predicate(VM_Version::supports_avx10_2());
   match(Set dst (MinVHF src1 src2));
@@ -25318,7 +25318,7 @@ instruct vector_minmax_HF_avx10_reg(vec dst, vec src1, vec src2)
   format %{ "vector_min_max_fp16 $dst, $src1, $src2" %}
   ins_encode %{
     int vlen_enc = vector_length_encoding(this);
-    int function =  this->ideal_Opcode() == Op_MinVHF ? AVX10_MINMAX_MIN_COMPARE_SIGN : AVX10_MINMAX_MAX_COMPARE_SIGN;
+    int function =  this->ideal_Opcode() == Op_MinVHF ? AVX10_2_MINMAX_MIN_COMPARE_SIGN : AVX10_2_MINMAX_MAX_COMPARE_SIGN;
     __ evminmaxph($dst$$XMMRegister, k0, $src1$$XMMRegister, $src2$$XMMRegister, true, function, vlen_enc);
   %}
   ins_pipe( pipe_slow );
diff --git a/src/hotspot/cpu/zero/assembler_zero.inline.hpp b/src/hotspot/cpu/zero/assembler_zero.inline.hpp
index d78eb39c973..a2961cfa84d 100644
--- a/src/hotspot/cpu/zero/assembler_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/assembler_zero.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/zero/continuationFreezeThaw_zero.inline.hpp b/src/hotspot/cpu/zero/continuationFreezeThaw_zero.inline.hpp
index 22f596b161a..740f65e3460 100644
--- a/src/hotspot/cpu/zero/continuationFreezeThaw_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/continuationFreezeThaw_zero.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/zero/icache_zero.hpp b/src/hotspot/cpu/zero/icache_zero.hpp
index 781021a2b20..cb6acb1b803 100644
--- a/src/hotspot/cpu/zero/icache_zero.hpp
+++ b/src/hotspot/cpu/zero/icache_zero.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/cpu/zero/smallRegisterMap_zero.inline.hpp b/src/hotspot/cpu/zero/smallRegisterMap_zero.inline.hpp
index 906575ab669..f6375796aec 100644
--- a/src/hotspot/cpu/zero/smallRegisterMap_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/smallRegisterMap_zero.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/zero/stackChunkFrameStream_zero.inline.hpp b/src/hotspot/cpu/zero/stackChunkFrameStream_zero.inline.hpp
index 3b9643fb3f4..f168062a59c 100644
--- a/src/hotspot/cpu/zero/stackChunkFrameStream_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/stackChunkFrameStream_zero.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/zero/stubRoutines_zero.hpp b/src/hotspot/cpu/zero/stubRoutines_zero.hpp
index 2002efc9f51..8050de8f9fd 100644
--- a/src/hotspot/cpu/zero/stubRoutines_zero.hpp
+++ b/src/hotspot/cpu/zero/stubRoutines_zero.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/os/aix/libodm_aix.cpp b/src/hotspot/os/aix/libodm_aix.cpp
index 854fd5e2b79..035703a1771 100644
--- a/src/hotspot/os/aix/libodm_aix.cpp
+++ b/src/hotspot/os/aix/libodm_aix.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015, 2019 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/os/aix/libperfstat_aix.hpp b/src/hotspot/os/aix/libperfstat_aix.hpp
index a984440e579..5a6ddfd8f4d 100644
--- a/src/hotspot/os/aix/libperfstat_aix.hpp
+++ b/src/hotspot/os/aix/libperfstat_aix.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
  * Copyright (c) 2022, IBM Corp.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/os/aix/osThread_aix.hpp b/src/hotspot/os/aix/osThread_aix.hpp
index 81c0eafa0f7..a3ba62d59db 100644
--- a/src/hotspot/os/aix/osThread_aix.hpp
+++ b/src/hotspot/os/aix/osThread_aix.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/os/aix/os_aix.hpp b/src/hotspot/os/aix/os_aix.hpp
index a7bac40e79b..a30e2077fc2 100644
--- a/src/hotspot/os/aix/os_aix.hpp
+++ b/src/hotspot/os/aix/os_aix.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index dc8f5187b5a..61de48bb7fa 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -861,6 +861,90 @@ pid_t os::Bsd::gettid() {
   }
 }
 
+// Returns the uid of a process or -1 on error.
+uid_t os::Bsd::get_process_uid(pid_t pid) {
+  struct kinfo_proc kp;
+  size_t size = sizeof kp;
+  int mib_kern[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, pid};
+  if (sysctl(mib_kern, 4, &kp, &size, nullptr, 0) == 0) {
+    if (size > 0 && kp.kp_proc.p_pid == pid) {
+      return kp.kp_eproc.e_ucred.cr_uid;
+    }
+  }
+  return (uid_t)-1;
+}
+
+// Returns true if the process is running as root.
+bool os::Bsd::is_process_root(pid_t pid) {
+  uid_t uid = get_process_uid(pid);
+  return (uid != (uid_t)-1) ? os::Posix::is_root(uid) : false;
+}
+
+#ifdef __APPLE__
+
+// macOS has a secure per-user temporary directory.
+// Root can attach to a non-root process, hence it needs
+// to lookup /var/folders for the user specific temporary directory
+// of the form /var/folders/*/*/T, that contains PERFDATA_NAME_user
+// directory.
+static const char VAR_FOLDERS[] = "/var/folders/";
+int os::Bsd::get_user_tmp_dir_macos(const char* user, int vmid, char* output_path, int output_size) {
+
+  // read the var/folders directory
+  DIR* varfolders_dir = os::opendir(VAR_FOLDERS);
+  if (varfolders_dir != nullptr) {
+
+    // var/folders directory contains 2-characters subdirectories (buckets)
+    struct dirent* bucket_de;
+
+    // loop until the PERFDATA_NAME_user directory has been found
+    while ((bucket_de = os::readdir(varfolders_dir)) != nullptr) {
+      // skip over files and special "." and ".."
+      if (bucket_de->d_type != DT_DIR || bucket_de->d_name[0] == '.') {
+        continue;
+      }
+      // absolute path to the bucket
+      char bucket[PATH_MAX];
+      int b = os::snprintf(bucket, PATH_MAX, "%s%s/", VAR_FOLDERS, bucket_de->d_name);
+
+      // the total length of the absolute path must not exceed the buffer size
+      if (b >= PATH_MAX || b < 0) {
+        continue;
+      }
+      // each bucket contains next level subdirectories
+      DIR* bucket_dir = os::opendir(bucket);
+      if (bucket_dir == nullptr) {
+        continue;
+      }
+      // read each subdirectory, skipping over regular files
+      struct dirent* subbucket_de;
+      while ((subbucket_de = os::readdir(bucket_dir)) != nullptr) {
+        if (subbucket_de->d_type != DT_DIR || subbucket_de->d_name[0] == '.') {
+          continue;
+        }
+        // If the PERFDATA_NAME_user directory exists in the T subdirectory,
+        // this means the subdirectory is the temporary directory of the user.
+        char perfdata_path[PATH_MAX];
+        int p = os::snprintf(perfdata_path, PATH_MAX, "%s%s/T/%s_%s/", bucket, subbucket_de->d_name, PERFDATA_NAME, user);
+
+        // the total length must not exceed the output buffer size
+        if (p >= PATH_MAX || p < 0) {
+          continue;
+        }
+        // check if the subdirectory exists
+        if (os::file_exists(perfdata_path)) {
+          // the return value of snprintf is not checked for the second time
+          return os::snprintf(output_path, output_size, "%s%s/T", bucket, subbucket_de->d_name);
+        }
+      }
+      os::closedir(bucket_dir);
+    }
+    os::closedir(varfolders_dir);
+  }
+  return -1;
+}
+#endif
+
 intx os::current_thread_id() {
 #ifdef __APPLE__
   return (intx)os::Bsd::gettid();
diff --git a/src/hotspot/os/bsd/os_bsd.hpp b/src/hotspot/os/bsd/os_bsd.hpp
index 82002917f39..da73211b9a7 100644
--- a/src/hotspot/os/bsd/os_bsd.hpp
+++ b/src/hotspot/os/bsd/os_bsd.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,12 @@ class os::Bsd {
   static pthread_t main_thread(void)                                { return _main_thread; }
 
   static pid_t gettid();
+  static uid_t get_process_uid(pid_t pid);
+  static bool is_process_root(pid_t pid);
+
+#ifdef __APPLE__
+  static int get_user_tmp_dir_macos(const char* user, int vmid, char* output_buffer, int buffer_size);
+#endif
 
   static intptr_t* ucontext_get_sp(const ucontext_t* uc);
   static intptr_t* ucontext_get_fp(const ucontext_t* uc);
diff --git a/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp b/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp
index ddcb0db2161..2df604083d2 100644
--- a/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp
+++ b/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp
@@ -467,9 +467,9 @@ void CgroupV1MemoryController::print_version_specific_info(outputStream* st, phy
     kmem_max_usage.set_value(temp);
   }
 
-  OSContainer::print_container_helper(st, kmem_limit, "kernel_memory_limit_in_bytes");
-  OSContainer::print_container_helper(st, kmem_usage, "kernel_memory_usage_in_bytes");
-  OSContainer::print_container_helper(st, kmem_max_usage, "kernel_memory_max_usage_in_bytes");
+  OSContainer::print_container_helper(st, kmem_limit, "kernel_memory_limit");
+  OSContainer::print_container_helper(st, kmem_usage, "kernel_memory_usage");
+  OSContainer::print_container_helper(st, kmem_max_usage, "kernel_memory_max_usage");
 }
 
 char* CgroupV1Subsystem::cpu_cpuset_cpus() {
diff --git a/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp b/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp
index f435e53c02c..c61d30e9236 100644
--- a/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp
+++ b/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp
@@ -378,8 +378,8 @@ void CgroupV2MemoryController::print_version_specific_info(outputStream* st, phy
   if (memory_swap_limit_value(reader(), swap_limit_val)) {
     swap_limit.set_value(swap_limit_val);
   }
-  OSContainer::print_container_helper(st, swap_current, "memory_swap_current_in_bytes");
-  OSContainer::print_container_helper(st, swap_limit, "memory_swap_max_limit_in_bytes");
+  OSContainer::print_container_helper(st, swap_current, "memory_swap_current");
+  OSContainer::print_container_helper(st, swap_limit, "memory_swap_max_limit");
 }
 
 char* CgroupV2Controller::construct_path(char* mount_path, const char* cgroup_path) {
diff --git a/src/hotspot/os/linux/gc/z/zSyscall_linux.hpp b/src/hotspot/os/linux/gc/z/zSyscall_linux.hpp
index e5978c8d93a..1c9a6d7d831 100644
--- a/src/hotspot/os/linux/gc/z/zSyscall_linux.hpp
+++ b/src/hotspot/os/linux/gc/z/zSyscall_linux.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/os/linux/osContainer_linux.cpp b/src/hotspot/os/linux/osContainer_linux.cpp
index d86bbf7428a..15a6403d07f 100644
--- a/src/hotspot/os/linux/osContainer_linux.cpp
+++ b/src/hotspot/os/linux/osContainer_linux.cpp
@@ -287,20 +287,44 @@ bool OSContainer::pids_current(uint64_t& value) {
   return cgroup_subsystem->pids_current(value);
 }
 
+template<typename T> struct metric_fmt;
+template<> struct metric_fmt<unsigned long long int> { static constexpr const char* fmt = "%llu"; };
+template<> struct metric_fmt<unsigned long int> { static constexpr const char* fmt = "%lu"; };
+template<> struct metric_fmt<int> { static constexpr const char* fmt = "%d"; };
+template<> struct metric_fmt<const char*> { static constexpr const char* fmt = "%s"; };
+
+template void OSContainer::print_container_metric<unsigned long long int>(outputStream*, const char*, unsigned long long int, const char*);
+template void OSContainer::print_container_metric<unsigned long int>(outputStream*, const char*, unsigned long int, const char*);
+template void OSContainer::print_container_metric<int>(outputStream*, const char*, int, const char*);
+template void OSContainer::print_container_metric<const char*>(outputStream*, const char*, const char*, const char*);
+
+template <typename T>
+void OSContainer::print_container_metric(outputStream* st, const char* metrics, T value, const char* unit) {
+  constexpr int max_length = 38; // Longest "metric: value" string ("maximum number of tasks: not supported")
+  constexpr int longest_value = max_length - 11; // Max length - shortest "metric: " string ("cpu_quota: ")
+  char value_str[longest_value + 1] = {};
+  os::snprintf_checked(value_str, longest_value, metric_fmt<T>::fmt, value);
+  st->print("%s: %*s", metrics, max_length - static_cast<int>(strlen(metrics)) - 2, value_str); // -2 for the ": "
+  if (unit[0] != '\0') {
+    st->print_cr(" %s", unit);
+  } else {
+    st->print_cr("");
+  }
+}
+
 void OSContainer::print_container_helper(outputStream* st, MetricResult& res, const char* metrics) {
-  st->print("%s: ", metrics);
   if (res.success()) {
     if (res.value() != value_unlimited) {
       if (res.value() >= 1024) {
-        st->print_cr(PHYS_MEM_TYPE_FORMAT " k", (physical_memory_size_type)(res.value() / K));
+        print_container_metric(st, metrics, res.value() / K, "kB");
       } else {
-        st->print_cr(PHYS_MEM_TYPE_FORMAT, res.value());
+        print_container_metric(st, metrics, res.value(), "B");
       }
     } else {
-      st->print_cr("%s", "unlimited");
+      print_container_metric(st, metrics, "unlimited");
     }
   } else {
     // Not supported
-    st->print_cr("%s", "unavailable");
+    print_container_metric(st, metrics, "unavailable");
   }
 }
diff --git a/src/hotspot/os/linux/osContainer_linux.hpp b/src/hotspot/os/linux/osContainer_linux.hpp
index 895c99ba167..11c3e086feb 100644
--- a/src/hotspot/os/linux/osContainer_linux.hpp
+++ b/src/hotspot/os/linux/osContainer_linux.hpp
@@ -65,6 +65,8 @@ class OSContainer: AllStatic {
   static void init();
   static void print_version_specific_info(outputStream* st);
   static void print_container_helper(outputStream* st, MetricResult& res, const char* metrics);
+  template <typename T>
+  static void print_container_metric(outputStream* st, const char* metrics, T value, const char* unit = "");
 
   static inline bool is_containerized();
   static const char * container_type();
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index ba05fde7f12..a28f9850495 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -1470,9 +1470,6 @@ void os::Linux::capture_initial_stack(size_t max_size) {
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// time support
-
 // thread_id is kernel thread id (similar to Solaris LWP id)
 intx os::current_thread_id() { return os::Linux::gettid(); }
 int os::current_process_id() {
@@ -2432,62 +2429,57 @@ bool os::Linux::print_container_info(outputStream* st) {
   st->print_cr("container (cgroup) information:");
 
   const char *p_ct = OSContainer::container_type();
-  st->print_cr("container_type: %s", p_ct != nullptr ? p_ct : "not supported");
+  OSContainer::print_container_metric(st, "container_type", p_ct != nullptr ? p_ct : "not supported");
 
   char *p = OSContainer::cpu_cpuset_cpus();
-  st->print_cr("cpu_cpuset_cpus: %s", p != nullptr ? p : "not supported");
+  OSContainer::print_container_metric(st, "cpu_cpuset_cpus", p != nullptr ? p : "not supported");
   free(p);
 
   p = OSContainer::cpu_cpuset_memory_nodes();
-  st->print_cr("cpu_memory_nodes: %s", p != nullptr ? p : "not supported");
+  OSContainer::print_container_metric(st, "cpu_memory_nodes", p != nullptr ? p : "not supported");
   free(p);
 
   int i = -1;
   bool supported = OSContainer::active_processor_count(i);
-  st->print("active_processor_count: ");
   if (supported) {
     assert(i > 0, "must be");
     if (ActiveProcessorCount > 0) {
-      st->print_cr("%d, but overridden by -XX:ActiveProcessorCount %d", i, ActiveProcessorCount);
+      OSContainer::print_container_metric(st, "active_processor_count", ActiveProcessorCount, "(from -XX:ActiveProcessorCount)");
     } else {
-      st->print_cr("%d", i);
+      OSContainer::print_container_metric(st, "active_processor_count", i);
     }
   } else {
-    st->print_cr("not supported");
+    OSContainer::print_container_metric(st, "active_processor_count", "not supported");
   }
 
 
   supported = OSContainer::cpu_quota(i);
-  st->print("cpu_quota: ");
   if (supported && i > 0) {
-    st->print_cr("%d", i);
+    OSContainer::print_container_metric(st, "cpu_quota", i);
   } else {
-    st->print_cr("%s", !supported ? "not supported" : "no quota");
+    OSContainer::print_container_metric(st, "cpu_quota", !supported ? "not supported" : "no quota");
   }
 
   supported = OSContainer::cpu_period(i);
-  st->print("cpu_period: ");
   if (supported && i > 0) {
-    st->print_cr("%d", i);
+    OSContainer::print_container_metric(st, "cpu_period", i);
   } else {
-    st->print_cr("%s", !supported ? "not supported" : "no period");
+    OSContainer::print_container_metric(st, "cpu_period", !supported ? "not supported" : "no period");
   }
 
   supported = OSContainer::cpu_shares(i);
-  st->print("cpu_shares: ");
   if (supported && i > 0) {
-    st->print_cr("%d", i);
+    OSContainer::print_container_metric(st, "cpu_shares", i);
   } else {
-    st->print_cr("%s", !supported ? "not supported" : "no shares");
+    OSContainer::print_container_metric(st, "cpu_shares", !supported ? "not supported" : "no shares");
   }
 
   uint64_t j = 0;
   supported = OSContainer::cpu_usage_in_micros(j);
-  st->print("cpu_usage_in_micros: ");
   if (supported && j > 0) {
-    st->print_cr(UINT64_FORMAT, j);
+    OSContainer::print_container_metric(st, "cpu_usage", j, "us");
   } else {
-    st->print_cr("%s", !supported ? "not supported" : "no usage");
+    OSContainer::print_container_metric(st, "cpu_usage", !supported ? "not supported" : "no usage");
   }
 
   MetricResult memory_limit;
@@ -2530,31 +2522,29 @@ bool os::Linux::print_container_info(outputStream* st) {
   if (OSContainer::cache_usage_in_bytes(val)) {
     cache_usage.set_value(val);
   }
-  OSContainer::print_container_helper(st, memory_limit, "memory_limit_in_bytes");
-  OSContainer::print_container_helper(st, mem_swap_limit, "memory_and_swap_limit_in_bytes");
-  OSContainer::print_container_helper(st, mem_soft_limit, "memory_soft_limit_in_bytes");
-  OSContainer::print_container_helper(st, mem_throttle_limit, "memory_throttle_limit_in_bytes");
-  OSContainer::print_container_helper(st, mem_usage, "memory_usage_in_bytes");
-  OSContainer::print_container_helper(st, mem_max_usage, "memory_max_usage_in_bytes");
-  OSContainer::print_container_helper(st, rss_usage, "rss_usage_in_bytes");
-  OSContainer::print_container_helper(st, cache_usage, "cache_usage_in_bytes");
+  OSContainer::print_container_helper(st, memory_limit, "memory_limit");
+  OSContainer::print_container_helper(st, mem_swap_limit, "memory_and_swap_limit");
+  OSContainer::print_container_helper(st, mem_soft_limit, "memory_soft_limit");
+  OSContainer::print_container_helper(st, mem_throttle_limit, "memory_throttle_limit");
+  OSContainer::print_container_helper(st, mem_usage, "memory_usage");
+  OSContainer::print_container_helper(st, mem_max_usage, "memory_max_usage");
+  OSContainer::print_container_helper(st, rss_usage, "rss_usage");
+  OSContainer::print_container_helper(st, cache_usage, "cache_usage");
 
   OSContainer::print_version_specific_info(st);
 
   supported = OSContainer::pids_max(j);
-  st->print("maximum number of tasks: ");
   if (supported && j != value_unlimited) {
-    st->print_cr(UINT64_FORMAT, j);
+    OSContainer::print_container_metric(st, "maximum number of tasks", j);
   } else {
-    st->print_cr("%s", !supported ? "not supported" : "unlimited");
+    OSContainer::print_container_metric(st, "maximum number of tasks", !supported ? "not supported" : "unlimited");
   }
 
   supported = OSContainer::pids_current(j);
-  st->print("current number of tasks: ");
   if (supported && j > 0) {
-    st->print_cr(UINT64_FORMAT, j);
+    OSContainer::print_container_metric(st, "current number of tasks", j);
   } else {
-    st->print_cr("%s", !supported ? "not supported" : "no current tasks");
+    OSContainer::print_container_metric(st, "current number of tasks", !supported ? "not supported" : "no tasks");
   }
 
   return true;
@@ -4298,13 +4288,6 @@ OSReturn os::get_native_priority(const Thread* const thread,
   return (*priority_ptr != -1 || errno == 0 ? OS_OK : OS_ERR);
 }
 
-// This is the fastest way to get thread cpu time on Linux.
-// Returns cpu time (user+sys) for any thread, not only for current.
-// POSIX compliant clocks are implemented in the kernels 2.6.16+.
-// It might work on 2.6.10+ with a special kernel/glibc patch.
-// For reference, please, see IEEE Std 1003.1-2004:
-//   http://www.unix.org/single_unix_specification
-
 jlong os::Linux::thread_cpu_time(clockid_t clockid) {
   struct timespec tp;
   int status = clock_gettime(clockid, &tp);
diff --git a/src/hotspot/os/linux/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp
index 43f70b4af56..41b5afbf5c3 100644
--- a/src/hotspot/os/linux/os_linux.hpp
+++ b/src/hotspot/os/linux/os_linux.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/os/linux/os_linux.inline.hpp b/src/hotspot/os/linux/os_linux.inline.hpp
index 4b5592d2f62..19438e50ad2 100644
--- a/src/hotspot/os/linux/os_linux.inline.hpp
+++ b/src/hotspot/os/linux/os_linux.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/os/linux/procMapsParser.hpp b/src/hotspot/os/linux/procMapsParser.hpp
index 037af91358f..b040f56e628 100644
--- a/src/hotspot/os/linux/procMapsParser.hpp
+++ b/src/hotspot/os/linux/procMapsParser.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2024, Red Hat, Inc. and/or its affiliates.
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/os/posix/include/jvm_md.h b/src/hotspot/os/posix/include/jvm_md.h
index 469738d01eb..eb8e1f0d7e9 100644
--- a/src/hotspot/os/posix/include/jvm_md.h
+++ b/src/hotspot/os/posix/include/jvm_md.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
index ef52b946cc6..07e1920c62d 100644
--- a/src/hotspot/os/posix/os_posix.cpp
+++ b/src/hotspot/os/posix/os_posix.cpp
@@ -1352,6 +1352,10 @@ bool os::Posix::is_root(uid_t uid){
     return ROOT_UID == uid;
 }
 
+bool os::Posix::is_current_user_root(){
+    return is_root(geteuid());
+}
+
 bool os::Posix::matches_effective_uid_or_root(uid_t uid) {
     return is_root(uid) || geteuid() == uid;
 }
diff --git a/src/hotspot/os/posix/os_posix.hpp b/src/hotspot/os/posix/os_posix.hpp
index 4b8b75ea07e..424d737cf42 100644
--- a/src/hotspot/os/posix/os_posix.hpp
+++ b/src/hotspot/os/posix/os_posix.hpp
@@ -76,6 +76,9 @@ public:
   // Returns true if given uid is root.
   static bool is_root(uid_t uid);
 
+  // Returns true if the current user is root.
+  static bool is_current_user_root();
+
   // Returns true if given uid is effective or root uid.
   static bool matches_effective_uid_or_root(uid_t uid);
 
diff --git a/src/hotspot/os/posix/perfMemory_posix.cpp b/src/hotspot/os/posix/perfMemory_posix.cpp
index 2cc0263d291..39bfc72a486 100644
--- a/src/hotspot/os/posix/perfMemory_posix.cpp
+++ b/src/hotspot/os/posix/perfMemory_posix.cpp
@@ -40,6 +40,9 @@
 #if defined(LINUX)
 #include "os_linux.hpp"
 #endif
+#if defined(BSD)
+#include "os_bsd.hpp"
+#endif
 
 # include <errno.h>
 # include <pwd.h>
@@ -142,6 +145,18 @@ static char* get_user_tmp_dir(const char* user, int vmid, int nspid) {
     jio_snprintf(buffer, TMP_BUFFER_LEN, "/proc/%d/root%s", vmid, tmpdir);
     tmpdir = buffer;
   }
+#endif
+#ifdef __APPLE__
+  char buffer[PATH_MAX] = {0};
+  // Check if the current user is root and the target VM is running as non-root.
+  // Otherwise the output of os::get_temp_directory() is used.
+  //
+  if (os::Posix::is_current_user_root() && !os::Bsd::is_process_root(vmid)) {
+    int path_size = os::Bsd::get_user_tmp_dir_macos(user, vmid, buffer, sizeof buffer);
+    if (path_size > 0 && (size_t)path_size < sizeof buffer) {
+      tmpdir = buffer;
+    }
+  }
 #endif
   const char* perfdir = PERFDATA_NAME;
   size_t nbytes = strlen(tmpdir) + strlen(perfdir) + strlen(user) + 3;
@@ -1138,7 +1153,8 @@ static void mmap_attach_shared(int vmid, char** addr, size_t* sizep, TRAPS) {
 
   // for linux, determine if vmid is for a containerized process
   int nspid = LINUX_ONLY(os::Linux::get_namespace_pid(vmid)) NOT_LINUX(-1);
-  const char* luser = get_user_name(vmid, &nspid, CHECK);
+  const char* luser = NOT_MACOS(get_user_name(vmid, &nspid, CHECK))
+                      MACOS_ONLY(get_user_name(os::Bsd::get_process_uid(vmid)));
 
   if (luser == nullptr) {
     THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
diff --git a/src/hotspot/os/posix/signals_posix.cpp b/src/hotspot/os/posix/signals_posix.cpp
index a989b40d49d..85babea5603 100644
--- a/src/hotspot/os/posix/signals_posix.cpp
+++ b/src/hotspot/os/posix/signals_posix.cpp
@@ -1669,21 +1669,21 @@ static void SR_handler(int sig, siginfo_t* siginfo, void* context) {
 
   // On some systems we have seen signal delivery get "stuck" until the signal
   // mask is changed as part of thread termination. Check that the current thread
-  // has not already terminated - else the following assertion
-  // will fail because the thread is no longer a JavaThread as the ~JavaThread
-  // destructor has completed.
-
+  // has not already terminated, else the osthread may already have been freed.
   if (thread->has_terminated()) {
     return;
   }
 
-  assert(thread->is_VM_thread() || thread->is_Java_thread(), "Must be VMThread or JavaThread");
-
   OSThread* osthread = thread->osthread();
 
   SuspendResume::State current = osthread->sr.state();
 
   if (current == SuspendResume::SR_SUSPEND_REQUEST) {
+    // Only check this on an active suspend request. It is possible to get a late delivered
+    // signal from a cancelled suspend request that hits after the JavaThread destructor
+    // completes, but before the Thread destructor causes `is_terminated()` to be true.
+    assert(thread->is_VM_thread() || thread->is_Java_thread(), "Must be VMThread or JavaThread");
+
     suspend_save_context(osthread, siginfo, context);
 
     // attempt to switch the state, we assume we had a SUSPEND_REQUEST
diff --git a/src/hotspot/os/posix/signals_posix.hpp b/src/hotspot/os/posix/signals_posix.hpp
index c1cb70df153..d0e32048ffa 100644
--- a/src/hotspot/os/posix/signals_posix.hpp
+++ b/src/hotspot/os/posix/signals_posix.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/os/posix/threadLocalStorage_posix.cpp b/src/hotspot/os/posix/threadLocalStorage_posix.cpp
index 8d1dad54a01..fe85a368df1 100644
--- a/src/hotspot/os/posix/threadLocalStorage_posix.cpp
+++ b/src/hotspot/os/posix/threadLocalStorage_posix.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/os/windows/gc/z/zSyscall_windows.hpp b/src/hotspot/os/windows/gc/z/zSyscall_windows.hpp
index 3d20fa5a924..ef093e1c370 100644
--- a/src/hotspot/os/windows/gc/z/zSyscall_windows.hpp
+++ b/src/hotspot/os/windows/gc/z/zSyscall_windows.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/os/windows/os_windows.hpp b/src/hotspot/os/windows/os_windows.hpp
index f1153bbbfd3..d4a7d51c59b 100644
--- a/src/hotspot/os/windows/os_windows.hpp
+++ b/src/hotspot/os/windows/os_windows.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/os/windows/safefetch_windows.hpp b/src/hotspot/os/windows/safefetch_windows.hpp
index c745b832abe..93e36d66d07 100644
--- a/src/hotspot/os/windows/safefetch_windows.hpp
+++ b/src/hotspot/os/windows/safefetch_windows.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022 SAP SE. All rights reserved.
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/os_cpu/bsd_aarch64/icache_bsd_aarch64.hpp b/src/hotspot/os_cpu/bsd_aarch64/icache_bsd_aarch64.hpp
index 8b942730ae2..bacf907389f 100644
--- a/src/hotspot/os_cpu/bsd_aarch64/icache_bsd_aarch64.hpp
+++ b/src/hotspot/os_cpu/bsd_aarch64/icache_bsd_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.S b/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.S
index 9ae19fa0cd9..ee70db01131 100644
--- a/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.S
+++ b/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.S
@@ -1,5 +1,5 @@
 // Copyright (c) 2021, Red Hat Inc. All rights reserved.
-// Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.S b/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.S
index 8abf9f49057..e4796483eb1 100644
--- a/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.S
+++ b/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.S
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016, Linaro Ltd. All rights reserved.
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/os_cpu/linux_aarch64/icache_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/icache_linux_aarch64.hpp
index 957be266702..8fbaa7a6b6e 100644
--- a/src/hotspot/os_cpu/linux_aarch64/icache_linux_aarch64.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/icache_linux_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/os_cpu/linux_aarch64/safefetch_linux_aarch64.S b/src/hotspot/os_cpu/linux_aarch64/safefetch_linux_aarch64.S
index ffffb7550bf..3a63ff7ad71 100644
--- a/src/hotspot/os_cpu/linux_aarch64/safefetch_linux_aarch64.S
+++ b/src/hotspot/os_cpu/linux_aarch64/safefetch_linux_aarch64.S
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022 SAP SE. All rights reserved.
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/os_cpu/linux_aarch64/threadLS_linux_aarch64.S b/src/hotspot/os_cpu/linux_aarch64/threadLS_linux_aarch64.S
index 451c13773be..33be490190c 100644
--- a/src/hotspot/os_cpu/linux_aarch64/threadLS_linux_aarch64.S
+++ b/src/hotspot/os_cpu/linux_aarch64/threadLS_linux_aarch64.S
@@ -1,5 +1,5 @@
 // Copyright (c) 2015, 2022, Red Hat Inc. All rights reserved.
-// Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/os_cpu/linux_ppc/gc/z/zSyscall_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/gc/z/zSyscall_linux_ppc.hpp
index 1b2b5dad7d7..97834f66a57 100644
--- a/src/hotspot/os_cpu/linux_ppc/gc/z/zSyscall_linux_ppc.hpp
+++ b/src/hotspot/os_cpu/linux_ppc/gc/z/zSyscall_linux_ppc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/os_cpu/linux_riscv/orderAccess_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/orderAccess_linux_riscv.hpp
index 828a603577d..26530cca5ba 100644
--- a/src/hotspot/os_cpu/linux_riscv/orderAccess_linux_riscv.hpp
+++ b/src/hotspot/os_cpu/linux_riscv/orderAccess_linux_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/os_cpu/linux_riscv/riscv_hwprobe.cpp b/src/hotspot/os_cpu/linux_riscv/riscv_hwprobe.cpp
index ec756c44fe6..253f460dca3 100644
--- a/src/hotspot/os_cpu/linux_riscv/riscv_hwprobe.cpp
+++ b/src/hotspot/os_cpu/linux_riscv/riscv_hwprobe.cpp
@@ -256,6 +256,9 @@ void RiscvHwprobe::add_features_from_query_result() {
       is_set(RISCV_HWPROBE_KEY_IMA_EXT_0, RISCV_HWPROBE_EXT_ZVKT)) {
     VM_Version::ext_Zvkn.enable_feature();
   }
+  if (is_set(RISCV_HWPROBE_KEY_IMA_EXT_0, RISCV_HWPROBE_EXT_ZVKG)) {
+    VM_Version::ext_Zvkg.enable_feature();
+  }
 #endif
 
   // ====== non-extensions ======
diff --git a/src/hotspot/os_cpu/windows_aarch64/icache_windows_aarch64.hpp b/src/hotspot/os_cpu/windows_aarch64/icache_windows_aarch64.hpp
index e12caebf0e2..b12aa545079 100644
--- a/src/hotspot/os_cpu/windows_aarch64/icache_windows_aarch64.hpp
+++ b/src/hotspot/os_cpu/windows_aarch64/icache_windows_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/share/adlc/adlc.hpp b/src/hotspot/share/adlc/adlc.hpp
index dd35ebf9e1a..fbc941f4c1b 100644
--- a/src/hotspot/share/adlc/adlc.hpp
+++ b/src/hotspot/share/adlc/adlc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/adlc/adlparse.hpp b/src/hotspot/share/adlc/adlparse.hpp
index bf30527c1f7..02baec53262 100644
--- a/src/hotspot/share/adlc/adlparse.hpp
+++ b/src/hotspot/share/adlc/adlparse.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/asm/assembler.hpp b/src/hotspot/share/asm/assembler.hpp
index 961b5fab700..bfe785fb94e 100644
--- a/src/hotspot/share/asm/assembler.hpp
+++ b/src/hotspot/share/asm/assembler.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/c1/c1_Canonicalizer.hpp b/src/hotspot/share/c1/c1_Canonicalizer.hpp
index f1c99d4996c..dc0b8c8dba7 100644
--- a/src/hotspot/share/c1/c1_Canonicalizer.hpp
+++ b/src/hotspot/share/c1/c1_Canonicalizer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/c1/c1_Defs.hpp b/src/hotspot/share/c1/c1_Defs.hpp
index 5803e1ce686..bae44d620ae 100644
--- a/src/hotspot/share/c1/c1_Defs.hpp
+++ b/src/hotspot/share/c1/c1_Defs.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/c1/c1_GraphBuilder.hpp b/src/hotspot/share/c1/c1_GraphBuilder.hpp
index 6eaeda5adcf..81983829ccb 100644
--- a/src/hotspot/share/c1/c1_GraphBuilder.hpp
+++ b/src/hotspot/share/c1/c1_GraphBuilder.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/c1/c1_Instruction.hpp b/src/hotspot/share/c1/c1_Instruction.hpp
index 6b5838f6062..7f6fb0f5191 100644
--- a/src/hotspot/share/c1/c1_Instruction.hpp
+++ b/src/hotspot/share/c1/c1_Instruction.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/c1/c1_InstructionPrinter.hpp b/src/hotspot/share/c1/c1_InstructionPrinter.hpp
index b7bac561327..6edf270ec6e 100644
--- a/src/hotspot/share/c1/c1_InstructionPrinter.hpp
+++ b/src/hotspot/share/c1/c1_InstructionPrinter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/c1/c1_LinearScan.hpp b/src/hotspot/share/c1/c1_LinearScan.hpp
index 2088352d336..3873c371a47 100644
--- a/src/hotspot/share/c1/c1_LinearScan.hpp
+++ b/src/hotspot/share/c1/c1_LinearScan.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -884,7 +884,6 @@ class LinearScanStatistic : public StackObj {
     counter_throw,
     counter_unwind,
     counter_typecheck,
-    counter_fpu_stack,
     counter_misc_inst,
     counter_other_inst,
     blank_line_2,
diff --git a/src/hotspot/share/c1/c1_Optimizer.hpp b/src/hotspot/share/c1/c1_Optimizer.hpp
index c26b7534bca..8ffe94dcf7d 100644
--- a/src/hotspot/share/c1/c1_Optimizer.hpp
+++ b/src/hotspot/share/c1/c1_Optimizer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/c1/c1_RangeCheckElimination.hpp b/src/hotspot/share/c1/c1_RangeCheckElimination.hpp
index 833f5dd1e99..f36a2065109 100644
--- a/src/hotspot/share/c1/c1_RangeCheckElimination.hpp
+++ b/src/hotspot/share/c1/c1_RangeCheckElimination.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/cds/aotArtifactFinder.cpp b/src/hotspot/share/cds/aotArtifactFinder.cpp
index 5f346e832a8..f85f1e46520 100644
--- a/src/hotspot/share/cds/aotArtifactFinder.cpp
+++ b/src/hotspot/share/cds/aotArtifactFinder.cpp
@@ -145,7 +145,7 @@ void AOTArtifactFinder::find_artifacts() {
 
 #if INCLUDE_CDS_JAVA_HEAP
   // Keep scanning until we discover no more class that need to be AOT-initialized.
-  if (CDSConfig::is_initing_classes_at_dump_time()) {
+  if (CDSConfig::is_dumping_aot_linked_classes()) {
     while (_pending_aot_inited_classes->length() > 0) {
       InstanceKlass* ik = _pending_aot_inited_classes->pop();
       HeapShared::copy_and_rescan_aot_inited_mirror(ik);
@@ -188,7 +188,7 @@ void AOTArtifactFinder::end_scanning_for_oops() {
 }
 
 void AOTArtifactFinder::add_aot_inited_class(InstanceKlass* ik) {
-  if (CDSConfig::is_initing_classes_at_dump_time()) {
+  if (CDSConfig::is_dumping_aot_linked_classes()) {
     if (RegeneratedClasses::is_regenerated_object(ik)) {
       precond(RegeneratedClasses::get_original_object(ik)->is_initialized());
     } else {
@@ -258,7 +258,7 @@ void AOTArtifactFinder::add_cached_instance_class(InstanceKlass* ik) {
       return;
     }
     scan_oops_in_instance_class(ik);
-    if (ik->is_hidden() && CDSConfig::is_initing_classes_at_dump_time()) {
+    if (ik->is_hidden() && CDSConfig::is_dumping_aot_linked_classes()) {
       bool succeed = AOTClassLinker::try_add_candidate(ik);
       guarantee(succeed, "All cached hidden classes must be aot-linkable");
       add_aot_inited_class(ik);
diff --git a/src/hotspot/share/cds/aotClassInitializer.cpp b/src/hotspot/share/cds/aotClassInitializer.cpp
index 00db747622f..06fc3af6f30 100644
--- a/src/hotspot/share/cds/aotClassInitializer.cpp
+++ b/src/hotspot/share/cds/aotClassInitializer.cpp
@@ -40,7 +40,7 @@ DEBUG_ONLY(InstanceKlass* _aot_init_class = nullptr;)
 
 bool AOTClassInitializer::can_archive_initialized_mirror(InstanceKlass* ik) {
   assert(!ArchiveBuilder::is_active() || !ArchiveBuilder::current()->is_in_buffer_space(ik), "must be source klass");
-  if (!CDSConfig::is_initing_classes_at_dump_time()) {
+  if (!CDSConfig::is_dumping_aot_linked_classes()) {
     return false;
   }
 
@@ -64,7 +64,7 @@ bool AOTClassInitializer::can_archive_initialized_mirror(InstanceKlass* ik) {
   // Automatic selection for aot-inited classes
   // ==========================================
   //
-  // When CDSConfig::is_initing_classes_at_dump_time is enabled,
+  // When CDSConfig::is_dumping_aot_linked_classes is enabled,
   // AOTArtifactFinder::find_artifacts() finds the classes of all
   // heap objects that are reachable from HeapShared::_run_time_special_subgraph,
   // and mark these classes as aot-inited. This preserves the initialized
@@ -310,7 +310,7 @@ void AOTClassInitializer::init_test_class(TRAPS) {
   //
   // -XX:AOTInitTestClass is NOT a general mechanism for including user-defined objects into
   // the AOT cache. Therefore, this option is NOT available in product JVM.
-  if (AOTInitTestClass != nullptr && CDSConfig::is_initing_classes_at_dump_time()) {
+  if (AOTInitTestClass != nullptr && CDSConfig::is_dumping_aot_linked_classes()) {
     log_info(aot)("Debug build only: force initialization of AOTInitTestClass %s", AOTInitTestClass);
     TempNewSymbol class_name = SymbolTable::new_symbol(AOTInitTestClass);
     Handle app_loader(THREAD, SystemDictionary::java_system_loader());
diff --git a/src/hotspot/share/cds/aotClassLinker.hpp b/src/hotspot/share/cds/aotClassLinker.hpp
index 7bbc9ce8138..66270bdb9cf 100644
--- a/src/hotspot/share/cds/aotClassLinker.hpp
+++ b/src/hotspot/share/cds/aotClassLinker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/cds/aotMappedHeapLoader.inline.hpp b/src/hotspot/share/cds/aotMappedHeapLoader.inline.hpp
index 0e50fefdf0f..2d7527949d3 100644
--- a/src/hotspot/share/cds/aotMappedHeapLoader.inline.hpp
+++ b/src/hotspot/share/cds/aotMappedHeapLoader.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/cds/aotMappedHeapWriter.cpp b/src/hotspot/share/cds/aotMappedHeapWriter.cpp
index edd0aede246..9c67b2e0e8d 100644
--- a/src/hotspot/share/cds/aotMappedHeapWriter.cpp
+++ b/src/hotspot/share/cds/aotMappedHeapWriter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -124,7 +124,7 @@ CompressedOops::Mode AOTMappedHeapWriter::narrow_oop_mode() {
 
 address AOTMappedHeapWriter::narrow_oop_base() {
   if (is_writing_deterministic_heap()) {
-    return (address)0;
+    return nullptr;
   } else {
     return CompressedOops::base();
   }
diff --git a/src/hotspot/share/cds/aotMetaspace.cpp b/src/hotspot/share/cds/aotMetaspace.cpp
index f56050d4d31..3824a2be3e2 100644
--- a/src/hotspot/share/cds/aotMetaspace.cpp
+++ b/src/hotspot/share/cds/aotMetaspace.cpp
@@ -96,6 +96,7 @@
 #include "runtime/vmOperations.hpp"
 #include "runtime/vmThread.hpp"
 #include "sanitizers/leak.hpp"
+#include "services/management.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/defaultStream.hpp"
@@ -1140,7 +1141,7 @@ void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS
     AOTReferenceObjSupport::initialize(CHECK);
     AOTReferenceObjSupport::stabilize_cached_reference_objects(CHECK);
 
-    if (CDSConfig::is_initing_classes_at_dump_time()) {
+    if (CDSConfig::is_dumping_aot_linked_classes()) {
       // java.lang.Class::reflectionFactory cannot be archived yet. We set this field
       // to null, and it will be initialized again at runtime.
       log_debug(aot)("Resetting Class::reflectionFactory");
@@ -2204,7 +2205,7 @@ void AOTMetaspace::initialize_shared_spaces() {
     CountSharedSymbols cl;
     SymbolTable::shared_symbols_do(&cl);
     tty->print_cr("Number of shared symbols: %zu", cl.total());
-    if (HeapShared::is_loading_mapping_mode()) {
+    if (HeapShared::is_loading() && HeapShared::is_loading_mapping_mode()) {
       tty->print_cr("Number of shared strings: %zu", StringTable::shared_entry_count());
     }
     tty->print_cr("VM version: %s\r\n", static_mapinfo->vm_version());
diff --git a/src/hotspot/share/cds/aotStreamedHeapLoader.hpp b/src/hotspot/share/cds/aotStreamedHeapLoader.hpp
index d436af35dd0..065129a8a7b 100644
--- a/src/hotspot/share/cds/aotStreamedHeapLoader.hpp
+++ b/src/hotspot/share/cds/aotStreamedHeapLoader.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/cds/aotThread.cpp b/src/hotspot/share/cds/aotThread.cpp
index 113a751d2a1..f3382a6f7e4 100644
--- a/src/hotspot/share/cds/aotThread.cpp
+++ b/src/hotspot/share/cds/aotThread.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index 86533e212d8..5f6b568dd6e 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -1026,23 +1026,19 @@ void CDSConfig::set_has_aot_linked_classes(bool has_aot_linked_classes) {
   _has_aot_linked_classes |= has_aot_linked_classes;
 }
 
-bool CDSConfig::is_initing_classes_at_dump_time() {
-  return is_dumping_heap() && is_dumping_aot_linked_classes();
-}
-
 bool CDSConfig::is_dumping_invokedynamic() {
   // Requires is_dumping_aot_linked_classes(). Otherwise the classes of some archived heap
   // objects used by the archive indy callsites may be replaced at runtime.
   return AOTInvokeDynamicLinking && is_dumping_aot_linked_classes() && is_dumping_heap();
 }
 
-// When we are dumping aot-linked classes and we are able to write archived heap objects, we automatically
-// enable the archiving of MethodHandles. This will in turn enable the archiving of MethodTypes and hidden
+// When we are dumping aot-linked classes, we automatically enable the archiving of MethodHandles.
+// This will in turn enable the archiving of MethodTypes and hidden
 // classes that are used in the implementation of MethodHandles.
 // Archived MethodHandles are required for higher-level optimizations such as AOT resolution of invokedynamic
 // and dynamic proxies.
 bool CDSConfig::is_dumping_method_handles() {
-  return is_initing_classes_at_dump_time();
+  return is_dumping_aot_linked_classes();
 }
 
 #endif // INCLUDE_CDS_JAVA_HEAP
diff --git a/src/hotspot/share/cds/cdsConfig.hpp b/src/hotspot/share/cds/cdsConfig.hpp
index d199e97eefd..202904e8231 100644
--- a/src/hotspot/share/cds/cdsConfig.hpp
+++ b/src/hotspot/share/cds/cdsConfig.hpp
@@ -187,7 +187,6 @@ public:
   static void disable_heap_dumping()                         { CDS_ONLY(_disable_heap_dumping = true); }
   static bool is_dumping_heap()                              NOT_CDS_JAVA_HEAP_RETURN_(false);
   static bool is_loading_heap()                              NOT_CDS_JAVA_HEAP_RETURN_(false);
-  static bool is_initing_classes_at_dump_time()              NOT_CDS_JAVA_HEAP_RETURN_(false);
 
   static bool is_dumping_invokedynamic()                     NOT_CDS_JAVA_HEAP_RETURN_(false);
   static bool is_dumping_method_handles()                    NOT_CDS_JAVA_HEAP_RETURN_(false);
diff --git a/src/hotspot/share/cds/cdsEnumKlass.cpp b/src/hotspot/share/cds/cdsEnumKlass.cpp
index 1bf6ba4eba8..177d1d6e3ad 100644
--- a/src/hotspot/share/cds/cdsEnumKlass.cpp
+++ b/src/hotspot/share/cds/cdsEnumKlass.cpp
@@ -40,7 +40,7 @@ bool CDSEnumKlass::is_enum_obj(oop orig_obj) {
 }
 
 // !!! This is legacy support for enum classes before JEP 483. This file is not used when
-// !!! CDSConfig::is_initing_classes_at_dump_time()==true.
+// !!! CDSConfig::is_dumping_aot_linked_classes()==true.
 //
 // Java Enum classes have synthetic <clinit> methods that look like this
 //     enum MyEnum {FOO, BAR}
@@ -63,7 +63,7 @@ bool CDSEnumKlass::is_enum_obj(oop orig_obj) {
 void CDSEnumKlass::handle_enum_obj(int level,
                                    KlassSubGraphInfo* subgraph_info,
                                    oop orig_obj) {
-  assert(!CDSConfig::is_initing_classes_at_dump_time(), "only for legacy support of enums");
+  assert(!CDSConfig::is_dumping_aot_linked_classes(), "only for legacy support of enums");
   assert(level > 1, "must never be called at the first (outermost) level");
   assert(is_enum_obj(orig_obj), "must be");
 
diff --git a/src/hotspot/share/cds/cdsEnumKlass.hpp b/src/hotspot/share/cds/cdsEnumKlass.hpp
index e6019ff705e..a4829368430 100644
--- a/src/hotspot/share/cds/cdsEnumKlass.hpp
+++ b/src/hotspot/share/cds/cdsEnumKlass.hpp
@@ -35,7 +35,7 @@ class JavaFieldStream;
 class KlassSubGraphInfo;
 
 // This is legacy support for enum classes before JEP 483. This code is not needed when
-// CDSConfig::is_initing_classes_at_dump_time()==true.
+// CDSConfig::is_dumping_aot_linked_classes()==true.
 class CDSEnumKlass: AllStatic {
 public:
   static bool is_enum_obj(oop orig_obj);
diff --git a/src/hotspot/share/cds/cdsHeapVerifier.cpp b/src/hotspot/share/cds/cdsHeapVerifier.cpp
index 65063b4b005..3ed0dce1f66 100644
--- a/src/hotspot/share/cds/cdsHeapVerifier.cpp
+++ b/src/hotspot/share/cds/cdsHeapVerifier.cpp
@@ -156,7 +156,7 @@ CDSHeapVerifier::CDSHeapVerifier() : _archived_objs(0), _problems(0)
 
 # undef ADD_EXCL
 
-  if (CDSConfig::is_initing_classes_at_dump_time()) {
+  if (CDSConfig::is_dumping_aot_linked_classes()) {
     add_shared_secret_accessors();
   }
   ClassLoaderDataGraph::classes_do(this);
diff --git a/src/hotspot/share/cds/finalImageRecipes.cpp b/src/hotspot/share/cds/finalImageRecipes.cpp
index bf8a760904c..8ba4514dfed 100644
--- a/src/hotspot/share/cds/finalImageRecipes.cpp
+++ b/src/hotspot/share/cds/finalImageRecipes.cpp
@@ -206,6 +206,8 @@ void FinalImageRecipes::load_all_classes(TRAPS) {
 
         if (ik->has_aot_safe_initializer() && (flags & WAS_INITED) != 0) {
           assert(ik->class_loader() == nullptr, "supported only for boot classes for now");
+          ResourceMark rm(THREAD);
+          log_info(aot, init)("Initializing %s", ik->external_name());
           ik->initialize(CHECK);
         }
       }
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index f2382289c7d..fdc335f3799 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -209,8 +209,14 @@ static bool is_subgraph_root_class_of(ArchivableStaticFieldInfo fields[], Instan
 }
 
 bool HeapShared::is_subgraph_root_class(InstanceKlass* ik) {
-  return is_subgraph_root_class_of(archive_subgraph_entry_fields, ik) ||
-         is_subgraph_root_class_of(fmg_archive_subgraph_entry_fields, ik);
+  assert(CDSConfig::is_dumping_heap(), "dump-time only");
+  if (!CDSConfig::is_dumping_aot_linked_classes()) {
+    // Legacy CDS archive support (to be deprecated)
+    return is_subgraph_root_class_of(archive_subgraph_entry_fields, ik) ||
+           is_subgraph_root_class_of(fmg_archive_subgraph_entry_fields, ik);
+  } else {
+    return false;
+  }
 }
 
 oop HeapShared::CachedOopInfo::orig_referrer() const {
@@ -934,12 +940,16 @@ void HeapShared::scan_java_class(Klass* orig_k) {
 void HeapShared::archive_subgraphs() {
   assert(CDSConfig::is_dumping_heap(), "must be");
 
-  archive_object_subgraphs(archive_subgraph_entry_fields,
-                           false /* is_full_module_graph */);
+  if (!CDSConfig::is_dumping_aot_linked_classes()) {
+    archive_object_subgraphs(archive_subgraph_entry_fields,
+                             false /* is_full_module_graph */);
+    if (CDSConfig::is_dumping_full_module_graph()) {
+      archive_object_subgraphs(fmg_archive_subgraph_entry_fields,
+                               true /* is_full_module_graph */);
+    }
+  }
 
   if (CDSConfig::is_dumping_full_module_graph()) {
-    archive_object_subgraphs(fmg_archive_subgraph_entry_fields,
-                             true /* is_full_module_graph */);
     Modules::verify_archived_modules();
   }
 }
@@ -1295,8 +1305,10 @@ void HeapShared::resolve_classes(JavaThread* current) {
   if (!is_archived_heap_in_use()) {
     return; // nothing to do
   }
-  resolve_classes_for_subgraphs(current, archive_subgraph_entry_fields);
-  resolve_classes_for_subgraphs(current, fmg_archive_subgraph_entry_fields);
+  if (!CDSConfig::is_using_aot_linked_classes()) {
+    resolve_classes_for_subgraphs(current, archive_subgraph_entry_fields);
+    resolve_classes_for_subgraphs(current, fmg_archive_subgraph_entry_fields);
+  }
 }
 
 void HeapShared::resolve_classes_for_subgraphs(JavaThread* current, ArchivableStaticFieldInfo fields[]) {
@@ -1734,13 +1746,13 @@ bool HeapShared::walk_one_object(PendingOopStack* stack, int level, KlassSubGrap
     }
   }
 
-  if (CDSConfig::is_initing_classes_at_dump_time()) {
+  if (CDSConfig::is_dumping_aot_linked_classes()) {
     if (java_lang_Class::is_instance(orig_obj)) {
       orig_obj = scratch_java_mirror(orig_obj);
       assert(orig_obj != nullptr, "must be archived");
     }
   } else if (java_lang_Class::is_instance(orig_obj) && subgraph_info != _dump_time_special_subgraph) {
-    // Without CDSConfig::is_initing_classes_at_dump_time(), we only allow archived objects to
+    // Without CDSConfig::is_dumping_aot_linked_classes(), we only allow archived objects to
     // point to the mirrors of (1) j.l.Object, (2) primitive classes, and (3) box classes. These are initialized
     // very early by HeapShared::init_box_classes().
     if (orig_obj == vmClasses::Object_klass()->java_mirror()
@@ -1808,9 +1820,9 @@ bool HeapShared::walk_one_object(PendingOopStack* stack, int level, KlassSubGrap
     orig_obj->oop_iterate(&pusher);
   }
 
-  if (CDSConfig::is_initing_classes_at_dump_time()) {
-    // The classes of all archived enum instances have been marked as aot-init,
-    // so there's nothing else to be done in the production run.
+  if (CDSConfig::is_dumping_aot_linked_classes()) {
+    // The enum klasses are archived with aot-initialized mirror.
+    // See AOTClassInitializer::can_archive_initialized_mirror().
   } else {
     // This is legacy support for enum classes before JEP 483 -- we cannot rerun
     // the enum's <clinit> in the production run, so special handling is needed.
@@ -1949,7 +1961,7 @@ void HeapShared::verify_reachable_objects_from(oop obj) {
 #endif
 
 void HeapShared::check_special_subgraph_classes() {
-  if (CDSConfig::is_initing_classes_at_dump_time()) {
+  if (CDSConfig::is_dumping_aot_linked_classes()) {
     // We can have aot-initialized classes (such as Enums) that can reference objects
     // of arbitrary types. Currently, we trust the JEP 483 implementation to only
     // aot-initialize classes that are "safe".
@@ -2136,9 +2148,11 @@ void HeapShared::init_subgraph_entry_fields(ArchivableStaticFieldInfo fields[],
 void HeapShared::init_subgraph_entry_fields(TRAPS) {
   assert(CDSConfig::is_dumping_heap(), "must be");
   _dump_time_subgraph_info_table = new (mtClass)DumpTimeKlassSubGraphInfoTable();
-  init_subgraph_entry_fields(archive_subgraph_entry_fields, CHECK);
-  if (CDSConfig::is_dumping_full_module_graph()) {
-    init_subgraph_entry_fields(fmg_archive_subgraph_entry_fields, CHECK);
+  if (!CDSConfig::is_dumping_aot_linked_classes()) {
+    init_subgraph_entry_fields(archive_subgraph_entry_fields, CHECK);
+    if (CDSConfig::is_dumping_full_module_graph()) {
+      init_subgraph_entry_fields(fmg_archive_subgraph_entry_fields, CHECK);
+    }
   }
 }
 
diff --git a/src/hotspot/share/cds/lambdaFormInvokers.inline.hpp b/src/hotspot/share/cds/lambdaFormInvokers.inline.hpp
index 09034debc13..d412873e5a4 100644
--- a/src/hotspot/share/cds/lambdaFormInvokers.inline.hpp
+++ b/src/hotspot/share/cds/lambdaFormInvokers.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/ci/bcEscapeAnalyzer.hpp b/src/hotspot/share/ci/bcEscapeAnalyzer.hpp
index 27fb5cf1323..b75cb6a56f4 100644
--- a/src/hotspot/share/ci/bcEscapeAnalyzer.hpp
+++ b/src/hotspot/share/ci/bcEscapeAnalyzer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/ci/ciEnv.hpp b/src/hotspot/share/ci/ciEnv.hpp
index a22975c7453..b384ff47a89 100644
--- a/src/hotspot/share/ci/ciEnv.hpp
+++ b/src/hotspot/share/ci/ciEnv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/ci/ciInstance.hpp b/src/hotspot/share/ci/ciInstance.hpp
index 1fb09985930..5367d397c97 100644
--- a/src/hotspot/share/ci/ciInstance.hpp
+++ b/src/hotspot/share/ci/ciInstance.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/ci/ciMetadata.hpp b/src/hotspot/share/ci/ciMetadata.hpp
index 2e232c59188..8f24ebcfaf5 100644
--- a/src/hotspot/share/ci/ciMetadata.hpp
+++ b/src/hotspot/share/ci/ciMetadata.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/ci/ciTypeFlow.hpp b/src/hotspot/share/ci/ciTypeFlow.hpp
index adfb85dc17f..add20077128 100644
--- a/src/hotspot/share/ci/ciTypeFlow.hpp
+++ b/src/hotspot/share/ci/ciTypeFlow.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/ci/ciUtilities.inline.hpp b/src/hotspot/share/ci/ciUtilities.inline.hpp
index 91f848368ac..78f4eb84fa9 100644
--- a/src/hotspot/share/ci/ciUtilities.inline.hpp
+++ b/src/hotspot/share/ci/ciUtilities.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/classfile/bytecodeAssembler.hpp b/src/hotspot/share/classfile/bytecodeAssembler.hpp
index c0383a9678c..cb40e92f1c4 100644
--- a/src/hotspot/share/classfile/bytecodeAssembler.hpp
+++ b/src/hotspot/share/classfile/bytecodeAssembler.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.hpp b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
index 803f227dcf3..19552706b17 100644
--- a/src/hotspot/share/classfile/classLoaderDataGraph.hpp
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/classfile/classLoaderStats.hpp b/src/hotspot/share/classfile/classLoaderStats.hpp
index 23da6bff63c..b9b29512ac0 100644
--- a/src/hotspot/share/classfile/classLoaderStats.hpp
+++ b/src/hotspot/share/classfile/classLoaderStats.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/classfile/classPrinter.cpp b/src/hotspot/share/classfile/classPrinter.cpp
index c4b6a024242..3ed0a5e9840 100644
--- a/src/hotspot/share/classfile/classPrinter.cpp
+++ b/src/hotspot/share/classfile/classPrinter.cpp
@@ -28,9 +28,10 @@
 #include "memory/iterator.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.hpp"
-#include "oops/klass.hpp"
+#include "oops/klass.inline.hpp"
 #include "oops/method.hpp"
 #include "oops/symbol.hpp"
+#include "utilities/growableArray.hpp"
 #include "utilities/ostream.hpp"
 
 class ClassPrinter::KlassPrintClosure : public LockedClassesDo {
@@ -42,16 +43,15 @@ class ClassPrinter::KlassPrintClosure : public LockedClassesDo {
   outputStream* _st;
   int _num;
   bool _has_printed_methods;
+  GrowableArray<InstanceKlass*> _klasses;
+
 public:
   KlassPrintClosure(const char* class_name_pattern,
                     const char* method_name_pattern,
                     const char* method_signature_pattern,
                     bool always_print_class_name,
                     int flags, outputStream* st)
-    : _class_name_pattern(class_name_pattern),
-      _method_name_pattern(method_name_pattern),
-      _method_signature_pattern(method_signature_pattern),
-      _always_print_class_name(always_print_class_name),
+    : _always_print_class_name(always_print_class_name),
       _flags(flags), _st(st), _num(0), _has_printed_methods(false)
   {
     if (has_mode(_flags, PRINT_METHOD_HANDLE)) {
@@ -66,70 +66,150 @@ public:
     if (has_mode(_flags, PRINT_BYTECODE)) {
       _flags |= (PRINT_METHOD_NAME);
     }
+
+    if (has_mode(_flags, PRINT_CLASS_DETAILS)) {
+      _always_print_class_name = true;
+    }
+
+    _class_name_pattern = copy_pattern(class_name_pattern);
+    _method_name_pattern = copy_pattern(method_name_pattern);
+    _method_signature_pattern = copy_pattern(method_signature_pattern);
+  }
+
+  static const char* copy_pattern(const char* pattern) {
+    if (pattern == nullptr) {
+      return nullptr;
+    }
+    char* copy = ResourceArea::strdup(pattern);
+    for (char* p = copy; *p; p++) {
+      if (*p == '.') {
+        *p = '/';
+      }
+    }
+    return copy;
   }
 
   virtual void do_klass(Klass* k) {
     if (!k->is_instance_klass()) {
       return;
     }
-    print_instance_klass(InstanceKlass::cast(k));
+    InstanceKlass* ik = InstanceKlass::cast(k);
+    if (ik->is_loaded() && ik->name()->is_star_match(_class_name_pattern)) {
+      _klasses.append(ik);
+    }
   }
 
+  void print() {
+    _klasses.sort(compare_klasses_alphabetically);
+    for (int i = 0; i < _klasses.length(); i++) {
+      print_instance_klass(_klasses.at(i));
+    }
+  }
+
+
   static bool match(const char* pattern, Symbol* sym) {
     return (pattern == nullptr || sym->is_star_match(pattern));
   }
 
+  static int compare_klasses_alphabetically(InstanceKlass** a, InstanceKlass** b) {
+    return compare_symbols_alphabetically((*a)->name(), (*b)->name());
+  }
+
+  static int compare_methods_alphabetically(const void* a, const void* b) {
+    Method* ma = *(Method**)a;
+    Method* mb = *(Method**)b;
+    int n = compare_symbols_alphabetically(ma->name(), mb->name());
+    if (n == 0) {
+      n = compare_symbols_alphabetically(ma->signature(), mb->signature());
+    }
+    return n;
+  }
+
+  static int compare_symbols_alphabetically(Symbol* a, Symbol *b) {
+    if (a == b) {
+      return 0;
+    }
+    if (a != nullptr && b == nullptr) {
+      return 1;
+    }
+    if (a == nullptr && b != nullptr) {
+      return -1;
+    }
+
+    return strcmp(a->as_C_string(), b->as_C_string());
+  }
+
   void print_klass_name(InstanceKlass* ik) {
-    _st->print("[%3d] " INTPTR_FORMAT " class %s ", _num++, p2i(ik), ik->name()->as_C_string());
+    _st->print("[%3d] " INTPTR_FORMAT " class: %s mirror: " INTPTR_FORMAT " ", _num++,
+               p2i(ik), ik->name()->as_C_string(), p2i(ik->java_mirror()));
     ik->class_loader_data()->print_value_on(_st);
     _st->cr();
   }
 
   void print_instance_klass(InstanceKlass* ik) {
-    if (ik->is_loaded() && ik->name()->is_star_match(_class_name_pattern)) {
-      ResourceMark rm;
-      if (_has_printed_methods) {
-        // We have printed some methods in the previous class.
-        // Print a new line to separate the two classes
-        _st->cr();
+    ResourceMark rm;
+    if (_has_printed_methods) {
+      // We have printed some methods in the previous class.
+      // Print a new line to separate the two classes
+      _st->cr();
+    }
+    _has_printed_methods = false;
+    if (_always_print_class_name) {
+      print_klass_name(ik);
+    }
+
+    if (has_mode(_flags, ClassPrinter::PRINT_CLASS_DETAILS)) {
+      _st->print("InstanceKlass: ");
+      ik->print_on(_st);
+      oop mirror = ik->java_mirror();
+      if (mirror != nullptr) {
+        _st->print("\nJava mirror oop for %s: ", ik->name()->as_C_string());
+        mirror->print_on(_st);
       }
-      _has_printed_methods = false;
-      if (_always_print_class_name) {
-        print_klass_name(ik);
+    }
+
+    if (has_mode(_flags, ClassPrinter::PRINT_METHOD_NAME)) {
+      bool print_codes = has_mode(_flags, ClassPrinter::PRINT_BYTECODE);
+      int len = ik->methods()->length();
+      int num_methods_printed = 0;
+
+      Method** sorted_methods = NEW_RESOURCE_ARRAY(Method*, len);
+      for (int index = 0; index < len; index++) {
+        sorted_methods[index] = ik->methods()->at(index);
       }
 
-      if (has_mode(_flags, ClassPrinter::PRINT_METHOD_NAME)) {
-        bool print_codes = has_mode(_flags, ClassPrinter::PRINT_BYTECODE);
-        int len = ik->methods()->length();
-        int num_methods_printed = 0;
+      qsort(sorted_methods, len, sizeof(Method*), compare_methods_alphabetically);
 
-        for (int index = 0; index < len; index++) {
-          Method* m = ik->methods()->at(index);
-          if (match(_method_name_pattern, m->name()) &&
-              match(_method_signature_pattern, m->signature())) {
-            if (print_codes && num_methods_printed++ > 0) {
-              _st->cr();
-            }
-
-            if (_has_printed_methods == false) {
-              if (!_always_print_class_name) {
-                print_klass_name(ik);
-              }
-              _has_printed_methods = true;
-            }
-            print_method(m);
+      for (int index = 0; index < len; index++) {
+        Method* m = sorted_methods[index];
+        if (match(_method_name_pattern, m->name()) &&
+            match(_method_signature_pattern, m->signature())) {
+          if (print_codes && num_methods_printed++ > 0) {
+            _st->cr();
           }
+
+          if (_has_printed_methods == false) {
+            if (!_always_print_class_name) {
+              print_klass_name(ik);
+            }
+            _has_printed_methods = true;
+          }
+          print_method(m);
         }
       }
     }
   }
 
   void print_method(Method* m) {
-    bool print_codes = has_mode(_flags, ClassPrinter::PRINT_BYTECODE);
     _st->print_cr(INTPTR_FORMAT " %smethod %s : %s", p2i(m),
                   m->is_static() ? "static " : "",
                   m->name()->as_C_string(), m->signature()->as_C_string());
-    if (print_codes) {
+
+    if (has_mode(_flags, ClassPrinter::PRINT_METHOD_DETAILS)) {
+      m->print_on(_st);
+    }
+
+    if (has_mode(_flags, ClassPrinter::PRINT_BYTECODE)) {
       m->print_codes_on(_st, _flags);
     }
   }
@@ -142,12 +222,16 @@ void ClassPrinter::print_flags_help(outputStream* os) {
   os->print_cr("   0x%02x  - print the address of bytecodes", PRINT_BYTECODE_ADDR);
   os->print_cr("   0x%02x  - print info for invokedynamic", PRINT_DYNAMIC);
   os->print_cr("   0x%02x  - print info for invokehandle",  PRINT_METHOD_HANDLE);
+  os->print_cr("   0x%02x  - print details of the C++ and Java objects that represent classes",  PRINT_CLASS_DETAILS);
+  os->print_cr("   0x%02x  - print details of the C++ objects that represent methods",  PRINT_METHOD_DETAILS);
   os->cr();
 }
 
 void ClassPrinter::print_classes(const char* class_name_pattern, int flags, outputStream* os) {
+  ResourceMark rm;
   KlassPrintClosure closure(class_name_pattern, nullptr, nullptr, true, flags, os);
   ClassLoaderDataGraph::classes_do(&closure);
+  closure.print();
 }
 
 void ClassPrinter::print_methods(const char* class_name_pattern,
@@ -174,4 +258,5 @@ void ClassPrinter::print_methods(const char* class_name_pattern,
   KlassPrintClosure closure(class_name_pattern, method_name_pattern, method_signature_pattern,
                             false, flags | PRINT_METHOD_NAME, os);
   ClassLoaderDataGraph::classes_do(&closure);
+  closure.print();
 }
diff --git a/src/hotspot/share/classfile/classPrinter.hpp b/src/hotspot/share/classfile/classPrinter.hpp
index 0fff372c302..470e82ddc0e 100644
--- a/src/hotspot/share/classfile/classPrinter.hpp
+++ b/src/hotspot/share/classfile/classPrinter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,8 @@ public:
     PRINT_BYTECODE_ADDR     = 1 << 2,
     PRINT_DYNAMIC           = 1 << 3, // extra information for invokedynamic (and dynamic constant ...)
     PRINT_METHOD_HANDLE     = 1 << 4, // extra information for invokehandle
+    PRINT_CLASS_DETAILS     = 1 << 5, // print details of the C++ and Java objects that represent classes
+    PRINT_METHOD_DETAILS    = 1 << 6, // print details of the C++ objects that represent methods
   };
   static bool has_mode(int flags, Mode mode) {
     return (flags & static_cast<int>(mode)) != 0;
diff --git a/src/hotspot/share/classfile/defaultMethods.hpp b/src/hotspot/share/classfile/defaultMethods.hpp
index c369cdc6cfd..e734008533b 100644
--- a/src/hotspot/share/classfile/defaultMethods.hpp
+++ b/src/hotspot/share/classfile/defaultMethods.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/classfile/javaClassesImpl.hpp b/src/hotspot/share/classfile/javaClassesImpl.hpp
index 5f88f708523..77975598ded 100644
--- a/src/hotspot/share/classfile/javaClassesImpl.hpp
+++ b/src/hotspot/share/classfile/javaClassesImpl.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/classfile/resolutionErrors.cpp b/src/hotspot/share/classfile/resolutionErrors.cpp
index f5a335f17f3..c41d5d2f052 100644
--- a/src/hotspot/share/classfile/resolutionErrors.cpp
+++ b/src/hotspot/share/classfile/resolutionErrors.cpp
@@ -127,10 +127,8 @@ ResolutionErrorEntry::~ResolutionErrorEntry() {
 }
 
 void ResolutionErrorEntry::set_nest_host_error(const char* message) {
-  // If a message is already set, free it.
-  if (nest_host_error() != nullptr) {
-    FREE_C_HEAP_ARRAY(char, _nest_host_error);
-  }
+  assert(_nest_host_error == nullptr, "caller should have checked");
+  assert_lock_strong(SystemDictionary_lock);
   _nest_host_error = message;
 }
 
diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index e03d198eb9f..0b47c749df8 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -54,6 +54,7 @@
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
+#include "oops/constantPool.inline.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/method.inline.hpp"
@@ -1859,7 +1860,7 @@ Symbol* SystemDictionary::find_resolution_error(const constantPoolHandle& pool,
 
 void SystemDictionary::add_nest_host_error(const constantPoolHandle& pool,
                                            int which,
-                                           const char* message) {
+                                           const stringStream& message) {
   {
     MutexLocker ml(Thread::current(), SystemDictionary_lock);
     ResolutionErrorEntry* entry = ResolutionErrorTable::find_entry(pool, which);
@@ -1868,14 +1869,19 @@ void SystemDictionary::add_nest_host_error(const constantPoolHandle& pool,
       // constant pool index. In this case resolution succeeded but there's an error in this nest host
       // that we use the table to record.
       assert(pool->resolved_klass_at(which) != nullptr, "klass should be resolved if there is no entry");
-      ResolutionErrorTable::add_entry(pool, which, message);
+      ResolutionErrorTable::add_entry(pool, which, message.as_string(true /* on C-heap */));
     } else {
       // An existing entry means we had a true resolution failure (LinkageError) with our nest host, but we
       // still want to add the error message for the higher-level access checks to report. We should
       // only reach here under the same error condition, so we can ignore the potential race with setting
-      // the message, and set it again.
-      assert(entry->nest_host_error() == nullptr || strcmp(entry->nest_host_error(), message) == 0, "should be the same message");
-      entry->set_nest_host_error(message);
+      // the message.
+      const char* nhe = entry->nest_host_error();
+      if (nhe == nullptr) {
+        entry->set_nest_host_error(message.as_string(true /* on C-heap */));
+      } else {
+        DEBUG_ONLY(const char* msg = message.base();)
+        assert(strcmp(nhe, msg) == 0, "New message %s, differs from original %s", msg, nhe);
+      }
     }
   }
 }
diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
index 99e13fea61e..e32e0082f8f 100644
--- a/src/hotspot/share/classfile/systemDictionary.hpp
+++ b/src/hotspot/share/classfile/systemDictionary.hpp
@@ -280,7 +280,7 @@ public:
 
   // Record a nest host resolution/validation error
   static void add_nest_host_error(const constantPoolHandle& pool, int which,
-                                  const char* message);
+                                  const stringStream& message);
   static const char* find_nest_host_error(const constantPoolHandle& pool, int which);
 
   static void add_to_initiating_loader(JavaThread* current, InstanceKlass* k,
diff --git a/src/hotspot/share/classfile/vmClassMacros.hpp b/src/hotspot/share/classfile/vmClassMacros.hpp
index 04f0aaaaa44..71d6b9f22b2 100644
--- a/src/hotspot/share/classfile/vmClassMacros.hpp
+++ b/src/hotspot/share/classfile/vmClassMacros.hpp
@@ -190,6 +190,9 @@
   /* GC support */                                                                                              \
   do_klass(FillerObject_klass,                          jdk_internal_vm_FillerObject                          ) \
                                                                                                                 \
+  /* Scoped Values */                                                                                           \
+  do_klass(ScopedValue_Carrier_klass,                   java_lang_ScopedValue_Carrier                         ) \
+                                                                                                                \
   /*end*/
 
 #endif // SHARE_CLASSFILE_VMCLASSMACROS_HPP
diff --git a/src/hotspot/share/classfile/vmClasses.hpp b/src/hotspot/share/classfile/vmClasses.hpp
index caa54590eb2..21f74e7bdd8 100644
--- a/src/hotspot/share/classfile/vmClasses.hpp
+++ b/src/hotspot/share/classfile/vmClasses.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp
index 6f9c2326a45..07fa294e8e1 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.hpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.hpp
@@ -415,18 +415,18 @@ class methodHandle;
                                                                                                                         \
   do_class(java_lang_StringCoding,        "java/lang/StringCoding")                                                     \
   do_intrinsic(_countPositives,     java_lang_StringCoding, countPositives_name, countPositives_signature, F_S)         \
-   do_name(     countPositives_name,                       "countPositives0")                                           \
+   do_name(     countPositives_name,                       "countPositives")                                            \
    do_signature(countPositives_signature,                  "([BII)I")                                                   \
                                                                                                                         \
   do_class(sun_nio_cs_iso8859_1_Encoder,  "sun/nio/cs/ISO_8859_1$Encoder")                                              \
   do_intrinsic(_encodeISOArray,     sun_nio_cs_iso8859_1_Encoder, encodeISOArray_name, encodeISOArray_signature, F_S)   \
-   do_name(     encodeISOArray_name,                             "encodeISOArray0")                                     \
+   do_name(     encodeISOArray_name,                             "implEncodeISOArray")                                  \
    do_signature(encodeISOArray_signature,                        "([CI[BII)I")                                          \
                                                                                                                         \
   do_intrinsic(_encodeByteISOArray,     java_lang_StringCoding, encodeISOArray_name, indexOfI_signature,         F_S)   \
                                                                                                                         \
   do_intrinsic(_encodeAsciiArray,       java_lang_StringCoding, encodeAsciiArray_name, encodeISOArray_signature, F_S)   \
-   do_name(     encodeAsciiArray_name,                           "encodeAsciiArray0")                                   \
+   do_name(     encodeAsciiArray_name,                           "implEncodeAsciiArray")                                \
                                                                                                                         \
   do_class(java_math_BigInteger,                      "java/math/BigInteger")                                           \
   do_intrinsic(_multiplyToLen,      java_math_BigInteger, multiplyToLen_name, multiplyToLen_signature, F_S)             \
diff --git a/src/hotspot/share/code/codeBehaviours.hpp b/src/hotspot/share/code/codeBehaviours.hpp
index 96a38fffc30..0484ac02e90 100644
--- a/src/hotspot/share/code/codeBehaviours.hpp
+++ b/src/hotspot/share/code/codeBehaviours.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
index beca3bcbcf5..95a2fb908de 100644
--- a/src/hotspot/share/code/codeCache.cpp
+++ b/src/hotspot/share/code/codeCache.cpp
@@ -227,11 +227,6 @@ void CodeCache::initialize_heaps() {
 
   if (!non_nmethod.set) {
     non_nmethod.size += compiler_buffer_size;
-    // Further down, just before FLAG_SET_ERGO(), all segment sizes are
-    // aligned down to the next lower multiple of min_size. For large page
-    // sizes, this may result in (non_nmethod.size == 0) which is not acceptable.
-    // Therefore, force non_nmethod.size to at least min_size.
-    non_nmethod.size = MAX2(non_nmethod.size, min_size);
   }
 
   if (!profiled.set && !non_profiled.set) {
@@ -307,11 +302,10 @@ void CodeCache::initialize_heaps() {
 
   // Note: if large page support is enabled, min_size is at least the large
   // page size. This ensures that the code cache is covered by large pages.
-  non_profiled.size += non_nmethod.size & alignment_mask(min_size);
-  non_profiled.size += profiled.size & alignment_mask(min_size);
-  non_nmethod.size = align_down(non_nmethod.size, min_size);
-  profiled.size = align_down(profiled.size, min_size);
-  non_profiled.size = align_down(non_profiled.size, min_size);
+  non_nmethod.size = align_up(non_nmethod.size, min_size);
+  profiled.size = align_up(profiled.size, min_size);
+  non_profiled.size = align_up(non_profiled.size, min_size);
+  cache_size = non_nmethod.size + profiled.size + non_profiled.size;
 
   FLAG_SET_ERGO(NonNMethodCodeHeapSize, non_nmethod.size);
   FLAG_SET_ERGO(ProfiledCodeHeapSize, profiled.size);
diff --git a/src/hotspot/share/code/codeCache.hpp b/src/hotspot/share/code/codeCache.hpp
index dc9e5d7dc20..349cc652bf4 100644
--- a/src/hotspot/share/code/codeCache.hpp
+++ b/src/hotspot/share/code/codeCache.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/code/compiledIC.hpp b/src/hotspot/share/code/compiledIC.hpp
index db8a0860b39..f60ed93aa97 100644
--- a/src/hotspot/share/code/compiledIC.hpp
+++ b/src/hotspot/share/code/compiledIC.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/code/dependencyContext.hpp b/src/hotspot/share/code/dependencyContext.hpp
index b08300ec645..6c3953e77e1 100644
--- a/src/hotspot/share/code/dependencyContext.hpp
+++ b/src/hotspot/share/code/dependencyContext.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/compiler/abstractCompiler.hpp b/src/hotspot/share/compiler/abstractCompiler.hpp
index adc85efbed5..5b97feb1a49 100644
--- a/src/hotspot/share/compiler/abstractCompiler.hpp
+++ b/src/hotspot/share/compiler/abstractCompiler.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/compiler/compileLog.hpp b/src/hotspot/share/compiler/compileLog.hpp
index 10698b3c13b..a92d03862f6 100644
--- a/src/hotspot/share/compiler/compileLog.hpp
+++ b/src/hotspot/share/compiler/compileLog.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/compiler/compilerDefinitions.inline.hpp b/src/hotspot/share/compiler/compilerDefinitions.inline.hpp
index 21bf80549f4..8bf70477cb3 100644
--- a/src/hotspot/share/compiler/compilerDefinitions.inline.hpp
+++ b/src/hotspot/share/compiler/compilerDefinitions.inline.hpp
@@ -29,6 +29,7 @@
 
 #include "compiler/compiler_globals.hpp"
 #include "runtime/arguments.hpp"
+#include "runtime/globals.hpp"
 
 inline bool CompilerConfig::is_interpreter_only() {
   return Arguments::is_interpreter_only() || TieredStopAtLevel == CompLevel_none;
diff --git a/src/hotspot/share/compiler/compilerDirectives.cpp b/src/hotspot/share/compiler/compilerDirectives.cpp
index 5431b03f6a1..1cd8bd1b510 100644
--- a/src/hotspot/share/compiler/compilerDirectives.cpp
+++ b/src/hotspot/share/compiler/compilerDirectives.cpp
@@ -561,6 +561,20 @@ bool DirectiveSet::should_not_inline(ciMethod* inlinee) {
   return false;
 }
 
+bool DirectiveSet::should_delay_inline(ciMethod* inlinee) {
+  inlinee->check_is_loaded();
+  VM_ENTRY_MARK;
+  methodHandle mh(THREAD, inlinee->get_Method());
+
+  if (_inlinematchers != nullptr) {
+    return matches_inline(mh, InlineMatcher::delay_inline);
+  }
+  if (!CompilerDirectivesIgnoreCompileCommandsOption) {
+    return CompilerOracle::should_delay_inline(mh);
+  }
+  return false;
+}
+
 bool DirectiveSet::parse_and_add_inline(char* str, const char*& error_msg) {
   InlineMatcher* m = InlineMatcher::parse_inline_pattern(str, error_msg);
   if (m != nullptr) {
diff --git a/src/hotspot/share/compiler/compilerDirectives.hpp b/src/hotspot/share/compiler/compilerDirectives.hpp
index 27aafe06919..e4826b3056c 100644
--- a/src/hotspot/share/compiler/compilerDirectives.hpp
+++ b/src/hotspot/share/compiler/compilerDirectives.hpp
@@ -142,6 +142,7 @@ public:
   void append_inline(InlineMatcher* m);
   bool should_inline(ciMethod* inlinee);
   bool should_not_inline(ciMethod* inlinee);
+  bool should_delay_inline(ciMethod* inlinee);
   void print_inline(outputStream* st);
   DirectiveSet* compilecommand_compatibility_init(const methodHandle& method);
   bool is_exclusive_copy() { return _directive == nullptr; }
diff --git a/src/hotspot/share/compiler/compilerOracle.cpp b/src/hotspot/share/compiler/compilerOracle.cpp
index 23bb754f432..5bcd01a4d09 100644
--- a/src/hotspot/share/compiler/compilerOracle.cpp
+++ b/src/hotspot/share/compiler/compilerOracle.cpp
@@ -480,6 +480,10 @@ bool CompilerOracle::should_not_inline(const methodHandle& method) {
   return check_predicate(CompileCommandEnum::DontInline, method) || check_predicate(CompileCommandEnum::Exclude, method);
 }
 
+bool CompilerOracle::should_delay_inline(const methodHandle& method) {
+  return (check_predicate(CompileCommandEnum::DelayInline, method));
+}
+
 bool CompilerOracle::should_print(const methodHandle& method) {
   return check_predicate(CompileCommandEnum::Print, method);
 }
diff --git a/src/hotspot/share/compiler/compilerOracle.hpp b/src/hotspot/share/compiler/compilerOracle.hpp
index 09984705792..665f3b2fbfd 100644
--- a/src/hotspot/share/compiler/compilerOracle.hpp
+++ b/src/hotspot/share/compiler/compilerOracle.hpp
@@ -51,6 +51,7 @@ class methodHandle;
   option(Log, "log", Bool) \
   option(Print, "print", Bool) \
   option(Inline,  "inline", Bool) \
+  option(DelayInline,  "delayinline", Bool) \
   option(DontInline,  "dontinline", Bool) \
   option(Blackhole,  "blackhole", Bool) \
   option(CompileOnly, "compileonly", Bool)\
@@ -150,6 +151,9 @@ class CompilerOracle : AllStatic {
   // Tells whether we want to disallow inlining of this method
   static bool should_not_inline(const methodHandle& method);
 
+  // Tells whether we want to delay inlining of this method
+  static bool should_delay_inline(const methodHandle& method);
+
   // Tells whether this method changes Thread.currentThread()
   static bool changes_current_thread(const methodHandle& method);
 
diff --git a/src/hotspot/share/compiler/compiler_globals.hpp b/src/hotspot/share/compiler/compiler_globals.hpp
index 3919c596d74..98590abc15f 100644
--- a/src/hotspot/share/compiler/compiler_globals.hpp
+++ b/src/hotspot/share/compiler/compiler_globals.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/compiler/directivesParser.hpp b/src/hotspot/share/compiler/directivesParser.hpp
index d4763430eb9..b0f6a74161a 100644
--- a/src/hotspot/share/compiler/directivesParser.hpp
+++ b/src/hotspot/share/compiler/directivesParser.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/compiler/disassembler.hpp b/src/hotspot/share/compiler/disassembler.hpp
index 8e2ea3ce50d..db7066c9023 100644
--- a/src/hotspot/share/compiler/disassembler.hpp
+++ b/src/hotspot/share/compiler/disassembler.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/compiler/methodMatcher.hpp b/src/hotspot/share/compiler/methodMatcher.hpp
index ba70747ad26..5f8fc8d4719 100644
--- a/src/hotspot/share/compiler/methodMatcher.hpp
+++ b/src/hotspot/share/compiler/methodMatcher.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -100,6 +100,7 @@ public:
   enum InlineType {
       unknown_inline,
       dont_inline,
+      delay_inline,
       force_inline
     };
 
diff --git a/src/hotspot/share/compiler/oopMap.hpp b/src/hotspot/share/compiler/oopMap.hpp
index f7a8cd8496c..0d9dbc188e8 100644
--- a/src/hotspot/share/compiler/oopMap.hpp
+++ b/src/hotspot/share/compiler/oopMap.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/compiler/oopMap.inline.hpp b/src/hotspot/share/compiler/oopMap.inline.hpp
index e64ae506115..327c2ebaa3f 100644
--- a/src/hotspot/share/compiler/oopMap.inline.hpp
+++ b/src/hotspot/share/compiler/oopMap.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.hpp
index 248aa0a9da0..d21c6b0b43c 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.hpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp
index e1d23867ea3..a1b4f73378d 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1Allocator.hpp b/src/hotspot/share/gc/g1/g1Allocator.hpp
index 9a7e62f5cc6..e340e2b40d1 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.hpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp
index f1e4d29c0e8..b5423b31575 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1AnalyticsSequences.inline.hpp b/src/hotspot/share/gc/g1/g1AnalyticsSequences.inline.hpp
index 9fae49320bc..0c8b4eb43a6 100644
--- a/src/hotspot/share/gc/g1/g1AnalyticsSequences.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1AnalyticsSequences.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1CardSet.inline.hpp b/src/hotspot/share/gc/g1/g1CardSet.inline.hpp
index 4909e922c6b..98e5a72aa8c 100644
--- a/src/hotspot/share/gc/g1/g1CardSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSet.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1CardSetMemory.inline.hpp b/src/hotspot/share/gc/g1/g1CardSetMemory.inline.hpp
index 7bb618e79b4..75af714060c 100644
--- a/src/hotspot/share/gc/g1/g1CardSetMemory.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSetMemory.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1CollectionSet.hpp b/src/hotspot/share/gc/g1/g1CollectionSet.hpp
index e1d6c40f0ce..df0228c4956 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSet.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSet.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1CollectionSet.inline.hpp b/src/hotspot/share/gc/g1/g1CollectionSet.inline.hpp
index 8b2086f2109..b0321588d18 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSet.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp
index 8987ee6b338..7e882de7e5a 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.inline.hpp b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.inline.hpp
index d32c7990d4e..b5080fee51c 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp b/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp
index cb9727b3413..4db8ed23c49 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp
index bc2fd565aab..f6d47acdc01 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1EdenRegions.hpp b/src/hotspot/share/gc/g1/g1EdenRegions.hpp
index a08cda97d4c..7cb4f93519e 100644
--- a/src/hotspot/share/gc/g1/g1EdenRegions.hpp
+++ b/src/hotspot/share/gc/g1/g1EdenRegions.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1EvacStats.hpp b/src/hotspot/share/gc/g1/g1EvacStats.hpp
index 4227cbab936..e6eb80442d6 100644
--- a/src/hotspot/share/gc/g1/g1EvacStats.hpp
+++ b/src/hotspot/share/gc/g1/g1EvacStats.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1FullGCResetMetadataTask.hpp b/src/hotspot/share/gc/g1/g1FullGCResetMetadataTask.hpp
index d2bc8e7d8e0..9e1f69c24bc 100644
--- a/src/hotspot/share/gc/g1/g1FullGCResetMetadataTask.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCResetMetadataTask.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1FullGCScope.hpp b/src/hotspot/share/gc/g1/g1FullGCScope.hpp
index ab5a48f3574..7a0d0a5395e 100644
--- a/src/hotspot/share/gc/g1/g1FullGCScope.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCScope.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp b/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp
index 0c5f14ba3b2..7c715ebc0e6 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1IHOPControl.hpp b/src/hotspot/share/gc/g1/g1IHOPControl.hpp
index b6e80d9b422..24061c026d1 100644
--- a/src/hotspot/share/gc/g1/g1IHOPControl.hpp
+++ b/src/hotspot/share/gc/g1/g1IHOPControl.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp b/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
index 62c502d497c..31a39f2aca2 100644
--- a/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
+++ b/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp
index 15155c1d668..b7f33ccd564 100644
--- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp
+++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1ParallelCleaning.hpp b/src/hotspot/share/gc/g1/g1ParallelCleaning.hpp
index 1a4e4601827..d8725cb110d 100644
--- a/src/hotspot/share/gc/g1/g1ParallelCleaning.hpp
+++ b/src/hotspot/share/gc/g1/g1ParallelCleaning.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp
index 61253c94ddd..3c1a6ed4667 100644
--- a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp
+++ b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp
index e2fc3d4fa04..e209cffdf0d 100644
--- a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp
+++ b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1RegionsOnNodes.hpp b/src/hotspot/share/gc/g1/g1RegionsOnNodes.hpp
index 5b8d6479833..fb1f2381dba 100644
--- a/src/hotspot/share/gc/g1/g1RegionsOnNodes.hpp
+++ b/src/hotspot/share/gc/g1/g1RegionsOnNodes.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1RootProcessor.hpp b/src/hotspot/share/gc/g1/g1RootProcessor.hpp
index 27c92d730cf..95267dc3c46 100644
--- a/src/hotspot/share/gc/g1/g1RootProcessor.hpp
+++ b/src/hotspot/share/gc/g1/g1RootProcessor.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1ServiceThread.hpp b/src/hotspot/share/gc/g1/g1ServiceThread.hpp
index 4ed9c241562..ff58a5f26f2 100644
--- a/src/hotspot/share/gc/g1/g1ServiceThread.hpp
+++ b/src/hotspot/share/gc/g1/g1ServiceThread.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp b/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp
index 65c20dfbf45..4e4966f6797 100644
--- a/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp
+++ b/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1Trace.hpp b/src/hotspot/share/gc/g1/g1Trace.hpp
index 1415828f376..a2e11ed4496 100644
--- a/src/hotspot/share/gc/g1/g1Trace.hpp
+++ b/src/hotspot/share/gc/g1/g1Trace.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1VMOperations.hpp b/src/hotspot/share/gc/g1/g1VMOperations.hpp
index 0cc45163800..5429051496a 100644
--- a/src/hotspot/share/gc/g1/g1VMOperations.hpp
+++ b/src/hotspot/share/gc/g1/g1VMOperations.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp b/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp
index 2b084b387bc..b56e82fac3c 100644
--- a/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp
+++ b/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp
@@ -26,7 +26,7 @@
 #include "gc/g1/g1HeapSizingPolicy.hpp"
 #include "gc/g1/jvmFlagConstraintsG1.hpp"
 #include "gc/shared/bufferNode.hpp"
-#include "gc/shared/ptrQueue.hpp"
+#include "gc/shared/satbMarkQueue.hpp"
 #include "runtime/globals_extension.hpp"
 #include "utilities/globalDefinitions.hpp"
 
diff --git a/src/hotspot/share/gc/g1/vmStructs_g1.hpp b/src/hotspot/share/gc/g1/vmStructs_g1.hpp
index 67c930e1b63..21c86d47a6b 100644
--- a/src/hotspot/share/gc/g1/vmStructs_g1.hpp
+++ b/src/hotspot/share/gc/g1/vmStructs_g1.hpp
@@ -70,8 +70,8 @@
   nonstatic_field(G1HeapRegionSetBase,   _length,       uint)                 \
                                                                               \
   nonstatic_field(SATBMarkQueue,       _active,         bool)                 \
-  nonstatic_field(PtrQueue,            _buf,            void**)               \
-  nonstatic_field(PtrQueue,            _index,          size_t)
+  nonstatic_field(SATBMarkQueue,       _buf,            void**)               \
+  nonstatic_field(SATBMarkQueue,       _index,          size_t)
 
 #define VM_INT_CONSTANTS_G1GC(declare_constant, declare_constant_with_value)  \
   declare_constant(G1HeapRegionType::FreeTag)                                 \
@@ -96,7 +96,6 @@
   declare_toplevel_type(G1HeapRegionManager)                                  \
   declare_toplevel_type(G1HeapRegionSetBase)                                  \
   declare_toplevel_type(G1MonitoringSupport)                                  \
-  declare_toplevel_type(PtrQueue)                                             \
   declare_toplevel_type(G1HeapRegionType)                                     \
   declare_toplevel_type(SATBMarkQueue)                                        \
                                                                               \
diff --git a/src/hotspot/share/gc/parallel/objectStartArray.hpp b/src/hotspot/share/gc/parallel/objectStartArray.hpp
index 3453df4059e..fac7a4ce13a 100644
--- a/src/hotspot/share/gc/parallel/objectStartArray.hpp
+++ b/src/hotspot/share/gc/parallel/objectStartArray.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index cff53e84059..0d8a3166f79 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -132,14 +132,14 @@ jint ParallelScavengeHeap::initialize() {
 
 void ParallelScavengeHeap::initialize_serviceability() {
 
-  _eden_pool = new EdenMutableSpacePool(_young_gen,
-                                        _young_gen->eden_space(),
-                                        "PS Eden Space",
-                                        false /* support_usage_threshold */);
+  _eden_pool = new PSEdenSpacePool(_young_gen,
+                                   _young_gen->eden_space(),
+                                   "PS Eden Space",
+                                   false /* support_usage_threshold */);
 
-  _survivor_pool = new SurvivorMutableSpacePool(_young_gen,
-                                                "PS Survivor Space",
-                                                false /* support_usage_threshold */);
+  _survivor_pool = new PSSurvivorSpacePool(_young_gen,
+                                           "PS Survivor Space",
+                                           false /* support_usage_threshold */);
 
   _old_pool = new PSOldGenerationPool(_old_gen,
                                       "PS Old Gen",
diff --git a/src/hotspot/share/gc/parallel/parallel_globals.hpp b/src/hotspot/share/gc/parallel/parallel_globals.hpp
index 84d884f128c..64e2effdeae 100644
--- a/src/hotspot/share/gc/parallel/parallel_globals.hpp
+++ b/src/hotspot/share/gc/parallel/parallel_globals.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,10 +33,7 @@
                           constraint)                                       \
   product(bool, UseMaximumCompactionOnSystemGC, true,                       \
           "Use maximum compaction in the Parallel Old garbage collector "   \
-          "for a system GC")                                                \
-                                                                            \
-  product(bool, PSChunkLargeArrays, true,                                   \
-          "(Deprecated) Process large arrays in chunks")
+          "for a system GC")
 
 // end of GC_PARALLEL_FLAGS
 
diff --git a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp
index 2b4bd2b6807..596ac231a97 100644
--- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp
+++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.hpp
index 0a404579da8..ee8ab3f7df0 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.hpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
index 663cd83be9c..773b64d56a6 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/parallel/psMemoryPool.cpp b/src/hotspot/share/gc/parallel/psMemoryPool.cpp
index 81c7b17a1ef..40170f62f06 100644
--- a/src/hotspot/share/gc/parallel/psMemoryPool.cpp
+++ b/src/hotspot/share/gc/parallel/psMemoryPool.cpp
@@ -39,16 +39,16 @@ MemoryUsage PSOldGenerationPool::get_memory_usage() {
   return MemoryUsage(initial_size(), used, committed, maxSize);
 }
 
-// The max size of EdenMutableSpacePool =
+// The max size of PSEdenSpacePool =
 //     max size of the PSYoungGen - capacity of two survivor spaces
 //
 // Max size of PS eden space is changing due to ergonomic.
 // PSYoungGen, PSOldGen, Eden, Survivor spaces are all resizable.
 //
-EdenMutableSpacePool::EdenMutableSpacePool(PSYoungGen* young_gen,
-                                           MutableSpace* space,
-                                           const char* name,
-                                           bool support_usage_threshold) :
+PSEdenSpacePool::PSEdenSpacePool(PSYoungGen* young_gen,
+                                 MutableSpace* space,
+                                 const char* name,
+                                 bool support_usage_threshold) :
   CollectedMemoryPool(name, space->capacity_in_bytes(),
                       (young_gen->max_gen_size() -
                        young_gen->from_space()->capacity_in_bytes() -
@@ -58,7 +58,7 @@ EdenMutableSpacePool::EdenMutableSpacePool(PSYoungGen* young_gen,
   _space(space) {
 }
 
-MemoryUsage EdenMutableSpacePool::get_memory_usage() {
+MemoryUsage PSEdenSpacePool::get_memory_usage() {
   size_t maxSize   = (available_for_allocation() ? max_size() : 0);
   size_t used = used_in_bytes();
   size_t committed = _space->capacity_in_bytes();
@@ -66,20 +66,20 @@ MemoryUsage EdenMutableSpacePool::get_memory_usage() {
   return MemoryUsage(initial_size(), used, committed, maxSize);
 }
 
-// The max size of SurvivorMutableSpacePool =
+// The max size of PSSurvivorSpacePool =
 //     current capacity of the from-space
 //
 // PS from and to survivor spaces could have different sizes.
 //
-SurvivorMutableSpacePool::SurvivorMutableSpacePool(PSYoungGen* young_gen,
-                                                   const char* name,
-                                                   bool support_usage_threshold) :
+PSSurvivorSpacePool::PSSurvivorSpacePool(PSYoungGen* young_gen,
+                                         const char* name,
+                                         bool support_usage_threshold) :
   CollectedMemoryPool(name, young_gen->from_space()->capacity_in_bytes(),
                       young_gen->from_space()->capacity_in_bytes(),
                       support_usage_threshold), _young_gen(young_gen) {
 }
 
-MemoryUsage SurvivorMutableSpacePool::get_memory_usage() {
+MemoryUsage PSSurvivorSpacePool::get_memory_usage() {
   size_t maxSize = (available_for_allocation() ? max_size() : 0);
   size_t used    = used_in_bytes();
   size_t committed = committed_in_bytes();
diff --git a/src/hotspot/share/gc/parallel/psMemoryPool.hpp b/src/hotspot/share/gc/parallel/psMemoryPool.hpp
index 0da47e5a8ef..72687049ecc 100644
--- a/src/hotspot/share/gc/parallel/psMemoryPool.hpp
+++ b/src/hotspot/share/gc/parallel/psMemoryPool.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,16 +43,16 @@ public:
   size_t max_size() const { return _old_gen->reserved().byte_size(); }
 };
 
-class EdenMutableSpacePool : public CollectedMemoryPool {
+class PSEdenSpacePool : public CollectedMemoryPool {
 private:
   PSYoungGen*   _young_gen;
   MutableSpace* _space;
 
 public:
-  EdenMutableSpacePool(PSYoungGen* young_gen,
-                       MutableSpace* space,
-                       const char* name,
-                       bool support_usage_threshold);
+  PSEdenSpacePool(PSYoungGen* young_gen,
+                  MutableSpace* space,
+                  const char* name,
+                  bool support_usage_threshold);
 
   MutableSpace* space()                     { return _space; }
   MemoryUsage get_memory_usage();
@@ -65,14 +65,14 @@ public:
   }
 };
 
-class SurvivorMutableSpacePool : public CollectedMemoryPool {
+class PSSurvivorSpacePool : public CollectedMemoryPool {
 private:
   PSYoungGen*   _young_gen;
 
 public:
-  SurvivorMutableSpacePool(PSYoungGen* young_gen,
-                           const char* name,
-                           bool support_usage_threshold);
+  PSSurvivorSpacePool(PSYoungGen* young_gen,
+                      const char* name,
+                      bool support_usage_threshold);
 
   MemoryUsage get_memory_usage();
 
diff --git a/src/hotspot/share/gc/parallel/psOldGen.hpp b/src/hotspot/share/gc/parallel/psOldGen.hpp
index 77ae5510b31..05359b12836 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.hpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/parallel/psPromotionLAB.hpp b/src/hotspot/share/gc/parallel/psPromotionLAB.hpp
index 60bd4ec250a..cf3ef0c90a3 100644
--- a/src/hotspot/share/gc/parallel/psPromotionLAB.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionLAB.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.hpp
index 9808a55335d..44df708eea4 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
index fb58c22cf29..f1fd49c7dfe 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
@@ -299,8 +299,7 @@ inline oop PSPromotionManager::copy_unmarked_to_survivor_space(oop o,
     // _min_array_size_for_chunking, and most of them will be arrays.
     // So, the objArray test would be very infrequent.
     if (new_obj_size > _min_array_size_for_chunking &&
-        klass->is_objArray_klass() &&
-        PSChunkLargeArrays) {
+        klass->is_objArray_klass()) {
       push_objArray(o, new_obj);
     } else {
       // we'll just push its contents
@@ -344,7 +343,6 @@ inline void PSPromotionManager::copy_and_push_safe_barrier(T* p) {
 inline void PSPromotionManager::process_popped_location_depth(ScannerTask task,
                                                               bool stolen) {
   if (task.is_partial_array_state()) {
-    assert(PSChunkLargeArrays, "invariant");
     process_array_chunk(task.to_partial_array_state(), stolen);
   } else {
     if (task.is_narrow_oop_ptr()) {
diff --git a/src/hotspot/share/gc/parallel/psScavenge.hpp b/src/hotspot/share/gc/parallel/psScavenge.hpp
index df97a1c1ede..e7db634c8e1 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.hpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/parallel/psVMOperations.hpp b/src/hotspot/share/gc/parallel/psVMOperations.hpp
index 1a542d59f8e..4c0908dfe14 100644
--- a/src/hotspot/share/gc/parallel/psVMOperations.hpp
+++ b/src/hotspot/share/gc/parallel/psVMOperations.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/parallel/psVirtualspace.hpp b/src/hotspot/share/gc/parallel/psVirtualspace.hpp
index ca94f4d83b6..87ea86809f0 100644
--- a/src/hotspot/share/gc/parallel/psVirtualspace.hpp
+++ b/src/hotspot/share/gc/parallel/psVirtualspace.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/parallel/psYoungGen.hpp b/src/hotspot/share/gc/parallel/psYoungGen.hpp
index 981b4a90874..98337d53184 100644
--- a/src/hotspot/share/gc/parallel/psYoungGen.hpp
+++ b/src/hotspot/share/gc/parallel/psYoungGen.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/parallel/spaceCounters.hpp b/src/hotspot/share/gc/parallel/spaceCounters.hpp
index b33aac386a6..86fc8438b23 100644
--- a/src/hotspot/share/gc/parallel/spaceCounters.hpp
+++ b/src/hotspot/share/gc/parallel/spaceCounters.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp b/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp
index e45bd45400c..f69219a1f40 100644
--- a/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp
+++ b/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/serial/cSpaceCounters.hpp b/src/hotspot/share/gc/serial/cSpaceCounters.hpp
index 14c68e2b397..22a51cbbd20 100644
--- a/src/hotspot/share/gc/serial/cSpaceCounters.hpp
+++ b/src/hotspot/share/gc/serial/cSpaceCounters.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.hpp b/src/hotspot/share/gc/serial/defNewGeneration.hpp
index 40d2116cb58..e0c7b6bba37 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.hpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index 104924c1cad..08d730bf877 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -91,14 +91,16 @@ SerialHeap::SerialHeap() :
     CollectedHeap(),
     _young_gen(nullptr),
     _old_gen(nullptr),
+    _young_gen_saved_top(nullptr),
+    _old_gen_saved_top(nullptr),
     _rem_set(nullptr),
     _gc_policy_counters(new GCPolicyCounters("Copy:MSC", 2, 2)),
     _young_manager(nullptr),
     _old_manager(nullptr),
-    _is_heap_almost_full(false),
     _eden_pool(nullptr),
     _survivor_pool(nullptr),
-    _old_pool(nullptr) {
+    _old_pool(nullptr),
+    _is_heap_almost_full(false) {
   _young_manager = new GCMemoryManager("Copy");
   _old_manager = new GCMemoryManager("MarkSweepCompact");
   GCLocker::initialize();
diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp
index f5286179abf..36916c3f98e 100644
--- a/src/hotspot/share/gc/serial/serialHeap.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.hpp
@@ -76,6 +76,8 @@ class SerialHeap : public CollectedHeap {
 private:
   DefNewGeneration* _young_gen;
   TenuredGeneration* _old_gen;
+
+  // Used during young-gc
   HeapWord* _young_gen_saved_top;
   HeapWord* _old_gen_saved_top;
 
@@ -94,6 +96,10 @@ private:
   GCMemoryManager* _young_manager;
   GCMemoryManager* _old_manager;
 
+  MemoryPool* _eden_pool;
+  MemoryPool* _survivor_pool;
+  MemoryPool* _old_pool;
+
   // Indicate whether heap is almost or approaching full.
   // Usually, there is some memory headroom for application/gc to run properly.
   // However, in extreme cases, e.g. young-gen is non-empty after a full gc, we
@@ -113,6 +119,19 @@ private:
 
   static void verify_not_in_native_if_java_thread() NOT_DEBUG_RETURN;
 
+  // Try to allocate space by expanding the heap.
+  HeapWord* expand_heap_and_allocate(size_t size, bool is_tlab);
+
+  HeapWord* mem_allocate_cas_noexpand(size_t size, bool is_tlab);
+  HeapWord* mem_allocate_work(size_t size, bool is_tlab);
+
+  void initialize_serviceability() override;
+
+  // Set the saved marks of generations, if that makes sense.
+  // In particular, if any generation might iterate over the oops
+  // in other generations, it should call this method.
+  void save_marks();
+
 public:
   // Returns JNI_OK on success
   jint initialize() override;
@@ -211,26 +230,6 @@ public:
   // generations in a fully generational heap.
   CardTableRS* rem_set() { return _rem_set; }
 
- public:
-  // Set the saved marks of generations, if that makes sense.
-  // In particular, if any generation might iterate over the oops
-  // in other generations, it should call this method.
-  void save_marks();
-
-private:
-  // Try to allocate space by expanding the heap.
-  HeapWord* expand_heap_and_allocate(size_t size, bool is_tlab);
-
-  HeapWord* mem_allocate_cas_noexpand(size_t size, bool is_tlab);
-  HeapWord* mem_allocate_work(size_t size, bool is_tlab);
-
-  MemoryPool* _eden_pool;
-  MemoryPool* _survivor_pool;
-  MemoryPool* _old_pool;
-
-  void initialize_serviceability() override;
-
-public:
   static SerialHeap* heap();
 
   SerialHeap();
diff --git a/src/hotspot/share/gc/serial/serialVMOperations.hpp b/src/hotspot/share/gc/serial/serialVMOperations.hpp
index 31f8c21e61a..9d4cac389e0 100644
--- a/src/hotspot/share/gc/serial/serialVMOperations.hpp
+++ b/src/hotspot/share/gc/serial/serialVMOperations.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
index 038038f6808..ff73ab72b2c 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
index 1c82566bdf4..db9733ce207 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp b/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp
index 89d419c28fa..280c406faa7 100644
--- a/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp
+++ b/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/barrierSet.hpp b/src/hotspot/share/gc/shared/barrierSet.hpp
index 2040ec32ea0..65e3b94c7f3 100644
--- a/src/hotspot/share/gc/shared/barrierSet.hpp
+++ b/src/hotspot/share/gc/shared/barrierSet.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -281,9 +281,9 @@ public:
     }
 
     template <typename T>
-    static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
-                                      arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
-                                      size_t length);
+    static OopCopyResult oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                               arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                               size_t length);
 
     // Off-heap oop accesses. These accessors get resolved when
     // IN_HEAP is not set (e.g. when using the NativeAccess API), it is
diff --git a/src/hotspot/share/gc/shared/barrierSet.inline.hpp b/src/hotspot/share/gc/shared/barrierSet.inline.hpp
index 8b314bb5995..eaa673114ab 100644
--- a/src/hotspot/share/gc/shared/barrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shared/barrierSet.inline.hpp
@@ -34,15 +34,16 @@
 
 template <DecoratorSet decorators, typename BarrierSetT>
 template <typename T>
-inline bool BarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
-                                                                                      arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
-                                                                                      size_t length) {
+inline OopCopyResult BarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                                                                               arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                                                                               size_t length) {
   T* src = arrayOopDesc::obj_offset_to_raw(src_obj, src_offset_in_bytes, src_raw);
   T* dst = arrayOopDesc::obj_offset_to_raw(dst_obj, dst_offset_in_bytes, dst_raw);
 
   if (!HasDecorator<decorators, ARRAYCOPY_CHECKCAST>::value) {
     // Covariant, copy without checks
-    return Raw::oop_arraycopy(nullptr, 0, src, nullptr, 0, dst, length);
+    Raw::oop_arraycopy(nullptr, 0, src, nullptr, 0, dst, length);
+    return OopCopyResult::ok;
   }
 
   // Copy each element with checking casts
@@ -50,12 +51,12 @@ inline bool BarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in
   for (const T* const end = src + length; src < end; src++, dst++) {
     const T elem = *src;
     if (!oopDesc::is_instanceof_or_null(CompressedOops::decode(elem), dst_klass)) {
-      return false;
+      return OopCopyResult::failed_check_class_cast;
     }
     *dst = elem;
   }
 
-  return true;
+  return OopCopyResult::ok;
 }
 
 #endif // SHARE_GC_SHARED_BARRIERSET_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/barrierSetConfig.hpp b/src/hotspot/share/gc/shared/barrierSetConfig.hpp
index 5a160f52c5a..412168cbb49 100644
--- a/src/hotspot/share/gc/shared/barrierSetConfig.hpp
+++ b/src/hotspot/share/gc/shared/barrierSetConfig.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
index 32a8719e21f..4bfa9406aab 100644
--- a/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
+++ b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.hpp b/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.hpp
index 10e8311e764..deb775c8a47 100644
--- a/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.hpp
+++ b/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
index dea36098673..faeb007c77d 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -104,9 +104,9 @@ public:
     static oop oop_atomic_xchg_in_heap(T* addr, oop new_value);
 
     template <typename T>
-    static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
-                                      arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
-                                      size_t length);
+    static OopCopyResult oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                               arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                               size_t length);
 
     static void clone_in_heap(oop src, oop dst, size_t size);
 
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp
index 7fc3fee1e7c..ea539a70be5 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp
@@ -99,7 +99,7 @@ oop_atomic_xchg_in_heap(T* addr, oop new_value) {
 
 template <DecoratorSet decorators, typename BarrierSetT>
 template <typename T>
-inline bool CardTableBarrierSet::AccessBarrier<decorators, BarrierSetT>::
+inline OopCopyResult CardTableBarrierSet::AccessBarrier<decorators, BarrierSetT>::
 oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
                       arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
                       size_t length) {
@@ -131,12 +131,13 @@ oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
         // objArrayOop) which we assume is 32 bit.
         assert(pd == (size_t)(int)pd, "length field overflow");
         bs->write_ref_array((HeapWord*)dst_raw, pd);
-        return false;
+        return OopCopyResult::failed_check_class_cast;
       }
     }
     bs->write_ref_array((HeapWord*)dst_raw, length);
   }
-  return true;
+
+  return OopCopyResult::ok;
 }
 
 template <DecoratorSet decorators, typename BarrierSetT>
diff --git a/src/hotspot/share/gc/shared/collectedHeap.inline.hpp b/src/hotspot/share/gc/shared/collectedHeap.inline.hpp
index 3900d1809ee..c9d84f54449 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.inline.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/collectorCounters.hpp b/src/hotspot/share/gc/shared/collectorCounters.hpp
index 273f8fb2a4e..02b07cbf5c6 100644
--- a/src/hotspot/share/gc/shared/collectorCounters.hpp
+++ b/src/hotspot/share/gc/shared/collectorCounters.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/gcArguments.hpp b/src/hotspot/share/gc/shared/gcArguments.hpp
index d8a4901f887..7e9fffedaba 100644
--- a/src/hotspot/share/gc/shared/gcArguments.hpp
+++ b/src/hotspot/share/gc/shared/gcArguments.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2017, Red Hat, Inc. and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/share/gc/shared/gcCause.hpp b/src/hotspot/share/gc/shared/gcCause.hpp
index aac4b801b74..c56833407ab 100644
--- a/src/hotspot/share/gc/shared/gcCause.hpp
+++ b/src/hotspot/share/gc/shared/gcCause.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/gcHeapSummary.hpp b/src/hotspot/share/gc/shared/gcHeapSummary.hpp
index ae08f60d3a6..4d209d01afb 100644
--- a/src/hotspot/share/gc/shared/gcHeapSummary.hpp
+++ b/src/hotspot/share/gc/shared/gcHeapSummary.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/gcLocker.hpp b/src/hotspot/share/gc/shared/gcLocker.hpp
index 33d10f0eecd..c0e28b66539 100644
--- a/src/hotspot/share/gc/shared/gcLocker.hpp
+++ b/src/hotspot/share/gc/shared/gcLocker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/gcLogPrecious.hpp b/src/hotspot/share/gc/shared/gcLogPrecious.hpp
index 8aa70252b3d..127a30f6b34 100644
--- a/src/hotspot/share/gc/shared/gcLogPrecious.hpp
+++ b/src/hotspot/share/gc/shared/gcLogPrecious.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/gcPolicyCounters.hpp b/src/hotspot/share/gc/shared/gcPolicyCounters.hpp
index e2ddb537f6e..b21967cd88b 100644
--- a/src/hotspot/share/gc/shared/gcPolicyCounters.hpp
+++ b/src/hotspot/share/gc/shared/gcPolicyCounters.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/gcThreadLocalData.hpp b/src/hotspot/share/gc/shared/gcThreadLocalData.hpp
index 2632e806bab..2847cd8bf33 100644
--- a/src/hotspot/share/gc/shared/gcThreadLocalData.hpp
+++ b/src/hotspot/share/gc/shared/gcThreadLocalData.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/gcTrace.hpp b/src/hotspot/share/gc/shared/gcTrace.hpp
index 6a47e54090f..def4ea8f3de 100644
--- a/src/hotspot/share/gc/shared/gcTrace.hpp
+++ b/src/hotspot/share/gc/shared/gcTrace.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/gcVMOperations.hpp b/src/hotspot/share/gc/shared/gcVMOperations.hpp
index a9aee2faf5d..5d4594e3d5c 100644
--- a/src/hotspot/share/gc/shared/gcVMOperations.hpp
+++ b/src/hotspot/share/gc/shared/gcVMOperations.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/genArguments.hpp b/src/hotspot/share/gc/shared/genArguments.hpp
index 0ff9568575d..088ee48f291 100644
--- a/src/hotspot/share/gc/shared/genArguments.hpp
+++ b/src/hotspot/share/gc/shared/genArguments.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/hSpaceCounters.hpp b/src/hotspot/share/gc/shared/hSpaceCounters.hpp
index b55b24f7601..b9a6011bd65 100644
--- a/src/hotspot/share/gc/shared/hSpaceCounters.hpp
+++ b/src/hotspot/share/gc/shared/hSpaceCounters.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/oopStorage.hpp b/src/hotspot/share/gc/shared/oopStorage.hpp
index 6097eeaa4f4..914c827f8ac 100644
--- a/src/hotspot/share/gc/shared/oopStorage.hpp
+++ b/src/hotspot/share/gc/shared/oopStorage.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/parallelCleaning.hpp b/src/hotspot/share/gc/shared/parallelCleaning.hpp
index e1b07f5778d..ed76c4c9df9 100644
--- a/src/hotspot/share/gc/shared/parallelCleaning.hpp
+++ b/src/hotspot/share/gc/shared/parallelCleaning.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/partialArraySplitter.hpp b/src/hotspot/share/gc/shared/partialArraySplitter.hpp
index 8608f993f8d..87cc137e797 100644
--- a/src/hotspot/share/gc/shared/partialArraySplitter.hpp
+++ b/src/hotspot/share/gc/shared/partialArraySplitter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/ptrQueue.cpp b/src/hotspot/share/gc/shared/ptrQueue.cpp
deleted file mode 100644
index fd7011700f4..00000000000
--- a/src/hotspot/share/gc/shared/ptrQueue.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "gc/shared/bufferNode.hpp"
-#include "gc/shared/ptrQueue.hpp"
-
-PtrQueue::PtrQueue(PtrQueueSet* qset) :
-  _index(0),
-  _buf(nullptr)
-{}
-
-PtrQueue::~PtrQueue() {
-  assert(_buf == nullptr, "queue must be flushed before delete");
-}
-
-size_t PtrQueue::current_capacity() const {
-  if (_buf == nullptr) {
-    return 0;
-  } else {
-    return BufferNode::make_node_from_buffer(_buf)->capacity();
-  }
-}
-
-PtrQueueSet::PtrQueueSet(BufferNode::Allocator* allocator) :
-  _allocator(allocator)
-{}
-
-PtrQueueSet::~PtrQueueSet() {}
-
-void PtrQueueSet::reset_queue(PtrQueue& queue) {
-  queue.set_index(queue.current_capacity());
-}
-
-void PtrQueueSet::flush_queue(PtrQueue& queue) {
-  void** buffer = queue.buffer();
-  if (buffer != nullptr) {
-    size_t index = queue.index();
-    queue.set_buffer(nullptr);
-    queue.set_index(0);
-    BufferNode* node = BufferNode::make_node_from_buffer(buffer, index);
-    if (index == node->capacity()) {
-      deallocate_buffer(node);
-    } else {
-      enqueue_completed_buffer(node);
-    }
-  }
-}
-
-bool PtrQueueSet::try_enqueue(PtrQueue& queue, void* value) {
-  size_t index = queue.index();
-  if (index == 0) return false;
-  void** buffer = queue.buffer();
-  assert(buffer != nullptr, "no buffer but non-zero index");
-  buffer[--index] = value;
-  queue.set_index(index);
-  return true;
-}
-
-void PtrQueueSet::retry_enqueue(PtrQueue& queue, void* value) {
-  assert(queue.index() != 0, "precondition");
-  assert(queue.buffer() != nullptr, "precondition");
-  size_t index = queue.index();
-  queue.buffer()[--index] = value;
-  queue.set_index(index);
-}
-
-BufferNode* PtrQueueSet::exchange_buffer_with_new(PtrQueue& queue) {
-  BufferNode* node = nullptr;
-  void** buffer = queue.buffer();
-  if (buffer != nullptr) {
-    node = BufferNode::make_node_from_buffer(buffer, queue.index());
-  }
-  install_new_buffer(queue);
-  return node;
-}
-
-void PtrQueueSet::install_new_buffer(PtrQueue& queue) {
-  BufferNode* node = _allocator->allocate();
-  queue.set_buffer(BufferNode::make_buffer_from_node(node));
-  queue.set_index(node->capacity());
-}
-
-void** PtrQueueSet::allocate_buffer() {
-  BufferNode* node = _allocator->allocate();
-  return BufferNode::make_buffer_from_node(node);
-}
-
-void PtrQueueSet::deallocate_buffer(BufferNode* node) {
-  _allocator->release(node);
-}
diff --git a/src/hotspot/share/gc/shared/ptrQueue.hpp b/src/hotspot/share/gc/shared/ptrQueue.hpp
deleted file mode 100644
index 8aa5e16d40b..00000000000
--- a/src/hotspot/share/gc/shared/ptrQueue.hpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_GC_SHARED_PTRQUEUE_HPP
-#define SHARE_GC_SHARED_PTRQUEUE_HPP
-
-#include "gc/shared/bufferNode.hpp"
-#include "utilities/align.hpp"
-#include "utilities/debug.hpp"
-#include "utilities/globalDefinitions.hpp"
-#include "utilities/sizes.hpp"
-
-// There are various techniques that require threads to be able to log
-// addresses.  For example, a generational write barrier might log
-// the addresses of modified old-generation objects.  This type supports
-// this operation.
-
-class PtrQueueSet;
-class PtrQueue {
-  friend class VMStructs;
-
-  NONCOPYABLE(PtrQueue);
-
-  // The (byte) index at which an object was last enqueued.  Starts at
-  // capacity (in bytes) (indicating an empty buffer) and goes towards zero.
-  // Value is always pointer-size aligned.
-  size_t _index;
-
-  static const size_t _element_size = sizeof(void*);
-
-  static size_t byte_index_to_index(size_t ind) {
-    assert(is_aligned(ind, _element_size), "precondition");
-    return ind / _element_size;
-  }
-
-  static size_t index_to_byte_index(size_t ind) {
-    return ind * _element_size;
-  }
-
-protected:
-  // The buffer.
-  void** _buf;
-
-  // Initialize this queue to contain a null buffer, and be part of the
-  // given PtrQueueSet.
-  PtrQueue(PtrQueueSet* qset);
-
-  // Requires queue flushed.
-  ~PtrQueue();
-
-public:
-
-  void** buffer() const { return _buf; }
-  void set_buffer(void** buffer) { _buf = buffer; }
-
-  size_t index() const {
-    return byte_index_to_index(_index);
-  }
-
-  void set_index(size_t new_index) {
-    assert(new_index <= current_capacity(), "precondition");
-    _index = index_to_byte_index(new_index);
-  }
-
-  // Returns the capacity of the buffer, or 0 if the queue doesn't currently
-  // have a buffer.
-  size_t current_capacity() const;
-
-  bool is_empty() const { return index() == current_capacity(); }
-  size_t size() const { return current_capacity() - index(); }
-
-protected:
-  // To support compiler.
-  template<typename Derived>
-  static ByteSize byte_offset_of_index() {
-    return byte_offset_of(Derived, _index);
-  }
-
-  static constexpr ByteSize byte_width_of_index() { return in_ByteSize(sizeof(size_t)); }
-
-  template<typename Derived>
-  static ByteSize byte_offset_of_buf() {
-    return byte_offset_of(Derived, _buf);
-  }
-
-  static ByteSize byte_width_of_buf() { return in_ByteSize(_element_size); }
-};
-
-// A PtrQueueSet represents resources common to a set of pointer queues.
-// In particular, the individual queues allocate buffers from this shared
-// set, and return completed buffers to the set.
-class PtrQueueSet {
-  BufferNode::Allocator* _allocator;
-
-  NONCOPYABLE(PtrQueueSet);
-
-protected:
-  // Create an empty ptr queue set.
-  PtrQueueSet(BufferNode::Allocator* allocator);
-  ~PtrQueueSet();
-
-  // Discard any buffered enqueued data.
-  void reset_queue(PtrQueue& queue);
-
-  // If queue has any buffered enqueued data, transfer it to this qset.
-  // Otherwise, deallocate queue's buffer.
-  void flush_queue(PtrQueue& queue);
-
-  // Add value to queue's buffer, returning true.  If buffer is full
-  // or if queue doesn't have a buffer, does nothing and returns false.
-  bool try_enqueue(PtrQueue& queue, void* value);
-
-  // Add value to queue's buffer.  The queue must have a non-full buffer.
-  // Used after an initial try_enqueue has failed and the situation resolved.
-  void retry_enqueue(PtrQueue& queue, void* value);
-
-  // Installs a new buffer into queue.
-  // Returns the old buffer, or null if queue didn't have a buffer.
-  BufferNode* exchange_buffer_with_new(PtrQueue& queue);
-
-  // Installs a new buffer into queue.
-  void install_new_buffer(PtrQueue& queue);
-
-public:
-
-  // Return the associated BufferNode allocator.
-  BufferNode::Allocator* allocator() const { return _allocator; }
-
-  // Return the buffer for a BufferNode of size buffer_capacity().
-  void** allocate_buffer();
-
-  // Return an empty buffer to the free list.  The node is required
-  // to have been allocated with a size of buffer_capacity().
-  void deallocate_buffer(BufferNode* node);
-
-  // A completed buffer is a buffer the mutator is finished with, and
-  // is ready to be processed by the collector.  It need not be full.
-
-  // Adds node to the completed buffer list.
-  virtual void enqueue_completed_buffer(BufferNode* node) = 0;
-
-  size_t buffer_capacity() const {
-    return _allocator->buffer_capacity();
-  }
-};
-
-#endif // SHARE_GC_SHARED_PTRQUEUE_HPP
diff --git a/src/hotspot/share/gc/shared/referenceProcessor.hpp b/src/hotspot/share/gc/shared/referenceProcessor.hpp
index a29ee7fca86..b211b94a85d 100644
--- a/src/hotspot/share/gc/shared/referenceProcessor.hpp
+++ b/src/hotspot/share/gc/shared/referenceProcessor.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/satbMarkQueue.cpp b/src/hotspot/share/gc/shared/satbMarkQueue.cpp
index 93c52b499a0..63496f2eb25 100644
--- a/src/hotspot/share/gc/shared/satbMarkQueue.cpp
+++ b/src/hotspot/share/gc/shared/satbMarkQueue.cpp
@@ -36,14 +36,19 @@
 #include "utilities/globalCounter.inline.hpp"
 
 SATBMarkQueue::SATBMarkQueue(SATBMarkQueueSet* qset) :
-  PtrQueue(qset),
+  _buf(nullptr),
+  _index(0),
   // SATB queues are only active during marking cycles. We create them
   // with their active field set to false. If a thread is created
   // during a cycle, it's SATB queue needs to be activated before the
   // thread starts running.  This is handled by the collector-specific
   // BarrierSet thread attachment protocol.
   _active(false)
-{ }
+{}
+
+SATBMarkQueue::~SATBMarkQueue() {
+  assert(_buf == nullptr, "queue must be flushed before delete");
+}
 
 #ifndef PRODUCT
 // Helpful for debugging
@@ -64,7 +69,7 @@ void SATBMarkQueue::print(const char* name) {
 #endif // PRODUCT
 
 SATBMarkQueueSet::SATBMarkQueueSet(BufferNode::Allocator* allocator) :
-  PtrQueueSet(allocator),
+  _allocator(allocator),
   _list(),
   _count_and_process_flag(0),
   _process_completed_buffers_threshold(SIZE_MAX),
@@ -214,13 +219,6 @@ bool SATBMarkQueueSet::apply_closure_to_completed_buffer(SATBBufferClosure* cl)
   }
 }
 
-void SATBMarkQueueSet::flush_queue(SATBMarkQueue& queue) {
-  // Filter now to possibly save work later.  If filtering empties the
-  // buffer then flush_queue can deallocate the buffer.
-  filter(queue);
-  PtrQueueSet::flush_queue(queue);
-}
-
 void SATBMarkQueueSet::enqueue_known_active(SATBMarkQueue& queue, oop obj) {
   assert(queue.is_active(), "precondition");
   void* value = cast_from_oop<void*>(obj);
@@ -355,3 +353,76 @@ void SATBMarkQueueSet::abandon_partial_marking() {
   } closure(*this);
   Threads::threads_do(&closure);
 }
+
+size_t SATBMarkQueue::current_capacity() const {
+  if (_buf == nullptr) {
+    return 0;
+  } else {
+    return BufferNode::make_node_from_buffer(_buf)->capacity();
+  }
+}
+
+void SATBMarkQueueSet::reset_queue(SATBMarkQueue& queue) {
+  queue.set_index(queue.current_capacity());
+}
+
+void SATBMarkQueueSet::flush_queue(SATBMarkQueue& queue) {
+  // Filter now to possibly save work later.  If filtering empties the
+  // buffer then flush_queue can deallocate the buffer.
+  filter(queue);
+  void** buffer = queue.buffer();
+  if (buffer != nullptr) {
+    size_t index = queue.index();
+    queue.set_buffer(nullptr);
+    queue.set_index(0);
+    BufferNode* node = BufferNode::make_node_from_buffer(buffer, index);
+    if (index == node->capacity()) {
+      deallocate_buffer(node);
+    } else {
+      enqueue_completed_buffer(node);
+    }
+  }
+}
+
+bool SATBMarkQueueSet::try_enqueue(SATBMarkQueue& queue, void* value) {
+  size_t index = queue.index();
+  if (index == 0) return false;
+  void** buffer = queue.buffer();
+  assert(buffer != nullptr, "no buffer but non-zero index");
+  buffer[--index] = value;
+  queue.set_index(index);
+  return true;
+}
+
+void SATBMarkQueueSet::retry_enqueue(SATBMarkQueue& queue, void* value) {
+  assert(queue.index() != 0, "precondition");
+  assert(queue.buffer() != nullptr, "precondition");
+  size_t index = queue.index();
+  queue.buffer()[--index] = value;
+  queue.set_index(index);
+}
+
+BufferNode* SATBMarkQueueSet::exchange_buffer_with_new(SATBMarkQueue& queue) {
+  BufferNode* node = nullptr;
+  void** buffer = queue.buffer();
+  if (buffer != nullptr) {
+    node = BufferNode::make_node_from_buffer(buffer, queue.index());
+  }
+  install_new_buffer(queue);
+  return node;
+}
+
+void SATBMarkQueueSet::install_new_buffer(SATBMarkQueue& queue) {
+  BufferNode* node = _allocator->allocate();
+  queue.set_buffer(BufferNode::make_buffer_from_node(node));
+  queue.set_index(node->capacity());
+}
+
+void** SATBMarkQueueSet::allocate_buffer() {
+  BufferNode* node = _allocator->allocate();
+  return BufferNode::make_buffer_from_node(node);
+}
+
+void SATBMarkQueueSet::deallocate_buffer(BufferNode* node) {
+  _allocator->release(node);
+}
diff --git a/src/hotspot/share/gc/shared/satbMarkQueue.hpp b/src/hotspot/share/gc/shared/satbMarkQueue.hpp
index d2b14a3cc92..f1577c004de 100644
--- a/src/hotspot/share/gc/shared/satbMarkQueue.hpp
+++ b/src/hotspot/share/gc/shared/satbMarkQueue.hpp
@@ -25,11 +25,15 @@
 #ifndef SHARE_GC_SHARED_SATBMARKQUEUE_HPP
 #define SHARE_GC_SHARED_SATBMARKQUEUE_HPP
 
-#include "gc/shared/ptrQueue.hpp"
+#include "gc/shared/bufferNode.hpp"
 #include "memory/allocation.hpp"
 #include "memory/padded.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/atomic.hpp"
+#include "utilities/align.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/sizes.hpp"
 
 class Thread;
 class Monitor;
@@ -45,12 +49,33 @@ public:
   virtual void do_buffer(void** buffer, size_t size) = 0;
 };
 
-// A PtrQueue whose elements are (possibly stale) pointers to object heads.
-class SATBMarkQueue: public PtrQueue {
+// A queue whose elements are (possibly stale) pointers to object heads.
+class SATBMarkQueue {
   friend class VMStructs;
   friend class SATBMarkQueueSet;
 
 private:
+  NONCOPYABLE(SATBMarkQueue);
+
+  // The buffer.
+  void** _buf;
+
+  // The (byte) index at which an object was last enqueued.  Starts at
+  // capacity (in bytes) (indicating an empty buffer) and goes towards zero.
+  // Value is always pointer-size aligned.
+  size_t _index;
+
+  static const size_t _element_size = sizeof(void*);
+
+  static size_t byte_index_to_index(size_t ind) {
+    assert(is_aligned(ind, _element_size), "precondition");
+    return ind / _element_size;
+  }
+
+  static size_t index_to_byte_index(size_t ind) {
+    return ind * _element_size;
+  }
+
   // Per-queue (so thread-local) cache of the SATBMarkQueueSet's
   // active state, to support inline barriers in compiled code.
   bool _active;
@@ -58,6 +83,29 @@ private:
 public:
   SATBMarkQueue(SATBMarkQueueSet* qset);
 
+  // Queue must be flushed
+  ~SATBMarkQueue();
+
+  void** buffer() const { return _buf; }
+
+  void set_buffer(void** buffer) { _buf = buffer; }
+
+  size_t index() const {
+    return byte_index_to_index(_index);
+  }
+
+  void set_index(size_t new_index) {
+    assert(new_index <= current_capacity(), "precondition");
+    _index = index_to_byte_index(new_index);
+  }
+
+  // Returns the capacity of the buffer, or 0 if the queue doesn't currently
+  // have a buffer.
+  size_t current_capacity() const;
+
+  bool is_empty() const { return index() == current_capacity(); }
+  size_t size() const { return current_capacity() - index(); }
+
   bool is_active() const { return _active; }
   void set_active(bool value) { _active = value; }
 
@@ -68,14 +116,16 @@ public:
 
   // Compiler support.
   static ByteSize byte_offset_of_index() {
-    return PtrQueue::byte_offset_of_index<SATBMarkQueue>();
+    return byte_offset_of(SATBMarkQueue, _index);
   }
-  using PtrQueue::byte_width_of_index;
+
+  static constexpr ByteSize byte_width_of_index() { return in_ByteSize(sizeof(size_t)); }
 
   static ByteSize byte_offset_of_buf() {
-    return PtrQueue::byte_offset_of_buf<SATBMarkQueue>();
+    return byte_offset_of(SATBMarkQueue, _buf);
   }
-  using PtrQueue::byte_width_of_buf;
+
+  static ByteSize byte_width_of_buf() { return in_ByteSize(_element_size); }
 
   static ByteSize byte_offset_of_active() {
     return byte_offset_of(SATBMarkQueue, _active);
@@ -84,7 +134,18 @@ public:
   static ByteSize byte_width_of_active() { return in_ByteSize(sizeof(bool)); }
 };
 
-class SATBMarkQueueSet: public PtrQueueSet {
+
+// A SATBMarkQueueSet represents resources common to a set of SATBMarkQueues.
+// In particular, the individual queues allocate buffers from this shared
+// set, and return completed buffers to the set.
+// A completed buffer is a buffer the mutator is finished with, and
+// is ready to be processed by the collector.  It need not be full.
+
+class SATBMarkQueueSet {
+
+  BufferNode::Allocator* _allocator;
+
+  NONCOPYABLE(SATBMarkQueueSet);
 
   DEFINE_PAD_MINUS_SIZE(1, DEFAULT_PADDING_SIZE, 0);
   PaddedEnd<BufferNode::Stack> _list;
@@ -99,6 +160,24 @@ class SATBMarkQueueSet: public PtrQueueSet {
   BufferNode* get_completed_buffer();
   void abandon_completed_buffers();
 
+  // Discard any buffered enqueued data.
+  void reset_queue(SATBMarkQueue& queue);
+
+  // Add value to queue's buffer, returning true.  If buffer is full
+  // or if queue doesn't have a buffer, does nothing and returns false.
+  bool try_enqueue(SATBMarkQueue& queue, void* value);
+
+  // Add value to queue's buffer.  The queue must have a non-full buffer.
+  // Used after an initial try_enqueue has failed and the situation resolved.
+  void retry_enqueue(SATBMarkQueue& queue, void* value);
+
+  // Installs a new buffer into queue.
+  // Returns the old buffer, or null if queue didn't have a buffer.
+  BufferNode* exchange_buffer_with_new(SATBMarkQueue& queue);
+
+  // Installs a new buffer into queue.
+  void install_new_buffer(SATBMarkQueue& queue);
+
 #ifdef ASSERT
   void dump_active_states(bool expected_active);
   void verify_active_states(bool expected_active);
@@ -106,6 +185,7 @@ class SATBMarkQueueSet: public PtrQueueSet {
 
 protected:
   SATBMarkQueueSet(BufferNode::Allocator* allocator);
+
   ~SATBMarkQueueSet();
 
   void handle_zero_index(SATBMarkQueue& queue);
@@ -131,6 +211,7 @@ public:
   void set_process_completed_buffers_threshold(size_t value);
 
   size_t buffer_enqueue_threshold() const { return _buffer_enqueue_threshold; }
+
   void set_buffer_enqueue_threshold_percentage(uint value);
 
   // If there exists some completed buffer, pop and process it, and
@@ -144,7 +225,7 @@ public:
   // Add obj to queue.  This qset and the queue must be active.
   void enqueue_known_active(SATBMarkQueue& queue, oop obj);
   virtual void filter(SATBMarkQueue& queue) = 0;
-  virtual void enqueue_completed_buffer(BufferNode* node);
+  void enqueue_completed_buffer(BufferNode* node);
 
   // The number of buffers in the list.  Racy and not updated atomically
   // with the set of completed buffers.
@@ -157,6 +238,20 @@ public:
     return (_count_and_process_flag.load_relaxed() & 1) != 0;
   }
 
+  // Return the associated BufferNode allocator.
+  BufferNode::Allocator* allocator() const { return _allocator; }
+
+  // Return the buffer for a BufferNode of size buffer_capacity().
+  void** allocate_buffer();
+
+  // Return an empty buffer to the free list.  The node is required
+  // to have been allocated with a size of buffer_capacity().
+  void deallocate_buffer(BufferNode* node);
+
+  size_t buffer_capacity() const {
+    return _allocator->buffer_capacity();
+  }
+
 #ifndef PRODUCT
   // Helpful for debugging
   void print_all(const char* msg);
diff --git a/src/hotspot/share/gc/shared/scavengableNMethods.hpp b/src/hotspot/share/gc/shared/scavengableNMethods.hpp
index 00db556577e..5e24d97a379 100644
--- a/src/hotspot/share/gc/shared/scavengableNMethods.hpp
+++ b/src/hotspot/share/gc/shared/scavengableNMethods.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedup.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedup.hpp
index 24d17d7d45b..e9e4622568a 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedup.hpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedup.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupProcessor.cpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupProcessor.cpp
index b8a27f31d01..765d247cb91 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupProcessor.cpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupProcessor.cpp
@@ -36,7 +36,6 @@
 #include "memory/iterator.hpp"
 #include "nmt/memTag.hpp"
 #include "oops/access.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/cpuTimeCounters.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/mutexLocker.hpp"
@@ -46,17 +45,17 @@
 
 OopStorage* StringDedup::Processor::_storages[2] = {};
 
-StringDedup::StorageUse* volatile StringDedup::Processor::_storage_for_requests = nullptr;
+Atomic<StringDedup::StorageUse*> StringDedup::Processor::_storage_for_requests{};
 StringDedup::StorageUse* StringDedup::Processor::_storage_for_processing = nullptr;
 
 void StringDedup::Processor::initialize_storage() {
   assert(_storages[0] == nullptr, "storage already created");
   assert(_storages[1] == nullptr, "storage already created");
-  assert(_storage_for_requests == nullptr, "storage already created");
+  assert(_storage_for_requests.load_relaxed() == nullptr, "storage already created");
   assert(_storage_for_processing == nullptr, "storage already created");
   _storages[0] = OopStorageSet::create_weak("StringDedup Requests0 Weak", mtStringDedup);
   _storages[1] = OopStorageSet::create_weak("StringDedup Requests1 Weak", mtStringDedup);
-  _storage_for_requests = new StorageUse(_storages[0]);
+  _storage_for_requests.store_relaxed(new StorageUse(_storages[0]));
   _storage_for_processing = new StorageUse(_storages[1]);
 }
 
@@ -75,7 +74,7 @@ void StringDedup::Processor::wait_for_requests() const {
   {
     ThreadBlockInVM tbivm(_thread);
     MonitorLocker ml(StringDedup_lock, Mutex::_no_safepoint_check_flag);
-    OopStorage* storage = AtomicAccess::load(&_storage_for_requests)->storage();
+    OopStorage* storage = _storage_for_requests.load_relaxed()->storage();
     while ((storage->allocation_count() == 0) &&
            !Table::is_dead_entry_removal_needed()) {
       ml.wait();
@@ -83,7 +82,7 @@ void StringDedup::Processor::wait_for_requests() const {
   }
   // Swap the request and processing storage objects.
   log_trace(stringdedup)("swapping request storages");
-  _storage_for_processing = AtomicAccess::xchg(&_storage_for_requests, _storage_for_processing);
+  _storage_for_processing = _storage_for_requests.exchange(_storage_for_processing);
   GlobalCounter::write_synchronize();
   // Wait for the now current processing storage object to no longer be used
   // by an in-progress GC.  Again here, the num-dead notification from the
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupProcessor.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupProcessor.hpp
index 7e5e64df9b4..d111e750c2d 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupProcessor.hpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupProcessor.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 #include "services/cpuTimeUsage.hpp"
 #include "utilities/macros.hpp"
 
@@ -51,7 +52,7 @@ class StringDedup::Processor : public CHeapObj<mtGC> {
   NONCOPYABLE(Processor);
 
   static OopStorage* _storages[2];
-  static StorageUse* volatile _storage_for_requests;
+  static Atomic<StorageUse*> _storage_for_requests;
   static StorageUse* _storage_for_processing;
 
   JavaThread* _thread;
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.cpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.cpp
index 245a0ab20e9..3cec188eec1 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.cpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.cpp
@@ -94,13 +94,17 @@ static double strdedup_elapsed_param_ms(Tickspan t) {
 void StringDedup::Stat::log_summary(const Stat* last_stat, const Stat* total_stat) {
   log_info(stringdedup)(
     "Concurrent String Deduplication "
-    "%zu/" STRDEDUP_BYTES_FORMAT_NS " (new), "
+    "%zu (inspected), "
+    "%zu/" STRDEDUP_BYTES_FORMAT_NS " (new unknown), "
     "%zu/" STRDEDUP_BYTES_FORMAT_NS " (deduped), "
-    "avg " STRDEDUP_PERCENT_FORMAT_NS ", "
+    "total avg deduped/new unknown bytes " STRDEDUP_PERCENT_FORMAT_NS ", "
+    STRDEDUP_BYTES_FORMAT_NS " (total deduped)," STRDEDUP_BYTES_FORMAT_NS " (total new unknown), "
     STRDEDUP_ELAPSED_FORMAT_MS " of " STRDEDUP_ELAPSED_FORMAT_MS,
+    last_stat->_inspected,
     last_stat->_new, STRDEDUP_BYTES_PARAM(last_stat->_new_bytes),
     last_stat->_deduped, STRDEDUP_BYTES_PARAM(last_stat->_deduped_bytes),
     percent_of(total_stat->_deduped_bytes, total_stat->_new_bytes),
+    STRDEDUP_BYTES_PARAM(total_stat->_deduped_bytes), STRDEDUP_BYTES_PARAM(total_stat->_new_bytes),
     strdedup_elapsed_param_ms(last_stat->_process_elapsed),
     strdedup_elapsed_param_ms(last_stat->_active_elapsed));
 }
@@ -210,14 +214,14 @@ void StringDedup::Stat::log_statistics() const {
   double deduped_bytes_percent       = percent_of(_deduped_bytes, _new_bytes);
   double replaced_percent            = percent_of(_replaced, _new);
   double deleted_percent             = percent_of(_deleted, _new);
-  log_debug(stringdedup)("    Inspected:    %12zu", _inspected);
-  log_debug(stringdedup)("      Known:      %12zu(%5.1f%%)", _known, known_percent);
-  log_debug(stringdedup)("      Shared:     %12zu(%5.1f%%)", _known_shared, known_shared_percent);
-  log_debug(stringdedup)("      New:        %12zu(%5.1f%%)" STRDEDUP_BYTES_FORMAT,
+  log_debug(stringdedup)("    Inspected:     %12zu", _inspected);
+  log_debug(stringdedup)("      Known:       %12zu(%5.1f%%)", _known, known_percent);
+  log_debug(stringdedup)("      Shared:      %12zu(%5.1f%%)", _known_shared, known_shared_percent);
+  log_debug(stringdedup)("      New unknown: %12zu(%5.1f%%)" STRDEDUP_BYTES_FORMAT,
                          _new, new_percent, STRDEDUP_BYTES_PARAM(_new_bytes));
-  log_debug(stringdedup)("      Replaced:   %12zu(%5.1f%%)", _replaced, replaced_percent);
-  log_debug(stringdedup)("      Deleted:    %12zu(%5.1f%%)", _deleted, deleted_percent);
-  log_debug(stringdedup)("    Deduplicated: %12zu(%5.1f%%)" STRDEDUP_BYTES_FORMAT "(%5.1f%%)",
+  log_debug(stringdedup)("      Replaced:    %12zu(%5.1f%%)", _replaced, replaced_percent);
+  log_debug(stringdedup)("      Deleted:     %12zu(%5.1f%%)", _deleted, deleted_percent);
+  log_debug(stringdedup)("    Deduplicated:  %12zu(%5.1f%%)" STRDEDUP_BYTES_FORMAT "(%5.1f%%)",
                          _deduped, deduped_percent, STRDEDUP_BYTES_PARAM(_deduped_bytes), deduped_bytes_percent);
   log_debug(stringdedup)("    Skipped: %zu (dead), %zu (incomplete), %zu (shared)",
                          _skipped_dead, _skipped_incomplete, _skipped_shared);
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp
index fb864ab34ab..81b5863b72f 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupStorageUse.cpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupStorageUse.cpp
index 427058f3e7e..f77532161f7 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupStorageUse.cpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupStorageUse.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "gc/shared/stringdedup/stringDedupStorageUse.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/javaThread.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalCounter.inline.hpp"
@@ -34,18 +33,18 @@ StringDedup::StorageUse::StorageUse(OopStorage* storage) :
 {}
 
 bool StringDedup::StorageUse::is_used_acquire() const {
-  return AtomicAccess::load_acquire(&_use_count) > 0;
+  return _use_count.load_acquire() > 0;
 }
 
 StringDedup::StorageUse*
-StringDedup::StorageUse::obtain(StorageUse* volatile* ptr) {
+StringDedup::StorageUse::obtain(Atomic<StorageUse*>* ptr) {
   GlobalCounter::CriticalSection cs(Thread::current());
-  StorageUse* storage = AtomicAccess::load(ptr);
-  AtomicAccess::inc(&storage->_use_count);
+  StorageUse* storage = ptr->load_relaxed();
+  storage->_use_count.add_then_fetch(1u);
   return storage;
 }
 
 void StringDedup::StorageUse::relinquish() {
-  size_t result = AtomicAccess::sub(&_use_count, size_t(1));
-  assert(result != SIZE_MAX, "use count underflow");
+  size_t result = _use_count.fetch_then_sub(1u);
+  assert(result != 0, "use count underflow");
 }
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupStorageUse.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupStorageUse.hpp
index 8439b9e557e..ad8cb9eb2c9 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupStorageUse.hpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupStorageUse.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 
@@ -35,7 +36,7 @@ class OopStorage;
 // Manage access to one of the OopStorage objects used for requests.
 class StringDedup::StorageUse : public CHeapObj<mtStringDedup> {
   OopStorage* const _storage;
-  volatile size_t _use_count;
+  Atomic<size_t> _use_count;
 
   NONCOPYABLE(StorageUse);
 
@@ -48,7 +49,7 @@ public:
   bool is_used_acquire() const;
 
   // Get the current requests object, and increment its in-use count.
-  static StorageUse* obtain(StorageUse* volatile* ptr);
+  static StorageUse* obtain(Atomic<StorageUse*>* ptr);
 
   // Discard a prior "obtain" request, decrementing the in-use count, and
   // permitting the deduplication thread to start processing if needed.
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.hpp
index b1feb1b4ca9..60d73a461d6 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.hpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
index 59979646395..8267a103539 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shared/vmStructs_gc.hpp b/src/hotspot/share/gc/shared/vmStructs_gc.hpp
index 3a644079875..db968e28f67 100644
--- a/src/hotspot/share/gc/shared/vmStructs_gc.hpp
+++ b/src/hotspot/share/gc/shared/vmStructs_gc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
index 35ec9ed5c8c..40fe0c00490 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
@@ -1394,7 +1394,7 @@ void ShenandoahBarrierC2Support::pin_and_expand(PhaseIdealLoop* phase) {
     }
     if (addr->Opcode() == Op_AddP) {
       Node* orig_base = addr->in(AddPNode::Base);
-      Node* base = new CheckCastPPNode(ctrl, orig_base, orig_base->bottom_type(), ConstraintCastNode::StrongDependency);
+      Node* base = new CheckCastPPNode(ctrl, orig_base, orig_base->bottom_type(), ConstraintCastNode::DependencyType::NonFloatingNarrowing);
       phase->register_new_node(base, ctrl);
       if (addr->in(AddPNode::Base) == addr->in((AddPNode::Address))) {
         // Field access
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
index 6498f0acdb6..41535f302d7 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
@@ -31,7 +31,6 @@
 #include "gc/shenandoah/heuristics/shenandoahSpaceInfo.hpp"
 #include "gc/shenandoah/shenandoahCollectionSet.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
-#include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
 #include "logging/log.hpp"
@@ -234,11 +233,12 @@ static double saturate(double value, double min, double max) {
 //    allocation rate computation independent.
 bool ShenandoahAdaptiveHeuristics::should_start_gc() {
   size_t capacity = ShenandoahHeap::heap()->soft_max_capacity();
-  size_t available = _space_info->soft_available();
+  size_t available = _space_info->soft_mutator_available();
   size_t allocated = _space_info->bytes_allocated_since_gc_start();
 
-  log_debug(gc)("should_start_gc? available: %zu, soft_max_capacity: %zu"
-                ", allocated: %zu", available, capacity, allocated);
+  log_debug(gc, ergo)("should_start_gc calculation: available: " PROPERFMT ", soft_max_capacity: "  PROPERFMT ", "
+                "allocated_since_gc_start: "  PROPERFMT,
+                PROPERFMTARGS(available), PROPERFMTARGS(capacity), PROPERFMTARGS(allocated));
 
   // Track allocation rate even if we decide to start a cycle for other reasons.
   double rate = _allocation_rate.sample(allocated);
@@ -252,9 +252,8 @@ bool ShenandoahAdaptiveHeuristics::should_start_gc() {
 
   size_t min_threshold = min_free_threshold();
   if (available < min_threshold) {
-    log_trigger("Free (%zu%s) is below minimum threshold (%zu%s)",
-                 byte_size_in_proper_unit(available), proper_unit_for_byte_size(available),
-                 byte_size_in_proper_unit(min_threshold), proper_unit_for_byte_size(min_threshold));
+    log_trigger("Free (Soft) (" PROPERFMT ") is below minimum threshold (" PROPERFMT ")",
+                 PROPERFMTARGS(available), PROPERFMTARGS(min_threshold));
     accept_trigger_with_type(OTHER);
     return true;
   }
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp
index f8a77d95d51..28673b28612 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp
@@ -26,7 +26,6 @@
 
 #include "gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp"
 #include "gc/shenandoah/shenandoahCollectionSet.hpp"
-#include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
 #include "logging/log.hpp"
@@ -47,26 +46,25 @@ ShenandoahCompactHeuristics::ShenandoahCompactHeuristics(ShenandoahSpaceInfo* sp
 }
 
 bool ShenandoahCompactHeuristics::should_start_gc() {
-  size_t max_capacity = _space_info->max_capacity();
   size_t capacity = ShenandoahHeap::heap()->soft_max_capacity();
-  size_t available = _space_info->available();
+  size_t available = _space_info->soft_mutator_available();
+  size_t bytes_allocated = _space_info->bytes_allocated_since_gc_start();
 
-  // Make sure the code below treats available without the soft tail.
-  size_t soft_tail = max_capacity - capacity;
-  available = (available > soft_tail) ? (available - soft_tail) : 0;
+  log_debug(gc, ergo)("should_start_gc calculation: available: " PROPERFMT ", soft_max_capacity: "  PROPERFMT ", "
+                "allocated_since_gc_start: "  PROPERFMT,
+                PROPERFMTARGS(available), PROPERFMTARGS(capacity), PROPERFMTARGS(bytes_allocated));
 
   size_t threshold_bytes_allocated = capacity / 100 * ShenandoahAllocationThreshold;
   size_t min_threshold = capacity / 100 * ShenandoahMinFreeThreshold;
 
   if (available < min_threshold) {
-    log_trigger("Free (%zu%s) is below minimum threshold (%zu%s)",
+    log_trigger("Free (Soft) (%zu%s) is below minimum threshold (%zu%s)",
                 byte_size_in_proper_unit(available),     proper_unit_for_byte_size(available),
                 byte_size_in_proper_unit(min_threshold), proper_unit_for_byte_size(min_threshold));
     accept_trigger();
     return true;
   }
 
-  size_t bytes_allocated = _space_info->bytes_allocated_since_gc_start();
   if (bytes_allocated > threshold_bytes_allocated) {
     log_trigger("Allocated since last cycle (%zu%s) is larger than allocation threshold (%zu%s)",
                 byte_size_in_proper_unit(bytes_allocated),           proper_unit_for_byte_size(bytes_allocated),
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp
index cab6abc4e6f..b14d72f249b 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp
@@ -104,7 +104,7 @@ void ShenandoahGenerationalHeuristics::choose_collection_set(ShenandoahCollectio
           // Note that for GLOBAL GC, region may be OLD, and OLD regions do not qualify for pre-selection
 
           // This region is old enough to be promoted but it was not preselected, either because its garbage is below
-          // ShenandoahOldGarbageThreshold so it will be promoted in place, or because there is not sufficient room
+          // old garbage threshold so it will be promoted in place, or because there is not sufficient room
           // in old gen to hold the evacuated copies of this region's live data.  In both cases, we choose not to
           // place this region into the collection set.
           if (region->get_top_before_promote() != nullptr) {
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.cpp
index 1e4d40cfa46..8bf068df0a8 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.cpp
@@ -71,7 +71,8 @@ ShenandoahOldHeuristics::ShenandoahOldHeuristics(ShenandoahOldGeneration* genera
   _growth_trigger(false),
   _fragmentation_density(0.0),
   _fragmentation_first_old_region(0),
-  _fragmentation_last_old_region(0)
+  _fragmentation_last_old_region(0),
+  _old_garbage_threshold(ShenandoahOldGarbageThreshold)
 {
 }
 
@@ -334,7 +335,13 @@ void ShenandoahOldHeuristics::prepare_for_old_collections() {
 
     size_t garbage = region->garbage();
     size_t live_bytes = region->get_live_data_bytes();
-    live_data += live_bytes;
+    if (!region->was_promoted_in_place()) {
+      // As currently implemented, region->get_live_data_bytes() represents bytes concurrently marked.
+      // Expansion of the region by promotion during concurrent marking is above TAMS, and is not included
+      // as live-data at [start of] old marking.
+      live_data += live_bytes;
+    }
+    // else, regions that were promoted in place had 0 old live data at mark start
 
     if (region->is_regular() || region->is_regular_pinned()) {
         // Only place regular or pinned regions with live data into the candidate set.
@@ -373,7 +380,7 @@ void ShenandoahOldHeuristics::prepare_for_old_collections() {
     }
   }
 
-  _old_generation->set_live_bytes_after_last_mark(live_data);
+  _old_generation->set_live_bytes_at_last_mark(live_data);
 
   // Unlike young, we are more interested in efficiently packing OLD-gen than in reclaiming garbage first.  We sort by live-data.
   // Some regular regions may have been promoted in place with no garbage but also with very little live data.  When we "compact"
@@ -385,7 +392,7 @@ void ShenandoahOldHeuristics::prepare_for_old_collections() {
   const size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
 
   // The convention is to collect regions that have more than this amount of garbage.
-  const size_t garbage_threshold = region_size_bytes * ShenandoahOldGarbageThreshold / 100;
+  const size_t garbage_threshold = region_size_bytes * get_old_garbage_threshold() / 100;
 
   // Enlightened interpretation: collect regions that have less than this amount of live.
   const size_t live_threshold = region_size_bytes - garbage_threshold;
@@ -655,6 +662,7 @@ bool ShenandoahOldHeuristics::should_start_gc() {
     const double percent = percent_of(old_gen_capacity, heap_capacity);
     log_trigger("Expansion failure, current size: %zu%s which is %.1f%% of total heap size",
                  byte_size_in_proper_unit(old_gen_capacity), proper_unit_for_byte_size(old_gen_capacity), percent);
+    adjust_old_garbage_threshold();
     return true;
   }
 
@@ -677,6 +685,7 @@ bool ShenandoahOldHeuristics::should_start_gc() {
                 "%zu to %zu (%zu), density: %.1f%%",
                 byte_size_in_proper_unit(fragmented_free), proper_unit_for_byte_size(fragmented_free),
                 first_old_region, last_old_region, span_of_old_regions, density * 100);
+    adjust_old_garbage_threshold();
     return true;
   }
 
@@ -699,12 +708,13 @@ bool ShenandoahOldHeuristics::should_start_gc() {
                     consecutive_young_cycles);
       _growth_trigger = false;
     } else if (current_usage > trigger_threshold) {
-      const size_t live_at_previous_old = _old_generation->get_live_bytes_after_last_mark();
+      const size_t live_at_previous_old = _old_generation->get_live_bytes_at_last_mark();
       const double percent_growth = percent_of(current_usage - live_at_previous_old, live_at_previous_old);
       log_trigger("Old has overgrown, live at end of previous OLD marking: "
                   "%zu%s, current usage: %zu%s, percent growth: %.1f%%",
                   byte_size_in_proper_unit(live_at_previous_old), proper_unit_for_byte_size(live_at_previous_old),
                   byte_size_in_proper_unit(current_usage), proper_unit_for_byte_size(current_usage), percent_growth);
+      adjust_old_garbage_threshold();
       return true;
     } else {
       // Mixed evacuations have decreased current_usage such that old-growth trigger is no longer relevant.
@@ -713,7 +723,41 @@ bool ShenandoahOldHeuristics::should_start_gc() {
   }
 
   // Otherwise, defer to inherited heuristic for gc trigger.
-  return this->ShenandoahHeuristics::should_start_gc();
+  bool result = this->ShenandoahHeuristics::should_start_gc();
+  if (result) {
+    adjust_old_garbage_threshold();
+  }
+  return result;
+}
+
+void ShenandoahOldHeuristics::adjust_old_garbage_threshold() {
+  const uintx MinimumOldGarbageThreshold = 10;
+  const uintx InterventionPercentage = 50;
+
+  const ShenandoahHeap* heap = ShenandoahHeap::heap();
+  size_t old_regions_size = _old_generation->used_regions_size();
+  size_t soft_max_size = heap->soft_max_capacity();
+  uintx percent_used = (uintx) ((old_regions_size * 100) / soft_max_size);
+  _old_garbage_threshold = ShenandoahOldGarbageThreshold;
+  if (percent_used > InterventionPercentage) {
+    uintx severity = percent_used - InterventionPercentage;    // ranges from 0 to 50
+    if (MinimumOldGarbageThreshold < ShenandoahOldGarbageThreshold) {
+      uintx adjustment_potential = ShenandoahOldGarbageThreshold - MinimumOldGarbageThreshold;
+      // With default values:
+      //   if percent_used > 80, garbage_threshold is 10
+      //   else if percent_used > 65, garbage_threshold is 15
+      //   else if percent_used > 50, garbage_threshold is 20
+      if (severity > 30) {
+        _old_garbage_threshold = ShenandoahOldGarbageThreshold - adjustment_potential;
+      } else if (severity > 15) {
+        _old_garbage_threshold = ShenandoahOldGarbageThreshold - 2 * adjustment_potential / 3;
+      } else {
+        _old_garbage_threshold = ShenandoahOldGarbageThreshold - adjustment_potential / 3;
+      }
+      log_info(gc)("Adjusting old garbage threshold to %lu because Old Generation used regions represents %lu%% of heap",
+                   _old_garbage_threshold, percent_used);
+    }
+  }
 }
 
 void ShenandoahOldHeuristics::record_success_concurrent() {
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp
index 8d3fec746ba..288d3d68e56 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp
@@ -102,6 +102,17 @@ private:
   size_t _fragmentation_first_old_region;
   size_t _fragmentation_last_old_region;
 
+  // The value of command-line argument ShenandoahOldGarbageThreshold represents the percent of garbage that must
+  // be present within an old-generation region before that region is considered a good candidate for inclusion in
+  // the collection set under normal circumstances.  For our purposes, normal circustances are when the memory consumed
+  // by the old generation is less than 50% of the soft heap capacity.  When the old generation grows beyond the 50%
+  // threshold, we dynamically adjust the old garbage threshold, allowing us to invest in packing the old generation
+  // more tightly so that more memory can be made available to the more frequent young GC cycles.  This variable
+  // is used in place of ShenandoahOldGarbageThreshold.  Under normal circumstances, its value is equal to
+  // ShenandoahOldGarbageThreshold.  When the GC is under duress, this value may be adjusted to a smaller value,
+  // as scaled according to the severity of duress that we are experiencing.
+  uintx _old_garbage_threshold;
+
   // Compare by live is used to prioritize compaction of old-gen regions.  With old-gen compaction, the goal is
   // to tightly pack long-lived objects into available regions.  In most cases, there has not been an accumulation
   // of garbage within old-gen regions.  The more likely opportunity will be to combine multiple sparsely populated
@@ -200,9 +211,28 @@ public:
 
   bool is_experimental() override;
 
+  // Returns the current value of a dynamically adjusted threshold percentage of garbage above which an old region is
+  // deemed eligible for evacuation.
+  inline uintx get_old_garbage_threshold() { return _old_garbage_threshold; }
+
 private:
   void slide_pinned_regions_to_front();
   bool all_candidates_are_pinned();
+
+  // The normal old_garbage_threshold is specified by ShenandoahOldGarbageThreshold command-line argument, with default
+  // value 25, denoting that a region that has at least 25% garbage is eligible for evacuation.  With default values for
+  // all command-line arguments, we make the following adjustments:
+  //  1. If the old generation has grown to consume more than 80% of the soft max capacity, adjust threshold to 10%
+  //  2. Otherwise, if the old generation has grown to consume more than 65%, adjust threshold to 15%
+  //  3. Otherwise, if the old generation has grown to consume more than 50%, adjust threshold to 20%
+  // The effect is to compact the old generation more aggressively as the old generation consumes larger percentages
+  // of the available heap memory.  In these circumstances, we pack the old generation more tightly in order to make
+  // more memory avaiable to the young generation so that the more frequent young collections can operate more
+  // efficiently.
+  //
+  // If the ShenandoahOldGarbageThreshold is specified on the command line, the effect of adjusting the old garbage
+  // threshold is scaled linearly.
+  void adjust_old_garbage_threshold();
 };
 
 #endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHOLDHEURISTICS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahSpaceInfo.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahSpaceInfo.hpp
index 7fb44c7b71b..6ed05abf0b1 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahSpaceInfo.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahSpaceInfo.hpp
@@ -38,7 +38,7 @@ class ShenandoahSpaceInfo {
 public:
   virtual const char* name() const = 0;
   virtual size_t max_capacity() const = 0;
-  virtual size_t soft_available() const = 0;
+  virtual size_t soft_mutator_available() const = 0;
   virtual size_t available() const = 0;
   virtual size_t used() const = 0;
 
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.cpp
index 205135751aa..d4d66fef6a1 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.cpp
@@ -26,7 +26,6 @@
 
 #include "gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp"
 #include "gc/shenandoah/shenandoahCollectionSet.hpp"
-#include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
 #include "logging/log.hpp"
@@ -41,20 +40,19 @@ ShenandoahStaticHeuristics::ShenandoahStaticHeuristics(ShenandoahSpaceInfo* spac
 ShenandoahStaticHeuristics::~ShenandoahStaticHeuristics() {}
 
 bool ShenandoahStaticHeuristics::should_start_gc() {
-  size_t max_capacity = _space_info->max_capacity();
   size_t capacity = ShenandoahHeap::heap()->soft_max_capacity();
-  size_t available = _space_info->available();
+  size_t available = _space_info->soft_mutator_available();
+  size_t allocated = _space_info->bytes_allocated_since_gc_start();
 
-  // Make sure the code below treats available without the soft tail.
-  size_t soft_tail = max_capacity - capacity;
-  available = (available > soft_tail) ? (available - soft_tail) : 0;
+  log_debug(gc, ergo)("should_start_gc calculation: available: " PROPERFMT ", soft_max_capacity: "  PROPERFMT ", "
+                "allocated_since_gc_start: "  PROPERFMT,
+                PROPERFMTARGS(available), PROPERFMTARGS(capacity), PROPERFMTARGS(allocated));
 
   size_t threshold_available = capacity / 100 * ShenandoahMinFreeThreshold;
 
   if (available < threshold_available) {
-    log_trigger("Free (%zu%s) is below minimum threshold (%zu%s)",
-                 byte_size_in_proper_unit(available),           proper_unit_for_byte_size(available),
-                 byte_size_in_proper_unit(threshold_available), proper_unit_for_byte_size(threshold_available));
+    log_trigger("Free (Soft) (" PROPERFMT ") is below minimum threshold (" PROPERFMT ")",
+                 PROPERFMTARGS(available), PROPERFMTARGS(threshold_available));
     accept_trigger();
     return true;
   }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
index 7db478a781a..28765605267 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
@@ -173,9 +173,9 @@ public:
     static oop oop_atomic_xchg_in_heap_at(oop base, ptrdiff_t offset, oop new_value);
 
     template <typename T>
-    static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
-                                      arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
-                                      size_t length);
+    static OopCopyResult oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                               arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                               size_t length);
 
     // Clone barrier support
     static void clone_in_heap(oop src, oop dst, size_t size);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
index 199256ca31b..f4b35e29b09 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
@@ -191,6 +191,20 @@ inline void ShenandoahBarrierSet::keep_alive_if_weak(DecoratorSet decorators, oo
 template <DecoratorSet decorators, typename T>
 inline void ShenandoahBarrierSet::write_ref_field_post(T* field) {
   assert(ShenandoahCardBarrier, "Should have been checked by caller");
+  if (_heap->is_in_young(field)) {
+    // Young field stores do not require card mark.
+    return;
+  }
+  T heap_oop = RawAccess<>::oop_load(field);
+  if (CompressedOops::is_null(heap_oop)) {
+    // Null reference store do not require card mark.
+    return;
+  }
+  oop obj = CompressedOops::decode_not_null(heap_oop);
+  if (!_heap->is_in_young(obj)) {
+    // Not an old->young reference store.
+    return;
+  }
   volatile CardTable::CardValue* byte = card_table()->byte_for(field);
   *byte = CardTable::dirty_card_val();
 }
@@ -368,15 +382,15 @@ void ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::clone_in_heap
 
 template <DecoratorSet decorators, typename BarrierSetT>
 template <typename T>
-bool ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
-                                                                                         arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
-                                                                                         size_t length) {
+OopCopyResult ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                                                                                  arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                                                                                  size_t length) {
   T* src = arrayOopDesc::obj_offset_to_raw(src_obj, src_offset_in_bytes, src_raw);
   T* dst = arrayOopDesc::obj_offset_to_raw(dst_obj, dst_offset_in_bytes, dst_raw);
 
   ShenandoahBarrierSet* bs = ShenandoahBarrierSet::barrier_set();
   bs->arraycopy_barrier(src, dst, length);
-  bool result = Raw::oop_arraycopy_in_heap(src_obj, src_offset_in_bytes, src_raw, dst_obj, dst_offset_in_bytes, dst_raw, length);
+  OopCopyResult result = Raw::oop_arraycopy_in_heap(src_obj, src_offset_in_bytes, src_raw, dst_obj, dst_offset_in_bytes, dst_raw, length);
   if (ShenandoahCardBarrier) {
     bs->write_ref_array((HeapWord*) dst, length);
   }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index eb05bf24028..c03e66e28da 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -2921,6 +2921,29 @@ void ShenandoahFreeSet::log_status_under_lock() {
   }
 }
 
+void ShenandoahFreeSet::log_freeset_stats(ShenandoahFreeSetPartitionId partition_id, LogStream& ls) {
+  size_t max = 0;
+  size_t total_free = 0;
+  size_t total_used = 0;
+
+  for (idx_t idx = _partitions.leftmost(partition_id);
+        idx <= _partitions.rightmost(partition_id); idx++) {
+    if (_partitions.in_free_set(partition_id, idx)) {
+      ShenandoahHeapRegion *r = _heap->get_region(idx);
+      size_t free = alloc_capacity(r);
+      max = MAX2(max, free);
+      total_free += free;
+      total_used += r->used();
+    }
+  }
+
+  ls.print(" %s freeset stats: Partition count: %zu, Reserved: " PROPERFMT ", Max free available in a single region: " PROPERFMT ";",
+            partition_name(partition_id),
+            _partitions.count(partition_id),
+            PROPERFMTARGS(total_free), PROPERFMTARGS(max)
+          );
+}
+
 void ShenandoahFreeSet::log_status() {
   shenandoah_assert_heaplocked();
 
@@ -3040,20 +3063,18 @@ void ShenandoahFreeSet::log_status() {
       // retired, the sum of used and capacities within regions that are still in the Mutator free partition may not match
       // my internally tracked values of used() and free().
       assert(free == total_free, "Free memory (%zu) should match calculated memory (%zu)", free, total_free);
-      ls.print("Free: %zu%s, Max: %zu%s regular, %zu%s humongous, ",
-               byte_size_in_proper_unit(total_free),    proper_unit_for_byte_size(total_free),
-               byte_size_in_proper_unit(max),           proper_unit_for_byte_size(max),
-               byte_size_in_proper_unit(max_humongous), proper_unit_for_byte_size(max_humongous)
-      );
+      ls.print("Whole heap stats: Total free: " PROPERFMT ", Total used: " PROPERFMT ", Max free in a single region: " PROPERFMT
+               ", Max humongous: " PROPERFMT "; ",
+               PROPERFMTARGS(total_free), PROPERFMTARGS(total_used), PROPERFMTARGS(max), PROPERFMTARGS(max_humongous));
 
-      ls.print("Frag: ");
+      ls.print("Frag stats: ");
       size_t frag_ext;
       if (total_free_ext > 0) {
         frag_ext = 100 - (100 * max_humongous / total_free_ext);
       } else {
         frag_ext = 0;
       }
-      ls.print("%zu%% external, ", frag_ext);
+      ls.print("External: %zu%%, ", frag_ext);
 
       size_t frag_int;
       if (_partitions.count(ShenandoahFreeSetPartitionId::Mutator) > 0) {
@@ -3062,52 +3083,13 @@ void ShenandoahFreeSet::log_status() {
       } else {
         frag_int = 0;
       }
-      ls.print("%zu%% internal; ", frag_int);
-      ls.print("Used: %zu%s, Mutator Free: %zu",
-               byte_size_in_proper_unit(total_used), proper_unit_for_byte_size(total_used),
-               _partitions.count(ShenandoahFreeSetPartitionId::Mutator));
-    }
-
-    {
-      size_t max = 0;
-      size_t total_free = 0;
-      size_t total_used = 0;
-
-      for (idx_t idx = _partitions.leftmost(ShenandoahFreeSetPartitionId::Collector);
-           idx <= _partitions.rightmost(ShenandoahFreeSetPartitionId::Collector); idx++) {
-        if (_partitions.in_free_set(ShenandoahFreeSetPartitionId::Collector, idx)) {
-          ShenandoahHeapRegion *r = _heap->get_region(idx);
-          size_t free = alloc_capacity(r);
-          max = MAX2(max, free);
-          total_free += free;
-          total_used += r->used();
-        }
-      }
-      ls.print(" Collector Reserve: %zu%s, Max: %zu%s; Used: %zu%s",
-               byte_size_in_proper_unit(total_free), proper_unit_for_byte_size(total_free),
-               byte_size_in_proper_unit(max),        proper_unit_for_byte_size(max),
-               byte_size_in_proper_unit(total_used), proper_unit_for_byte_size(total_used));
+      ls.print("Internal: %zu%%; ", frag_int);
     }
 
+    log_freeset_stats(ShenandoahFreeSetPartitionId::Mutator, ls);
+    log_freeset_stats(ShenandoahFreeSetPartitionId::Collector, ls);
     if (_heap->mode()->is_generational()) {
-      size_t max = 0;
-      size_t total_free = 0;
-      size_t total_used = 0;
-
-      for (idx_t idx = _partitions.leftmost(ShenandoahFreeSetPartitionId::OldCollector);
-           idx <= _partitions.rightmost(ShenandoahFreeSetPartitionId::OldCollector); idx++) {
-        if (_partitions.in_free_set(ShenandoahFreeSetPartitionId::OldCollector, idx)) {
-          ShenandoahHeapRegion *r = _heap->get_region(idx);
-          size_t free = alloc_capacity(r);
-          max = MAX2(max, free);
-          total_free += free;
-          total_used += r->used();
-        }
-      }
-      ls.print_cr(" Old Collector Reserve: %zu%s, Max: %zu%s; Used: %zu%s",
-                  byte_size_in_proper_unit(total_free), proper_unit_for_byte_size(total_free),
-                  byte_size_in_proper_unit(max),        proper_unit_for_byte_size(max),
-                  byte_size_in_proper_unit(total_used), proper_unit_for_byte_size(total_used));
+      log_freeset_stats(ShenandoahFreeSetPartitionId::OldCollector, ls);
     }
   }
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
index a9c5ebe49de..95f9fbe6856 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
@@ -29,6 +29,7 @@
 #include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 #include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
+#include "logging/logStream.hpp"
 
 // Each ShenandoahHeapRegion is associated with a ShenandoahFreeSetPartitionId.
 enum class ShenandoahFreeSetPartitionId : uint8_t {
@@ -629,6 +630,7 @@ private:
   void establish_old_collector_alloc_bias();
   size_t get_usable_free_words(size_t free_bytes) const;
 
+  void log_freeset_stats(ShenandoahFreeSetPartitionId partition_id, LogStream& ls);
   // log status, assuming lock has already been acquired by the caller.
   void log_status();
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
index 55d6033b3bc..d74ee872cd1 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
@@ -505,10 +505,10 @@ inline void assert_no_in_place_promotions() {
 #endif
 }
 
-// Preselect for inclusion into the collection set regions whose age is at or above tenure age which contain more than
-// ShenandoahOldGarbageThreshold amounts of garbage.  We identify these regions by setting the appropriate entry of
-// the collection set's preselected regions array to true.  All entries are initialized to false before calling this
-// function.
+// Preselect for inclusion into the collection set all regions whose age is at or above tenure age and for which the
+// garbage percentage exceeds a dynamically adjusted threshold (known as the old-garbage threshold percentage).  We
+// identify these regions by setting the appropriate entry of the collection set's preselected regions array to true.
+// All entries are initialized to false before calling this function.
 //
 // During the subsequent selection of the collection set, we give priority to these promotion set candidates.
 // Without this prioritization, we found that the aged regions tend to be ignored because they typically have
@@ -531,7 +531,8 @@ size_t ShenandoahGeneration::select_aged_regions(const size_t old_promotion_rese
   bool* const candidate_regions_for_promotion_by_copy = heap->collection_set()->preselected_regions();
   ShenandoahMarkingContext* const ctx = heap->marking_context();
 
-  const size_t old_garbage_threshold = (ShenandoahHeapRegion::region_size_bytes() * ShenandoahOldGarbageThreshold) / 100;
+  const size_t old_garbage_threshold =
+    (ShenandoahHeapRegion::region_size_bytes() * heap->old_generation()->heuristics()->get_old_garbage_threshold()) / 100;
 
   const size_t pip_used_threshold = (ShenandoahHeapRegion::region_size_bytes() * ShenandoahGenerationalMinPIPUsage) / 100;
 
@@ -937,8 +938,8 @@ size_t ShenandoahGeneration::available_with_reserve() const {
   return result;
 }
 
-size_t ShenandoahGeneration::soft_available() const {
-  size_t result = available(ShenandoahHeap::heap()->soft_max_capacity());
+size_t ShenandoahGeneration::soft_mutator_available() const {
+  size_t result = available(ShenandoahHeap::heap()->soft_max_capacity() * (100.0 - ShenandoahEvacReserve) / 100);
   return result;
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
index 424a00f789d..06cf132f946 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
@@ -71,7 +71,7 @@ private:
   // garbage-dense regions, including those that satisfy criteria 1 & 2 below,
   // and whose live bytes will fit within old_available budget:
   // Criterion 1. region age >= tenuring threshold
-  // Criterion 2. region garbage percentage > ShenandoahOldGarbageThreshold
+  // Criterion 2. region garbage percentage > old garbage threshold
   //
   // Identifies regions eligible for promotion in place,
   // being those of at least tenuring_threshold age that have lower garbage
@@ -126,7 +126,7 @@ private:
   // The soft max heap size may be adjusted lower than the max heap size to cause the trigger
   // to believe it has less memory available than is _really_ available. Lowering the soft
   // max heap size will cause the adaptive heuristic to run more frequent cycles.
-  size_t soft_available() const override;
+  size_t soft_mutator_available() const override;
 
   void log_status(const char* msg) const;
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp
index 4a3faa2c707..c9b956f9c2f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp
@@ -145,7 +145,7 @@ void ShenandoahGenerationalEvacuationTask::maybe_promote_region(ShenandoahHeapRe
       // triggers the load-reference barrier (LRB) to copy on reference fetch.
       //
       // Aged humongous continuation regions are handled with their start region.  If an aged regular region has
-      // more garbage than ShenandoahOldGarbageThreshold, we'll promote by evacuation.  If there is room for evacuation
+      // more garbage than the old garbage threshold, we'll promote by evacuation.  If there is room for evacuation
       // in this cycle, the region will be in the collection set.  If there is not room, the region will be promoted
       // by evacuation in some future GC cycle.
 
@@ -177,7 +177,8 @@ void ShenandoahGenerationalEvacuationTask::promote_in_place(ShenandoahHeapRegion
   size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
 
   {
-    const size_t old_garbage_threshold = (region_size_bytes * ShenandoahOldGarbageThreshold) / 100;
+    const size_t old_garbage_threshold =
+      (region_size_bytes * _heap->old_generation()->heuristics()->get_old_garbage_threshold()) / 100;
     assert(!_heap->is_concurrent_old_mark_in_progress(), "Cannot promote in place during old marking");
     assert(region->garbage_before_padded_for_promote() < old_garbage_threshold,
            "Region %zu has too much garbage for promotion", region->index());
@@ -222,7 +223,6 @@ void ShenandoahGenerationalEvacuationTask::promote_in_place(ShenandoahHeapRegion
   // We do not need to scan above TAMS because restored top equals tams
   assert(obj_addr == tams, "Expect loop to terminate when obj_addr equals tams");
 
-
   {
     ShenandoahHeapLocker locker(_heap->lock());
 
@@ -250,6 +250,7 @@ void ShenandoahGenerationalEvacuationTask::promote_in_place(ShenandoahHeapRegion
     // Transfer this region from young to old, increasing promoted_reserve if available space exceeds plab_min_size()
     _heap->free_set()->add_promoted_in_place_region_to_old_collector(region);
     region->set_affiliation(OLD_GENERATION);
+    region->set_promoted_in_place();
   }
 }
 
@@ -288,6 +289,7 @@ void ShenandoahGenerationalEvacuationTask::promote_humongous(ShenandoahHeapRegio
               r->index(), p2i(r->bottom()), p2i(r->top()));
       // We mark the entire humongous object's range as dirty after loop terminates, so no need to dirty the range here
       r->set_affiliation(OLD_GENERATION);
+      r->set_promoted_in_place();
     }
 
     ShenandoahFreeSet* freeset = _heap->free_set();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp
index ef913362df3..78672ee10a5 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp
@@ -83,7 +83,7 @@ void ShenandoahGenerationalFullGC::handle_completion(ShenandoahHeap* heap) {
   assert_usage_not_more_than_regions_used(young);
 
   // Establish baseline for next old-has-grown trigger.
-  old->set_live_bytes_after_last_mark(old->used());
+  old->set_live_bytes_at_last_mark(old->used());
 }
 
 void ShenandoahGenerationalFullGC::rebuild_remembered_set(ShenandoahHeap* heap) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.cpp
index c9972e2db81..a072fe2db06 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.cpp
@@ -78,15 +78,6 @@ size_t ShenandoahGlobalGeneration::available() const {
   return MIN2(available, ShenandoahHeap::heap()->free_set()->available());
 }
 
-size_t ShenandoahGlobalGeneration::soft_available() const {
-  size_t available = this->available();
-
-  // Make sure the code below treats available without the soft tail.
-  assert(max_capacity() >= ShenandoahHeap::heap()->soft_max_capacity(), "Max capacity must be greater than soft max capacity.");
-  size_t soft_tail = max_capacity() - ShenandoahHeap::heap()->soft_max_capacity();
-  return (available > soft_tail) ? (available - soft_tail) : 0;
-}
-
 void ShenandoahGlobalGeneration::set_concurrent_mark_in_progress(bool in_progress) {
   ShenandoahHeap* heap = ShenandoahHeap::heap();
   if (in_progress && heap->mode()->is_generational()) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.hpp
index 5ceba8ed50e..9f9e4818a95 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.hpp
@@ -56,7 +56,6 @@ public:
   size_t max_capacity() const override;
 
   size_t available() const override;
-  size_t soft_available() const override;
 
   void set_concurrent_mark_in_progress(bool in_progress) override;
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
index fc6c24a8423..34c279a1495 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
@@ -344,9 +344,6 @@ uint ShenandoahHeap::get_object_age(oop obj) {
   }
   if (w.has_monitor()) {
     w = w.monitor()->header();
-  } else if (w.is_being_inflated() || w.has_displaced_mark_helper()) {
-    // Informs caller that we aren't able to determine the age
-    return markWord::max_age + 1; // sentinel
   }
   assert(w.age() <= markWord::max_age, "Impossible!");
   return w.age();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
index 2ed5614c698..cf0dc5476d0 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
@@ -262,6 +262,7 @@ private:
   HeapWord* volatile _update_watermark;
 
   uint _age;
+  bool _promoted_in_place;
   CENSUS_NOISE(uint _youth;)   // tracks epochs of retrograde ageing (rejuvenation)
 
   ShenandoahSharedFlag _recycling; // Used to indicate that the region is being recycled; see try_recycle*().
@@ -354,6 +355,15 @@ public:
 
   inline void save_top_before_promote();
   inline HeapWord* get_top_before_promote() const { return _top_before_promoted; }
+
+  inline void set_promoted_in_place() {
+    _promoted_in_place = true;
+  }
+
+  // Returns true iff this region was promoted in place subsequent to the most recent start of concurrent old marking.
+  inline bool was_promoted_in_place() {
+    return _promoted_in_place;
+  }
   inline void restore_top_before_promote();
   inline size_t garbage_before_padded_for_promote() const;
 
@@ -379,7 +389,13 @@ public:
   inline void increase_live_data_gc_words(size_t s);
 
   inline bool has_live() const;
+
+  // Represents the number of live bytes identified by most recent marking effort.  Does not include the bytes
+  // above TAMS.
   inline size_t get_live_data_bytes() const;
+
+  // Represents the number of live words identified by most recent marking effort.  Does not include the words
+  // above TAMS.
   inline size_t get_live_data_words() const;
 
   inline size_t garbage() const;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
index 69673eb7a60..b9304ee9daa 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
@@ -152,6 +152,7 @@ inline void ShenandoahHeapRegion::internal_increase_live_data(size_t s) {
 
 inline void ShenandoahHeapRegion::clear_live_data() {
   AtomicAccess::store(&_live_data, (size_t)0);
+  _promoted_in_place = false;
 }
 
 inline size_t ShenandoahHeapRegion::get_live_data_words() const {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
index 6a0f986cde5..c7cf013d034 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
@@ -116,11 +116,10 @@ ShenandoahOldGeneration::ShenandoahOldGeneration(uint max_queues)
     _is_parsable(true),
     _card_scan(nullptr),
     _state(WAITING_FOR_BOOTSTRAP),
-    _growth_before_compaction(INITIAL_GROWTH_BEFORE_COMPACTION),
-    _min_growth_before_compaction ((ShenandoahMinOldGenGrowthPercent * FRACTIONAL_DENOMINATOR) / 100)
+    _growth_percent_before_collection(INITIAL_GROWTH_PERCENT_BEFORE_COLLECTION)
 {
   assert(type() == ShenandoahGenerationType::OLD, "OO sanity");
-  _live_bytes_after_last_mark = ShenandoahHeap::heap()->capacity() * INITIAL_LIVE_FRACTION / FRACTIONAL_DENOMINATOR;
+  _live_bytes_at_last_mark = (ShenandoahHeap::heap()->soft_max_capacity() * INITIAL_LIVE_PERCENT) / 100;
   // Always clear references for old generation
   ref_processor()->set_soft_reference_policy(true);
 
@@ -221,20 +220,20 @@ ShenandoahOldGeneration::configure_plab_for_current_thread(const ShenandoahAlloc
   }
 }
 
-size_t ShenandoahOldGeneration::get_live_bytes_after_last_mark() const {
-  return _live_bytes_after_last_mark;
+size_t ShenandoahOldGeneration::get_live_bytes_at_last_mark() const {
+  return _live_bytes_at_last_mark;
 }
 
-void ShenandoahOldGeneration::set_live_bytes_after_last_mark(size_t bytes) {
+void ShenandoahOldGeneration::set_live_bytes_at_last_mark(size_t bytes) {
   if (bytes == 0) {
     // Restart search for best old-gen size to the initial state
-    _live_bytes_after_last_mark = ShenandoahHeap::heap()->capacity() * INITIAL_LIVE_FRACTION / FRACTIONAL_DENOMINATOR;
-    _growth_before_compaction = INITIAL_GROWTH_BEFORE_COMPACTION;
+    _live_bytes_at_last_mark = (ShenandoahHeap::heap()->soft_max_capacity() * INITIAL_LIVE_PERCENT) / 100;
+    _growth_percent_before_collection = INITIAL_GROWTH_PERCENT_BEFORE_COLLECTION;
   } else {
-    _live_bytes_after_last_mark = bytes;
-    _growth_before_compaction /= 2;
-    if (_growth_before_compaction < _min_growth_before_compaction) {
-      _growth_before_compaction = _min_growth_before_compaction;
+    _live_bytes_at_last_mark = bytes;
+    _growth_percent_before_collection /= 2;
+    if (_growth_percent_before_collection < ShenandoahMinOldGenGrowthPercent) {
+      _growth_percent_before_collection = ShenandoahMinOldGenGrowthPercent;
     }
   }
 }
@@ -244,7 +243,19 @@ void ShenandoahOldGeneration::handle_failed_transfer() {
 }
 
 size_t ShenandoahOldGeneration::usage_trigger_threshold() const {
-  size_t result = _live_bytes_after_last_mark + (_live_bytes_after_last_mark * _growth_before_compaction) / FRACTIONAL_DENOMINATOR;
+  size_t threshold_by_relative_growth =
+    _live_bytes_at_last_mark + (_live_bytes_at_last_mark * _growth_percent_before_collection) / 100;
+  size_t soft_max_capacity = ShenandoahHeap::heap()->soft_max_capacity();
+  size_t threshold_by_growth_into_percent_remaining;
+  if (_live_bytes_at_last_mark < soft_max_capacity) {
+    threshold_by_growth_into_percent_remaining = (size_t)
+      (_live_bytes_at_last_mark + ((soft_max_capacity - _live_bytes_at_last_mark)
+                                      * ShenandoahMinOldGenGrowthRemainingHeapPercent / 100.0));
+  } else {
+    // we're already consuming more than soft max capacity, so we should start old GC right away.
+    threshold_by_growth_into_percent_remaining = soft_max_capacity;
+  }
+  size_t result = MIN2(threshold_by_relative_growth, threshold_by_growth_into_percent_remaining);
   return result;
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
index 614a1596287..90c1458ac97 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
@@ -287,28 +287,23 @@ public:
 private:
   State _state;
 
-  static const size_t FRACTIONAL_DENOMINATOR = 65536;
-
   // During initialization of the JVM, we search for the correct old-gen size by initially performing old-gen
-  // collection when old-gen usage is 50% more (INITIAL_GROWTH_BEFORE_COMPACTION) than the initial old-gen size
-  // estimate (3.125% of heap).  The next old-gen trigger occurs when old-gen grows 25% larger than its live
-  // memory at the end of the first old-gen collection.  Then we trigger again when old-gen grows 12.5%
-  // more than its live memory at the end of the previous old-gen collection.  Thereafter, we trigger each time
-  // old-gen grows more than 12.5% following the end of its previous old-gen collection.
-  static const size_t INITIAL_GROWTH_BEFORE_COMPACTION = FRACTIONAL_DENOMINATOR / 2;        //  50.0%
+  // collection when old-gen usage is 50% more (INITIAL_GROWTH_PERCENT_BEFORE_COLLECTION) than the initial old-gen size
+  // estimate (16% of heap).  With each successive old-gen collection, we divide the growth trigger by two, but
+  // never use a growth trigger smaller than ShenandoahMinOldGenGrowthPercent.
+  static const size_t INITIAL_GROWTH_PERCENT_BEFORE_COLLECTION = 50;
 
-  // INITIAL_LIVE_FRACTION represents the initial guess of how large old-gen should be.  We estimate that old-gen
-  // needs to consume 6.25% of the total heap size.  And we "pretend" that we start out with this amount of live
+  // INITIAL_LIVE_PERCENT represents the initial guess of how large old-gen should be.  We estimate that old gen
+  // needs to consume 16% of the total heap size.  And we "pretend" that we start out with this amount of live
   // old-gen memory.  The first old-collection trigger will occur when old-gen occupies 50% more than this initial
-  // approximation of the old-gen memory requirement, in other words when old-gen usage is 150% of 6.25%, which
-  // is 9.375% of the total heap size.
-  static const uint16_t INITIAL_LIVE_FRACTION = FRACTIONAL_DENOMINATOR / 16;                //   6.25%
+  // approximation of the old-gen memory requirement, in other words when old-gen usage is 150% of 16%, which
+  // is 24% of the heap size.
+  static const size_t INITIAL_LIVE_PERCENT = 16;
 
-  size_t _live_bytes_after_last_mark;
+  size_t _live_bytes_at_last_mark;
 
-  // How much growth in usage before we trigger old collection, per FRACTIONAL_DENOMINATOR (65_536)
-  size_t _growth_before_compaction;
-  const size_t _min_growth_before_compaction;                                               // Default is 12.5%
+  // How much growth in usage before we trigger old collection as a percent of soft_max_capacity
+  size_t _growth_percent_before_collection;
 
   void validate_transition(State new_state) NOT_DEBUG_RETURN;
 
@@ -323,8 +318,8 @@ public:
 
   void transition_to(State new_state);
 
-  size_t get_live_bytes_after_last_mark() const;
-  void set_live_bytes_after_last_mark(size_t new_live);
+  size_t get_live_bytes_at_last_mark() const;
+  void set_live_bytes_at_last_mark(size_t new_live);
 
   size_t usage_trigger_threshold() const;
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp b/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp
index be11a364ab7..14adb924585 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2021, Red Hat, Inc. and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahYoungGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahYoungGeneration.cpp
index 86be2fc60be..f00ce16136f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahYoungGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahYoungGeneration.cpp
@@ -138,8 +138,8 @@ size_t ShenandoahYoungGeneration::available() const {
   return MIN2(available, ShenandoahHeap::heap()->free_set()->available());
 }
 
-size_t ShenandoahYoungGeneration::soft_available() const {
-  size_t available = this->ShenandoahGeneration::soft_available();
+size_t ShenandoahYoungGeneration::soft_mutator_available() const {
+  size_t available = this->ShenandoahGeneration::soft_mutator_available();
   return MIN2(available, ShenandoahHeap::heap()->free_set()->available());
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahYoungGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahYoungGeneration.hpp
index 6b2794b12c3..930c5ff1747 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahYoungGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahYoungGeneration.hpp
@@ -83,7 +83,7 @@ public:
   size_t max_capacity() const override;
 
   size_t available() const override;
-  size_t soft_available() const override;
+  size_t soft_mutator_available() const override;
 
   void prepare_gc() override;
 };
diff --git a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
index 8bd59beb93b..15520c47bbc 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2021, Red Hat, Inc. All rights reserved.
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,15 +59,29 @@
           "fail, resulting in stop-the-world full GCs.")                    \
           range(0,100)                                                      \
                                                                             \
-  product(double, ShenandoahMinOldGenGrowthPercent, 12.5, EXPERIMENTAL,     \
+  product(double, ShenandoahMinOldGenGrowthPercent, 50, EXPERIMENTAL,       \
           "(Generational mode only) If the usage within old generation "    \
           "has grown by at least this percent of its live memory size "     \
-          "at completion of the most recent old-generation marking "        \
-          "effort, heuristics may trigger the start of a new old-gen "      \
-          "collection.")                                                    \
+          "at the start of the previous old-generation marking effort, "    \
+          "heuristics may trigger the start of a new old-gen collection.")  \
           range(0.0,100.0)                                                  \
                                                                             \
-  product(uintx, ShenandoahIgnoreOldGrowthBelowPercentage,10, EXPERIMENTAL, \
+  product(double, ShenandoahMinOldGenGrowthRemainingHeapPercent,            \
+          35, EXPERIMENTAL,                                                 \
+          "(Generational mode only) If the usage within old generation "    \
+          "has grown to exceed this percent of the remaining heap that "    \
+          "was not marked live within the old generation at the time "      \
+          "of the last old-generation marking effort, heuristics may "      \
+          "trigger the start of a new old-gen collection.  Setting "        \
+          "this value to a smaller value may cause back-to-back old "       \
+          "generation marking triggers, since the typical memory used "     \
+          "by the old generation is about 30% larger than the live "        \
+          "memory contained within the old generation (because default "    \
+          "value of ShenandoahOldGarbageThreshold is 25.")                  \
+          range(0.0,100.0)                                                  \
+                                                                            \
+  product(uintx, ShenandoahIgnoreOldGrowthBelowPercentage,                  \
+          40, EXPERIMENTAL,                                                 \
           "(Generational mode only) If the total usage of the old "         \
           "generation is smaller than this percent, we do not trigger "     \
           "old gen collections even if old has grown, except when "         \
@@ -77,12 +91,13 @@
           range(0,100)                                                      \
                                                                             \
   product(uintx, ShenandoahDoNotIgnoreGrowthAfterYoungCycles,               \
-          50, EXPERIMENTAL,                                                 \
-          "(Generational mode only) Even if the usage of old generation "   \
-          "is below ShenandoahIgnoreOldGrowthBelowPercentage, "             \
-          "trigger an old-generation mark if old has grown and this "       \
-          "many consecutive young-gen collections have been "               \
-          "completed following the preceding old-gen collection.")          \
+          100, EXPERIMENTAL,                                                \
+          "(Generational mode only) Trigger an old-generation mark "        \
+          "if old has grown and this many consecutive young-gen "           \
+          "collections have been completed following the preceding "        \
+          "old-gen collection.  We perform this old-generation mark "       \
+          "evvort even if the usage of old generation is below "            \
+          "ShenandoahIgnoreOldGrowthBelowPercentage.")                      \
                                                                             \
   product(bool, ShenandoahGenerationalAdaptiveTenuring, true, EXPERIMENTAL, \
           "(Generational mode only) Dynamically adapt tenuring age.")       \
diff --git a/src/hotspot/share/gc/z/zArguments.hpp b/src/hotspot/share/gc/z/zArguments.hpp
index 8bbd88f357c..eab2d22ac63 100644
--- a/src/hotspot/share/gc/z/zArguments.hpp
+++ b/src/hotspot/share/gc/z/zArguments.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/z/zBarrier.hpp b/src/hotspot/share/gc/z/zBarrier.hpp
index 3071061c997..17dcfcd06dc 100644
--- a/src/hotspot/share/gc/z/zBarrier.hpp
+++ b/src/hotspot/share/gc/z/zBarrier.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/z/zBarrierSet.hpp b/src/hotspot/share/gc/z/zBarrierSet.hpp
index 502cc36d380..074d0e859fd 100644
--- a/src/hotspot/share/gc/z/zBarrierSet.hpp
+++ b/src/hotspot/share/gc/z/zBarrierSet.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -88,6 +88,7 @@ public:
     static void store_barrier_native_with_healing(zpointer* p);
     static void store_barrier_native_without_healing(zpointer* p);
 
+    [[noreturn]]
     static void unsupported();
     static zaddress load_barrier(narrowOop* p, zpointer o) { unsupported(); return zaddress::null; }
     static zaddress load_barrier_on_unknown_oop_ref(oop base, ptrdiff_t offset, narrowOop* p, zpointer o) { unsupported(); return zaddress::null; }
@@ -98,11 +99,11 @@ public:
     static void store_barrier_native_without_healing(narrowOop* p)  { unsupported(); }
 
     static zaddress oop_copy_one_barriers(zpointer* dst, zpointer* src);
-    static bool oop_copy_one_check_cast(zpointer* dst, zpointer* src, Klass* dst_klass);
-    static void oop_copy_one(zpointer* dst, zpointer* src);
+    static OopCopyResult oop_copy_one_check_cast(zpointer* dst, zpointer* src, Klass* dst_klass);
+    static OopCopyResult oop_copy_one(zpointer* dst, zpointer* src);
 
-    static bool oop_arraycopy_in_heap_check_cast(zpointer* dst, zpointer* src, size_t length, Klass* dst_klass);
-    static bool oop_arraycopy_in_heap_no_check_cast(zpointer* dst, zpointer* src, size_t length);
+    static OopCopyResult oop_arraycopy_in_heap_check_cast(zpointer* dst, zpointer* src, size_t length, Klass* dst_klass);
+    static OopCopyResult oop_arraycopy_in_heap_no_check_cast(zpointer* dst, zpointer* src, size_t length);
 
   public:
     //
@@ -134,19 +135,19 @@ public:
     static oop oop_atomic_xchg_in_heap(narrowOop* p, oop new_value) { unsupported(); return nullptr; }
     static oop oop_atomic_xchg_in_heap_at(oop base, ptrdiff_t offset, oop new_value);
 
-    static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, zpointer* src_raw,
-                                      arrayOop dst_obj, size_t dst_offset_in_bytes, zpointer* dst_raw,
-                                      size_t length);
-    static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, oop* src_raw,
-                                      arrayOop dst_obj, size_t dst_offset_in_bytes, oop* dst_raw,
-                                      size_t length) {
+    static OopCopyResult oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, zpointer* src_raw,
+                                               arrayOop dst_obj, size_t dst_offset_in_bytes, zpointer* dst_raw,
+                                               size_t length);
+    static OopCopyResult oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, oop* src_raw,
+                                               arrayOop dst_obj, size_t dst_offset_in_bytes, oop* dst_raw,
+                                               size_t length) {
       return oop_arraycopy_in_heap(src_obj, src_offset_in_bytes, (zpointer*)src_raw,
                                    dst_obj, dst_offset_in_bytes, (zpointer*)dst_raw,
                                    length);
     }
-    static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, narrowOop* src_raw,
-                                      arrayOop dst_obj, size_t dst_offset_in_bytes, narrowOop* dst_raw,
-                                      size_t length) { unsupported(); return false; }
+    static OopCopyResult oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, narrowOop* src_raw,
+                                               arrayOop dst_obj, size_t dst_offset_in_bytes, narrowOop* dst_raw,
+                                               size_t length) { unsupported(); }
 
     static void clone_in_heap(oop src, oop dst, size_t size);
 
diff --git a/src/hotspot/share/gc/z/zBarrierSet.inline.hpp b/src/hotspot/share/gc/z/zBarrierSet.inline.hpp
index 9973b1d0131..d99aa561764 100644
--- a/src/hotspot/share/gc/z/zBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/z/zBarrierSet.inline.hpp
@@ -328,48 +328,56 @@ inline zaddress ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_copy_on
 }
 
 template <DecoratorSet decorators, typename BarrierSetT>
-inline void ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_copy_one(zpointer* dst, zpointer* src) {
+inline OopCopyResult ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_copy_one(zpointer* dst, zpointer* src) {
   const zaddress obj = oop_copy_one_barriers(dst, src);
 
+  // Future location for null-restriction check and failure reporting
+
   AtomicAccess::store(dst, ZAddress::store_good(obj));
+
+  return OopCopyResult::ok;
 }
 
 template <DecoratorSet decorators, typename BarrierSetT>
-inline bool ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_copy_one_check_cast(zpointer* dst, zpointer* src, Klass* dst_klass) {
+inline OopCopyResult ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_copy_one_check_cast(zpointer* dst, zpointer* src, Klass* dst_klass) {
   const zaddress obj = oop_copy_one_barriers(dst, src);
 
   if (!oopDesc::is_instanceof_or_null(to_oop(obj), dst_klass)) {
     // Check cast failed
-    return false;
+    return OopCopyResult::failed_check_class_cast;
   }
 
   AtomicAccess::store(dst, ZAddress::store_good(obj));
 
-  return true;
+  return OopCopyResult::ok;
 }
 
 template <DecoratorSet decorators, typename BarrierSetT>
-inline bool ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap_check_cast(zpointer* dst, zpointer* src, size_t length, Klass* dst_klass) {
+inline OopCopyResult ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap_check_cast(zpointer* dst, zpointer* src, size_t length, Klass* dst_klass) {
   // Check cast and copy each elements
   for (const zpointer* const end = src + length; src < end; src++, dst++) {
-    if (!oop_copy_one_check_cast(dst, src, dst_klass)) {
-      // Check cast failed
-      return false;
+    const OopCopyResult result = oop_copy_one_check_cast(dst, src, dst_klass);
+    if (result != OopCopyResult::ok) {
+      return result;
     }
   }
 
-  return true;
+  return OopCopyResult::ok;
 }
 
 template <DecoratorSet decorators, typename BarrierSetT>
-inline bool ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap_no_check_cast(zpointer* dst, zpointer* src, size_t length) {
+inline OopCopyResult ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap_no_check_cast(zpointer* dst, zpointer* src, size_t length) {
   const bool is_disjoint = HasDecorator<decorators, ARRAYCOPY_DISJOINT>::value;
 
   if (is_disjoint || src > dst) {
     for (const zpointer* const end = src + length; src < end; src++, dst++) {
-      oop_copy_one(dst, src);
+      const OopCopyResult result = oop_copy_one(dst, src);
+      if (result != OopCopyResult::ok) {
+        return result;
+      }
     }
-    return true;
+
+    return OopCopyResult::ok;
   }
 
   if (src < dst) {
@@ -377,28 +385,32 @@ inline bool ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_i
     src += length - 1;
     dst += length - 1;
     for ( ; src >= end; src--, dst--) {
-      oop_copy_one(dst, src);
+      const OopCopyResult result = oop_copy_one(dst, src);
+      if (result != OopCopyResult::ok) {
+        return result;
+      }
     }
-    return true;
+
+    return OopCopyResult::ok;
   }
 
   // src and dst are the same; nothing to do
-  return true;
+  return OopCopyResult::ok;
 }
 
 template <DecoratorSet decorators, typename BarrierSetT>
-inline bool ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, zpointer* src_raw,
-                                                                                       arrayOop dst_obj, size_t dst_offset_in_bytes, zpointer* dst_raw,
-                                                                                       size_t length) {
+inline OopCopyResult ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, zpointer* src_raw,
+                                                                                                arrayOop dst_obj, size_t dst_offset_in_bytes, zpointer* dst_raw,
+                                                                                                size_t length) {
   zpointer* const src = arrayOopDesc::obj_offset_to_raw(src_obj, src_offset_in_bytes, src_raw);
   zpointer* const dst = arrayOopDesc::obj_offset_to_raw(dst_obj, dst_offset_in_bytes, dst_raw);
 
   if (HasDecorator<decorators, ARRAYCOPY_CHECKCAST>::value) {
     Klass* const dst_klass = objArrayOop(dst_obj)->element_klass();
     return oop_arraycopy_in_heap_check_cast(dst, src, length, dst_klass);
+  } else {
+    return oop_arraycopy_in_heap_no_check_cast(dst, src, length);
   }
-
-  return oop_arraycopy_in_heap_no_check_cast(dst, src, length);
 }
 
 template <DecoratorSet decorators, typename BarrierSetT>
diff --git a/src/hotspot/share/gc/z/zBarrierSetNMethod.hpp b/src/hotspot/share/gc/z/zBarrierSetNMethod.hpp
index f51aa53a7e9..c7bbe35e17d 100644
--- a/src/hotspot/share/gc/z/zBarrierSetNMethod.hpp
+++ b/src/hotspot/share/gc/z/zBarrierSetNMethod.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/z/zGeneration.hpp b/src/hotspot/share/gc/z/zGeneration.hpp
index 7ce096de6db..3b700361460 100644
--- a/src/hotspot/share/gc/z/zGeneration.hpp
+++ b/src/hotspot/share/gc/z/zGeneration.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/z/zGlobals.hpp b/src/hotspot/share/gc/z/zGlobals.hpp
index 8c4f0d0c015..278b6480d1d 100644
--- a/src/hotspot/share/gc/z/zGlobals.hpp
+++ b/src/hotspot/share/gc/z/zGlobals.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/z/zHeapIterator.hpp b/src/hotspot/share/gc/z/zHeapIterator.hpp
index 2b570e98f1c..3ebc7965ad7 100644
--- a/src/hotspot/share/gc/z/zHeapIterator.hpp
+++ b/src/hotspot/share/gc/z/zHeapIterator.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/z/zMark.hpp b/src/hotspot/share/gc/z/zMark.hpp
index 07e73849af6..cc398addeb8 100644
--- a/src/hotspot/share/gc/z/zMark.hpp
+++ b/src/hotspot/share/gc/z/zMark.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/z/zMark.inline.hpp b/src/hotspot/share/gc/z/zMark.inline.hpp
index 26c84679cc0..c174a7594a4 100644
--- a/src/hotspot/share/gc/z/zMark.inline.hpp
+++ b/src/hotspot/share/gc/z/zMark.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/z/zMarkContext.hpp b/src/hotspot/share/gc/z/zMarkContext.hpp
index 12f56c2f7a5..e79e5e317e3 100644
--- a/src/hotspot/share/gc/z/zMarkContext.hpp
+++ b/src/hotspot/share/gc/z/zMarkContext.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/z/zMarkContext.inline.hpp b/src/hotspot/share/gc/z/zMarkContext.inline.hpp
index 7273a87a8c6..1609f73f3a0 100644
--- a/src/hotspot/share/gc/z/zMarkContext.inline.hpp
+++ b/src/hotspot/share/gc/z/zMarkContext.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/z/zNMethod.hpp b/src/hotspot/share/gc/z/zNMethod.hpp
index 5d797f3fd55..865ea11e7b9 100644
--- a/src/hotspot/share/gc/z/zNMethod.hpp
+++ b/src/hotspot/share/gc/z/zNMethod.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/z/zNMethodTableIteration.hpp b/src/hotspot/share/gc/z/zNMethodTableIteration.hpp
index 34bd7d9b4f8..064c3eafca0 100644
--- a/src/hotspot/share/gc/z/zNMethodTableIteration.hpp
+++ b/src/hotspot/share/gc/z/zNMethodTableIteration.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/z/zPageTable.hpp b/src/hotspot/share/gc/z/zPageTable.hpp
index fadf550d996..350c518e77a 100644
--- a/src/hotspot/share/gc/z/zPageTable.hpp
+++ b/src/hotspot/share/gc/z/zPageTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/z/zRemembered.hpp b/src/hotspot/share/gc/z/zRemembered.hpp
index 6cc76f5dc26..b571d34d590 100644
--- a/src/hotspot/share/gc/z/zRemembered.hpp
+++ b/src/hotspot/share/gc/z/zRemembered.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/z/zStat.hpp b/src/hotspot/share/gc/z/zStat.hpp
index 0078c963626..739c3cd5980 100644
--- a/src/hotspot/share/gc/z/zStat.hpp
+++ b/src/hotspot/share/gc/z/zStat.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/z/zThreadLocalData.hpp b/src/hotspot/share/gc/z/zThreadLocalData.hpp
index 111a64e978e..a141fd8f83a 100644
--- a/src/hotspot/share/gc/z/zThreadLocalData.hpp
+++ b/src/hotspot/share/gc/z/zThreadLocalData.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/z/zUncoloredRoot.hpp b/src/hotspot/share/gc/z/zUncoloredRoot.hpp
index c007176e5c2..040b68673ba 100644
--- a/src/hotspot/share/gc/z/zUncoloredRoot.hpp
+++ b/src/hotspot/share/gc/z/zUncoloredRoot.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/include/jmm.h b/src/hotspot/share/include/jmm.h
index ee1462fe5a8..96139cc43b2 100644
--- a/src/hotspot/share/include/jmm.h
+++ b/src/hotspot/share/include/jmm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/include/jvm.h b/src/hotspot/share/include/jvm.h
index dccdcacef71..7236679d8f3 100644
--- a/src/hotspot/share/include/jvm.h
+++ b/src/hotspot/share/include/jvm.h
@@ -87,6 +87,9 @@ JVM_InternString(JNIEnv *env, jstring str);
 /*
  * java.lang.System
  */
+JNIEXPORT jboolean JNICALL
+JVM_AOTEndRecording(JNIEnv *env);
+
 JNIEXPORT jlong JNICALL
 JVM_CurrentTimeMillis(JNIEnv *env, jclass ignored);
 
diff --git a/src/hotspot/share/include/jvm_io.h b/src/hotspot/share/include/jvm_io.h
index 5233798b5a8..06c5f87952f 100644
--- a/src/hotspot/share/include/jvm_io.h
+++ b/src/hotspot/share/include/jvm_io.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/interpreter/bytecode.hpp b/src/hotspot/share/interpreter/bytecode.hpp
index de83cfe5d71..9d56da9f567 100644
--- a/src/hotspot/share/interpreter/bytecode.hpp
+++ b/src/hotspot/share/interpreter/bytecode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/interpreter/bytecode.inline.hpp b/src/hotspot/share/interpreter/bytecode.inline.hpp
index 139f477d397..18e38809c96 100644
--- a/src/hotspot/share/interpreter/bytecode.inline.hpp
+++ b/src/hotspot/share/interpreter/bytecode.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/interpreter/bytecodeHistogram.hpp b/src/hotspot/share/interpreter/bytecodeHistogram.hpp
index dfa712f9f04..96274f2bf0c 100644
--- a/src/hotspot/share/interpreter/bytecodeHistogram.hpp
+++ b/src/hotspot/share/interpreter/bytecodeHistogram.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/interpreter/bytecodeStream.hpp b/src/hotspot/share/interpreter/bytecodeStream.hpp
index 412951691c5..a6af350a24e 100644
--- a/src/hotspot/share/interpreter/bytecodeStream.hpp
+++ b/src/hotspot/share/interpreter/bytecodeStream.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/interpreter/bytecodeTracer.hpp b/src/hotspot/share/interpreter/bytecodeTracer.hpp
index e7d7a360948..b32e55abbcf 100644
--- a/src/hotspot/share/interpreter/bytecodeTracer.hpp
+++ b/src/hotspot/share/interpreter/bytecodeTracer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/interpreter/interpreter.hpp b/src/hotspot/share/interpreter/interpreter.hpp
index 800429913fd..576146b344e 100644
--- a/src/hotspot/share/interpreter/interpreter.hpp
+++ b/src/hotspot/share/interpreter/interpreter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/interpreter/interpreterRuntime.hpp b/src/hotspot/share/interpreter/interpreterRuntime.hpp
index f553debcd75..70ceeb0b2af 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.hpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/interpreter/linkResolver.hpp b/src/hotspot/share/interpreter/linkResolver.hpp
index 4d28e712c5f..6308e0e09ad 100644
--- a/src/hotspot/share/interpreter/linkResolver.hpp
+++ b/src/hotspot/share/interpreter/linkResolver.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/interpreter/templateInterpreter.hpp b/src/hotspot/share/interpreter/templateInterpreter.hpp
index fd6888ffab8..0b37412737e 100644
--- a/src/hotspot/share/interpreter/templateInterpreter.hpp
+++ b/src/hotspot/share/interpreter/templateInterpreter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp
index 07a7ca6169d..44fd99f79bf 100644
--- a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp
+++ b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.hpp b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.hpp
index 0032109982a..65d4ebebfe7 100644
--- a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.hpp
+++ b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.inline.hpp b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.inline.hpp
index effee05c2f1..f51a26d24bf 100644
--- a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.inline.hpp
+++ b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/interpreter/zero/zeroInterpreter.hpp b/src/hotspot/share/interpreter/zero/zeroInterpreter.hpp
index 79528de639b..a98a4c8caed 100644
--- a/src/hotspot/share/interpreter/zero/zeroInterpreter.hpp
+++ b/src/hotspot/share/interpreter/zero/zeroInterpreter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/interpreter/zero/zeroInterpreterGenerator.hpp b/src/hotspot/share/interpreter/zero/zeroInterpreterGenerator.hpp
index f8db4a07e9a..d8dbd706905 100644
--- a/src/hotspot/share/interpreter/zero/zeroInterpreterGenerator.hpp
+++ b/src/hotspot/share/interpreter/zero/zeroInterpreterGenerator.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp b/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
index d18136e1570..549d879de99 100644
--- a/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
+++ b/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
@@ -47,14 +47,14 @@
 
 bool register_jfr_dcmds() {
   uint32_t full_export = DCmd_Source_Internal | DCmd_Source_AttachAPI | DCmd_Source_MBean;
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrCheckFlightRecordingDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrDumpFlightRecordingDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrStartFlightRecordingDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrStopFlightRecordingDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrCheckFlightRecordingDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrDumpFlightRecordingDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrStartFlightRecordingDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrStopFlightRecordingDCmd>(full_export));
   // JFR.query Uncomment when developing new queries for the JFR.view command
-  // DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrQueryFlightRecordingDCmd>(full_export, true, true));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrViewFlightRecordingDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrConfigureFlightRecorderDCmd>(full_export, true, false));
+  // DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrQueryFlightRecordingDCmd>(full_export, /*hidden=*/true));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrViewFlightRecordingDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrConfigureFlightRecorderDCmd>(full_export));
   return true;
 }
 
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.cpp b/src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.cpp
index 4f96680fa6c..701f75ff87c 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.cpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.cpp
@@ -121,13 +121,14 @@ void BFSClosure::closure_impl(UnifiedOopRef reference, const oop pointee) {
      return;
   }
 
-  if (_use_dfs) {
-    assert(_current_parent != nullptr, "invariant");
-    DFSClosure::find_leaks_from_edge(_edge_store, _mark_bits, _current_parent);
-    return;
-  }
-
   if (!_mark_bits->is_marked(pointee)) {
+
+    if (_use_dfs) {
+      assert(_current_parent != nullptr, "invariant");
+      DFSClosure::find_leaks_from_edge(_edge_store, _mark_bits, _current_parent);
+      return;
+    }
+
     _mark_bits->mark_obj(pointee);
     // is the pointee a sample object?
     if (pointee->mark().is_marked()) {
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp b/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp
index 5f630589257..98364690422 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.hpp b/src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.hpp
index 18cee5de7f2..a0c48b3bb5d 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/eventEmitter.hpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/eventEmitter.hpp
index 3965d0c0ff7..984d0ac6ef2 100644
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/eventEmitter.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/eventEmitter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp
index 63e251d3b67..bff310784c2 100644
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp b/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp
index 66ed9145c81..736ddcad48b 100644
--- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/metadata/jfrSerializer.hpp b/src/hotspot/share/jfr/metadata/jfrSerializer.hpp
index 34ea94acbe8..4e339991e6e 100644
--- a/src/hotspot/share/jfr/metadata/jfrSerializer.hpp
+++ b/src/hotspot/share/jfr/metadata/jfrSerializer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index 18a74454eb6..2b082165005 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -1289,8 +1289,8 @@
     <Field type="ulong" name="inspected" label="Inspected" />
     <Field type="ulong" name="known" label="Known" />
     <Field type="ulong" name="shared" label="Shared" />
-    <Field type="ulong" name="newStrings" label="New Strings" />
-    <Field type="ulong" name="newSize" contentType="bytes" label="New Size" />
+    <Field type="ulong" name="newStrings" label="New Strings" description="New unknown strings" />
+    <Field type="ulong" name="newSize" contentType="bytes" label="New Size" description="Size of new unknown strings" />
     <Field type="ulong" name="replaced" label="Replaced" />
     <Field type="ulong" name="deleted" label="Deleted" />
     <Field type="ulong" name="deduplicated" label="Deduplicated" />
diff --git a/src/hotspot/share/jfr/recorder/jfrEventSetting.hpp b/src/hotspot/share/jfr/recorder/jfrEventSetting.hpp
index 3b2888bf505..68a76e89ae3 100644
--- a/src/hotspot/share/jfr/recorder/jfrEventSetting.hpp
+++ b/src/hotspot/share/jfr/recorder/jfrEventSetting.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackFilterRegistry.hpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackFilterRegistry.hpp
index a3564506924..cc75d974acb 100644
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackFilterRegistry.hpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackFilterRegistry.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp
index 690a5730804..c89fb46f5e5 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolWriter.hpp b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolWriter.hpp
index 5fc41550b66..0853060b913 100644
--- a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolWriter.hpp
+++ b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolWriter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp b/src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp
index 5bdc0015a2b..e9266ce171a 100644
--- a/src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp
+++ b/src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp
@@ -125,20 +125,6 @@ static traceid get_source(const InstanceKlass* ik, JavaThread* jt) {
   return source_id;
 }
 
-static traceid get_source(const AOTClassLocation* cl, JavaThread* jt) {
-  assert(cl != nullptr, "invariant");
-  assert(!cl->is_modules_image(), "invariant");
-  const char* const path = cl->path();
-  assert(path != nullptr, "invariant");
-  size_t len = strlen(path);
-  const char* file_type = cl->file_type_string();
-  assert(file_type != nullptr, "invariant");
-  len += strlen(file_type) + 3; // ":/" + null
-  char* const url = NEW_RESOURCE_ARRAY_IN_THREAD(jt, char, len);
-  jio_snprintf(url, len, "%s%s%s", file_type, ":/", path);
-  return JfrSymbolTable::add(url);
-}
-
 static inline void send_event(const InstanceKlass* ik, traceid source_id) {
   EventClassDefine event;
   event.set_definedClass(ik);
@@ -172,6 +158,20 @@ void JfrClassDefineEvent::on_creation(const InstanceKlass* ik, const ClassFilePa
 }
 
 #if INCLUDE_CDS
+static traceid get_source(const AOTClassLocation* cl, JavaThread* jt) {
+  assert(cl != nullptr, "invariant");
+  assert(!cl->is_modules_image(), "invariant");
+  const char* const path = cl->path();
+  assert(path != nullptr, "invariant");
+  size_t len = strlen(path);
+  const char* file_type = cl->file_type_string();
+  assert(file_type != nullptr, "invariant");
+  len += strlen(file_type) + 3; // ":/" + null
+  char* const url = NEW_RESOURCE_ARRAY_IN_THREAD(jt, char, len);
+  jio_snprintf(url, len, "%s%s%s", file_type, ":/", path);
+  return JfrSymbolTable::add(url);
+}
+
 void JfrClassDefineEvent::on_restoration(const InstanceKlass* ik, JavaThread* jt) {
   assert(ik != nullptr, "invariant");
   assert(ik->trace_id() != 0, "invariant");
diff --git a/src/hotspot/share/jfr/support/jfrDeprecationEventWriter.hpp b/src/hotspot/share/jfr/support/jfrDeprecationEventWriter.hpp
index 85a7ba51732..7f31be3cddf 100644
--- a/src/hotspot/share/jfr/support/jfrDeprecationEventWriter.hpp
+++ b/src/hotspot/share/jfr/support/jfrDeprecationEventWriter.hpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/support/jfrDeprecationManager.hpp b/src/hotspot/share/jfr/support/jfrDeprecationManager.hpp
index 86fe3cd35df..093d94bcd6e 100644
--- a/src/hotspot/share/jfr/support/jfrDeprecationManager.hpp
+++ b/src/hotspot/share/jfr/support/jfrDeprecationManager.hpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/support/jfrObjectAllocationSample.hpp b/src/hotspot/share/jfr/support/jfrObjectAllocationSample.hpp
index cb63d7e1e29..447a7e84f5c 100644
--- a/src/hotspot/share/jfr/support/jfrObjectAllocationSample.hpp
+++ b/src/hotspot/share/jfr/support/jfrObjectAllocationSample.hpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/support/jfrStackTraceMark.hpp b/src/hotspot/share/jfr/support/jfrStackTraceMark.hpp
index 1429c48a278..2815d9f0594 100644
--- a/src/hotspot/share/jfr/support/jfrStackTraceMark.hpp
+++ b/src/hotspot/share/jfr/support/jfrStackTraceMark.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp b/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp
index cf849a7654c..da19080d371 100644
--- a/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp b/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp
index 814f15017e0..86b0df60155 100644
--- a/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/utilities/jfrEpochQueue.inline.hpp b/src/hotspot/share/jfr/utilities/jfrEpochQueue.inline.hpp
index 553d61582c0..28d02f89a26 100644
--- a/src/hotspot/share/jfr/utilities/jfrEpochQueue.inline.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrEpochQueue.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/utilities/jfrRelation.hpp b/src/hotspot/share/jfr/utilities/jfrRelation.hpp
index 9c7dce3d451..455f55c7509 100644
--- a/src/hotspot/share/jfr/utilities/jfrRelation.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrRelation.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp
index af87f2bc5fb..295901ff567 100644
--- a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp
+++ b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp
index ad16b7abde3..2381ecc5741 100644
--- a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp
+++ b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp b/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp
index 83451148c70..c032d0c320b 100644
--- a/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp
+++ b/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jvmci/jvmci.hpp b/src/hotspot/share/jvmci/jvmci.hpp
index 196007fc7dd..02609fb6bb9 100644
--- a/src/hotspot/share/jvmci/jvmci.hpp
+++ b/src/hotspot/share/jvmci/jvmci.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index 5891bec9c8a..a01f95d8cd5 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1218,7 +1218,7 @@ C2V_VMENTRY_0(jint, installCode0, (JNIEnv *env, jobject,
   return result;
 C2V_END
 
-C2V_VMENTRY_0(jobject, getInvalidationReasonDescription, (JNIEnv *env, jobject, jint invalidation_reason))
+C2V_VMENTRY_NULL(jobject, getInvalidationReasonDescription, (JNIEnv *env, jobject, jint invalidation_reason))
   HandleMark hm(THREAD);
   JNIHandleMark jni_hm(thread);
   nmethod::InvalidationReason reason = static_cast<nmethod::InvalidationReason>(invalidation_reason);
diff --git a/src/hotspot/share/jvmci/jvmciEnv.hpp b/src/hotspot/share/jvmci/jvmciEnv.hpp
index fbe5be88c3f..82d9fe1d56c 100644
--- a/src/hotspot/share/jvmci/jvmciEnv.hpp
+++ b/src/hotspot/share/jvmci/jvmciEnv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jvmci/jvmci_globals.hpp b/src/hotspot/share/jvmci/jvmci_globals.hpp
index 05bc9a134c7..730d223e74e 100644
--- a/src/hotspot/share/jvmci/jvmci_globals.hpp
+++ b/src/hotspot/share/jvmci/jvmci_globals.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp b/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp
index de965da0f80..5948951ecd7 100644
--- a/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp
+++ b/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/libadt/vectset.hpp b/src/hotspot/share/libadt/vectset.hpp
index 7dbe70000c7..5cbae2f59a3 100644
--- a/src/hotspot/share/libadt/vectset.hpp
+++ b/src/hotspot/share/libadt/vectset.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/logging/log.hpp b/src/hotspot/share/logging/log.hpp
index 7820e2c21d1..e2541f34662 100644
--- a/src/hotspot/share/logging/log.hpp
+++ b/src/hotspot/share/logging/log.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/logging/logConfiguration.hpp b/src/hotspot/share/logging/logConfiguration.hpp
index 6e84199fdde..ed8a7e35adb 100644
--- a/src/hotspot/share/logging/logConfiguration.hpp
+++ b/src/hotspot/share/logging/logConfiguration.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/logging/logDecorators.hpp b/src/hotspot/share/logging/logDecorators.hpp
index 5b245626ade..fff145729e4 100644
--- a/src/hotspot/share/logging/logDecorators.hpp
+++ b/src/hotspot/share/logging/logDecorators.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/logging/logDiagnosticCommand.cpp b/src/hotspot/share/logging/logDiagnosticCommand.cpp
index adf596afc94..c9b1015ab45 100644
--- a/src/hotspot/share/logging/logDiagnosticCommand.cpp
+++ b/src/hotspot/share/logging/logDiagnosticCommand.cpp
@@ -46,7 +46,7 @@ LogDiagnosticCommand::LogDiagnosticCommand(outputStream* output, bool heap_alloc
 
 void LogDiagnosticCommand::registerCommand() {
   uint32_t full_visibility = DCmd_Source_Internal | DCmd_Source_AttachAPI | DCmd_Source_MBean;
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<LogDiagnosticCommand>(full_visibility, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<LogDiagnosticCommand>(full_visibility));
 }
 
 void LogDiagnosticCommand::execute(DCmdSource source, TRAPS) {
diff --git a/src/hotspot/share/memory/heapInspection.hpp b/src/hotspot/share/memory/heapInspection.hpp
index 58e91217a32..51498d926ec 100644
--- a/src/hotspot/share/memory/heapInspection.hpp
+++ b/src/hotspot/share/memory/heapInspection.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/memory/iterator.hpp b/src/hotspot/share/memory/iterator.hpp
index 25820d6de02..1a639d153fe 100644
--- a/src/hotspot/share/memory/iterator.hpp
+++ b/src/hotspot/share/memory/iterator.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/memory/memoryReserver.hpp b/src/hotspot/share/memory/memoryReserver.hpp
index fd052e5e283..9ef12650b55 100644
--- a/src/hotspot/share/memory/memoryReserver.hpp
+++ b/src/hotspot/share/memory/memoryReserver.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/memory/metaspace/metablock.inline.hpp b/src/hotspot/share/memory/metaspace/metablock.inline.hpp
index 87dceceeb74..23d5ecc1bec 100644
--- a/src/hotspot/share/memory/metaspace/metablock.inline.hpp
+++ b/src/hotspot/share/memory/metaspace/metablock.inline.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2023 Red Hat, Inc. All rights reserved.
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/memory/resourceArea.inline.hpp b/src/hotspot/share/memory/resourceArea.inline.hpp
index cd8890c228d..60afc6acd53 100644
--- a/src/hotspot/share/memory/resourceArea.inline.hpp
+++ b/src/hotspot/share/memory/resourceArea.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/nmt/mallocHeader.hpp b/src/hotspot/share/nmt/mallocHeader.hpp
index acfc7401268..45568243ef3 100644
--- a/src/hotspot/share/nmt/mallocHeader.hpp
+++ b/src/hotspot/share/nmt/mallocHeader.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, 2022 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/share/nmt/mallocHeader.inline.hpp b/src/hotspot/share/nmt/mallocHeader.inline.hpp
index 7bc8a25028c..0ad0b3ddc81 100644
--- a/src/hotspot/share/nmt/mallocHeader.inline.hpp
+++ b/src/hotspot/share/nmt/mallocHeader.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, 2022 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/share/nmt/nativeCallStackPrinter.hpp b/src/hotspot/share/nmt/nativeCallStackPrinter.hpp
index 12bd1176485..79bbd4d16d2 100644
--- a/src/hotspot/share/nmt/nativeCallStackPrinter.hpp
+++ b/src/hotspot/share/nmt/nativeCallStackPrinter.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2024, Red Hat, Inc. All rights reserved.
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/oops/access.hpp b/src/hotspot/share/oops/access.hpp
index 917627f445e..8430e960a27 100644
--- a/src/hotspot/share/oops/access.hpp
+++ b/src/hotspot/share/oops/access.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -128,9 +128,9 @@ class Access: public AllStatic {
 
 protected:
   template <typename T>
-  static inline bool oop_arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, const T* src_raw,
-                                   arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
-                                   size_t length) {
+  static inline OopCopyResult oop_arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, const T* src_raw,
+                                            arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                            size_t length) {
     verify_decorators<ARRAYCOPY_DECORATOR_MASK | IN_HEAP |
                       AS_DECORATOR_MASK | IS_ARRAY | IS_DEST_UNINITIALIZED>();
     return AccessInternal::arraycopy<decorators | INTERNAL_VALUE_IS_OOP>(src_obj, src_offset_in_bytes, src_raw,
@@ -316,19 +316,24 @@ public:
                        length);
   }
 
-  static inline bool oop_arraycopy(arrayOop src_obj, size_t src_offset_in_bytes,
-                                   arrayOop dst_obj, size_t dst_offset_in_bytes,
-                                   size_t length) {
+  [[nodiscard]] // The caller is responsible to throw an exception on failure
+  static inline OopCopyResult oop_arraycopy(arrayOop src_obj, size_t src_offset_in_bytes,
+                                            arrayOop dst_obj, size_t dst_offset_in_bytes,
+                                            size_t length) {
     return AccessT::oop_arraycopy(src_obj, src_offset_in_bytes, static_cast<const HeapWord*>(nullptr),
                                   dst_obj, dst_offset_in_bytes, static_cast<HeapWord*>(nullptr),
                                   length);
   }
 
   template <typename T>
-  static inline bool oop_arraycopy_raw(T* src, T* dst, size_t length) {
-    return AccessT::oop_arraycopy(nullptr, 0, src,
-                                  nullptr, 0, dst,
-                                  length);
+  static inline void oop_arraycopy_raw(T* src, T* dst, size_t length) {
+    static_assert((decorators & ARRAYCOPY_CHECKCAST) == 0);
+
+    OopCopyResult result = AccessT::oop_arraycopy(nullptr, 0, src,
+                                                  nullptr, 0, dst,
+                                                  length);
+
+    assert(result == OopCopyResult::ok, "Should never fail");
   }
 
 };
diff --git a/src/hotspot/share/oops/access.inline.hpp b/src/hotspot/share/oops/access.inline.hpp
index da3d54c4902..fccdfd60862 100644
--- a/src/hotspot/share/oops/access.inline.hpp
+++ b/src/hotspot/share/oops/access.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -125,19 +125,19 @@ namespace AccessInternal {
   template <class GCBarrierType, DecoratorSet decorators>
   struct PostRuntimeDispatch<GCBarrierType, BARRIER_ARRAYCOPY, decorators>: public AllStatic {
     template <typename T>
-    static bool access_barrier(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
-                               arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
-                               size_t length) {
+    static OopCopyResult access_barrier(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                        arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                        size_t length) {
       GCBarrierType::arraycopy_in_heap(src_obj, src_offset_in_bytes, src_raw,
                                        dst_obj, dst_offset_in_bytes, dst_raw,
                                        length);
-      return true;
+      return OopCopyResult::ok;
     }
 
     template <typename T>
-    static bool oop_access_barrier(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
-                                   arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
-                                   size_t length) {
+    static OopCopyResult oop_access_barrier(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                            arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                            size_t length) {
       typedef typename HeapOopType<decorators>::type OopType;
       return GCBarrierType::oop_arraycopy_in_heap(src_obj, src_offset_in_bytes, reinterpret_cast<OopType*>(src_raw),
                                                   dst_obj, dst_offset_in_bytes, reinterpret_cast<OopType*>(dst_raw),
@@ -331,9 +331,9 @@ namespace AccessInternal {
   }
 
   template <DecoratorSet decorators, typename T>
-  bool RuntimeDispatch<decorators, T, BARRIER_ARRAYCOPY>::arraycopy_init(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
-                                                                         arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
-                                                                         size_t length) {
+  OopCopyResult RuntimeDispatch<decorators, T, BARRIER_ARRAYCOPY>::arraycopy_init(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                                                                  arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                                                                  size_t length) {
     func_t function = BarrierResolver<decorators, func_t, BARRIER_ARRAYCOPY>::resolve_barrier();
     _arraycopy_func = function;
     return function(src_obj, src_offset_in_bytes, src_raw,
diff --git a/src/hotspot/share/oops/accessBackend.hpp b/src/hotspot/share/oops/accessBackend.hpp
index f4f4f906efd..03f5fc05729 100644
--- a/src/hotspot/share/oops/accessBackend.hpp
+++ b/src/hotspot/share/oops/accessBackend.hpp
@@ -35,6 +35,13 @@
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 
+// Result from oop_arraycopy
+enum class OopCopyResult {
+  ok,                      // oop array copy sucessful
+  failed_check_class_cast, // oop array copy failed subtype check (ARRAYCOPY_CHECKCAST)
+  failed_check_null        // oop array copy failed null check (ARRAYCOPY_NOTNULL)
+};
+
 // This metafunction returns either oop or narrowOop depending on whether
 // an access needs to use compressed oops or not.
 template <DecoratorSet decorators>
@@ -92,17 +99,17 @@ namespace AccessInternal {
     typedef T (*atomic_cmpxchg_func_t)(void* addr, T compare_value, T new_value);
     typedef T (*atomic_xchg_func_t)(void* addr, T new_value);
 
-    typedef bool (*arraycopy_func_t)(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
-                                     arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
-                                     size_t length);
+    typedef OopCopyResult (*arraycopy_func_t)(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                              arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                              size_t length);
     typedef void (*clone_func_t)(oop src, oop dst, size_t size);
   };
 
   template <DecoratorSet decorators>
   struct AccessFunctionTypes<decorators, void> {
-    typedef bool (*arraycopy_func_t)(arrayOop src_obj, size_t src_offset_in_bytes, void* src,
-                                     arrayOop dst_obj, size_t dst_offset_in_bytes, void* dst,
-                                     size_t length);
+    typedef OopCopyResult (*arraycopy_func_t)(arrayOop src_obj, size_t src_offset_in_bytes, void* src,
+                                              arrayOop dst_obj, size_t dst_offset_in_bytes, void* dst,
+                                              size_t length);
   };
 
   template <DecoratorSet decorators, typename T, BarrierType barrier> struct AccessFunction {};
@@ -505,13 +512,13 @@ namespace AccessInternal {
     typedef typename AccessFunction<decorators, T, BARRIER_ARRAYCOPY>::type func_t;
     static func_t _arraycopy_func;
 
-    static bool arraycopy_init(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
-                               arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
-                               size_t length);
+    static OopCopyResult arraycopy_init(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                        arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                        size_t length);
 
-    static inline bool arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
-                                 arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
-                                 size_t length) {
+    static inline OopCopyResult arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                          arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                          size_t length) {
       assert_access_thread_state();
       return _arraycopy_func(src_obj, src_offset_in_bytes, src_raw,
                              dst_obj, dst_offset_in_bytes, dst_raw,
@@ -820,25 +827,27 @@ namespace AccessInternal {
 
     template <DecoratorSet decorators, typename T>
     inline static typename EnableIf<
-      HasDecorator<decorators, AS_RAW>::value && CanHardwireRaw<decorators>::value, bool>::type
+      HasDecorator<decorators, AS_RAW>::value && CanHardwireRaw<decorators>::value, OopCopyResult>::type
     arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
               arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
               size_t length) {
       typedef RawAccessBarrier<decorators & RAW_DECORATOR_MASK> Raw;
       if (HasDecorator<decorators, INTERNAL_VALUE_IS_OOP>::value) {
-        return Raw::oop_arraycopy(src_obj, src_offset_in_bytes, src_raw,
-                                  dst_obj, dst_offset_in_bytes, dst_raw,
-                                  length);
+        Raw::oop_arraycopy(src_obj, src_offset_in_bytes, src_raw,
+                           dst_obj, dst_offset_in_bytes, dst_raw,
+                           length);
       } else {
-        return Raw::arraycopy(src_obj, src_offset_in_bytes, src_raw,
-                              dst_obj, dst_offset_in_bytes, dst_raw,
-                              length);
+        Raw::arraycopy(src_obj, src_offset_in_bytes, src_raw,
+                       dst_obj, dst_offset_in_bytes, dst_raw,
+                       length);
       }
+
+      return OopCopyResult::ok;
     }
 
     template <DecoratorSet decorators, typename T>
     inline static typename EnableIf<
-      HasDecorator<decorators, AS_RAW>::value && !CanHardwireRaw<decorators>::value, bool>::type
+      HasDecorator<decorators, AS_RAW>::value && !CanHardwireRaw<decorators>::value, OopCopyResult>::type
     arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
               arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
               size_t length) {
@@ -857,7 +866,7 @@ namespace AccessInternal {
 
     template <DecoratorSet decorators, typename T>
     inline static typename EnableIf<
-      !HasDecorator<decorators, AS_RAW>::value, bool>::type
+      !HasDecorator<decorators, AS_RAW>::value, OopCopyResult>::type
     arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
               arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
               size_t length) {
@@ -1001,18 +1010,18 @@ namespace AccessInternal {
   }
 
   template <DecoratorSet decorators, typename T>
-  inline bool arraycopy_reduce_types(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
-                                     arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
-                                     size_t length) {
+  inline OopCopyResult arraycopy_reduce_types(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+                                              arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                              size_t length) {
     return PreRuntimeDispatch::arraycopy<decorators>(src_obj, src_offset_in_bytes, src_raw,
                                                      dst_obj, dst_offset_in_bytes, dst_raw,
                                                      length);
   }
 
   template <DecoratorSet decorators>
-  inline bool arraycopy_reduce_types(arrayOop src_obj, size_t src_offset_in_bytes, HeapWord* src_raw,
-                                     arrayOop dst_obj, size_t dst_offset_in_bytes, HeapWord* dst_raw,
-                                     size_t length) {
+  inline OopCopyResult arraycopy_reduce_types(arrayOop src_obj, size_t src_offset_in_bytes, HeapWord* src_raw,
+                                              arrayOop dst_obj, size_t dst_offset_in_bytes, HeapWord* dst_raw,
+                                              size_t length) {
     const DecoratorSet expanded_decorators = decorators | INTERNAL_CONVERT_COMPRESSED_OOP;
     return PreRuntimeDispatch::arraycopy<expanded_decorators>(src_obj, src_offset_in_bytes, src_raw,
                                                               dst_obj, dst_offset_in_bytes, dst_raw,
@@ -1020,9 +1029,9 @@ namespace AccessInternal {
   }
 
   template <DecoratorSet decorators>
-  inline bool arraycopy_reduce_types(arrayOop src_obj, size_t src_offset_in_bytes, narrowOop* src_raw,
-                                     arrayOop dst_obj, size_t dst_offset_in_bytes, narrowOop* dst_raw,
-                                     size_t length) {
+  inline OopCopyResult arraycopy_reduce_types(arrayOop src_obj, size_t src_offset_in_bytes, narrowOop* src_raw,
+                                              arrayOop dst_obj, size_t dst_offset_in_bytes, narrowOop* dst_raw,
+                                              size_t length) {
     const DecoratorSet expanded_decorators = decorators | INTERNAL_CONVERT_COMPRESSED_OOP |
                                              INTERNAL_RT_USE_COMPRESSED_OOPS;
     return PreRuntimeDispatch::arraycopy<expanded_decorators>(src_obj, src_offset_in_bytes, src_raw,
@@ -1160,9 +1169,9 @@ namespace AccessInternal {
   }
 
   template <DecoratorSet decorators, typename T>
-  inline bool arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, const T* src_raw,
-                        arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
-                        size_t length) {
+  inline OopCopyResult arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, const T* src_raw,
+                                 arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+                                 size_t length) {
     STATIC_ASSERT((HasDecorator<decorators, INTERNAL_VALUE_IS_OOP>::value ||
                    (std::is_same<T, void>::value || std::is_integral<T>::value) ||
                     std::is_floating_point<T>::value)); // arraycopy allows type erased void elements
diff --git a/src/hotspot/share/oops/arrayKlass.hpp b/src/hotspot/share/oops/arrayKlass.hpp
index 6ee783fb510..b9b100f18a8 100644
--- a/src/hotspot/share/oops/arrayKlass.hpp
+++ b/src/hotspot/share/oops/arrayKlass.hpp
@@ -51,15 +51,15 @@ class ArrayKlass: public Klass {
 
  public:
   // Testing operation
-  DEBUG_ONLY(bool is_array_klass_slow() const { return true; })
+  DEBUG_ONLY(bool is_array_klass_slow() const override { return true; })
 
   // Returns the ObjArrayKlass for n'th dimension.
-  ArrayKlass* array_klass(int n, TRAPS);
-  ArrayKlass* array_klass_or_null(int n);
+  ArrayKlass* array_klass(int n, TRAPS) override;
+  ArrayKlass* array_klass_or_null(int n) override;
 
   // Returns the array class with this class as element type.
-  ArrayKlass* array_klass(TRAPS);
-  ArrayKlass* array_klass_or_null();
+  ArrayKlass* array_klass(TRAPS) override;
+  ArrayKlass* array_klass_or_null() override;
 
   // Instance variables
   int dimension() const                 { return _dimension;      }
@@ -79,7 +79,7 @@ class ArrayKlass: public Klass {
   // type of elements (T_OBJECT for both oop arrays and array-arrays)
   BasicType element_type() const        { return layout_helper_element_type(layout_helper()); }
 
-  virtual InstanceKlass* java_super() const;
+  InstanceKlass* java_super() const override;
 
   // Allocation
   // Sizes points to the first dimension of the array, subsequent dimensions
@@ -87,13 +87,13 @@ class ArrayKlass: public Klass {
   virtual oop multi_allocate(int rank, jint* sizes, TRAPS);
 
   // find field according to JVM spec 5.4.3.2, returns the klass in which the field is defined
-  Klass* find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const;
+  Klass* find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const override;
 
   // Lookup operations
   Method* uncached_lookup_method(const Symbol* name,
                                  const Symbol* signature,
                                  OverpassLookupMode overpass_mode,
-                                 PrivateLookupMode private_mode = PrivateLookupMode::find) const;
+                                 PrivateLookupMode private_mode = PrivateLookupMode::find) const override;
 
   static ArrayKlass* cast(Klass* k) {
     return const_cast<ArrayKlass*>(cast(const_cast<const Klass*>(k)));
@@ -105,38 +105,38 @@ class ArrayKlass: public Klass {
   }
 
   GrowableArray<Klass*>* compute_secondary_supers(int num_extra_slots,
-                                                  Array<InstanceKlass*>* transitive_interfaces);
+                                                  Array<InstanceKlass*>* transitive_interfaces) override;
 
   // Sizing
   static int static_size(int header_size);
 
-  virtual void metaspace_pointers_do(MetaspaceClosure* iter);
+  void metaspace_pointers_do(MetaspaceClosure* iter) override;
 
   // Return a handle.
   static void     complete_create_array_klass(ArrayKlass* k, Klass* super_klass, ModuleEntry* module, TRAPS);
 
   // JVMTI support
-  jint jvmti_class_status() const;
+  jint jvmti_class_status() const override;
 
 #if INCLUDE_CDS
   // CDS support - remove and restore oops from metadata. Oops are not shared.
-  virtual void remove_unshareable_info();
-  virtual void remove_java_mirror();
+  void remove_unshareable_info() override;
+  void remove_java_mirror() override;
   void restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS);
   void cds_print_value_on(outputStream* st) const;
 #endif
 
   void log_array_class_load(Klass* k);
   // Printing
-  void print_on(outputStream* st) const;
-  void print_value_on(outputStream* st) const;
+  void print_on(outputStream* st) const override;
+  void print_value_on(outputStream* st) const override;
 
-  void oop_print_on(oop obj, outputStream* st);
+  void oop_print_on(oop obj, outputStream* st) override;
 
   // Verification
-  void verify_on(outputStream* st);
+  void verify_on(outputStream* st) override;
 
-  void oop_verify_on(oop obj, outputStream* st);
+  void oop_verify_on(oop obj, outputStream* st) override;
 };
 
 #endif // SHARE_OOPS_ARRAYKLASS_HPP
diff --git a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
index f6aedc312aa..d13bedcc076 100644
--- a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
+++ b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index e74bc80d893..56a80daed60 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -312,12 +312,11 @@ InstanceKlass* InstanceKlass::nest_host(TRAPS) {
       ss.print("Nest host resolution of %s with host %s failed: ",
                this->external_name(), target_host_class);
       java_lang_Throwable::print(PENDING_EXCEPTION, &ss);
-      const char* msg = ss.as_string(true /* on C-heap */);
       constantPoolHandle cph(THREAD, constants());
-      SystemDictionary::add_nest_host_error(cph, _nest_host_index, msg);
+      SystemDictionary::add_nest_host_error(cph, _nest_host_index, ss);
       CLEAR_PENDING_EXCEPTION;
 
-      log_trace(class, nestmates)("%s", msg);
+      log_trace(class, nestmates)("%s", ss.base());
     } else {
       // A valid nest-host is an instance class in the current package that lists this
       // class as a nest member. If any of these conditions are not met the class is
@@ -356,10 +355,9 @@ InstanceKlass* InstanceKlass::nest_host(TRAPS) {
                  k->external_name(),
                  k->class_loader_data()->loader_name_and_id(),
                  error);
-        const char* msg = ss.as_string(true /* on C-heap */);
         constantPoolHandle cph(THREAD, constants());
-        SystemDictionary::add_nest_host_error(cph, _nest_host_index, msg);
-        log_trace(class, nestmates)("%s", msg);
+        SystemDictionary::add_nest_host_error(cph, _nest_host_index, ss);
+        log_trace(class, nestmates)("%s", ss.base());
       }
     }
   } else {
diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
index a03e6c05b54..23a59d26093 100644
--- a/src/hotspot/share/oops/instanceKlass.hpp
+++ b/src/hotspot/share/oops/instanceKlass.hpp
@@ -313,8 +313,8 @@ class InstanceKlass: public Klass {
 
   bool is_public() const                { return _access_flags.is_public(); }
   bool is_final() const                 { return _access_flags.is_final(); }
-  bool is_interface() const             { return _access_flags.is_interface(); }
-  bool is_abstract() const              { return _access_flags.is_abstract(); }
+  bool is_interface() const override    { return _access_flags.is_interface(); }
+  bool is_abstract() const override     { return _access_flags.is_abstract(); }
   bool is_super() const                 { return _access_flags.is_super(); }
   bool is_synthetic() const             { return _access_flags.is_synthetic(); }
   void set_is_synthetic()               { _access_flags.set_is_synthetic(); }
@@ -494,8 +494,8 @@ public:
   };
 
   // package
-  PackageEntry* package() const     { return _package_entry; }
-  ModuleEntry* module() const;
+  PackageEntry* package() const override { return _package_entry; }
+  ModuleEntry* module() const override;
   bool in_javabase_module() const;
   bool in_unnamed_package() const   { return (_package_entry == nullptr); }
   void set_package(ClassLoaderData* loader_data, PackageEntry* pkg_entry, TRAPS);
@@ -552,11 +552,11 @@ public:
   void set_is_marked_dependent(bool value) { _misc_flags.set_is_marked_dependent(value); }
 
   // initialization (virtuals from Klass)
-  bool should_be_initialized() const;  // means that initialize should be called
+  bool should_be_initialized() const override;  // means that initialize should be called
   void initialize_with_aot_initialized_mirror(TRAPS);
   void assert_no_clinit_will_run_for_aot_initialized_class() const NOT_DEBUG_RETURN;
-  void initialize(TRAPS);
-  void initialize_preemptable(TRAPS);
+  void initialize(TRAPS) override;
+  void initialize_preemptable(TRAPS) override;
   void link_class(TRAPS);
   bool link_class_or_fail(TRAPS); // returns false on failure
   void rewrite_class(TRAPS);
@@ -578,7 +578,7 @@ public:
   // find field in direct superinterfaces, returns the interface in which the field is defined
   Klass* find_interface_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const;
   // find field according to JVM spec 5.4.3.2, returns the klass in which the field is defined
-  Klass* find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const;
+  Klass* find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const override;
   // find instance or static fields according to JVM spec 5.4.3.2, returns the klass in which the field is defined
   Klass* find_field(Symbol* name, Symbol* sig, bool is_static, fieldDescriptor* fd) const;
 
@@ -637,7 +637,7 @@ public:
   Method* uncached_lookup_method(const Symbol* name,
                                  const Symbol* signature,
                                  OverpassLookupMode overpass_mode,
-                                 PrivateLookupMode private_mode = PrivateLookupMode::find) const;
+                                 PrivateLookupMode private_mode = PrivateLookupMode::find) const override;
 
   // lookup a method in all the interfaces that this class implements
   // (returns null if not found)
@@ -660,7 +660,7 @@ public:
   void set_constants(ConstantPool* c)    { _constants = c; }
 
   // protection domain
-  oop protection_domain() const;
+  oop protection_domain() const override;
 
   // signers
   objArrayOop signers() const;
@@ -834,7 +834,7 @@ public:
 
   // Check whether reflection/jni/jvm code is allowed to instantiate this class;
   // if not, throw either an Error or an Exception.
-  virtual void check_valid_for_instantiation(bool throwError, TRAPS);
+  void check_valid_for_instantiation(bool throwError, TRAPS) override;
 
   // initialization
   void call_class_initializer(TRAPS);
@@ -901,12 +901,12 @@ public:
  public:
   // virtual operations from Klass
   GrowableArray<Klass*>* compute_secondary_supers(int num_extra_slots,
-                                                  Array<InstanceKlass*>* transitive_interfaces);
-  bool can_be_primary_super_slow() const;
-  size_t oop_size(oop obj)  const             { return size_helper(); }
+                                                  Array<InstanceKlass*>* transitive_interfaces) override;
+  bool can_be_primary_super_slow() const override;
+  size_t oop_size(oop obj) const override { return size_helper(); }
   // slow because it's a virtual call and used for verifying the layout_helper.
   // Using the layout_helper bits, we can call is_instance_klass without a virtual call.
-  DEBUG_ONLY(bool is_instance_klass_slow() const      { return true; })
+  DEBUG_ONLY(bool is_instance_klass_slow() const override { return true; })
 
   // Iterators
   void do_local_static_fields(FieldClosure* cl);
@@ -932,7 +932,7 @@ public:
     return (Klass::super() == nullptr) ? nullptr : InstanceKlass::cast(Klass::super());
   }
 
-  virtual InstanceKlass* java_super() const {
+  InstanceKlass* java_super() const override {
     return InstanceKlass::super();
   }
 
@@ -949,10 +949,10 @@ public:
            (is_interface ? (int)sizeof(Klass*)/wordSize : 0));
   }
 
-  int size() const                    { return size(vtable_length(),
-                                               itable_length(),
-                                               nonstatic_oop_map_size(),
-                                               is_interface());
+  int size() const override           { return size(vtable_length(),
+                                                    itable_length(),
+                                                    nonstatic_oop_map_size(),
+                                                    is_interface());
   }
 
 
@@ -1008,15 +1008,15 @@ public:
   void static deallocate_record_components(ClassLoaderData* loader_data,
                                            Array<RecordComponent*>* record_component);
 
-  virtual bool on_stack() const;
+  bool on_stack() const override;
 
   // callbacks for actions during class unloading
   static void unload_class(InstanceKlass* ik);
 
-  virtual void release_C_heap_structures(bool release_sub_metadata = true);
+  void release_C_heap_structures(bool release_sub_metadata = true) override;
 
   // Naming
-  const char* signature_name() const;
+  const char* signature_name() const override;
 
   // Oop fields (and metadata) iterators
   //
@@ -1095,12 +1095,12 @@ public:
   oop init_lock() const;
 
   // Returns the array class for the n'th dimension
-  virtual ArrayKlass* array_klass(int n, TRAPS);
-  virtual ArrayKlass* array_klass_or_null(int n);
+  ArrayKlass* array_klass(int n, TRAPS) override;
+  ArrayKlass* array_klass_or_null(int n) override;
 
   // Returns the array class with this class as element type
-  virtual ArrayKlass* array_klass(TRAPS);
-  virtual ArrayKlass* array_klass_or_null();
+  ArrayKlass* array_klass(TRAPS) override;
+  ArrayKlass* array_klass_or_null() override;
 
   static void clean_initialization_error_table();
 private:
@@ -1139,9 +1139,9 @@ public:
 
 #if INCLUDE_CDS
   // CDS support - remove and restore oops from metadata. Oops are not shared.
-  virtual void remove_unshareable_info();
+  void remove_unshareable_info() override;
   void remove_unshareable_flags();
-  virtual void remove_java_mirror();
+  void remove_java_mirror() override;
   void restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, PackageEntry* pkg_entry, TRAPS);
   void init_shared_package_entry();
   bool can_be_verified_at_dumptime() const;
@@ -1154,22 +1154,22 @@ public:
     _misc_flags.set_has_init_deps_processed(true);
   }
 
-  u2 compute_modifier_flags() const;
+  u2 compute_modifier_flags() const override;
 
 public:
   // JVMTI support
-  jint jvmti_class_status() const;
+  jint jvmti_class_status() const override;
 
-  virtual void metaspace_pointers_do(MetaspaceClosure* iter);
+  void metaspace_pointers_do(MetaspaceClosure* iter) override;
 
  public:
   // Printing
-  void print_on(outputStream* st) const;
-  void print_value_on(outputStream* st) const;
+  void print_on(outputStream* st) const override;
+  void print_value_on(outputStream* st) const override;
 
-  void oop_print_value_on(oop obj, outputStream* st);
+  void oop_print_value_on(oop obj, outputStream* st) override;
 
-  void oop_print_on      (oop obj, outputStream* st);
+  void oop_print_on      (oop obj, outputStream* st) override;
 
 #ifndef PRODUCT
   void print_dependent_nmethods(bool verbose = false);
@@ -1177,12 +1177,12 @@ public:
   bool verify_itable_index(int index);
 #endif
 
-  const char* internal_name() const;
+  const char* internal_name() const override;
 
   // Verification
-  void verify_on(outputStream* st);
+  void verify_on(outputStream* st) override;
 
-  void oop_verify_on(oop obj, outputStream* st);
+  void oop_verify_on(oop obj, outputStream* st) override;
 
   // Logging
   void print_class_load_logging(ClassLoaderData* loader_data,
diff --git a/src/hotspot/share/oops/instanceMirrorKlass.hpp b/src/hotspot/share/oops/instanceMirrorKlass.hpp
index 4546f904eca..0768d383d68 100644
--- a/src/hotspot/share/oops/instanceMirrorKlass.hpp
+++ b/src/hotspot/share/oops/instanceMirrorKlass.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,7 @@ class InstanceMirrorKlass: public InstanceKlass {
   }
 
   // Returns the size of the instance including the extra static fields.
-  virtual size_t oop_size(oop obj) const;
+  size_t oop_size(oop obj) const override;
 
   // Static field offset is an offset into the Heap, should be converted by
   // based on UseCompressedOop for traversal
diff --git a/src/hotspot/share/oops/instanceRefKlass.hpp b/src/hotspot/share/oops/instanceRefKlass.hpp
index c372b83a267..fc219d06739 100644
--- a/src/hotspot/share/oops/instanceRefKlass.hpp
+++ b/src/hotspot/share/oops/instanceRefKlass.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -126,7 +126,7 @@ class InstanceRefKlass: public InstanceKlass {
 
  public:
   // Verification
-  void oop_verify_on(oop obj, outputStream* st);
+  void oop_verify_on(oop obj, outputStream* st) override;
 };
 
 #endif // SHARE_OOPS_INSTANCEREFKLASS_HPP
diff --git a/src/hotspot/share/oops/instanceStackChunkKlass.hpp b/src/hotspot/share/oops/instanceStackChunkKlass.hpp
index 5afbc5d00eb..c2da94cef79 100644
--- a/src/hotspot/share/oops/instanceStackChunkKlass.hpp
+++ b/src/hotspot/share/oops/instanceStackChunkKlass.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp
index 25fb900e7d6..b6974762209 100644
--- a/src/hotspot/share/oops/klass.hpp
+++ b/src/hotspot/share/oops/klass.hpp
@@ -215,7 +215,7 @@ protected:
   enum class StaticLookupMode   { find, skip };
   enum class PrivateLookupMode  { find, skip };
 
-  virtual bool is_klass() const { return true; }
+  bool is_klass() const override { return true; }
 
   // super() cannot be InstanceKlass* -- Java arrays are covariant, and _super is used
   // to implement that. NB: the _super of "[Ljava/lang/Integer;" is "[Ljava/lang/Number;"
@@ -649,9 +649,6 @@ public:
   // actual oop size of obj in memory in word size.
   virtual size_t oop_size(oop obj) const = 0;
 
-  // Size of klass in word size.
-  virtual int size() const = 0;
-
   // Returns the Java name for a class (Resource allocated)
   // For arrays, this returns the name of the element with a leading '['.
   // For classes, this returns the name with the package separators
@@ -728,8 +725,8 @@ public:
 
   JFR_ONLY(DEFINE_TRACE_ID_METHODS;)
 
-  virtual void metaspace_pointers_do(MetaspaceClosure* iter);
-  virtual MetaspaceObj::Type type() const { return ClassType; }
+  void metaspace_pointers_do(MetaspaceClosure* iter) override;
+  MetaspaceObj::Type type() const override { return ClassType; }
 
   inline bool is_loader_alive() const;
   inline bool is_loader_present_and_alive() const;
@@ -764,15 +761,13 @@ public:
   virtual jint jvmti_class_status() const;
 
   // Printing
-  virtual void print_on(outputStream* st) const;
+  void print_on(outputStream* st) const override;
 
   virtual void oop_print_value_on(oop obj, outputStream* st);
   virtual void oop_print_on      (oop obj, outputStream* st);
 
   void print_secondary_supers_on(outputStream* st) const;
 
-  virtual const char* internal_name() const = 0;
-
   // Verification
   virtual void verify_on(outputStream* st);
   void verify() { verify_on(tty); }
diff --git a/src/hotspot/share/oops/markWord.hpp b/src/hotspot/share/oops/markWord.hpp
index 6bcbcfe97a0..c54a9f1bf5d 100644
--- a/src/hotspot/share/oops/markWord.hpp
+++ b/src/hotspot/share/oops/markWord.hpp
@@ -60,13 +60,6 @@
 //    [ptr             | 10]  monitor            inflated lock (header is swapped out, UseObjectMonitorTable == false)
 //    [header          | 10]  monitor            inflated lock (UseObjectMonitorTable == true)
 //    [ptr             | 11]  marked             used to mark an object
-//    [0 ............ 0| 00]  inflating          inflation in progress (stack-locking in use)
-//
-//    We assume that stack/thread pointers have the lowest two bits cleared.
-//
-//  - INFLATING() is a distinguished markword value of all zeros that is
-//    used when inflating an existing stack-lock into an ObjectMonitor.
-//    See below for is_being_inflated() and INFLATING().
 
 class BasicLock;
 class ObjectMonitor;
@@ -173,19 +166,6 @@ class markWord {
     return (mask_bits(value(), lock_mask_in_place) == unlocked_value);
   }
 
-  // Special temporary state of the markWord while being inflated.
-  // Code that looks at mark outside a lock need to take this into account.
-  bool is_being_inflated() const { return (value() == 0); }
-
-  // Distinguished markword value - used when inflating over
-  // an existing stack-lock.  0 indicates the markword is "BUSY".
-  // Lockword mutators that use a LD...CAS idiom should always
-  // check for and avoid overwriting a 0 value installed by some
-  // other thread.  (They should spin or block instead.  The 0 value
-  // is transient and *should* be short-lived).
-  // Fast-locking does not use INFLATING.
-  static markWord INFLATING() { return zero(); }    // inflate-in-progress
-
   // Should this header be preserved during GC?
   bool must_be_preserved() const {
     return (!is_unlocked() || !has_no_hash());
@@ -209,42 +189,28 @@ class markWord {
   bool has_monitor() const {
     return ((value() & lock_mask_in_place) == monitor_value);
   }
+  markWord set_has_monitor() const {
+    return markWord((value() & ~lock_mask_in_place) | monitor_value);
+  }
   ObjectMonitor* monitor() const {
     assert(has_monitor(), "check");
     assert(!UseObjectMonitorTable, "Locking with OM table does not use markWord for monitors");
     // Use xor instead of &~ to provide one extra tag-bit check.
     return (ObjectMonitor*) (value() ^ monitor_value);
   }
-  bool has_displaced_mark_helper() const {
-    intptr_t lockbits = value() & lock_mask_in_place;
-    return !UseObjectMonitorTable && lockbits == monitor_value;
-  }
-  markWord displaced_mark_helper() const;
-  void set_displaced_mark_helper(markWord m) const;
-  markWord copy_set_hash(intptr_t hash) const {
-    uintptr_t tmp = value() & (~hash_mask_in_place);
-    tmp |= ((hash & hash_mask) << hash_shift);
-    return markWord(tmp);
-  }
-  // it is only used to be stored into BasicLock as the
-  // indicator that the lock is using heavyweight monitor
-  static markWord unused_mark() {
-    return markWord(marked_value);
-  }
-  // the following two functions create the markWord to be
-  // stored into object header, it encodes monitor info
-  static markWord encode(BasicLock* lock) {
-    return from_pointer(lock);
-  }
+
   static markWord encode(ObjectMonitor* monitor) {
     assert(!UseObjectMonitorTable, "Locking with OM table does not use markWord for monitors");
     uintptr_t tmp = (uintptr_t) monitor;
     return markWord(tmp | monitor_value);
   }
 
-  markWord set_has_monitor() const {
-    return markWord((value() & ~lock_mask_in_place) | monitor_value);
+  bool has_displaced_mark_helper() const {
+    intptr_t lockbits = value() & lock_mask_in_place;
+    return !UseObjectMonitorTable && lockbits == monitor_value;
   }
+  markWord displaced_mark_helper() const;
+  void set_displaced_mark_helper(markWord m) const;
 
   // used to encode pointers during GC
   markWord clear_lock_bits() const { return markWord(value() & ~lock_mask_in_place); }
@@ -269,6 +235,12 @@ class markWord {
     return hash() == no_hash;
   }
 
+  markWord copy_set_hash(intptr_t hash) const {
+    uintptr_t tmp = value() & (~hash_mask_in_place);
+    tmp |= ((hash & hash_mask) << hash_shift);
+    return markWord(tmp);
+  }
+
   inline Klass* klass() const;
   inline Klass* klass_or_null() const;
   inline Klass* klass_without_asserts() const;
diff --git a/src/hotspot/share/oops/metadata.hpp b/src/hotspot/share/oops/metadata.hpp
index 5a890a27fa1..d88bd9d087d 100644
--- a/src/hotspot/share/oops/metadata.hpp
+++ b/src/hotspot/share/oops/metadata.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/oops/methodData.hpp b/src/hotspot/share/oops/methodData.hpp
index f9f36c8ad15..196537359b5 100644
--- a/src/hotspot/share/oops/methodData.hpp
+++ b/src/hotspot/share/oops/methodData.hpp
@@ -1148,6 +1148,8 @@ public:
 // is seen. A per ReceiverTypeData counter is incremented on type
 // overflow (when there's no more room for a not yet profiled Klass*).
 //
+// Updated by platform-specific code, for example MacroAssembler::profile_receiver_type.
+//
 class ReceiverTypeData : public CounterData {
   friend class VMStructs;
   friend class JVMCIVMStructs;
diff --git a/src/hotspot/share/oops/objArrayKlass.cpp b/src/hotspot/share/oops/objArrayKlass.cpp
index ba2bc7f889f..2bbe898adbd 100644
--- a/src/hotspot/share/oops/objArrayKlass.cpp
+++ b/src/hotspot/share/oops/objArrayKlass.cpp
@@ -185,38 +185,59 @@ oop ObjArrayKlass::multi_allocate(int rank, jint* sizes, TRAPS) {
   return h_array();
 }
 
+static void throw_array_store_exception(arrayOop src, arrayOop dst, TRAPS) {
+  ResourceMark rm(THREAD);
+  Klass* bound = ObjArrayKlass::cast(dst->klass())->element_klass();
+  Klass* stype = ObjArrayKlass::cast(src->klass())->element_klass();
+  stringStream ss;
+  if (!bound->is_subtype_of(stype)) {
+    ss.print("arraycopy: type mismatch: can not copy %s[] into %s[]",
+             stype->external_name(), bound->external_name());
+  } else {
+    // oop_arraycopy should return the index in the source array that
+    // contains the problematic oop.
+    ss.print("arraycopy: element type mismatch: can not cast one of the elements"
+             " of %s[] to the type of the destination array, %s",
+             stype->external_name(), bound->external_name());
+  }
+  THROW_MSG(vmSymbols::java_lang_ArrayStoreException(), ss.as_string());
+}
+
 // Either oop or narrowOop depending on UseCompressedOops.
 void ObjArrayKlass::do_copy(arrayOop s, size_t src_offset,
                             arrayOop d, size_t dst_offset, int length, TRAPS) {
   if (s == d) {
     // since source and destination are equal we do not need conversion checks.
     assert(length > 0, "sanity check");
-    ArrayAccess<>::oop_arraycopy(s, src_offset, d, dst_offset, length);
+    OopCopyResult result = ArrayAccess<>::oop_arraycopy(s, src_offset, d, dst_offset, length);
+    assert(result == OopCopyResult::ok, "Should never fail");
   } else {
     // We have to make sure all elements conform to the destination array
     Klass* bound = ObjArrayKlass::cast(d->klass())->element_klass();
     Klass* stype = ObjArrayKlass::cast(s->klass())->element_klass();
-    if (stype == bound || stype->is_subtype_of(bound)) {
-      // elements are guaranteed to be subtypes, so no check necessary
-      ArrayAccess<ARRAYCOPY_DISJOINT>::oop_arraycopy(s, src_offset, d, dst_offset, length);
-    } else {
-      // slow case: need individual subtype checks
-      // note: don't use obj_at_put below because it includes a redundant store check
-      if (!ArrayAccess<ARRAYCOPY_DISJOINT | ARRAYCOPY_CHECKCAST>::oop_arraycopy(s, src_offset, d, dst_offset, length)) {
-        ResourceMark rm(THREAD);
-        stringStream ss;
-        if (!bound->is_subtype_of(stype)) {
-          ss.print("arraycopy: type mismatch: can not copy %s[] into %s[]",
-                   stype->external_name(), bound->external_name());
-        } else {
-          // oop_arraycopy should return the index in the source array that
-          // contains the problematic oop.
-          ss.print("arraycopy: element type mismatch: can not cast one of the elements"
-                   " of %s[] to the type of the destination array, %s",
-                   stype->external_name(), bound->external_name());
-        }
-        THROW_MSG(vmSymbols::java_lang_ArrayStoreException(), ss.as_string());
+    bool type_check = stype != bound && !stype->is_subtype_of(bound);
+
+    auto arraycopy = [&] {
+      if (type_check) {
+        return ArrayAccess<ARRAYCOPY_DISJOINT | ARRAYCOPY_CHECKCAST>::
+            oop_arraycopy(s, src_offset, d, dst_offset, length);
+      } else {
+        return ArrayAccess<ARRAYCOPY_DISJOINT>::
+            oop_arraycopy(s, src_offset, d, dst_offset, length);
       }
+    };
+
+    OopCopyResult result = arraycopy();
+
+    switch (result) {
+    case OopCopyResult::ok:
+      // Done
+      break;
+    case OopCopyResult::failed_check_class_cast:
+      throw_array_store_exception(s, d, JavaThread::current());
+      break;
+    default:
+      ShouldNotReachHere();
     }
   }
 }
diff --git a/src/hotspot/share/oops/objArrayKlass.hpp b/src/hotspot/share/oops/objArrayKlass.hpp
index 1a4f7f657d2..12db56351ed 100644
--- a/src/hotspot/share/oops/objArrayKlass.hpp
+++ b/src/hotspot/share/oops/objArrayKlass.hpp
@@ -72,29 +72,29 @@ class ObjArrayKlass : public ArrayKlass {
   void set_bottom_klass(Klass* k)   { _bottom_klass = k; }
   Klass** bottom_klass_addr()       { return &_bottom_klass; }
 
-  ModuleEntry* module() const;
-  PackageEntry* package() const;
+  ModuleEntry* module() const override;
+  PackageEntry* package() const override;
 
   // Dispatched operation
-  bool can_be_primary_super_slow() const;
+  bool can_be_primary_super_slow() const override;
   GrowableArray<Klass*>* compute_secondary_supers(int num_extra_slots,
-                                                  Array<InstanceKlass*>* transitive_interfaces);
-  DEBUG_ONLY(bool is_objArray_klass_slow()  const  { return true; })
-  size_t oop_size(oop obj) const;
+                                                  Array<InstanceKlass*>* transitive_interfaces) override;
+  DEBUG_ONLY(bool is_objArray_klass_slow() const override { return true; })
+  size_t oop_size(oop obj) const override;
 
   // Allocation
   static ObjArrayKlass* allocate_objArray_klass(ClassLoaderData* loader_data,
                                                 int n, Klass* element_klass, TRAPS);
 
-  oop multi_allocate(int rank, jint* sizes, TRAPS);
+  oop multi_allocate(int rank, jint* sizes, TRAPS) override;
 
   // Copying
-  void  copy_array(arrayOop s, int src_pos, arrayOop d, int dst_pos, int length, TRAPS);
+  void copy_array(arrayOop s, int src_pos, arrayOop d, int dst_pos, int length, TRAPS) override;
 
   // Compute protection domain
-  oop protection_domain() const { return bottom_klass()->protection_domain(); }
+  oop protection_domain() const override { return bottom_klass()->protection_domain(); }
 
-  virtual void metaspace_pointers_do(MetaspaceClosure* iter);
+  virtual void metaspace_pointers_do(MetaspaceClosure* iter) override;
 
  private:
   // Either oop or narrowOop depending on UseCompressedOops.
@@ -114,10 +114,10 @@ class ObjArrayKlass : public ArrayKlass {
 
   // Sizing
   static int header_size()                { return sizeof(ObjArrayKlass)/wordSize; }
-  int size() const                        { return ArrayKlass::static_size(header_size()); }
+  int size() const override               { return ArrayKlass::static_size(header_size()); }
 
   // Initialization (virtual from Klass)
-  void initialize(TRAPS);
+  void initialize(TRAPS) override;
 
   // Oop fields (and metadata) iterators
   //
@@ -150,24 +150,24 @@ class ObjArrayKlass : public ArrayKlass {
   inline void oop_oop_iterate_elements_bounded(objArrayOop a, OopClosureType* closure, void* low, void* high);
 
  public:
-  u2 compute_modifier_flags() const;
+  u2 compute_modifier_flags() const override;
 
  public:
   // Printing
-  void print_on(outputStream* st) const;
-  void print_value_on(outputStream* st) const;
+  void print_on(outputStream* st) const override;
+  void print_value_on(outputStream* st) const override;
 
-  void oop_print_value_on(oop obj, outputStream* st);
+  void oop_print_value_on(oop obj, outputStream* st) override;
 #ifndef PRODUCT
-  void oop_print_on      (oop obj, outputStream* st);
+  void oop_print_on      (oop obj, outputStream* st) override;
 #endif //PRODUCT
 
-  const char* internal_name() const;
+  const char* internal_name() const override;
 
   // Verification
-  void verify_on(outputStream* st);
+  void verify_on(outputStream* st) override;
 
-  void oop_verify_on(oop obj, outputStream* st);
+  void oop_verify_on(oop obj, outputStream* st) override;
 };
 
 #endif // SHARE_OOPS_OBJARRAYKLASS_HPP
diff --git a/src/hotspot/share/oops/oopCast.inline.hpp b/src/hotspot/share/oops/oopCast.inline.hpp
index 1b21b3fd4e7..ecc0f1c173d 100644
--- a/src/hotspot/share/oops/oopCast.inline.hpp
+++ b/src/hotspot/share/oops/oopCast.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/oops/oopHandle.inline.hpp b/src/hotspot/share/oops/oopHandle.inline.hpp
index 343d677ab04..2080a8984ab 100644
--- a/src/hotspot/share/oops/oopHandle.inline.hpp
+++ b/src/hotspot/share/oops/oopHandle.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/oops/stackChunkOop.hpp b/src/hotspot/share/oops/stackChunkOop.hpp
index 79944f0326e..55ed9ee237c 100644
--- a/src/hotspot/share/oops/stackChunkOop.hpp
+++ b/src/hotspot/share/oops/stackChunkOop.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/oops/typeArrayKlass.hpp b/src/hotspot/share/oops/typeArrayKlass.hpp
index 22600702fe2..87a41a6d4b3 100644
--- a/src/hotspot/share/oops/typeArrayKlass.hpp
+++ b/src/hotspot/share/oops/typeArrayKlass.hpp
@@ -56,10 +56,10 @@ class TypeArrayKlass : public ArrayKlass {
   jint max_length()                     { return _max_length; }
   void set_max_length(jint m)           { _max_length = m;    }
 
-  u2 compute_modifier_flags() const;
+  u2 compute_modifier_flags() const override;
 
   // testers
-  DEBUG_ONLY(bool is_typeArray_klass_slow() const  { return true; })
+  DEBUG_ONLY(bool is_typeArray_klass_slow() const override { return true; })
 
   // klass allocation
   static TypeArrayKlass* create_klass(BasicType type, const char* name_str,
@@ -68,15 +68,15 @@ class TypeArrayKlass : public ArrayKlass {
     return create_klass(type, external_name(type), THREAD);
   }
 
-  size_t oop_size(oop obj) const;
+  size_t oop_size(oop obj) const override;
 
   // Allocation
-  oop multi_allocate(int rank, jint* sizes, TRAPS);
+  oop multi_allocate(int rank, jint* sizes, TRAPS) override;
 
-  oop protection_domain() const { return nullptr; }
+  oop protection_domain() const override { return nullptr; }
 
   // Copying
-  void  copy_array(arrayOop s, int src_pos, arrayOop d, int dst_pos, int length, TRAPS);
+  void  copy_array(arrayOop s, int src_pos, arrayOop d, int dst_pos, int length, TRAPS) override;
 
   // Oop iterators. Since there are no oops in TypeArrayKlasses,
   // these functions only return the size of the object.
@@ -113,23 +113,23 @@ class TypeArrayKlass : public ArrayKlass {
 
   // Sizing
   static int header_size()  { return sizeof(TypeArrayKlass)/wordSize; }
-  int size() const          { return ArrayKlass::static_size(header_size()); }
+  int size() const override { return ArrayKlass::static_size(header_size()); }
 
   // Initialization (virtual from Klass)
-  void initialize(TRAPS);
+  void initialize(TRAPS) override;
 
  public:
   // Printing
-  void oop_print_on(oop obj, outputStream* st);
+  void oop_print_on(oop obj, outputStream* st) override;
   void oop_print_elements_on(typeArrayOop ta, outputStream* st);
-  void print_on(outputStream* st) const;
-  void print_value_on(outputStream* st) const;
+  void print_on(outputStream* st) const override;
+  void print_value_on(outputStream* st) const override;
 
  public:
-  const char* internal_name() const;
+  const char* internal_name() const override;
 
-  ModuleEntry* module() const;
-  PackageEntry* package() const;
+  ModuleEntry* module() const override;
+  PackageEntry* package() const override;
 };
 
 #endif // SHARE_OOPS_TYPEARRAYKLASS_HPP
diff --git a/src/hotspot/share/oops/weakHandle.inline.hpp b/src/hotspot/share/oops/weakHandle.inline.hpp
index 30bdac5a74e..a6e24c19f58 100644
--- a/src/hotspot/share/oops/weakHandle.inline.hpp
+++ b/src/hotspot/share/oops/weakHandle.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/opto/addnode.cpp b/src/hotspot/share/opto/addnode.cpp
index 6075317d86e..40cd6337c17 100644
--- a/src/hotspot/share/opto/addnode.cpp
+++ b/src/hotspot/share/opto/addnode.cpp
@@ -31,8 +31,8 @@
 #include "opto/movenode.hpp"
 #include "opto/mulnode.hpp"
 #include "opto/phaseX.hpp"
+#include "opto/rangeinference.hpp"
 #include "opto/subnode.hpp"
-#include "opto/utilities/xor.hpp"
 #include "runtime/stubRoutines.hpp"
 
 // Portions of code courtesy of Clifford Click
@@ -1011,35 +1011,8 @@ Node* OrINode::Ideal(PhaseGVN* phase, bool can_reshape) {
 // the logical operations the ring's ADD is really a logical OR function.
 // This also type-checks the inputs for sanity.  Guaranteed never to
 // be passed a TOP or BOTTOM type, these are filtered out by pre-check.
-const Type *OrINode::add_ring( const Type *t0, const Type *t1 ) const {
-  const TypeInt *r0 = t0->is_int(); // Handy access
-  const TypeInt *r1 = t1->is_int();
-
-  // If both args are bool, can figure out better types
-  if ( r0 == TypeInt::BOOL ) {
-    if ( r1 == TypeInt::ONE) {
-      return TypeInt::ONE;
-    } else if ( r1 == TypeInt::BOOL ) {
-      return TypeInt::BOOL;
-    }
-  } else if ( r0 == TypeInt::ONE ) {
-    if ( r1 == TypeInt::BOOL ) {
-      return TypeInt::ONE;
-    }
-  }
-
-  // If either input is all ones, the output is all ones.
-  // x | ~0 == ~0 <==> x | -1 == -1
-  if (r0 == TypeInt::MINUS_1 || r1 == TypeInt::MINUS_1) {
-    return TypeInt::MINUS_1;
-  }
-
-  // If either input is not a constant, just return all integers.
-  if( !r0->is_con() || !r1->is_con() )
-    return TypeInt::INT;        // Any integer, but still no symbols.
-
-  // Otherwise just OR them bits.
-  return TypeInt::make( r0->get_con() | r1->get_con() );
+const Type* OrINode::add_ring(const Type* t1, const Type* t2) const {
+  return RangeInference::infer_or(t1->is_int(), t2->is_int());
 }
 
 //=============================================================================
@@ -1087,22 +1060,8 @@ Node* OrLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
 }
 
 //------------------------------add_ring---------------------------------------
-const Type *OrLNode::add_ring( const Type *t0, const Type *t1 ) const {
-  const TypeLong *r0 = t0->is_long(); // Handy access
-  const TypeLong *r1 = t1->is_long();
-
-  // If either input is all ones, the output is all ones.
-  // x | ~0 == ~0 <==> x | -1 == -1
-  if (r0 == TypeLong::MINUS_1 || r1 == TypeLong::MINUS_1) {
-    return TypeLong::MINUS_1;
-  }
-
-  // If either input is not a constant, just return all integers.
-  if( !r0->is_con() || !r1->is_con() )
-    return TypeLong::LONG;      // Any integer, but still no symbols.
-
-  // Otherwise just OR them bits.
-  return TypeLong::make( r0->get_con() | r1->get_con() );
+const Type* OrLNode::add_ring(const Type* t1, const Type* t2) const {
+  return RangeInference::infer_or(t1->is_long(), t2->is_long());
 }
 
 //---------------------------Helper -------------------------------------------
@@ -1189,46 +1148,14 @@ const Type* XorINode::Value(PhaseGVN* phase) const {
 // the logical operations the ring's ADD is really a logical OR function.
 // This also type-checks the inputs for sanity.  Guaranteed never to
 // be passed a TOP or BOTTOM type, these are filtered out by pre-check.
-const Type *XorINode::add_ring( const Type *t0, const Type *t1 ) const {
-  const TypeInt *r0 = t0->is_int(); // Handy access
-  const TypeInt *r1 = t1->is_int();
-
-  if (r0->is_con() && r1->is_con()) {
-    // compute constant result
-    return TypeInt::make(r0->get_con() ^ r1->get_con());
-  }
-
-  // At least one of the arguments is not constant
-
-  if (r0->_lo >= 0 && r1->_lo >= 0) {
-      // Combine [r0->_lo, r0->_hi] ^ [r0->_lo, r1->_hi] -> [0, upper_bound]
-      jint upper_bound = xor_upper_bound_for_ranges<jint, juint>(r0->_hi, r1->_hi);
-      return TypeInt::make(0, upper_bound, MAX2(r0->_widen, r1->_widen));
-  }
-
-  return TypeInt::INT;
+const Type* XorINode::add_ring(const Type* t1, const Type* t2) const {
+  return RangeInference::infer_xor(t1->is_int(), t2->is_int());
 }
 
 //=============================================================================
 //------------------------------add_ring---------------------------------------
-const Type *XorLNode::add_ring( const Type *t0, const Type *t1 ) const {
-  const TypeLong *r0 = t0->is_long(); // Handy access
-  const TypeLong *r1 = t1->is_long();
-
-  if (r0->is_con() && r1->is_con()) {
-    // compute constant result
-    return TypeLong::make(r0->get_con() ^ r1->get_con());
-  }
-
-  // At least one of the arguments is not constant
-
-  if (r0->_lo >= 0 && r1->_lo >= 0) {
-      // Combine [r0->_lo, r0->_hi] ^ [r0->_lo, r1->_hi] -> [0, upper_bound]
-      julong upper_bound = xor_upper_bound_for_ranges<jlong, julong>(r0->_hi, r1->_hi);
-      return TypeLong::make(0, upper_bound, MAX2(r0->_widen, r1->_widen));
-  }
-
-  return TypeLong::LONG;
+const Type* XorLNode::add_ring(const Type* t1, const Type* t2) const {
+  return RangeInference::infer_xor(t1->is_long(), t2->is_long());
 }
 
 Node* XorLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
@@ -1401,6 +1328,10 @@ static ConstAddOperands as_add_with_constant(Node* n) {
 }
 
 Node* MaxNode::IdealI(PhaseGVN* phase, bool can_reshape) {
+  Node* n = AddNode::Ideal(phase, can_reshape);
+  if (n != nullptr) {
+    return n;
+  }
   int opcode = Opcode();
   assert(opcode == Op_MinI || opcode == Op_MaxI, "Unexpected opcode");
   // Try to transform the following pattern, in any of its four possible
@@ -1598,8 +1529,10 @@ static Node* fold_subI_no_underflow_pattern(Node* n, PhaseGVN* phase) {
         Node* x    = add2->in(1);
         Node* con2 = add2->in(2);
         if (is_sub_con(con2)) {
+          // The graph could be dying (i.e. x is top) in which case type(x) is not a long.
+          const TypeLong* x_long = phase->type(x)->isa_long();
           // Collapsed graph not equivalent if potential over/underflow -> bailing out (*)
-          if (can_overflow(phase->type(x)->is_long(), con1->get_long() + con2->get_long())) {
+          if (x_long == nullptr || can_overflow(x_long, con1->get_long() + con2->get_long())) {
             return nullptr;
           }
           Node* new_con = phase->transform(new AddLNode(con1, con2));
diff --git a/src/hotspot/share/opto/addnode.hpp b/src/hotspot/share/opto/addnode.hpp
index 28ed73121ed..1bbdae92e48 100644
--- a/src/hotspot/share/opto/addnode.hpp
+++ b/src/hotspot/share/opto/addnode.hpp
@@ -246,6 +246,13 @@ public:
 
   // Do not match base-ptr edge
   virtual uint match_edge(uint idx) const;
+
+#ifdef ASSERT
+  bool address_input_has_same_base() const {
+    Node *addp = in(Address);
+    return !addp->is_AddP() || addp->in(Base)->is_top() || addp->in(Base) == in(Base);
+  }
+#endif
 };
 
 //------------------------------OrINode----------------------------------------
diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index 2b2b4db47b1..f470049bf7e 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -675,9 +675,6 @@
   product(bool, PrintIntrinsics, false, DIAGNOSTIC,                         \
           "prints attempted and successful inlining of intrinsics")         \
                                                                             \
-  develop(bool, VerifyIntrinsicChecks, false,                               \
-          "Verify in intrinsic that Java level checks work as expected")    \
-                                                                            \
   develop(bool, StressReflectiveCode, false,                                \
           "Use inexact types at allocations, etc., to test reflection")     \
                                                                             \
@@ -697,7 +694,8 @@
           "Print progress during Iterative Global Value Numbering")         \
                                                                             \
   develop(uint, VerifyIterativeGVN, 0,                                      \
-          "Verify Iterative Global Value Numbering =DCBA, with:"            \
+          "Verify Iterative Global Value Numbering =EDCBA, with:"           \
+          "  E: verify node specific invariants"                            \
           "  D: verify Node::Identity did not miss opportunities"           \
           "  C: verify Node::Ideal did not miss opportunities"              \
           "  B: verify that type(n) == n->Value() after IGVN"               \
diff --git a/src/hotspot/share/opto/callGenerator.cpp b/src/hotspot/share/opto/callGenerator.cpp
index db03dd9d80c..1465da02ac8 100644
--- a/src/hotspot/share/opto/callGenerator.cpp
+++ b/src/hotspot/share/opto/callGenerator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -418,7 +418,8 @@ bool LateInlineMHCallGenerator::do_late_inline_check(Compile* C, JVMState* jvms)
       C->inline_printer()->record(cg->method(), call_node()->jvms(), InliningResult::FAILURE,
                                   "late method handle call resolution");
     }
-    assert(!cg->is_late_inline() || cg->is_mh_late_inline() || AlwaysIncrementalInline || StressIncrementalInlining, "we're doing late inlining");
+    assert(!cg->is_late_inline() || cg->is_mh_late_inline() || cg->is_virtual_late_inline() ||
+           AlwaysIncrementalInline || StressIncrementalInlining, "we're doing late inlining");
     _inline_cg = cg;
     return true;
   } else {
diff --git a/src/hotspot/share/opto/callGenerator.hpp b/src/hotspot/share/opto/callGenerator.hpp
index e24ea5e5356..75ba6f709c0 100644
--- a/src/hotspot/share/opto/callGenerator.hpp
+++ b/src/hotspot/share/opto/callGenerator.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/opto/callnode.hpp b/src/hotspot/share/opto/callnode.hpp
index 90a86d76679..de4b8941359 100644
--- a/src/hotspot/share/opto/callnode.hpp
+++ b/src/hotspot/share/opto/callnode.hpp
@@ -943,9 +943,8 @@ protected:
   TupleNode* make_tuple_of_input_state_and_top_return_values(const Compile* C) const;
 
 public:
-  CallLeafPureNode(const TypeFunc* tf, address addr, const char* name,
-                   const TypePtr* adr_type)
-      : CallLeafNode(tf, addr, name, adr_type) {
+  CallLeafPureNode(const TypeFunc* tf, address addr, const char* name)
+      : CallLeafNode(tf, addr, name, nullptr) {
     init_class_id(Class_CallLeafPure);
   }
   int Opcode() const override;
diff --git a/src/hotspot/share/opto/castnode.cpp b/src/hotspot/share/opto/castnode.cpp
index 6d899c1f950..998b6a79903 100644
--- a/src/hotspot/share/opto/castnode.cpp
+++ b/src/hotspot/share/opto/castnode.cpp
@@ -22,7 +22,6 @@
  *
  */
 
-#include "castnode.hpp"
 #include "opto/addnode.hpp"
 #include "opto/callnode.hpp"
 #include "opto/castnode.hpp"
@@ -35,12 +34,22 @@
 #include "opto/type.hpp"
 #include "utilities/checkedCast.hpp"
 
+const ConstraintCastNode::DependencyType ConstraintCastNode::DependencyType::FloatingNarrowing(true, true, "floating narrowing dependency"); // not pinned, narrows type
+const ConstraintCastNode::DependencyType ConstraintCastNode::DependencyType::FloatingNonNarrowing(true, false, "floating non-narrowing dependency"); // not pinned, doesn't narrow type
+const ConstraintCastNode::DependencyType ConstraintCastNode::DependencyType::NonFloatingNarrowing(false, true, "non-floating narrowing dependency"); // pinned, narrows type
+const ConstraintCastNode::DependencyType ConstraintCastNode::DependencyType::NonFloatingNonNarrowing(false, false, "non-floating non-narrowing dependency"); // pinned, doesn't narrow type
+
 //=============================================================================
 // If input is already higher or equal to cast type, then this is an identity.
 Node* ConstraintCastNode::Identity(PhaseGVN* phase) {
-  if (_dependency == UnconditionalDependency) {
+  if (!_dependency.narrows_type()) {
+    // If this cast doesn't carry a type dependency (i.e. not used for type narrowing), we cannot optimize it.
     return this;
   }
+
+  // This cast node carries a type dependency. We can remove it if:
+  // - Its input has a narrower type
+  // - There's a dominating cast with same input but narrower type
   Node* dom = dominating_cast(phase, phase);
   if (dom != nullptr) {
     return dom;
@@ -109,7 +118,7 @@ Node* ConstraintCastNode::Ideal(PhaseGVN* phase, bool can_reshape) {
 }
 
 uint ConstraintCastNode::hash() const {
-  return TypeNode::hash() + (int)_dependency + (_extra_types != nullptr ? _extra_types->hash() : 0);
+  return TypeNode::hash() + _dependency.hash() + (_extra_types != nullptr ? _extra_types->hash() : 0);
 }
 
 bool ConstraintCastNode::cmp(const Node &n) const {
@@ -117,7 +126,7 @@ bool ConstraintCastNode::cmp(const Node &n) const {
     return false;
   }
   ConstraintCastNode& cast = (ConstraintCastNode&) n;
-  if (cast._dependency != _dependency) {
+  if (!cast._dependency.cmp(_dependency)) {
     return false;
   }
   if (_extra_types == nullptr || cast._extra_types == nullptr) {
@@ -130,7 +139,7 @@ uint ConstraintCastNode::size_of() const {
   return sizeof(*this);
 }
 
-Node* ConstraintCastNode::make_cast_for_basic_type(Node* c, Node* n, const Type* t, DependencyType dependency, BasicType bt) {
+Node* ConstraintCastNode::make_cast_for_basic_type(Node* c, Node* n, const Type* t, const DependencyType& dependency, BasicType bt) {
   switch(bt) {
   case T_INT:
     return new CastIINode(c, n, t, dependency);
@@ -143,9 +152,9 @@ Node* ConstraintCastNode::make_cast_for_basic_type(Node* c, Node* n, const Type*
 }
 
 TypeNode* ConstraintCastNode::dominating_cast(PhaseGVN* gvn, PhaseTransform* pt) const {
-  if (_dependency == UnconditionalDependency) {
-    return nullptr;
-  }
+  // See discussion at definition of ConstraintCastNode::DependencyType: replacing this cast with a dominating one is
+  // not safe if _dependency.narrows_type() is not true.
+  assert(_dependency.narrows_type(), "cast can't be replaced by dominating one");
   Node* val = in(1);
   Node* ctl = in(0);
   int opc = Opcode();
@@ -205,30 +214,21 @@ void ConstraintCastNode::dump_spec(outputStream *st) const {
     st->print(" extra types: ");
     _extra_types->dump_on(st);
   }
-  if (_dependency != RegularDependency) {
-    st->print(" %s dependency", _dependency == StrongDependency ? "strong" : "unconditional");
-  }
+  st->print(" ");
+  _dependency.dump_on(st);
 }
 #endif
 
-const Type* CastIINode::Value(PhaseGVN* phase) const {
-  const Type *res = ConstraintCastNode::Value(phase);
-  if (res == Type::TOP) {
-    return Type::TOP;
-  }
-  assert(res->isa_int(), "res must be int");
-
-  // Similar to ConvI2LNode::Value() for the same reasons
-  // see if we can remove type assertion after loop opts
-  res = widen_type(phase, res, T_INT);
-
-  return res;
+CastIINode* CastIINode::make_with(Node* parent, const TypeInteger* type, const DependencyType& dependency) const {
+  return new CastIINode(in(0), parent, type, dependency, _range_check_dependency, _extra_types);
 }
 
-Node* ConstraintCastNode::find_or_make_integer_cast(PhaseIterGVN* igvn, Node* parent, const TypeInteger* type) const {
-  Node* n = clone();
-  n->set_req(1, parent);
-  n->as_ConstraintCast()->set_type(type);
+CastLLNode* CastLLNode::make_with(Node* parent, const TypeInteger* type, const DependencyType& dependency) const {
+  return new CastLLNode(in(0), parent, type, dependency, _extra_types);
+}
+
+Node* ConstraintCastNode::find_or_make_integer_cast(PhaseIterGVN* igvn, Node* parent, const TypeInteger* type, const DependencyType& dependency) const {
+  Node* n = make_with(parent, type, dependency);
   Node* existing = igvn->hash_find_insert(n);
   if (existing != nullptr) {
     n->destruct(igvn);
@@ -242,14 +242,13 @@ Node *CastIINode::Ideal(PhaseGVN *phase, bool can_reshape) {
   if (progress != nullptr) {
     return progress;
   }
-  if (can_reshape && !phase->C->post_loop_opts_phase()) {
-    // makes sure we run ::Value to potentially remove type assertion after loop opts
+  if (!phase->C->post_loop_opts_phase()) {
+    // makes sure we run widen_type() to potentially common type assertions after loop opts
     phase->C->record_for_post_loop_opts_igvn(this);
   }
   if (!_range_check_dependency || phase->C->post_loop_opts_phase()) {
     return optimize_integer_cast(phase, T_INT);
   }
-  phase->C->record_for_post_loop_opts_igvn(this);
   return nullptr;
 }
 
@@ -279,9 +278,9 @@ void CastIINode::dump_spec(outputStream* st) const {
 #endif
 
 CastIINode* CastIINode::pin_array_access_node() const {
-  assert(_dependency == RegularDependency, "already pinned");
+  assert(_dependency.is_floating(), "already pinned");
   if (has_range_check()) {
-    return new CastIINode(in(0), in(1), bottom_type(), StrongDependency, has_range_check());
+    return new CastIINode(in(0), in(1), bottom_type(), _dependency.with_pinned_dependency(), has_range_check());
   }
   return nullptr;
 }
@@ -314,18 +313,7 @@ void CastIINode::remove_range_check_cast(Compile* C) {
   }
 }
 
-
-const Type* CastLLNode::Value(PhaseGVN* phase) const {
-  const Type* res = ConstraintCastNode::Value(phase);
-  if (res == Type::TOP) {
-    return Type::TOP;
-  }
-  assert(res->isa_long(), "res must be long");
-
-  return widen_type(phase, res, T_LONG);
-}
-
-bool CastLLNode::is_inner_loop_backedge(ProjNode* proj) {
+bool CastLLNode::is_inner_loop_backedge(IfProjNode* proj) {
   if (proj != nullptr) {
     Node* ctrl_use = proj->unique_ctrl_out_or_null();
     if (ctrl_use != nullptr && ctrl_use->Opcode() == Op_Loop &&
@@ -344,8 +332,8 @@ bool CastLLNode::cmp_used_at_inner_loop_exit_test(CmpNode* cmp) {
       for (DUIterator_Fast jmax, j = bol->fast_outs(jmax); j < jmax; j++) {
         Node* iff = bol->fast_out(j);
         if (iff->Opcode() == Op_If) {
-          ProjNode* true_proj = iff->as_If()->proj_out_or_null(true);
-          ProjNode* false_proj = iff->as_If()->proj_out_or_null(false);
+          IfTrueNode* true_proj = iff->as_If()->true_proj_or_null();
+          IfFalseNode* false_proj = iff->as_If()->false_proj_or_null();
           if (is_inner_loop_backedge(true_proj) || is_inner_loop_backedge(false_proj)) {
             return true;
           }
@@ -392,7 +380,7 @@ Node* CastLLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
     return progress;
   }
   if (!phase->C->post_loop_opts_phase()) {
-    // makes sure we run ::Value to potentially remove type assertion after loop opts
+    // makes sure we run widen_type() to potentially common type assertions after loop opts
     phase->C->record_for_post_loop_opts_igvn(this);
   }
   // transform (CastLL (ConvI2L ..)) into (ConvI2L (CastII ..)) if the type of the CastLL is narrower than the type of
@@ -543,7 +531,7 @@ Node* CastP2XNode::Identity(PhaseGVN* phase) {
   return this;
 }
 
-Node* ConstraintCastNode::make_cast_for_type(Node* c, Node* in, const Type* type, DependencyType dependency,
+Node* ConstraintCastNode::make_cast_for_type(Node* c, Node* in, const Type* type, const DependencyType& dependency,
                                              const TypeTuple* types) {
   if (type->isa_int()) {
     return new CastIINode(c, in, type, dependency, false, types);
@@ -564,7 +552,7 @@ Node* ConstraintCastNode::make_cast_for_type(Node* c, Node* in, const Type* type
   return nullptr;
 }
 
-Node* ConstraintCastNode::optimize_integer_cast(PhaseGVN* phase, BasicType bt) {
+Node* ConstraintCastNode::optimize_integer_cast_of_add(PhaseGVN* phase, BasicType bt) {
   PhaseIterGVN *igvn = phase->is_IterGVN();
   const TypeInteger* this_type = this->type()->isa_integer(bt);
   if (this_type == nullptr) {
@@ -586,8 +574,42 @@ Node* ConstraintCastNode::optimize_integer_cast(PhaseGVN* phase, BasicType bt) {
     Node* x = z->in(1);
     Node* y = z->in(2);
 
-    Node* cx = find_or_make_integer_cast(igvn, x, rx);
-    Node* cy = find_or_make_integer_cast(igvn, y, ry);
+    const TypeInteger* tx = phase->type(x)->is_integer(bt);
+    const TypeInteger* ty = phase->type(y)->is_integer(bt);
+
+    // (Cast (Add x y) tz) is transformed into (Add (Cast x rx) (Cast y ry))
+    //
+    // tz = [tzlo, tzhi]
+    // rx = [rxlo, rxhi]
+    // ry = [rylo, ryhi]
+    // with type of x, tx = [txlo, txhi]
+    // with type of y, ty = [tylo, tyhi]
+    //
+    // From Compile::push_thru_add():
+    // rxlo = max(tzlo - tyhi, txlo)
+    // rxhi = min(tzhi - tylo, txhi)
+    // rylo = max(tzlo - txhi, tylo)
+    // ryhi = min(tzhi - txlo, tyhi)
+    //
+    // If x is a constant, then txlo = txhi
+    // rxlo = txlo, rxhi = txhi
+    // The bounds of the type of the Add after transformation then is:
+    // rxlo + rylo >= txlo + tzlo - txhi >= tzlo
+    // rxhi + ryhi <= txhi + tzhi - txlo <= tzhi
+    // The resulting type is not wider than the type of the Cast
+    // before transformation
+    //
+    // If neither x nor y are constant then the type of the resulting
+    // Add can be wider than the type of the type of the Cast before
+    // transformation.
+    // For instance, tx = [0, 10], ty = [0, 10], tz = [0, 10]
+    // then rx = [0, 10], ry = [0, 10]
+    // and rx + ry = [0, 20] which is wider than tz
+    //
+    // Same reasoning applies to (Cast (Sub x y) tz)
+    const DependencyType& dependency = (!tx->is_con() && !ty->is_con()) ? _dependency.with_non_narrowing() : _dependency;
+    Node* cx = find_or_make_integer_cast(igvn, x, rx, dependency);
+    Node* cy = find_or_make_integer_cast(igvn, y, ry, dependency);
     if (op == Op_Add(bt)) {
       return AddNode::make(cx, cy, bt);
     } else {
@@ -599,11 +621,26 @@ Node* ConstraintCastNode::optimize_integer_cast(PhaseGVN* phase, BasicType bt) {
   return nullptr;
 }
 
-const Type* ConstraintCastNode::widen_type(const PhaseGVN* phase, const Type* res, BasicType bt) const {
-  if (!phase->C->post_loop_opts_phase()) {
+Node* ConstraintCastNode::optimize_integer_cast(PhaseGVN* phase, BasicType bt) {
+  Node* res = optimize_integer_cast_of_add(phase, bt);
+  if (res != nullptr) {
     return res;
   }
+  const Type* t = Value(phase);
+  if (t != Type::TOP && phase->C->post_loop_opts_phase()) {
+    const Type* bottom_t = bottom_type();
+    const TypeInteger* wide_t = widen_type(phase, bottom_t, bt);
+    if (wide_t != bottom_t) {
+      // Widening the type of the Cast (to allow some commoning) causes the Cast to change how it can be optimized (if
+      // type of its input is narrower than the Cast's type, we can't remove it to not loose the control dependency).
+      return make_with(in(1), wide_t, _dependency.with_non_narrowing());
+    }
+  }
+  return nullptr;
+}
 
+const TypeInteger* ConstraintCastNode::widen_type(const PhaseGVN* phase, const Type* res, BasicType bt) const {
+  const TypeInteger* this_type = res->is_integer(bt);
   // At VerifyConstraintCasts == 1, we verify the ConstraintCastNodes that are present during code
   // emission. This allows us detecting possible mis-scheduling due to these nodes being pinned at
   // the wrong control nodes.
@@ -612,10 +649,9 @@ const Type* ConstraintCastNode::widen_type(const PhaseGVN* phase, const Type* re
   // mis-transformations that may happen due to these nodes being pinned at the wrong control
   // nodes.
   if (VerifyConstraintCasts > 1) {
-    return res;
+    return this_type;
   }
 
-  const TypeInteger* this_type = res->is_integer(bt);
   const TypeInteger* in_type = phase->type(in(1))->isa_integer(bt);
   if (in_type != nullptr &&
       (in_type->lo_as_long() != this_type->lo_as_long() ||
@@ -636,5 +672,5 @@ const Type* ConstraintCastNode::widen_type(const PhaseGVN* phase, const Type* re
                              MIN2(in_type->hi_as_long(), hi1),
                              MAX2((int)in_type->_widen, w1), bt);
   }
-  return res;
+  return this_type;
 }
diff --git a/src/hotspot/share/opto/castnode.hpp b/src/hotspot/share/opto/castnode.hpp
index 3c6ade64aa8..f22df546f41 100644
--- a/src/hotspot/share/opto/castnode.hpp
+++ b/src/hotspot/share/opto/castnode.hpp
@@ -33,21 +33,119 @@
 // cast to a different range
 class ConstraintCastNode: public TypeNode {
 public:
-  enum DependencyType {
-    RegularDependency, // if cast doesn't improve input type, cast can be removed
-    StrongDependency,  // leave cast in even if _type doesn't improve input type, can be replaced by stricter dominating cast if one exist
-    UnconditionalDependency // leave cast in unconditionally
+  // Cast nodes are subject to a few optimizations:
+  //
+  // 1- if the type carried by the Cast doesn't narrow the type of its input, the cast can be replaced by its input.
+  // Similarly, if a dominating Cast with the same input and a narrower type constraint is found, it can replace the
+  // current cast.
+  //
+  // 2- if the condition that the Cast is control dependent is hoisted, the Cast is hoisted as well
+  //
+  // 1- and 2- are not always applied depending on what constraint are applied to the Cast: there are cases where 1-
+  // and 2- apply, where neither 1- nor 2- apply and where one or the other apply. This class abstract away these
+  // details.
+  //
+  // If _narrows_type is true, the cast carries a type dependency: "after" the control the cast is dependent on, its data
+  // input is known to have a narrower type (stored in the cast node itself). Optimizations 1- above only apply to cast
+  // nodes for which _narrows_type is true.
+  // if _floating is true, the cast only depends on a single control: its control input. Otherwise, it is pinned at its
+  // current location. Optimizations 2- only apply to cast nodes for which _floating is true.
+  // _floating here is similar to Node::depends_only_on_test().
+  // The 4 combinations of _narrows_types/_floating true/false have some use. See below, at the end of this class
+  // definition, for examples.
+  class DependencyType {
+  private:
+    const bool _floating; // Does this Cast depends on its control input or is it pinned?
+    const bool _narrows_type; // Does this Cast narrows the type i.e. if input type is narrower can it be removed?
+    const char* _desc;
+    DependencyType(bool depends_on_test, bool narrows_type, const char* desc)
+      : _floating(depends_on_test),
+        _narrows_type(narrows_type),
+        _desc(desc) {
+    }
+    NONCOPYABLE(DependencyType);
+
+  public:
+
+    bool is_floating() const {
+      return _floating;
+    }
+
+    bool narrows_type() const {
+      return _narrows_type;
+    }
+
+    void dump_on(outputStream *st) const {
+      st->print("%s", _desc);
+    }
+
+    uint hash() const {
+      return (_floating ? 1 : 0) + (_narrows_type ? 2 : 0);
+    }
+
+    bool cmp(const DependencyType& other) const {
+      return _floating == other._floating && _narrows_type == other._narrows_type;
+    }
+
+    const DependencyType& with_non_narrowing() const {
+      if (_floating) {
+        return FloatingNonNarrowing;
+      }
+      return NonFloatingNonNarrowing;
+    }
+
+    const DependencyType& with_pinned_dependency() const {
+      if (_narrows_type) {
+        return NonFloatingNarrowing;
+      }
+      return NonFloatingNonNarrowing;
+    }
+
+    // All the possible combinations of floating/narrowing with example use cases:
+
+    // Use case example: Range Check CastII
+    // Floating: The Cast is only dependent on the single range check. If the range check was ever to be hoisted it
+    //           would be safe to let the Cast float to where the range check is hoisted up to.
+    // Narrowing: The Cast narrows the type to a positive index. If the input to the Cast is narrower, we can safely
+    //            remove the cast because the array access will be safe.
+    static const DependencyType FloatingNarrowing;
+    // Use case example: Widening Cast nodes' types after loop opts: We want to common Casts with slightly different types.
+    // Floating: These Casts only depend on the single control.
+    // NonNarrowing: Even when the input type is narrower, we are not removing the Cast. Otherwise, the dependency
+    //               to the single control is lost, and an array access could float above its range check because we
+    //               just removed the dependency to the range check by removing the Cast. This could lead to an
+    //               out-of-bounds access.
+    static const DependencyType FloatingNonNarrowing;
+    // Use case example: An array accesses that is no longer dependent on a single range check (e.g. range check smearing).
+    // NonFloating: The array access must be pinned below all the checks it depends on. If the check it directly depends
+    //              on with a control input is hoisted, we do not hoist the Cast as well. If we allowed the Cast to float,
+    //              we risk that the array access ends up above another check it depends on (we cannot model two control
+    //              dependencies for a node in the IR). This could lead to an out-of-bounds access.
+    // Narrowing: If the Cast does not narrow the input type, then it's safe to remove the cast because the array access
+    //            will be safe.
+    static const DependencyType NonFloatingNarrowing;
+    // Use case example: Sinking nodes out of a loop
+    // Non-Floating & Non-Narrowing: We don't want the Cast that forces the node to be out of loop to be removed in any
+    //                               case. Otherwise, the sunk node could float back into the loop, undoing the sinking.
+    //                               This Cast is only used for pinning without caring about narrowing types.
+    static const DependencyType NonFloatingNonNarrowing;
+
   };
 
-  protected:
-  const DependencyType _dependency;
+protected:
+  const DependencyType& _dependency;
   virtual bool cmp( const Node &n ) const;
   virtual uint size_of() const;
   virtual uint hash() const;    // Check the type
-  const Type* widen_type(const PhaseGVN* phase, const Type* res, BasicType bt) const;
-  Node* find_or_make_integer_cast(PhaseIterGVN* igvn, Node* parent, const TypeInteger* type) const;
+  const TypeInteger* widen_type(const PhaseGVN* phase, const Type* res, BasicType bt) const;
+
+  virtual ConstraintCastNode* make_with(Node* parent, const TypeInteger* type, const DependencyType& dependency) const {
+    ShouldNotReachHere(); // Only implemented for CastII and CastLL
+    return nullptr;
+  }
+
+  Node* find_or_make_integer_cast(PhaseIterGVN* igvn, Node* parent, const TypeInteger* type, const DependencyType& dependency) const;
 
-  private:
   // PhiNode::Ideal() transforms a Phi that merges a single uncasted value into a single cast pinned at the region.
   // The types of cast nodes eliminated as a consequence of this transformation are collected and stored here so the
   // type dependencies carried by the cast are known. The cast can then be eliminated if the type of its input is
@@ -55,7 +153,7 @@ public:
   const TypeTuple* _extra_types;
 
   public:
-  ConstraintCastNode(Node* ctrl, Node* n, const Type* t, ConstraintCastNode::DependencyType dependency,
+  ConstraintCastNode(Node* ctrl, Node* n, const Type* t, const DependencyType& dependency,
                      const TypeTuple* extra_types)
           : TypeNode(t,2), _dependency(dependency), _extra_types(extra_types) {
     init_class_id(Class_ConstraintCast);
@@ -67,18 +165,21 @@ public:
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual int Opcode() const;
   virtual uint ideal_reg() const = 0;
-  virtual bool depends_only_on_test() const { return _dependency == RegularDependency; }
-  bool carry_dependency() const { return _dependency != RegularDependency; }
+  bool carry_dependency() const { return !_dependency.cmp(DependencyType::FloatingNarrowing); }
+  // A cast node depends_only_on_test if and only if it is floating
+  virtual bool depends_only_on_test() const { return _dependency.is_floating(); }
+  const DependencyType& dependency() const { return _dependency; }
   TypeNode* dominating_cast(PhaseGVN* gvn, PhaseTransform* pt) const;
-  static Node* make_cast_for_basic_type(Node* c, Node* n, const Type* t, DependencyType dependency, BasicType bt);
+  static Node* make_cast_for_basic_type(Node* c, Node* n, const Type* t, const DependencyType& dependency, BasicType bt);
 
 #ifndef PRODUCT
   virtual void dump_spec(outputStream *st) const;
 #endif
 
-  static Node* make_cast_for_type(Node* c, Node* in, const Type* type, DependencyType dependency,
+  static Node* make_cast_for_type(Node* c, Node* in, const Type* type, const DependencyType& dependency,
                                   const TypeTuple* types);
 
+  Node* optimize_integer_cast_of_add(PhaseGVN* phase, BasicType bt);
   Node* optimize_integer_cast(PhaseGVN* phase, BasicType bt);
 
   bool higher_equal_types(PhaseGVN* phase, const Node* other) const;
@@ -102,7 +203,7 @@ class CastIINode: public ConstraintCastNode {
   virtual uint size_of() const;
 
   public:
-  CastIINode(Node* ctrl, Node* n, const Type* t, DependencyType dependency = RegularDependency, bool range_check_dependency = false, const TypeTuple* types = nullptr)
+  CastIINode(Node* ctrl, Node* n, const Type* t, const DependencyType& dependency = DependencyType::FloatingNarrowing, bool range_check_dependency = false, const TypeTuple* types = nullptr)
     : ConstraintCastNode(ctrl, n, t, dependency, types), _range_check_dependency(range_check_dependency) {
     assert(ctrl != nullptr, "control must be set");
     init_class_id(Class_CastII);
@@ -110,7 +211,7 @@ class CastIINode: public ConstraintCastNode {
   virtual int Opcode() const;
   virtual uint ideal_reg() const { return Op_RegI; }
   virtual Node* Identity(PhaseGVN* phase);
-  virtual const Type* Value(PhaseGVN* phase) const;
+
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   bool has_range_check() const {
 #ifdef _LP64
@@ -122,6 +223,7 @@ class CastIINode: public ConstraintCastNode {
   }
 
   CastIINode* pin_array_access_node() const;
+  CastIINode* make_with(Node* parent, const TypeInteger* type, const DependencyType& dependency) const;
   void remove_range_check_cast(Compile* C);
 
 #ifndef PRODUCT
@@ -131,15 +233,13 @@ class CastIINode: public ConstraintCastNode {
 
 class CastLLNode: public ConstraintCastNode {
 public:
-  CastLLNode(Node* ctrl, Node* n, const Type* t, DependencyType dependency = RegularDependency, const TypeTuple* types = nullptr)
+  CastLLNode(Node* ctrl, Node* n, const Type* t, const DependencyType& dependency = DependencyType::FloatingNarrowing, const TypeTuple* types = nullptr)
           : ConstraintCastNode(ctrl, n, t, dependency, types) {
     assert(ctrl != nullptr, "control must be set");
     init_class_id(Class_CastLL);
   }
 
-  virtual const Type* Value(PhaseGVN* phase) const;
-
-  static bool is_inner_loop_backedge(ProjNode* proj);
+  static bool is_inner_loop_backedge(IfProjNode* proj);
 
   static bool cmp_used_at_inner_loop_exit_test(CmpNode* cmp);
   bool used_at_inner_loop_exit_test() const;
@@ -147,11 +247,12 @@ public:
   virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
   virtual int Opcode() const;
   virtual uint ideal_reg() const { return Op_RegL; }
+  CastLLNode* make_with(Node* parent, const TypeInteger* type, const DependencyType& dependency) const;
 };
 
 class CastHHNode: public ConstraintCastNode {
 public:
-  CastHHNode(Node* ctrl, Node* n, const Type* t, DependencyType dependency = RegularDependency, const TypeTuple* types = nullptr)
+  CastHHNode(Node* ctrl, Node* n, const Type* t, const DependencyType& dependency = DependencyType::FloatingNarrowing, const TypeTuple* types = nullptr)
           : ConstraintCastNode(ctrl, n, t, dependency, types) {
     assert(ctrl != nullptr, "control must be set");
     init_class_id(Class_CastHH);
@@ -162,7 +263,7 @@ public:
 
 class CastFFNode: public ConstraintCastNode {
 public:
-  CastFFNode(Node* ctrl, Node* n, const Type* t, DependencyType dependency = RegularDependency, const TypeTuple* types = nullptr)
+  CastFFNode(Node* ctrl, Node* n, const Type* t, const DependencyType& dependency = DependencyType::FloatingNarrowing, const TypeTuple* types = nullptr)
           : ConstraintCastNode(ctrl, n, t, dependency, types) {
     assert(ctrl != nullptr, "control must be set");
     init_class_id(Class_CastFF);
@@ -173,7 +274,7 @@ public:
 
 class CastDDNode: public ConstraintCastNode {
 public:
-  CastDDNode(Node* ctrl, Node* n, const Type* t, DependencyType dependency = RegularDependency, const TypeTuple* types = nullptr)
+  CastDDNode(Node* ctrl, Node* n, const Type* t, const DependencyType& dependency = DependencyType::FloatingNarrowing, const TypeTuple* types = nullptr)
           : ConstraintCastNode(ctrl, n, t, dependency, types) {
     assert(ctrl != nullptr, "control must be set");
     init_class_id(Class_CastDD);
@@ -184,7 +285,7 @@ public:
 
 class CastVVNode: public ConstraintCastNode {
 public:
-  CastVVNode(Node* ctrl, Node* n, const Type* t, DependencyType dependency = RegularDependency, const TypeTuple* types = nullptr)
+  CastVVNode(Node* ctrl, Node* n, const Type* t, const DependencyType& dependency = DependencyType::FloatingNarrowing, const TypeTuple* types = nullptr)
           : ConstraintCastNode(ctrl, n, t, dependency, types) {
     assert(ctrl != nullptr, "control must be set");
     init_class_id(Class_CastVV);
@@ -198,7 +299,7 @@ public:
 // cast pointer to pointer (different type)
 class CastPPNode: public ConstraintCastNode {
   public:
-  CastPPNode (Node* ctrl, Node* n, const Type* t, DependencyType dependency = RegularDependency, const TypeTuple* types = nullptr)
+  CastPPNode (Node* ctrl, Node* n, const Type* t, const DependencyType& dependency = DependencyType::FloatingNarrowing, const TypeTuple* types = nullptr)
     : ConstraintCastNode(ctrl, n, t, dependency, types) {
     init_class_id(Class_CastPP);
   }
@@ -210,7 +311,7 @@ class CastPPNode: public ConstraintCastNode {
 // for _checkcast, cast pointer to pointer (different type), without JOIN,
 class CheckCastPPNode: public ConstraintCastNode {
   public:
-  CheckCastPPNode(Node* ctrl, Node* n, const Type* t, DependencyType dependency = RegularDependency, const TypeTuple* types = nullptr)
+  CheckCastPPNode(Node* ctrl, Node* n, const Type* t, const DependencyType& dependency = DependencyType::FloatingNarrowing, const TypeTuple* types = nullptr)
     : ConstraintCastNode(ctrl, n, t, dependency, types) {
     assert(ctrl != nullptr, "control must be set");
     init_class_id(Class_CheckCastPP);
diff --git a/src/hotspot/share/opto/cfgnode.cpp b/src/hotspot/share/opto/cfgnode.cpp
index 0598f10b880..efa0b55e2c2 100644
--- a/src/hotspot/share/opto/cfgnode.cpp
+++ b/src/hotspot/share/opto/cfgnode.cpp
@@ -933,8 +933,8 @@ bool RegionNode::optimize_trichotomy(PhaseIterGVN* igvn) {
   }
   // At this point we know that region->in(idx1) and region->(idx2) map to the same
   // value and control flow. Now search for ifs that feed into these region inputs.
-  ProjNode* proj1 = region->in(idx1)->isa_Proj();
-  ProjNode* proj2 = region->in(idx2)->isa_Proj();
+  IfProjNode* proj1 = region->in(idx1)->isa_IfProj();
+  IfProjNode* proj2 = region->in(idx2)->isa_IfProj();
   if (proj1 == nullptr || proj1->outcnt() != 1 ||
       proj2 == nullptr || proj2->outcnt() != 1) {
     return false; // No projection inputs with region as unique user found
@@ -1351,11 +1351,75 @@ const Type* PhiNode::Value(PhaseGVN* phase) const {
   }
 #endif //ASSERT
 
+  // In rare cases, during an IGVN call to `PhiNode::Value`, `_type` and `t` have incompatible opinion on speculative type,
+  // resulting into a too small intersection (such as AnyNull), which is removed in cleanup_speculative.
+  // From that `ft` has no speculative type (ft->speculative() == nullptr).
+  // After the end of the current `PhiNode::Value` call, `ft` (that is returned) is being store into `_type`
+  // (see PhaseIterGVN::transform_old -> raise_bottom_type -> set_type).
+  //
+  // It is possible that verification happens immediately after, without any change to the current node, or any of its inputs.
+  // In the verification invocation of `PhiNode::Value`, `t` would be the same as the IGVN `t` (union of input types, that are unchanged),
+  // but the new `_type` is the value returned by the IGVN invocation of `PhiNode::Value`, the former `ft`, that has no speculative type.
+  // Thus, the result of `t->filter_speculative(_type)`, the new `ft`, gets the speculative type of `t`, which is not empty. Since the
+  // result of the verification invocation of `PhiNode::Value` has some speculative type, it is not the same as the previously returned type
+  // (that had no speculative type), making verification fail.
+  //
+  // In such a case, doing the filtering one time more allows to reach a fixpoint.
+  if (ft->speculative() == nullptr && t->speculative() != nullptr) {
+    ft = t->filter_speculative(ft);
+  }
+  verify_type_stability(phase, t, ft);
+
   // Deal with conversion problems found in data loops.
   ft = phase->saturate_and_maybe_push_to_igvn_worklist(this, ft);
   return ft;
 }
 
+#ifdef ASSERT
+// Makes sure that a newly computed type is stable when filtered against the incoming types.
+// Otherwise, we may have IGVN verification failures. See PhiNode::Value, and the second
+// filtering (enforcing stability), for details.
+void PhiNode::verify_type_stability(const PhaseGVN* const phase, const Type* const union_of_input_types, const Type* const new_type) const {
+  const Type* doubly_filtered_type = union_of_input_types->filter_speculative(new_type);
+  if (Type::equals(new_type, doubly_filtered_type)) {
+    return;
+  }
+
+  stringStream ss;
+
+  ss.print_cr("At node:");
+  this->dump("\n", false, &ss);
+
+  const Node* region = in(Region);
+  for (uint i = 1; i < req(); ++i) {
+    ss.print("in(%d): ", i);
+    if (region->in(i) != nullptr && phase->type(region->in(i)) == Type::CONTROL) {
+      const Type* ti = phase->type(in(i));
+      ti->dump_on(&ss);
+    }
+    ss.print_cr("");
+  }
+
+  ss.print("t: ");
+  union_of_input_types->dump_on(&ss);
+  ss.print_cr("");
+
+  ss.print("_type: ");
+  _type->dump_on(&ss);
+  ss.print_cr("");
+
+  ss.print("Filter once: ");
+  new_type->dump_on(&ss);
+  ss.print_cr("");
+  ss.print("Filter twice: ");
+  doubly_filtered_type->dump_on(&ss);
+  ss.print_cr("");
+  tty->print("%s", ss.base());
+  tty->flush();
+  assert(false, "computed type would not pass verification");
+}
+#endif
+
 // Does this Phi represent a simple well-shaped diamond merge?  Return the
 // index of the true path or 0 otherwise.
 int PhiNode::is_diamond_phi() const {
@@ -1483,18 +1547,9 @@ Node* PhiNode::Identity(PhaseGVN* phase) {
     Node* phi_reg = region();
     for (DUIterator_Fast imax, i = phi_reg->fast_outs(imax); i < imax; i++) {
       Node* u = phi_reg->fast_out(i);
-      if (u->is_Phi() && u->as_Phi()->type() == Type::MEMORY &&
-          u->adr_type() == TypePtr::BOTTOM && u->in(0) == phi_reg &&
-          u->req() == phi_len) {
-        for (uint j = 1; j < phi_len; j++) {
-          if (in(j) != u->in(j)) {
-            u = nullptr;
-            break;
-          }
-        }
-        if (u != nullptr) {
-          return u;
-        }
+      assert(!u->is_Phi() || u->in(0) == phi_reg, "broken Phi/Region subgraph");
+      if (u->is_Phi() && u->req() == phi_len && can_be_replaced_by(u->as_Phi())) {
+        return u;
       }
     }
   }
@@ -2096,6 +2151,20 @@ bool PhiNode::is_split_through_mergemem_terminating() const {
   return true;
 }
 
+// Is one of the inputs a Cast that has not been processed by igvn yet?
+bool PhiNode::wait_for_cast_input_igvn(const PhaseIterGVN* igvn) const {
+  for (uint i = 1, cnt = req(); i < cnt; ++i) {
+    Node* n = in(i);
+    while (n != nullptr && n->is_ConstraintCast()) {
+      if (igvn->_worklist.member(n)) {
+        return true;
+      }
+      n = n->in(1);
+    }
+  }
+  return false;
+}
+
 //------------------------------Ideal------------------------------------------
 // Return a node which is more "ideal" than the current node.  Must preserve
 // the CFG, but we can still strip out dead paths.
@@ -2154,6 +2223,28 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
       // If there is a chance that the region can be optimized out do
       // not add a cast node that we can't remove yet.
       !wait_for_region_igvn(phase)) {
+    // If one of the inputs is a cast that has yet to be processed by igvn, delay processing of this node to give the
+    // inputs a chance to optimize and possibly end up with identical inputs (casts included).
+    // Say we have:
+    // (Phi region (Cast#1 c uin) (Cast#2 c uin))
+    // and Cast#1 and Cast#2 have not had a chance to common yet
+    // if the unique_input() transformation below proceeds, then PhiNode::Ideal returns:
+    // (Cast#3 region uin) (1)
+    // If PhiNode::Ideal is delayed until Cast#1 and Cast#2 common, then it returns:
+    // (Cast#1 c uin) (2)
+    //
+    // In (1) the resulting cast is conservatively pinned at a later control and while Cast#3 and Cast#1/Cast#2 still
+    // have a chance to common, that requires proving that c dominates region in ConstraintCastNode::dominating_cast()
+    // which may not happen if control flow is too complicated and another pass of loop opts doesn't run. Delaying the
+    // transformation here should allow a more optimal result.
+    // Beyond the efficiency concern, there is a risk, if the casts are CastPPs, to end up with a chain of AddPs with
+    // different base inputs (but a unique uncasted base input). This breaks an invariant in the shape of address
+    // subtrees.
+    PhaseIterGVN* igvn = phase->is_IterGVN();
+    if (wait_for_cast_input_igvn(igvn)) {
+      igvn->_worklist.push(this);
+      return nullptr;
+    }
     uncasted = true;
     uin = unique_input(phase, true);
   }
@@ -2192,7 +2283,7 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
       if (phi_type->isa_ptr()) {
         const Type* uin_type = phase->type(uin);
         if (!phi_type->isa_oopptr() && !uin_type->isa_oopptr()) {
-          cast = new CastPPNode(r, uin, phi_type, ConstraintCastNode::StrongDependency, extra_types);
+          cast = new CastPPNode(r, uin, phi_type, ConstraintCastNode::DependencyType::NonFloatingNarrowing, extra_types);
         } else {
           // Use a CastPP for a cast to not null and a CheckCastPP for
           // a cast to a new klass (and both if both null-ness and
@@ -2202,7 +2293,7 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
           // null, uin's type must be casted to not null
           if (phi_type->join(TypePtr::NOTNULL) == phi_type->remove_speculative() &&
               uin_type->join(TypePtr::NOTNULL) != uin_type->remove_speculative()) {
-            cast = new CastPPNode(r, uin, TypePtr::NOTNULL, ConstraintCastNode::StrongDependency, extra_types);
+            cast = new CastPPNode(r, uin, TypePtr::NOTNULL, ConstraintCastNode::DependencyType::NonFloatingNarrowing, extra_types);
           }
 
           // If the type of phi and uin, both casted to not null,
@@ -2214,14 +2305,14 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
               cast = phase->transform(cast);
               n = cast;
             }
-            cast = new CheckCastPPNode(r, n, phi_type, ConstraintCastNode::StrongDependency, extra_types);
+            cast = new CheckCastPPNode(r, n, phi_type, ConstraintCastNode::DependencyType::NonFloatingNarrowing, extra_types);
           }
           if (cast == nullptr) {
-            cast = new CastPPNode(r, uin, phi_type, ConstraintCastNode::StrongDependency, extra_types);
+            cast = new CastPPNode(r, uin, phi_type, ConstraintCastNode::DependencyType::NonFloatingNarrowing, extra_types);
           }
         }
       } else {
-        cast = ConstraintCastNode::make_cast_for_type(r, uin, phi_type, ConstraintCastNode::StrongDependency, extra_types);
+        cast = ConstraintCastNode::make_cast_for_type(r, uin, phi_type, ConstraintCastNode::DependencyType::NonFloatingNarrowing, extra_types);
       }
       assert(cast != nullptr, "cast should be set");
       cast = phase->transform(cast);
@@ -2551,7 +2642,7 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
               }
               Node* phi = mms.memory();
               assert(made_new_phi || phi->in(i) == n, "replace the i-th merge by a slice");
-              phi->set_req(i, mms.memory2());
+              phi->set_req_X(i, mms.memory2(), phase);
             }
           }
         }
@@ -2560,7 +2651,9 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
           for (MergeMemStream mms(result); mms.next_non_empty(); ) {
             Node* phi = mms.memory();
             for (uint i = 1; i < req(); ++i) {
-              if (phi->in(i) == this)  phi->set_req(i, phi);
+              if (phi->in(i) == this) {
+                phi->set_req_X(i, phi, phase);
+              }
             }
           }
         }
@@ -2582,7 +2675,7 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
       Node *ii = in(i);
       Node *new_in = MemNode::optimize_memory_chain(ii, at, nullptr, phase);
       if (ii != new_in ) {
-        set_req(i, new_in);
+        set_req_X(i, new_in, phase);
         progress = this;
       }
     }
@@ -2690,6 +2783,25 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
     progress = merge_through_phi(this, phase->is_IterGVN());
   }
 
+  // PhiNode::Identity replaces a non-bottom memory phi with a bottom memory phi with the same inputs, if it exists.
+  // If the bottom memory phi's inputs are changed (so it can now replace the non-bottom memory phi) or if it's created
+  // only after the non-bottom memory phi is processed by igvn, PhiNode::Identity doesn't run and the transformation
+  // doesn't happen.
+  // Look for non-bottom Phis that should be transformed and enqueue them for igvn so that PhiNode::Identity executes for
+  // them.
+  if (can_reshape && type() == Type::MEMORY && adr_type() == TypePtr::BOTTOM) {
+    PhaseIterGVN* igvn = phase->is_IterGVN();
+    uint phi_len = req();
+    Node* phi_reg = region();
+    for (DUIterator_Fast imax, i = phi_reg->fast_outs(imax); i < imax; i++) {
+      Node* u = phi_reg->fast_out(i);
+      assert(!u->is_Phi() || (u->in(0) == phi_reg && u->req() == phi_len), "broken Phi/Region subgraph");
+      if (u->is_Phi() && u->as_Phi()->can_be_replaced_by(this)) {
+        igvn->_worklist.push(u);
+      }
+    }
+  }
+
   return progress;              // Return any progress
 }
 
@@ -2739,6 +2851,11 @@ const TypeTuple* PhiNode::collect_types(PhaseGVN* phase) const {
   return TypeTuple::make(types.length(), flds);
 }
 
+bool PhiNode::can_be_replaced_by(const PhiNode* other) const {
+  return type() == Type::MEMORY && other->type() == Type::MEMORY && adr_type() != TypePtr::BOTTOM &&
+    other->adr_type() == TypePtr::BOTTOM && has_same_inputs_as(other);
+}
+
 Node* PhiNode::clone_through_phi(Node* root_phi, const Type* t, uint c, PhaseIterGVN* igvn) {
   Node_Stack stack(1);
   VectorSet  visited;
diff --git a/src/hotspot/share/opto/cfgnode.hpp b/src/hotspot/share/opto/cfgnode.hpp
index bc0b38e2f97..ca549af1554 100644
--- a/src/hotspot/share/opto/cfgnode.hpp
+++ b/src/hotspot/share/opto/cfgnode.hpp
@@ -182,6 +182,9 @@ class PhiNode : public TypeNode {
 
   bool is_split_through_mergemem_terminating() const;
 
+  void verify_type_stability(const PhaseGVN* phase, const Type* union_of_input_types, const Type* new_type) const NOT_DEBUG_RETURN;
+  bool wait_for_cast_input_igvn(const PhaseIterGVN* igvn) const;
+
 public:
   // Node layout (parallels RegionNode):
   enum { Region,                // Control input is the Phi's region.
@@ -271,6 +274,7 @@ public:
 #endif //ASSERT
 
   const TypeTuple* collect_types(PhaseGVN* phase) const;
+  bool can_be_replaced_by(const PhiNode* other) const;
 };
 
 //------------------------------GotoNode---------------------------------------
@@ -339,19 +343,19 @@ class IfNode : public MultiBranchNode {
   // Helper methods for fold_compares
   bool cmpi_folds(PhaseIterGVN* igvn, bool fold_ne = false);
   bool is_ctrl_folds(Node* ctrl, PhaseIterGVN* igvn);
-  bool has_shared_region(ProjNode* proj, ProjNode*& success, ProjNode*& fail);
-  bool has_only_uncommon_traps(ProjNode* proj, ProjNode*& success, ProjNode*& fail, PhaseIterGVN* igvn);
-  Node* merge_uncommon_traps(ProjNode* proj, ProjNode* success, ProjNode* fail, PhaseIterGVN* igvn);
+  bool has_shared_region(IfProjNode* proj, IfProjNode*& success, IfProjNode*& fail) const;
+  bool has_only_uncommon_traps(IfProjNode* proj, IfProjNode*& success, IfProjNode*& fail, PhaseIterGVN* igvn) const;
+  Node* merge_uncommon_traps(IfProjNode* proj, IfProjNode* success, IfProjNode* fail, PhaseIterGVN* igvn);
   static void improve_address_types(Node* l, Node* r, ProjNode* fail, PhaseIterGVN* igvn);
-  bool is_cmp_with_loadrange(ProjNode* proj);
-  bool is_null_check(ProjNode* proj, PhaseIterGVN* igvn);
-  bool is_side_effect_free_test(ProjNode* proj, PhaseIterGVN* igvn);
-  void reroute_side_effect_free_unc(ProjNode* proj, ProjNode* dom_proj, PhaseIterGVN* igvn);
-  bool fold_compares_helper(ProjNode* proj, ProjNode* success, ProjNode* fail, PhaseIterGVN* igvn);
+  bool is_cmp_with_loadrange(IfProjNode* proj) const;
+  bool is_null_check(IfProjNode* proj, PhaseIterGVN* igvn) const;
+  bool is_side_effect_free_test(IfProjNode* proj, PhaseIterGVN* igvn) const;
+  static void reroute_side_effect_free_unc(IfProjNode* proj, IfProjNode* dom_proj, PhaseIterGVN* igvn);
+  bool fold_compares_helper(IfProjNode* proj, IfProjNode* success, IfProjNode* fail, PhaseIterGVN* igvn);
   static bool is_dominator_unc(CallStaticJavaNode* dom_unc, CallStaticJavaNode* unc);
 
 protected:
-  ProjNode* range_check_trap_proj(int& flip, Node*& l, Node*& r);
+  IfProjNode* range_check_trap_proj(int& flip, Node*& l, Node*& r) const;
   Node* Ideal_common(PhaseGVN *phase, bool can_reshape);
   Node* search_identical(int dist, PhaseIterGVN* igvn);
 
@@ -430,6 +434,24 @@ public:
 
   static IfNode* make_with_same_profile(IfNode* if_node_profile, Node* ctrl, Node* bol);
 
+  IfTrueNode* true_proj() const {
+    return proj_out(true)->as_IfTrue();
+  }
+
+  IfTrueNode* true_proj_or_null() const {
+    ProjNode* true_proj = proj_out_or_null(true);
+    return true_proj == nullptr ? nullptr : true_proj->as_IfTrue();
+  }
+
+  IfFalseNode* false_proj() const {
+    return proj_out(false)->as_IfFalse();
+  }
+
+  IfFalseNode* false_proj_or_null() const {
+    ProjNode* false_proj = proj_out_or_null(false);
+    return false_proj == nullptr ? nullptr : false_proj->as_IfFalse();
+  }
+
   virtual int Opcode() const;
   virtual bool pinned() const { return true; }
   virtual const Type *bottom_type() const { return TypeTuple::IFBOTH; }
@@ -520,7 +542,7 @@ class ParsePredicateNode : public IfNode {
 
   // Return the uncommon trap If projection of this Parse Predicate.
   ParsePredicateUncommonProj* uncommon_proj() const {
-    return proj_out(0)->as_IfFalse();
+    return false_proj();
   }
 
   Node* uncommon_trap() const;
@@ -538,6 +560,11 @@ public:
   IfProjNode(IfNode *ifnode, uint idx) : CProjNode(ifnode,idx) {}
   virtual Node* Identity(PhaseGVN* phase);
 
+  // Return the other IfProj node.
+  IfProjNode* other_if_proj() const {
+    return in(0)->as_If()->proj_out(1 - _con)->as_IfProj();
+  }
+
   void pin_array_access_nodes(PhaseIterGVN* igvn);
 
 protected:
diff --git a/src/hotspot/share/opto/chaitin.cpp b/src/hotspot/share/opto/chaitin.cpp
index 667270d96b4..3ba3ffc1045 100644
--- a/src/hotspot/share/opto/chaitin.cpp
+++ b/src/hotspot/share/opto/chaitin.cpp
@@ -1076,8 +1076,8 @@ void PhaseChaitin::gather_lrg_masks( bool after_aggressive ) {
 
       // Prepare register mask for each input
       for( uint k = input_edge_start; k < cnt; k++ ) {
-        uint vreg = _lrg_map.live_range_id(n->in(k));
-        if (!vreg) {
+        uint vreg_in = _lrg_map.live_range_id(n->in(k));
+        if (!vreg_in) {
           continue;
         }
 
@@ -1099,7 +1099,7 @@ void PhaseChaitin::gather_lrg_masks( bool after_aggressive ) {
           if (k >= cur_node->num_opnds()) continue;
         }
 
-        LRG &lrg = lrgs(vreg);
+        LRG &lrg_in = lrgs(vreg_in);
         // // Testing for floating point code shape
         // Node *test = n->in(k);
         // if( test->is_Mach() ) {
@@ -1114,25 +1114,25 @@ void PhaseChaitin::gather_lrg_masks( bool after_aggressive ) {
         // Do not limit registers from uncommon uses before
         // AggressiveCoalesce.  This effectively pre-virtual-splits
         // around uncommon uses of common defs.
-        const RegMask &rm = n->in_RegMask(k);
+        const RegMask &rm_in = n->in_RegMask(k);
         if (!after_aggressive && _cfg.get_block_for_node(n->in(k))->_freq > 1000 * block->_freq) {
           // Since we are BEFORE aggressive coalesce, leave the register
           // mask untrimmed by the call.  This encourages more coalescing.
           // Later, AFTER aggressive, this live range will have to spill
           // but the spiller handles slow-path calls very nicely.
         } else {
-          lrg.and_with(rm);
+          lrg_in.and_with(rm_in);
         }
 
         // Check for bound register masks
-        const RegMask &lrgmask = lrg.mask();
+        const RegMask &lrgmask_in = lrg_in.mask();
         uint kreg = n->in(k)->ideal_reg();
         bool is_vect = RegMask::is_vector(kreg);
         assert(n->in(k)->bottom_type()->isa_vect() == nullptr || is_vect ||
                kreg == Op_RegD || kreg == Op_RegL || kreg == Op_RegVectMask,
                "vector must be in vector registers");
-        if (lrgmask.is_bound(kreg))
-          lrg._is_bound = 1;
+        if (lrgmask_in.is_bound(kreg))
+          lrg_in._is_bound = 1;
 
         // If this use of a double forces a mis-aligned double,
         // flag as '_fat_proj' - really flag as allowing misalignment
@@ -1141,30 +1141,30 @@ void PhaseChaitin::gather_lrg_masks( bool after_aggressive ) {
         // FOUR registers!
 #ifdef ASSERT
         if (is_vect && !_scheduling_info_generated) {
-          if (lrg.num_regs() != 0) {
-            assert(lrgmask.is_aligned_sets(lrg.num_regs()), "vector should be aligned");
-            assert(!lrg._fat_proj, "sanity");
-            assert(RegMask::num_registers(kreg) == lrg.num_regs(), "sanity");
+          if (lrg_in.num_regs() != 0) {
+            assert(lrgmask_in.is_aligned_sets(lrg_in.num_regs()), "vector should be aligned");
+            assert(!lrg_in._fat_proj, "sanity");
+            assert(RegMask::num_registers(kreg) == lrg_in.num_regs(), "sanity");
           } else {
             assert(n->is_Phi(), "not all inputs processed only if Phi");
           }
         }
 #endif
-        if (!is_vect && lrg.num_regs() == 2 && !lrg._fat_proj && rm.is_misaligned_pair()) {
-          lrg._fat_proj = 1;
-          lrg._is_bound = 1;
+        if (!is_vect && lrg_in.num_regs() == 2 && !lrg_in._fat_proj && rm_in.is_misaligned_pair()) {
+          lrg_in._fat_proj = 1;
+          lrg_in._is_bound = 1;
         }
         // if the LRG is an unaligned pair, we will have to spill
         // so clear the LRG's register mask if it is not already spilled
         if (!is_vect && !n->is_SpillCopy() &&
-            (lrg._def == nullptr || lrg.is_multidef() || !lrg._def->is_SpillCopy()) &&
-            lrgmask.is_misaligned_pair()) {
-          lrg.clear();
+            (lrg_in._def == nullptr || lrg_in.is_multidef() || !lrg_in._def->is_SpillCopy()) &&
+            lrgmask_in.is_misaligned_pair()) {
+          lrg_in.clear();
         }
 
         // Check for maximum frequency value
-        if (lrg._maxfreq < block->_freq) {
-          lrg._maxfreq = block->_freq;
+        if (lrg_in._maxfreq < block->_freq) {
+          lrg_in._maxfreq = block->_freq;
         }
 
       } // End for all allocated inputs
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index bf7feeed0a2..cea2b09e142 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -595,7 +595,9 @@ void Compile::print_ideal_ir(const char* phase_name) {
   if (_output == nullptr) {
     ss.print_cr("AFTER: %s", phase_name);
     // Print out all nodes in ascending order of index.
-    root()->dump_bfs(MaxNodeLimit, nullptr, "+S$", &ss);
+    // It is important that we traverse both inputs and outputs of nodes,
+    // so that we reach all nodes that are connected to Root.
+    root()->dump_bfs(MaxNodeLimit, nullptr, "-+S$", &ss);
   } else {
     // Dump the node blockwise if we have a scheduling
     _output->print_scheduling(&ss);
@@ -3418,10 +3420,7 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
 
   case Op_AddP: {               // Assert sane base pointers
     Node *addp = n->in(AddPNode::Address);
-    assert( !addp->is_AddP() ||
-            addp->in(AddPNode::Base)->is_top() || // Top OK for allocation
-            addp->in(AddPNode::Base) == n->in(AddPNode::Base),
-            "Base pointers must match (addp %u)", addp->_idx );
+    assert(n->as_AddP()->address_input_has_same_base(), "Base pointers must match (addp %u)", addp->_idx );
 #ifdef _LP64
     if ((UseCompressedOops || UseCompressedClassPointers) &&
         addp->Opcode() == Op_ConP &&
@@ -4582,7 +4581,7 @@ Node* Compile::constrained_convI2L(PhaseGVN* phase, Node* value, const TypeInt*
     // node from floating above the range check during loop optimizations. Otherwise, the
     // ConvI2L node may be eliminated independently of the range check, causing the data path
     // to become TOP while the control path is still there (although it's unreachable).
-    value = new CastIINode(ctrl, value, itype, carry_dependency ? ConstraintCastNode::StrongDependency : ConstraintCastNode::RegularDependency, true /* range check dependency */);
+    value = new CastIINode(ctrl, value, itype, carry_dependency ? ConstraintCastNode::DependencyType::NonFloatingNarrowing : ConstraintCastNode::DependencyType::FloatingNarrowing, true /* range check dependency */);
     value = phase->transform(value);
   }
   const TypeLong* ltype = TypeLong::make(itype->_lo, itype->_hi, itype->_widen);
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index f5611062f2c..45a3a4f548f 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -984,7 +984,8 @@ public:
                                    JVMState* jvms, bool allow_inline, float profile_factor, ciKlass* speculative_receiver_type = nullptr,
                                    bool allow_intrinsics = true);
   bool should_delay_inlining(ciMethod* call_method, JVMState* jvms) {
-    return should_delay_string_inlining(call_method, jvms) ||
+    return C->directive()->should_delay_inline(call_method) ||
+           should_delay_string_inlining(call_method, jvms) ||
            should_delay_boxing_inlining(call_method, jvms) ||
            should_delay_vector_inlining(call_method, jvms);
   }
diff --git a/src/hotspot/share/opto/countbitsnode.hpp b/src/hotspot/share/opto/countbitsnode.hpp
index 35465b1835b..9e08ab71013 100644
--- a/src/hotspot/share/opto/countbitsnode.hpp
+++ b/src/hotspot/share/opto/countbitsnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/opto/divnode.cpp b/src/hotspot/share/opto/divnode.cpp
index cf5bc8ce643..db4fedbba3b 100644
--- a/src/hotspot/share/opto/divnode.cpp
+++ b/src/hotspot/share/opto/divnode.cpp
@@ -42,7 +42,7 @@
 
 #include <math.h>
 
-ModFloatingNode::ModFloatingNode(Compile* C, const TypeFunc* tf, address addr, const char* name) : CallLeafPureNode(tf, addr, name, TypeRawPtr::BOTTOM) {
+ModFloatingNode::ModFloatingNode(Compile* C, const TypeFunc* tf, address addr, const char* name) : CallLeafPureNode(tf, addr, name) {
   add_flag(Flag_is_macro);
   C->add_macro_node(this);
 }
@@ -504,6 +504,102 @@ Node* unsigned_div_ideal(PhaseGVN* phase, bool can_reshape, Node* div) {
   return nullptr;
 }
 
+template<typename IntegerType>
+static const IntegerType* compute_signed_div_type(const IntegerType* i1, const IntegerType* i2) {
+  typedef typename IntegerType::NativeType NativeType;
+  assert(!i2->is_con() || i2->get_con() != 0, "Can't handle zero constant divisor");
+  int widen = MAX2(i1->_widen, i2->_widen);
+
+  // Case A: divisor range spans zero (i2->_lo < 0 < i2->_hi)
+  // We split into two subproblems to avoid division by 0:
+  //   - negative part: [i2->_lo, −1]
+  //   - positive part: [1, i2->_hi]
+  // Then we union the results by taking the min of all lower‐bounds and
+  // the max of all upper‐bounds from the two halves.
+  if (i2->_lo < 0 && i2->_hi > 0) {
+    // Handle negative part of the divisor range
+    const IntegerType* neg_part = compute_signed_div_type(i1, IntegerType::make(i2->_lo, -1, widen));
+    // Handle positive part of the divisor range
+    const IntegerType* pos_part = compute_signed_div_type(i1, IntegerType::make(1, i2->_hi, widen));
+    // Merge results
+    NativeType new_lo = MIN2(neg_part->_lo, pos_part->_lo);
+    NativeType new_hi = MAX2(neg_part->_hi, pos_part->_hi);
+    assert(new_hi >= new_lo, "sanity");
+    return IntegerType::make(new_lo, new_hi, widen);
+  }
+
+  // Case B: divisor range does NOT span zero.
+  // Here i2 is entirely negative or entirely positive.
+  // Then i1/i2 is monotonic in i1 and i2 (when i2 keeps the same sign).
+  // Therefore the extrema occur at the four “corners”:
+  //   (i1->_lo, i2->_hi), (i1->_lo, i2->_lo), (i1->_hi, i2->_lo), (i1->_hi, i2->_hi).
+  // We compute all four and take the min and max.
+  // A special case handles overflow when dividing the most‐negative value by −1.
+
+  // adjust i2 bounds to not include zero, as zero always throws
+  NativeType i2_lo = i2->_lo == 0 ? 1 : i2->_lo;
+  NativeType i2_hi = i2->_hi == 0 ? -1 : i2->_hi;
+  constexpr NativeType min_val = std::numeric_limits<NativeType>::min();
+  static_assert(min_val == min_jint || min_val == min_jlong, "min has to be either min_jint or min_jlong");
+  constexpr NativeType max_val = std::numeric_limits<NativeType>::max();
+  static_assert(max_val == max_jint || max_val == max_jlong, "max has to be either max_jint or max_jlong");
+
+  // Special overflow case: min_val / (-1) == min_val (cf. JVMS§6.5 idiv/ldiv)
+  // We need to be careful that we never run min_val / (-1) in C++ code, as this overflow is UB there
+  if (i1->_lo == min_val && i2_hi == -1) {
+    NativeType new_lo = min_val;
+    NativeType new_hi;
+    // compute new_hi depending on whether divisor or dividend is non-constant.
+    // i2 is purely in the negative domain here (as i2_hi is -1)
+    // which means the maximum value this division can yield is either
+    if (!i1->is_con()) {
+      // a) non-constant dividend: i1 could be min_val + 1.
+      // -> i1 / i2 = (min_val + 1) / -1 = max_val is possible.
+      new_hi = max_val;
+      assert((min_val + 1) / -1 == new_hi, "new_hi should be max_val");
+    } else if (i2_lo != i2_hi) {
+      // b) i1 is constant min_val, i2 is non-constant.
+      //    if i2 = -1 -> i1 / i2 =  min_val / -1 = min_val
+      //    if i2 < -1 -> i1 / i2 <= min_val / -2 = (max_val / 2) + 1
+      new_hi = (max_val / 2) + 1;
+      assert(min_val / -2 == new_hi, "new_hi should be (max_val / 2) + 1)");
+    } else {
+      // c) i1 is constant min_val, i2 is constant -1.
+      //    -> i1 / i2 = min_val / -1 = min_val
+      new_hi = min_val;
+    }
+
+#ifdef ASSERT
+    // validate new_hi for non-constant divisor
+    if (i2_lo != i2_hi) {
+      assert(i2_lo != -1, "Special case not possible here, as i2_lo has to be < i2_hi");
+      NativeType result = i1->_lo / i2_lo;
+      assert(new_hi >= result, "computed wrong value for new_hi");
+    }
+
+    // validate new_hi for non-constant dividend
+    if (!i1->is_con()) {
+      assert(i2_hi > min_val, "Special case not possible here, as i1->_hi has to be > min");
+      NativeType result1 = i1->_hi / i2_lo;
+      NativeType result2 = i1->_hi / i2_hi;
+      assert(new_hi >= result1 && new_hi >= result2, "computed wrong value for new_hi");
+    }
+#endif
+
+    return IntegerType::make(new_lo, new_hi, widen);
+  }
+  assert((i1->_lo != min_val && i1->_hi != min_val) || (i2_hi != -1 && i2_lo != -1), "should have filtered out before");
+
+  // Special case not possible here, calculate all corners normally
+  NativeType corner1 = i1->_lo / i2_lo;
+  NativeType corner2 = i1->_lo / i2_hi;
+  NativeType corner3 = i1->_hi / i2_lo;
+  NativeType corner4 = i1->_hi / i2_hi;
+
+  NativeType new_lo = MIN4(corner1, corner2, corner3, corner4);
+  NativeType new_hi = MAX4(corner1, corner2, corner3, corner4);
+  return IntegerType::make(new_lo, new_hi, widen);
+}
 
 //=============================================================================
 //------------------------------Identity---------------------------------------
@@ -549,65 +645,26 @@ Node *DivINode::Ideal(PhaseGVN *phase, bool can_reshape) {
 // prevent hoisting the divide above an unsafe test.
 const Type* DivINode::Value(PhaseGVN* phase) const {
   // Either input is TOP ==> the result is TOP
-  const Type *t1 = phase->type( in(1) );
-  const Type *t2 = phase->type( in(2) );
-  if( t1 == Type::TOP ) return Type::TOP;
-  if( t2 == Type::TOP ) return Type::TOP;
+  const Type* t1 = phase->type(in(1));
+  const Type* t2 = phase->type(in(2));
+  if (t1 == Type::TOP || t2 == Type::TOP) {
+    return Type::TOP;
+  }
+
+  if (t2 == TypeInt::ZERO) {
+    // this division will always throw an exception
+    return Type::TOP;
+  }
 
   // x/x == 1 since we always generate the dynamic divisor check for 0.
   if (in(1) == in(2)) {
     return TypeInt::ONE;
   }
 
-  // Either input is BOTTOM ==> the result is the local BOTTOM
-  const Type *bot = bottom_type();
-  if( (t1 == bot) || (t2 == bot) ||
-      (t1 == Type::BOTTOM) || (t2 == Type::BOTTOM) )
-    return bot;
+  const TypeInt* i1 = t1->is_int();
+  const TypeInt* i2 = t2->is_int();
 
-  // Divide the two numbers.  We approximate.
-  // If divisor is a constant and not zero
-  const TypeInt *i1 = t1->is_int();
-  const TypeInt *i2 = t2->is_int();
-  int widen = MAX2(i1->_widen, i2->_widen);
-
-  if( i2->is_con() && i2->get_con() != 0 ) {
-    int32_t d = i2->get_con(); // Divisor
-    jint lo, hi;
-    if( d >= 0 ) {
-      lo = i1->_lo/d;
-      hi = i1->_hi/d;
-    } else {
-      if( d == -1 && i1->_lo == min_jint ) {
-        // 'min_jint/-1' throws arithmetic exception during compilation
-        lo = min_jint;
-        // do not support holes, 'hi' must go to either min_jint or max_jint:
-        // [min_jint, -10]/[-1,-1] ==> [min_jint] UNION [10,max_jint]
-        hi = i1->_hi == min_jint ? min_jint : max_jint;
-      } else {
-        lo = i1->_hi/d;
-        hi = i1->_lo/d;
-      }
-    }
-    return TypeInt::make(lo, hi, widen);
-  }
-
-  // If the dividend is a constant
-  if( i1->is_con() ) {
-    int32_t d = i1->get_con();
-    if( d < 0 ) {
-      if( d == min_jint ) {
-        //  (-min_jint) == min_jint == (min_jint / -1)
-        return TypeInt::make(min_jint, max_jint/2 + 1, widen);
-      } else {
-        return TypeInt::make(d, -d, widen);
-      }
-    }
-    return TypeInt::make(-d, d, widen);
-  }
-
-  // Otherwise we give up all hope
-  return TypeInt::INT;
+  return compute_signed_div_type<TypeInt>(i1, i2);
 }
 
 
@@ -655,65 +712,26 @@ Node *DivLNode::Ideal( PhaseGVN *phase, bool can_reshape) {
 // prevent hoisting the divide above an unsafe test.
 const Type* DivLNode::Value(PhaseGVN* phase) const {
   // Either input is TOP ==> the result is TOP
-  const Type *t1 = phase->type( in(1) );
-  const Type *t2 = phase->type( in(2) );
-  if( t1 == Type::TOP ) return Type::TOP;
-  if( t2 == Type::TOP ) return Type::TOP;
+  const Type* t1 = phase->type(in(1));
+  const Type* t2 = phase->type(in(2));
+  if (t1 == Type::TOP || t2 == Type::TOP) {
+    return Type::TOP;
+  }
+
+  if (t2 == TypeLong::ZERO) {
+    // this division will always throw an exception
+    return Type::TOP;
+  }
 
   // x/x == 1 since we always generate the dynamic divisor check for 0.
   if (in(1) == in(2)) {
     return TypeLong::ONE;
   }
 
-  // Either input is BOTTOM ==> the result is the local BOTTOM
-  const Type *bot = bottom_type();
-  if( (t1 == bot) || (t2 == bot) ||
-      (t1 == Type::BOTTOM) || (t2 == Type::BOTTOM) )
-    return bot;
+  const TypeLong* i1 = t1->is_long();
+  const TypeLong* i2 = t2->is_long();
 
-  // Divide the two numbers.  We approximate.
-  // If divisor is a constant and not zero
-  const TypeLong *i1 = t1->is_long();
-  const TypeLong *i2 = t2->is_long();
-  int widen = MAX2(i1->_widen, i2->_widen);
-
-  if( i2->is_con() && i2->get_con() != 0 ) {
-    jlong d = i2->get_con();    // Divisor
-    jlong lo, hi;
-    if( d >= 0 ) {
-      lo = i1->_lo/d;
-      hi = i1->_hi/d;
-    } else {
-      if( d == CONST64(-1) && i1->_lo == min_jlong ) {
-        // 'min_jlong/-1' throws arithmetic exception during compilation
-        lo = min_jlong;
-        // do not support holes, 'hi' must go to either min_jlong or max_jlong:
-        // [min_jlong, -10]/[-1,-1] ==> [min_jlong] UNION [10,max_jlong]
-        hi = i1->_hi == min_jlong ? min_jlong : max_jlong;
-      } else {
-        lo = i1->_hi/d;
-        hi = i1->_lo/d;
-      }
-    }
-    return TypeLong::make(lo, hi, widen);
-  }
-
-  // If the dividend is a constant
-  if( i1->is_con() ) {
-    jlong d = i1->get_con();
-    if( d < 0 ) {
-      if( d == min_jlong ) {
-        //  (-min_jlong) == min_jlong == (min_jlong / -1)
-        return TypeLong::make(min_jlong, max_jlong/2 + 1, widen);
-      } else {
-        return TypeLong::make(d, -d, widen);
-      }
-    }
-    return TypeLong::make(-d, d, widen);
-  }
-
-  // Otherwise we give up all hope
-  return TypeLong::LONG;
+  return compute_signed_div_type<TypeLong>(i1, i2);
 }
 
 
diff --git a/src/hotspot/share/opto/doCall.cpp b/src/hotspot/share/opto/doCall.cpp
index 5533b19897b..e4418631d17 100644
--- a/src/hotspot/share/opto/doCall.cpp
+++ b/src/hotspot/share/opto/doCall.cpp
@@ -192,7 +192,7 @@ CallGenerator* Compile::call_generator(ciMethod* callee, int vtable_index, bool
     // Try inlining a bytecoded method:
     if (!call_does_dispatch) {
       InlineTree* ilt = InlineTree::find_subtree_from_root(this->ilt(), jvms->caller(), jvms->method());
-      bool should_delay = C->should_delay_inlining();
+      bool should_delay = C->should_delay_inlining() || C->directive()->should_delay_inline(callee);
       if (ilt->ok_to_inline(callee, jvms, profile, should_delay)) {
         CallGenerator* cg = CallGenerator::for_inline(callee, expected_uses);
         // For optimized virtual calls assert at runtime that receiver object
diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index fb3b5dba42c..b067d93176a 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -748,7 +748,7 @@ Node* ConnectionGraph::specialize_castpp(Node* castpp, Node* base, Node* current
   _igvn->_worklist.push(current_control);
   _igvn->_worklist.push(control_successor);
 
-  return _igvn->transform(ConstraintCastNode::make_cast_for_type(not_eq_control, base, _igvn->type(castpp), ConstraintCastNode::UnconditionalDependency, nullptr));
+  return _igvn->transform(ConstraintCastNode::make_cast_for_type(not_eq_control, base, _igvn->type(castpp), ConstraintCastNode::DependencyType::NonFloatingNonNarrowing, nullptr));
 }
 
 Node* ConnectionGraph::split_castpp_load_through_phi(Node* curr_addp, Node* curr_load, Node* region, GrowableArray<Node*>* bases_for_loads, GrowableArray<Node *>  &alloc_worklist) {
@@ -1235,7 +1235,7 @@ bool ConnectionGraph::reduce_phi_on_safepoints_helper(Node* ophi, Node* cast, No
   Node* nsr_merge_pointer = ophi;
   if (cast != nullptr) {
     const Type* new_t = merge_t->meet(TypePtr::NULL_PTR);
-    nsr_merge_pointer = _igvn->transform(ConstraintCastNode::make_cast_for_type(cast->in(0), cast->in(1), new_t, ConstraintCastNode::RegularDependency, nullptr));
+    nsr_merge_pointer = _igvn->transform(ConstraintCastNode::make_cast_for_type(cast->in(0), cast->in(1), new_t, ConstraintCastNode::DependencyType::FloatingNarrowing, nullptr));
   }
 
   for (uint spi = 0; spi < safepoints.size(); spi++) {
@@ -1376,7 +1376,7 @@ void ConnectionGraph::reset_scalar_replaceable_entries(PhiNode* ophi) {
       }
 
       if (change) {
-        Node* new_cast = ConstraintCastNode::make_cast_for_type(out->in(0), out->in(1), out_new_t, ConstraintCastNode::StrongDependency, nullptr);
+        Node* new_cast = ConstraintCastNode::make_cast_for_type(out->in(0), out->in(1), out_new_t, ConstraintCastNode::DependencyType::NonFloatingNarrowing, nullptr);
         _igvn->replace_node(out, new_cast);
         _igvn->register_new_node_with_optimizer(new_cast);
       }
diff --git a/src/hotspot/share/opto/escape.hpp b/src/hotspot/share/opto/escape.hpp
index eea6403acdd..04a9dc82982 100644
--- a/src/hotspot/share/opto/escape.hpp
+++ b/src/hotspot/share/opto/escape.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
index 49c411843d5..71ae8fe44a7 100644
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2505,7 +2505,8 @@ Node* GraphKit::make_runtime_call(int flags,
     uint num_bits = call_type->range()->field_at(TypeFunc::Parms)->is_vect()->length_in_bytes() * BitsPerByte;
     call = new CallLeafVectorNode(call_type, call_addr, call_name, adr_type, num_bits);
   } else if (flags & RC_PURE) {
-    call = new CallLeafPureNode(call_type, call_addr, call_name, adr_type);
+    assert(adr_type == nullptr, "pure call does not touch memory");
+    call = new CallLeafPureNode(call_type, call_addr, call_name);
   } else {
     call = new CallLeafNode(call_type, call_addr, call_name, adr_type);
   }
@@ -3417,6 +3418,7 @@ Node* GraphKit::insert_mem_bar(int opcode, Node* precedent) {
   mb->init_req(TypeFunc::Control, control());
   mb->init_req(TypeFunc::Memory,  reset_memory());
   Node* membar = _gvn.transform(mb);
+  record_for_igvn(membar);
   set_control(_gvn.transform(new ProjNode(membar, TypeFunc::Control)));
   set_all_memory_call(membar);
   return membar;
@@ -3446,6 +3448,7 @@ Node* GraphKit::insert_mem_bar_volatile(int opcode, int alias_idx, Node* precede
     mb->set_req(TypeFunc::Memory, memory(alias_idx));
   }
   Node* membar = _gvn.transform(mb);
+  record_for_igvn(membar);
   set_control(_gvn.transform(new ProjNode(membar, TypeFunc::Control)));
   if (alias_idx == Compile::AliasIdxBot) {
     merged_memory()->set_base_memory(_gvn.transform(new ProjNode(membar, TypeFunc::Memory)));
diff --git a/src/hotspot/share/opto/graphKit.hpp b/src/hotspot/share/opto/graphKit.hpp
index 806a211d7e2..56e9a949e6f 100644
--- a/src/hotspot/share/opto/graphKit.hpp
+++ b/src/hotspot/share/opto/graphKit.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/opto/idealKit.hpp b/src/hotspot/share/opto/idealKit.hpp
index fe07716dcff..280f61fd9a9 100644
--- a/src/hotspot/share/opto/idealKit.hpp
+++ b/src/hotspot/share/opto/idealKit.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/opto/ifnode.cpp b/src/hotspot/share/opto/ifnode.cpp
index 83e975b95a2..cd8017f9fb3 100644
--- a/src/hotspot/share/opto/ifnode.cpp
+++ b/src/hotspot/share/opto/ifnode.cpp
@@ -487,7 +487,7 @@ IfNode* IfNode::make_with_same_profile(IfNode* if_node_profile, Node* ctrl, Node
 
 // if this IfNode follows a range check pattern return the projection
 // for the failed path
-ProjNode* IfNode::range_check_trap_proj(int& flip_test, Node*& l, Node*& r) {
+IfProjNode* IfNode::range_check_trap_proj(int& flip_test, Node*& l, Node*& r) const {
   if (outcnt() != 2) {
     return nullptr;
   }
@@ -515,8 +515,10 @@ ProjNode* IfNode::range_check_trap_proj(int& flip_test, Node*& l, Node*& r) {
   //  Flip 1:  If (Bool[<] CmpU(l, LoadRange)) ...
   //  Flip 2:  If (Bool[<=] CmpU(LoadRange, l)) ...
 
-  ProjNode* iftrap = proj_out_or_null(flip_test == 2 ? true : false);
-  return iftrap;
+  if (flip_test == 2) {
+    return true_proj_or_null();
+  }
+  return false_proj_or_null();
 }
 
 
@@ -528,7 +530,7 @@ int RangeCheckNode::is_range_check(Node* &range, Node* &index, jint &offset) {
   int flip_test = 0;
   Node* l = nullptr;
   Node* r = nullptr;
-  ProjNode* iftrap = range_check_trap_proj(flip_test, l, r);
+  IfProjNode* iftrap = range_check_trap_proj(flip_test, l, r);
 
   if (iftrap == nullptr) {
     return 0;
@@ -769,7 +771,7 @@ bool IfNode::cmpi_folds(PhaseIterGVN* igvn, bool fold_ne) {
 // Is a dominating control suitable for folding with this if?
 bool IfNode::is_ctrl_folds(Node* ctrl, PhaseIterGVN* igvn) {
   return ctrl != nullptr &&
-    ctrl->is_Proj() &&
+    ctrl->is_IfProj() &&
     ctrl->outcnt() == 1 && // No side-effects
     ctrl->in(0) != nullptr &&
     ctrl->in(0)->Opcode() == Op_If &&
@@ -782,8 +784,8 @@ bool IfNode::is_ctrl_folds(Node* ctrl, PhaseIterGVN* igvn) {
 }
 
 // Do this If and the dominating If share a region?
-bool IfNode::has_shared_region(ProjNode* proj, ProjNode*& success, ProjNode*& fail) {
-  ProjNode* otherproj = proj->other_if_proj();
+bool IfNode::has_shared_region(IfProjNode* proj, IfProjNode*& success, IfProjNode*& fail) const {
+  IfProjNode* otherproj = proj->other_if_proj();
   Node* otherproj_ctrl_use = otherproj->unique_ctrl_out_or_null();
   RegionNode* region = (otherproj_ctrl_use != nullptr && otherproj_ctrl_use->is_Region()) ? otherproj_ctrl_use->as_Region() : nullptr;
   success = nullptr;
@@ -791,13 +793,14 @@ bool IfNode::has_shared_region(ProjNode* proj, ProjNode*& success, ProjNode*& fa
 
   if (otherproj->outcnt() == 1 && region != nullptr && !region->has_phi()) {
     for (int i = 0; i < 2; i++) {
-      ProjNode* proj = proj_out(i);
-      if (success == nullptr && proj->outcnt() == 1 && proj->unique_out() == region) {
-        success = proj;
+      IfProjNode* next_proj = proj_out(i)->as_IfProj();
+      if (success == nullptr && next_proj->outcnt() == 1 && next_proj->unique_out() == region) {
+        success = next_proj;
       } else if (fail == nullptr) {
-        fail = proj;
+        fail = next_proj;
       } else {
-        success = fail = nullptr;
+        success = nullptr;
+        fail = nullptr;
       }
     }
   }
@@ -848,8 +851,8 @@ ProjNode* IfNode::uncommon_trap_proj(CallStaticJavaNode*& call, Deoptimization::
 }
 
 // Do this If and the dominating If both branch out to an uncommon trap
-bool IfNode::has_only_uncommon_traps(ProjNode* proj, ProjNode*& success, ProjNode*& fail, PhaseIterGVN* igvn) {
-  ProjNode* otherproj = proj->other_if_proj();
+bool IfNode::has_only_uncommon_traps(IfProjNode* proj, IfProjNode*& success, IfProjNode*& fail, PhaseIterGVN* igvn) const {
+  IfProjNode* otherproj = proj->other_if_proj();
   CallStaticJavaNode* dom_unc = otherproj->is_uncommon_trap_proj();
 
   if (otherproj->outcnt() == 1 && dom_unc != nullptr) {
@@ -886,8 +889,8 @@ bool IfNode::has_only_uncommon_traps(ProjNode* proj, ProjNode*& success, ProjNod
           !igvn->C->too_many_traps(dom_method, dom_bci, Deoptimization::Reason_range_check) &&
           // Return true if c2 manages to reconcile with UnstableIf optimization. See the comments for it.
           igvn->C->remove_unstable_if_trap(dom_unc, true/*yield*/)) {
-        success = unc_proj;
-        fail = unc_proj->other_if_proj();
+        success = unc_proj->as_IfProj();
+        fail = unc_proj->as_IfProj()->other_if_proj();
         return true;
       }
     }
@@ -896,7 +899,7 @@ bool IfNode::has_only_uncommon_traps(ProjNode* proj, ProjNode*& success, ProjNod
 }
 
 // Check that the 2 CmpI can be folded into as single CmpU and proceed with the folding
-bool IfNode::fold_compares_helper(ProjNode* proj, ProjNode* success, ProjNode* fail, PhaseIterGVN* igvn) {
+bool IfNode::fold_compares_helper(IfProjNode* proj, IfProjNode* success, IfProjNode* fail, PhaseIterGVN* igvn) {
   Node* this_cmp = in(1)->in(1);
   BoolNode* this_bool = in(1)->as_Bool();
   IfNode* dom_iff = proj->in(0)->as_If();
@@ -904,7 +907,7 @@ bool IfNode::fold_compares_helper(ProjNode* proj, ProjNode* success, ProjNode* f
   Node* lo = dom_iff->in(1)->in(1)->in(2);
   Node* hi = this_cmp->in(2);
   Node* n = this_cmp->in(1);
-  ProjNode* otherproj = proj->other_if_proj();
+  IfProjNode* otherproj = proj->other_if_proj();
 
   const TypeInt* lo_type = IfNode::filtered_int_type(igvn, n, otherproj);
   const TypeInt* hi_type = IfNode::filtered_int_type(igvn, n, success);
@@ -1106,11 +1109,11 @@ bool IfNode::fold_compares_helper(ProjNode* proj, ProjNode* success, ProjNode* f
 // Merge the branches that trap for this If and the dominating If into
 // a single region that branches to the uncommon trap for the
 // dominating If
-Node* IfNode::merge_uncommon_traps(ProjNode* proj, ProjNode* success, ProjNode* fail, PhaseIterGVN* igvn) {
+Node* IfNode::merge_uncommon_traps(IfProjNode* proj, IfProjNode* success, IfProjNode* fail, PhaseIterGVN* igvn) {
   Node* res = this;
   assert(success->in(0) == this, "bad projection");
 
-  ProjNode* otherproj = proj->other_if_proj();
+  IfProjNode* otherproj = proj->other_if_proj();
 
   CallStaticJavaNode* unc = success->is_uncommon_trap_proj();
   CallStaticJavaNode* dom_unc = otherproj->is_uncommon_trap_proj();
@@ -1237,7 +1240,7 @@ void IfNode::improve_address_types(Node* l, Node* r, ProjNode* fail, PhaseIterGV
 #endif
 }
 
-bool IfNode::is_cmp_with_loadrange(ProjNode* proj) {
+bool IfNode::is_cmp_with_loadrange(IfProjNode* proj) const {
   if (in(1) != nullptr &&
       in(1)->in(1) != nullptr &&
       in(1)->in(1)->in(2) != nullptr) {
@@ -1256,7 +1259,7 @@ bool IfNode::is_cmp_with_loadrange(ProjNode* proj) {
   return false;
 }
 
-bool IfNode::is_null_check(ProjNode* proj, PhaseIterGVN* igvn) {
+bool IfNode::is_null_check(IfProjNode* proj, PhaseIterGVN* igvn) const {
   Node* other = in(1)->in(1)->in(2);
   if (other->in(MemNode::Address) != nullptr &&
       proj->in(0)->in(1) != nullptr &&
@@ -1273,7 +1276,7 @@ bool IfNode::is_null_check(ProjNode* proj, PhaseIterGVN* igvn) {
 
 // Check that the If that is in between the 2 integer comparisons has
 // no side effect
-bool IfNode::is_side_effect_free_test(ProjNode* proj, PhaseIterGVN* igvn) {
+bool IfNode::is_side_effect_free_test(IfProjNode* proj, PhaseIterGVN* igvn) const {
   if (proj == nullptr) {
     return false;
   }
@@ -1313,9 +1316,9 @@ bool IfNode::is_side_effect_free_test(ProjNode* proj, PhaseIterGVN* igvn) {
 // won't be guarded by the first CmpI anymore. It can trap in cases
 // where the first CmpI would have prevented it from executing: on a
 // trap, we need to restart execution at the state of the first CmpI
-void IfNode::reroute_side_effect_free_unc(ProjNode* proj, ProjNode* dom_proj, PhaseIterGVN* igvn) {
+void IfNode::reroute_side_effect_free_unc(IfProjNode* proj, IfProjNode* dom_proj, PhaseIterGVN* igvn) {
   CallStaticJavaNode* dom_unc = dom_proj->is_uncommon_trap_if_pattern();
-  ProjNode* otherproj = proj->other_if_proj();
+  IfProjNode* otherproj = proj->other_if_proj();
   CallStaticJavaNode* unc = proj->is_uncommon_trap_if_pattern();
   Node* call_proj = dom_unc->unique_ctrl_out();
   Node* halt = call_proj->unique_ctrl_out();
@@ -1346,9 +1349,9 @@ Node* IfNode::fold_compares(PhaseIterGVN* igvn) {
     if (is_ctrl_folds(ctrl, igvn)) {
       // A integer comparison immediately dominated by another integer
       // comparison
-      ProjNode* success = nullptr;
-      ProjNode* fail = nullptr;
-      ProjNode* dom_cmp = ctrl->as_Proj();
+      IfProjNode* success = nullptr;
+      IfProjNode* fail = nullptr;
+      IfProjNode* dom_cmp = ctrl->as_IfProj();
       if (has_shared_region(dom_cmp, success, fail) &&
           // Next call modifies graph so must be last
           fold_compares_helper(dom_cmp, success, fail, igvn)) {
@@ -1362,11 +1365,11 @@ Node* IfNode::fold_compares(PhaseIterGVN* igvn) {
       return nullptr;
     } else if (ctrl->in(0) != nullptr &&
                ctrl->in(0)->in(0) != nullptr) {
-      ProjNode* success = nullptr;
-      ProjNode* fail = nullptr;
+      IfProjNode* success = nullptr;
+      IfProjNode* fail = nullptr;
       Node* dom = ctrl->in(0)->in(0);
-      ProjNode* dom_cmp = dom->isa_Proj();
-      ProjNode* other_cmp = ctrl->isa_Proj();
+      IfProjNode* dom_cmp = dom->isa_IfProj();
+      IfProjNode* other_cmp = ctrl->isa_IfProj();
 
       // Check if it's an integer comparison dominated by another
       // integer comparison with another test in between
@@ -1875,8 +1878,8 @@ static IfNode* idealize_test(PhaseGVN* phase, IfNode* iff) {
   assert(iff->in(0) != nullptr, "If must be live");
 
   if (iff->outcnt() != 2)  return nullptr; // Malformed projections.
-  Node* old_if_f = iff->proj_out(false);
-  Node* old_if_t = iff->proj_out(true);
+  IfFalseNode* old_if_f = iff->false_proj();
+  IfTrueNode* old_if_t = iff->true_proj();
 
   // CountedLoopEnds want the back-control test to be TRUE, regardless of
   // whether they are testing a 'gt' or 'lt' condition.  The 'gt' condition
@@ -2192,7 +2195,7 @@ void ParsePredicateNode::mark_useless(PhaseIterGVN& igvn) {
 }
 
 Node* ParsePredicateNode::uncommon_trap() const {
-  ParsePredicateUncommonProj* uncommon_proj = proj_out(0)->as_IfFalse();
+  ParsePredicateUncommonProj* uncommon_proj = false_proj();
   Node* uct_region_or_call = uncommon_proj->unique_ctrl_out();
   assert(uct_region_or_call->is_Region() || uct_region_or_call->is_Call(), "must be a region or call uct");
   return uct_region_or_call;
diff --git a/src/hotspot/share/opto/indexSet.hpp b/src/hotspot/share/opto/indexSet.hpp
index f628bade3fa..1d0aab0142a 100644
--- a/src/hotspot/share/opto/indexSet.hpp
+++ b/src/hotspot/share/opto/indexSet.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/opto/intrinsicnode.hpp b/src/hotspot/share/opto/intrinsicnode.hpp
index df34e363259..2672402881e 100644
--- a/src/hotspot/share/opto/intrinsicnode.hpp
+++ b/src/hotspot/share/opto/intrinsicnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 113530c8835..2c2a7c020b8 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -940,11 +940,7 @@ inline Node* LibraryCallKit::generate_limit_guard(Node* offset,
 }
 
 // Emit range checks for the given String.value byte array
-void LibraryCallKit::generate_string_range_check(Node* array,
-                                                 Node* offset,
-                                                 Node* count,
-                                                 bool char_count,
-                                                 bool halt_on_oob) {
+void LibraryCallKit::generate_string_range_check(Node* array, Node* offset, Node* count, bool char_count) {
   if (stopped()) {
     return; // already stopped
   }
@@ -962,17 +958,10 @@ void LibraryCallKit::generate_string_range_check(Node* array,
   generate_limit_guard(offset, count, load_array_length(array), bailout);
 
   if (bailout->req() > 1) {
-    if (halt_on_oob) {
-      bailout = _gvn.transform(bailout)->as_Region();
-      Node* frame = _gvn.transform(new ParmNode(C->start(), TypeFunc::FramePtr));
-      Node* halt = _gvn.transform(new HaltNode(bailout, frame, "unexpected guard failure in intrinsic"));
-      C->root()->add_req(halt);
-    } else {
-      PreserveJVMState pjvms(this);
-      set_control(_gvn.transform(bailout));
-      uncommon_trap(Deoptimization::Reason_intrinsic,
-                    Deoptimization::Action_maybe_recompile);
-    }
+    PreserveJVMState pjvms(this);
+    set_control(_gvn.transform(bailout));
+    uncommon_trap(Deoptimization::Reason_intrinsic,
+                  Deoptimization::Action_maybe_recompile);
   }
 }
 
@@ -1130,7 +1119,6 @@ bool LibraryCallKit::inline_array_equals(StrIntrinsicNode::ArgEnc ae) {
 
 
 //------------------------------inline_countPositives------------------------------
-// int java.lang.StringCoding#countPositives0(byte[] ba, int off, int len)
 bool LibraryCallKit::inline_countPositives() {
   if (too_many_traps(Deoptimization::Reason_intrinsic)) {
     return false;
@@ -1142,14 +1130,13 @@ bool LibraryCallKit::inline_countPositives() {
   Node* offset     = argument(1);
   Node* len        = argument(2);
 
-  if (VerifyIntrinsicChecks) {
-    ba = must_be_not_null(ba, true);
-    generate_string_range_check(ba, offset, len, false, true);
-    if (stopped()) {
-      return true;
-    }
-  }
+  ba = must_be_not_null(ba, true);
 
+  // Range checks
+  generate_string_range_check(ba, offset, len, false);
+  if (stopped()) {
+    return true;
+  }
   Node* ba_start = array_element_address(ba, offset, T_BYTE);
   Node* result = new CountPositivesNode(control(), memory(TypeAryPtr::BYTES), ba_start, len);
   set_result(_gvn.transform(result));
@@ -1183,7 +1170,7 @@ bool LibraryCallKit::inline_preconditions_checkIndex(BasicType bt) {
   jlong upper_bound = _gvn.type(length)->is_integer(bt)->hi_as_long();
   Node* casted_length = ConstraintCastNode::make_cast_for_basic_type(
       control(), length, TypeInteger::make(0, upper_bound, Type::WidenMax, bt),
-      ConstraintCastNode::RegularDependency, bt);
+      ConstraintCastNode::DependencyType::FloatingNarrowing, bt);
   casted_length = _gvn.transform(casted_length);
   replace_in_map(length, casted_length);
   length = casted_length;
@@ -1213,7 +1200,7 @@ bool LibraryCallKit::inline_preconditions_checkIndex(BasicType bt) {
   // index is now known to be >= 0 and < length, cast it
   Node* result = ConstraintCastNode::make_cast_for_basic_type(
       control(), index, TypeInteger::make(0, upper_bound, Type::WidenMax, bt),
-      ConstraintCastNode::RegularDependency, bt);
+      ConstraintCastNode::DependencyType::FloatingNarrowing, bt);
   result = _gvn.transform(result);
   set_result(result);
   replace_in_map(index, result);
@@ -6171,7 +6158,7 @@ LibraryCallKit::tightly_coupled_allocation(Node* ptr) {
 
 CallStaticJavaNode* LibraryCallKit::get_uncommon_trap_from_success_proj(Node* node) {
   if (node->is_IfProj()) {
-    Node* other_proj = node->as_IfProj()->other_if_proj();
+    IfProjNode* other_proj = node->as_IfProj()->other_if_proj();
     for (DUIterator_Fast jmax, j = other_proj->fast_outs(jmax); j < jmax; j++) {
       Node* obs = other_proj->fast_out(j);
       if (obs->in(0) == other_proj && obs->is_CallStaticJava() &&
@@ -6184,9 +6171,6 @@ CallStaticJavaNode* LibraryCallKit::get_uncommon_trap_from_success_proj(Node* no
 }
 
 //-------------inline_encodeISOArray-----------------------------------
-// int sun.nio.cs.ISO_8859_1.Encoder#encodeISOArray0(byte[] sa, int sp, byte[] da, int dp, int len)
-// int java.lang.StringCoding#encodeISOArray0(byte[] sa, int sp, byte[] da, int dp, int len)
-// int java.lang.StringCoding#encodeAsciiArray0(char[] sa, int sp, byte[] da, int dp, int len)
 // encode char[] to byte[] in ISO_8859_1 or ASCII
 bool LibraryCallKit::inline_encodeISOArray(bool ascii) {
   assert(callee()->signature()->size() == 5, "encodeISOArray has 5 parameters");
@@ -6197,14 +6181,8 @@ bool LibraryCallKit::inline_encodeISOArray(bool ascii) {
   Node *dst_offset  = argument(3);
   Node *length      = argument(4);
 
-  // Cast source & target arrays to not-null
-  if (VerifyIntrinsicChecks) {
-    src = must_be_not_null(src, true);
-    dst = must_be_not_null(dst, true);
-    if (stopped()) {
-      return true;
-    }
-  }
+  src = must_be_not_null(src, true);
+  dst = must_be_not_null(dst, true);
 
   const TypeAryPtr* src_type = src->Value(&_gvn)->isa_aryptr();
   const TypeAryPtr* dst_type = dst->Value(&_gvn)->isa_aryptr();
@@ -6221,15 +6199,6 @@ bool LibraryCallKit::inline_encodeISOArray(bool ascii) {
     return false;
   }
 
-  // Check source & target bounds
-  if (VerifyIntrinsicChecks) {
-    generate_string_range_check(src, src_offset, length, src_elem == T_BYTE, true);
-    generate_string_range_check(dst, dst_offset, length, false, true);
-    if (stopped()) {
-      return true;
-    }
-  }
-
   Node* src_start = array_element_address(src, src_offset, T_CHAR);
   Node* dst_start = array_element_address(dst, dst_offset, dst_elem);
   // 'src_start' points to src array + scaled offset
diff --git a/src/hotspot/share/opto/library_call.hpp b/src/hotspot/share/opto/library_call.hpp
index bfe29814dec..00ba4c795f1 100644
--- a/src/hotspot/share/opto/library_call.hpp
+++ b/src/hotspot/share/opto/library_call.hpp
@@ -163,8 +163,7 @@ class LibraryCallKit : public GraphKit {
                              Node* array_length,
                              RegionNode* region);
   void  generate_string_range_check(Node* array, Node* offset,
-                                    Node* length, bool char_count,
-                                    bool halt_on_oob = false);
+                                    Node* length, bool char_count);
   Node* current_thread_helper(Node* &tls_output, ByteSize handle_offset,
                               bool is_immutable);
   Node* generate_current_thread(Node* &tls_output);
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 5c65103677b..fdb3ab89b82 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -87,7 +87,7 @@ void IdealLoopTree::record_for_igvn() {
     Node* outer_safepoint = l->outer_safepoint();
     assert(outer_safepoint != nullptr, "missing piece of strip mined loop");
     _phase->_igvn._worklist.push(outer_safepoint);
-    Node* cle_out = _head->as_CountedLoop()->loopexit()->proj_out(false);
+    IfFalseNode* cle_out = _head->as_CountedLoop()->loopexit()->false_proj();
     assert(cle_out != nullptr, "missing piece of strip mined loop");
     _phase->_igvn._worklist.push(cle_out);
   }
@@ -1366,7 +1366,7 @@ Node *PhaseIdealLoop::clone_up_backedge_goo(Node *back_ctrl, Node *preheader_ctr
 // the backedge of the main or post loop is removed, a Div node won't be able to float above the zero trip guard of the
 // loop and can't execute even if the loop is not reached.
 void PhaseIdealLoop::cast_incr_before_loop(Node* incr, Node* ctrl, CountedLoopNode* loop) {
-  Node* castii = new CastIINode(ctrl, incr, TypeInt::INT, ConstraintCastNode::UnconditionalDependency);
+  Node* castii = new CastIINode(ctrl, incr, TypeInt::INT, ConstraintCastNode::DependencyType::NonFloatingNonNarrowing);
   register_new_node(castii, ctrl);
   Node* phi = loop->phi();
   assert(phi->in(LoopNode::EntryControl) == incr, "replacing wrong input?");
@@ -1464,9 +1464,8 @@ void PhaseIdealLoop::insert_pre_post_loops(IdealLoopTree *loop, Node_List &old_n
   pre_end->_prob = PROB_FAIR;
 
   // Find the pre-loop normal exit.
-  Node* pre_exit = pre_end->proj_out(false);
-  assert(pre_exit->Opcode() == Op_IfFalse, "");
-  IfFalseNode *new_pre_exit = new IfFalseNode(pre_end);
+  IfFalseNode* pre_exit = pre_end->false_proj();
+  IfFalseNode* new_pre_exit = new IfFalseNode(pre_end);
   _igvn.register_new_node_with_optimizer(new_pre_exit);
   set_idom(new_pre_exit, pre_end, dd_main_head);
   set_loop(new_pre_exit, outer_loop->_parent);
@@ -1707,8 +1706,7 @@ Node *PhaseIdealLoop::insert_post_loop(IdealLoopTree* loop, Node_List& old_new,
 
   //------------------------------
   // Step A: Create a new post-Loop.
-  Node* main_exit = outer_main_end->proj_out(false);
-  assert(main_exit->Opcode() == Op_IfFalse, "");
+  IfFalseNode* main_exit = outer_main_end->false_proj();
   int dd_main_exit = dom_depth(main_exit);
 
   // Step A1: Clone the loop body of main. The clone becomes the post-loop.
@@ -1721,7 +1719,7 @@ Node *PhaseIdealLoop::insert_post_loop(IdealLoopTree* loop, Node_List& old_new,
   post_head->set_post_loop(main_head);
 
   // clone_loop() above changes the exit projection
-  main_exit = outer_main_end->proj_out(false);
+  main_exit = outer_main_end->false_proj();
 
   // Reduce the post-loop trip count.
   CountedLoopEndNode* post_end = old_new[main_end->_idx]->as_CountedLoopEnd();
@@ -1786,7 +1784,7 @@ Node *PhaseIdealLoop::insert_post_loop(IdealLoopTree* loop, Node_List& old_new,
   // right after the execution of the inner CountedLoop.
   // We have to make sure that such stores in the post loop have the right memory inputs from the main loop
   // The moved store node is always attached right after the inner loop exit, and just before the safepoint
-  const Node* if_false = main_end->proj_out(false);
+  const IfFalseNode* if_false = main_end->false_proj();
   for (DUIterator j = if_false->outs(); if_false->has_out(j); j++) {
     Node* store = if_false->out(j);
     if (store->is_Store()) {
@@ -3262,7 +3260,7 @@ bool IdealLoopTree::do_remove_empty_loop(PhaseIdealLoop *phase) {
   Node* cast_ii = ConstraintCastNode::make_cast_for_basic_type(
       cl->in(LoopNode::EntryControl), exact_limit,
       phase->_igvn.type(exact_limit),
-      ConstraintCastNode::UnconditionalDependency, T_INT);
+      ConstraintCastNode::DependencyType::NonFloatingNonNarrowing, T_INT);
   phase->register_new_node(cast_ii, cl->in(LoopNode::EntryControl));
 
   Node* final_iv = new SubINode(cast_ii, cl->stride());
@@ -3944,7 +3942,7 @@ bool PhaseIdealLoop::intrinsify_fill(IdealLoopTree* lpt) {
     return false;
   }
 
-  Node* exit = head->loopexit()->proj_out_or_null(0);
+  IfFalseNode* exit = head->loopexit()->false_proj_or_null();
   if (exit == nullptr) {
     return false;
   }
@@ -3988,7 +3986,7 @@ bool PhaseIdealLoop::intrinsify_fill(IdealLoopTree* lpt) {
 
   // If the store is on the backedge, it is not executed in the last
   // iteration, and we must subtract 1 from the len.
-  Node* backedge = head->loopexit()->proj_out(1);
+  IfTrueNode* backedge = head->loopexit()->true_proj();
   if (store->in(0) == backedge) {
     len = new SubINode(len, _igvn.intcon(1));
     _igvn.register_new_node_with_optimizer(len);
diff --git a/src/hotspot/share/opto/loopUnswitch.cpp b/src/hotspot/share/opto/loopUnswitch.cpp
index 287f8354dc1..cc83bdda561 100644
--- a/src/hotspot/share/opto/loopUnswitch.cpp
+++ b/src/hotspot/share/opto/loopUnswitch.cpp
@@ -488,7 +488,7 @@ IfTrueNode* PhaseIdealLoop::create_new_if_for_multiversion(IfTrueNode* multivers
   IfNode* multiversion_if = multiversioning_fast_proj->in(0)->as_If();
   Node* entry = multiversion_if->in(0);
   OpaqueMultiversioningNode* opaque = multiversion_if->in(1)->as_OpaqueMultiversioning();
-  IfFalseNode* multiversion_slow_proj = multiversion_if->proj_out(0)->as_IfFalse();
+  IfFalseNode* multiversion_slow_proj = multiversion_if->false_proj();
   Node* slow_path = multiversion_slow_proj->unique_ctrl_out();
 
   // The slow_loop may still be delayed, and waiting for runtime-checks to be added to the
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 03cc5cbcff6..dacc1a1a734 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -79,11 +79,10 @@ bool LoopNode::is_valid_counted_loop(BasicType bt) const {
     BaseCountedLoopNode*    l  = as_BaseCountedLoop();
     BaseCountedLoopEndNode* le = l->loopexit_or_null();
     if (le != nullptr &&
-        le->proj_out_or_null(1 /* true */) == l->in(LoopNode::LoopBackControl)) {
+        le->true_proj_or_null() == l->in(LoopNode::LoopBackControl)) {
       Node* phi  = l->phi();
-      Node* exit = le->proj_out_or_null(0 /* false */);
-      if (exit != nullptr && exit->Opcode() == Op_IfFalse &&
-          phi != nullptr && phi->is_Phi() &&
+      IfFalseNode* exit = le->false_proj_or_null();
+      if (exit != nullptr && phi != nullptr && phi->is_Phi() &&
           phi->in(LoopNode::LoopBackControl) == l->incr() &&
           le->loopnode() == l && le->stride_is_con()) {
         return true;
@@ -942,7 +941,7 @@ bool PhaseIdealLoop::create_loop_nest(IdealLoopTree* loop, Node_List &old_new) {
     safepoint = find_safepoint(back_control, x, loop);
   }
 
-  Node* exit_branch = exit_test->proj_out(false);
+  IfFalseNode* exit_branch = exit_test->false_proj();
   Node* entry_control = head->in(LoopNode::EntryControl);
 
   // Clone the control flow of the loop to build an outer loop
@@ -1001,7 +1000,7 @@ bool PhaseIdealLoop::create_loop_nest(IdealLoopTree* loop, Node_List &old_new) {
     // a negative stride). We add a CastII here to guarantee that, when the counted loop is created in a subsequent loop
     // opts pass, an accurate range of values for the limits is found.
     const TypeInt* inner_iters_actual_int_range = TypeInt::make(0, iters_limit, Type::WidenMin);
-    inner_iters_actual_int = new CastIINode(outer_head, inner_iters_actual_int, inner_iters_actual_int_range, ConstraintCastNode::UnconditionalDependency);
+    inner_iters_actual_int = new CastIINode(outer_head, inner_iters_actual_int, inner_iters_actual_int_range, ConstraintCastNode::DependencyType::NonFloatingNonNarrowing);
     _igvn.register_new_node_with_optimizer(inner_iters_actual_int);
   } else {
     inner_iters_actual_int = inner_iters_actual;
@@ -1315,7 +1314,7 @@ bool PhaseIdealLoop::try_make_short_running_loop(IdealLoopTree* loop, jint strid
     register_new_node(bol, iff->in(0));
     new_limit = ConstraintCastNode::make_cast_for_basic_type(new_predicate_proj, new_limit,
                                                              TypeInteger::make(1, iters_limit_long, Type::WidenMin, bt),
-                                                             ConstraintCastNode::UnconditionalDependency, bt);
+                                                             ConstraintCastNode::DependencyType::NonFloatingNonNarrowing, bt);
     register_new_node(new_limit, new_predicate_proj);
 
 #ifndef PRODUCT
@@ -1334,7 +1333,7 @@ bool PhaseIdealLoop::try_make_short_running_loop(IdealLoopTree* loop, jint strid
     const TypeLong* new_limit_t = new_limit->Value(&_igvn)->is_long();
     new_limit = ConstraintCastNode::make_cast_for_basic_type(predicates.entry(), new_limit,
                                                              TypeLong::make(0, new_limit_t->_hi, new_limit_t->_widen),
-                                                             ConstraintCastNode::UnconditionalDependency, bt);
+                                                             ConstraintCastNode::DependencyType::NonFloatingNonNarrowing, bt);
     register_new_node(new_limit, predicates.entry());
   } else {
     assert(bt == T_INT && known_short_running_loop, "only CountedLoop statically known to be short running");
@@ -3087,7 +3086,7 @@ IfFalseNode* OuterStripMinedLoopNode::outer_loop_exit() const {
   if (le == nullptr) {
     return nullptr;
   }
-  Node* c = le->proj_out_or_null(false);
+  IfFalseNode* c = le->false_proj_or_null();
   if (c == nullptr) {
     return nullptr;
   }
@@ -3407,7 +3406,7 @@ void OuterStripMinedLoopNode::adjust_strip_mined_loop(PhaseIterGVN* igvn) {
     return;
   }
 
-  Node* cle_tail = inner_cle->proj_out(true);
+  IfTrueNode* cle_tail = inner_cle->true_proj();
   ResourceMark rm;
   Node_List old_new;
   if (cle_tail->outcnt() > 1) {
@@ -3549,7 +3548,7 @@ void OuterStripMinedLoopNode::transform_to_counted_loop(PhaseIterGVN* igvn, Phas
     iloop->replace_node_and_forward_ctrl(outer_le, new_end);
   }
   // the backedge of the inner loop must be rewired to the new loop end
-  Node* backedge = cle->proj_out(true);
+  IfTrueNode* backedge = cle->true_proj();
   igvn->replace_input_of(backedge, 0, new_end);
   if (iloop != nullptr) {
     iloop->set_idom(backedge, new_end, iloop->dom_depth(new_end) + 1);
@@ -3630,7 +3629,7 @@ const Type* OuterStripMinedLoopEndNode::Value(PhaseGVN* phase) const {
 bool OuterStripMinedLoopEndNode::is_expanded(PhaseGVN *phase) const {
   // The outer strip mined loop head only has Phi uses after expansion
   if (phase->is_IterGVN()) {
-    Node* backedge = proj_out_or_null(true);
+    IfTrueNode* backedge = true_proj_or_null();
     if (backedge != nullptr) {
       Node* head = backedge->unique_ctrl_out_or_null();
       if (head != nullptr && head->is_OuterStripMinedLoop()) {
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 3b97d76773f..ffc283ac941 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -607,7 +607,7 @@ public:
   virtual SafePointNode* outer_safepoint() const;
   CountedLoopNode* inner_counted_loop() const { return unique_ctrl_out()->as_CountedLoop(); }
   CountedLoopEndNode* inner_counted_loop_end() const { return  inner_counted_loop()->loopexit(); }
-  IfFalseNode* inner_loop_exit() const { return inner_counted_loop_end()->proj_out(false)->as_IfFalse(); }
+  IfFalseNode* inner_loop_exit() const { return inner_counted_loop_end()->false_proj(); }
 
   void adjust_strip_mined_loop(PhaseIterGVN* igvn);
 
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index ee3f138b8af..9e3d4681e7c 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -1174,7 +1174,7 @@ Node *PhaseIdealLoop::split_if_with_blocks_pre( Node *n ) {
     if ( nn ) return nn;
   }
 
-  if (n->is_ConstraintCast()) {
+  if (n->is_ConstraintCast() && n->as_ConstraintCast()->dependency().narrows_type()) {
     Node* dom_cast = n->as_ConstraintCast()->dominating_cast(&_igvn, this);
     // ConstraintCastNode::dominating_cast() uses node control input to determine domination.
     // Node control inputs don't necessarily agree with loop control info (due to
@@ -1321,8 +1321,8 @@ bool PhaseIdealLoop::identical_backtoback_ifs(Node *n) {
     return false;
   }
   IfNode* dom_if = dom->as_If();
-  Node* proj_true = dom_if->proj_out(1);
-  Node* proj_false = dom_if->proj_out(0);
+  IfTrueNode* proj_true = dom_if->true_proj();
+  IfFalseNode* proj_false = dom_if->false_proj();
 
   for (uint i = 1; i < region->req(); i++) {
     if (is_dominator(proj_true, region->in(i))) {
@@ -1585,8 +1585,8 @@ bool PhaseIdealLoop::try_merge_identical_ifs(Node* n) {
               dom_if->in(1)->in(1)->as_SubTypeCheck()->method() != nullptr), "only for subtype checks with profile data attached");
       _igvn.replace_input_of(n, 1, dom_if->in(1));
     }
-    ProjNode* dom_proj_true = dom_if->proj_out(1);
-    ProjNode* dom_proj_false = dom_if->proj_out(0);
+    IfTrueNode* dom_proj_true = dom_if->true_proj();
+    IfFalseNode* dom_proj_false = dom_if->false_proj();
 
     // Now split the IF
     RegionNode* new_false_region;
@@ -1630,10 +1630,10 @@ bool PhaseIdealLoop::try_merge_identical_ifs(Node* n) {
     // unrelated control dependency.
     for (uint i = 1; i < new_false_region->req(); i++) {
       if (is_dominator(dom_proj_true, new_false_region->in(i))) {
-        dominated_by(dom_proj_true->as_IfProj(), new_false_region->in(i)->in(0)->as_If());
+        dominated_by(dom_proj_true, new_false_region->in(i)->in(0)->as_If());
       } else {
         assert(is_dominator(dom_proj_false, new_false_region->in(i)), "bad if");
-        dominated_by(dom_proj_false->as_IfProj(), new_false_region->in(i)->in(0)->as_If());
+        dominated_by(dom_proj_false, new_false_region->in(i)->in(0)->as_If());
       }
     }
     return true;
@@ -1708,6 +1708,7 @@ void PhaseIdealLoop::try_sink_out_of_loop(Node* n) {
       !n->is_OpaqueInitializedAssertionPredicate() &&
       !n->is_OpaqueTemplateAssertionPredicate() &&
       !is_raw_to_oop_cast && // don't extend live ranges of raw oops
+      n->Opcode() != Op_CreateEx &&
       (KillPathsReachableByDeadTypeNode || !n->is_Type())
       ) {
     Node *n_ctrl = get_ctrl(n);
@@ -1837,7 +1838,7 @@ void PhaseIdealLoop::try_sink_out_of_loop(Node* n) {
               if (in != nullptr && ctrl_is_member(n_loop, in)) {
                 const Type* in_t = _igvn.type(in);
                 cast = ConstraintCastNode::make_cast_for_type(x_ctrl, in, in_t,
-                                                              ConstraintCastNode::UnconditionalDependency, nullptr);
+                                                              ConstraintCastNode::DependencyType::NonFloatingNonNarrowing, nullptr);
               }
               if (cast != nullptr) {
                 Node* prev = _igvn.hash_find_insert(cast);
@@ -2394,7 +2395,7 @@ void PhaseIdealLoop::clone_outer_loop(LoopNode* head, CloneLoopMode mode, IdealL
     CountedLoopEndNode* cle = cl->loopexit();
     CountedLoopNode* new_cl = old_new[cl->_idx]->as_CountedLoop();
     CountedLoopEndNode* new_cle = new_cl->as_CountedLoop()->loopexit_or_null();
-    Node* cle_out = cle->proj_out(false);
+    IfFalseNode* cle_out = cle->false_proj();
 
     Node* new_sfpt = nullptr;
     Node* new_cle_out = cle_out->clone();
@@ -2691,7 +2692,7 @@ void PhaseIdealLoop::fix_ctrl_uses(const Node_List& body, const IdealLoopTree* l
           if (use->in(0) == cle) {
             IfFalseNode* cle_out = use->as_IfFalse();
             IfNode* le = cl->outer_loop_end();
-            use = le->proj_out(false);
+            use = le->false_proj();
             use_loop = get_loop(use);
             if (mode == CloneIncludesStripMined) {
               nnn = old_new[le->_idx];
diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
index 90602bc2b35..80818a4ddc7 100644
--- a/src/hotspot/share/opto/macro.cpp
+++ b/src/hotspot/share/opto/macro.cpp
@@ -2379,8 +2379,8 @@ void PhaseMacroExpand::expand_subtypecheck_node(SubTypeCheckNode *check) {
       continue;
     }
 
-    Node* iftrue = iff->as_If()->proj_out(1);
-    Node* iffalse = iff->as_If()->proj_out(0);
+    IfTrueNode* iftrue = iff->as_If()->true_proj();
+    IfFalseNode* iffalse = iff->as_If()->false_proj();
     Node* ctrl = iff->in(0);
 
     Node* subklass = nullptr;
@@ -2658,8 +2658,7 @@ bool PhaseMacroExpand::expand_macro_nodes() {
       case Op_ModD:
       case Op_ModF: {
         CallNode* mod_macro = n->as_Call();
-        CallNode* call = new CallLeafPureNode(mod_macro->tf(), mod_macro->entry_point(),
-                                              mod_macro->_name, TypeRawPtr::BOTTOM);
+        CallNode* call = new CallLeafPureNode(mod_macro->tf(), mod_macro->entry_point(), mod_macro->_name);
         call->init_req(TypeFunc::Control, mod_macro->in(TypeFunc::Control));
         call->init_req(TypeFunc::I_O, C->top());
         call->init_req(TypeFunc::Memory, C->top());
diff --git a/src/hotspot/share/opto/macroArrayCopy.cpp b/src/hotspot/share/opto/macroArrayCopy.cpp
index 0ba8ed40c37..fb4a1842a36 100644
--- a/src/hotspot/share/opto/macroArrayCopy.cpp
+++ b/src/hotspot/share/opto/macroArrayCopy.cpp
@@ -233,7 +233,7 @@ void PhaseMacroExpand::generate_partial_inlining_block(Node** ctrl, MergeMemNode
   Node* inline_block = generate_guard(ctrl, bol_le, nullptr, PROB_FAIR);
   Node* stub_block = *ctrl;
 
-  Node* casted_length = new CastLLNode(inline_block, length, inline_range, ConstraintCastNode::RegularDependency);
+  Node* casted_length = new CastLLNode(inline_block, length, inline_range, ConstraintCastNode::DependencyType::FloatingNarrowing);
   transform_later(casted_length);
   Node* mask_gen = VectorMaskGenNode::make(casted_length, type);
   transform_later(mask_gen);
diff --git a/src/hotspot/share/opto/matcher.hpp b/src/hotspot/share/opto/matcher.hpp
index ca13d0166a1..a071cff9e3c 100644
--- a/src/hotspot/share/opto/matcher.hpp
+++ b/src/hotspot/share/opto/matcher.hpp
@@ -329,6 +329,10 @@ public:
 
   static bool match_rule_supported_vector_masked(int opcode, int vlen, BasicType bt);
 
+  // Determines if a vector operation needs to be partially implemented with a mask
+  // controlling only the lanes in range [0, vector_length) are processed. This applies
+  // to operations whose vector length is less than the hardware-supported maximum
+  // vector length. Returns true if the operation requires masking, false otherwise.
   static bool vector_needs_partial_operations(Node* node, const TypeVect* vt);
 
   static bool vector_rearrange_requires_load_shuffle(BasicType elem_bt, int vlen);
diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index 19ff90df5ed..5b76f5b42cf 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -3103,7 +3103,7 @@ MergePrimitiveStores::CFGStatus MergePrimitiveStores::cfg_status_for_pair(const
       ctrl_use->in(0)->outcnt() != 2) {
     return CFGStatus::Failure; // Not RangeCheck.
   }
-  ProjNode* other_proj = ctrl_use->as_IfProj()->other_if_proj();
+  IfProjNode* other_proj = ctrl_use->as_IfProj()->other_if_proj();
   Node* trap = other_proj->is_uncommon_trap_proj(Deoptimization::Reason_range_check);
   if (trap != merge_mem->unique_out() ||
       ctrl_use->in(0)->in(0) != ctrl_def) {
diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp
index 280781f686b..aa8d6cfce2e 100644
--- a/src/hotspot/share/opto/mulnode.cpp
+++ b/src/hotspot/share/opto/mulnode.cpp
@@ -29,6 +29,7 @@
 #include "opto/memnode.hpp"
 #include "opto/mulnode.hpp"
 #include "opto/phaseX.hpp"
+#include "opto/rangeinference.hpp"
 #include "opto/subnode.hpp"
 #include "utilities/powerOfTwo.hpp"
 
@@ -620,80 +621,14 @@ const Type* MulHiValue(const Type *t1, const Type *t2, const Type *bot) {
   return TypeLong::LONG;
 }
 
-template<typename IntegerType>
-static const IntegerType* and_value(const IntegerType* r0, const IntegerType* r1) {
-  typedef typename IntegerType::NativeType NativeType;
-  static_assert(std::is_signed<NativeType>::value, "Native type of IntegerType must be signed!");
-
-  int widen = MAX2(r0->_widen, r1->_widen);
-
-  // If both types are constants, we can calculate a constant result.
-  if (r0->is_con() && r1->is_con()) {
-    return IntegerType::make(r0->get_con() & r1->get_con());
-  }
-
-  // If both ranges are positive, the result will range from 0 up to the hi value of the smaller range. The minimum
-  // of the two constrains the upper bound because any higher value in the other range will see all zeroes, so it will be masked out.
-  if (r0->_lo >= 0 && r1->_lo >= 0) {
-    return IntegerType::make(0, MIN2(r0->_hi, r1->_hi), widen);
-  }
-
-  // If only one range is positive, the result will range from 0 up to that range's maximum value.
-  // For the operation 'x & C' where C is a positive constant, the result will be in the range [0..C]. With that observation,
-  // we can say that for any integer c such that 0 <= c <= C will also be in the range [0..C]. Therefore, 'x & [c..C]'
-  // where c >= 0 will be in the range [0..C].
-  if (r0->_lo >= 0) {
-    return IntegerType::make(0, r0->_hi, widen);
-  }
-
-  if (r1->_lo >= 0) {
-    return IntegerType::make(0, r1->_hi, widen);
-  }
-
-  // At this point, all positive ranges will have already been handled, so the only remaining cases will be negative ranges
-  // and constants.
-
-  assert(r0->_lo < 0 && r1->_lo < 0, "positive ranges should already be handled!");
-
-  // As two's complement means that both numbers will start with leading 1s, the lower bound of both ranges will contain
-  // the common leading 1s of both minimum values. In order to count them with count_leading_zeros, the bits are inverted.
-  NativeType sel_val = ~MIN2(r0->_lo, r1->_lo);
-
-  NativeType min;
-  if (sel_val == 0) {
-    // Since count_leading_zeros is undefined at 0, we short-circuit the condition where both ranges have a minimum of -1.
-    min = -1;
-  } else {
-    // To get the number of bits to shift, we count the leading 0-bits and then subtract one, as the sign bit is already set.
-    int shift_bits = count_leading_zeros(sel_val) - 1;
-    min = std::numeric_limits<NativeType>::min() >> shift_bits;
-  }
-
-  NativeType max;
-  if (r0->_hi < 0 && r1->_hi < 0) {
-    // If both ranges are negative, then the same optimization as both positive ranges will apply, and the smaller hi
-    // value will mask off any bits set by higher values.
-    max = MIN2(r0->_hi, r1->_hi);
-  } else {
-    // In the case of ranges that cross zero, negative values can cause the higher order bits to be set, so the maximum
-    // positive value can be as high as the larger hi value.
-    max = MAX2(r0->_hi, r1->_hi);
-  }
-
-  return IntegerType::make(min, max, widen);
-}
-
 //=============================================================================
 //------------------------------mul_ring---------------------------------------
 // Supplied function returns the product of the inputs IN THE CURRENT RING.
 // For the logical operations the ring's MUL is really a logical AND function.
 // This also type-checks the inputs for sanity.  Guaranteed never to
 // be passed a TOP or BOTTOM type, these are filtered out by pre-check.
-const Type *AndINode::mul_ring( const Type *t0, const Type *t1 ) const {
-  const TypeInt* r0 = t0->is_int();
-  const TypeInt* r1 = t1->is_int();
-
-  return and_value<TypeInt>(r0, r1);
+const Type* AndINode::mul_ring(const Type* t1, const Type* t2) const {
+  return RangeInference::infer_and(t1->is_int(), t2->is_int());
 }
 
 static bool AndIL_is_zero_element_under_mask(const PhaseGVN* phase, const Node* expr, const Node* mask, BasicType bt);
@@ -822,11 +757,8 @@ Node *AndINode::Ideal(PhaseGVN *phase, bool can_reshape) {
 // For the logical operations the ring's MUL is really a logical AND function.
 // This also type-checks the inputs for sanity.  Guaranteed never to
 // be passed a TOP or BOTTOM type, these are filtered out by pre-check.
-const Type *AndLNode::mul_ring( const Type *t0, const Type *t1 ) const {
-  const TypeLong* r0 = t0->is_long();
-  const TypeLong* r1 = t1->is_long();
-
-  return and_value<TypeLong>(r0, r1);
+const Type* AndLNode::mul_ring(const Type* t1, const Type* t2) const {
+  return RangeInference::infer_and(t1->is_long(), t2->is_long());
 }
 
 const Type* AndLNode::Value(PhaseGVN* phase) const {
diff --git a/src/hotspot/share/opto/multnode.cpp b/src/hotspot/share/opto/multnode.cpp
index 9409a2f6af3..05867a35268 100644
--- a/src/hotspot/share/opto/multnode.cpp
+++ b/src/hotspot/share/opto/multnode.cpp
@@ -260,12 +260,7 @@ CallStaticJavaNode* ProjNode::is_uncommon_trap_if_pattern(Deoptimization::DeoptR
     // Not a projection of an If or variation of a dead If node.
     return nullptr;
   }
-  return other_if_proj()->is_uncommon_trap_proj(reason);
-}
-
-ProjNode* ProjNode::other_if_proj() const {
-  assert(_con == 0 || _con == 1, "not an if?");
-  return in(0)->as_If()->proj_out(1-_con);
+  return as_IfProj()->other_if_proj()->is_uncommon_trap_proj(reason);
 }
 
 NarrowMemProjNode::NarrowMemProjNode(InitializeNode* src, const TypePtr* adr_type)
diff --git a/src/hotspot/share/opto/multnode.hpp b/src/hotspot/share/opto/multnode.hpp
index be1351cc5b1..20ab59aeabc 100644
--- a/src/hotspot/share/opto/multnode.hpp
+++ b/src/hotspot/share/opto/multnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -200,9 +200,6 @@ public:
   //                                             other_proj->[region->..]call_uct"
   // null otherwise
   CallStaticJavaNode* is_uncommon_trap_if_pattern(Deoptimization::DeoptReason reason = Deoptimization::Reason_none) const;
-
-  // Return other proj node when this is a If proj node
-  ProjNode* other_if_proj() const;
 };
 
 // A ProjNode variant that captures an adr_type(). Used as a projection of InitializeNode to have the right adr_type()
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index 2452677caf3..832727a424e 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2024, 2025, Alibaba Group Holding Limited. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -999,18 +999,22 @@ bool Node::has_out_with(int opcode1, int opcode2, int opcode3, int opcode4) {
 //---------------------------uncast_helper-------------------------------------
 Node* Node::uncast_helper(const Node* p, bool keep_deps) {
 #ifdef ASSERT
+  // If we end up traversing more nodes than we actually have,
+  // it is definitely an infinite loop.
+  uint max_depth = Compile::current()->unique();
   uint depth_count = 0;
   const Node* orig_p = p;
 #endif
 
   while (true) {
 #ifdef ASSERT
-    if (depth_count >= K) {
+    if (depth_count++ >= max_depth) {
       orig_p->dump(4);
-      if (p != orig_p)
+      if (p != orig_p) {
         p->dump(1);
+      }
+      fatal("infinite loop in Node::uncast_helper");
     }
-    assert(depth_count++ < K, "infinite loop in Node::uncast_helper");
 #endif
     if (p == nullptr || p->req() != 2) {
       break;
@@ -1209,7 +1213,7 @@ bool Node::has_special_unique_user() const {
   if (this->is_Store()) {
     // Condition for back-to-back stores folding.
     return n->Opcode() == op && n->in(MemNode::Memory) == this;
-  } else if ((this->is_Load() || this->is_DecodeN() || this->is_Phi()) && n->Opcode() == Op_MemBarAcquire) {
+  } else if ((this->is_Load() || this->is_DecodeN() || this->is_Phi() || this->is_Con()) && n->Opcode() == Op_MemBarAcquire) {
     // Condition for removing an unused LoadNode or DecodeNNode from the MemBarAcquire precedence input
     return true;
   } else if (this->is_Load() && n->is_Move()) {
@@ -2875,16 +2879,9 @@ Node* Node::find_similar(int opc) {
         Node* use = def->fast_out(i);
         if (use != this &&
             use->Opcode() == opc &&
-            use->req() == req()) {
-          uint j;
-          for (j = 0; j < use->req(); j++) {
-            if (use->in(j) != in(j)) {
-              break;
-            }
-          }
-          if (j == use->req()) {
-            return use;
-          }
+            use->req() == req() &&
+            has_same_inputs_as(use)) {
+          return use;
         }
       }
     }
@@ -2892,6 +2889,16 @@ Node* Node::find_similar(int opc) {
   return nullptr;
 }
 
+bool Node::has_same_inputs_as(const Node* other) const {
+  assert(req() == other->req(), "should have same number of inputs");
+  for (uint j = 0; j < other->req(); j++) {
+    if (in(j) != other->in(j)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 Node* Node::unique_multiple_edges_out_or_null() const {
   Node* use = nullptr;
   for (DUIterator_Fast kmax, k = fast_outs(kmax); k < kmax; k++) {
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 2e19d1d247b..0adb2072100 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -1179,6 +1179,7 @@ public:
   // Return a node with opcode "opc" and same inputs as "this" if one can
   // be found; Otherwise return null;
   Node* find_similar(int opc);
+  bool has_same_inputs_as(const Node* other) const;
 
   // Return the unique control out if only one. Null if none or more than one.
   Node* unique_ctrl_out_or_null() const;
diff --git a/src/hotspot/share/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp
index cb8073144a5..eac2b3e863a 100644
--- a/src/hotspot/share/opto/parse2.cpp
+++ b/src/hotspot/share/opto/parse2.cpp
@@ -41,6 +41,7 @@
 #include "opto/opaquenode.hpp"
 #include "opto/parse.hpp"
 #include "opto/runtime.hpp"
+#include "opto/subtypenode.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/sharedRuntime.hpp"
 
@@ -1719,38 +1720,108 @@ static Node* extract_obj_from_klass_load(PhaseGVN* gvn, Node* n) {
   return obj;
 }
 
+// Matches exact and inexact type check IR shapes during parsing.
+// On successful match, returns type checked object node and its type after successful check
+// as out parameters.
+static bool match_type_check(PhaseGVN& gvn,
+                             BoolTest::mask btest,
+                             Node* con, const Type* tcon,
+                             Node* val, const Type* tval,
+                             Node** obj, const TypeOopPtr** cast_type) { // out-parameters
+  // Look for opportunities to sharpen the type of a node whose klass is compared with a constant klass.
+  // The constant klass being tested against can come from many bytecode instructions (implicitly or explicitly),
+  // and also from profile data used by speculative casts.
+  if (btest == BoolTest::eq && tcon->isa_klassptr()) {
+    // Found:
+    //   Bool(CmpP(LoadKlass(obj._klass), ConP(Foo.klass)), [eq])
+    // or the narrowOop equivalent.
+    (*obj) = extract_obj_from_klass_load(&gvn, val);
+    (*cast_type) = tcon->isa_klassptr()->as_instance_type();
+    return true; // found
+  }
+
+  // Match an instanceof check.
+  // During parsing its IR shape is not canonicalized yet.
+  //
+  //             obj superklass
+  //              |    |
+  //           SubTypeCheck
+  //                |
+  //               Bool [eq] / [ne]
+  //                |
+  //                If
+  //               / \
+  //              T   F
+  //               \ /
+  //              Region
+  //                 \  ConI ConI
+  //                  \  |  /
+  //          val ->    Phi  ConI  <- con
+  //                     \  /
+  //                     CmpI
+  //                      |
+  //                    Bool [btest]
+  //                      |
+  //
+  if (tval->isa_int() && val->is_Phi() && val->in(0)->as_Region()->is_diamond()) {
+    RegionNode* diamond = val->in(0)->as_Region();
+    IfNode* if1 = diamond->in(1)->in(0)->as_If();
+    BoolNode* b1 = if1->in(1)->isa_Bool();
+    if (b1 != nullptr && b1->in(1)->isa_SubTypeCheck()) {
+      assert(b1->_test._test == BoolTest::eq ||
+             b1->_test._test == BoolTest::ne, "%d", b1->_test._test);
+
+      ProjNode* success_proj = if1->proj_out(b1->_test._test == BoolTest::eq ? 1 : 0);
+      int idx = diamond->find_edge(success_proj);
+      assert(idx == 1 || idx == 2, "");
+      Node* vcon = val->in(idx);
+
+      assert(val->find_edge(con) > 0, "");
+      if ((btest == BoolTest::eq && vcon == con) || (btest == BoolTest::ne && vcon != con)) {
+        SubTypeCheckNode* sub = b1->in(1)->as_SubTypeCheck();
+        Node* obj_or_subklass = sub->in(SubTypeCheckNode::ObjOrSubKlass);
+        Node* superklass = sub->in(SubTypeCheckNode::SuperKlass);
+
+        if (gvn.type(obj_or_subklass)->isa_oopptr()) {
+          const TypeKlassPtr* klass_ptr_type = gvn.type(superklass)->is_klassptr();
+          const TypeKlassPtr* improved_klass_ptr_type = klass_ptr_type->try_improve();
+
+          (*obj) = obj_or_subklass;
+          (*cast_type) = improved_klass_ptr_type->cast_to_exactness(false)->as_instance_type();
+          return true; // found
+        }
+      }
+    }
+  }
+  return false; // not found
+}
+
 void Parse::sharpen_type_after_if(BoolTest::mask btest,
                                   Node* con, const Type* tcon,
                                   Node* val, const Type* tval) {
-  // Look for opportunities to sharpen the type of a node
-  // whose klass is compared with a constant klass.
-  if (btest == BoolTest::eq && tcon->isa_klassptr()) {
-    Node* obj = extract_obj_from_klass_load(&_gvn, val);
-    const TypeOopPtr* con_type = tcon->isa_klassptr()->as_instance_type();
-    if (obj != nullptr && (con_type->isa_instptr() || con_type->isa_aryptr())) {
-       // Found:
-       //   Bool(CmpP(LoadKlass(obj._klass), ConP(Foo.klass)), [eq])
-       // or the narrowOop equivalent.
-       const Type* obj_type = _gvn.type(obj);
-       const TypeOopPtr* tboth = obj_type->join_speculative(con_type)->isa_oopptr();
-       if (tboth != nullptr && tboth->klass_is_exact() && tboth != obj_type &&
-           tboth->higher_equal(obj_type)) {
-          // obj has to be of the exact type Foo if the CmpP succeeds.
-          int obj_in_map = map()->find_edge(obj);
-          JVMState* jvms = this->jvms();
-          if (obj_in_map >= 0 &&
-              (jvms->is_loc(obj_in_map) || jvms->is_stk(obj_in_map))) {
-            TypeNode* ccast = new CheckCastPPNode(control(), obj, tboth);
-            const Type* tcc = ccast->as_Type()->type();
-            assert(tcc != obj_type && tcc->higher_equal(obj_type), "must improve");
-            // Delay transform() call to allow recovery of pre-cast value
-            // at the control merge.
-            _gvn.set_type_bottom(ccast);
-            record_for_igvn(ccast);
-            // Here's the payoff.
-            replace_in_map(obj, ccast);
-          }
-       }
+  Node* obj = nullptr;
+  const TypeOopPtr* cast_type = nullptr;
+  // Insert a cast node with a narrowed type after a successful type check.
+  if (match_type_check(_gvn, btest, con, tcon, val, tval,
+                       &obj, &cast_type)) {
+    assert(obj != nullptr && cast_type != nullptr, "missing type check info");
+    const Type* obj_type = _gvn.type(obj);
+    const TypeOopPtr* tboth = obj_type->join_speculative(cast_type)->isa_oopptr();
+    if (tboth != nullptr && tboth != obj_type && tboth->higher_equal(obj_type)) {
+      int obj_in_map = map()->find_edge(obj);
+      JVMState* jvms = this->jvms();
+      if (obj_in_map >= 0 &&
+          (jvms->is_loc(obj_in_map) || jvms->is_stk(obj_in_map))) {
+        TypeNode* ccast = new CheckCastPPNode(control(), obj, tboth);
+        const Type* tcc = ccast->as_Type()->type();
+        assert(tcc != obj_type && tcc->higher_equal(obj_type), "must improve");
+        // Delay transform() call to allow recovery of pre-cast value
+        // at the control merge.
+        _gvn.set_type_bottom(ccast);
+        record_for_igvn(ccast);
+        // Here's the payoff.
+        replace_in_map(obj, ccast);
+      }
     }
   }
 
diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 4a0933b89f2..1e4cd42e09a 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -1076,7 +1076,8 @@ void PhaseIterGVN::verify_optimize() {
 
   if (is_verify_Value() ||
       is_verify_Ideal() ||
-      is_verify_Identity()) {
+      is_verify_Identity() ||
+      is_verify_invariants()) {
     ResourceMark rm;
     Unique_Node_List worklist;
     bool failure = false;
@@ -1088,6 +1089,7 @@ void PhaseIterGVN::verify_optimize() {
       if (is_verify_Ideal())    { failure |= verify_Ideal_for(n, false); }
       if (is_verify_Ideal())    { failure |= verify_Ideal_for(n, true); }
       if (is_verify_Identity()) { failure |= verify_Identity_for(n); }
+      if (is_verify_invariants()) { failure |= verify_node_invariants_for(n); }
       // traverse all inputs and outputs
       for (uint i = 0; i < n->req(); i++) {
         if (n->in(i) != nullptr) {
@@ -1102,7 +1104,7 @@ void PhaseIterGVN::verify_optimize() {
     // We should either make sure that these nodes are properly added back to the IGVN worklist
     // in PhaseIterGVN::add_users_to_worklist to update them again or add an exception
     // in the verification code above if that is not possible for some reason (like Load nodes).
-    assert(!failure, "Missed optimization opportunity in PhaseIterGVN");
+    assert(!failure, "Missed optimization opportunity/broken graph in PhaseIterGVN");
   }
 
   verify_empty_worklist(nullptr);
@@ -2058,6 +2060,21 @@ bool PhaseIterGVN::verify_Identity_for(Node* n) {
   tty->print_cr("%s", ss.as_string());
   return true;
 }
+
+// Some other verifications that are not specific to a particular transformation.
+bool PhaseIterGVN::verify_node_invariants_for(const Node* n) {
+  if (n->is_AddP()) {
+    if (!n->as_AddP()->address_input_has_same_base()) {
+      stringStream ss; // Print as a block without tty lock.
+      ss.cr();
+      ss.print_cr("Base pointers must match for AddP chain:");
+      n->dump_bfs(2, nullptr, "", &ss);
+      tty->print_cr("%s", ss.as_string());
+      return true;
+    }
+  }
+  return false;
+}
 #endif
 
 /**
diff --git a/src/hotspot/share/opto/phaseX.hpp b/src/hotspot/share/opto/phaseX.hpp
index 473231e6af5..3f75aab8980 100644
--- a/src/hotspot/share/opto/phaseX.hpp
+++ b/src/hotspot/share/opto/phaseX.hpp
@@ -493,6 +493,7 @@ public:
   bool verify_Value_for(Node* n, bool strict = false);
   bool verify_Ideal_for(Node* n, bool can_reshape);
   bool verify_Identity_for(Node* n);
+  bool verify_node_invariants_for(const Node* n);
   void verify_empty_worklist(Node* n);
 #endif
 
@@ -616,6 +617,10 @@ public:
     // '-XX:VerifyIterativeGVN=1000'
     return ((VerifyIterativeGVN % 10000) / 1000) == 1;
   }
+  static bool is_verify_invariants() {
+    // '-XX:VerifyIterativeGVN=10000'
+    return ((VerifyIterativeGVN % 100000) / 10000) == 1;
+  }
 protected:
   // Sub-quadratic implementation of '-XX:VerifyIterativeGVN=1' (Use-Def verification).
   julong _verify_counter;
diff --git a/src/hotspot/share/opto/predicates.cpp b/src/hotspot/share/opto/predicates.cpp
index 2489ff563a9..89bc4374ca6 100644
--- a/src/hotspot/share/opto/predicates.cpp
+++ b/src/hotspot/share/opto/predicates.cpp
@@ -65,7 +65,7 @@ bool AssertionPredicate::has_assertion_predicate_opaque(const Node* predicate_pr
 
 // Check if the other projection (UCT projection) of `success_proj` has a Halt node as output.
 bool AssertionPredicate::has_halt(const IfTrueNode* success_proj) {
-  ProjNode* other_proj = success_proj->other_if_proj();
+  IfProjNode* other_proj = success_proj->other_if_proj();
   return other_proj->outcnt() == 1 && other_proj->unique_out()->Opcode() == Op_Halt;
 }
 
@@ -396,7 +396,7 @@ bool InitializedAssertionPredicate::is_predicate(const Node* maybe_success_proj)
 
 #ifdef ASSERT
 bool InitializedAssertionPredicate::has_halt(const IfTrueNode* success_proj) {
-  ProjNode* other_proj = success_proj->other_if_proj();
+  IfProjNode* other_proj = success_proj->other_if_proj();
   if (other_proj->outcnt() != 1) {
     return false;
   }
diff --git a/src/hotspot/share/opto/rangeinference.cpp b/src/hotspot/share/opto/rangeinference.cpp
index 40b9da4bde5..cb26e68ef58 100644
--- a/src/hotspot/share/opto/rangeinference.cpp
+++ b/src/hotspot/share/opto/rangeinference.cpp
@@ -25,7 +25,6 @@
 #include "opto/rangeinference.hpp"
 #include "opto/type.hpp"
 #include "utilities/intn_t.hpp"
-#include "utilities/tuple.hpp"
 
 // If the cardinality of a TypeInt is below this threshold, use min widen, see
 // TypeIntPrototype<S, U>::normalize_widen
@@ -688,6 +687,8 @@ template class TypeIntPrototype<intn_t<1>, uintn_t<1>>;
 template class TypeIntPrototype<intn_t<2>, uintn_t<2>>;
 template class TypeIntPrototype<intn_t<3>, uintn_t<3>>;
 template class TypeIntPrototype<intn_t<4>, uintn_t<4>>;
+template class TypeIntPrototype<intn_t<5>, uintn_t<5>>;
+template class TypeIntPrototype<intn_t<6>, uintn_t<6>>;
 
 // Compute the meet of 2 types. When dual is true, the subset relation in CT is
 // reversed. This means that the result of 2 CTs would be the intersection of
@@ -709,10 +710,7 @@ const Type* TypeIntHelper::int_type_xmeet(const CT* i1, const Type* t2) {
 
     if (!i1->_is_dual) {
       // meet (a.k.a union)
-      return CT::make_or_top(TypeIntPrototype<S, U>{{MIN2(i1->_lo, i2->_lo), MAX2(i1->_hi, i2->_hi)},
-                                                    {MIN2(i1->_ulo, i2->_ulo), MAX2(i1->_uhi, i2->_uhi)},
-                                                    {i1->_bits._zeros & i2->_bits._zeros, i1->_bits._ones & i2->_bits._ones}},
-                             MAX2(i1->_widen, i2->_widen), false);
+      return int_type_union(i1, i2);
     } else {
       // join (a.k.a intersection)
       return CT::make_or_top(TypeIntPrototype<S, U>{{MAX2(i1->_lo, i2->_lo), MIN2(i1->_hi, i2->_hi)},
diff --git a/src/hotspot/share/opto/rangeinference.hpp b/src/hotspot/share/opto/rangeinference.hpp
index 73b8b43bd6e..ebfd98ca4a6 100644
--- a/src/hotspot/share/opto/rangeinference.hpp
+++ b/src/hotspot/share/opto/rangeinference.hpp
@@ -25,6 +25,7 @@
 #ifndef SHARE_OPTO_RANGEINFERENCE_HPP
 #define SHARE_OPTO_RANGEINFERENCE_HPP
 
+#include "cppstdlib/limits.hpp"
 #include "cppstdlib/type_traits.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -92,19 +93,6 @@ public:
   RangeInt<U> _urange;
   KnownBits<U> _bits;
 
-private:
-  friend class TypeInt;
-  friend class TypeLong;
-
-  template <class T1, class T2>
-  friend void test_canonicalize_constraints_exhaustive();
-
-  template <class T1, class T2>
-  friend void test_canonicalize_constraints_simple();
-
-  template <class T1, class T2>
-  friend void test_canonicalize_constraints_random();
-
   // A canonicalized version of a TypeIntPrototype, if the prototype represents
   // an empty type, _present is false, otherwise, _data is canonical
   class CanonicalizedTypeIntPrototype {
@@ -158,21 +146,33 @@ public:
   template <class CT>
   static const Type* int_type_xmeet(const CT* i1, const Type* t2);
 
-  template <class CT>
-  static bool int_type_is_equal(const CT* t1, const CT* t2) {
+  template <class CTP>
+  static CTP int_type_union(CTP t1, CTP t2) {
+    using CT = std::conditional_t<std::is_pointer_v<CTP>, std::remove_pointer_t<CTP>, CTP>;
+    using S = std::remove_const_t<decltype(CT::_lo)>;
+    using U = std::remove_const_t<decltype(CT::_ulo)>;
+    return CT::make(TypeIntPrototype<S, U>{{MIN2(t1->_lo, t2->_lo), MAX2(t1->_hi, t2->_hi)},
+                                           {MIN2(t1->_ulo, t2->_ulo), MAX2(t1->_uhi, t2->_uhi)},
+                                           {t1->_bits._zeros & t2->_bits._zeros, t1->_bits._ones & t2->_bits._ones}},
+                    MAX2(t1->_widen, t2->_widen));
+  }
+
+  template <class CTP>
+  static bool int_type_is_equal(const CTP t1, const CTP t2) {
     return t1->_lo == t2->_lo && t1->_hi == t2->_hi &&
            t1->_ulo == t2->_ulo && t1->_uhi == t2->_uhi &&
            t1->_bits._zeros == t2->_bits._zeros && t1->_bits._ones == t2->_bits._ones;
   }
 
-  template <class CT>
-  static bool int_type_is_subset(const CT* super, const CT* sub) {
+  template <class CTP>
+  static bool int_type_is_subset(const CTP super, const CTP sub) {
+    using U = decltype(super->_ulo);
     return super->_lo <= sub->_lo && super->_hi >= sub->_hi &&
            super->_ulo <= sub->_ulo && super->_uhi >= sub->_uhi &&
            // All bits that are known in super must also be known to be the same
            // value in sub, &~ (and not) is the same as a set subtraction on bit
            // sets
-           (super->_bits._zeros &~ sub->_bits._zeros) == 0 && (super->_bits._ones &~ sub->_bits._ones) == 0;
+           (super->_bits._zeros &~ sub->_bits._zeros) == U(0) && (super->_bits._ones &~ sub->_bits._ones) == U(0);
   }
 
   template <class CT>
@@ -195,4 +195,199 @@ public:
 #endif // PRODUCT
 };
 
+// A TypeIntMirror is structurally similar to a TypeInt or a TypeLong but it decouples the range
+// inference from the Type infrastructure of the compiler. It also allows more flexibility with the
+// bit width of the integer type. As a result, it is more efficient to use for intermediate steps
+// of inference, as well as more flexible to perform testing on different integer types.
+template <class S, class U>
+class TypeIntMirror {
+public:
+  S _lo;
+  S _hi;
+  U _ulo;
+  U _uhi;
+  KnownBits<U> _bits;
+  int _widen = 0; // dummy field to mimic the same field in TypeInt, useful in testing
+
+  static TypeIntMirror make(const TypeIntPrototype<S, U>& t, int widen) {
+    auto canonicalized_t = t.canonicalize_constraints();
+    assert(!canonicalized_t.empty(), "must not be empty");
+    return TypeIntMirror{canonicalized_t._data._srange._lo, canonicalized_t._data._srange._hi,
+                         canonicalized_t._data._urange._lo, canonicalized_t._data._urange._hi,
+                         canonicalized_t._data._bits};
+  }
+
+  // These allow TypeIntMirror to mimick the behaviors of TypeInt* and TypeLong*, so they can be
+  // passed into RangeInference methods. These are only used in testing, so they are implemented in
+  // the test file.
+  const TypeIntMirror* operator->() const;
+  TypeIntMirror meet(const TypeIntMirror& o) const;
+  bool contains(U u) const;
+  bool contains(const TypeIntMirror& o) const;
+  bool operator==(const TypeIntMirror& o) const;
+
+  template <class T>
+  TypeIntMirror cast() const;
+};
+
+// This class contains methods for inferring the Type of the result of several arithmetic
+// operations from those of the corresponding inputs. For example, given a, b such that the Type of
+// a is [0, 1] and the Type of b is [-1, 3], then the Type of the sum a + b is [-1, 4].
+// The methods in this class receive one or more template parameters which are often TypeInt* or
+// TypeLong*, or they can be TypeIntMirror which behave similar to TypeInt* and TypeLong* during
+// testing. This allows us to verify the correctness of the implementation without coupling with
+// the hotspot compiler allocation infrastructure.
+class RangeInference {
+private:
+  // If CTP is a pointer, get the underlying type. For the test helper classes, using the struct
+  // directly allows straightfoward equality comparison.
+  template <class CTP>
+  using CT = std::remove_const_t<std::conditional_t<std::is_pointer_v<CTP>, std::remove_pointer_t<CTP>, CTP>>;
+
+  // The type of CT::_lo, should be jint for TypeInt* and jlong for TypeLong*
+  template <class CTP>
+  using S = std::remove_const_t<decltype(CT<CTP>::_lo)>;
+
+  // The type of CT::_ulo, should be juint for TypeInt* and julong for TypeLong*
+  template <class CTP>
+  using U = std::remove_const_t<decltype(CT<CTP>::_ulo)>;
+
+  // A TypeInt consists of 1 or 2 simple intervals, each of which will lie either in the interval
+  // [0, max_signed] or [min_signed, -1]. It is more optimal to analyze each simple interval
+  // separately when doing inference. For example, consider a, b whose Types are both [-2, 2]. By
+  // analyzing the interval [-2, -1] and [0, 2] separately, we can easily see that the result of
+  // a & b must also be in the interval [-2, 2]. This is much harder if we want to work with the
+  // whole value range at the same time.
+  // This class offers a convenient way to traverse all the simple interval of a TypeInt.
+  template <class CTP>
+  class SimpleIntervalIterable {
+  private:
+    TypeIntMirror<S<CTP>, U<CTP>> _first_interval;
+    TypeIntMirror<S<CTP>, U<CTP>> _second_interval;
+    int _interval_num;
+
+  public:
+    SimpleIntervalIterable(CTP t) {
+      if (U<CTP>(t->_lo) <= U<CTP>(t->_hi)) {
+        _interval_num = 1;
+        _first_interval = TypeIntMirror<S<CTP>, U<CTP>>{t->_lo, t->_hi, t->_ulo, t->_uhi, t->_bits};
+      } else {
+        _interval_num = 2;
+        _first_interval = TypeIntMirror<S<CTP>, U<CTP>>::make(TypeIntPrototype<S<CTP>, U<CTP>>{{t->_lo, S<CTP>(t->_uhi)}, {U<CTP>(t->_lo), t->_uhi}, t->_bits}, 0);
+        _second_interval = TypeIntMirror<S<CTP>, U<CTP>>::make(TypeIntPrototype<S<CTP>, U<CTP>>{{S<CTP>(t->_ulo), t->_hi}, {t->_ulo, U<CTP>(t->_hi)}, t->_bits}, 0);
+      }
+    }
+
+    class Iterator {
+    private:
+      const SimpleIntervalIterable& _iterable;
+      int _current_interval;
+
+      Iterator(const SimpleIntervalIterable& iterable) : _iterable(iterable), _current_interval(0) {}
+
+      friend class SimpleIntervalIterable;
+    public:
+      const TypeIntMirror<S<CTP>, U<CTP>>& operator*() const {
+        assert(_current_interval < _iterable._interval_num, "out of bounds, %d - %d", _current_interval, _iterable._interval_num);
+        if (_current_interval == 0) {
+          return _iterable._first_interval;
+        } else {
+          return _iterable._second_interval;
+        }
+      }
+
+      Iterator& operator++() {
+        assert(_current_interval < _iterable._interval_num, "out of bounds, %d - %d", _current_interval, _iterable._interval_num);
+        _current_interval++;
+        return *this;
+      }
+
+      bool operator!=(const Iterator& o) const {
+        assert(&_iterable == &o._iterable, "not on the same iterable");
+        return _current_interval != o._current_interval;
+      }
+    };
+
+    Iterator begin() const {
+      return Iterator(*this);
+    }
+
+    Iterator end() const {
+      Iterator res(*this);
+      res._current_interval = _interval_num;
+      return res;
+    }
+  };
+
+  // Infer a result given the input types of a binary operation
+  template <class CTP, class Inference>
+  static CTP infer_binary(CTP t1, CTP t2, Inference infer) {
+    CTP res;
+    bool is_init = false;
+
+    SimpleIntervalIterable<CTP> t1_simple_intervals(t1);
+    SimpleIntervalIterable<CTP> t2_simple_intervals(t2);
+
+    for (auto& st1 : t1_simple_intervals) {
+      for (auto& st2 : t2_simple_intervals) {
+        CTP current = infer(st1, st2);
+
+        if (is_init) {
+          res = res->meet(current)->template cast<CT<CTP>>();
+        } else {
+          is_init = true;
+          res = current;
+        }
+      }
+    }
+
+    assert(is_init, "must be initialized");
+    return res;
+  }
+
+public:
+  template <class CTP>
+  static CTP infer_and(CTP t1, CTP t2) {
+    return infer_binary(t1, t2, [&](const TypeIntMirror<S<CTP>, U<CTP>>& st1, const TypeIntMirror<S<CTP>, U<CTP>>& st2) {
+      S<CTP> lo = std::numeric_limits<S<CTP>>::min();
+      S<CTP> hi = std::numeric_limits<S<CTP>>::max();
+      U<CTP> ulo = std::numeric_limits<U<CTP>>::min();
+      // The unsigned value of the result of 'and' is always not greater than both of its inputs
+      // since there is no position at which the bit is 1 in the result and 0 in either input
+      U<CTP> uhi = MIN2(st1._uhi, st2._uhi);
+      U<CTP> zeros = st1._bits._zeros | st2._bits._zeros;
+      U<CTP> ones = st1._bits._ones & st2._bits._ones;
+      return CT<CTP>::make(TypeIntPrototype<S<CTP>, U<CTP>>{{lo, hi}, {ulo, uhi}, {zeros, ones}}, MAX2(t1->_widen, t2->_widen));
+    });
+  }
+
+  template <class CTP>
+  static CTP infer_or(CTP t1, CTP t2) {
+    return infer_binary(t1, t2, [&](const TypeIntMirror<S<CTP>, U<CTP>>& st1, const TypeIntMirror<S<CTP>, U<CTP>>& st2) {
+      S<CTP> lo = std::numeric_limits<S<CTP>>::min();
+      S<CTP> hi = std::numeric_limits<S<CTP>>::max();
+      // The unsigned value of the result of 'or' is always not less than both of its inputs since
+      // there is no position at which the bit is 0 in the result and 1 in either input
+      U<CTP> ulo = MAX2(st1._ulo, st2._ulo);
+      U<CTP> uhi = std::numeric_limits<U<CTP>>::max();
+      U<CTP> zeros = st1._bits._zeros & st2._bits._zeros;
+      U<CTP> ones = st1._bits._ones | st2._bits._ones;
+      return CT<CTP>::make(TypeIntPrototype<S<CTP>, U<CTP>>{{lo, hi}, {ulo, uhi}, {zeros, ones}}, MAX2(t1->_widen, t2->_widen));
+    });
+  }
+
+  template <class CTP>
+  static CTP infer_xor(CTP t1, CTP t2) {
+    return infer_binary(t1, t2, [&](const TypeIntMirror<S<CTP>, U<CTP>>& st1, const TypeIntMirror<S<CTP>, U<CTP>>& st2) {
+      S<CTP> lo = std::numeric_limits<S<CTP>>::min();
+      S<CTP> hi = std::numeric_limits<S<CTP>>::max();
+      U<CTP> ulo = std::numeric_limits<U<CTP>>::min();
+      U<CTP> uhi = std::numeric_limits<U<CTP>>::max();
+      U<CTP> zeros = (st1._bits._zeros & st2._bits._zeros) | (st1._bits._ones & st2._bits._ones);
+      U<CTP> ones = (st1._bits._zeros & st2._bits._ones) | (st1._bits._ones & st2._bits._zeros);
+      return CT<CTP>::make(TypeIntPrototype<S<CTP>, U<CTP>>{{lo, hi}, {ulo, uhi}, {zeros, ones}}, MAX2(t1->_widen, t2->_widen));
+    });
+  }
+};
+
 #endif // SHARE_OPTO_RANGEINFERENCE_HPP
diff --git a/src/hotspot/share/opto/stringopts.cpp b/src/hotspot/share/opto/stringopts.cpp
index 6b98c4ca2b0..e499ba932e1 100644
--- a/src/hotspot/share/opto/stringopts.cpp
+++ b/src/hotspot/share/opto/stringopts.cpp
@@ -255,7 +255,7 @@ void StringConcat::eliminate_unneeded_control() {
       Compile* C = _stringopts->C;
       C->gvn_replace_by(n, n->in(0)->in(0));
       // get rid of the other projection
-      C->gvn_replace_by(n->in(0)->as_If()->proj_out(false), C->top());
+      C->gvn_replace_by(n->in(0)->as_If()->false_proj(), C->top());
     } else if (n->is_Region()) {
       Node* iff = n->in(1)->in(0);
       assert(n->req() == 3 && n->in(2)->in(0) == iff, "not a diamond");
diff --git a/src/hotspot/share/opto/stringopts.hpp b/src/hotspot/share/opto/stringopts.hpp
index 21be4109c7d..b893ac8c278 100644
--- a/src/hotspot/share/opto/stringopts.hpp
+++ b/src/hotspot/share/opto/stringopts.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/opto/superwordVTransformBuilder.hpp b/src/hotspot/share/opto/superwordVTransformBuilder.hpp
index cc9dd225f01..3c5d31cc9c2 100644
--- a/src/hotspot/share/opto/superwordVTransformBuilder.hpp
+++ b/src/hotspot/share/opto/superwordVTransformBuilder.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/opto/type.hpp b/src/hotspot/share/opto/type.hpp
index 4666cfbcf2d..73e2ba0045a 100644
--- a/src/hotspot/share/opto/type.hpp
+++ b/src/hotspot/share/opto/type.hpp
@@ -798,6 +798,7 @@ public:
   // must always specify w
   static const TypeInt* make(jint lo, jint hi, int widen);
   static const Type* make_or_top(const TypeIntPrototype<jint, juint>& t, int widen);
+  static const TypeInt* make(const TypeIntPrototype<jint, juint>& t, int widen) { return make_or_top(t, widen)->is_int(); }
 
   // Check for single integer
   bool is_con() const { return _lo == _hi; }
@@ -879,6 +880,7 @@ public:
   // must always specify w
   static const TypeLong* make(jlong lo, jlong hi, int widen);
   static const Type* make_or_top(const TypeIntPrototype<jlong, julong>& t, int widen);
+  static const TypeLong* make(const TypeIntPrototype<jlong, julong>& t, int widen) { return make_or_top(t, widen)->is_long(); }
 
   // Check for single integer
   bool is_con() const { return _lo == _hi; }
diff --git a/src/hotspot/share/opto/utilities/xor.hpp b/src/hotspot/share/opto/utilities/xor.hpp
deleted file mode 100644
index 20edaf0d017..00000000000
--- a/src/hotspot/share/opto/utilities/xor.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef SHARE_OPTO_UTILITIES_XOR_HPP
-#define SHARE_OPTO_UTILITIES_XOR_HPP
-
-#include "utilities/powerOfTwo.hpp"
-// Code separated into its own header to allow access from GTEST
-
-// Given 2 non-negative values in the ranges [0, hi_0] and [0, hi_1], respectively. The bitwise
-// xor of these values should also be non-negative. This method calculates an upper bound.
-
-// S and U type parameters correspond to the signed and unsigned
-// variants of an integer to operate on.
-template<class S, class U>
-static S xor_upper_bound_for_ranges(const S hi_0, const S hi_1) {
-    static_assert(S(-1) < S(0), "S must be signed");
-    static_assert(U(-1) > U(0), "U must be unsigned");
-
-    assert(hi_0 >= 0, "must be non-negative");
-    assert(hi_1 >= 0, "must be non-negative");
-
-    // x ^ y cannot have any bit set that is higher than both the highest bits set in x and y
-    // x cannot have any bit set that is higher than the highest bit set in hi_0
-    // y cannot have any bit set that is higher than the highest bit set in hi_1
-
-    // We want to find a value that has all 1 bits everywhere up to and including
-    // the highest bits set in hi_0 as well as hi_1. For this, we can take the next
-    // power of 2 strictly greater than both hi values and subtract 1 from it.
-
-    // Example 1:
-    // hi_0 = 5 (0b0101)       hi_1=1 (0b0001)
-    //    (5|1)+1       = 0b0110
-    //    round_up_pow2 = 0b1000
-    //    -1            = 0b0111 = max
-
-    // Example 2 - this demonstrates need for the +1:
-    // hi_0 =  4 (0b0100)        hi_1=4 (0b0100)
-    //    (4|4)+1       = 0b0101
-    //    round_up_pow2 = 0b1000
-    //    -1            = 0b0111 = max
-    // Without the +1, round_up_pow2 would be 0b0100, resulting in 0b0011 as max
-
-    // Note: cast to unsigned happens before +1 to avoid signed overflow, and
-    // round_up is safe because high bit is unset (0 <= lo <= hi)
-
-    return round_up_power_of_2(U(hi_0 | hi_1) + 1) - 1;
-}
-
-#endif // SHARE_OPTO_UTILITIES_XOR_HPP
diff --git a/src/hotspot/share/opto/vectorization.cpp b/src/hotspot/share/opto/vectorization.cpp
index 15b2df663b6..f81ee1b7ddb 100644
--- a/src/hotspot/share/opto/vectorization.cpp
+++ b/src/hotspot/share/opto/vectorization.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2023, Arm Limited. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -132,10 +132,10 @@ VStatus VLoop::check_preconditions_helper() {
       tty->print_cr(" Infrastructure for speculative runtime-checks:");
       if (_auto_vectorization_parse_predicate_proj != nullptr) {
         tty->print_cr("  auto_vectorization_parse_predicate_proj: speculate and trap");
-        _auto_vectorization_parse_predicate_proj->dump_bfs(5,0,"");
+        _auto_vectorization_parse_predicate_proj->dump_bfs(5, nullptr, "");
       } else if (_multiversioning_fast_proj != nullptr) {
         tty->print_cr("  multiversioning_fast_proj: speculate and multiversion");
-        _multiversioning_fast_proj->dump_bfs(5,0,"");
+        _multiversioning_fast_proj->dump_bfs(5, nullptr, "");
       } else {
         tty->print_cr("  Not found.");
       }
@@ -1060,6 +1060,29 @@ bool VPointer::can_make_speculative_aliasing_check_with(const VPointer& other) c
     return false;
   }
 
+  // The speculative check also needs to create the pointer expressions for both
+  // VPointers. We must check that we can do that, i.e. that all variables of the
+  // VPointers are available at the speculative check (and not just pre-loop invariant).
+  if (!this->can_make_pointer_expression_at_speculative_check()) {
+#ifdef ASSERT
+    if (_vloop.is_trace_speculative_aliasing_analysis()) {
+      tty->print_cr("VPointer::can_make_speculative_aliasing_check_with: not all variables of VPointer are avaialbe at speculative check!");
+      this->print_on(tty);
+    }
+#endif
+    return false;
+  }
+
+  if (!other.can_make_pointer_expression_at_speculative_check()) {
+#ifdef ASSERT
+    if (_vloop.is_trace_speculative_aliasing_analysis()) {
+      tty->print_cr("VPointer::can_make_speculative_aliasing_check_with: not all variables of VPointer are avaialbe at speculative check!");
+      other.print_on(tty);
+    }
+#endif
+    return false;
+  }
+
   return true;
 }
 
@@ -1147,6 +1170,8 @@ BoolNode* VPointer::make_speculative_aliasing_check_with(const VPointer& other,
   Node* main_init = new ConvL2INode(main_initL);
   phase->register_new_node_with_ctrl_of(main_init, pre_init);
 
+  assert(vp1.can_make_pointer_expression_at_speculative_check(), "variables must be available early enough to avoid cycles");
+  assert(vp2.can_make_pointer_expression_at_speculative_check(), "variables must be available early enough to avoid cycles");
   Node* p1_init = vp1.make_pointer_expression(main_init, ctrl);
   Node* p2_init = vp2.make_pointer_expression(main_init, ctrl);
   Node* size1 = igvn.longcon(vp1.size());
diff --git a/src/hotspot/share/opto/vectorization.hpp b/src/hotspot/share/opto/vectorization.hpp
index aacd406f798..9308712f78a 100644
--- a/src/hotspot/share/opto/vectorization.hpp
+++ b/src/hotspot/share/opto/vectorization.hpp
@@ -1188,6 +1188,22 @@ private:
     return true;
   }
 
+  // We already know that all non-iv summands are pre loop invariant.
+  // See init_are_non_iv_summands_pre_loop_invariant
+  // That is good enough for alignment computations in the pre-loop limit. But it is not
+  // sufficient if we want to use the variables of the VPointer at the speculative check,
+  // which is further up before the pre-loop.
+  bool can_make_pointer_expression_at_speculative_check() const {
+    bool success = true;
+    mem_pointer().for_each_non_empty_summand([&] (const MemPointerSummand& s) {
+      Node* variable = s.variable();
+      if (variable != _vloop.iv() && !_vloop.is_available_for_speculative_check(variable)) {
+        success = false;
+      }
+    });
+    return success;
+  }
+
   // In the pointer analysis, and especially the AlignVector analysis, we assume that
   // stride and scale are not too large. For example, we multiply "iv_scale * iv_stride",
   // and assume that this does not overflow the int range. We also take "abs(iv_scale)"
diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp
index 57b94205e5e..271dc901dcb 100644
--- a/src/hotspot/share/opto/vectornode.cpp
+++ b/src/hotspot/share/opto/vectornode.cpp
@@ -936,28 +936,26 @@ bool VectorNode::is_scalar_op_that_returns_int_but_vector_op_returns_long(int op
   }
 }
 
+// Idealize vector operations whose vector size is less than the hardware supported
+// max vector size. Generate a vector mask for the operation. Lanes with indices
+// inside of the vector size are set to true, while the remaining lanes are set to
+// false. Returns the corresponding masked vector node.
+static Node* ideal_partial_operations(PhaseGVN* phase, Node* node, const TypeVect* vt) {
+  if (!Matcher::vector_needs_partial_operations(node, vt)) {
+    return nullptr;
+  }
 
-Node* VectorNode::try_to_gen_masked_vector(PhaseGVN* gvn, Node* node, const TypeVect* vt) {
   int vopc = node->Opcode();
   uint vlen = vt->length();
   BasicType bt = vt->element_basic_type();
+  assert(Matcher::match_rule_supported_vector_masked(vopc, vlen, bt),
+         "The masked feature is required for the vector operation");
+  assert(Matcher::match_rule_supported_vector(Op_VectorMaskGen, vlen, bt),
+         "'VectorMaskGen' is required to generate a vector mask");
 
-  // Predicated vectors do not need to add another mask input
-  if (node->is_predicated_vector() || !Matcher::has_predicated_vectors() ||
-      !Matcher::match_rule_supported_vector_masked(vopc, vlen, bt) ||
-      !Matcher::match_rule_supported_vector(Op_VectorMaskGen, vlen, bt)) {
-    return nullptr;
-  }
-
-  Node* mask = nullptr;
-  // Generate a vector mask for vector operation whose vector length is lower than the
-  // hardware supported max vector length.
-  if (vt->length_in_bytes() < (uint)MaxVectorSize) {
-    Node* length = gvn->transform(new ConvI2LNode(gvn->makecon(TypeInt::make(vlen))));
-    mask = gvn->transform(VectorMaskGenNode::make(length, bt, vlen));
-  } else {
-    return nullptr;
-  }
+  // Generate a vector mask, with lanes inside of the vector length set to true.
+  Node* length = phase->transform(new ConvI2LNode(phase->makecon(TypeInt::make(vlen))));
+  Node* mask = phase->transform(VectorMaskGenNode::make(length, bt, vlen));
 
   // Generate the related masked op for vector load/store/load_gather/store_scatter.
   // Or append the mask to the vector op's input list by default.
@@ -1037,8 +1035,9 @@ bool VectorNode::should_swap_inputs_to_help_global_value_numbering() {
 }
 
 Node* VectorNode::Ideal(PhaseGVN* phase, bool can_reshape) {
-  if (Matcher::vector_needs_partial_operations(this, vect_type())) {
-    return try_to_gen_masked_vector(phase, this, vect_type());
+  Node* n = ideal_partial_operations(phase, this, vect_type());
+  if (n != nullptr) {
+    return n;
   }
 
   // Sort inputs of commutative non-predicated vector operations to help value numbering.
@@ -1119,9 +1118,9 @@ LoadVectorNode* LoadVectorNode::make(int opc, Node* ctl, Node* mem,
 }
 
 Node* LoadVectorNode::Ideal(PhaseGVN* phase, bool can_reshape) {
-  const TypeVect* vt = vect_type();
-  if (Matcher::vector_needs_partial_operations(this, vt)) {
-    return VectorNode::try_to_gen_masked_vector(phase, this, vt);
+  Node* n = ideal_partial_operations(phase, this, vect_type());
+  if (n != nullptr) {
+    return n;
   }
   return LoadNode::Ideal(phase, can_reshape);
 }
@@ -1133,9 +1132,9 @@ StoreVectorNode* StoreVectorNode::make(int opc, Node* ctl, Node* mem, Node* adr,
 }
 
 Node* StoreVectorNode::Ideal(PhaseGVN* phase, bool can_reshape) {
-  const TypeVect* vt = vect_type();
-  if (Matcher::vector_needs_partial_operations(this, vt)) {
-    return VectorNode::try_to_gen_masked_vector(phase, this, vt);
+  Node* n = ideal_partial_operations(phase, this, vect_type());
+  if (n != nullptr) {
+    return n;
   }
   return StoreNode::Ideal(phase, can_reshape);
 }
@@ -1411,11 +1410,11 @@ ReductionNode* ReductionNode::make(int opc, Node* ctrl, Node* n1, Node* n2, Basi
 }
 
 Node* ReductionNode::Ideal(PhaseGVN* phase, bool can_reshape) {
-  const TypeVect* vt = vect_type();
-  if (Matcher::vector_needs_partial_operations(this, vt)) {
-    return VectorNode::try_to_gen_masked_vector(phase, this, vt);
+  Node* n = ideal_partial_operations(phase, this, vect_type());
+  if (n != nullptr) {
+    return n;
   }
-  return nullptr;
+  return Node::Ideal(phase, can_reshape);
 }
 
 // Convert fromLong to maskAll if the input sets or unsets all lanes.
@@ -1893,11 +1892,11 @@ Node* VectorMaskOpNode::make(Node* mask, const Type* ty, int mopc) {
 }
 
 Node* VectorMaskOpNode::Ideal(PhaseGVN* phase, bool can_reshape) {
-  const TypeVect* vt = vect_type();
-  if (Matcher::vector_needs_partial_operations(this, vt)) {
-    return VectorNode::try_to_gen_masked_vector(phase, this, vt);
+  Node* n = ideal_partial_operations(phase, this, vect_type());
+  if (n != nullptr) {
+    return n;
   }
-  return nullptr;
+  return TypeNode::Ideal(phase, can_reshape);
 }
 
 Node* VectorMaskCastNode::Identity(PhaseGVN* phase) {
diff --git a/src/hotspot/share/opto/vectornode.hpp b/src/hotspot/share/opto/vectornode.hpp
index 427aeff53fc..dc7aa13cf36 100644
--- a/src/hotspot/share/opto/vectornode.hpp
+++ b/src/hotspot/share/opto/vectornode.hpp
@@ -117,7 +117,6 @@ class VectorNode : public TypeNode {
   static bool is_vector_bitwise_not_pattern(Node* n);
   static Node* degenerate_vector_rotate(Node* n1, Node* n2, bool is_rotate_left, int vlen,
                                         BasicType bt, PhaseGVN* phase);
-  static Node* try_to_gen_masked_vector(PhaseGVN* gvn, Node* node, const TypeVect* vt);
 
   // [Start, end) half-open range defining which operands are vectors
   static void vector_operands(Node* n, uint* start, uint* end);
diff --git a/src/hotspot/share/prims/foreignGlobals.inline.hpp b/src/hotspot/share/prims/foreignGlobals.inline.hpp
index f5c79997764..d983aca11cc 100644
--- a/src/hotspot/share/prims/foreignGlobals.inline.hpp
+++ b/src/hotspot/share/prims/foreignGlobals.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index 16d9efde410..ef5aca96a57 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -229,6 +229,19 @@ extern void trace_class_resolution(Klass* to_class) {
 
 // java.lang.System //////////////////////////////////////////////////////////////////////
 
+JVM_ENTRY(jboolean, JVM_AOTEndRecording(JNIEnv *env))
+#if INCLUDE_CDS
+  if (CDSConfig::is_dumping_preimage_static_archive()) {
+    if (!AOTMetaspace::preimage_static_archive_dumped()) {
+      AOTMetaspace::dump_static_archive(THREAD);
+      return JNI_TRUE;
+    }
+  }
+  return JNI_FALSE;
+#else
+  return JNI_FALSE;
+#endif // INCLUDE_CDS
+JVM_END
 
 JVM_LEAF(jlong, JVM_CurrentTimeMillis(JNIEnv *env, jclass ignored))
   return os::javaTimeMillis();
@@ -1198,22 +1211,11 @@ JVM_ENTRY(jboolean, JVM_IsHiddenClass(JNIEnv *env, jclass cls))
 JVM_END
 
 
-class ScopedValueBindingsResolver {
-public:
-  InstanceKlass* Carrier_klass;
-  ScopedValueBindingsResolver(JavaThread* THREAD) {
-    Klass *k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_ScopedValue_Carrier(), true, THREAD);
-    Carrier_klass = InstanceKlass::cast(k);
-  }
-};
-
 JVM_ENTRY(jobject, JVM_FindScopedValueBindings(JNIEnv *env, jclass cls))
   ResourceMark rm(THREAD);
   GrowableArray<Handle>* local_array = new GrowableArray<Handle>(12);
   JvmtiVMObjectAllocEventCollector oam;
 
-  static ScopedValueBindingsResolver resolver(THREAD);
-
   // Iterate through Java frames
   vframeStream vfst(thread);
   for(; !vfst.at_end(); vfst.next()) {
@@ -1226,7 +1228,7 @@ JVM_ENTRY(jobject, JVM_FindScopedValueBindings(JNIEnv *env, jclass cls))
     InstanceKlass* holder = method->method_holder();
     if (name == vmSymbols::runWith_method_name()) {
       if (holder == vmClasses::Thread_klass()
-          || holder == resolver.Carrier_klass) {
+          || holder == vmClasses::ScopedValue_Carrier_klass()) {
         loc = 1;
       }
     }
diff --git a/src/hotspot/share/prims/jvmti.xml b/src/hotspot/share/prims/jvmti.xml
index 2d1d8c0330d..7809897399e 100644
--- a/src/hotspot/share/prims/jvmti.xml
+++ b/src/hotspot/share/prims/jvmti.xml
@@ -13173,7 +13173,7 @@ myInit() {
          id="ClassLoad" const="JVMTI_EVENT_CLASS_LOAD" filtered="thread" phase="start" num="55">
     <description>
       A class load event is generated
-      <functionlink id="GetLoadedClasses">when a class or interface is created.</functionlink>.
+      <functionlink id="GetLoadedClasses">when a class or interface is created</functionlink>.
       <p/>
       Array class creation does not generate a class load event.
       The creation of a primitive class (for example, java.lang.Integer.TYPE)
diff --git a/src/hotspot/share/prims/jvmtiAgent.hpp b/src/hotspot/share/prims/jvmtiAgent.hpp
index b2e312c8030..f3873ff9559 100644
--- a/src/hotspot/share/prims/jvmtiAgent.hpp
+++ b/src/hotspot/share/prims/jvmtiAgent.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/prims/jvmtiEventController.inline.hpp b/src/hotspot/share/prims/jvmtiEventController.inline.hpp
index c5dbdcc5f8e..8c00df99838 100644
--- a/src/hotspot/share/prims/jvmtiEventController.inline.hpp
+++ b/src/hotspot/share/prims/jvmtiEventController.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/prims/jvmtiImpl.hpp b/src/hotspot/share/prims/jvmtiImpl.hpp
index c359b2fcbc3..0fd63556a78 100644
--- a/src/hotspot/share/prims/jvmtiImpl.hpp
+++ b/src/hotspot/share/prims/jvmtiImpl.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/prims/jvmtiTagMap.cpp b/src/hotspot/share/prims/jvmtiTagMap.cpp
index 90a3461f321..04cb70863cd 100644
--- a/src/hotspot/share/prims/jvmtiTagMap.cpp
+++ b/src/hotspot/share/prims/jvmtiTagMap.cpp
@@ -1204,8 +1204,10 @@ void JvmtiTagMap::flush_object_free_events() {
   assert_not_at_safepoint();
   if (env()->is_enabled(JVMTI_EVENT_OBJECT_FREE)) {
     {
+      // The other thread can block for safepoints during event callbacks, so ensure we
+      // are safepoint-safe while waiting.
+      ThreadBlockInVM tbivm(JavaThread::current());
       MonitorLocker ml(lock(), Mutex::_no_safepoint_check_flag);
-      // If another thread is posting events, let it finish
       while (_posting_events) {
         ml.wait();
       }
diff --git a/src/hotspot/share/prims/jvmtiTagMapTable.hpp b/src/hotspot/share/prims/jvmtiTagMapTable.hpp
index f717552da2b..e408d9dac86 100644
--- a/src/hotspot/share/prims/jvmtiTagMapTable.hpp
+++ b/src/hotspot/share/prims/jvmtiTagMapTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/prims/jvmtiThreadState.inline.hpp b/src/hotspot/share/prims/jvmtiThreadState.inline.hpp
index 5f9aa842d15..2b060f1a2e4 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.inline.hpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/prims/methodHandles.hpp b/src/hotspot/share/prims/methodHandles.hpp
index 1a419cbb53d..73da28a6cf5 100644
--- a/src/hotspot/share/prims/methodHandles.hpp
+++ b/src/hotspot/share/prims/methodHandles.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/prims/vectorSupport.hpp b/src/hotspot/share/prims/vectorSupport.hpp
index 9ec6500543c..5dd06f31b16 100644
--- a/src/hotspot/share/prims/vectorSupport.hpp
+++ b/src/hotspot/share/prims/vectorSupport.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/prims/vmstorage.hpp b/src/hotspot/share/prims/vmstorage.hpp
index f605dc28a9f..ea9aa3c5423 100644
--- a/src/hotspot/share/prims/vmstorage.hpp
+++ b/src/hotspot/share/prims/vmstorage.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index a6ce092e40d..1c2f5527ff9 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -199,6 +199,10 @@ WB_ENTRY(jint, WB_TakeLockAndHangInSafepoint(JNIEnv* env, jobject wb))
   return 0;
 WB_END
 
+WB_ENTRY(jlong, WB_GetMinimumJavaStackSize(JNIEnv* env, jobject o))
+  return os::get_minimum_java_stack_size();
+WB_END
+
 class WBIsKlassAliveClosure : public LockedClassesDo {
     Symbol* _name;
     int _count;
@@ -3133,7 +3137,8 @@ static JNINativeMethod methods[] = {
   {CC"cleanMetaspaces", CC"()V",                      (void*)&WB_CleanMetaspaces},
   {CC"rss", CC"()J",                                  (void*)&WB_Rss},
   {CC"printString", CC"(Ljava/lang/String;I)Ljava/lang/String;", (void*)&WB_PrintString},
-  {CC"lockAndStuckInSafepoint", CC"()V", (void*)&WB_TakeLockAndHangInSafepoint},
+  {CC"lockAndStuckInSafepoint", CC"()V",              (void*)&WB_TakeLockAndHangInSafepoint},
+  {CC"getMinimumJavaStackSize", CC"()J",              (void*)&WB_GetMinimumJavaStackSize},
   {CC"wordSize", CC"()J",                             (void*)&WB_WordSize},
   {CC"rootChunkWordSize", CC"()J",                    (void*)&WB_RootChunkWordSize},
   {CC"isStatic", CC"()Z",                             (void*)&WB_IsStaticallyLinked},
diff --git a/src/hotspot/share/runtime/abstract_vm_version.cpp b/src/hotspot/share/runtime/abstract_vm_version.cpp
index 3860307f8df..4051ba3f9d6 100644
--- a/src/hotspot/share/runtime/abstract_vm_version.cpp
+++ b/src/hotspot/share/runtime/abstract_vm_version.cpp
@@ -26,6 +26,7 @@
 #include "compiler/compilerDefinitions.hpp"
 #include "jvm_io.h"
 #include "runtime/arguments.hpp"
+#include "runtime/os.hpp"
 #include "runtime/vm_version.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -282,6 +283,8 @@ const char* Abstract_VM_Version::internal_vm_info_string() {
         #define HOTSPOT_BUILD_COMPILER "MS VC++ 17.13 (VS2022)"
       #elif _MSC_VER == 1944
         #define HOTSPOT_BUILD_COMPILER "MS VC++ 17.14 (VS2022)"
+      #elif _MSC_VER == 1950
+        #define HOTSPOT_BUILD_COMPILER "MS VC++ 18.0 (VS2026)"
       #else
         #define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER)
       #endif
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index dab3a60c650..cf0a1ab9757 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -534,13 +534,11 @@ static SpecialFlag const special_jvm_flags[] = {
   { "DynamicDumpSharedSpaces",      JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
   { "RequireSharedSpaces",          JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
   { "UseSharedSpaces",              JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
-  { "LockingMode",                  JDK_Version::jdk(24), JDK_Version::jdk(26), JDK_Version::jdk(27) },
 #ifdef _LP64
   { "UseCompressedClassPointers",   JDK_Version::jdk(25),  JDK_Version::jdk(27), JDK_Version::undefined() },
 #endif
   { "ParallelRefProcEnabled",       JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
   { "ParallelRefProcBalancingEnabled", JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
-  { "PSChunkLargeArrays",           JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
   { "MaxRAM",                       JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
   { "AggressiveHeap",               JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
   { "NeverActAsServerClassMachine", JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
@@ -550,35 +548,12 @@ static SpecialFlag const special_jvm_flags[] = {
 
   // -------------- Obsolete Flags - sorted by expired_in --------------
 
-#ifdef LINUX
-  { "UseOprofile",                  JDK_Version::jdk(25), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-#endif
   { "MetaspaceReclaimPolicy",       JDK_Version::undefined(), JDK_Version::jdk(21), JDK_Version::undefined() },
-  { "G1UpdateBufferSize",           JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "ShenandoahPacing",             JDK_Version::jdk(25), JDK_Version::jdk(26), JDK_Version::jdk(27) },
 #if defined(AARCH64)
   { "NearCpool",                    JDK_Version::undefined(), JDK_Version::jdk(25), JDK_Version::undefined() },
 #endif
 
-  { "AdaptiveSizeMajorGCDecayTimeScale",                JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "AdaptiveSizePolicyInitializingSteps",              JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "AdaptiveSizePolicyOutputInterval",                 JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "AdaptiveSizeThroughPutPolicy",                     JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "AdaptiveTimeWeight",                               JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "PausePadding",                                     JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "SurvivorPadding",                                  JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "TenuredGenerationSizeIncrement",                   JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "TenuredGenerationSizeSupplement",                  JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "TenuredGenerationSizeSupplementDecay",             JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "UseAdaptiveGenerationSizePolicyAtMajorCollection", JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "UseAdaptiveGenerationSizePolicyAtMinorCollection", JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "UseAdaptiveSizeDecayMajorGCCost",                  JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "UseAdaptiveSizePolicyFootprintGoal",               JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "UseAdaptiveSizePolicyWithSystemGC",                JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "UsePSAdaptiveSurvivorSizePolicy",                  JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-
-  { "PretenureSizeThreshold",       JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
-  { "HeapMaximumCompactionInterval",JDK_Version::undefined(), JDK_Version::jdk(26), JDK_Version::jdk(27) },
+  { "PSChunkLargeArrays",           JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
 
 #ifdef ASSERT
   { "DummyObsoleteTestFlag",        JDK_Version::undefined(), JDK_Version::jdk(18), JDK_Version::undefined() },
@@ -1117,6 +1092,13 @@ void Arguments::print_summary_on(outputStream* st) {
   st->cr();
 }
 
+void Arguments::set_jvm_flags_file(const char *value) {
+  if (_jvm_flags_file != nullptr) {
+    os::free(_jvm_flags_file);
+  }
+  _jvm_flags_file = os::strdup_check_oom(value);
+}
+
 void Arguments::print_jvm_flags_on(outputStream* st) {
   if (_num_jvm_flags > 0) {
     for (int i=0; i < _num_jvm_flags; i++) {
@@ -2869,6 +2851,10 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, JVMFlagOrigin
   return JNI_OK;
 }
 
+void Arguments::set_ext_dirs(char *value) {
+  _ext_dirs = os::strdup_check_oom(value);
+}
+
 void Arguments::add_patch_mod_prefix(const char* module_name, const char* path) {
   // For java.base check for duplicate --patch-module options being specified on the command line.
   // This check is only required for java.base, all other duplicate module specifications
diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
index 3d83959d76a..f2bcc21e123 100644
--- a/src/hotspot/share/runtime/arguments.hpp
+++ b/src/hotspot/share/runtime/arguments.hpp
@@ -25,18 +25,17 @@
 #ifndef SHARE_RUNTIME_ARGUMENTS_HPP
 #define SHARE_RUNTIME_ARGUMENTS_HPP
 
-#include "logging/logLevel.hpp"
-#include "logging/logTag.hpp"
+#include "jni.h"
 #include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
-#include "runtime/globals.hpp"
+#include "runtime/flags/jvmFlag.hpp"
 #include "runtime/java.hpp"
-#include "runtime/os.hpp"
-#include "utilities/debug.hpp"
-#include "utilities/vmEnums.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 // Arguments parses the command line and recognizes options
 
+template <typename E>
+class GrowableArray;
 class JVMFlag;
 
 // Invocation API hook typedefs (these should really be defined in jni.h)
@@ -412,12 +411,8 @@ class Arguments : AllStatic {
 
   // convenient methods to get and set jvm_flags_file
   static const char* get_jvm_flags_file()  { return _jvm_flags_file; }
-  static void set_jvm_flags_file(const char *value) {
-    if (_jvm_flags_file != nullptr) {
-      os::free(_jvm_flags_file);
-    }
-    _jvm_flags_file = os::strdup_check_oom(value);
-  }
+  static void set_jvm_flags_file(const char *value);
+
   // convenient methods to obtain / print jvm_flags and jvm_args
   static const char* jvm_flags()           { return build_resource_string(_jvm_flags_array, _num_jvm_flags); }
   static const char* jvm_args()            { return build_resource_string(_jvm_args_array, _num_jvm_args); }
@@ -479,7 +474,7 @@ class Arguments : AllStatic {
   static void set_dll_dir(const char *value) { _sun_boot_library_path->set_value(value); }
   static void set_java_home(const char *value) { _java_home->set_value(value); }
   static void set_library_path(const char *value) { _java_library_path->set_value(value); }
-  static void set_ext_dirs(char *value)     { _ext_dirs = os::strdup_check_oom(value); }
+  static void set_ext_dirs(char *value);
 
   // Set up the underlying pieces of the boot class path
   static void add_patch_mod_prefix(const char *module_name, const char *path);
diff --git a/src/hotspot/share/runtime/atomic.hpp b/src/hotspot/share/runtime/atomic.hpp
index b8960fd796b..0c335913b5c 100644
--- a/src/hotspot/share/runtime/atomic.hpp
+++ b/src/hotspot/share/runtime/atomic.hpp
@@ -26,7 +26,6 @@
 #define SHARE_RUNTIME_ATOMIC_HPP
 
 #include "cppstdlib/type_traits.hpp"
-#include "metaprogramming/enableIf.hpp"
 #include "metaprogramming/primitiveConversions.hpp"
 #include "runtime/atomicAccess.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -89,8 +88,12 @@
 // value will be initialized as if by translating the value that would be
 // provided by default constructing an atomic type for the value type's
 // decayed type.
-
-// (3) Atomic pointers and atomic integers additionally provide
+//
+// (3) Constructors for all atomic types are constexpr, to ensure non-local
+// atomic variables are constant initialized (C++17 6.6.2) when initialized
+// with suitable arguments.
+//
+// (4) Atomic pointers and atomic integers additionally provide
 //
 //   member functions:
 //     v.add_then_fetch(i [, o]) -> T
@@ -102,7 +105,7 @@
 // type of i must be signed, or both must be unsigned. Atomic pointers perform
 // element arithmetic.
 //
-// (4) Atomic integers additionally provide
+// (5) Atomic integers additionally provide
 //
 //   member functions:
 //     v.and_then_fetch(x [, o]) -> T
@@ -112,7 +115,7 @@
 //     v.fetch_then_or(x [, o]) -> T
 //     v.fetch_then_xor(x [, o]) -> T
 //
-// (5) Atomic pointers additionally provide
+// (6) Atomic pointers additionally provide
 //
 //   nested types:
 //     ElementType -> std::remove_pointer_t<T>
@@ -217,7 +220,7 @@ class AtomicImpl::CommonCore {
   T volatile _value;
 
 protected:
-  explicit CommonCore(T value) : _value(value) {}
+  explicit constexpr CommonCore(T value) : _value(value) {}
   ~CommonCore() = default;
 
   T volatile* value_ptr() { return &_value; }
@@ -290,7 +293,7 @@ class AtomicImpl::SupportsArithmetic : public CommonCore<T> {
   }
 
 protected:
-  explicit SupportsArithmetic(T value) : CommonCore<T>(value) {}
+  explicit constexpr SupportsArithmetic(T value) : CommonCore<T>(value) {}
   ~SupportsArithmetic() = default;
 
 public:
@@ -333,7 +336,7 @@ class AtomicImpl::Atomic<T, AtomicImpl::Category::Integer>
   : public SupportsArithmetic<T>
 {
 public:
-  explicit Atomic(T value = 0) : SupportsArithmetic<T>(value) {}
+  explicit constexpr Atomic(T value = 0) : SupportsArithmetic<T>(value) {}
 
   NONCOPYABLE(Atomic);
 
@@ -373,7 +376,7 @@ class AtomicImpl::Atomic<T, AtomicImpl::Category::Byte>
   : public CommonCore<T>
 {
 public:
-  explicit Atomic(T value = 0) : CommonCore<T>(value) {}
+  explicit constexpr Atomic(T value = 0) : CommonCore<T>(value) {}
 
   NONCOPYABLE(Atomic);
 
@@ -389,7 +392,7 @@ class AtomicImpl::Atomic<T, AtomicImpl::Category::Pointer>
   : public SupportsArithmetic<T>
 {
 public:
-  explicit Atomic(T value = nullptr) : SupportsArithmetic<T>(value) {}
+  explicit constexpr Atomic(T value = nullptr) : SupportsArithmetic<T>(value) {}
 
   NONCOPYABLE(Atomic);
 
@@ -410,12 +413,21 @@ class AtomicImpl::Atomic<T, AtomicImpl::Category::Translated> {
 
   Atomic<Decayed> _value;
 
-  static Decayed decay(T x) { return Translator::decay(x); }
+  // The decay function and the constructors are constexpr so that a non-local
+  // atomic object constructed with constant arguments will be a constant
+  // initialization.  One might ask why it's not a problem that some
+  // specializations of these functions are not constant expressions. The
+  // answer lies in C++17 10.1.5/6, along with us having *some* constexpr
+  // translator decay functions, constexpr ctors for some translated types,
+  // and constexpr ctors for some decayed types.  Also, C++23 removes those
+  // restrictions on constexpr functions and ctors.
+
+  static constexpr Decayed decay(T x) { return Translator::decay(x); }
   static T recover(Decayed x) { return Translator::recover(x); }
 
   // Support for default construction via the default construction of _value.
   struct UseDecayedCtor {};
-  explicit Atomic(UseDecayedCtor) : _value() {}
+  explicit constexpr Atomic(UseDecayedCtor) : _value() {}
   using DefaultCtorSelect =
     std::conditional_t<std::is_default_constructible_v<T>, T, UseDecayedCtor>;
 
@@ -424,9 +436,9 @@ public:
 
   // If T is default constructible, construct from a default constructed T.
   // Otherwise, default construct the underlying Atomic<Decayed>.
-  Atomic() : Atomic(DefaultCtorSelect()) {}
+  constexpr Atomic() : Atomic(DefaultCtorSelect()) {}
 
-  explicit Atomic(T value) : _value(decay(value)) {}
+  explicit constexpr Atomic(T value) : _value(decay(value)) {}
 
   NONCOPYABLE(Atomic);
 
diff --git a/src/hotspot/share/runtime/continuationFreezeThaw.cpp b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
index ccbe78817d6..9df89f1f12a 100644
--- a/src/hotspot/share/runtime/continuationFreezeThaw.cpp
+++ b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1736,8 +1736,8 @@ static void verify_frame_kind(frame& top, Continuation::preempt_kind preempt_kin
       m = top.interpreter_frame_method();
       assert(!m->is_native() || m->is_synchronized(), "invalid method %s", m->external_name());
       address bcp = top.interpreter_frame_bcp();
-      assert(bcp != 0 || m->is_native(), "");
-      at_sync_method = m->is_synchronized() && (bcp == 0 || bcp == m->code_base());
+      assert(bcp != nullptr || m->is_native(), "");
+      at_sync_method = m->is_synchronized() && (bcp == nullptr || bcp == m->code_base());
       // bcp is advanced on monitorenter before making the VM call, adjust for that.
       bool at_sync_bytecode = bcp > m->code_base() && Bytecode(m, bcp - 1).code() == Bytecodes::Code::_monitorenter;
       assert(at_sync_method || at_sync_bytecode, "");
diff --git a/src/hotspot/share/runtime/continuationHelper.inline.hpp b/src/hotspot/share/runtime/continuationHelper.inline.hpp
index 9aadfd8a388..7bbdbd4935d 100644
--- a/src/hotspot/share/runtime/continuationHelper.inline.hpp
+++ b/src/hotspot/share/runtime/continuationHelper.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/continuationJavaClasses.hpp b/src/hotspot/share/runtime/continuationJavaClasses.hpp
index 91224b94e1e..8397c7c1493 100644
--- a/src/hotspot/share/runtime/continuationJavaClasses.hpp
+++ b/src/hotspot/share/runtime/continuationJavaClasses.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/continuationWrapper.inline.hpp b/src/hotspot/share/runtime/continuationWrapper.inline.hpp
index ddf5e0be02d..1f9226f8bd3 100644
--- a/src/hotspot/share/runtime/continuationWrapper.inline.hpp
+++ b/src/hotspot/share/runtime/continuationWrapper.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/cpuTimeCounters.hpp b/src/hotspot/share/runtime/cpuTimeCounters.hpp
index 9ad00492731..c2e636bdb1d 100644
--- a/src/hotspot/share/runtime/cpuTimeCounters.hpp
+++ b/src/hotspot/share/runtime/cpuTimeCounters.hpp
@@ -28,6 +28,7 @@
 #define SHARE_RUNTIME_CPUTIMECOUNTERS_HPP
 
 
+#include "gc/shared/gc_globals.hpp"
 #include "memory/iterator.hpp"
 #include "runtime/os.hpp"
 #include "runtime/perfData.hpp"
@@ -83,7 +84,9 @@ public:
     assert(_instance == nullptr, "we can only allocate one CPUTimeCounters object");
     if (UsePerfData && os::is_thread_cpu_time_supported()) {
       _instance = new CPUTimeCounters();
-      create_counter(SUN_THREADS, CPUTimeGroups::CPUTimeType::gc_total);
+      if (UseG1GC || UseParallelGC) {
+        create_counter(SUN_THREADS, CPUTimeGroups::CPUTimeType::gc_total);
+      }
     }
   }
 
diff --git a/src/hotspot/share/runtime/flags/flagSetting.hpp b/src/hotspot/share/runtime/flags/flagSetting.hpp
index 0f75636621a..f4e20a951d9 100644
--- a/src/hotspot/share/runtime/flags/flagSetting.hpp
+++ b/src/hotspot/share/runtime/flags/flagSetting.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp
index d0141c2e6cc..63d3424b3ed 100644
--- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp
+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp
@@ -306,7 +306,7 @@ JVMFlag::Error TypeProfileLevelConstraintFunc(uint value, bool verbose) {
 }
 
 JVMFlag::Error VerifyIterativeGVNConstraintFunc(uint value, bool verbose) {
-  const int max_modes = 4;
+  const int max_modes = 5;
   uint original_value = value;
   for (int i = 0; i < max_modes; i++) {
     if (value % 10 > 1) {
diff --git a/src/hotspot/share/runtime/flags/jvmFlagLookup.hpp b/src/hotspot/share/runtime/flags/jvmFlagLookup.hpp
index 256f674f19c..6459aed60e6 100644
--- a/src/hotspot/share/runtime/flags/jvmFlagLookup.hpp
+++ b/src/hotspot/share/runtime/flags/jvmFlagLookup.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 68b5d8254fd..6a2bbc9c648 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -809,6 +809,7 @@ const int ObjectAlignmentInBytes = 8;
                                                                             \
   develop(uintx, PreallocatedOutOfMemoryErrorCount, 4,                      \
           "Number of OutOfMemoryErrors preallocated with backtrace")        \
+          range(0, 1024)                                                    \
                                                                             \
   product(bool, UseXMMForArrayCopy, false,                                  \
           "Use SSE2 MOVQ instruction for Arraycopy")                        \
@@ -1369,6 +1370,7 @@ const int ObjectAlignmentInBytes = 8;
                                                                             \
   product(int, SpecTrapLimitExtraEntries,  3, EXPERIMENTAL,                 \
           "Extra method data trap entries for speculation")                 \
+          range(0, 100)                                                     \
                                                                             \
   product(double, InlineFrequencyRatio, 0.25, DIAGNOSTIC,                   \
           "Ratio of call site execution to caller method invocation")       \
diff --git a/src/hotspot/share/runtime/handles.hpp b/src/hotspot/share/runtime/handles.hpp
index 7b51b4aff1c..68c948a493b 100644
--- a/src/hotspot/share/runtime/handles.hpp
+++ b/src/hotspot/share/runtime/handles.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/handles.inline.hpp b/src/hotspot/share/runtime/handles.inline.hpp
index 15b06315823..4e1e2ed8686 100644
--- a/src/hotspot/share/runtime/handles.inline.hpp
+++ b/src/hotspot/share/runtime/handles.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/icache.hpp b/src/hotspot/share/runtime/icache.hpp
index e442c4d88e0..bc153862323 100644
--- a/src/hotspot/share/runtime/icache.hpp
+++ b/src/hotspot/share/runtime/icache.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/interfaceSupport.inline.hpp b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
index c52c2664faa..ecd7397d81a 100644
--- a/src/hotspot/share/runtime/interfaceSupport.inline.hpp
+++ b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index fb4abdac2ef..c49a9f5d4b8 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -71,6 +71,7 @@
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/java.hpp"
 #include "runtime/javaThread.hpp"
+#include "runtime/os.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/task.hpp"
@@ -765,3 +766,23 @@ void JDK_Version::to_string(char* buffer, size_t buflen) const {
     }
   }
 }
+
+void JDK_Version::set_java_version(const char* version) {
+  _java_version = os::strdup(version);
+}
+
+void JDK_Version::set_runtime_name(const char* name) {
+  _runtime_name = os::strdup(name);
+}
+
+void JDK_Version::set_runtime_version(const char* version) {
+  _runtime_version = os::strdup(version);
+}
+
+void JDK_Version::set_runtime_vendor_version(const char* vendor_version) {
+  _runtime_vendor_version = os::strdup(vendor_version);
+}
+
+void JDK_Version::set_runtime_vendor_vm_bug_url(const char* vendor_vm_bug_url) {
+  _runtime_vendor_vm_bug_url = os::strdup(vendor_vm_bug_url);
+}
diff --git a/src/hotspot/share/runtime/java.hpp b/src/hotspot/share/runtime/java.hpp
index 67cf3fb686a..2eb8d6b8ead 100644
--- a/src/hotspot/share/runtime/java.hpp
+++ b/src/hotspot/share/runtime/java.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 #ifndef SHARE_RUNTIME_JAVA_HPP
 #define SHARE_RUNTIME_JAVA_HPP
 
-#include "runtime/os.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class Handle;
@@ -133,38 +132,27 @@ class JDK_Version {
   static const char* java_version() {
     return _java_version;
   }
-  static void set_java_version(const char* version) {
-    _java_version = os::strdup(version);
-  }
+  static void set_java_version(const char* version);
 
   static const char* runtime_name() {
     return _runtime_name;
   }
-  static void set_runtime_name(const char* name) {
-    _runtime_name = os::strdup(name);
-  }
+  static void set_runtime_name(const char* name);
 
   static const char* runtime_version() {
     return _runtime_version;
   }
-  static void set_runtime_version(const char* version) {
-    _runtime_version = os::strdup(version);
-  }
+  static void set_runtime_version(const char* version);
 
   static const char* runtime_vendor_version() {
     return _runtime_vendor_version;
   }
-  static void set_runtime_vendor_version(const char* vendor_version) {
-    _runtime_vendor_version = os::strdup(vendor_version);
-  }
+  static void set_runtime_vendor_version(const char* vendor_version);
 
   static const char* runtime_vendor_vm_bug_url() {
     return _runtime_vendor_vm_bug_url;
   }
-  static void set_runtime_vendor_vm_bug_url(const char* vendor_vm_bug_url) {
-    _runtime_vendor_vm_bug_url = os::strdup(vendor_vm_bug_url);
-  }
-
+  static void set_runtime_vendor_vm_bug_url(const char* vendor_vm_bug_url);
 };
 
 #endif // SHARE_RUNTIME_JAVA_HPP
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 1bf4841e193..4ee9a9dfd79 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -1052,7 +1052,11 @@ void JavaThread::set_exception_oop(oop o) {
 }
 
 void JavaThread::handle_special_runtime_exit_condition() {
-  if (is_obj_deopt_suspend()) {
+  // We mustn't block for object deopt if the thread is
+  // currently executing in a JNI critical region, as that
+  // can cause deadlock because allocation may be locked out
+  // and the object deopt suspender may try to allocate.
+  if (is_obj_deopt_suspend() && !in_critical()) {
     frame_anchor()->make_walkable();
     wait_for_object_deoptimization();
   }
diff --git a/src/hotspot/share/runtime/jfieldIDWorkaround.hpp b/src/hotspot/share/runtime/jfieldIDWorkaround.hpp
index 68db2e36d45..fcca5bc244c 100644
--- a/src/hotspot/share/runtime/jfieldIDWorkaround.hpp
+++ b/src/hotspot/share/runtime/jfieldIDWorkaround.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/monitorDeflationThread.hpp b/src/hotspot/share/runtime/monitorDeflationThread.hpp
index 6b681617a4c..29fb5394c6f 100644
--- a/src/hotspot/share/runtime/monitorDeflationThread.hpp
+++ b/src/hotspot/share/runtime/monitorDeflationThread.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/mountUnmountDisabler.cpp b/src/hotspot/share/runtime/mountUnmountDisabler.cpp
index 5bf00323f10..8635eeb2dcc 100644
--- a/src/hotspot/share/runtime/mountUnmountDisabler.cpp
+++ b/src/hotspot/share/runtime/mountUnmountDisabler.cpp
@@ -28,6 +28,7 @@
 #include "prims/jvmtiThreadState.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaThread.hpp"
+#include "runtime/jniHandles.hpp"
 #include "runtime/mountUnmountDisabler.hpp"
 #include "runtime/threadSMR.hpp"
 
@@ -193,6 +194,13 @@ void MountUnmountDisabler::end_transition(JavaThread* current, oop vthread, bool
   }
 }
 
+// disable transitions for one virtual thread
+// disable transitions for all threads if thread is nullptr or a platform thread
+MountUnmountDisabler::MountUnmountDisabler(jthread thread)
+  : MountUnmountDisabler(JNIHandles::resolve_external_guard(thread))
+{
+}
+
 // disable transitions for one virtual thread
 // disable transitions for all threads if thread is nullptr or a platform thread
 MountUnmountDisabler::MountUnmountDisabler(oop thread_oop)
@@ -367,7 +375,7 @@ MountUnmountDisabler::enable_transition_for_all() {
   OrderAccess::release();
 
   MonitorLocker ml(VThreadTransition_lock);
-  if (exclusive_operation_ongoing()) {
+  if (_is_exclusive) {
     set_exclusive_operation_ongoing(false);
   }
   dec_active_disablers();
diff --git a/src/hotspot/share/runtime/mountUnmountDisabler.hpp b/src/hotspot/share/runtime/mountUnmountDisabler.hpp
index 2ebb09734a6..4c9b6124b46 100644
--- a/src/hotspot/share/runtime/mountUnmountDisabler.hpp
+++ b/src/hotspot/share/runtime/mountUnmountDisabler.hpp
@@ -58,6 +58,7 @@ class MountUnmountDisabler : public AnyObj {
  public:
   MountUnmountDisabler(bool exlusive = false);
   MountUnmountDisabler(oop thread_oop);
+  MountUnmountDisabler(jthread thread);
   ~MountUnmountDisabler();
 
   static int global_vthread_transition_disable_count();
diff --git a/src/hotspot/share/runtime/notificationThread.hpp b/src/hotspot/share/runtime/notificationThread.hpp
index e8e72052e4a..b516a147828 100644
--- a/src/hotspot/share/runtime/notificationThread.hpp
+++ b/src/hotspot/share/runtime/notificationThread.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/objectMonitorTable.cpp b/src/hotspot/share/runtime/objectMonitorTable.cpp
new file mode 100644
index 00000000000..9b522720a28
--- /dev/null
+++ b/src/hotspot/share/runtime/objectMonitorTable.cpp
@@ -0,0 +1,308 @@
+/*
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "logging/log.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
+#include "runtime/javaThread.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "runtime/objectMonitorTable.hpp"
+#include "runtime/safepoint.hpp"
+#include "runtime/thread.hpp"
+#include "runtime/timerTrace.hpp"
+#include "runtime/trimNativeHeap.hpp"
+#include "utilities/concurrentHashTableTasks.inline.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+// -----------------------------------------------------------------------------
+// ConcurrentHashTable storing links from objects to ObjectMonitors
+
+using ConcurrentTable = ConcurrentHashTable<ObjectMonitorTableConfig, mtObjectMonitor>;
+
+static ConcurrentTable* _table = nullptr;
+static volatile size_t _items_count = 0;
+static size_t _table_size = 0;
+static volatile bool _resize = false;
+
+class ObjectMonitorTableConfig : public AllStatic {
+ public:
+  using Value = ObjectMonitor*;
+  static uintx get_hash(Value const& value, bool* is_dead) {
+    return (uintx)value->hash();
+  }
+  static void* allocate_node(void* context, size_t size, Value const& value) {
+    ObjectMonitorTable::inc_items_count();
+    return AllocateHeap(size, mtObjectMonitor);
+  };
+  static void free_node(void* context, void* memory, Value const& value) {
+    ObjectMonitorTable::dec_items_count();
+    FreeHeap(memory);
+  }
+};
+
+class Lookup : public StackObj {
+  oop _obj;
+
+ public:
+  explicit Lookup(oop obj) : _obj(obj) {}
+
+  uintx get_hash() const {
+    uintx hash = _obj->mark().hash();
+    assert(hash != 0, "should have a hash");
+    return hash;
+  }
+
+  bool equals(ObjectMonitor** value) {
+    assert(*value != nullptr, "must be");
+    return (*value)->object_refers_to(_obj);
+  }
+
+  bool is_dead(ObjectMonitor** value) {
+    assert(*value != nullptr, "must be");
+    return false;
+  }
+};
+
+class LookupMonitor : public StackObj {
+  ObjectMonitor* _monitor;
+
+ public:
+  explicit LookupMonitor(ObjectMonitor* monitor) : _monitor(monitor) {}
+
+  uintx get_hash() const {
+    return _monitor->hash();
+  }
+
+  bool equals(ObjectMonitor** value) {
+    return (*value) == _monitor;
+  }
+
+  bool is_dead(ObjectMonitor** value) {
+    assert(*value != nullptr, "must be");
+    return (*value)->object_is_dead();
+  }
+};
+
+void ObjectMonitorTable::inc_items_count() {
+  AtomicAccess::inc(&_items_count, memory_order_relaxed);
+}
+
+void ObjectMonitorTable::dec_items_count() {
+  AtomicAccess::dec(&_items_count, memory_order_relaxed);
+}
+
+double ObjectMonitorTable::get_load_factor() {
+  size_t count = AtomicAccess::load(&_items_count);
+  return (double)count / (double)_table_size;
+}
+
+size_t ObjectMonitorTable::table_size(Thread* current) {
+  return ((size_t)1) << _table->get_size_log2(current);
+}
+
+size_t ObjectMonitorTable::max_log_size() {
+  // TODO[OMTable]: Evaluate the max size.
+  // TODO[OMTable]: Need to fix init order to use Universe::heap()->max_capacity();
+  //                Using MaxHeapSize directly this early may be wrong, and there
+  //                are definitely rounding errors (alignment).
+  const size_t max_capacity = MaxHeapSize;
+  const size_t min_object_size = CollectedHeap::min_dummy_object_size() * HeapWordSize;
+  const size_t max_objects = max_capacity / MAX2(MinObjAlignmentInBytes, checked_cast<int>(min_object_size));
+  const size_t log_max_objects = log2i_graceful(max_objects);
+
+  return MAX2(MIN2<size_t>(SIZE_BIG_LOG2, log_max_objects), min_log_size());
+}
+
+// ~= log(AvgMonitorsPerThreadEstimate default)
+size_t ObjectMonitorTable::min_log_size() {
+  return 10;
+}
+
+template<typename V>
+size_t ObjectMonitorTable::clamp_log_size(V log_size) {
+  return MAX2(MIN2(log_size, checked_cast<V>(max_log_size())), checked_cast<V>(min_log_size()));
+}
+
+size_t ObjectMonitorTable::initial_log_size() {
+  const size_t estimate = log2i(MAX2(os::processor_count(), 1)) + log2i(MAX2(AvgMonitorsPerThreadEstimate, size_t(1)));
+  return clamp_log_size(estimate);
+}
+
+size_t ObjectMonitorTable::grow_hint() {
+  return ConcurrentTable::DEFAULT_GROW_HINT;
+}
+
+void ObjectMonitorTable::create() {
+  _table = new ConcurrentTable(initial_log_size(), max_log_size(), grow_hint());
+  _items_count = 0;
+  _table_size = table_size(Thread::current());
+  _resize = false;
+}
+
+void ObjectMonitorTable::verify_monitor_get_result(oop obj, ObjectMonitor* monitor) {
+#ifdef ASSERT
+  if (SafepointSynchronize::is_at_safepoint()) {
+    bool has_monitor = obj->mark().has_monitor();
+    assert(has_monitor == (monitor != nullptr),
+           "Inconsistency between markWord and ObjectMonitorTable has_monitor: %s monitor: " PTR_FORMAT,
+           BOOL_TO_STR(has_monitor), p2i(monitor));
+  }
+#endif
+}
+
+ObjectMonitor* ObjectMonitorTable::monitor_get(Thread* current, oop obj) {
+  ObjectMonitor* result = nullptr;
+  Lookup lookup_f(obj);
+  auto found_f = [&](ObjectMonitor** found) {
+    assert((*found)->object_peek() == obj, "must be");
+    result = *found;
+  };
+  _table->get(current, lookup_f, found_f);
+  verify_monitor_get_result(obj, result);
+  return result;
+}
+
+void ObjectMonitorTable::try_notify_grow() {
+  if (!_table->is_max_size_reached() && !AtomicAccess::load(&_resize)) {
+    AtomicAccess::store(&_resize, true);
+    if (Service_lock->try_lock()) {
+      Service_lock->notify();
+      Service_lock->unlock();
+    }
+  }
+}
+
+bool ObjectMonitorTable::should_grow() {
+  return get_load_factor() > GROW_LOAD_FACTOR && !_table->is_max_size_reached();
+}
+
+bool ObjectMonitorTable::should_resize() {
+  return should_grow() || should_shrink() || AtomicAccess::load(&_resize);
+}
+
+template <typename Task, typename... Args>
+bool ObjectMonitorTable::run_task(JavaThread* current, Task& task, const char* task_name, Args&... args) {
+  if (task.prepare(current)) {
+    log_trace(monitortable)("Started to %s", task_name);
+    TraceTime timer(task_name, TRACETIME_LOG(Debug, monitortable, perf));
+    while (task.do_task(current, args...)) {
+      task.pause(current);
+      {
+        ThreadBlockInVM tbivm(current);
+      }
+      task.cont(current);
+    }
+    task.done(current);
+    return true;
+  }
+  return false;
+}
+
+bool ObjectMonitorTable::grow(JavaThread* current) {
+  ConcurrentTable::GrowTask grow_task(_table);
+  if (run_task(current, grow_task, "Grow")) {
+    _table_size = table_size(current);
+    log_info(monitortable)("Grown to size: %zu", _table_size);
+    return true;
+  }
+  return false;
+}
+
+bool ObjectMonitorTable::clean(JavaThread* current) {
+  ConcurrentTable::BulkDeleteTask clean_task(_table);
+  auto is_dead = [&](ObjectMonitor** monitor) {
+    return (*monitor)->object_is_dead();
+  };
+  auto do_nothing = [&](ObjectMonitor** monitor) {};
+  NativeHeapTrimmer::SuspendMark sm("ObjectMonitorTable");
+  return run_task(current, clean_task, "Clean", is_dead, do_nothing);
+}
+
+bool ObjectMonitorTable::resize(JavaThread* current) {
+  LogTarget(Info, monitortable) lt;
+  bool success = false;
+
+  if (should_grow()) {
+    lt.print("Start growing with load factor %f", get_load_factor());
+    success = grow(current);
+  } else {
+    if (!_table->is_max_size_reached() && AtomicAccess::load(&_resize)) {
+      lt.print("WARNING: Getting resize hints with load factor %f", get_load_factor());
+    }
+    lt.print("Start cleaning with load factor %f", get_load_factor());
+    success = clean(current);
+  }
+
+  AtomicAccess::store(&_resize, false);
+
+  return success;
+}
+
+ObjectMonitor* ObjectMonitorTable::monitor_put_get(Thread* current, ObjectMonitor* monitor, oop obj) {
+  // Enter the monitor into the concurrent hashtable.
+  ObjectMonitor* result = monitor;
+  Lookup lookup_f(obj);
+  auto found_f = [&](ObjectMonitor** found) {
+    assert((*found)->object_peek() == obj, "must be");
+    result = *found;
+  };
+  bool grow;
+  _table->insert_get(current, lookup_f, monitor, found_f, &grow);
+  verify_monitor_get_result(obj, result);
+  if (grow) {
+    try_notify_grow();
+  }
+  return result;
+}
+
+bool ObjectMonitorTable::remove_monitor_entry(Thread* current, ObjectMonitor* monitor) {
+  LookupMonitor lookup_f(monitor);
+  return _table->remove(current, lookup_f);
+}
+
+bool ObjectMonitorTable::contains_monitor(Thread* current, ObjectMonitor* monitor) {
+  LookupMonitor lookup_f(monitor);
+  bool result = false;
+  auto found_f = [&](ObjectMonitor** found) {
+    result = true;
+  };
+  _table->get(current, lookup_f, found_f);
+  return result;
+}
+
+void ObjectMonitorTable::print_on(outputStream* st) {
+  auto printer = [&] (ObjectMonitor** entry) {
+    ObjectMonitor* om = *entry;
+    oop obj = om->object_peek();
+    st->print("monitor=" PTR_FORMAT ", ", p2i(om));
+    st->print("object=" PTR_FORMAT, p2i(obj));
+    assert(obj->mark().hash() == om->hash(), "hash must match");
+    st->cr();
+    return true;
+  };
+  if (SafepointSynchronize::is_at_safepoint()) {
+    _table->do_safepoint_scan(printer);
+  } else {
+    _table->do_scan(Thread::current(), printer);
+  }
+}
diff --git a/src/hotspot/share/runtime/objectMonitorTable.hpp b/src/hotspot/share/runtime/objectMonitorTable.hpp
new file mode 100644
index 00000000000..146468d46b2
--- /dev/null
+++ b/src/hotspot/share/runtime/objectMonitorTable.hpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_RUNTIME_OBJECTMONITORTABLE_HPP
+#define SHARE_RUNTIME_OBJECTMONITORTABLE_HPP
+
+#include "memory/allStatic.hpp"
+#include "oops/oopsHierarchy.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+class JavaThread;
+class ObjectMonitor;
+class ObjectMonitorTableConfig;
+class outputStream;
+class Thread;
+
+class ObjectMonitorTable : AllStatic {
+  friend class ObjectMonitorTableConfig;
+
+ private:
+  static void inc_items_count();
+  static void dec_items_count();
+  static double get_load_factor();
+  static size_t table_size(Thread* current);
+  static size_t max_log_size();
+  static size_t min_log_size();
+
+  template <typename V>
+  static size_t clamp_log_size(V log_size);
+  static size_t initial_log_size();
+  static size_t grow_hint();
+
+ public:
+  static void create();
+  static void verify_monitor_get_result(oop obj, ObjectMonitor* monitor);
+  static ObjectMonitor* monitor_get(Thread* current, oop obj);
+  static void try_notify_grow();
+  static bool should_shrink() { return false; } // Not implemented
+
+  static constexpr double GROW_LOAD_FACTOR = 0.75;
+
+  static bool should_grow();
+  static bool should_resize();
+
+  template <typename Task, typename... Args>
+  static bool run_task(JavaThread* current, Task& task, const char* task_name, Args&... args);
+  static bool grow(JavaThread* current);
+  static bool clean(JavaThread* current);
+  static bool resize(JavaThread* current);
+  static ObjectMonitor* monitor_put_get(Thread* current, ObjectMonitor* monitor, oop obj);
+  static bool remove_monitor_entry(Thread* current, ObjectMonitor* monitor);
+  static bool contains_monitor(Thread* current, ObjectMonitor* monitor);
+  static void print_on(outputStream* st);
+};
+
+#endif // SHARE_RUNTIME_OBJECTMONITORTABLE_HPP
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index ceff9b54c33..cf18388c625 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -2577,6 +2577,10 @@ jint os::set_minimum_stack_sizes() {
   return JNI_OK;
 }
 
+jlong os::get_minimum_java_stack_size() {
+  return static_cast<jlong>(_java_thread_min_stack_allowed);
+}
+
 // Builds a platform dependent Agent_OnLoad_<lib_name> function name
 // which is used to find statically linked in agents.
 // Parameters:
diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp
index b65bf643cbf..d585d3e5fc0 100644
--- a/src/hotspot/share/runtime/os.hpp
+++ b/src/hotspot/share/runtime/os.hpp
@@ -390,6 +390,8 @@ class os: AllStatic {
   static jint set_minimum_stack_sizes();
 
  public:
+  // get allowed minimum java stack size
+  static jlong get_minimum_java_stack_size();
   // Find committed memory region within specified range (start, start + size),
   // return true if found any
   static bool committed_in_range(address start, size_t size, address& committed_start, size_t& committed_size);
@@ -980,10 +982,7 @@ class os: AllStatic {
   // The thread_cpu_time() and current_thread_cpu_time() are only
   // supported if is_thread_cpu_time_supported() returns true.
 
-  // Thread CPU Time - return the fast estimate on a platform
-  // On Linux   - fast clock_gettime where available - user+sys
-  //            - otherwise: very slow /proc fs - user+sys
-  // On Windows - GetThreadTimes - user+sys
+  // Thread CPU Time - return the fast estimate on a platform - user+sys
   static jlong current_thread_cpu_time();
   static jlong thread_cpu_time(Thread* t);
 
diff --git a/src/hotspot/share/runtime/park.hpp b/src/hotspot/share/runtime/park.hpp
index f353ce34b74..4406a66da0d 100644
--- a/src/hotspot/share/runtime/park.hpp
+++ b/src/hotspot/share/runtime/park.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/perfDataTypes.hpp b/src/hotspot/share/runtime/perfDataTypes.hpp
index 9928975b8e2..c6ea228bdf1 100644
--- a/src/hotspot/share/runtime/perfDataTypes.hpp
+++ b/src/hotspot/share/runtime/perfDataTypes.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/reflection.cpp b/src/hotspot/share/runtime/reflection.cpp
index d6c10c5c70c..1797471d84b 100644
--- a/src/hotspot/share/runtime/reflection.cpp
+++ b/src/hotspot/share/runtime/reflection.cpp
@@ -270,17 +270,16 @@ void Reflection::array_set(jvalue* value, arrayOop a, int index, BasicType value
   if (!a->is_within_bounds(index)) {
     THROW(vmSymbols::java_lang_ArrayIndexOutOfBoundsException());
   }
-  if (a->is_objArray()) {
-    if (value_type == T_OBJECT) {
-      oop obj = cast_to_oop(value->l);
-      if (obj != nullptr) {
-        Klass* element_klass = ObjArrayKlass::cast(a->klass())->element_klass();
-        if (!obj->is_a(element_klass)) {
-          THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "array element type mismatch");
-        }
+  if (value_type == T_OBJECT) {
+    assert(a->is_objArray(), "just checking");
+    oop obj = cast_to_oop(value->l);
+    if (obj != nullptr) {
+      Klass* element_klass = ObjArrayKlass::cast(a->klass())->element_klass();
+      if (!obj->is_a(element_klass)) {
+        THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "array element type mismatch");
       }
-      objArrayOop(a)->obj_at_put(index, obj);
     }
+    objArrayOop(a)->obj_at_put(index, obj);
   } else {
     assert(a->is_typeArray(), "just checking");
     BasicType array_type = TypeArrayKlass::cast(a->klass())->element_type();
diff --git a/src/hotspot/share/runtime/safefetch.hpp b/src/hotspot/share/runtime/safefetch.hpp
index a1781962ec0..43872c781b4 100644
--- a/src/hotspot/share/runtime/safefetch.hpp
+++ b/src/hotspot/share/runtime/safefetch.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2022 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/hotspot/share/runtime/safepoint.hpp b/src/hotspot/share/runtime/safepoint.hpp
index 190095ec30b..c6f3a5cad2c 100644
--- a/src/hotspot/share/runtime/safepoint.hpp
+++ b/src/hotspot/share/runtime/safepoint.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/safepointVerifiers.hpp b/src/hotspot/share/runtime/safepointVerifiers.hpp
index 8d309a973d8..f652b6e4803 100644
--- a/src/hotspot/share/runtime/safepointVerifiers.hpp
+++ b/src/hotspot/share/runtime/safepointVerifiers.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index 7e3bf763d08..d426fd31a43 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -3362,7 +3362,7 @@ JRT_LEAF(intptr_t*, SharedRuntime::OSR_migration_begin( JavaThread *current) )
                   RegisterMap::WalkContinuation::skip);
   frame sender = fr.sender(&map);
   if (sender.is_interpreted_frame()) {
-    current->push_cont_fastpath(sender.sp());
+    current->push_cont_fastpath(sender.unextended_sp());
   }
 
   return buf;
diff --git a/src/hotspot/share/runtime/signature.cpp b/src/hotspot/share/runtime/signature.cpp
index 9ae5b3df415..044319d1752 100644
--- a/src/hotspot/share/runtime/signature.cpp
+++ b/src/hotspot/share/runtime/signature.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/smallRegisterMap.inline.hpp b/src/hotspot/share/runtime/smallRegisterMap.inline.hpp
index 09febdaf450..f3923c01c2f 100644
--- a/src/hotspot/share/runtime/smallRegisterMap.inline.hpp
+++ b/src/hotspot/share/runtime/smallRegisterMap.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/stackChunkFrameStream.hpp b/src/hotspot/share/runtime/stackChunkFrameStream.hpp
index cb46254d125..921e44f3a3a 100644
--- a/src/hotspot/share/runtime/stackChunkFrameStream.hpp
+++ b/src/hotspot/share/runtime/stackChunkFrameStream.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp b/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
index 97166950752..e3696d03b4c 100644
--- a/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
+++ b/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/stackWatermark.hpp b/src/hotspot/share/runtime/stackWatermark.hpp
index 4f1c65c903c..4cb30a26db5 100644
--- a/src/hotspot/share/runtime/stackWatermark.hpp
+++ b/src/hotspot/share/runtime/stackWatermark.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index fe95320c574..fde1aa50400 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -44,6 +44,7 @@
 #include "runtime/lockStack.inline.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/objectMonitor.inline.hpp"
+#include "runtime/objectMonitorTable.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
@@ -1470,291 +1471,6 @@ void ObjectSynchronizer::log_in_use_monitor_details(outputStream* out, bool log_
   out->flush();
 }
 
-// -----------------------------------------------------------------------------
-// ConcurrentHashTable storing links from objects to ObjectMonitors
-class ObjectMonitorTable : AllStatic {
-  struct Config {
-    using Value = ObjectMonitor*;
-    static uintx get_hash(Value const& value, bool* is_dead) {
-      return (uintx)value->hash();
-    }
-    static void* allocate_node(void* context, size_t size, Value const& value) {
-      ObjectMonitorTable::inc_items_count();
-      return AllocateHeap(size, mtObjectMonitor);
-    };
-    static void free_node(void* context, void* memory, Value const& value) {
-      ObjectMonitorTable::dec_items_count();
-      FreeHeap(memory);
-    }
-  };
-  using ConcurrentTable = ConcurrentHashTable<Config, mtObjectMonitor>;
-
-  static ConcurrentTable* _table;
-  static volatile size_t _items_count;
-  static size_t _table_size;
-  static volatile bool _resize;
-
-  class Lookup : public StackObj {
-    oop _obj;
-
-   public:
-    explicit Lookup(oop obj) : _obj(obj) {}
-
-    uintx get_hash() const {
-      uintx hash = _obj->mark().hash();
-      assert(hash != 0, "should have a hash");
-      return hash;
-    }
-
-    bool equals(ObjectMonitor** value) {
-      assert(*value != nullptr, "must be");
-      return (*value)->object_refers_to(_obj);
-    }
-
-    bool is_dead(ObjectMonitor** value) {
-      assert(*value != nullptr, "must be");
-      return false;
-    }
-  };
-
-  class LookupMonitor : public StackObj {
-    ObjectMonitor* _monitor;
-
-   public:
-    explicit LookupMonitor(ObjectMonitor* monitor) : _monitor(monitor) {}
-
-    uintx get_hash() const {
-      return _monitor->hash();
-    }
-
-    bool equals(ObjectMonitor** value) {
-      return (*value) == _monitor;
-    }
-
-    bool is_dead(ObjectMonitor** value) {
-      assert(*value != nullptr, "must be");
-      return (*value)->object_is_dead();
-    }
-  };
-
-  static void inc_items_count() {
-    AtomicAccess::inc(&_items_count, memory_order_relaxed);
-  }
-
-  static void dec_items_count() {
-    AtomicAccess::dec(&_items_count, memory_order_relaxed);
-  }
-
-  static double get_load_factor() {
-    size_t count = AtomicAccess::load(&_items_count);
-    return (double)count / (double)_table_size;
-  }
-
-  static size_t table_size(Thread* current = Thread::current()) {
-    return ((size_t)1) << _table->get_size_log2(current);
-  }
-
-  static size_t max_log_size() {
-    // TODO[OMTable]: Evaluate the max size.
-    // TODO[OMTable]: Need to fix init order to use Universe::heap()->max_capacity();
-    //                Using MaxHeapSize directly this early may be wrong, and there
-    //                are definitely rounding errors (alignment).
-    const size_t max_capacity = MaxHeapSize;
-    const size_t min_object_size = CollectedHeap::min_dummy_object_size() * HeapWordSize;
-    const size_t max_objects = max_capacity / MAX2(MinObjAlignmentInBytes, checked_cast<int>(min_object_size));
-    const size_t log_max_objects = log2i_graceful(max_objects);
-
-    return MAX2(MIN2<size_t>(SIZE_BIG_LOG2, log_max_objects), min_log_size());
-  }
-
-  static size_t min_log_size() {
-    // ~= log(AvgMonitorsPerThreadEstimate default)
-    return 10;
-  }
-
-  template<typename V>
-  static size_t clamp_log_size(V log_size) {
-    return MAX2(MIN2(log_size, checked_cast<V>(max_log_size())), checked_cast<V>(min_log_size()));
-  }
-
-  static size_t initial_log_size() {
-    const size_t estimate = log2i(MAX2(os::processor_count(), 1)) + log2i(MAX2(AvgMonitorsPerThreadEstimate, size_t(1)));
-    return clamp_log_size(estimate);
-  }
-
-  static size_t grow_hint () {
-    return ConcurrentTable::DEFAULT_GROW_HINT;
-  }
-
- public:
-  static void create() {
-    _table = new ConcurrentTable(initial_log_size(), max_log_size(), grow_hint());
-    _items_count = 0;
-    _table_size = table_size();
-    _resize = false;
-  }
-
-  static void verify_monitor_get_result(oop obj, ObjectMonitor* monitor) {
-#ifdef ASSERT
-    if (SafepointSynchronize::is_at_safepoint()) {
-      bool has_monitor = obj->mark().has_monitor();
-      assert(has_monitor == (monitor != nullptr),
-          "Inconsistency between markWord and ObjectMonitorTable has_monitor: %s monitor: " PTR_FORMAT,
-          BOOL_TO_STR(has_monitor), p2i(monitor));
-    }
-#endif
-  }
-
-  static ObjectMonitor* monitor_get(Thread* current, oop obj) {
-    ObjectMonitor* result = nullptr;
-    Lookup lookup_f(obj);
-    auto found_f = [&](ObjectMonitor** found) {
-      assert((*found)->object_peek() == obj, "must be");
-      result = *found;
-    };
-    _table->get(current, lookup_f, found_f);
-    verify_monitor_get_result(obj, result);
-    return result;
-  }
-
-  static void try_notify_grow() {
-    if (!_table->is_max_size_reached() && !AtomicAccess::load(&_resize)) {
-      AtomicAccess::store(&_resize, true);
-      if (Service_lock->try_lock()) {
-        Service_lock->notify();
-        Service_lock->unlock();
-      }
-    }
-  }
-
-  static bool should_shrink() {
-    // Not implemented;
-    return false;
-  }
-
-  static constexpr double GROW_LOAD_FACTOR = 0.75;
-
-  static bool should_grow() {
-    return get_load_factor() > GROW_LOAD_FACTOR && !_table->is_max_size_reached();
-  }
-
-  static bool should_resize() {
-    return should_grow() || should_shrink() || AtomicAccess::load(&_resize);
-  }
-
-  template<typename Task, typename... Args>
-  static bool run_task(JavaThread* current, Task& task, const char* task_name, Args&... args) {
-    if (task.prepare(current)) {
-      log_trace(monitortable)("Started to %s", task_name);
-      TraceTime timer(task_name, TRACETIME_LOG(Debug, monitortable, perf));
-      while (task.do_task(current, args...)) {
-        task.pause(current);
-        {
-          ThreadBlockInVM tbivm(current);
-        }
-        task.cont(current);
-      }
-      task.done(current);
-      return true;
-    }
-    return false;
-  }
-
-  static bool grow(JavaThread* current) {
-    ConcurrentTable::GrowTask grow_task(_table);
-    if (run_task(current, grow_task, "Grow")) {
-      _table_size = table_size(current);
-      log_info(monitortable)("Grown to size: %zu", _table_size);
-      return true;
-    }
-    return false;
-  }
-
-  static bool clean(JavaThread* current) {
-    ConcurrentTable::BulkDeleteTask clean_task(_table);
-    auto is_dead = [&](ObjectMonitor** monitor) {
-      return (*monitor)->object_is_dead();
-    };
-    auto do_nothing = [&](ObjectMonitor** monitor) {};
-    NativeHeapTrimmer::SuspendMark sm("ObjectMonitorTable");
-    return run_task(current, clean_task, "Clean", is_dead, do_nothing);
-  }
-
-  static bool resize(JavaThread* current) {
-    LogTarget(Info, monitortable) lt;
-    bool success = false;
-
-    if (should_grow()) {
-      lt.print("Start growing with load factor %f", get_load_factor());
-      success = grow(current);
-    } else {
-      if (!_table->is_max_size_reached() && AtomicAccess::load(&_resize)) {
-        lt.print("WARNING: Getting resize hints with load factor %f", get_load_factor());
-      }
-      lt.print("Start cleaning with load factor %f", get_load_factor());
-      success = clean(current);
-    }
-
-    AtomicAccess::store(&_resize, false);
-
-    return success;
-  }
-
-  static ObjectMonitor* monitor_put_get(Thread* current, ObjectMonitor* monitor, oop obj) {
-    // Enter the monitor into the concurrent hashtable.
-    ObjectMonitor* result = monitor;
-    Lookup lookup_f(obj);
-    auto found_f = [&](ObjectMonitor** found) {
-      assert((*found)->object_peek() == obj, "must be");
-      result = *found;
-    };
-    bool grow;
-    _table->insert_get(current, lookup_f, monitor, found_f, &grow);
-    verify_monitor_get_result(obj, result);
-    if (grow) {
-      try_notify_grow();
-    }
-    return result;
-  }
-
-  static bool remove_monitor_entry(Thread* current, ObjectMonitor* monitor) {
-    LookupMonitor lookup_f(monitor);
-    return _table->remove(current, lookup_f);
-  }
-
-  static bool contains_monitor(Thread* current, ObjectMonitor* monitor) {
-    LookupMonitor lookup_f(monitor);
-    bool result = false;
-    auto found_f = [&](ObjectMonitor** found) {
-      result = true;
-    };
-    _table->get(current, lookup_f, found_f);
-    return result;
-  }
-
-  static void print_on(outputStream* st) {
-    auto printer = [&] (ObjectMonitor** entry) {
-       ObjectMonitor* om = *entry;
-       oop obj = om->object_peek();
-       st->print("monitor=" PTR_FORMAT ", ", p2i(om));
-       st->print("object=" PTR_FORMAT, p2i(obj));
-       assert(obj->mark().hash() == om->hash(), "hash must match");
-       st->cr();
-       return true;
-    };
-    if (SafepointSynchronize::is_at_safepoint()) {
-      _table->do_safepoint_scan(printer);
-    } else {
-      _table->do_scan(Thread::current(), printer);
-    }
-  }
-};
-
-ObjectMonitorTable::ConcurrentTable* ObjectMonitorTable::_table = nullptr;
-volatile size_t ObjectMonitorTable::_items_count = 0;
-size_t ObjectMonitorTable::_table_size = 0;
-volatile bool ObjectMonitorTable::_resize = false;
-
 ObjectMonitor* ObjectSynchronizer::get_or_insert_monitor_from_table(oop object, JavaThread* current, bool* inserted) {
   ObjectMonitor* monitor = get_monitor_from_table(current, object);
   if (monitor != nullptr) {
diff --git a/src/hotspot/share/runtime/threadIdentifier.hpp b/src/hotspot/share/runtime/threadIdentifier.hpp
index 70e11713841..69956538969 100644
--- a/src/hotspot/share/runtime/threadIdentifier.hpp
+++ b/src/hotspot/share/runtime/threadIdentifier.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/vframe.hpp b/src/hotspot/share/runtime/vframe.hpp
index c8c166f3236..882b84e2b6f 100644
--- a/src/hotspot/share/runtime/vframe.hpp
+++ b/src/hotspot/share/runtime/vframe.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/vmOperations.hpp b/src/hotspot/share/runtime/vmOperations.hpp
index 2ed9626652c..86f77f44161 100644
--- a/src/hotspot/share/runtime/vmOperations.hpp
+++ b/src/hotspot/share/runtime/vmOperations.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
index 91b23904676..0846f339227 100644
--- a/src/hotspot/share/services/diagnosticCommand.cpp
+++ b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -91,85 +91,82 @@ static void loadAgentModule(TRAPS) {
                          THREAD);
 }
 
-void DCmd::register_dcmds(){
-  // Registration of the diagnostic commands
-  // First argument specifies which interfaces will export the command
-  // Second argument specifies if the command is enabled
-  // Third  argument specifies if the command is hidden
+void DCmd::register_dcmds() {
+  // Argument specifies on which interfaces a command is made available:
   uint32_t full_export = DCmd_Source_Internal | DCmd_Source_AttachAPI
                          | DCmd_Source_MBean;
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HelpDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VersionDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CommandLineDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<PrintSystemPropertiesDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<PrintVMFlagsDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SetVMFlagDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VMDynamicLibrariesDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VMUptimeDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VMInfoDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemGCDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<RunFinalizationDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapInfoDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<FinalizerInfoDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HelpDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VersionDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CommandLineDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<PrintSystemPropertiesDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<PrintVMFlagsDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SetVMFlagDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VMDynamicLibrariesDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VMUptimeDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VMInfoDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemGCDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<RunFinalizationDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapInfoDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<FinalizerInfoDCmd>(full_export));
 #if INCLUDE_SERVICES
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapDumpDCmd>(DCmd_Source_Internal | DCmd_Source_AttachAPI, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHistogramDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemDictionaryDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHierarchyDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassesDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SymboltableDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<StringtableDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<metaspace::MetaspaceDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<EventLogDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapDumpDCmd>(DCmd_Source_Internal | DCmd_Source_AttachAPI));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHistogramDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemDictionaryDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHierarchyDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassesDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SymboltableDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<StringtableDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<metaspace::MetaspaceDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<EventLogDCmd>(full_export));
 #if INCLUDE_JVMTI // Both JVMTI and SERVICES have to be enabled to have this dcmd
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JVMTIAgentLoadDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JVMTIAgentLoadDCmd>(full_export));
 #endif // INCLUDE_JVMTI
 #endif // INCLUDE_SERVICES
 #if INCLUDE_JVMTI
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JVMTIDataDumpDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JVMTIDataDumpDCmd>(full_export));
 #endif // INCLUDE_JVMTI
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ThreadDumpDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ThreadDumpDCmd>(full_export));
 #if INCLUDE_JVMTI
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ThreadDumpToFileDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ThreadDumpToFileDCmd>(full_export));
 #endif // INCLUDE_JVMTI
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VThreadSchedulerDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VThreadPollersDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassLoaderStatsDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassLoaderHierarchyDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompileQueueDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CodeListDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CodeCacheDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VThreadSchedulerDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VThreadPollersDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassLoaderStatsDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassLoaderHierarchyDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompileQueueDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CodeListDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CodeCacheDCmd>(full_export));
 #ifdef LINUX
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<PerfMapDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<TrimCLibcHeapDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<MallocInfoDcmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<PerfMapDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<TrimCLibcHeapDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<MallocInfoDcmd>(full_export));
 #endif // LINUX
 #if defined(LINUX) || defined(_WIN64) || defined(__APPLE__)
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemMapDCmd>(full_export, true,false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemDumpMapDCmd>(full_export, true,false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemMapDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemDumpMapDCmd>(full_export));
 #endif // LINUX or WINDOWS or MacOS
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CodeHeapAnalyticsDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CodeHeapAnalyticsDCmd>(full_export));
 
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesPrintDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesAddDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesRemoveDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesClearDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilationMemoryStatisticDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesPrintDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesAddDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesRemoveDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilerDirectivesClearDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilationMemoryStatisticDCmd>(full_export));
 
   // Enhanced JMX Agent Support
   // These commands not currently exported via the DiagnosticCommandMBean
   uint32_t jmx_agent_export_flags = DCmd_Source_Internal | DCmd_Source_AttachAPI;
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStartRemoteDCmd>(jmx_agent_export_flags, true,false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStartLocalDCmd>(jmx_agent_export_flags, true,false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStopRemoteDCmd>(jmx_agent_export_flags, true,false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStatusDCmd>(jmx_agent_export_flags, true,false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStartRemoteDCmd>(jmx_agent_export_flags));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStartLocalDCmd>(jmx_agent_export_flags));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStopRemoteDCmd>(jmx_agent_export_flags));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStatusDCmd>(jmx_agent_export_flags));
 
 #if INCLUDE_CDS
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<DumpSharedArchiveDCmd>(full_export, true, false));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<AOTEndRecordingDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<DumpSharedArchiveDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<AOTEndRecordingDCmd>(full_export));
 #endif // INCLUDE_CDS
 
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<NMTDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<NMTDCmd>(full_export));
 }
 
 HelpDCmd::HelpDCmd(outputStream* output, bool heap) : DCmdWithParser(output, heap),
@@ -192,8 +189,7 @@ void HelpDCmd::execute(DCmdSource source, TRAPS) {
     for (int i = 0; i < cmd_list->length(); i++) {
       DCmdFactory* factory = DCmdFactory::factory(source, cmd_list->at(i),
                                                   strlen(cmd_list->at(i)));
-      output()->print_cr("%s%s", factory->name(),
-                         factory->is_enabled() ? "" : " [disabled]");
+      output()->print_cr("%s", factory->name());
       output()->print_cr("\t%s", factory->description());
       output()->cr();
       factory = factory->next();
@@ -203,8 +199,7 @@ void HelpDCmd::execute(DCmdSource source, TRAPS) {
     DCmdFactory* factory = DCmdFactory::factory(source, _cmd.value(),
                                                 strlen(_cmd.value()));
     if (factory != nullptr) {
-      output()->print_cr("%s%s", factory->name(),
-                         factory->is_enabled() ? "" : " [disabled]");
+      output()->print_cr("%s", factory->name());
       output()->print_cr("%s", factory->description());
       output()->print_cr("\nImpact: %s", factory->impact());
       output()->cr();
@@ -223,8 +218,7 @@ void HelpDCmd::execute(DCmdSource source, TRAPS) {
     for (int i = 0; i < cmd_list->length(); i++) {
       DCmdFactory* factory = DCmdFactory::factory(source, cmd_list->at(i),
                                                   strlen(cmd_list->at(i)));
-      output()->print_cr("%s%s", factory->name(),
-                         factory->is_enabled() ? "" : " [disabled]");
+      output()->print_cr("%s", factory->name());
       factory = factory->_next;
     }
     output()->print_cr("\nFor more information about a specific command use 'help <command>'.");
diff --git a/src/hotspot/share/services/diagnosticFramework.cpp b/src/hotspot/share/services/diagnosticFramework.cpp
index c37fe7b4e1e..71cc461f161 100644
--- a/src/hotspot/share/services/diagnosticFramework.cpp
+++ b/src/hotspot/share/services/diagnosticFramework.cpp
@@ -563,10 +563,6 @@ DCmd* DCmdFactory::create_local_DCmd(DCmdSource source, CmdLine &line,
                                      outputStream* out, TRAPS) {
   DCmdFactory* f = factory(source, line.cmd_addr(), line.cmd_len());
   if (f != nullptr) {
-    if (!f->is_enabled()) {
-      THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
-                     f->disabled_message());
-    }
     return f->create_resource_instance(out);
   }
   THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
@@ -594,8 +590,7 @@ GrowableArray<DCmdInfo*>* DCmdFactory::DCmdInfo_list(DCmdSource source ) {
     if (!factory->is_hidden() && (factory->export_flags() & source)) {
       array->append(new DCmdInfo(factory->name(),
                     factory->description(), factory->impact(),
-                    factory->num_arguments(),
-                    factory->is_enabled()));
+                    factory->num_arguments()));
     }
     factory = factory->next();
   }
diff --git a/src/hotspot/share/services/diagnosticFramework.hpp b/src/hotspot/share/services/diagnosticFramework.hpp
index 206b5ed27b4..5f9253b492e 100644
--- a/src/hotspot/share/services/diagnosticFramework.hpp
+++ b/src/hotspot/share/services/diagnosticFramework.hpp
@@ -117,21 +117,18 @@ protected:
   const char* const _description;    /* Short description */
   const char* const _impact;         /* Impact on the JVM */
   const int         _num_arguments;  /* Number of supported options or arguments */
-  const bool        _is_enabled;     /* True if the diagnostic command can be invoked, false otherwise */
 public:
   DCmdInfo(const char* name,
           const char* description,
           const char* impact,
-          int num_arguments,
-          bool enabled)
+          int num_arguments)
   : _name(name), _description(description), _impact(impact),
-    _num_arguments(num_arguments), _is_enabled(enabled) {}
+    _num_arguments(num_arguments) {}
   const char* name() const          { return _name; }
   bool name_equals(const char* cmd_name) const;
   const char* description() const   { return _description; }
   const char* impact() const        { return _impact; }
   int num_arguments() const         { return _num_arguments; }
-  bool is_enabled() const           { return _is_enabled; }
 };
 
 // A DCmdArgumentInfo instance provides a description of a diagnostic command
@@ -233,8 +230,6 @@ public:
   //  static const char* name()             { return "<command name>";}
   //  static const char* description()      { return "<command help>";}
 
-  static const char* disabled_message() { return "Diagnostic command currently disabled"; }
-
   // The impact() method returns a description of the intrusiveness of the diagnostic
   // command on the Java Virtual Machine behavior. The rational for this method is that some
   // diagnostic commands can seriously disrupt the behavior of the Java Virtual Machine
@@ -337,8 +332,7 @@ public:
 };
 
 // Diagnostic commands are not directly instantiated but created with a factory.
-// Each diagnostic command class has its own factory. The DCmdFactory class also
-// manages the status of the diagnostic command (hidden, enabled). A DCmdFactory
+// Each diagnostic command class has its own factory. A DCmdFactory
 // has to be registered to make the diagnostic command available (see
 // management.cpp)
 class DCmdFactory: public CHeapObj<mtInternal> {
@@ -350,10 +344,6 @@ private:
   // Pointer to the next factory in the singly-linked list of registered
   // diagnostic commands
   DCmdFactory*        _next;
-  // When disabled, a diagnostic command cannot be executed. Any attempt to
-  // execute it will result in the printing of the disabled message without
-  // instantiating the command.
-  const bool          _enabled;
   // When hidden, a diagnostic command doesn't appear in the list of commands
   // provided by the 'help' command.
   const bool          _hidden;
@@ -361,10 +351,9 @@ private:
   const int           _num_arguments;
 
 public:
-  DCmdFactory(int num_arguments, uint32_t flags, bool enabled, bool hidden)
-    : _next(nullptr), _enabled(enabled), _hidden(hidden),
+  DCmdFactory(int num_arguments, uint32_t flags, bool hidden)
+    : _next(nullptr), _hidden(hidden),
       _export_flags(flags), _num_arguments(num_arguments) {}
-  bool is_enabled() const       { return _enabled; }
   bool is_hidden() const        { return _hidden; }
   uint32_t export_flags() const { return _export_flags; }
   int num_arguments() const     { return _num_arguments; }
@@ -373,11 +362,8 @@ public:
   virtual const char* name() const = 0;
   virtual const char* description() const = 0;
   virtual const char* impact() const = 0;
-  virtual const char* disabled_message() const = 0;
   // Register a DCmdFactory to make a diagnostic command available.
   // Once registered, a diagnostic command must not be unregistered.
-  // To prevent a diagnostic command from being executed, just set the
-  // enabled flag to false.
   static int register_DCmdFactory(DCmdFactory* factory);
   static DCmdFactory* factory(DCmdSource source, const char* cmd, size_t len);
   // Returns a resourceArea allocated diagnostic command for the given command line
@@ -401,8 +387,8 @@ private:
 // where this template is used to create and register factories.
 template <class DCmdClass> class DCmdFactoryImpl : public DCmdFactory {
 public:
-  DCmdFactoryImpl(uint32_t flags, bool enabled, bool hidden) :
-    DCmdFactory(get_num_arguments<DCmdClass>(), flags, enabled, hidden) { }
+  DCmdFactoryImpl(uint32_t flags, bool hidden = false) :
+    DCmdFactory(get_num_arguments<DCmdClass>(), flags, hidden) { }
   // Returns a resourceArea allocated instance
   DCmd* create_resource_instance(outputStream* output) const {
     return new DCmdClass(output, false);
@@ -416,9 +402,6 @@ public:
   const char* impact() const {
     return DCmdClass::impact();
   }
-  const char* disabled_message() const {
-     return DCmdClass::disabled_message();
-  }
 
 private:
 #ifdef ASSERT
diff --git a/src/hotspot/share/services/gcNotifier.hpp b/src/hotspot/share/services/gcNotifier.hpp
index f74d81b5b6e..1597e2698c4 100644
--- a/src/hotspot/share/services/gcNotifier.hpp
+++ b/src/hotspot/share/services/gcNotifier.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/services/management.cpp b/src/hotspot/share/services/management.cpp
index cc26e2e1352..290e4839c96 100644
--- a/src/hotspot/share/services/management.cpp
+++ b/src/hotspot/share/services/management.cpp
@@ -2032,7 +2032,11 @@ JVM_ENTRY(void, jmm_GetDiagnosticCommandInfo(JNIEnv *env, jobjectArray cmds,
     infoArray[i].description = info->description();
     infoArray[i].impact = info->impact();
     infoArray[i].num_arguments = info->num_arguments();
-    infoArray[i].enabled = info->is_enabled();
+
+    // All registered DCmds are always enabled. We set the dcmdInfo::enabled
+    // field to true to be compatible with the Java API
+    // com.sun.management.internal.DiagnosticCommandInfo.
+    infoArray[i].enabled = true;
   }
 JVM_END
 
diff --git a/src/hotspot/share/services/threadIdTable.hpp b/src/hotspot/share/services/threadIdTable.hpp
index b295cec2514..15dfb89d670 100644
--- a/src/hotspot/share/services/threadIdTable.hpp
+++ b/src/hotspot/share/services/threadIdTable.hpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/utilities/concurrentHashTable.hpp b/src/hotspot/share/utilities/concurrentHashTable.hpp
index a837a56a19a..d2317847307 100644
--- a/src/hotspot/share/utilities/concurrentHashTable.hpp
+++ b/src/hotspot/share/utilities/concurrentHashTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 #define SHARE_UTILITIES_CONCURRENTHASHTABLE_HPP
 
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/mutex.hpp"
 #include "utilities/globalCounter.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -69,7 +70,7 @@ class ConcurrentHashTable : public CHeapObj<MT> {
   class Node {
    private:
     DEBUG_ONLY(size_t _saved_hash);
-    Node * volatile _next;
+    Atomic<Node*> _next;
     VALUE _value;
    public:
     Node(const VALUE& value, Node* next = nullptr)
@@ -79,8 +80,8 @@ class ConcurrentHashTable : public CHeapObj<MT> {
     }
 
     Node* next() const;
-    void set_next(Node* node)         { _next = node; }
-    Node* const volatile * next_ptr() { return &_next; }
+    void set_next(Node* node) { _next.store_relaxed(node); }
+    const Atomic<Node*>* next_ptr() const { return &_next; }
 #ifdef ASSERT
     size_t saved_hash() const         { return _saved_hash; }
     void set_saved_hash(size_t hash)  { _saved_hash = hash; }
@@ -122,7 +123,7 @@ class ConcurrentHashTable : public CHeapObj<MT> {
     // unlocked -> locked -> redirect
     // Locked state only applies to an updater.
     // Reader only check for redirect.
-    Node * volatile _first;
+    Atomic<Node*> _first;
 
     static const uintptr_t STATE_LOCK_BIT     = 0x1;
     static const uintptr_t STATE_REDIRECT_BIT = 0x2;
@@ -156,20 +157,25 @@ class ConcurrentHashTable : public CHeapObj<MT> {
     // A bucket is only one pointer with the embedded state.
     Bucket() : _first(nullptr) {};
 
+    NONCOPYABLE(Bucket);
+
+    // Copy bucket's first entry to this.
+    void assign(const Bucket& bucket);
+
     // Get the first pointer unmasked.
     Node* first() const;
 
     // Get a pointer to the const first pointer. Do not deference this
     // pointer, the pointer pointed to _may_ contain an embedded state. Such
     // pointer should only be used as input to release_assign_node_ptr.
-    Node* const volatile * first_ptr() { return &_first; }
+    const Atomic<Node*>* first_ptr() const { return &_first; }
 
     // This is the only place where a pointer to a Node pointer that potentially
     // is _first should be changed. Otherwise we destroy the embedded state. We
     // only give out pointer to const Node pointer to avoid accidental
     // assignment, thus here we must cast const part away. Method is not static
     // due to an assert.
-    void release_assign_node_ptr(Node* const volatile * dst, Node* node) const;
+    void release_assign_node_ptr(const Atomic<Node*>* dst, Node* node) const;
 
     // This method assigns this buckets last Node next ptr to input Node.
     void release_assign_last_node_next(Node* node);
@@ -246,7 +252,7 @@ class ConcurrentHashTable : public CHeapObj<MT> {
   const size_t _log2_start_size;  // Start size.
   const size_t _grow_hint;        // Number of linked items
 
-  volatile bool _size_limit_reached;
+  Atomic<bool> _size_limit_reached;
 
   // We serialize resizers and other bulk operations which do not support
   // concurrent resize with this lock.
@@ -255,7 +261,7 @@ class ConcurrentHashTable : public CHeapObj<MT> {
   // taking the mutex after a safepoint this bool is the actual state. After
   // acquiring the mutex you must check if this is already locked. If so you
   // must drop the mutex until the real lock holder grabs the mutex.
-  volatile Thread* _resize_lock_owner;
+  Atomic<Thread*> _resize_lock_owner;
 
   // Return true if lock mutex/state succeeded.
   bool try_resize_lock(Thread* locker);
@@ -273,7 +279,7 @@ class ConcurrentHashTable : public CHeapObj<MT> {
   // this field keep tracks if a version of the hash-table was ever been seen.
   // We the working thread pointer as tag for debugging. The _invisible_epoch
   // can only be used by the owner of _resize_lock.
-  volatile Thread* _invisible_epoch;
+  Atomic<Thread*> _invisible_epoch;
 
   // Scoped critical section, which also handles the invisible epochs.
   // An invisible epoch/version do not need a write_synchronize().
@@ -435,11 +441,11 @@ class ConcurrentHashTable : public CHeapObj<MT> {
   size_t get_size_log2(Thread* thread);
   static size_t get_node_size() { return sizeof(Node); }
   static size_t get_dynamic_node_size(size_t value_size);
-  bool is_max_size_reached() { return _size_limit_reached; }
+  bool is_max_size_reached() { return _size_limit_reached.load_relaxed(); }
 
   // This means no paused bucket resize operation is going to resume
   // on this table.
-  bool is_safepoint_safe() { return _resize_lock_owner == nullptr; }
+  bool is_safepoint_safe() { return _resize_lock_owner.load_relaxed() == nullptr; }
 
   // Re-size operations.
   bool shrink(Thread* thread, size_t size_limit_log2 = 0);
diff --git a/src/hotspot/share/utilities/concurrentHashTable.inline.hpp b/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
index eeaff0167b2..31b451ba38a 100644
--- a/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
+++ b/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 
 #include "cppstdlib/type_traits.hpp"
 #include "memory/allocation.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/atomicAccess.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/prefetch.inline.hpp"
@@ -62,7 +63,7 @@ inline typename ConcurrentHashTable<CONFIG, MT>::Node*
 ConcurrentHashTable<CONFIG, MT>::
   Node::next() const
 {
-  return AtomicAccess::load_acquire(&_next);
+  return _next.load_acquire();
 }
 
 // Bucket
@@ -71,19 +72,26 @@ inline typename ConcurrentHashTable<CONFIG, MT>::Node*
 ConcurrentHashTable<CONFIG, MT>::
   Bucket::first_raw() const
 {
-  return AtomicAccess::load_acquire(&_first);
+  return _first.load_acquire();
 }
 
 template <typename CONFIG, MemTag MT>
 inline void ConcurrentHashTable<CONFIG, MT>::
   Bucket::release_assign_node_ptr(
-    typename ConcurrentHashTable<CONFIG, MT>::Node* const volatile * dst,
+    const Atomic<typename ConcurrentHashTable<CONFIG, MT>::Node*>* dst,
     typename ConcurrentHashTable<CONFIG, MT>::Node* node) const
 {
   // Due to this assert this methods is not static.
   assert(is_locked(), "Must be locked.");
-  Node** tmp = (Node**)dst;
-  AtomicAccess::release_store(tmp, clear_set_state(node, *dst));
+  Atomic<Node*>* tmp = const_cast<Atomic<Node*>*>(dst);
+  tmp->release_store(clear_set_state(node, dst->load_relaxed()));
+}
+
+template <typename CONFIG, MemTag MT>
+inline void ConcurrentHashTable<CONFIG, MT>::
+  Bucket::assign(const Bucket& bucket)
+{
+  _first.store_relaxed(bucket._first.load_relaxed());
 }
 
 template <typename CONFIG, MemTag MT>
@@ -92,7 +100,7 @@ ConcurrentHashTable<CONFIG, MT>::
   Bucket::first() const
 {
   // We strip the states bit before returning the ptr.
-  return clear_state(AtomicAccess::load_acquire(&_first));
+  return clear_state(_first.load_acquire());
 }
 
 template <typename CONFIG, MemTag MT>
@@ -133,9 +141,9 @@ inline void ConcurrentHashTable<CONFIG, MT>::
      typename ConcurrentHashTable<CONFIG, MT>::Node* node)
 {
   assert(is_locked(), "Must be locked.");
-  Node* const volatile * ret = first_ptr();
-  while (clear_state(*ret) != nullptr) {
-    ret = clear_state(*ret)->next_ptr();
+  const Atomic<Node*>* ret = first_ptr();
+  while (clear_state(ret->load_relaxed()) != nullptr) {
+    ret = clear_state(ret->load_relaxed())->next_ptr();
   }
   release_assign_node_ptr(ret, node);
 }
@@ -149,7 +157,7 @@ inline bool ConcurrentHashTable<CONFIG, MT>::
   if (is_locked()) {
     return false;
   }
-  if (AtomicAccess::cmpxchg(&_first, expect, node) == expect) {
+  if (_first.compare_exchange(expect, node) == expect) {
     return true;
   }
   return false;
@@ -164,7 +172,7 @@ inline bool ConcurrentHashTable<CONFIG, MT>::
   }
   // We will expect a clean first pointer.
   Node* tmp = first();
-  if (AtomicAccess::cmpxchg(&_first, tmp, set_state(tmp, STATE_LOCK_BIT)) == tmp) {
+  if (_first.compare_exchange(tmp, set_state(tmp, STATE_LOCK_BIT)) == tmp) {
     return true;
   }
   return false;
@@ -177,7 +185,7 @@ inline void ConcurrentHashTable<CONFIG, MT>::
   assert(is_locked(), "Must be locked.");
   assert(!have_redirect(),
          "Unlocking a bucket after it has reached terminal state.");
-  AtomicAccess::release_store(&_first, clear_state(first()));
+  _first.release_store(clear_state(first()));
 }
 
 template <typename CONFIG, MemTag MT>
@@ -185,7 +193,7 @@ inline void ConcurrentHashTable<CONFIG, MT>::
   Bucket::redirect()
 {
   assert(is_locked(), "Must be locked.");
-  AtomicAccess::release_store(&_first, set_state(_first, STATE_REDIRECT_BIT));
+  _first.release_store(set_state(_first.load_relaxed(), STATE_REDIRECT_BIT));
 }
 
 // InternalTable
@@ -221,8 +229,8 @@ inline ConcurrentHashTable<CONFIG, MT>::
       _cs_context(GlobalCounter::critical_section_begin(_thread))
 {
   // This version is published now.
-  if (AtomicAccess::load_acquire(&_cht->_invisible_epoch) != nullptr) {
-    AtomicAccess::release_store_fence(&_cht->_invisible_epoch, (Thread*)nullptr);
+  if (_cht->_invisible_epoch.load_acquire() != nullptr) {
+    _cht->_invisible_epoch.release_store_fence(nullptr);
   }
 }
 
@@ -282,16 +290,16 @@ template <typename CONFIG, MemTag MT>
 inline void ConcurrentHashTable<CONFIG, MT>::
   write_synchonize_on_visible_epoch(Thread* thread)
 {
-  assert(_resize_lock_owner == thread, "Re-size lock not held");
+  assert(_resize_lock_owner.load_relaxed() == thread, "Re-size lock not held");
   OrderAccess::fence(); // Prevent below load from floating up.
   // If no reader saw this version we can skip write_synchronize.
-  if (AtomicAccess::load_acquire(&_invisible_epoch) == thread) {
+  if (_invisible_epoch.load_acquire() == thread) {
     return;
   }
-  assert(_invisible_epoch == nullptr, "Two thread doing bulk operations");
+  assert(_invisible_epoch.load_relaxed() == nullptr, "Two thread doing bulk operations");
   // We set this/next version that we are synchronizing for to not published.
   // A reader will zero this flag if it reads this/next version.
-  AtomicAccess::release_store(&_invisible_epoch, thread);
+  _invisible_epoch.release_store(thread);
   GlobalCounter::write_synchronize();
 }
 
@@ -300,8 +308,8 @@ inline bool ConcurrentHashTable<CONFIG, MT>::
   try_resize_lock(Thread* locker)
 {
   if (_resize_lock->try_lock()) {
-    if (_resize_lock_owner != nullptr) {
-      assert(locker != _resize_lock_owner, "Already own lock");
+    if (_resize_lock_owner.load_relaxed() != nullptr) {
+      assert(locker != _resize_lock_owner.load_relaxed(), "Already own lock");
       // We got mutex but internal state is locked.
       _resize_lock->unlock();
       return false;
@@ -309,8 +317,8 @@ inline bool ConcurrentHashTable<CONFIG, MT>::
   } else {
     return false;
   }
-  _invisible_epoch = nullptr;
-  _resize_lock_owner = locker;
+  _invisible_epoch.store_relaxed(nullptr);
+  _resize_lock_owner.store_relaxed(locker);
   return true;
 }
 
@@ -326,8 +334,8 @@ inline void ConcurrentHashTable<CONFIG, MT>::
     _resize_lock->lock_without_safepoint_check();
     // If holder of lock dropped mutex for safepoint mutex might be unlocked,
     // and _resize_lock_owner will contain the owner.
-    if (_resize_lock_owner != nullptr) {
-      assert(locker != _resize_lock_owner, "Already own lock");
+    if (_resize_lock_owner.load_relaxed() != nullptr) {
+      assert(locker != _resize_lock_owner.load_relaxed(), "Already own lock");
       // We got mutex but internal state is locked.
       _resize_lock->unlock();
       yield.wait();
@@ -335,17 +343,17 @@ inline void ConcurrentHashTable<CONFIG, MT>::
       break;
     }
   } while(true);
-  _resize_lock_owner = locker;
-  _invisible_epoch = nullptr;
+  _resize_lock_owner.store_relaxed(locker);
+  _invisible_epoch.store_relaxed(nullptr);
 }
 
 template <typename CONFIG, MemTag MT>
 inline void ConcurrentHashTable<CONFIG, MT>::
   unlock_resize_lock(Thread* locker)
 {
-  _invisible_epoch = nullptr;
-  assert(locker == _resize_lock_owner, "Not unlocked by locker.");
-  _resize_lock_owner = nullptr;
+  _invisible_epoch.store_relaxed(nullptr);
+  assert(locker == _resize_lock_owner.load_relaxed(), "Not unlocked by locker.");
+  _resize_lock_owner.store_relaxed(nullptr);
   _resize_lock->unlock();
 }
 
@@ -412,8 +420,8 @@ inline void ConcurrentHashTable<CONFIG, MT>::
     bucket->lock();
 
     size_t odd_index = even_index + _table->_size;
-    _new_table->get_buckets()[even_index] = *bucket;
-    _new_table->get_buckets()[odd_index] = *bucket;
+    _new_table->get_buckets()[even_index].assign(*bucket);
+    _new_table->get_buckets()[odd_index].assign(*bucket);
 
     // Moves lockers go to new table, where they will wait until unlock() below.
     bucket->redirect(); /* Must release stores above */
@@ -444,7 +452,7 @@ inline bool ConcurrentHashTable<CONFIG, MT>::
 {
   Bucket* bucket = get_bucket_locked(thread, lookup_f.get_hash());
   assert(bucket->is_locked(), "Must be locked.");
-  Node* const volatile * rem_n_prev = bucket->first_ptr();
+  const Atomic<Node*>* rem_n_prev = bucket->first_ptr();
   Node* rem_n = bucket->first();
   while (rem_n != nullptr) {
     if (lookup_f.equals(rem_n->value())) {
@@ -477,8 +485,8 @@ inline void ConcurrentHashTable<CONFIG, MT>::
 {
   // Here we have resize lock so table is SMR safe, and there is no new
   // table. Can do this in parallel if we want.
-  assert((is_mt && _resize_lock_owner != nullptr) ||
-         (!is_mt && _resize_lock_owner == thread), "Re-size lock not held");
+  assert((is_mt && _resize_lock_owner.load_relaxed() != nullptr) ||
+         (!is_mt && _resize_lock_owner.load_relaxed() == thread), "Re-size lock not held");
   Node* ndel_stack[StackBufferSize];
   InternalTable* table = get_table();
   assert(start_idx < stop_idx, "Must be");
@@ -533,7 +541,7 @@ inline void ConcurrentHashTable<CONFIG, MT>::
 
   size_t dels = 0;
   Node* ndel[StackBufferSize];
-  Node* const volatile * rem_n_prev = bucket->first_ptr();
+  const Atomic<Node*>* rem_n_prev = bucket->first_ptr();
   Node* rem_n = bucket->first();
   while (rem_n != nullptr) {
     if (lookup_f.is_dead(rem_n->value())) {
@@ -642,8 +650,8 @@ inline bool ConcurrentHashTable<CONFIG, MT>::
     return false;
   }
   Node* delete_me = nullptr;
-  Node* const volatile * even = new_table->get_bucket(even_index)->first_ptr();
-  Node* const volatile * odd = new_table->get_bucket(odd_index)->first_ptr();
+  const Atomic<Node*>* even = new_table->get_bucket(even_index)->first_ptr();
+  const Atomic<Node*>* odd = new_table->get_bucket(odd_index)->first_ptr();
   while (aux != nullptr) {
     bool dead_hash = false;
     size_t aux_hash = CONFIG::get_hash(*aux->value(), &dead_hash);
@@ -696,7 +704,7 @@ inline bool ConcurrentHashTable<CONFIG, MT>::
   if (!try_resize_lock(thread)) {
     return false;
   }
-  assert(_resize_lock_owner == thread, "Re-size lock not held");
+  assert(_resize_lock_owner.load_relaxed() == thread, "Re-size lock not held");
   if (_table->_log2_size == _log2_start_size ||
       _table->_log2_size <= log2_size) {
     unlock_resize_lock(thread);
@@ -710,10 +718,10 @@ template <typename CONFIG, MemTag MT>
 inline void ConcurrentHashTable<CONFIG, MT>::
   internal_shrink_epilog(Thread* thread)
 {
-  assert(_resize_lock_owner == thread, "Re-size lock not held");
+  assert(_resize_lock_owner.load_relaxed() == thread, "Re-size lock not held");
 
   InternalTable* old_table = set_table_from_new();
-  _size_limit_reached = false;
+  _size_limit_reached.store_relaxed(false);
   unlock_resize_lock(thread);
 #ifdef ASSERT
   for (size_t i = 0; i < old_table->_size; i++) {
@@ -741,11 +749,11 @@ inline void ConcurrentHashTable<CONFIG, MT>::
     b_old_even->lock();
     b_old_odd->lock();
 
-    _new_table->get_buckets()[bucket_it] = *b_old_even;
+    _new_table->get_buckets()[bucket_it].assign(*b_old_even);
 
     // Put chains together.
     _new_table->get_bucket(bucket_it)->
-      release_assign_last_node_next(*(b_old_odd->first_ptr()));
+      release_assign_last_node_next(b_old_odd->first_ptr()->load_relaxed());
 
     b_old_even->redirect();
     b_old_odd->redirect();
@@ -767,13 +775,13 @@ inline bool ConcurrentHashTable<CONFIG, MT>::
   internal_shrink(Thread* thread, size_t log2_size)
 {
   if (!internal_shrink_prolog(thread, log2_size)) {
-    assert(_resize_lock_owner != thread, "Re-size lock held");
+    assert(_resize_lock_owner.load_relaxed() != thread, "Re-size lock held");
     return false;
   }
-  assert(_resize_lock_owner == thread, "Should be locked by me");
+  assert(_resize_lock_owner.load_relaxed() == thread, "Should be locked by me");
   internal_shrink_range(thread, 0, _new_table->_size);
   internal_shrink_epilog(thread);
-  assert(_resize_lock_owner != thread, "Re-size lock held");
+  assert(_resize_lock_owner.load_relaxed() != thread, "Re-size lock held");
   return true;
 }
 
@@ -787,7 +795,7 @@ inline void ConcurrentHashTable<CONFIG, MT>::
   delete _table;
   // Create and publish a new table
   InternalTable* table = new InternalTable(log2_size);
-  _size_limit_reached = (log2_size == _log2_size_limit);
+  _size_limit_reached.store_relaxed(log2_size == _log2_size_limit);
   AtomicAccess::release_store(&_table, table);
 }
 
@@ -812,7 +820,7 @@ inline bool ConcurrentHashTable<CONFIG, MT>::
   }
 
   _new_table = new InternalTable(_table->_log2_size + 1);
-  _size_limit_reached = _new_table->_log2_size == _log2_size_limit;
+  _size_limit_reached.store_relaxed(_new_table->_log2_size == _log2_size_limit);
 
   return true;
 }
@@ -821,7 +829,7 @@ template <typename CONFIG, MemTag MT>
 inline void ConcurrentHashTable<CONFIG, MT>::
   internal_grow_epilog(Thread* thread)
 {
-  assert(_resize_lock_owner == thread, "Should be locked");
+  assert(_resize_lock_owner.load_relaxed() == thread, "Should be locked");
 
   InternalTable* old_table = set_table_from_new();
   unlock_resize_lock(thread);
@@ -840,13 +848,13 @@ inline bool ConcurrentHashTable<CONFIG, MT>::
   internal_grow(Thread* thread, size_t log2_size)
 {
   if (!internal_grow_prolog(thread, log2_size)) {
-    assert(_resize_lock_owner != thread, "Re-size lock held");
+    assert(_resize_lock_owner.load_relaxed() != thread, "Re-size lock held");
     return false;
   }
-  assert(_resize_lock_owner == thread, "Should be locked by me");
+  assert(_resize_lock_owner.load_relaxed() == thread, "Should be locked by me");
   internal_grow_range(thread, 0, _table->_size);
   internal_grow_epilog(thread);
-  assert(_resize_lock_owner != thread, "Re-size lock held");
+  assert(_resize_lock_owner.load_relaxed() != thread, "Re-size lock held");
   return true;
 }
 
@@ -961,7 +969,7 @@ template <typename FUNC>
 inline void ConcurrentHashTable<CONFIG, MT>::
   do_scan_locked(Thread* thread, FUNC& scan_f)
 {
-  assert(_resize_lock_owner == thread, "Re-size lock not held");
+  assert(_resize_lock_owner.load_relaxed() == thread, "Re-size lock not held");
   // We can do a critical section over the entire loop but that would block
   // updates for a long time. Instead we choose to block resizes.
   InternalTable* table = get_table();
@@ -980,7 +988,7 @@ inline size_t ConcurrentHashTable<CONFIG, MT>::
                      size_t num_del, Node** ndel, GrowableArrayCHeap<Node*, MT>& extra)
 {
   size_t dels = 0;
-  Node* const volatile * rem_n_prev = bucket->first_ptr();
+  const Atomic<Node*>* rem_n_prev = bucket->first_ptr();
   Node* rem_n = bucket->first();
   while (rem_n != nullptr) {
     if (eval_f(rem_n->value())) {
@@ -1020,7 +1028,7 @@ ConcurrentHashTable(size_t log2size, size_t log2size_limit, size_t grow_hint, bo
   _resize_lock = new Mutex(rank, "ConcurrentHashTableResize_lock");
   _table = new InternalTable(log2size);
   assert(log2size_limit >= log2size, "bad ergo");
-  _size_limit_reached = _table->_log2_size == _log2_size_limit;
+  _size_limit_reached.store_relaxed(_table->_log2_size == _log2_size_limit);
 }
 
 template <typename CONFIG, MemTag MT>
@@ -1139,11 +1147,11 @@ inline void ConcurrentHashTable<CONFIG, MT>::
 {
   assert(!SafepointSynchronize::is_at_safepoint(),
          "must be outside a safepoint");
-  assert(_resize_lock_owner != thread, "Re-size lock held");
+  assert(_resize_lock_owner.load_relaxed() != thread, "Re-size lock held");
   lock_resize_lock(thread);
   do_scan_locked(thread, scan_f);
   unlock_resize_lock(thread);
-  assert(_resize_lock_owner != thread, "Re-size lock held");
+  assert(_resize_lock_owner.load_relaxed() != thread, "Re-size lock held");
 }
 
 template <typename CONFIG, MemTag MT>
@@ -1205,7 +1213,7 @@ inline bool ConcurrentHashTable<CONFIG, MT>::
   }
   do_bulk_delete_locked(thread, eval_f, del_f);
   unlock_resize_lock(thread);
-  assert(_resize_lock_owner != thread, "Re-size lock held");
+  assert(_resize_lock_owner.load_relaxed() != thread, "Re-size lock held");
   return true;
 }
 
diff --git a/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp b/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp
index 086a548ede5..054008953a8 100644
--- a/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp
+++ b/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp
@@ -27,6 +27,7 @@
 
 // No concurrentHashTableTasks.hpp
 
+#include "runtime/atomic.hpp"
 #include "runtime/atomicAccess.hpp"
 #include "utilities/concurrentHashTable.inline.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -41,7 +42,7 @@ class ConcurrentHashTable<CONFIG, MT>::BucketsOperation {
   ConcurrentHashTable<CONFIG, MT>* _cht;
 
   class InternalTableClaimer {
-    volatile size_t _next;
+    Atomic<size_t> _next;
     size_t _limit;
     size_t _size;
 
@@ -56,14 +57,14 @@ public:
 
     void set(size_t claim_size, InternalTable* table) {
       assert(table != nullptr, "precondition");
-      _next = 0;
+      _next.store_relaxed(0);
       _limit = table->_size;
       _size  = MIN2(claim_size, _limit);
     }
 
     bool claim(size_t* start, size_t* stop) {
-      if (AtomicAccess::load(&_next) < _limit) {
-        size_t claimed = AtomicAccess::fetch_then_add(&_next, _size);
+      if (_next.load_relaxed() < _limit) {
+        size_t claimed = _next.fetch_then_add(_size);
         if (claimed < _limit) {
           *start = claimed;
           *stop  = MIN2(claimed + _size, _limit);
@@ -78,7 +79,7 @@ public:
     }
 
     bool have_more_work() {
-      return AtomicAccess::load_acquire(&_next) >= _limit;
+      return _next.load_acquire() >= _limit;
     }
   };
 
@@ -108,13 +109,13 @@ public:
   }
 
   void thread_owns_resize_lock(Thread* thread) {
-    assert(BucketsOperation::_cht->_resize_lock_owner == thread,
+    assert(BucketsOperation::_cht->_resize_lock_owner.load_relaxed() == thread,
            "Should be locked by me");
     assert(BucketsOperation::_cht->_resize_lock->owned_by_self(),
            "Operations lock not held");
   }
   void thread_owns_only_state_lock(Thread* thread) {
-    assert(BucketsOperation::_cht->_resize_lock_owner == thread,
+    assert(BucketsOperation::_cht->_resize_lock_owner.load_relaxed() == thread,
            "Should be locked by me");
     assert(!BucketsOperation::_cht->_resize_lock->owned_by_self(),
            "Operations lock held");
@@ -122,7 +123,7 @@ public:
   void thread_do_not_own_resize_lock(Thread* thread) {
     assert(!BucketsOperation::_cht->_resize_lock->owned_by_self(),
            "Operations lock held");
-    assert(BucketsOperation::_cht->_resize_lock_owner != thread,
+    assert(BucketsOperation::_cht->_resize_lock_owner.load_relaxed() != thread,
            "Should not be locked by me");
   }
 
@@ -169,7 +170,7 @@ class ConcurrentHashTable<CONFIG, MT>::BulkDeleteTask :
   template <typename EVALUATE_FUNC, typename DELETE_FUNC>
   bool do_task(Thread* thread, EVALUATE_FUNC& eval_f, DELETE_FUNC& del_f) {
     size_t start, stop;
-    assert(BucketsOperation::_cht->_resize_lock_owner != nullptr,
+    assert(BucketsOperation::_cht->_resize_lock_owner.load_relaxed() != nullptr,
            "Should be locked");
     if (!this->claim(&start, &stop)) {
       return false;
@@ -177,7 +178,7 @@ class ConcurrentHashTable<CONFIG, MT>::BulkDeleteTask :
     BucketsOperation::_cht->do_bulk_delete_locked_for(thread, start, stop,
                                                       eval_f, del_f,
                                                       BucketsOperation::_is_mt);
-    assert(BucketsOperation::_cht->_resize_lock_owner != nullptr,
+    assert(BucketsOperation::_cht->_resize_lock_owner.load_relaxed() != nullptr,
            "Should be locked");
     return true;
   }
@@ -210,13 +211,13 @@ class ConcurrentHashTable<CONFIG, MT>::GrowTask :
   // Re-sizes a portion of the table. Returns true if there is more work.
   bool do_task(Thread* thread) {
     size_t start, stop;
-    assert(BucketsOperation::_cht->_resize_lock_owner != nullptr,
+    assert(BucketsOperation::_cht->_resize_lock_owner.load_relaxed() != nullptr,
            "Should be locked");
     if (!this->claim(&start, &stop)) {
       return false;
     }
     BucketsOperation::_cht->internal_grow_range(thread, start, stop);
-    assert(BucketsOperation::_cht->_resize_lock_owner != nullptr,
+    assert(BucketsOperation::_cht->_resize_lock_owner.load_relaxed() != nullptr,
            "Should be locked");
     return true;
   }
@@ -253,13 +254,13 @@ class ConcurrentHashTable<CONFIG, MT>::StatisticsTask :
   template <typename VALUE_SIZE_FUNC>
   bool do_task(Thread* thread, VALUE_SIZE_FUNC& sz) {
     size_t start, stop;
-    assert(BucketsOperation::_cht->_resize_lock_owner != nullptr,
+    assert(BucketsOperation::_cht->_resize_lock_owner.load_relaxed() != nullptr,
            "Should be locked");
     if (!this->claim(&start, &stop)) {
       return false;
     }
     BucketsOperation::_cht->internal_statistics_range(thread, start, stop, sz, _summary, _literal_bytes);
-    assert(BucketsOperation::_cht->_resize_lock_owner != nullptr,
+    assert(BucketsOperation::_cht->_resize_lock_owner.load_relaxed() != nullptr,
            "Should be locked");
     return true;
   }
diff --git a/src/hotspot/share/utilities/deferredStatic.hpp b/src/hotspot/share/utilities/deferredStatic.hpp
index 3a32f920fe8..a37b169803a 100644
--- a/src/hotspot/share/utilities/deferredStatic.hpp
+++ b/src/hotspot/share/utilities/deferredStatic.hpp
@@ -35,7 +35,7 @@
 // object must be explicitly initialized before use. This avoids problems
 // resulting from the unspecified initialization time and ordering between
 // different objects that comes from using undeferred objects (the so-called
-// "Static Initialization Order Fiasco).
+// "Static Initialization Order Fiasco").
 //
 // Once initialized, the object is never destroyed. This avoids similar issues
 // with the timing and ordering of destruction on normal program exit.
@@ -53,7 +53,7 @@ class DeferredStatic {
 public:
   NONCOPYABLE(DeferredStatic);
 
-  DeferredStatic()
+  constexpr DeferredStatic()
   DEBUG_ONLY(: _initialized(false)) {
     // Do not construct value, on purpose.
   }
diff --git a/src/hotspot/share/utilities/elfFile.hpp b/src/hotspot/share/utilities/elfFile.hpp
index 1298892533e..8abd846364c 100644
--- a/src/hotspot/share/utilities/elfFile.hpp
+++ b/src/hotspot/share/utilities/elfFile.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/utilities/intn_t.hpp b/src/hotspot/share/utilities/intn_t.hpp
index 6f43f5c2556..594e62a1694 100644
--- a/src/hotspot/share/utilities/intn_t.hpp
+++ b/src/hotspot/share/utilities/intn_t.hpp
@@ -79,6 +79,7 @@ public:
   static_assert(min < max, "");
 
   constexpr bool operator==(intn_t o) const { return (_v & _mask) == (o._v & _mask); }
+  constexpr bool operator!=(intn_t o) const { return !(*this == o); }
   constexpr bool operator<(intn_t o) const { return int(*this) < int(o); }
   constexpr bool operator>(intn_t o) const { return int(*this) > int(o); }
   constexpr bool operator<=(intn_t o) const { return int(*this) <= int(o); }
diff --git a/src/hotspot/share/utilities/macros.hpp b/src/hotspot/share/utilities/macros.hpp
index 9bdf4c2dd1f..8404fc757f0 100644
--- a/src/hotspot/share/utilities/macros.hpp
+++ b/src/hotspot/share/utilities/macros.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/utilities/nativeCallStack.hpp b/src/hotspot/share/utilities/nativeCallStack.hpp
index 32635a72d51..cb7823c0c0a 100644
--- a/src/hotspot/share/utilities/nativeCallStack.hpp
+++ b/src/hotspot/share/utilities/nativeCallStack.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/utilities/numberSeq.hpp b/src/hotspot/share/utilities/numberSeq.hpp
index fff4b416745..b70b081586b 100644
--- a/src/hotspot/share/utilities/numberSeq.hpp
+++ b/src/hotspot/share/utilities/numberSeq.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/utilities/objectBitSet.hpp b/src/hotspot/share/utilities/objectBitSet.hpp
index 73f1c89dd40..8f3e334b1a5 100644
--- a/src/hotspot/share/utilities/objectBitSet.hpp
+++ b/src/hotspot/share/utilities/objectBitSet.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/utilities/objectBitSet.inline.hpp b/src/hotspot/share/utilities/objectBitSet.inline.hpp
index e1b4d728b10..e204841e6e2 100644
--- a/src/hotspot/share/utilities/objectBitSet.inline.hpp
+++ b/src/hotspot/share/utilities/objectBitSet.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/utilities/resizableHashTable.hpp b/src/hotspot/share/utilities/resizableHashTable.hpp
index b445ed8a55e..a5b53698b11 100644
--- a/src/hotspot/share/utilities/resizableHashTable.hpp
+++ b/src/hotspot/share/utilities/resizableHashTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/utilities/spinCriticalSection.cpp b/src/hotspot/share/utilities/spinCriticalSection.cpp
index 0bbbc82c12b..4064c234e97 100644
--- a/src/hotspot/share/utilities/spinCriticalSection.cpp
+++ b/src/hotspot/share/utilities/spinCriticalSection.cpp
@@ -24,30 +24,19 @@
 
 #include "runtime/atomicAccess.hpp"
 #include "utilities/spinCriticalSection.hpp"
+#include "utilities/spinYield.hpp"
 
 void SpinCriticalSection::spin_acquire(volatile int* adr) {
   if (AtomicAccess::cmpxchg(adr, 0, 1) == 0) {
     return;   // normal fast-path return
   }
 
+  SpinYield sy(4096, 5, millis_to_nanos(1));
+
   // Slow-path : We've encountered contention -- Spin/Yield/Block strategy.
-  int ctr = 0;
-  int Yields = 0;
   for (;;) {
     while (*adr != 0) {
-      ++ctr;
-      if ((ctr & 0xFFF) == 0 || !os::is_MP()) {
-        if (Yields > 5) {
-          os::naked_short_sleep(1);
-        }
-        else {
-          os::naked_yield();
-          ++Yields;
-        }
-      }
-      else {
-        SpinPause();
-      }
+      sy.wait();
     }
     if (AtomicAccess::cmpxchg(adr, 0, 1) == 0) return;
   }
diff --git a/src/hotspot/share/utilities/ticks.hpp b/src/hotspot/share/utilities/ticks.hpp
index 88dc9a787f9..7822e565f32 100644
--- a/src/hotspot/share/utilities/ticks.hpp
+++ b/src/hotspot/share/utilities/ticks.hpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/aix/classes/sun/nio/ch/AixPollPort.java b/src/java.base/aix/classes/sun/nio/ch/AixPollPort.java
index b8610655b6c..1d2121cb50f 100644
--- a/src/java.base/aix/classes/sun/nio/ch/AixPollPort.java
+++ b/src/java.base/aix/classes/sun/nio/ch/AixPollPort.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java b/src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java
index 3e3f637cd4c..be270bb79c3 100644
--- a/src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java
+++ b/src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2020, 2022, Red Hat Inc.
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/macosx/native/libjava/java_props_macosx.c b/src/java.base/macosx/native/libjava/java_props_macosx.c
index 6656bf04efc..94749ee3efe 100644
--- a/src/java.base/macosx/native/libjava/java_props_macosx.c
+++ b/src/java.base/macosx/native/libjava/java_props_macosx.c
@@ -23,7 +23,6 @@
  * questions.
  */
 
-#include <stdbool.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -230,50 +229,33 @@ void setOSNameAndVersion(java_props_t *sprops) {
     NSString *nsVerStr = NULL;
     char* osVersionCStr = NULL;
     NSOperatingSystemVersion osVer = [[NSProcessInfo processInfo] operatingSystemVersion];
-    // Some macOS versions require special handling. For example,
-    // when the NSOperatingSystemVersion reports 10.16 as the version
-    // then it should be treated as 11. Similarly, when it reports 16.0
-    // as the version then it should be treated as 26.
-    // If the SYSTEM_VERSION_COMPAT environment variable (a macOS construct)
-    // is set to 1, then we don't do any special handling for any versions
-    // and just literally use the value that NSOperatingSystemVersion reports.
-    const char* envVal = getenv("SYSTEM_VERSION_COMPAT");
-    const bool versionCompatEnabled = envVal != NULL
-                                      && strncmp(envVal, "1", 1) == 0;
-    const bool requiresSpecialHandling =
-            ((long) osVer.majorVersion == 10 && (long) osVer.minorVersion >= 16)
-            || ((long) osVer.majorVersion == 16 && (long) osVer.minorVersion >= 0);
-    if (!requiresSpecialHandling || versionCompatEnabled) {
-        // no special handling - just use the version reported
-        // by NSOperatingSystemVersion
-        if (osVer.patchVersion == 0) {
-            // Omit trailing ".0"
+    // Copy out the char* if running on version other than 10.16 Mac OS (10.16 == 11.x)
+    // or explicitly requesting version compatibility
+    if (!((long)osVer.majorVersion == 10 && (long)osVer.minorVersion >= 16) ||
+            (getenv("SYSTEM_VERSION_COMPAT") != NULL)) {
+        if (osVer.patchVersion == 0) { // Omit trailing ".0"
             nsVerStr = [NSString stringWithFormat:@"%ld.%ld",
                     (long)osVer.majorVersion, (long)osVer.minorVersion];
         } else {
             nsVerStr = [NSString stringWithFormat:@"%ld.%ld.%ld",
-                    (long)osVer.majorVersion, (long)osVer.minorVersion,
-                    (long)osVer.patchVersion];
+                    (long)osVer.majorVersion, (long)osVer.minorVersion, (long)osVer.patchVersion];
         }
     } else {
-        // Requires special handling. We ignore the version reported
-        // by the NSOperatingSystemVersion API and instead read the
-        // *real* ProductVersion from
-        // /System/Library/CoreServices/.SystemVersionPlatform.plist.
-        // If not found there, then as a last resort we fallback to
-        // /System/Library/CoreServices/SystemVersion.plist
-        NSDictionary *version = [NSDictionary dictionaryWithContentsOfFile:
-            @"/System/Library/CoreServices/.SystemVersionPlatform.plist"];
+        // Version 10.16, without explicit env setting of SYSTEM_VERSION_COMPAT
+        // AKA 11+ Read the *real* ProductVersion from the hidden link to avoid SYSTEM_VERSION_COMPAT
+        // If not found, fallback below to the SystemVersion.plist
+        NSDictionary *version = [NSDictionary dictionaryWithContentsOfFile :
+                         @"/System/Library/CoreServices/.SystemVersionPlatform.plist"];
         if (version != NULL) {
-            nsVerStr = [version objectForKey: @"ProductVersion"];
+            nsVerStr = [version objectForKey : @"ProductVersion"];
         }
     }
-    // Last resort - fallback to reading the SystemVersion.plist
+    // Fallback to reading the SystemVersion.plist
     if (nsVerStr == NULL) {
-        NSDictionary *version = [NSDictionary dictionaryWithContentsOfFile:
-            @"/System/Library/CoreServices/SystemVersion.plist"];
+        NSDictionary *version = [NSDictionary dictionaryWithContentsOfFile :
+                                 @"/System/Library/CoreServices/SystemVersion.plist"];
         if (version != NULL) {
-            nsVerStr = [version objectForKey: @"ProductVersion"];
+            nsVerStr = [version objectForKey : @"ProductVersion"];
         }
     }
 
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java b/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java
index 9f19e1415bd..458edff7e76 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/lang/Byte.java b/src/java.base/share/classes/java/lang/Byte.java
index d9913e354a4..0f3f7f40d05 100644
--- a/src/java.base/share/classes/java/lang/Byte.java
+++ b/src/java.base/share/classes/java/lang/Byte.java
@@ -26,6 +26,7 @@
 package java.lang;
 
 import jdk.internal.misc.CDS;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 import jdk.internal.vm.annotation.Stable;
 
@@ -103,6 +104,7 @@ public final class Byte extends Number implements Comparable<Byte>, Constable {
         return Optional.of(DynamicConstantDesc.ofNamed(BSM_EXPLICIT_CAST, DEFAULT_NAME, CD_byte, intValue()));
     }
 
+    @AOTSafeClassInitializer
     private static final class ByteCache {
         private ByteCache() {}
 
diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java
index b71849eaee7..ffda729a45a 100644
--- a/src/java.base/share/classes/java/lang/Character.java
+++ b/src/java.base/share/classes/java/lang/Character.java
@@ -26,6 +26,7 @@
 package java.lang;
 
 import jdk.internal.misc.CDS;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 import jdk.internal.vm.annotation.Stable;
 
@@ -9379,6 +9380,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
         this.value = value;
     }
 
+    @AOTSafeClassInitializer
     private static final class CharacterCache {
         private CharacterCache(){}
 
diff --git a/src/java.base/share/classes/java/lang/CharacterData00.java.template b/src/java.base/share/classes/java/lang/CharacterData00.java.template
index 247a3ec7050..cb1a9c9cc0b 100644
--- a/src/java.base/share/classes/java/lang/CharacterData00.java.template
+++ b/src/java.base/share/classes/java/lang/CharacterData00.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/lang/CharacterDataLatin1.java.template b/src/java.base/share/classes/java/lang/CharacterDataLatin1.java.template
index 8316164c7c5..8513f52fd20 100644
--- a/src/java.base/share/classes/java/lang/CharacterDataLatin1.java.template
+++ b/src/java.base/share/classes/java/lang/CharacterDataLatin1.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/lang/CharacterDataPrivateUse.java b/src/java.base/share/classes/java/lang/CharacterDataPrivateUse.java
index 22eae86f4a3..cf6106d47b0 100644
--- a/src/java.base/share/classes/java/lang/CharacterDataPrivateUse.java
+++ b/src/java.base/share/classes/java/lang/CharacterDataPrivateUse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/lang/CharacterDataUndefined.java b/src/java.base/share/classes/java/lang/CharacterDataUndefined.java
index 4db9ff4ed3c..d3281f5a2f3 100644
--- a/src/java.base/share/classes/java/lang/CharacterDataUndefined.java
+++ b/src/java.base/share/classes/java/lang/CharacterDataUndefined.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/lang/Integer.java b/src/java.base/share/classes/java/lang/Integer.java
index 2742ec40abf..a9da1c32490 100644
--- a/src/java.base/share/classes/java/lang/Integer.java
+++ b/src/java.base/share/classes/java/lang/Integer.java
@@ -28,6 +28,8 @@ package java.lang;
 import jdk.internal.misc.CDS;
 import jdk.internal.misc.VM;
 import jdk.internal.util.DecimalDigits;
+import jdk.internal.vm.annotation.AOTRuntimeSetup;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
 import jdk.internal.vm.annotation.ForceInline;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 import jdk.internal.vm.annotation.Stable;
@@ -891,15 +893,20 @@ public final class Integer extends Number
      * with new Integer object(s) after initialization.
      */
 
+    @AOTSafeClassInitializer
     private static final class IntegerCache {
         static final int low = -128;
-        static final int high;
+        @Stable static int high;
 
-        @Stable
-        static final Integer[] cache;
+        @Stable static Integer[] cache;
         static Integer[] archivedCache;
 
         static {
+            runtimeSetup();
+        }
+
+        @AOTRuntimeSetup
+        private static void runtimeSetup() {
             // high value may be configured by property
             int h = 127;
             String integerCacheHighPropValue =
@@ -915,34 +922,50 @@ public final class Integer extends Number
             }
             high = h;
 
-            // Load IntegerCache.archivedCache from archive, if possible
-            CDS.initializeFromArchive(IntegerCache.class);
-            int size = (high - low) + 1;
-
-            // Use the archived cache if it exists and is large enough
-            if (archivedCache == null || size > archivedCache.length) {
-                Integer[] c = new Integer[size];
-                int j = low;
-                // If archive has Integer cache, we must use all instances from it.
-                // Otherwise, the identity checks between archived Integers and
-                // runtime-cached Integers would fail.
-                int archivedSize = (archivedCache == null) ? 0 : archivedCache.length;
-                for (int i = 0; i < archivedSize; i++) {
-                    c[i] = archivedCache[i];
-                    assert j == archivedCache[i];
-                    j++;
-                }
-                // Fill the rest of the cache.
-                for (int i = archivedSize; i < size; i++) {
-                    c[i] = new Integer(j++);
-                }
-                archivedCache = c;
+            Integer[] precomputed = null;
+            if (cache != null) {
+                // IntegerCache has been AOT-initialized.
+                precomputed = cache;
+            } else {
+                // Legacy CDS archive support (to be deprecated):
+                // Load IntegerCache.archivedCache from archive, if possible
+                CDS.initializeFromArchive(IntegerCache.class);
+                precomputed = archivedCache;
             }
-            cache = archivedCache;
+
+            cache = loadOrInitializeCache(precomputed);
+            archivedCache = cache; // Legacy CDS archive support (to be deprecated)
             // range [-128, 127] must be interned (JLS7 5.1.7)
             assert IntegerCache.high >= 127;
         }
 
+        private static Integer[] loadOrInitializeCache(Integer[] precomputed) {
+            int size = (high - low) + 1;
+
+            // Use the precomputed cache if it exists and is large enough
+            if (precomputed != null && size <= precomputed.length) {
+                return precomputed;
+            }
+
+            Integer[] c = new Integer[size];
+            int j = low;
+            // If we loading a precomputed cache (from AOT cache or CDS archive),
+            // we must use all instances from it.
+            // Otherwise, the Integers from the AOT cache (or CDS archive) will not
+            // have the same object identity as items in IntegerCache.cache[].
+            int precomputedSize = (precomputed == null) ? 0 : precomputed.length;
+            for (int i = 0; i < precomputedSize; i++) {
+                c[i] = precomputed[i];
+                assert j == precomputed[i];
+                j++;
+            }
+            // Fill the rest of the cache.
+            for (int i = precomputedSize; i < size; i++) {
+                c[i] = new Integer(j++);
+            }
+            return c;
+        }
+
         private IntegerCache() {}
     }
 
diff --git a/src/java.base/share/classes/java/lang/Long.java b/src/java.base/share/classes/java/lang/Long.java
index 3077e7c0a38..c5cd9650f2d 100644
--- a/src/java.base/share/classes/java/lang/Long.java
+++ b/src/java.base/share/classes/java/lang/Long.java
@@ -35,6 +35,7 @@ import java.util.Optional;
 
 import jdk.internal.misc.CDS;
 import jdk.internal.util.DecimalDigits;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
 import jdk.internal.vm.annotation.ForceInline;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 import jdk.internal.vm.annotation.Stable;
@@ -911,6 +912,7 @@ public final class Long extends Number
         return Long.valueOf(parseLong(s, 10));
     }
 
+    @AOTSafeClassInitializer
     private static final class LongCache {
         private LongCache() {}
 
diff --git a/src/java.base/share/classes/java/lang/Module.java b/src/java.base/share/classes/java/lang/Module.java
index cd2b8095ee4..bd04345554b 100644
--- a/src/java.base/share/classes/java/lang/Module.java
+++ b/src/java.base/share/classes/java/lang/Module.java
@@ -69,6 +69,7 @@ import jdk.internal.module.ServicesCatalog;
 import jdk.internal.module.Resources;
 import jdk.internal.reflect.CallerSensitive;
 import jdk.internal.reflect.Reflection;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
 import jdk.internal.vm.annotation.Stable;
 
 /**
@@ -391,6 +392,7 @@ public final class Module implements AnnotatedElement {
     private static final Module EVERYONE_MODULE;
     private static final Set<Module> EVERYONE_SET;
 
+    @AOTSafeClassInitializer
     private static class ArchivedData {
         private static ArchivedData archivedData;
         private final Module allUnnamedModule;
diff --git a/src/java.base/share/classes/java/lang/ModuleLayer.java b/src/java.base/share/classes/java/lang/ModuleLayer.java
index 9d922f787a6..a073de6b14a 100644
--- a/src/java.base/share/classes/java/lang/ModuleLayer.java
+++ b/src/java.base/share/classes/java/lang/ModuleLayer.java
@@ -53,6 +53,7 @@ import jdk.internal.module.ServicesCatalog;
 import jdk.internal.misc.CDS;
 import jdk.internal.reflect.CallerSensitive;
 import jdk.internal.reflect.Reflection;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
 import jdk.internal.vm.annotation.Stable;
 
 /**
@@ -145,6 +146,7 @@ import jdk.internal.vm.annotation.Stable;
  * @see Module#getLayer()
  */
 
+@AOTSafeClassInitializer
 public final class ModuleLayer {
 
     // the empty layer (may be initialized from the CDS archive)
diff --git a/src/java.base/share/classes/java/lang/Short.java b/src/java.base/share/classes/java/lang/Short.java
index 4c64427b6df..920500a7fa3 100644
--- a/src/java.base/share/classes/java/lang/Short.java
+++ b/src/java.base/share/classes/java/lang/Short.java
@@ -26,6 +26,7 @@
 package java.lang;
 
 import jdk.internal.misc.CDS;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 import jdk.internal.vm.annotation.Stable;
 
@@ -230,6 +231,7 @@ public final class Short extends Number implements Comparable<Short>, Constable
         return Optional.of(DynamicConstantDesc.ofNamed(BSM_EXPLICIT_CAST, DEFAULT_NAME, CD_short, intValue()));
     }
 
+    @AOTSafeClassInitializer
     private static final class ShortCache {
         private ShortCache() {}
 
diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java
index d7aef113e15..d3eda052740 100644
--- a/src/java.base/share/classes/java/lang/String.java
+++ b/src/java.base/share/classes/java/lang/String.java
@@ -1111,7 +1111,7 @@ public final class String
         int sp = 0;
         int sl = len;
         while (sp < sl) {
-            int ret = StringCoding.encodeISOArray(val, sp, dst, dp, len);
+            int ret = StringCoding.implEncodeISOArray(val, sp, dst, dp, len);
             sp = sp + ret;
             dp = dp + ret;
             if (ret != len) {
diff --git a/src/java.base/share/classes/java/lang/StringCoding.java b/src/java.base/share/classes/java/lang/StringCoding.java
index 545f216b755..c02af28c37d 100644
--- a/src/java.base/share/classes/java/lang/StringCoding.java
+++ b/src/java.base/share/classes/java/lang/StringCoding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2024, Alibaba Group Holding Limited. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,11 +26,8 @@
 
 package java.lang;
 
-import jdk.internal.util.Preconditions;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 
-import java.util.function.BiFunction;
-
 /**
  * Utility class for string encoding and decoding.
  */
@@ -41,7 +38,7 @@ class StringCoding {
     /**
      * Count the number of leading non-zero ascii chars in the range.
      */
-    static int countNonZeroAscii(String s) {
+    public static int countNonZeroAscii(String s) {
         byte[] value = s.value();
         if (s.isLatin1()) {
             return countNonZeroAsciiLatin1(value, 0, value.length);
@@ -53,7 +50,7 @@ class StringCoding {
     /**
      * Count the number of non-zero ascii chars in the range.
      */
-    private static int countNonZeroAsciiLatin1(byte[] ba, int off, int len) {
+    public static int countNonZeroAsciiLatin1(byte[] ba, int off, int len) {
         int limit = off + len;
         for (int i = off; i < limit; i++) {
             if (ba[i] <= 0) {
@@ -66,7 +63,7 @@ class StringCoding {
     /**
      * Count the number of leading non-zero ascii chars in the range.
      */
-    private static int countNonZeroAsciiUTF16(byte[] ba, int off, int strlen) {
+    public static int countNonZeroAsciiUTF16(byte[] ba, int off, int strlen) {
         int limit = off + strlen;
         for (int i = off; i < limit; i++) {
             char c = StringUTF16.charAt(ba, i);
@@ -77,7 +74,7 @@ class StringCoding {
         return strlen;
     }
 
-    static boolean hasNegatives(byte[] ba, int off, int len) {
+    public static boolean hasNegatives(byte[] ba, int off, int len) {
         return countPositives(ba, off, len) != len;
     }
 
@@ -88,24 +85,9 @@ class StringCoding {
      *   bytes in the range. If there are negative bytes, the implementation must return
      *   a value that is less than or equal to the index of the first negative byte
      *   in the range.
-     *
-     * @param ba a byte array
-     * @param off the index of the first byte to start reading from
-     * @param len the total number of bytes to read
-     * @throws NullPointerException if {@code ba} is null
-     * @throws ArrayIndexOutOfBoundsException if the provided sub-range is
-     *         {@linkplain Preconditions#checkFromIndexSize(int, int, int, BiFunction) out of bounds}
      */
-    static int countPositives(byte[] ba, int off, int len) {
-        Preconditions.checkFromIndexSize(
-                off, len,
-                ba.length,      // Implicit null check on `ba`
-                Preconditions.AIOOBE_FORMATTER);
-        return countPositives0(ba, off, len);
-    }
-
     @IntrinsicCandidate
-    private static int countPositives0(byte[] ba, int off, int len) {
+    public static int countPositives(byte[] ba, int off, int len) {
         int limit = off + len;
         for (int i = off; i < limit; i++) {
             if (ba[i] < 0) {
@@ -115,37 +97,9 @@ class StringCoding {
         return len;
     }
 
-    /**
-     * Encodes as many ISO-8859-1 codepoints as possible from the source byte
-     * array containing characters encoded in UTF-16, into the destination byte
-     * array, assuming that the encoding is ISO-8859-1 compatible.
-     *
-     * @param sa the source byte array containing characters encoded in UTF-16
-     * @param sp the index of the <em>character (not byte!)</em> from the source array to start reading from
-     * @param da the target byte array
-     * @param dp the index of the target array to start writing to
-     * @param len the maximum number of <em>characters (not bytes!)</em> to be encoded
-     * @return the total number of <em>characters (not bytes!)</em> successfully encoded
-     * @throws NullPointerException if any of the provided arrays is null
-     */
-    static int encodeISOArray(byte[] sa, int sp,
-                              byte[] da, int dp, int len) {
-        // This method should tolerate invalid arguments, matching the lenient behavior of the VM intrinsic.
-        // Hence, using operator expressions instead of `Preconditions`, which throw on failure.
-        int sl;
-        if ((sp | dp | len) < 0 ||
-                // Halving the length of `sa` to obtain the number of characters:
-                sp >= (sl = sa.length >>> 1) ||     // Implicit null check on `sa`
-                dp >= da.length) {                  // Implicit null check on `da`
-            return 0;
-        }
-        int minLen = Math.min(len, Math.min(sl - sp, da.length - dp));
-        return encodeISOArray0(sa, sp, da, dp, minLen);
-    }
-
     @IntrinsicCandidate
-    private static int encodeISOArray0(byte[] sa, int sp,
-                                       byte[] da, int dp, int len) {
+    public static int implEncodeISOArray(byte[] sa, int sp,
+                                         byte[] da, int dp, int len) {
         int i = 0;
         for (; i < len; i++) {
             char c = StringUTF16.getChar(sa, sp++);
@@ -156,35 +110,10 @@ class StringCoding {
         return i;
     }
 
-    /**
-     * Encodes as many ASCII codepoints as possible from the source
-     * character array into the destination byte array, assuming that
-     * the encoding is ASCII compatible.
-     *
-     * @param sa the source character array
-     * @param sp the index of the source array to start reading from
-     * @param da the target byte array
-     * @param dp the index of the target array to start writing to
-     * @param len the maximum number of characters to be encoded
-     * @return the total number of characters successfully encoded
-     * @throws NullPointerException if any of the provided arrays is null
-     */
-    static int encodeAsciiArray(char[] sa, int sp,
-                                byte[] da, int dp, int len) {
-        // This method should tolerate invalid arguments, matching the lenient behavior of the VM intrinsic.
-        // Hence, using operator expressions instead of `Preconditions`, which throw on failure.
-        if ((sp | dp | len) < 0 ||
-                sp >= sa.length ||      // Implicit null check on `sa`
-                dp >= da.length) {      // Implicit null check on `da`
-            return 0;
-        }
-        int minLen = Math.min(len, Math.min(sa.length - sp, da.length - dp));
-        return encodeAsciiArray0(sa, sp, da, dp, minLen);
-    }
-
     @IntrinsicCandidate
-    static int encodeAsciiArray0(char[] sa, int sp,
-                                 byte[] da, int dp, int len) {
+    public static int implEncodeAsciiArray(char[] sa, int sp,
+                                           byte[] da, int dp, int len)
+    {
         int i = 0;
         for (; i < len; i++) {
             char c = sa[sp++];
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index 5c2b47afe3d..f3a57c34165 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -55,6 +55,7 @@ import java.util.Properties;
 import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.function.Supplier;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Stream;
@@ -2176,8 +2177,8 @@ public final class System {
                 return String.decodeASCII(src, srcOff, dst, dstOff, len);
             }
 
-            public int encodeASCII(char[] sa, int sp, byte[] da, int dp, int len) {
-                return StringCoding.encodeAsciiArray(sa, sp, da, dp, len);
+            public int uncheckedEncodeASCII(char[] src, int srcOff, byte[] dst, int dstOff, int len) {
+                return StringCoding.implEncodeAsciiArray(src, srcOff, dst, dstOff, len);
             }
 
             public InputStream initialSystemIn() {
diff --git a/src/java.base/share/classes/java/lang/ThreadBuilders.java b/src/java.base/share/classes/java/lang/ThreadBuilders.java
index 033c237877c..150ce263b01 100644
--- a/src/java.base/share/classes/java/lang/ThreadBuilders.java
+++ b/src/java.base/share/classes/java/lang/ThreadBuilders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/lang/invoke/CallSite.java b/src/java.base/share/classes/java/lang/invoke/CallSite.java
index e9e3477f96f..1f1a03bccca 100644
--- a/src/java.base/share/classes/java/lang/invoke/CallSite.java
+++ b/src/java.base/share/classes/java/lang/invoke/CallSite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandle.java b/src/java.base/share/classes/java/lang/invoke/VarHandle.java
index 9246fdc0395..0bcb9a660da 100644
--- a/src/java.base/share/classes/java/lang/invoke/VarHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/VarHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/lang/module/Configuration.java b/src/java.base/share/classes/java/lang/module/Configuration.java
index a76a32cfb28..40eeddc3f0b 100644
--- a/src/java.base/share/classes/java/lang/module/Configuration.java
+++ b/src/java.base/share/classes/java/lang/module/Configuration.java
@@ -44,6 +44,7 @@ import java.util.stream.Stream;
 import jdk.internal.misc.CDS;
 import jdk.internal.module.ModuleReferenceImpl;
 import jdk.internal.module.ModuleTarget;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
 import jdk.internal.vm.annotation.Stable;
 
 /**
@@ -155,6 +156,7 @@ import jdk.internal.vm.annotation.Stable;
  * @since 9
  * @see java.lang.ModuleLayer
  */
+@AOTSafeClassInitializer
 public final class Configuration {
 
     // @see Configuration#empty()
diff --git a/src/java.base/share/classes/java/lang/ref/Cleaner.java b/src/java.base/share/classes/java/lang/ref/Cleaner.java
index 20a964be21d..ebe230a2f00 100644
--- a/src/java.base/share/classes/java/lang/ref/Cleaner.java
+++ b/src/java.base/share/classes/java/lang/ref/Cleaner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/lang/ref/PhantomReference.java b/src/java.base/share/classes/java/lang/ref/PhantomReference.java
index a6e144dc7b6..5f6f47a14b3 100644
--- a/src/java.base/share/classes/java/lang/ref/PhantomReference.java
+++ b/src/java.base/share/classes/java/lang/ref/PhantomReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/lang/ref/SoftReference.java b/src/java.base/share/classes/java/lang/ref/SoftReference.java
index 0bc372eb105..1409cd89d0f 100644
--- a/src/java.base/share/classes/java/lang/ref/SoftReference.java
+++ b/src/java.base/share/classes/java/lang/ref/SoftReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/lang/ref/WeakReference.java b/src/java.base/share/classes/java/lang/ref/WeakReference.java
index 4b4f834485e..4bdce2ace98 100644
--- a/src/java.base/share/classes/java/lang/ref/WeakReference.java
+++ b/src/java.base/share/classes/java/lang/ref/WeakReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/lang/runtime/ExactConversionsSupport.java b/src/java.base/share/classes/java/lang/runtime/ExactConversionsSupport.java
index 6e17a4b85a0..a1a93859c42 100644
--- a/src/java.base/share/classes/java/lang/runtime/ExactConversionsSupport.java
+++ b/src/java.base/share/classes/java/lang/runtime/ExactConversionsSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,9 +64,12 @@ package java.lang.runtime;
  *   floating-point type is considered exact.</li>
  * </ul>
  *
- * @jls 5.7.1 Exact Testing Conversions
- * @jls 5.7.2 Unconditionally Exact Testing Conversions
- * @jls 15.20.2 The instanceof Operator
+ * @see <a href="../../../../../specs/primitive-types-in-patterns-instanceof-switch-jls.html#jls-5.7.1">
+ * JLS 5.7.1 Exact Testing Conversions</a>
+ * @see <a href="../../../../../specs/primitive-types-in-patterns-instanceof-switch-jls.html#jls-5.7.2">
+ * JLS 5.7.2 Unconditionally Exact Testing Conversions</a>
+ * @see <a href="../../../../../specs/primitive-types-in-patterns-instanceof-switch-jls.html#jls-15.20.2">
+ * JLS 15.20.2 The instanceof Operator</a>
  *
  * @implNote Some exactness checks describe a test which can be redirected
  * safely through one of the existing methods. Those are omitted too (i.e.,
diff --git a/src/java.base/share/classes/java/net/Authenticator.java b/src/java.base/share/classes/java/net/Authenticator.java
index fb33596feed..d7b64d4bc73 100644
--- a/src/java.base/share/classes/java/net/Authenticator.java
+++ b/src/java.base/share/classes/java/net/Authenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/net/doc-files/net-properties.html b/src/java.base/share/classes/java/net/doc-files/net-properties.html
index 54d4cd55a9b..f7767655235 100644
--- a/src/java.base/share/classes/java/net/doc-files/net-properties.html
+++ b/src/java.base/share/classes/java/net/doc-files/net-properties.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 <!--
- Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template b/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template
index 8f0fcc08952..e900c2eca0f 100644
--- a/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template
+++ b/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/security/Provider.java b/src/java.base/share/classes/java/security/Provider.java
index de2845fb550..f95caa1d920 100644
--- a/src/java.base/share/classes/java/security/Provider.java
+++ b/src/java.base/share/classes/java/security/Provider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/text/MessageFormat.java b/src/java.base/share/classes/java/text/MessageFormat.java
index 5477d0f881a..1a850ebaa42 100644
--- a/src/java.base/share/classes/java/text/MessageFormat.java
+++ b/src/java.base/share/classes/java/text/MessageFormat.java
@@ -1713,12 +1713,7 @@ public class MessageFormat extends Format {
             throw new IllegalArgumentException("unknown format type: " + type);
         }
         // Get the style if recognized, otherwise treat style as a SubformatPattern
-        FormatStyle fStyle;
-        try {
-            fStyle = FormatStyle.fromString(style);
-        } catch (IllegalArgumentException iae) {
-            fStyle = FormatStyle.SUBFORMATPATTERN;
-        }
+        FormatStyle fStyle = FormatStyle.fromString(style);
         return switch (fType) {
             case NUMBER -> switch (fStyle) {
                 case DEFAULT -> NumberFormat.getInstance(locale);
@@ -1976,41 +1971,43 @@ public class MessageFormat extends Format {
     }
 
     // Corresponding to the FormatStyle pattern
+    // WARNING: fromString is dependent on ordinal positioning and Enum names.
     private enum FormatStyle {
-        DEFAULT(""),
-        SHORT("short"),
-        MEDIUM("medium"),
-        LONG("long"),
-        FULL("full"),
-        INTEGER("integer"),
-        CURRENCY("currency"),
-        PERCENT("percent"),
-        COMPACT_SHORT("compact_short"),
-        COMPACT_LONG("compact_long"),
-        OR("or"),
-        UNIT("unit"),
-        SUBFORMATPATTERN(null);
+        // Special styles
+        DEFAULT,
+        SUBFORMATPATTERN,
+        // Pre-defined styles
+        SHORT,
+        MEDIUM,
+        LONG,
+        FULL,
+        INTEGER,
+        CURRENCY,
+        PERCENT,
+        COMPACT_SHORT,
+        COMPACT_LONG,
+        OR,
+        UNIT;
 
-        private final String text;
-
-        // Differs from FormatType in that the text String is
-        // not guaranteed to match the Enum name, thus a text field is used
-        FormatStyle(String text) {
-            this.text = text;
-        }
-
-        // This method returns a FormatStyle (excluding SUBFORMATPATTERN)
-        // that matches the passed String. If no FormatStyle is found,
-        // an IllegalArgumentException is thrown
+        // Returns a FormatStyle corresponding to the input text.
+        // DEFAULT is the empty String.
+        // Pre-defined styles are lower case versions of their enum name
+        // (but compared case-insensitive for historical compatibility).
+        // SUBFORMATPATTERN is anything else.
         private static FormatStyle fromString(String text) {
-            for (FormatStyle style : values()) {
-                // Also check trimmed case-insensitive for historical reasons
-                if (style != FormatStyle.SUBFORMATPATTERN &&
-                        text.trim().compareToIgnoreCase(style.text) == 0) {
-                    return style;
+            var style = text.trim();
+            if (style.isEmpty()) {
+                return FormatStyle.DEFAULT;
+            }
+            var styles = values();
+            // Match starting at the pre-defined styles -> [SHORT:]
+            for (int i = SHORT.ordinal(); i < styles.length; i++) {
+                var fStyle = styles[i];
+                if (style.compareToIgnoreCase(fStyle.name()) == 0) {
+                    return fStyle;
                 }
             }
-            throw new IllegalArgumentException();
+            return FormatStyle.SUBFORMATPATTERN;
         }
     }
 
diff --git a/src/java.base/share/classes/java/util/Collection.java b/src/java.base/share/classes/java/util/Collection.java
index 43e8db55d7f..88f5568d799 100644
--- a/src/java.base/share/classes/java/util/Collection.java
+++ b/src/java.base/share/classes/java/util/Collection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/util/ImmutableCollections.java b/src/java.base/share/classes/java/util/ImmutableCollections.java
index abc48ff5ed9..e7fe22490da 100644
--- a/src/java.base/share/classes/java/util/ImmutableCollections.java
+++ b/src/java.base/share/classes/java/util/ImmutableCollections.java
@@ -42,6 +42,9 @@ import java.util.function.UnaryOperator;
 import jdk.internal.access.JavaUtilCollectionAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.misc.CDS;
+import jdk.internal.vm.annotation.AOTRuntimeSetup;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
+import jdk.internal.vm.annotation.ForceInline;
 import jdk.internal.vm.annotation.Stable;
 
 /**
@@ -52,6 +55,7 @@ import jdk.internal.vm.annotation.Stable;
  * classes use a serial proxy and thus have no need to declare serialVersionUID.
  */
 @SuppressWarnings("serial")
+@AOTSafeClassInitializer
 class ImmutableCollections {
     /**
      * A "salt" value used for randomizing iteration order. This is initialized once
@@ -59,14 +63,20 @@ class ImmutableCollections {
      * it needs to vary sufficiently from one run to the next so that iteration order
      * will vary between JVM runs.
      */
-    private static final long SALT32L;
+    @Stable private static long SALT32L;
 
     /**
      * For set and map iteration, we will iterate in "reverse" stochastically,
      * decided at bootstrap time.
      */
-    private static final boolean REVERSE;
+    @Stable private static boolean REVERSE;
+
     static {
+        runtimeSetup();
+    }
+
+    @AOTRuntimeSetup
+    private static void runtimeSetup() {
         // to generate a reasonably random and well-mixed SALT, use an arbitrary
         // value (a slice of pi), multiply with a random seed, then pick
         // the mid 32-bits from the product. By picking a SALT value in the
@@ -102,6 +112,7 @@ class ImmutableCollections {
     static final MapN<?,?> EMPTY_MAP;
 
     static {
+        // Legacy CDS archive support (to be deprecated)
         CDS.initializeFromArchive(ImmutableCollections.class);
         if (archivedObjects == null) {
             EMPTY = new Object();
diff --git a/src/java.base/share/classes/java/util/UUID.java b/src/java.base/share/classes/java/util/UUID.java
index fa66d199239..f69ca8171cf 100644
--- a/src/java.base/share/classes/java/util/UUID.java
+++ b/src/java.base/share/classes/java/util/UUID.java
@@ -32,12 +32,11 @@ import jdk.internal.access.SharedSecrets;
 import jdk.internal.util.ByteArrayLittleEndian;
 
 /**
- * A class that represents an immutable universally unique identifier (UUID).
+ * A class that represents an immutable Universally Unique IDentifier (UUID).
  * A UUID represents a 128-bit value.
  *
- * <p> There exist different variants of these global identifiers.  The methods
- * of this class are for manipulating the Leach-Salz variant, although the
- * constructors allow the creation of any variant of UUID (described below).
+ * <p> This class is primarily designed for manipulating Leach-Salz variant UUIDs,
+ * but it also supports the creation of UUIDs of other variants.
  *
  * <p> The layout of a variant 2 (Leach-Salz) UUID is as follows:
  *
diff --git a/src/java.base/share/classes/java/util/WeakHashMap.java b/src/java.base/share/classes/java/util/WeakHashMap.java
index 7f2960eb2ad..b5a27593840 100644
--- a/src/java.base/share/classes/java/util/WeakHashMap.java
+++ b/src/java.base/share/classes/java/util/WeakHashMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/util/jar/Attributes.java b/src/java.base/share/classes/java/util/jar/Attributes.java
index 9322bb9acac..20ff81676c9 100644
--- a/src/java.base/share/classes/java/util/jar/Attributes.java
+++ b/src/java.base/share/classes/java/util/jar/Attributes.java
@@ -36,6 +36,7 @@ import java.util.Objects;
 import java.util.Set;
 
 import jdk.internal.misc.CDS;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
 import jdk.internal.vm.annotation.Stable;
 
 import sun.nio.cs.UTF_8;
@@ -60,6 +61,7 @@ import sun.util.logging.PlatformLogger;
  * @see     Manifest
  * @since   1.2
  */
+@AOTSafeClassInitializer
 public class Attributes implements Map<Object,Object>, Cloneable {
     /**
      * The attribute name-value mappings.
@@ -450,6 +452,7 @@ public class Attributes implements Map<Object,Object>, Cloneable {
      *
      * @spec jar/jar.html JAR File Specification
      */
+    @AOTSafeClassInitializer
     public static class Name {
         private final String name;
         private final int hashCode;
@@ -669,6 +672,7 @@ public class Attributes implements Map<Object,Object>, Cloneable {
 
         static {
 
+            // Legacy CDS archive support (to be deprecated)
             CDS.initializeFromArchive(Attributes.Name.class);
 
             if (KNOWN_NAMES == null) {
diff --git a/src/java.base/share/classes/java/util/jar/JarInputStream.java b/src/java.base/share/classes/java/util/jar/JarInputStream.java
index 5c29d74f92a..8b10dd161dc 100644
--- a/src/java.base/share/classes/java/util/jar/JarInputStream.java
+++ b/src/java.base/share/classes/java/util/jar/JarInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/util/jar/JarVerifier.java b/src/java.base/share/classes/java/util/jar/JarVerifier.java
index fe58c4dffec..d73231a4c61 100644
--- a/src/java.base/share/classes/java/util/jar/JarVerifier.java
+++ b/src/java.base/share/classes/java/util/jar/JarVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/util/stream/GathererOp.java b/src/java.base/share/classes/java/util/stream/GathererOp.java
index c4239b1e029..4cdbc4b9c58 100644
--- a/src/java.base/share/classes/java/util/stream/GathererOp.java
+++ b/src/java.base/share/classes/java/util/stream/GathererOp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java b/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java
index 12abd53350f..2920fee3f7a 100644
--- a/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java
+++ b/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/java/util/zip/snippet-files/Snippets.java b/src/java.base/share/classes/java/util/zip/snippet-files/Snippets.java
index 9508b7aefea..2afb9d9328e 100644
--- a/src/java.base/share/classes/java/util/zip/snippet-files/Snippets.java
+++ b/src/java.base/share/classes/java/util/zip/snippet-files/Snippets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/javax/security/auth/Subject.java b/src/java.base/share/classes/javax/security/auth/Subject.java
index dd1e2333005..863d9d66921 100644
--- a/src/java.base/share/classes/javax/security/auth/Subject.java
+++ b/src/java.base/share/classes/javax/security/auth/Subject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/jdk/internal/ValueBased.java b/src/java.base/share/classes/jdk/internal/ValueBased.java
index 160ffce874a..42e78018198 100644
--- a/src/java.base/share/classes/jdk/internal/ValueBased.java
+++ b/src/java.base/share/classes/jdk/internal/ValueBased.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
index 86e5f317dc7..c5c45ca3553 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -448,19 +448,15 @@ public interface JavaLangAccess {
     PrintStream initialSystemErr();
 
     /**
-     * Encodes as many ASCII codepoints as possible from the source
-     * character array into the destination byte array, assuming that
-     * the encoding is ASCII compatible.
+     * Encodes as many ASCII codepoints as possible from the source array into
+     * the destination byte array, assuming that the encoding is ASCII
+     * compatible.
+     * <p>
+     * <b>WARNING: This method does not perform any bound checks.</b>
      *
-     * @param sa the source character array
-     * @param sp the index of the source array to start reading from
-     * @param da the target byte array
-     * @param dp the index of the target array to start writing to
-     * @param len the total number of characters to be encoded
-     * @return the total number of characters successfully encoded
-     * @throws NullPointerException if any of the provided arrays is null
+     * @return the number of bytes successfully encoded, or 0 if none
      */
-    int encodeASCII(char[] sa, int sp, byte[] da, int dp, int len);
+    int uncheckedEncodeASCII(char[] src, int srcOff, byte[] dst, int dstOff, int len);
 
     /**
      * Set the cause of Throwable
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaUtilConcurrentTLRAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaUtilConcurrentTLRAccess.java
index 29434e823a4..820c195ea0d 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaUtilConcurrentTLRAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaUtilConcurrentTLRAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/jdk/internal/classfile/components/snippet-files/PackageSnippets.java b/src/java.base/share/classes/jdk/internal/classfile/components/snippet-files/PackageSnippets.java
index 519ae096757..07f44835ba7 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/components/snippet-files/PackageSnippets.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/components/snippet-files/PackageSnippets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java b/src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java
index 3940f996e0d..0137a45d028 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/VMStorage.java b/src/java.base/share/classes/jdk/internal/foreign/abi/VMStorage.java
index 0be1675ccd8..06cc4068f8f 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/VMStorage.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/VMStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/Norm2AllModes.java b/src/java.base/share/classes/jdk/internal/icu/impl/Norm2AllModes.java
index 67c9eff6f34..1545ae7cdb4 100644
--- a/src/java.base/share/classes/jdk/internal/icu/impl/Norm2AllModes.java
+++ b/src/java.base/share/classes/jdk/internal/icu/impl/Norm2AllModes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/UBiDiProps.java b/src/java.base/share/classes/jdk/internal/icu/impl/UBiDiProps.java
index e7e1e65c2a0..b83bc8e941f 100644
--- a/src/java.base/share/classes/jdk/internal/icu/impl/UBiDiProps.java
+++ b/src/java.base/share/classes/jdk/internal/icu/impl/UBiDiProps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/UCharacterProperty.java b/src/java.base/share/classes/jdk/internal/icu/impl/UCharacterProperty.java
index 073ffe933df..a8efbcafa12 100644
--- a/src/java.base/share/classes/jdk/internal/icu/impl/UCharacterProperty.java
+++ b/src/java.base/share/classes/jdk/internal/icu/impl/UCharacterProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java b/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
index 6807928b2c2..10aa0397f0c 100644
--- a/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
+++ b/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -220,14 +220,6 @@ public class BasicImageReader implements AutoCloseable {
         return slice(buffer, offset, size).order(byteOrder).asIntBuffer();
     }
 
-    public static void releaseByteBuffer(ByteBuffer buffer) {
-        Objects.requireNonNull(buffer);
-
-        if (!MAP_ALL) {
-            ImageBufferCache.releaseBuffer(buffer);
-        }
-    }
-
     public String getName() {
         return name;
     }
@@ -362,13 +354,15 @@ public class BasicImageReader implements AutoCloseable {
         if (offset < 0 || Integer.MAX_VALUE <= offset) {
             throw new IndexOutOfBoundsException("Bad offset: " + offset);
         }
+        int checkedOffset = (int) offset;
 
         if (size < 0 || Integer.MAX_VALUE <= size) {
-            throw new IndexOutOfBoundsException("Bad size: " + size);
+            throw new IllegalArgumentException("Bad size: " + size);
         }
+        int checkedSize = (int) size;
 
         if (MAP_ALL) {
-            ByteBuffer buffer = slice(memoryMap, (int)offset, (int)size);
+            ByteBuffer buffer = slice(memoryMap, checkedOffset, checkedSize);
             buffer.order(ByteOrder.BIG_ENDIAN);
 
             return buffer;
@@ -376,21 +370,18 @@ public class BasicImageReader implements AutoCloseable {
             if (channel == null) {
                 throw new InternalError("Image file channel not open");
             }
-
-            ByteBuffer buffer = ImageBufferCache.getBuffer(size);
+            ByteBuffer buffer = ByteBuffer.allocate(checkedSize);
             int read;
             try {
-                read = channel.read(buffer, offset);
+                read = channel.read(buffer, checkedOffset);
                 buffer.rewind();
             } catch (IOException ex) {
-                ImageBufferCache.releaseBuffer(buffer);
                 throw new RuntimeException(ex);
             }
 
-            if (read != size) {
-                ImageBufferCache.releaseBuffer(buffer);
+            if (read != checkedSize) {
                 throw new RuntimeException("Short read: " + read +
-                                           " instead of " + size + " bytes");
+                        " instead of " + checkedSize + " bytes");
             }
 
             return buffer;
@@ -406,17 +397,12 @@ public class BasicImageReader implements AutoCloseable {
 
     public byte[] getResource(ImageLocation loc) {
         ByteBuffer buffer = getResourceBuffer(loc);
-
-        if (buffer != null) {
-            byte[] bytes = getBufferBytes(buffer);
-            ImageBufferCache.releaseBuffer(buffer);
-
-            return bytes;
-        }
-
-        return null;
+        return buffer != null ? getBufferBytes(buffer) : null;
     }
 
+    /**
+     * Returns the content of jimage location in a newly allocated byte buffer.
+     */
     public ByteBuffer getResourceBuffer(ImageLocation loc) {
         Objects.requireNonNull(loc);
         long offset = loc.getContentOffset() + indexSize;
@@ -437,10 +423,8 @@ public class BasicImageReader implements AutoCloseable {
             return readBuffer(offset, uncompressedSize);
         } else {
             ByteBuffer buffer = readBuffer(offset, compressedSize);
-
             if (buffer != null) {
                 byte[] bytesIn = getBufferBytes(buffer);
-                ImageBufferCache.releaseBuffer(buffer);
                 byte[] bytesOut;
 
                 try {
diff --git a/src/java.base/share/classes/jdk/internal/jimage/ImageBufferCache.java b/src/java.base/share/classes/jdk/internal/jimage/ImageBufferCache.java
deleted file mode 100644
index c2cc4a028be..00000000000
--- a/src/java.base/share/classes/jdk/internal/jimage/ImageBufferCache.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.internal.jimage;
-
-import java.lang.ref.WeakReference;
-import java.nio.ByteBuffer;
-import java.util.AbstractMap;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Map;
-
-/**
- * @implNote This class needs to maintain JDK 8 source compatibility.
- *
- * It is used internally in the JDK to implement jimage/jrtfs access,
- * but also compiled and delivered as part of the jrt-fs.jar to support access
- * to the jimage file provided by the shipped JDK by tools running on JDK 8.
- */
-class ImageBufferCache {
-    private static final int MAX_CACHED_BUFFERS = 3;
-    private static final int LARGE_BUFFER = 0x10000;
-
-    /*
-     * We used to have a class BufferReference extending from WeakReference<ByteBuffer>.
-     * BufferReference class had an  instance field called "capacity". This field was
-     * used to make DECREASING_CAPACITY_NULLS_LAST comparator stable in the presence
-     * of GC clearing the WeakReference concurrently.
-     *
-     * But this scheme results in metaspace leak. The thread local is alive till the
-     * the thread is alive. And so ImageBufferCache$BufferReference class was kept alive.
-     * Because this class and ImageBufferCache$BufferReference are all loaded by a URL
-     * class loader from jrt-fs.jar, the class loader and so all the classes loaded by it
-     * were alive!
-     *
-     * Solution is to avoid using a URL loader loaded class type with thread local. All we
-     * need is a pair of WeakReference<ByteBuffer>, Integer (saved capacity for stability
-     * of comparator). We use Map.Entry as pair implementation. With this, all types used
-     * with thread local are bootstrap types and so no metaspace leak.
-     */
-    @SuppressWarnings("unchecked")
-    private static final ThreadLocal<Map.Entry<WeakReference<ByteBuffer>, Integer>[]> CACHE =
-        new ThreadLocal<Map.Entry<WeakReference<ByteBuffer>, Integer>[]>() {
-            @Override
-            protected Map.Entry<WeakReference<ByteBuffer>, Integer>[] initialValue() {
-                // 1 extra slot to simplify logic of releaseBuffer()
-                return (Map.Entry<WeakReference<ByteBuffer>, Integer>[])new Map.Entry<?,?>[MAX_CACHED_BUFFERS + 1];
-            }
-        };
-
-    private static ByteBuffer allocateBuffer(long size) {
-        return ByteBuffer.allocateDirect((int)((size + 0xFFF) & ~0xFFF));
-    }
-
-    static ByteBuffer getBuffer(long size) {
-        if (size < 0 || Integer.MAX_VALUE < size) {
-            throw new IndexOutOfBoundsException("size");
-        }
-
-        ByteBuffer result = null;
-
-        if (size > LARGE_BUFFER) {
-            result = allocateBuffer(size);
-        } else {
-            Map.Entry<WeakReference<ByteBuffer>, Integer>[] cache = CACHE.get();
-
-            // buffers are ordered by decreasing capacity
-            // cache[MAX_CACHED_BUFFERS] is always null
-            for (int i = MAX_CACHED_BUFFERS - 1; i >= 0; i--) {
-                Map.Entry<WeakReference<ByteBuffer>, Integer> reference = cache[i];
-
-                if (reference != null) {
-                    ByteBuffer buffer = getByteBuffer(reference);
-
-                    if (buffer != null && size <= buffer.capacity()) {
-                        cache[i] = null;
-                        result = buffer;
-                        result.rewind();
-                        break;
-                    }
-                }
-            }
-
-            if (result == null) {
-                result = allocateBuffer(size);
-            }
-        }
-
-        result.limit((int)size);
-
-        return result;
-    }
-
-    static void releaseBuffer(ByteBuffer buffer) {
-        if (buffer.capacity() > LARGE_BUFFER) {
-            return;
-        }
-
-        Map.Entry<WeakReference<ByteBuffer>, Integer>[] cache = CACHE.get();
-
-        // expunge cleared BufferRef(s)
-        for (int i = 0; i < MAX_CACHED_BUFFERS; i++) {
-            Map.Entry<WeakReference<ByteBuffer>, Integer> reference = cache[i];
-            if (reference != null && getByteBuffer(reference) == null) {
-                cache[i] = null;
-            }
-        }
-
-        // insert buffer back with new BufferRef wrapping it
-        cache[MAX_CACHED_BUFFERS] = newCacheEntry(buffer);
-        Arrays.sort(cache, DECREASING_CAPACITY_NULLS_LAST);
-        // squeeze the smallest one out
-        cache[MAX_CACHED_BUFFERS] = null;
-    }
-
-    private static Map.Entry<WeakReference<ByteBuffer>, Integer> newCacheEntry(ByteBuffer bb) {
-        return new AbstractMap.SimpleEntry<WeakReference<ByteBuffer>, Integer>(
-                    new WeakReference<ByteBuffer>(bb), bb.capacity());
-    }
-
-    private static int getCapacity(Map.Entry<WeakReference<ByteBuffer>, Integer> e) {
-        return e == null? 0 : e.getValue();
-    }
-
-    private static ByteBuffer getByteBuffer(Map.Entry<WeakReference<ByteBuffer>, Integer> e) {
-        return e == null? null : e.getKey().get();
-    }
-
-    private static Comparator<Map.Entry<WeakReference<ByteBuffer>, Integer>> DECREASING_CAPACITY_NULLS_LAST =
-        new Comparator<Map.Entry<WeakReference<ByteBuffer>, Integer>>() {
-            @Override
-            public int compare(Map.Entry<WeakReference<ByteBuffer>, Integer> br1,
-                        Map.Entry<WeakReference<ByteBuffer>, Integer> br2) {
-                return Integer.compare(getCapacity(br1), getCapacity(br2));
-            }
-        };
-}
diff --git a/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java b/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java
index e062e1629ff..c36e265ee2f 100644
--- a/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java
+++ b/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -190,20 +190,7 @@ public final class ImageReader implements AutoCloseable {
     }
 
     /**
-     * Releases a (possibly cached) {@link ByteBuffer} obtained via
-     * {@link #getResourceBuffer(Node)}.
-     *
-     * <p>Note that no testing is performed to check whether the buffer about
-     * to be released actually came from a call to {@code getResourceBuffer()}.
-     */
-    public static void releaseByteBuffer(ByteBuffer buffer) {
-        BasicImageReader.releaseByteBuffer(buffer);
-    }
-
-    /**
-     * Returns the content of a resource node in a possibly cached byte buffer.
-     * Callers of this method must call {@link #releaseByteBuffer(ByteBuffer)}
-     * when they are finished with it.
+     * Returns the content of a resource node in a newly allocated byte buffer.
      */
     public ByteBuffer getResourceBuffer(Node node) {
         requireOpen();
diff --git a/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystem.java b/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystem.java
index 6530bd1f90a..c405801506f 100644
--- a/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystem.java
+++ b/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/jdk/internal/loader/ArchivedClassLoaders.java b/src/java.base/share/classes/jdk/internal/loader/ArchivedClassLoaders.java
index be3425590fc..439772a8789 100644
--- a/src/java.base/share/classes/jdk/internal/loader/ArchivedClassLoaders.java
+++ b/src/java.base/share/classes/jdk/internal/loader/ArchivedClassLoaders.java
@@ -27,11 +27,13 @@ package jdk.internal.loader;
 import java.util.Map;
 import jdk.internal.misc.CDS;
 import jdk.internal.module.ServicesCatalog;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
 
 /**
  * Used to archive the built-in class loaders, their services catalogs, and the
  * package-to-module map used by the built-in class loaders.
  */
+@AOTSafeClassInitializer
 class ArchivedClassLoaders {
     private static ArchivedClassLoaders archivedClassLoaders;
 
diff --git a/src/java.base/share/classes/jdk/internal/math/FDBigInteger.java b/src/java.base/share/classes/jdk/internal/math/FDBigInteger.java
index 1ef9dee3a8a..5413226c112 100644
--- a/src/java.base/share/classes/jdk/internal/math/FDBigInteger.java
+++ b/src/java.base/share/classes/jdk/internal/math/FDBigInteger.java
@@ -26,6 +26,7 @@
 package jdk.internal.math;
 
 import jdk.internal.misc.CDS;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
 import jdk.internal.vm.annotation.Stable;
 
 import java.util.Arrays;
@@ -33,6 +34,7 @@ import java.util.Arrays;
 /**
  * A simple big integer class specifically for floating point base conversion.
  */
+@AOTSafeClassInitializer
 final class FDBigInteger {
 
     @Stable
@@ -53,6 +55,7 @@ final class FDBigInteger {
 
     // Initialize FDBigInteger cache of powers of 5.
     static {
+        // Legacy CDS archive support (to be deprecated)
         CDS.initializeFromArchive(FDBigInteger.class);
         Object[] caches = archivedCaches;
         if (caches == null) {
diff --git a/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template b/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template
index 158df7c8bb3..b594aca7a05 100644
--- a/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template
+++ b/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/jdk/internal/module/ArchivedBootLayer.java b/src/java.base/share/classes/jdk/internal/module/ArchivedBootLayer.java
index 5c806f81dcd..425238dd521 100644
--- a/src/java.base/share/classes/jdk/internal/module/ArchivedBootLayer.java
+++ b/src/java.base/share/classes/jdk/internal/module/ArchivedBootLayer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,12 @@
 package jdk.internal.module;
 
 import jdk.internal.misc.CDS;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
 
 /**
  * Used by ModuleBootstrap for archiving the boot layer.
  */
+@AOTSafeClassInitializer
 class ArchivedBootLayer {
     private static ArchivedBootLayer archivedBootLayer;
 
diff --git a/src/java.base/share/classes/jdk/internal/module/ArchivedModuleGraph.java b/src/java.base/share/classes/jdk/internal/module/ArchivedModuleGraph.java
index 4f9223d0171..deb280c878d 100644
--- a/src/java.base/share/classes/jdk/internal/module/ArchivedModuleGraph.java
+++ b/src/java.base/share/classes/jdk/internal/module/ArchivedModuleGraph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,11 +30,13 @@ import java.util.function.Function;
 import java.lang.module.Configuration;
 import java.lang.module.ModuleFinder;
 import jdk.internal.misc.CDS;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
 
 /**
  * Used by ModuleBootstrap for archiving the configuration for the boot layer,
  * and the system module finder.
  */
+@AOTSafeClassInitializer
 class ArchivedModuleGraph {
     private static ArchivedModuleGraph archivedModuleGraph;
 
@@ -126,6 +128,7 @@ class ArchivedModuleGraph {
     }
 
     static {
+        // Legacy CDS archive support (to be deprecated)
         CDS.initializeFromArchive(ArchivedModuleGraph.class);
     }
 }
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java b/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java
index ed97937e39a..4111055d634 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java b/src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java
index 370c151af84..afebb89168c 100644
--- a/src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java
+++ b/src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -467,12 +467,6 @@ public final class SystemModuleFinders {
                     .map(reader::getResourceBuffer);
         }
 
-        @Override
-        public void release(ByteBuffer bb) {
-            Objects.requireNonNull(bb);
-            ImageReader.releaseByteBuffer(bb);
-        }
-
         @Override
         public Stream<String> list() throws IOException {
             if (closed)
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
index 79b5968b210..e80869b868c 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
@@ -30,8 +30,8 @@ java.launcher.opt.vmselect   =\    {0}\t  zur Auswahl der "{1}" VM\n
 java.launcher.opt.hotspot    =\    {0}\t  ist ein Synonym für die "{1}" VM  [verworfen]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    -classpath <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    --class-path <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n                  Eine durch "{0}" getrennte Liste mit Verzeichnissen, JAR-Archiven\n                  und ZIP-Archiven, in denen nach Klassendateien gesucht wird.\n    -p <Modulpfad>\n    --module-path <Modulpfad>...\n                  Eine durch "{0}" getrennte Liste mit Elementen, von denen jedes Element ein Dateipfad ist\n                  zu einem Modul oder einem Verzeichnis mit Modulen ist. Jedes Modul ist entweder\n                  ein modulares JAR oder ein entpacktes Modulverzeichnis.\n    --upgrade-module-path <Modulpfad>...\n                  Eine durch "{0}" getrennte Liste mit Elementen, von denen jedes Element ein Dateipfad ist\n                  zu einem Modul oder einem Verzeichnis mit Modulen ist,\n                  um upgradefähige Module im Laufzeitimage zu ersetzen. Jedes Modul ist entweder\n                  ein modulares JAR oder ein entpacktes Modulverzeichnis.\n    --add-modules <Modulname>[,<Modulname>...]\n                  Root-Module, die zusätzlich zum anfänglichen Modul aufgelöst werden sollen.\n                  <Modulname> kann auch wie folgt lauten: ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <Modulname>[,<Modulname>...]\n                  Damit kann der Code in Modulen auf Code und Daten außerhalb der JRE zugreifen.\n                  <Modulname> kann auch ALL-UNNAMED sein, um den Code im Classpath anzugeben.\n    --illegal-native-access=<Wert>\n                  Zugriff auf Code und Daten außerhalb der JRE\n                  durch Code in Modulen zulassen oder verweigern, für die der native Zugriff nicht explizit aktiviert ist.\n                  <Wert> ist "deny", "warn" oder "allow". Der Standardwert ist "warn".\n                  Diese Option wird in einem zukünftigen Release entfernt.\n    --list-modules\n                  Listet beobachtbare Module auf und beendet den Vorgang\n    -d <Modulname>\n    --describe-module <Modulname>\n                  Beschreibt ein Modul und beendet den Vorgang\n    --dry-run     Erstellt eine VM und lädt die Hauptklasse, führt aber nicht die Hauptmethode aus.\n                  Die Option "--dry-run" kann nützlich sein, um die\n                  Befehlszeilenoptionen, wie die Modulsystemkonfiguration, zu validieren.\n    --validate-modules\n                  Validiert alle Module und beendet den Vorgang\n                  Die Option "--validate-modules" kann nützlich sein, um\n                  Konflikte und andere Fehler mit Modulen auf dem Modulpfad zu ermitteln.\n    -D<Name>=<Wert>\n                  Legt eine Systemeigenschaft fest\n    -verbose:[class|module|gc|jni]\n                  Aktiviert die Verbose-Ausgabe für das angegebene Subsystem\n    -version      Gibt die Produktversion an den Fehlerstream aus und beendet den Vorgang\n    --version      Gibt die Produktversion an den Outputstream aus und beendet den Vorgang\n    -showversion  Gibt die Produktversion an den Fehlerstream aus und setzt den Vorgang fort\n    --show-version\n                  Gibt die Produktversion an den Outputstream aus und setzt den Vorgang fort\n    --show-module-resolution\n                  Zeigt die Modulauflösungsausgabe beim Start an\n    -? -h -help\n                  Gibt diese Hilfemeldung an den Fehlerstream aus\n    --help        Gibt diese Hilfemeldung an den Outputstream aus\n    -X            Gibt Hilfe zu zusätzlichen Optionen an den Fehlerstream aus\n    --help-extra  Gibt Hilfe zu zusätzlichen Optionen an den Outputstream aus\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  Aktiviert Assertions mit angegebener \
-Granularität\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  Deaktiviert Assertions mit angegebener Granularität\n    -esa | -enablesystemassertions\n                  Aktiviert System-Assertions\n    -dsa | -disablesystemassertions\n                  Deaktiviert System-Assertions\n    -agentlib:<libname>[=<options>]\n                  Lädt die native Agent Library <libname>. Beispiel: -agentlib:jdwp\n                  siehe auch -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  Lädt die native Agent Library mit dem vollständigen Pfadnamen\n    -javaagent:<jarpath>[=<options>]\n                  Lädt den Java-Programmiersprachen-Agent, siehe java.lang.instrument\n    -splash:<imagepath>\n                  Zeigt den Startbildschirm mit einem angegebenen Bild an\n                  Skalierte HiDPI-Bilder werden automatisch unterstützt und verwendet,\n                  falls verfügbar. Der nicht skalierte Bilddateiname (Beispiel: image.ext)\n                  muss immer als Argument an die Option "-splash" übergeben werden.\n                  Das am besten geeignete angegebene skalierte Bild wird\n                  automatisch ausgewählt.\n                  Weitere Informationen finden Sie in der Dokumentation zur SplashScreen-API\n    @argument files\n                  Eine oder mehrere Argumentdateien mit Optionen\n    --disable-@files\n                  Verhindert die weitere Erweiterung von Argumentdateien\n    --enable-preview\n                  Lässt zu, das Klassen von Vorschaufeatures dieses Release abhängig sind\nUm ein Argument für eine lange Option anzugeben, können Sie --<Name>=<Wert> oder\n--<Name> <Wert> verwenden.\n
+java.launcher.opt.footer = \    -cp <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    -classpath <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    --class-path <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n                  Eine durch "{0}" getrennte Liste mit Verzeichnissen, JAR-Archiven\n                  und ZIP-Archiven, in denen nach Klassendateien gesucht wird.\n    -p <Modulpfad>\n    --module-path <Modulpfad>...\n                  Eine durch "{0}" getrennte Liste mit Elementen, von denen jedes Element ein Dateipfad ist\n                  zu einem Modul oder einem Verzeichnis mit Modulen ist. Jedes Modul ist entweder\n                  ein modulares JAR oder ein entpacktes Modulverzeichnis.\n    --upgrade-module-path <Modulpfad>...\n                  Eine durch "{0}" getrennte Liste mit Elementen, von denen jedes Element ein Dateipfad ist\n                  zu einem Modul oder einem Verzeichnis mit Modulen ist,\n                  um upgradefähige Module im Laufzeitimage zu ersetzen. Jedes Modul ist entweder\n                  ein modulares JAR oder ein entpacktes Modulverzeichnis.\n    --add-modules <Modulname>[,<Modulname>...]\n                  Root-Module, die zusätzlich zum anfänglichen Modul aufgelöst werden sollen.\n                  <Modulname> kann auch wie folgt lauten: ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <Modulname>[,<Modulname>...]\n                  Damit kann der Code in Modulen auf Code und Daten außerhalb der JRE zugreifen.\n                  <Modulname> kann auch ALL-UNNAMED sein, um den Code im Classpath anzugeben.\n    --illegal-native-access=<Wert>\n                  Zugriff auf Code und Daten außerhalb der JRE\n                  durch Code in Modulen zulassen oder verweigern, für die der native Zugriff nicht explizit aktiviert ist.\n                  <Wert> ist "deny", "warn" oder "allow". Der Standardwert ist "warn".\n                  Diese Option wird in einem zukünftigen Release entfernt.\n    --enable-final-field-mutation <Modulname>[,<Modulname>...]\n                  Zulassen, dass die endgültigen Instanzfelder durch Code in den angegebenen Modulen mutiert werden.\n                  <Modulname> kann auch ALL-UNNAMED sein, um den Code im Classpath anzugeben.\n    --illegal-final-field-mutation=<Wert>\n                  Erlauben oder verweigern Sie die Mutation von endgültigen Feldern durch Code in Modulen, für die die Mutation\n                  von endgültigen Feldern nicht explizit aktiviert ist.\n                  <Wert> ist "deny", "warn", "debug" oder "allow". Der Standardwert ist "warn".\n                  Diese Option wird in einem zukünftigen Release entfernt.\n    --list-modules\n                  Listet beobachtbare Module auf und beendet den Vorgang\n    -d <Modulname>\n    --describe-module <Modulname>\n                  Beschreibt ein Modul und beendet den Vorgang\n    --dry-run     Erstellt eine VM und lädt die Hauptklasse, führt aber nicht die Hauptmethode aus.\n                  Die Option "--dry-run" kann nützlich sein, um die\n                  Befehlszeilenoptionen, wie die Modulsystemkonfiguration, zu validieren.\n    --validate-modules\n                  Validiert alle Module und beendet den Vorgang\n                  Die Option "--validate-modules" kann nützlich sein, um\n                  Konflikte und andere Fehler mit Modulen auf dem Modulpfad zu ermitteln.\n    -D<Name>=<Wert>\n                  Legt eine Systemeigenschaft fest\n    -verbose:[class|module|gc|jni]\n                  Aktiviert die Verbose-Ausgabe für das angegebene Subsystem\n    -version      Gibt die Produktversion an den Fehlerstream aus und beendet den Vorgang\n    --version      Gibt die Produktversion an den Outputstream aus und beendet den Vorgang\n    -showversion  Gibt die Produktversion an den Fehlerstream aus und \
+setzt den Vorgang fort\n    --show-version\n                  Gibt die Produktversion an den Outputstream aus und setzt den Vorgang fort\n    --show-module-resolution\n                  Zeigt die Modulauflösungsausgabe beim Start an\n    -? -h -help\n                  Gibt diese Hilfemeldung an den Fehlerstream aus\n    --help        Gibt diese Hilfemeldung an den Outputstream aus\n    -X            Gibt Hilfe zu zusätzlichen Optionen an den Fehlerstream aus\n    --help-extra  Gibt Hilfe zu zusätzlichen Optionen an den Outputstream aus\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  Aktiviert Assertions mit angegebener Granularität\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  Deaktiviert Assertions mit angegebener Granularität\n    -esa | -enablesystemassertions\n                  Aktiviert System-Assertions\n    -dsa | -disablesystemassertions\n                  Deaktiviert System-Assertions\n    -agentlib:<libname>[=<options>]\n                  Lädt die native Agent Library <libname>. Beispiel: -agentlib:jdwp\n                  siehe auch -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  Lädt die native Agent Library mit dem vollständigen Pfadnamen\n    -javaagent:<jarpath>[=<options>]\n                  Lädt den Java-Programmiersprachen-Agent, siehe java.lang.instrument\n    -splash:<imagepath>\n                  Zeigt den Startbildschirm mit einem angegebenen Bild an\n                  Skalierte HiDPI-Bilder werden automatisch unterstützt und verwendet,\n                  falls verfügbar. Der nicht skalierte Bilddateiname (Beispiel: image.ext)\n                  muss immer als Argument an die Option "-splash" übergeben werden.\n                  Das am besten geeignete angegebene skalierte Bild wird\n                  automatisch ausgewählt.\n                  Weitere Informationen finden Sie in der Dokumentation zur SplashScreen-API\n    @argument files\n                  Eine oder mehrere Argumentdateien mit Optionen\n    --disable-@files\n                  Verhindert die weitere Erweiterung von Argumentdateien\n    --enable-preview\n                  Lässt zu, das Klassen von Vorschaufeatures dieses Release abhängig sind\nUm ein Argument für eine lange Option anzugeben, können Sie --<Name>=<Wert> oder\n--<Name> <Wert> verwenden.\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.usage=\n    -Xbatch           Deaktiviert die Hintergrundkompilierung\n    -Xbootclasspath/a:<durch {0} getrennte Verzeichnisse und ZIP-/JAR-Dateien>\n                      An das Ende des Bootstrap Classpaths anhängen\n    -Xcheck:jni       Führt zusätzliche Prüfungen für JNI-Funktionen aus\n    -Xcomp            Erzwingt die Kompilierung von Methoden beim ersten Aufruf\n    -Xdebug           Führt keine Aktion aus. Ist veraltet und wird in einem zukünftigen Release entfernt.\n    -Xdiag            Zeigt zusätzliche Diagnosemeldungen an\n    -Xint             Nur Ausführung im interpretierten Modus\n    -Xinternalversion\n                      Zeigt detailliertere JVM-Versionsinformationen an als die\n                      Option -version\n    -Xlog:<Optionen>      Konfiguriert oder aktiviert Logging mit dem einheitlichen Java Virtual\n                      Machine-(JVM-)Logging-Framework. Verwenden Sie -Xlog:help\n                      für weitere Einzelheiten.\n    -Xloggc:<Datei>    Protokolliert den GC-Status in einer Datei mit Zeitstempeln.\n                      Diese Option ist veraltet und kann in einem\n                      zukünftigen Release entfernt werden. Wird durch -Xlog:gc:<Datei> ersetzt.\n    -Xmixed           Ausführung im gemischten Modus (Standard)\n    -Xmn<Größe>        Legt die anfängliche und maximale Größe (in Byte) des Heaps\n                      für die Young Generation (Nursery) fest\n    -Xms<size>        Legt die minimale und die anfängliche Java-Heap-Größe fest\n    -Xmx<Größe>        Legt die maximale Java-Heap-Größe fest\n    -Xnoclassgc       Deaktiviert die Klassen-Garbage Collection\n    -Xrs               Reduziert die Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n    -Xshare:auto      Verwendet freigegebene Klassendaten, wenn möglich (Standard)\n    -Xshare:off       Versucht nicht, freigegebene Klassendaten zu verwenden\n    -Xshare:on        Erfordert die Verwendung freigegebener Klassendaten, verläuft sonst nicht erfolgreich.\n                      Diese Testoption kann zeitweise zu\n                      Fehlern führen. Sie darf nicht in Produktionsumgebungen verwendet werden.\n    -XshowSettings    Zeigt alle Einstellungen an und fährt fort\n    -XshowSettings:all\n                      Zeigt alle Einstellungen als Verbose-Ausgabe an und fährt fort\n    -XshowSettings:locale\n                      Zeigt alle gebietsschemabezogenen Einstellungen an und fährt fort\n    -XshowSettings:properties\n                      Zeigt alle Eigenschaftseinstellungen an und fährt fort\n    -XshowSettings:vm\n                      Zeigt alle VM-bezogenen Einstellungen an und fährt fort\n    -XshowSettings:security\n                      Zeigt alle Sicherheitseinstellungen an und fährt fort\n    -XshowSettings:security:all\n                      Zeigt alle Sicherheitseinstellungen an und fährt fort\n    -XshowSettings:security:properties\n                      Zeigt Sicherheitseigenschaften an und fährt fort\n    -XshowSettings:security:providers\n                      Zeigt statische Sicherheitsprovidereinstellungen an und fährt fort\n    -XshowSettings:security:tls\n                      Zeigt TLS-bezogene Sicherheitseinstellungen an und fährt fort\n    -XshowSettings:system\n                      (Nur Linux) Zeigt die Konfiguration des Hostsystems oder Containers an\n                      und fährt fort\n    -Xss<Größe>        Legt die Stackgröße des Java-Threads fest\n                      Die tatsächliche Größe kann auf ein Vielfaches der\n                      Systemseitengröße aufgerundet werden, wenn für das Betriebssystem erforderlich.\n    -Xverify          Legt den Modus der Bytecodeverifizierung fest\n            \
@@ -58,6 +58,7 @@ java.launcher.jar.error3=kein Hauptmanifestattribut, in {0}
 java.launcher.jar.error4=Fehler beim Laden des Java-Agents in {0}
 java.launcher.jar.error5=Fehler: Beim Versuch, Datei {0} zu schließen, ist ein unerwarteter Fehler aufgetreten
 java.launcher.jar.error.illegal.ena.value=Fehler: Ungültiger Wert "{0}" für das Manifestattribut "Enable-Native-Access". Nur ''ALL-UNNAMED'' ist zulässig
+java.launcher.jar.error.illegal.effm.value=Fehler: Ungültiger Wert "{0}" für das Manifestattribut "Enable-Final-Field-Mutation". Nur "ALL-UNNAMED" ist zulässig
 java.launcher.init.error=Initialisierungsfehler
 java.launcher.javafx.error1=Fehler: Die JavaFX-Methode launchApplication hat die falsche Signatur, sie\nmuss als statisch deklariert werden und einen Wert vom Typ VOID zurückgeben
 java.launcher.module.error1=Modul {0} weist kein ModuleMainClass-Attribut auf. Verwenden Sie -m <module>/<main-class>
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
index 04b68db3a8e..49712b21c52 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
@@ -31,8 +31,9 @@ java.launcher.opt.hotspot    =\    {0}\t  は"{1}" VMのシノニムです  [非
 
 # Translators please note do not translate the options themselves
 java.launcher.opt.footer = \    -cp <ディレクトリおよびzip/jarファイルのクラス検索パス>\n    -classpath <ディレクトリおよびzip/jarファイルのクラス検索パス>\n    --class-path <ディレクトリおよびzip/jarファイルのクラス検索パス>\n                  "{0}"区切りリスト(ディレクトリ、JARアーカイブ、\n                  ZIPアーカイブ)で、クラス・ファイルの検索用。\n    -p <module path>\n    --module-path <module path>...\n                  要素を"{0}"で区切ったリストで、各要素は次へのファイル・パスです:\n                  モジュール、またはモジュールが格納されているディレクトリ。各モジュールは次のいずれかです:\n                  モジュラJARまたは展開形式のモジュール・ディレクトリ。\n    --upgrade-module-path <module path>...\n                  要素を"{0}"で区切ったリストで、各要素は次へのファイル・パスです:\n                  モジュール、またはモジュールが格納されているディレクトリで、次のものを置き換えます:\n                  ランタイム・イメージのアップグレード可能なモジュール。各モジュールは次のいずれかです:\n                  モジュラJARまたは展開形式のモジュール・ディレクトリ。\n    --add-modules <module name>[,<module name>...]\n                  初期モジュールに加えて解決するルート・モジュール。\n                  <module name>には次も指定できます: ALL-DEFAULT、ALL-SYSTEM、\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  モジュール内のコードをJavaランタイムの外のコードおよびデータにアクセスさせることができます。\n                  <module name>は、クラス・パス上のコードを指定するためにALL-UNNAMEDにもできます。\n    --illegal-native-access=<value>\n                  Javaランタイムの外のコードおよびデータへのアクセスを許可または拒否します\n                  (ネイティブ・アクセスが明示的に有効化されていないモジュール内のコードによる)。\n                  \
-<value>は、"deny"、"warn"または"allow"のいずれかです。デフォルト値は"warn"です。\n                  このオプションは、将来のリリースで削除される予定です。\n    --list-modules\n                  参照可能なモジュールをリストし終了します\n    -d <module name>\n    --describe-module <module name>\n                  モジュールを説明し終了します\n    --dry-run     VMを作成しメイン・クラスをロードしますが、メイン・メソッドは実行しません。\n                  --dry-runオプションは、次の検証に役立つ場合があります:\n                  モジュール・システム構成などのコマンド行オプション。\n    --validate-modules\n                  すべてのモジュールを検証し終了します\n                  --validate-modulesオプションは、次の検索に役立つ場合があります:\n                  モジュール・パス上のモジュールでの競合およびその他のエラー。\n    -D<name>=<value>\n                  システム・プロパティを設定します\n    -verbose:[class|module|gc|jni]\n                  特定のサブシステムで詳細出力を有効にする\n    -version      製品バージョンをエラー・ストリームに出力して終了します\n    --version     製品バージョンを出力ストリームに出力して終了します\n    -showversion  製品バージョンをエラー・ストリームに出力して続行します\n    --show-version\n                  製品バージョンを出力ストリームに出力して続行します\n    --show-module-resolution\n                  起動時にモジュール解決出力を表示します\n    -? -h -help\n                  このヘルプ・メッセージをエラー・ストリームに出力します\n    --help        このヘルプ・メッセージを出力ストリームに出力します\n    -X            追加オプションのヘルプをエラー・ストリームに出力します\n    --help-extra  追加オプションのヘルプを出力ストリームに出力します\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  指定した粒度でアサーションを有効にします\n    -da[:<packagename>...|:<classname>]\n    \
--disableassertions[:<packagename>...|:<classname>]\n                  指定した粒度でアサーションを無効にします\n    -esa | -enablesystemassertions\n                  システム・アサーションを有効にします\n    -dsa | -disablesystemassertions\n                  システム・アサーションを無効にします\n    -agentlib:<libname>[=<options>]\n                  ネイティブ・エージェント・ライブラリ<libname>をロードします。例: -agentlib:jdwp\n                  -agentlib:jdwp=helpも参照してください\n    -agentpath:<pathname>[=<options>]\n                  フルパス名を使用して、ネイティブ・エージェント・ライブラリをロードします\n    -javaagent:<jarpath>[=<options>]\n                  Javaプログラミング言語エージェントをロードします。java.lang.instrumentを参照してください\n    -splash:<imagepath>\n                  指定されたイメージを含むスプラッシュ画面を表示します\n                  HiDPIスケールのイメージが自動的にサポートされて使用されます\n                  (可能な場合)。スケーリングされないイメージのファイル名(image.extなど)を\n                  引数として-splashオプションに必ず渡す必要があります。\n                  指定された最も適切なスケーリング済イメージが選択されます\n                  (自動的)。\n                  詳細は、SplashScreen APIのドキュメントを参照してください\n    @argumentファイル\n                  オプションを含む1つ以上の引数ファイル\n    --disable-@files\n                  さらなる引数ファイル拡張を無効にします\n    --enable-preview\n                  クラスをこのリリースのプレビュー機能に依存させることができます\n長いオプションの引数を指定する場合、--<name>=<value>または\n--<name> <value>を使用できます。\n
+<value>は、"deny"、"warn"または"allow"のいずれかです。デフォルト値は"warn"です。\n                  このオプションは、将来のリリースで削除される予定です。\n    --enable-final-field-mutation <module name>[,<module name>...]\n                  指定されたモジュールのコードで、finalインスタンス・フィールドを変更できます。\n                  <module name>は、クラス・パス上のコードを指定するためにALL-UNNAMEDにもできます。\n    --illegal-final-field-mutation=<value>\n                  finalのモジュール内のコードによるfinalフィールド変更を許可または拒否します\n                  フィールド変更は明示的に有効化されていません。\n                  <value>は、"deny"、"warn"、"debug"または"allow"のいずれかです。デフォルト値は"warn"です。\n                  このオプションは、将来のリリースで削除される予定です。\n    --list-modules\n                  参照可能なモジュールをリストし終了します\n    -d <module name>\n    --describe-module <module name>\n                  モジュールを説明し終了します\n    --dry-run     VMを作成しメイン・クラスをロードしますが、メイン・メソッドは実行しません。\n                  --dry-runオプションは、次の検証に役立つ場合があります:\n                  モジュール・システム構成などのコマンド行オプション。\n    --validate-modules\n                  すべてのモジュールを検証し終了します\n                  --validate-modulesオプションは、次の検索に役立つ場合があります:\n                  モジュール・パス上のモジュールでの競合およびその他のエラー。\n    -D<name>=<value>\n                  システム・プロパティを設定します\n    -verbose:[class|module|gc|jni]\n                  特定のサブシステムで詳細出力を有効にする\n    -version      製品バージョンをエラー・ストリームに出力して終了します\n    --version     製品バージョンを出力ストリームに出力して終了します\n    -showversion  製品バージョンをエラー・ストリームに出力して続行します\n    --show-version\n             \
+     製品バージョンを出力ストリームに出力して続行します\n    --show-module-resolution\n                  起動時にモジュール解決出力を表示します\n    -? -h -help\n                  このヘルプ・メッセージをエラー・ストリームに出力します\n    --help        このヘルプ・メッセージを出力ストリームに出力します\n    -X            追加オプションのヘルプをエラー・ストリームに出力します\n    --help-extra  追加オプションのヘルプを出力ストリームに出力します\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  指定した粒度でアサーションを有効にします\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  指定した粒度でアサーションを無効にします\n    -esa | -enablesystemassertions\n                  システム・アサーションを有効にします\n    -dsa | -disablesystemassertions\n                  システム・アサーションを無効にします\n    -agentlib:<libname>[=<options>]\n                  ネイティブ・エージェント・ライブラリ<libname>をロードします。例: -agentlib:jdwp\n                  -agentlib:jdwp=helpも参照してください\n    -agentpath:<pathname>[=<options>]\n                  フルパス名を使用して、ネイティブ・エージェント・ライブラリをロードします\n    -javaagent:<jarpath>[=<options>]\n                  Javaプログラミング言語エージェントをロードします。java.lang.instrumentを参照してください\n    -splash:<imagepath>\n                  指定されたイメージを含むスプラッシュ画面を表示します\n                  HiDPIスケールのイメージが自動的にサポートされて使用されます\n                  (可能な場合)。スケーリングされないイメージのファイル名(image.extなど)を\n                  引数として-splashオプションに必ず渡す必要があります。\n                  指定された最も適切なスケーリング済イメージが選択されます\n                  (自動的)。\n                  詳細は、SplashScreen APIのドキュメントを参照してください\n    @argumentファイル\n                  \
+オプションを含む1つ以上の引数ファイル\n    --disable-@files\n                  さらなる引数ファイル拡張を無効にします\n    --enable-preview\n                  クラスをこのリリースのプレビュー機能に依存させることができます\n長いオプションの引数を指定する場合、--<name>=<value>または\n--<name> <value>を使用できます。\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.usage=\n    -Xbatch           バックグラウンド・コンパイルを無効にします\n    -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n                      ブートストラップ・クラス・パスの最後に追加します\n    -Xcheck:jni       JNI関数に対する追加のチェックを実行します\n    -Xcomp            初回呼出し時にメソッドのコンパイルを強制します\n    -Xdebug           何も実行されません。将来のリリースで削除されるため、非推奨になりました。\n    -Xdiag            追加の診断メッセージを表示します\n    -Xint             インタプリタ・モードの実行のみ\n    -Xinternalversion\n                      -versionオプションより詳細なJVMバージョン情報を\n                      表示します\n    -Xlog:<opts>      Java Virtual Machine (JVM)統合ロギング・フレームワークでの\n                      ロギングを構成または有効化します。詳細は、-Xlog:helpを\n                      使用してください。\n    -Xloggc:<file>    タイムスタンプが付いたファイルにGCステータスのログを記録します\n                      このオプションは非推奨であり、将来のリリースで削除される\n                      可能性があります。-Xlog:gc:<file>で置換されています。\n    -Xmixed           混合モードの実行(デフォルト)\n    -Xmn<size>        若い世代(ナーサリ)のヒープの初期サイズおよび最大サイズ\n                      (バイト単位)を設定します\n    -Xms<size>        Javaの最小および初期のヒープ・サイズを設定します\n    -Xmx<size>        Javaの最大ヒープ・サイズを設定します\n    -Xnoclassgc       クラスのガベージ・コレクションを無効にします\n    -Xrs              Java/VMによるOSシグナルの使用を削減します(ドキュメントを参照)\n    -Xshare:auto      可能であれば共有クラス・データを使用します(デフォルト)\n    -Xshare:off       共有クラス・データの使用を試みません\n    -Xshare:on        共有クラス・データの使用を必須にし、できなければ失敗します。\n                      \
@@ -60,6 +61,7 @@ java.launcher.jar.error3={0}にメイン・マニフェスト属性がありま
 java.launcher.jar.error4={0}内のJavaエージェントのロード中にエラーが発生しました
 java.launcher.jar.error5=エラー: ファイル{0}を閉じるときに、予期しないエラーが発生しました
 java.launcher.jar.error.illegal.ena.value=エラー: Enable-Native-Accessマニフェスト属性の値"{0}"が不正です。''ALL-UNNAMED''のみ許可されます
+java.launcher.jar.error.illegal.effm.value=エラー: Enable-Final-Field-Mutationマニフェスト属性の値"{0}"が不正です。''ALL-UNNAMED''のみ許可されます
 java.launcher.init.error=初期化エラー
 java.launcher.javafx.error1=エラー: JavaFX launchApplicationメソッドに誤ったシグネチャがあり、\nstaticを宣言してvoid型の値を返す必要があります
 java.launcher.module.error1=モジュール{0}にModuleMainClass属性がありません。-m <module>/<main-class>を使用してください
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
index ec466bf3019..b3c0268f953 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
@@ -30,8 +30,9 @@ java.launcher.opt.vmselect   =\    {0}\t  选择 "{1}" VM\n
 java.launcher.opt.hotspot    =\    {0}\t  是 "{1}" VM 的同义词 [已过时]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <目录和 zip/jar 文件的类搜索路径>\n    -classpath <目录和 zip/jar 文件的类搜索路径>\n    --class-path <目录和 zip/jar 文件的类搜索路径>\n                  以 "{0}" 分隔的用于搜索类文件的目录、JAR 档案\n                  和 ZIP 档案列表。\n    -p <模块路径>\n    --module-path <模块路径>...\n                  以 "{0}" 分隔的元素列表，每个元素都是\n                  模块或包含模块的目录的文件路径。每个模块都是\n                  模块化 JAR 或展开的模块目录。\n    --upgrade-module-path <模块路径>...\n                  以 "{0}" 分隔的元素列表，每个元素都是\n                  模块或包含模块（用于替换运行时映像中的\n                  可升级模块）的目录的文件路径。每个模块都是\n                  模块化 JAR 或展开的模块目录。\n    --add-modules <模块名称>[,<模块名称>...]\n                  除了初始模块之外要解析的根模块。\n                  <模块名称> 还可以为 ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  允许模块中的代码访问 Java 运行时之外的代码和数据。\n                  <module name> 也可以是 ALL-UNNAMED，以指示类路径上的代码。\n    --illegal-native-access=<value>\n                  允许或拒绝模块中没有明确为其启用本机访问的\n                  代码访问 Java 运行时之外的代码和数据。\n                  <value> 为 "deny"、"warn" 或 "allow" 之一。默认值为 "warn"。\n                  此选项将在未来发行版中删除。\n    --list-modules\n                  列出可观察模块并退出\n    -d <module name>\n    --describe-module <模块名称>\n                  描述模块并退出\n    --dry-run     创建 VM 并加载主类, 但不执行 main 方法。\n                  此 --dry-run 选项对于验证诸如\n                  模块系统配置这样的命令行选项可能非常有用。\n    --validate-modules\n                  验证所有模块并退出\n                  --validate-modules 选项对于查找\n                  模块路径中模块的冲突及其他错误可能非常有用。\n    -D<名称>=<值>\n                  设置系统属性\n    -verbose:[class|module|gc|jni]\n                  为给定子系统启用详细输出\n    -version      将产品版本输出到错误流并退出\n    --version     \
-将产品版本输出到输出流并退出\n    -showversion  将产品版本输出到错误流并继续\n    --show-version\n                  将产品版本输出到输出流并继续\n    --show-module-resolution\n                  在启动过程中显示模块解析输出\n    -? -h -help\n                  将此帮助消息输出到错误流\n    --help        将此帮助消息输出到输出流\n    -X            将额外选项的帮助输出到错误流\n    --help-extra  将额外选项的帮助输出到输出流\n    -ea[:<程序包名称>...|:<类名>]\n    -enableassertions[:<程序包名称>...|:<类名>]\n                  按指定的粒度启用断言\n    -da[:<程序包名称>...|:<类名>]\n    -disableassertions[:<程序包名称>...|:<类名>]\n                  按指定的粒度禁用断言\n    -esa | -enablesystemassertions\n                  启用系统断言\n    -dsa | -disablesystemassertions\n                  禁用系统断言\n    -agentlib:<库名>[=<选项>]\n                  加载本机代理库 <库名>, 例如 -agentlib:jdwp\n                  另请参阅 -agentlib:jdwp=help\n    -agentpath:<路径名>[=<选项>]\n                  按完整路径名加载本机代理库\n    -javaagent:<jar 路径>[=<选项>]\n                  加载 Java 编程语言代理, 请参阅 java.lang.instrument\n    -splash:<图像路径>\n                  使用指定的图像显示启动屏幕\n                  自动支持和使用 HiDPI 缩放图像\n                  (如果可用)。应始终将未缩放的图像文件名 (例如, image.ext)\n                  作为参数传递给 -splash 选项。\n                  将自动选取提供的最合适的缩放\n                  图像。\n                  有关详细信息, 请参阅 SplashScreen API 文档\n    @argument 文件\n                  一个或多个包含选项的参数文件\n    --disable-@files\n                  阻止进一步扩展参数文件\n    --enable-preview\n                  允许类依赖于此发行版的预览功能\n要为长选项指定参数, 可以使用 --<名称>=<值> 或\n--<名称> <值>。\n
+java.launcher.opt.footer = \    -cp <目录和 zip/jar 文件的类搜索路径>\n    -classpath <目录和 zip/jar 文件的类搜索路径>\n    --class-path <目录和 zip/jar 文件的类搜索路径>\n                  以 "{0}" 分隔的用于搜索类文件的目录、JAR 档案\n                  和 ZIP 档案列表。\n    -p <模块路径>\n    --module-path <模块路径>...\n                  以 "{0}" 分隔的元素列表，每个元素都是\n                  模块或包含模块的目录的文件路径。每个模块都是\n                  模块化 JAR 或展开的模块目录。\n    --upgrade-module-path <模块路径>...\n                  以 "{0}" 分隔的元素列表，每个元素都是\n                  模块或包含模块（用于替换运行时映像中的\n                  可升级模块）的目录的文件路径。每个模块都是\n                  模块化 JAR 或展开的模块目录。\n    --add-modules <模块名称>[,<模块名称>...]\n                  除了初始模块之外要解析的根模块。\n                  <模块名称> 还可以为 ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  允许模块中的代码访问 Java 运行时之外的代码和数据。\n                  <module name> 也可以是 ALL-UNNAMED，以指示类路径上的代码。\n    --illegal-native-access=<value>\n                  允许或拒绝模块中没有明确为其启用本机访问的\n                  代码访问 Java 运行时之外的代码和数据。\n                  <value> 为 "deny"、"warn" 或 "allow" 之一。默认值为 "warn"。\n                  此选项将在未来发行版中删除。\n    --enable-final-field-mutation <module name>[,<module name>...]\n                  允许指定模块中的代码变更最终实例字段。\n                  <module name> 也可以是 ALL-UNNAMED，以指示类路径上的代码。\n    --illegal-final-field-mutation=<value>\n                  允许或拒绝模块中的代码在未明确启用最终字段变更时\n                  变更最终字段。\n                  <value> 为 "deny"、"warn"、"debug" 或 "allow" 之一。默认值为 "warn"。\n                  此选项将在未来发行版中删除。\n    --list-modules\n                  列出可观察模块并退出\n    -d <module name>\n    --describe-module <模块名称>\n                  描述模块并退出\n    --dry-run     创建 VM 并加载主类, 但不执行 main 方法。\n                  此 --dry-run \
+选项对于验证诸如\n                  模块系统配置这样的命令行选项可能非常有用。\n    --validate-modules\n                  验证所有模块并退出\n                  --validate-modules 选项对于查找\n                  模块路径中模块的冲突及其他错误可能非常有用。\n    -D<名称>=<值>\n                  设置系统属性\n    -verbose:[class|module|gc|jni]\n                  为给定子系统启用详细输出\n    -version      将产品版本输出到错误流并退出\n    --version     将产品版本输出到输出流并退出\n    -showversion  将产品版本输出到错误流并继续\n    --show-version\n                  将产品版本输出到输出流并继续\n    --show-module-resolution\n                  在启动过程中显示模块解析输出\n    -? -h -help\n                  将此帮助消息输出到错误流\n    --help        将此帮助消息输出到输出流\n    -X            将额外选项的帮助输出到错误流\n    --help-extra  将额外选项的帮助输出到输出流\n    -ea[:<程序包名称>...|:<类名>]\n    -enableassertions[:<程序包名称>...|:<类名>]\n                  按指定的粒度启用断言\n    -da[:<程序包名称>...|:<类名>]\n    -disableassertions[:<程序包名称>...|:<类名>]\n                  按指定的粒度禁用断言\n    -esa | -enablesystemassertions\n                  启用系统断言\n    -dsa | -disablesystemassertions\n                  禁用系统断言\n    -agentlib:<库名>[=<选项>]\n                  加载本机代理库 <库名>, 例如 -agentlib:jdwp\n                  另请参阅 -agentlib:jdwp=help\n    -agentpath:<路径名>[=<选项>]\n                  按完整路径名加载本机代理库\n    -javaagent:<jar 路径>[=<选项>]\n                  加载 Java 编程语言代理, 请参阅 java.lang.instrument\n    -splash:<图像路径>\n                  使用指定的图像显示启动屏幕\n                  自动支持和使用 HiDPI 缩放图像\n                  (如果可用)。应始终将未缩放的图像文件名 (例如, image.ext)\n                  作为参数传递给 -splash 选项。\n                  将自动选取提供的最合适的缩放\n                  图像。\n                  有关详细信息, 请参阅 SplashScreen API 文档\n    @argument 文件\n                  一个或多个包含选项的参数文件\n    --disable-@files\n                  阻止进一步扩展参数文件\n    --enable-preview\n                  \
+允许类依赖于此发行版的预览功能\n要为长选项指定参数, 可以使用 --<名称>=<值> 或\n--<名称> <值>。\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.usage=\n    -Xbatch           禁用后台编译\n    -Xbootclasspath/a:<以 {0} 分隔的目录和 zip/jar 文件>\n                      附加在引导类路径末尾\n    -Xcheck:jni       对 JNI 函数执行其他检查\n    -Xcomp            强制在首次调用时编译方法\n    -Xdebug           不执行任何操作；已过时，将在未来发行版中删除。\n    -Xdiag            显示附加诊断消息\n    -Xint             仅解释模式执行\n    -Xinternalversion\n                      显示比 -version 选项更详细的\n                      JVM 版本信息\n    -Xlog:<opts>      配置或启用采用 Java 虚拟\n                      机 (Java Virtual Machine, JVM) 统一记录框架进行事件记录。使用 -Xlog:help\n                      可了解详细信息。\n    -Xloggc:<file>    将 GC 状态记录在文件中（带时间戳）。\n                      此选项已过时，可能会在\n                      将来的发行版中删除。它将替换为 -Xlog:gc:<file>。\n    -Xmixed           混合模式执行（默认值）\n    -Xmn<size>        为年轻代（新生代）设置初始和最大堆大小\n                      （以字节为单位）\n    -Xms<size>        设置最小和初始 Java 堆大小\n    -Xmx<size>        设置最大 Java 堆大小\n    -Xnoclassgc       禁用类垃圾收集\n    -Xrs              减少 Java/VM 对操作系统信号的使用（请参见文档）\n    -Xshare:auto      在可能的情况下使用共享类数据（默认值）\n    -Xshare:off       不尝试使用共享类数据\n    -Xshare:on        要求使用共享类数据，否则将失败。\n                      这是一个测试选项，可能导致间歇性\n                      故障。不应在生产环境中使用它。\n    -XshowSettings    显示所有设置并继续\n    -XshowSettings:all\n                      详细显示所有设置并继续\n    -XshowSettings:locale\n                      显示所有与区域设置相关的设置并继续\n    -XshowSettings:properties\n                      显示所有属性设置并继续\n    -XshowSettings:vm\n                      显示所有与 vm 相关的设置并继续\n    -XshowSettings:security\n                      显示所有安全设置并继续\n    -XshowSettings:security:all\n                      显示所有安全设置并继续\n    -XshowSettings:security:properties\n                      显示安全属性并继续\n    -XshowSettings:security:providers\n                      显示静态安全提供方设置并继续\n    -XshowSettings:security:tls\n                      显示与 TLS \
@@ -49,7 +50,7 @@ java.launcher.cls.error2=错误: 在类 {0} 中找不到 main 方法, 请将 mai
 java.launcher.cls.error3=错误: 缺少 JavaFX 运行时组件, 需要使用该组件来运行此应用程序
 java.launcher.cls.error4=错误: 加载主类 {0} 时出现 LinkageError\n\t{1}
 java.launcher.cls.error5=错误: 无法初始化主类 {0}\n原因: {1}: {2}
-java.launcher.cls.error6=错误：在类 {0} 中未找到非专用零参数构造器\n请从现有构造器中删除专用，或者定义为：\n   public {0}()
+java.launcher.cls.error6=错误：在类 {0} 中未找到非专用零参数构造器\n请从现有构造器中删除 private，或者定义为：\n   public {0}()
 java.launcher.cls.error7=错误：无法调用非静态内部类 {0} 构造器\n请将内部类设为静态或将内部类移出到单独的源文件
 java.launcher.cls.error8=错误：无法实例化抽象类 {0}\n请使用具体类
 java.launcher.jar.error1=错误: 尝试打开文件{0}时出现意外错误
@@ -58,6 +59,7 @@ java.launcher.jar.error3={0}中没有主清单属性
 java.launcher.jar.error4=在 {0} 中加载 Java 代理时出错
 java.launcher.jar.error5=错误：尝试关闭文件 {0} 时出现意外错误
 java.launcher.jar.error.illegal.ena.value=错误：Enable-Native-Access 清单属性的值 "{0}" 非法。仅允许使用 ''ALL-UNNAMED''
+java.launcher.jar.error.illegal.effm.value=错误：Enable-Final-Field-Mutation 清单属性的值 "{0}" 非法。仅允许使用 ''ALL-UNNAMED''
 java.launcher.init.error=初始化错误
 java.launcher.javafx.error1=错误: JavaFX launchApplication 方法具有错误的签名, 必须\n将方法声明为静态方法并返回空类型的值
 java.launcher.module.error1=模块 {0} 不具有 ModuleMainClass 属性，请使用 -m <模块>/<主类>
diff --git a/src/java.base/share/classes/sun/net/www/MimeTable.java b/src/java.base/share/classes/sun/net/www/MimeTable.java
index 5b760241671..886ad1b08f0 100644
--- a/src/java.base/share/classes/sun/net/www/MimeTable.java
+++ b/src/java.base/share/classes/sun/net/www/MimeTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java b/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java
index f567d7bd643..9c9766e2ce2 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package sun.net.www.protocol.http;
 
+import java.io.IOException;
 import java.net.PasswordAuthentication;
 import java.net.URL;
 import java.util.HashMap;
@@ -428,9 +429,10 @@ public abstract class AuthenticationInfo extends AuthCacheValue implements Clone
      * @param conn The connection to apply the header(s) to
      * @param p A source of header values for this connection, if needed.
      * @param raw The raw header field (if needed)
-     * @return true if all goes well, false if no headers were set.
+     * @throws IOException if no headers were set
      */
-    public abstract boolean setHeaders(HttpURLConnection conn, HeaderParser p, String raw);
+    public abstract void setHeaders(HttpURLConnection conn, HeaderParser p, String raw)
+            throws IOException;
 
     /**
      * Check if the header indicates that the current auth. parameters are stale.
diff --git a/src/java.base/share/classes/sun/net/www/protocol/http/BasicAuthentication.java b/src/java.base/share/classes/sun/net/www/protocol/http/BasicAuthentication.java
index f008c185b5d..aa2a9625a01 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/http/BasicAuthentication.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/BasicAuthentication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -125,15 +125,13 @@ final class BasicAuthentication extends AuthenticationInfo {
      * @param conn The connection to apply the header(s) to
      * @param p A source of header values for this connection, if needed.
      * @param raw The raw header values for this connection, if needed.
-     * @return true if all goes well, false if no headers were set.
      */
     @Override
-    public boolean setHeaders(HttpURLConnection conn, HeaderParser p, String raw) {
+    public void setHeaders(HttpURLConnection conn, HeaderParser p, String raw) {
         // no need to synchronize here:
         //   already locked by s.n.w.p.h.HttpURLConnection
         assert conn.isLockHeldByCurrentThread();
         conn.setAuthenticationProperty(getHeaderName(), getHeaderValue(null,null));
-        return true;
     }
 
     /**
diff --git a/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java b/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java
index 28d7bc5cf4e..87ea7c17085 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -321,7 +321,11 @@ final class DigestAuthentication extends AuthenticationInfo {
      */
     @Override
     public String getHeaderValue(URL url, String method) {
-        return getHeaderValueImpl(url.getFile(), method);
+        try {
+            return getHeaderValueImpl(url.getFile(), method);
+        } catch (IOException _) {
+            return null;
+        }
     }
 
     /**
@@ -339,7 +343,11 @@ final class DigestAuthentication extends AuthenticationInfo {
      * @return the value of the HTTP header this authentication wants set
      */
     String getHeaderValue(String requestURI, String method) {
-        return getHeaderValueImpl(requestURI, method);
+        try {
+            return getHeaderValueImpl(requestURI, method);
+        } catch (IOException _) {
+            return null;
+        }
     }
 
     /**
@@ -369,10 +377,11 @@ final class DigestAuthentication extends AuthenticationInfo {
      * @param conn The connection to apply the header(s) to
      * @param p A source of header values for this connection, if needed.
      * @param raw Raw header values for this connection, if needed.
-     * @return true if all goes well, false if no headers were set.
+     * @throws IOException if no headers were set
      */
     @Override
-    public boolean setHeaders(HttpURLConnection conn, HeaderParser p, String raw) {
+    public void setHeaders(HttpURLConnection conn, HeaderParser p, String raw)
+            throws IOException {
         // no need to synchronize here:
         //   already locked by s.n.w.p.h.HttpURLConnection
         assert conn.isLockHeldByCurrentThread();
@@ -380,14 +389,14 @@ final class DigestAuthentication extends AuthenticationInfo {
         params.setNonce (p.findValue("nonce"));
         params.setOpaque (p.findValue("opaque"));
         params.setQop (p.findValue("qop"));
-        params.setUserhash (Boolean.valueOf(p.findValue("userhash")));
+        params.setUserhash (Boolean.parseBoolean(p.findValue("userhash")));
         String charset = p.findValue("charset");
         if (charset == null) {
             charset = "ISO_8859_1";
         } else if (!charset.equalsIgnoreCase("UTF-8")) {
             // UTF-8 is only valid value. ISO_8859_1 represents default behavior
             // when the parameter is not set.
-            return false;
+            throw new IOException("Illegal charset in header");
         }
         params.setCharset(charset.toUpperCase(Locale.ROOT));
 
@@ -405,7 +414,7 @@ final class DigestAuthentication extends AuthenticationInfo {
         }
 
         if (params.nonce == null || authMethod == null || pw == null || realm == null) {
-            return false;
+            throw new IOException("Server challenge incomplete");
         }
         if (authMethod.length() >= 1) {
             // Method seems to get converted to all lower case elsewhere.
@@ -415,8 +424,7 @@ final class DigestAuthentication extends AuthenticationInfo {
                         + authMethod.substring(1).toLowerCase(Locale.ROOT);
         }
 
-        if (!setAlgorithmNames(p, params))
-            return false;
+        setAlgorithmNames(p, params);
 
         // If authQop is true, then the server is doing RFC2617 and
         // has offered qop=auth. We do not support any other modes
@@ -426,20 +434,17 @@ final class DigestAuthentication extends AuthenticationInfo {
             params.setNewCnonce();
         }
 
-        String value = getHeaderValueImpl (uri, method);
-        if (value != null) {
-            conn.setAuthenticationProperty(getHeaderName(), value);
-            return true;
-        } else {
-            return false;
-        }
+        String value = getHeaderValueImpl(uri, method);
+        assert value != null;
+        conn.setAuthenticationProperty(getHeaderName(), value);
     }
 
     // Algorithm name is stored in two separate fields (of Paramaeters)
     // This allows for variations in digest algorithm name (aliases)
     // and also allow for the -sess variant defined in HTTP Digest protocol
-    // returns false if algorithm not supported
-    private static boolean setAlgorithmNames(HeaderParser p, Parameters params) {
+    // throws IOException if algorithm not supported
+    private static void setAlgorithmNames(HeaderParser p, Parameters params)
+            throws IOException {
         String algorithm = p.findValue("algorithm");
         String digestName = algorithm;
         if (algorithm == null || algorithm.isEmpty()) {
@@ -459,18 +464,17 @@ final class DigestAuthentication extends AuthenticationInfo {
         var oid = KnownOIDs.findMatch(digestName);
         if (oid == null) {
             log("unknown algorithm: " + algorithm);
-            return false;
+            throw new IOException("Unknown algorithm: " + algorithm);
         }
         digestName = oid.stdName();
         params.setAlgorithm (algorithm);
         params.setDigestName (digestName);
-        return true;
     }
 
     /* Calculate the Authorization header field given the request URI
      * and based on the authorization information in params
      */
-    private String getHeaderValueImpl (String uri, String method) {
+    private String getHeaderValueImpl (String uri, String method) throws IOException {
         String response;
         char[] passwd = pw.getPassword();
         boolean qop = params.authQop();
@@ -479,11 +483,7 @@ final class DigestAuthentication extends AuthenticationInfo {
         String nonce = params.getNonce ();
         String algorithm = params.getAlgorithm ();
         String digest = params.getDigestName ();
-        try {
-            validateDigest(digest);
-        } catch (IOException e) {
-            return null;
-        }
+        validateDigest(digest);
         Charset charset = params.getCharset();
         boolean userhash = params.getUserhash ();
         params.incrementNC ();
@@ -505,7 +505,7 @@ final class DigestAuthentication extends AuthenticationInfo {
                                         digest, session, charset);
         } catch (CharacterCodingException | NoSuchAlgorithmException ex) {
             log(ex.getMessage());
-            return null;
+            throw new IOException("Failed to compute digest", ex);
         }
 
         String ncfield = "\"";
@@ -534,7 +534,7 @@ final class DigestAuthentication extends AuthenticationInfo {
             }
         } catch (CharacterCodingException | NoSuchAlgorithmException ex) {
             log(ex.getMessage());
-            return null;
+            throw new IOException("Failed to compute user hash", ex);
         }
 
         String value = authMethod
diff --git a/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
index aee9670ce26..89ad0cc48ed 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
@@ -61,6 +61,7 @@ import java.util.Set;
 import java.util.StringJoiner;
 import jdk.internal.access.JavaNetHttpCookieAccess;
 import jdk.internal.access.SharedSecrets;
+import jdk.internal.util.Exceptions;
 import sun.net.NetProperties;
 import sun.net.NetworkClient;
 import sun.net.util.IPAddressUtil;
@@ -1469,16 +1470,29 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
                         /* in this case, only one header field will be present */
                         String raw = responses.findValue ("Proxy-Authenticate");
                         reset ();
-                        if (!proxyAuthentication.setHeaders(this,
-                                                        authhdr.headerParser(), raw)) {
+                        try {
+                            proxyAuthentication.setHeaders(this,
+                                    authhdr.headerParser(), raw);
+                        } catch (IOException ex) {
                             disconnectInternal();
-                            throw new IOException ("Authentication failure");
+                            if (Exceptions.enhancedNonSocketExceptions()) {
+                                throw new IOException ("Authentication failure", ex);
+                            } else {
+                                throw new IOException ("Authentication failure");
+                            }
                         }
-                        if (serverAuthentication != null && srvHdr != null &&
-                                !serverAuthentication.setHeaders(this,
-                                                        srvHdr.headerParser(), raw)) {
-                            disconnectInternal ();
-                            throw new IOException ("Authentication failure");
+                        if (serverAuthentication != null && srvHdr != null) {
+                            try {
+                                serverAuthentication.setHeaders(this,
+                                        srvHdr.headerParser(), raw);
+                            } catch (IOException ex) {
+                                disconnectInternal();
+                                if (Exceptions.enhancedNonSocketExceptions()) {
+                                    throw new IOException ("Authentication failure", ex);
+                                } else {
+                                    throw new IOException ("Authentication failure");
+                                }
+                            }
                         }
                         authObj = null;
                         doingNTLMp2ndStage = false;
@@ -1557,9 +1571,15 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
                     } else {
                         reset ();
                         /* header not used for ntlm */
-                        if (!serverAuthentication.setHeaders(this, null, raw)) {
+                        try {
+                            serverAuthentication.setHeaders(this, null, raw);
+                        } catch (IOException ex) {
                             disconnectWeb();
-                            throw new IOException ("Authentication failure");
+                            if (Exceptions.enhancedNonSocketExceptions()) {
+                                throw new IOException ("Authentication failure", ex);
+                            } else {
+                                throw new IOException ("Authentication failure");
+                            }
                         }
                         doingNTLM2ndStage = false;
                         authObj = null;
@@ -1935,10 +1955,16 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
                     } else {
                         String raw = responses.findValue ("Proxy-Authenticate");
                         reset ();
-                        if (!proxyAuthentication.setHeaders(this,
-                                                authhdr.headerParser(), raw)) {
+                        try {
+                            proxyAuthentication.setHeaders(this,
+                                    authhdr.headerParser(), raw);
+                        } catch (IOException ex) {
                             disconnectInternal();
-                            throw new IOException ("Authentication failure");
+                            if (Exceptions.enhancedNonSocketExceptions()) {
+                                throw new IOException ("Authentication failure", ex);
+                            } else {
+                                throw new IOException ("Authentication failure");
+                            }
                         }
                         authObj = null;
                         doingNTLMp2ndStage = false;
@@ -2201,7 +2227,9 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
                 };
             }
             if (ret != null) {
-                if (!ret.setHeaders(this, p, raw)) {
+                try {
+                    ret.setHeaders(this, p, raw);
+                } catch (IOException e) {
                     ret.disposeContext();
                     ret = null;
                 }
@@ -2358,7 +2386,9 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
                 }
             }
             if (ret != null ) {
-                if (!ret.setHeaders(this, p, raw)) {
+                try {
+                    ret.setHeaders(this, p, raw);
+                } catch (IOException e) {
                     ret.disposeContext();
                     ret = null;
                 }
diff --git a/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java b/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java
index c27d866f5ef..c016b0dae29 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -168,29 +168,24 @@ final class NegotiateAuthentication extends AuthenticationInfo {
      * @param p A source of header values for this connection, not used because
      *          HeaderParser converts the fields to lower case, use raw instead
      * @param raw The raw header field.
-     * @return true if all goes well, false if no headers were set.
+     * @throws IOException if no headers were set
      */
     @Override
-    public boolean setHeaders(HttpURLConnection conn, HeaderParser p, String raw) {
+    public void setHeaders(HttpURLConnection conn, HeaderParser p, String raw) throws IOException {
         // no need to synchronize here:
         //   already locked by s.n.w.p.h.HttpURLConnection
         assert conn.isLockHeldByCurrentThread();
 
-        try {
-            String response;
-            byte[] incoming = null;
-            String[] parts = raw.split("\\s+");
-            if (parts.length > 1) {
-                incoming = Base64.getDecoder().decode(parts[1]);
-            }
-            response = hci.scheme + " " + Base64.getEncoder().encodeToString(
-                        incoming==null?firstToken():nextToken(incoming));
-
-            conn.setAuthenticationProperty(getHeaderName(), response);
-            return true;
-        } catch (IOException e) {
-            return false;
+        String response;
+        byte[] incoming = null;
+        String[] parts = raw.split("\\s+");
+        if (parts.length > 1) {
+            incoming = Base64.getDecoder().decode(parts[1]);
         }
+        response = hci.scheme + " " + Base64.getEncoder().encodeToString(
+                    incoming==null?firstToken():nextToken(incoming));
+
+        conn.setAuthenticationProperty(getHeaderName(), response);
     }
 
     /**
diff --git a/src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java b/src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java
index 14b2058d28d..09f6d7b1d75 100644
--- a/src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java
+++ b/src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,6 +109,7 @@ class ChannelInputStream extends InputStream {
         if (len == 0)
             return 0;
 
+        len = Math.min(len, Streams.MAX_BUFFER_SIZE);
         ByteBuffer bb = ((this.bs == bs)
                          ? this.bb
                          : ByteBuffer.wrap(bs));
diff --git a/src/java.base/share/classes/sun/nio/ch/ChannelOutputStream.java b/src/java.base/share/classes/sun/nio/ch/ChannelOutputStream.java
index dff8af9ebaf..b7207c9fd4b 100644
--- a/src/java.base/share/classes/sun/nio/ch/ChannelOutputStream.java
+++ b/src/java.base/share/classes/sun/nio/ch/ChannelOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,10 +64,15 @@ class ChannelOutputStream extends OutputStream {
      * If the channel is selectable then it must be configured blocking.
      */
     private void writeFully(ByteBuffer bb) throws IOException {
-        while (bb.remaining() > 0) {
+        int pos = bb.position();
+        int rem = bb.limit() - pos;
+        while (rem > 0) {
+            bb.limit(pos + Math.min(Streams.MAX_BUFFER_SIZE, rem));
             int n = ch.write(bb);
             if (n <= 0)
-                throw new RuntimeException("no bytes written");
+                throw new IOException("Write failed");
+            pos += n;
+            rem -= n;
         }
     }
 
diff --git a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
index 57935ff5b00..01f894be227 100644
--- a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
@@ -78,10 +78,6 @@ import static jdk.internal.util.Exceptions.formatMsg;
 public final class NioSocketImpl extends SocketImpl implements PlatformSocketImpl {
     private static final NativeDispatcher nd = new SocketDispatcher();
 
-    // The maximum number of bytes to read/write per syscall to avoid needing
-    // a huge buffer from the temporary buffer cache
-    private static final int MAX_BUFFER_SIZE = 128 * 1024;
-
     // true if this is a SocketImpl for a ServerSocket
     private final boolean server;
 
@@ -355,8 +351,8 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
                 // emulate legacy behavior to return -1, even if socket is closed
                 if (readEOF)
                     return -1;
-                // read up to MAX_BUFFER_SIZE bytes
-                int size = Math.min(len, MAX_BUFFER_SIZE);
+                // read up to Streams.MAX_BUFFER_SIZE bytes
+                int size = Math.min(len, Streams.MAX_BUFFER_SIZE);
                 int n = implRead(b, off, size, remainingNanos);
                 if (n == -1)
                     readEOF = true;
@@ -453,8 +449,8 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
                 int pos = off;
                 int end = off + len;
                 while (pos < end) {
-                    // write up to MAX_BUFFER_SIZE bytes
-                    int size = Math.min((end - pos), MAX_BUFFER_SIZE);
+                    // write up to Streams.MAX_BUFFER_SIZE bytes
+                    int size = Math.min((end - pos), Streams.MAX_BUFFER_SIZE);
                     int n = implWrite(b, pos, size);
                     pos += n;
                 }
diff --git a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
index 6f3e8b443dc..868ed3b64bc 100644
--- a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
@@ -1373,6 +1373,7 @@ class SocketChannelImpl
             // nothing to do
             return 0;
         }
+        len = Math.min(len, Streams.MAX_BUFFER_SIZE);
 
         readLock.lock();
         try {
@@ -1469,7 +1470,7 @@ class SocketChannelImpl
                 beginWrite(true);
                 configureSocketNonBlockingIfVirtualThread();
                 while (pos < end && isOpen()) {
-                    int size = end - pos;
+                    int size = Math.min(end - pos, Streams.MAX_BUFFER_SIZE);
                     int n = tryWrite(b, pos, size);
                     while (IOStatus.okayToRetry(n) && isOpen()) {
                         park(Net.POLLOUT);
diff --git a/src/java.base/share/classes/sun/nio/ch/Streams.java b/src/java.base/share/classes/sun/nio/ch/Streams.java
index 4326c9e2e0b..847fa8333e8 100644
--- a/src/java.base/share/classes/sun/nio/ch/Streams.java
+++ b/src/java.base/share/classes/sun/nio/ch/Streams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,10 @@ import java.nio.channels.WritableByteChannel;
  * Factory methods for input/output streams based on channels.
  */
 public class Streams {
+    // The maximum number of bytes to read/write per syscall to avoid needing
+    // a huge buffer from the temporary buffer cache
+    static final int MAX_BUFFER_SIZE = 128 * 1024;
+
     private Streams() { }
 
     /**
diff --git a/src/java.base/share/classes/sun/nio/ch/ThreadPool.java b/src/java.base/share/classes/sun/nio/ch/ThreadPool.java
index 38a49567c15..73be9451119 100644
--- a/src/java.base/share/classes/sun/nio/ch/ThreadPool.java
+++ b/src/java.base/share/classes/sun/nio/ch/ThreadPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/nio/cs/CESU_8.java b/src/java.base/share/classes/sun/nio/cs/CESU_8.java
index 409b375ec88..11f21f56139 100644
--- a/src/java.base/share/classes/sun/nio/cs/CESU_8.java
+++ b/src/java.base/share/classes/sun/nio/cs/CESU_8.java
@@ -445,7 +445,7 @@ class CESU_8 extends Unicode
             int dl = dst.arrayOffset() + dst.limit();
 
             // Handle ASCII-only prefix
-            int n = JLA.encodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
+            int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
             sp += n;
             dp += n;
 
diff --git a/src/java.base/share/classes/sun/nio/cs/DoubleByte.java b/src/java.base/share/classes/sun/nio/cs/DoubleByte.java
index 0969669a35b..2a4dbdc95ed 100644
--- a/src/java.base/share/classes/sun/nio/cs/DoubleByte.java
+++ b/src/java.base/share/classes/sun/nio/cs/DoubleByte.java
@@ -600,7 +600,7 @@ public class DoubleByte {
 
             try {
                 if (isASCIICompatible) {
-                    int n = JLA.encodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
+                    int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
                     sp += n;
                     dp += n;
                 }
diff --git a/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java b/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java
index ff5970e92a8..39215bfa93d 100644
--- a/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java
+++ b/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java
@@ -35,6 +35,7 @@ import java.util.Objects;
 
 import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.SharedSecrets;
+import jdk.internal.util.Preconditions;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 
 public class ISO_8859_1
@@ -141,34 +142,20 @@ public class ISO_8859_1
 
         private final Surrogate.Parser sgp = new Surrogate.Parser();
 
-        /**
-         * Encodes as many ISO-8859-1 codepoints as possible from the source
-         * character array into the destination byte array, assuming that
-         * the encoding is ISO-8859-1 compatible.
-         *
-         * @param sa the source character array
-         * @param sp the index of the source array to start reading from
-         * @param da the target byte array
-         * @param dp the index of the target array to start writing to
-         * @param len the maximum number of characters to be encoded
-         * @return the total number of characters successfully encoded
-         * @throws NullPointerException if any of the provided arrays is null
-         */
+        // Method possible replaced with a compiler intrinsic.
         private static int encodeISOArray(char[] sa, int sp,
                                           byte[] da, int dp, int len) {
-            // This method should tolerate invalid arguments, matching the lenient behavior of the VM intrinsic.
-            // Hence, using operator expressions instead of `Preconditions`, which throw on failure.
-            if ((sp | dp | len) < 0 ||
-                    sp >= sa.length ||      // Implicit null check on `sa`
-                    dp >= da.length) {      // Implicit null check on `da`
+            if (len <= 0) {
                 return 0;
             }
-            int minLen = Math.min(len, Math.min(sa.length - sp, da.length - dp));
-            return encodeISOArray0(sa, sp, da, dp, minLen);
+            encodeISOArrayCheck(sa, sp, da, dp, len);
+            return implEncodeISOArray(sa, sp, da, dp, len);
         }
 
         @IntrinsicCandidate
-        private static int encodeISOArray0(char[] sa, int sp, byte[] da, int dp, int len) {
+        private static int implEncodeISOArray(char[] sa, int sp,
+                                              byte[] da, int dp, int len)
+        {
             int i = 0;
             for (; i < len; i++) {
                 char c = sa[sp++];
@@ -179,6 +166,17 @@ public class ISO_8859_1
             return i;
         }
 
+        private static void encodeISOArrayCheck(char[] sa, int sp,
+                                                byte[] da, int dp, int len) {
+            Objects.requireNonNull(sa);
+            Objects.requireNonNull(da);
+            Preconditions.checkIndex(sp, sa.length, Preconditions.AIOOBE_FORMATTER);
+            Preconditions.checkIndex(dp, da.length, Preconditions.AIOOBE_FORMATTER);
+
+            Preconditions.checkIndex(sp + len - 1, sa.length, Preconditions.AIOOBE_FORMATTER);
+            Preconditions.checkIndex(dp + len - 1, da.length, Preconditions.AIOOBE_FORMATTER);
+        }
+
         private CoderResult encodeArrayLoop(CharBuffer src,
                                             ByteBuffer dst)
         {
diff --git a/src/java.base/share/classes/sun/nio/cs/SingleByte.java b/src/java.base/share/classes/sun/nio/cs/SingleByte.java
index a5bf06cb251..59887b944d3 100644
--- a/src/java.base/share/classes/sun/nio/cs/SingleByte.java
+++ b/src/java.base/share/classes/sun/nio/cs/SingleByte.java
@@ -217,7 +217,7 @@ public class SingleByte
             int len = Math.min(dl - dp, sl - sp);
 
             if (isASCIICompatible) {
-                int n = JLA.encodeASCII(sa, sp, da, dp, len);
+                int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, len);
                 sp += n;
                 dp += n;
                 len -= n;
diff --git a/src/java.base/share/classes/sun/nio/cs/US_ASCII.java b/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
index 3886978d209..bb84ab1bd4b 100644
--- a/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
+++ b/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
@@ -159,7 +159,7 @@ public class US_ASCII
             assert (dp <= dl);
             dp = (dp <= dl ? dp : dl);
 
-            int n = JLA.encodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
+            int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
             sp += n;
             dp += n;
 
diff --git a/src/java.base/share/classes/sun/nio/cs/UTF_8.java b/src/java.base/share/classes/sun/nio/cs/UTF_8.java
index d2d6d7e485d..54e479f838a 100644
--- a/src/java.base/share/classes/sun/nio/cs/UTF_8.java
+++ b/src/java.base/share/classes/sun/nio/cs/UTF_8.java
@@ -452,7 +452,7 @@ public final class UTF_8 extends Unicode {
             int dl = dst.arrayOffset() + dst.limit();
 
             // Handle ASCII-only prefix
-            int n = JLA.encodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
+            int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
             sp += n;
             dp += n;
 
diff --git a/src/java.base/share/classes/sun/nio/fs/AbstractPoller.java b/src/java.base/share/classes/sun/nio/fs/AbstractPoller.java
index 29c07223988..f5252393769 100644
--- a/src/java.base/share/classes/sun/nio/fs/AbstractPoller.java
+++ b/src/java.base/share/classes/sun/nio/fs/AbstractPoller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/nio/fs/Cancellable.java b/src/java.base/share/classes/sun/nio/fs/Cancellable.java
index df3c95abcc9..42dacb7b242 100644
--- a/src/java.base/share/classes/sun/nio/fs/Cancellable.java
+++ b/src/java.base/share/classes/sun/nio/fs/Cancellable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java b/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java
index da486231a1d..e9cfa2fda2b 100644
--- a/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java
+++ b/src/java.base/share/classes/sun/nio/fs/PollingWatchService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ec/ECPrivateKeyImpl.java b/src/java.base/share/classes/sun/security/ec/ECPrivateKeyImpl.java
index 1b69a5b22b4..9700f9a3521 100644
--- a/src/java.base/share/classes/sun/security/ec/ECPrivateKeyImpl.java
+++ b/src/java.base/share/classes/sun/security/ec/ECPrivateKeyImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/provider/ML_DSA.java b/src/java.base/share/classes/sun/security/provider/ML_DSA.java
index af64ef399a8..6a578427e51 100644
--- a/src/java.base/share/classes/sun/security/provider/ML_DSA.java
+++ b/src/java.base/share/classes/sun/security/provider/ML_DSA.java
@@ -1555,7 +1555,7 @@ public class ML_DSA {
         return res;
     }
 
-    // precondition: -2^31 * MONT_Q <= a, b < 2^31, -2^31 < a * b < 2^31 * MONT_Q
+    // precondition: -2^31 <= a, b < 2^31, -2^31 * MONT_Q <= a * b < 2^31 * MONT_Q
     // computes a * b * 2^-32 mod MONT_Q
     // the result is greater than -MONT_Q and less than MONT_Q
     // See e.g. Algorithm 3 in https://eprint.iacr.org/2018/039.pdf
diff --git a/src/java.base/share/classes/sun/security/rsa/RSAPadding.java b/src/java.base/share/classes/sun/security/rsa/RSAPadding.java
index 919c734eaca..e823a59483e 100644
--- a/src/java.base/share/classes/sun/security/rsa/RSAPadding.java
+++ b/src/java.base/share/classes/sun/security/rsa/RSAPadding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java b/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
index d6c1cec5735..dd9b7017390 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java b/src/java.base/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java
index cc513eb30ba..6be84e8f8fa 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateStatus.java b/src/java.base/share/classes/sun/security/ssl/CertificateStatus.java
index a1048e423d1..c2286f3c422 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateStatus.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/CookieExtension.java b/src/java.base/share/classes/sun/security/ssl/CookieExtension.java
index 2c22dd121ba..b42cea082e0 100644
--- a/src/java.base/share/classes/sun/security/ssl/CookieExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/CookieExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java
index 744ff59f402..7d94598f5cf 100644
--- a/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/DTLSOutputRecord.java b/src/java.base/share/classes/sun/security/ssl/DTLSOutputRecord.java
index 162dbb58eec..6bb23b72ef9 100644
--- a/src/java.base/share/classes/sun/security/ssl/DTLSOutputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/DTLSOutputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java
index a02a8438163..82e888ef98f 100644
--- a/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/ECPointFormatsExtension.java b/src/java.base/share/classes/sun/security/ssl/ECPointFormatsExtension.java
index 72b7c950374..de61e44b258 100644
--- a/src/java.base/share/classes/sun/security/ssl/ECPointFormatsExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/ECPointFormatsExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/EncryptedExtensions.java b/src/java.base/share/classes/sun/security/ssl/EncryptedExtensions.java
index b5be927f0aa..bc34e6fe113 100644
--- a/src/java.base/share/classes/sun/security/ssl/EncryptedExtensions.java
+++ b/src/java.base/share/classes/sun/security/ssl/EncryptedExtensions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java b/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java
index 6bacbfbd1d8..a6bedd9e205 100644
--- a/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2017, Red Hat, Inc. and/or its affiliates.
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java b/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java
index 2a05881180d..61571cfd03b 100644
--- a/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java
+++ b/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/HelloRequest.java b/src/java.base/share/classes/sun/security/ssl/HelloRequest.java
index 39464992db5..b207e1071b0 100644
--- a/src/java.base/share/classes/sun/security/ssl/HelloRequest.java
+++ b/src/java.base/share/classes/sun/security/ssl/HelloRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/HelloVerifyRequest.java b/src/java.base/share/classes/sun/security/ssl/HelloVerifyRequest.java
index 8d3f1048c91..1922a4339bb 100644
--- a/src/java.base/share/classes/sun/security/ssl/HelloVerifyRequest.java
+++ b/src/java.base/share/classes/sun/security/ssl/HelloVerifyRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/MaxFragExtension.java b/src/java.base/share/classes/sun/security/ssl/MaxFragExtension.java
index 25500c7ac57..a6c376ad962 100644
--- a/src/java.base/share/classes/sun/security/ssl/MaxFragExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/MaxFragExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
index 0c708b194cb..877236ebfad 100644
--- a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
+++ b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java b/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java
index c826d9c89e3..8f5cc000494 100644
--- a/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java
+++ b/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/PskKeyExchangeModesExtension.java b/src/java.base/share/classes/sun/security/ssl/PskKeyExchangeModesExtension.java
index a4f343ccb06..6c306839b5a 100644
--- a/src/java.base/share/classes/sun/security/ssl/PskKeyExchangeModesExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/PskKeyExchangeModesExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/RSAServerKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/RSAServerKeyExchange.java
index 43f2ef95ba8..4ab1cdf1f93 100644
--- a/src/java.base/share/classes/sun/security/ssl/RSAServerKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/RSAServerKeyExchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java b/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java
index 90b9e999925..b744914b31d 100644
--- a/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java b/src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java
index a86257ab3d0..f38fdb2656b 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java b/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
index 1b3c8ec3eba..1dbfcdba4df 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java b/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java
index 1a0283cf859..de375cdfd98 100644
--- a/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -178,6 +178,7 @@ final class SessionTicketExtension {
      */
     static final class SessionTicketSpec implements SSLExtensionSpec {
         private static final int GCM_TAG_LEN = 128;
+        private static final int GCM_IV_LEN = 12;
         ByteBuffer data;
         static final ByteBuffer zero = ByteBuffer.wrap(new byte[0]);
 
@@ -215,7 +216,7 @@ final class SessionTicketExtension {
 
             try {
                 StatelessKey key = KeyState.getCurrentKey(hc);
-                byte[] iv = new byte[16];
+                byte[] iv = new byte[GCM_IV_LEN];
 
                 SecureRandom random = hc.sslContext.getSecureRandom();
                 random.nextBytes(iv);
@@ -269,7 +270,7 @@ final class SessionTicketExtension {
                     return null;
                 }
 
-                iv = new byte[16];
+                iv = new byte[GCM_IV_LEN];
                 data.get(iv);
                 Cipher c = Cipher.getInstance("AES/GCM/NoPadding");
                 c.init(Cipher.DECRYPT_MODE, key.key,
diff --git a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
index 1bbe0bfb9c7..40ee01d284a 100644
--- a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
@@ -30,9 +30,7 @@ import java.security.*;
 import java.security.cert.*;
 import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
-
 import javax.net.ssl.*;
-
 import sun.security.ssl.SSLAlgorithmConstraints.SIGNATURE_CONSTRAINTS_MODE;
 import sun.security.util.AnchorCertificates;
 import sun.security.util.HostnameChecker;
@@ -40,19 +38,14 @@ import sun.security.validator.*;
 
 /**
  * This class implements the SunJSSE X.509 trust manager using the internal
- * validator API in J2SE core. The logic in this class is minimal.<p>
+ * validator API in J2SE core. The logic in this class is minimal.
  * <p>
  * This class supports both the Simple validation algorithm from previous
- * JSSE versions and PKIX validation. Currently, it is not possible for the
- * application to specify PKIX parameters other than trust anchors. This will
- * be fixed in a future release using new APIs. When that happens, it may also
- * make sense to separate the Simple and PKIX trust managers into separate
- * classes.
+ * JSSE versions and PKIX validation.
  *
  * @author Andreas Sterbenz
  */
-final class X509TrustManagerImpl extends X509ExtendedTrustManager
-        implements X509TrustManager {
+final class X509TrustManagerImpl extends X509ExtendedTrustManager {
 
     private final String validatorType;
 
@@ -208,120 +201,90 @@ final class X509TrustManagerImpl extends X509ExtendedTrustManager
     private void checkTrusted(X509Certificate[] chain,
             String authType, Socket socket,
             boolean checkClientTrusted) throws CertificateException {
-        Validator v = checkTrustedInit(chain, authType, checkClientTrusted);
 
-        X509Certificate[] trustedChain;
+        SSLSession session = null;
+        AlgorithmConstraints constraints = null;
+        String identityAlg = null;
+
         if (socket instanceof SSLSocket sslSocket && sslSocket.isConnected()) {
-
-            SSLSession session = sslSocket.getHandshakeSession();
-            if (session == null) {
-                throw new CertificateException("No handshake session");
-            }
-
-            AlgorithmConstraints constraints = SSLAlgorithmConstraints.forSocket(
+            session = sslSocket.getHandshakeSession();
+            constraints = SSLAlgorithmConstraints.forSocket(
                     sslSocket, SIGNATURE_CONSTRAINTS_MODE.LOCAL, false);
-
-            // Grab any stapled OCSP responses for use in validation
-            List<byte[]> responseList = Collections.emptyList();
-            if (!checkClientTrusted && session instanceof ExtendedSSLSession) {
-                responseList =
-                        ((ExtendedSSLSession)session).getStatusResponses();
-            }
-            trustedChain = v.validate(chain, null, responseList,
-                    constraints, checkClientTrusted ? null : authType);
-
-            // check endpoint identity
-            String identityAlg = sslSocket.getSSLParameters().
+            identityAlg = sslSocket.getSSLParameters().
                     getEndpointIdentificationAlgorithm();
-            if (identityAlg != null && !identityAlg.isEmpty()) {
-                checkIdentity(session,
-                        trustedChain, identityAlg, checkClientTrusted);
-            }
-        } else {
-            trustedChain = v.validate(chain, null, Collections.emptyList(),
-                    null, checkClientTrusted ? null : authType);
         }
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,trustmanager")) {
-            SSLLogger.fine("Found trusted certificate",
-                    trustedChain[trustedChain.length - 1]);
+        findTrustedCertificate(chain, authType,
+                session, constraints, identityAlg, checkClientTrusted);
+    }
+
+    private void checkTrusted(X509Certificate[] chain,
+            String authType, SSLEngine engine,
+            boolean checkClientTrusted) throws CertificateException {
+
+        SSLSession session = null;
+        AlgorithmConstraints constraints = null;
+        String identityAlg = null;
+
+        if (engine != null) {
+            session = engine.getHandshakeSession();
+            constraints = SSLAlgorithmConstraints.forEngine(
+                    engine, SIGNATURE_CONSTRAINTS_MODE.LOCAL, false);
+            identityAlg = engine.getSSLParameters().
+                    getEndpointIdentificationAlgorithm();
         }
+
+        findTrustedCertificate(chain, authType,
+                session, constraints, identityAlg, checkClientTrusted);
     }
 
     private void checkTrusted(X509Certificate[] chain,
             String authType, QuicTLSEngineImpl quicTLSEngine,
             boolean checkClientTrusted) throws CertificateException {
-        Validator v = checkTrustedInit(chain, authType, checkClientTrusted);
+
+        SSLSession session = null;
+        AlgorithmConstraints constraints = null;
+        String identityAlg = null;
+
+        if (quicTLSEngine != null) {
+            session = quicTLSEngine.getHandshakeSession();
+            constraints = SSLAlgorithmConstraints.forQUIC(
+                    quicTLSEngine, SIGNATURE_CONSTRAINTS_MODE.LOCAL, false);
+            identityAlg = quicTLSEngine.getSSLParameters().
+                    getEndpointIdentificationAlgorithm();
+        }
+
+        findTrustedCertificate(chain, authType,
+                session, constraints, identityAlg, checkClientTrusted);
+    }
+
+    private void findTrustedCertificate(X509Certificate[] chain,
+            String authType, SSLSession session,
+            AlgorithmConstraints constraints, String identityAlg,
+            boolean checkClientTrusted) throws CertificateException {
 
         final X509Certificate[] trustedChain;
-        if (quicTLSEngine != null) {
+        Validator v = checkTrustedInit(chain, authType, checkClientTrusted);
 
-            final SSLSession session = quicTLSEngine.getHandshakeSession();
+        if (constraints != null) {
             if (session == null) {
                 throw new CertificateException("No handshake session");
             }
 
-            // create the algorithm constraints
-            final AlgorithmConstraints constraints = SSLAlgorithmConstraints.forQUIC(
-                    quicTLSEngine, SIGNATURE_CONSTRAINTS_MODE.LOCAL, false);
+            // Grab any stapled OCSP responses for use in validation
             final List<byte[]> responseList;
-            // grab any stapled OCSP responses for use in validation
             if (!checkClientTrusted &&
                     session instanceof ExtendedSSLSession extSession) {
                 responseList = extSession.getStatusResponses();
             } else {
                 responseList = Collections.emptyList();
             }
-            // do the certificate chain validation
+
+            // Certificate chain validation
             trustedChain = v.validate(chain, null, responseList,
                     constraints, checkClientTrusted ? null : authType);
 
-            // check endpoint identity
-            String identityAlg = quicTLSEngine.getSSLParameters().
-                    getEndpointIdentificationAlgorithm();
-            if (identityAlg != null && !identityAlg.isEmpty()) {
-                checkIdentity(session, trustedChain,
-                        identityAlg, checkClientTrusted);
-            }
-        } else {
-            trustedChain = v.validate(chain, null, Collections.emptyList(),
-                    null, checkClientTrusted ? null : authType);
-        }
-
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,trustmanager")) {
-            SSLLogger.fine("Found trusted certificate",
-                    trustedChain[trustedChain.length - 1]);
-        }
-    }
-
-    private void checkTrusted(X509Certificate[] chain,
-            String authType, SSLEngine engine,
-            boolean checkClientTrusted) throws CertificateException {
-        Validator v = checkTrustedInit(chain, authType, checkClientTrusted);
-
-        X509Certificate[] trustedChain;
-        if (engine != null) {
-
-            SSLSession session = engine.getHandshakeSession();
-            if (session == null) {
-                throw new CertificateException("No handshake session");
-            }
-
-            AlgorithmConstraints constraints = SSLAlgorithmConstraints.forEngine(
-                    engine, SIGNATURE_CONSTRAINTS_MODE.LOCAL, false);
-
-            // Grab any stapled OCSP responses for use in validation
-            List<byte[]> responseList = Collections.emptyList();
-            if (!checkClientTrusted && session instanceof ExtendedSSLSession) {
-                responseList =
-                        ((ExtendedSSLSession)session).getStatusResponses();
-            }
-            trustedChain = v.validate(chain, null, responseList,
-                    constraints, checkClientTrusted ? null : authType);
-
-            // check endpoint identity
-            String identityAlg = engine.getSSLParameters().
-                    getEndpointIdentificationAlgorithm();
+            // Check endpoint identity
             if (identityAlg != null && !identityAlg.isEmpty()) {
                 checkIdentity(session, trustedChain,
                         identityAlg, checkClientTrusted);
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_de.properties b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_de.properties
index 1c7a9cd17cf..a452dd34e9d 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_de.properties
+++ b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_de.properties
@@ -313,7 +313,7 @@ Unable.to.parse.denyAfter.string.in.exception.message=denyAfter-Datumszeichenfol
 whose.sigalg.weak=%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko.
 whose.key.disabled=%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko und ist deaktiviert.
 whose.key.weak=%1$s verwendet %2$s. Das gilt als Sicherheitsrisiko. Dieser Schlüssel wird in einem zukünftigen Update deaktiviert.
-jks.storetype.warning=Der %1$s-Keystore verwendet ein proprietäres Format. Es wird empfohlen, auf PKCS12 zu migrieren, das ein Industriestandardformat mit "keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12" ist.
+jks.storetype.warning=%1$s verwendet veraltete kryptografische Algorithmen und wird in einer zukünftigen Version entfernt. Migrieren Sie zu PKCS12 mit:\nkeytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12
 migrate.keystore.warning="%1$s" zu %4$s migriert. Der %2$s-Keystore wurde als "%3$s" gesichert.
 backup.keystore.warning=Der ursprüngliche Keystore "%1$s" wird als "%3$s" gesichert...
 importing.keystore.status=Keystore %1$s wird in %2$s importiert...
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_ja.properties b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_ja.properties
index 63ba4f220dd..a3d7771eb38 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_ja.properties
+++ b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_ja.properties
@@ -313,7 +313,7 @@ Unable.to.parse.denyAfter.string.in.exception.message=例外メッセージのde
 whose.sigalg.weak=%1$sは%2$s署名アルゴリズムを使用しており、これはセキュリティ・リスクとみなされます。
 whose.key.disabled=%1$sは%2$sを使用しており、これはセキュリティ・リスクとみなされ、無効化されています。
 whose.key.weak=%1$sは%2$sを使用しており、これはセキュリティ・リスクとみなされます。これは将来の更新で無効化されます。
-jks.storetype.warning=%1$sキーストアは独自の形式を使用しています。"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12"を使用する業界標準の形式であるPKCS12に移行することをお薦めします。
+jks.storetype.warning=%1$sは古い暗号化アルゴリズムを使用しているため、将来のリリースで削除されます。次を使用してPKCS12に移行します:\nkeytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12
 migrate.keystore.warning="%1$s"が%4$sに移行されました。%2$sキーストアは"%3$s"としてバックアップされます。
 backup.keystore.warning=元のキーストア"%1$s"は"%3$s"としてバックアップされます...
 importing.keystore.status=キーストア%1$sを%2$sにインポートしています...
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_zh_CN.properties b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_zh_CN.properties
index 1f96aa12c57..435e74e468f 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_zh_CN.properties
+++ b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_zh_CN.properties
@@ -313,7 +313,7 @@ Unable.to.parse.denyAfter.string.in.exception.message=无法解析异常错误
 whose.sigalg.weak=%1$s 使用的 %2$s 签名算法存在安全风险。
 whose.key.disabled=%1$s 使用的 %2$s 被视为存在安全风险而且被禁用。
 whose.key.weak=%1$s 使用的 %2$s 被视为存在安全风险。它将在未来的更新中被禁用。
-jks.storetype.warning=%1$s 密钥库使用专用格式。建议使用 "keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12" 迁移到行业标准格式 PKCS12。
+jks.storetype.warning=%1$s 使用的加密算法已过时，将在未来发行版中删除。请使用以下命令迁移到 PKCS12：\nkeytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12
 migrate.keystore.warning=已将 "%1$s" 迁移到 %4$s。将 %2$s 密钥库作为 "%3$s" 进行了备份。
 backup.keystore.warning=已将原始密钥库 "%1$s" 备份为 "%3$s"...
 importing.keystore.status=正在将密钥库 %1$s 导入到 %2$s...
diff --git a/src/java.base/share/classes/sun/security/util/Password.java b/src/java.base/share/classes/sun/security/util/Password.java
index e358bcd95de..02cdcaf53fd 100644
--- a/src/java.base/share/classes/sun/security/util/Password.java
+++ b/src/java.base/share/classes/sun/security/util/Password.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import java.util.Arrays;
 
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.io.JdkConsoleImpl;
+import jdk.internal.misc.VM;
 
 /**
  * A utility class for reading passwords
@@ -65,7 +66,9 @@ public class Password {
                     }
                     consoleBytes = ConsoleHolder.convertToBytes(consoleEntered);
                     in = new ByteArrayInputStream(consoleBytes);
-                } else if (System.in.available() == 0) {
+                } else if (in == System.in && VM.isBooted()
+                            && System.in.available() == 0) {
+                    // Warn if reading password from System.in but it's empty.
                     // This may be running in an IDE Run Window or in JShell,
                     // which acts like an interactive console and echoes the
                     // entered password. In this case, print a warning that
@@ -73,6 +76,7 @@ public class Password {
                     // it's more likely the input comes from a pipe, such as
                     // "echo password |" or "cat password_file |" where input
                     // will be silently consumed without echoing to the screen.
+                    // Warn only if VM is booted and ResourcesMgr is available.
                     System.err.print(ResourcesMgr.getString
                             ("warning.input.may.be.visible.on.screen"));
                 }
diff --git a/src/java.base/share/classes/sun/security/util/Pem.java b/src/java.base/share/classes/sun/security/util/Pem.java
index a9b2908bcc9..c49dcaa912f 100644
--- a/src/java.base/share/classes/sun/security/util/Pem.java
+++ b/src/java.base/share/classes/sun/security/util/Pem.java
@@ -59,6 +59,9 @@ public class Pem {
     // Pattern matching for stripping whitespace.
     private static final Pattern STRIP_WHITESPACE_PATTERN;
 
+    // Pattern matching for inserting line breaks.
+    private static final Pattern LINE_WRAP_64_PATTERN;
+
     // Lazy initialized PBES2 OID value
     private static ObjectIdentifier PBES2OID;
 
@@ -72,6 +75,7 @@ public class Pem {
         PBE_PATTERN = Pattern.compile("^PBEWith.*And.*",
             Pattern.CASE_INSENSITIVE);
         STRIP_WHITESPACE_PATTERN = Pattern.compile("\\s+");
+        LINE_WRAP_64_PATTERN = Pattern.compile("(.{64})");
     }
 
     public static final String CERTIFICATE = "CERTIFICATE";
@@ -359,7 +363,7 @@ public class Pem {
      * @return PEM in a string
      */
     public static String pemEncoded(PEM pem) {
-        String p = pem.content().replaceAll("(.{64})", "$1\r\n");
+        String p = LINE_WRAP_64_PATTERN.matcher(pem.content()).replaceAll("$1\r\n");
         return pemEncoded(pem.type(), p);
     }
 
diff --git a/src/java.base/share/classes/sun/security/util/resources/security_de.properties b/src/java.base/share/classes/sun/security/util/resources/security_de.properties
index a431268831b..63c7fdca472 100644
--- a/src/java.base/share/classes/sun/security/util/resources/security_de.properties
+++ b/src/java.base/share/classes/sun/security/util/resources/security_de.properties
@@ -43,7 +43,7 @@ provided.null.OID.map=Null-OID-Zuordnung angegeben
 NEWLINE=\n
 invalid.null.action.provided=Ungültige Nullaktion angegeben
 invalid.null.Class.provided=Ungültige Nullklasse angegeben
-Subject.=Subjekt:\n
+Subject.=Subject:\n
 .Principal.=\tPrincipal:\u0020
 .Public.Credential.=\tÖffentliche Zugangsdaten:\u0020
 .Private.Credential.=\tPrivate Zugangsdaten:\u0020
@@ -74,3 +74,6 @@ line.number.expected.expect.found.actual.=Zeile {0}: [{1}] erwartet, [{2}] gefun
 
 # sun.security.pkcs11.SunPKCS11
 PKCS11.Token.providerName.Password.=Kennwort für PKCS11-Token [{0}]:\u0020
+
+# sun.security.util.Password
+warning.input.may.be.visible.on.screen=[Warnung: Eingabe ist möglicherweise auf dem Bildschirm sichtbar]\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/security_ja.properties b/src/java.base/share/classes/sun/security/util/resources/security_ja.properties
index ff13b37cf3b..00d22e054a5 100644
--- a/src/java.base/share/classes/sun/security/util/resources/security_ja.properties
+++ b/src/java.base/share/classes/sun/security/util/resources/security_ja.properties
@@ -74,3 +74,6 @@ line.number.expected.expect.found.actual.=行{0}: [{1}]ではなく[{2}]が検
 
 # sun.security.pkcs11.SunPKCS11
 PKCS11.Token.providerName.Password.=PKCS11トークン[{0}]パスワード:\u0020
+
+# sun.security.util.Password
+warning.input.may.be.visible.on.screen=[警告: 入力が画面に表示される場合があります]\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/security_zh_CN.properties b/src/java.base/share/classes/sun/security/util/resources/security_zh_CN.properties
index 6a4ec11de77..a322cb7b1e8 100644
--- a/src/java.base/share/classes/sun/security/util/resources/security_zh_CN.properties
+++ b/src/java.base/share/classes/sun/security/util/resources/security_zh_CN.properties
@@ -74,3 +74,6 @@ line.number.expected.expect.found.actual.=行号 {0}: 应为 [{1}], 找到 [{2}]
 
 # sun.security.pkcs11.SunPKCS11
 PKCS11.Token.providerName.Password.=PKCS11 标记 [{0}] 密码：\u0020
+
+# sun.security.util.Password
+warning.input.may.be.visible.on.screen=[警告：输入可能显示在屏幕上]\u0020
diff --git a/src/java.base/share/classes/sun/util/locale/BaseLocale.java b/src/java.base/share/classes/sun/util/locale/BaseLocale.java
index 58ec6d76aa5..31078720ddc 100644
--- a/src/java.base/share/classes/sun/util/locale/BaseLocale.java
+++ b/src/java.base/share/classes/sun/util/locale/BaseLocale.java
@@ -34,11 +34,14 @@ package sun.util.locale;
 
 import jdk.internal.misc.CDS;
 import jdk.internal.util.ReferencedKeySet;
+import jdk.internal.vm.annotation.AOTRuntimeSetup;
+import jdk.internal.vm.annotation.AOTSafeClassInitializer;
 import jdk.internal.vm.annotation.Stable;
 
 import java.util.StringJoiner;
 import java.util.function.Supplier;
 
+@AOTSafeClassInitializer
 public final class BaseLocale {
 
     public static @Stable BaseLocale[] constantBaseLocales;
@@ -63,6 +66,7 @@ public final class BaseLocale {
             CANADA_FRENCH = 18,
             NUM_CONSTANTS = 19;
     static {
+        // Legacy CDS archive support (to be deprecated)
         CDS.initializeFromArchive(BaseLocale.class);
         BaseLocale[] baseLocales = constantBaseLocales;
         if (baseLocales == null) {
@@ -91,13 +95,21 @@ public final class BaseLocale {
     }
 
     // Interned BaseLocale cache
-    private static final LazyConstant<ReferencedKeySet<BaseLocale>> CACHE =
+    @Stable private static LazyConstant<ReferencedKeySet<BaseLocale>> CACHE;
+    static {
+        runtimeSetup();
+    }
+
+    @AOTRuntimeSetup
+    private static void runtimeSetup() {
+        CACHE =
             LazyConstant.of(new Supplier<>() {
                 @Override
                 public ReferencedKeySet<BaseLocale> get() {
                     return ReferencedKeySet.create(true, ReferencedKeySet.concurrentHashMapSupplier());
                 }
             });
+    }
 
     public static final String SEP = "_";
 
diff --git a/src/java.base/share/classes/sun/util/locale/UnicodeLocaleExtension.java b/src/java.base/share/classes/sun/util/locale/UnicodeLocaleExtension.java
index 7f66febf65f..d9d68c34349 100644
--- a/src/java.base/share/classes/sun/util/locale/UnicodeLocaleExtension.java
+++ b/src/java.base/share/classes/sun/util/locale/UnicodeLocaleExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/data/tzdata/VERSION b/src/java.base/share/data/tzdata/VERSION
index 4bd54efbcdc..ce25e7653b0 100644
--- a/src/java.base/share/data/tzdata/VERSION
+++ b/src/java.base/share/data/tzdata/VERSION
@@ -21,4 +21,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-tzdata2025b
+tzdata2025c
diff --git a/src/java.base/share/data/tzdata/africa b/src/java.base/share/data/tzdata/africa
index 8098f4bea9d..cf1247ee3ab 100644
--- a/src/java.base/share/data/tzdata/africa
+++ b/src/java.base/share/data/tzdata/africa
@@ -27,9 +27,9 @@
 # 2009-05-17 by Arthur David Olson.
 
 # This file is by no means authoritative; if you think you know better,
-# go ahead and edit the file (and please send any changes to
-# tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING in the tz distribution.
+# go ahead and edit the file, and please send any changes to
+# the public mailing list tz@iana.org for general use in the future.
+# For more, please see the file CONTRIBUTING in the tz distribution.
 
 # From Paul Eggert (2018-05-27):
 #
@@ -138,8 +138,9 @@ Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1912 Jan 01  2:00u # Praia
 			-1:00	-	%z
 
 # Chad
+# Fort-Lamy was renamed to N’Djamena on 1973-04-06.
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Ndjamena	1:00:12 -	LMT	1912 Jan  1 # N'Djamena
+Zone	Africa/Ndjamena	1:00:12 -	LMT	1912 Jan  1 # Fort-Lamy
 			1:00	-	WAT	1979 Oct 14
 			1:00	1:00	WAST	1980 Mar  8
 			1:00	-	WAT
diff --git a/src/java.base/share/data/tzdata/antarctica b/src/java.base/share/data/tzdata/antarctica
index 87787d31cfe..b3c186851f1 100644
--- a/src/java.base/share/data/tzdata/antarctica
+++ b/src/java.base/share/data/tzdata/antarctica
@@ -26,13 +26,10 @@
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
-# From Paul Eggert (1999-11-15):
-# To keep things manageable, we list only locations occupied year-round; see
-# COMNAP - Stations and Bases
-# http://www.comnap.aq/comnap/comnap.nsf/P/Stations/
-# and
-# Summary of the Peri-Antarctic Islands (1998-07-23)
-# http://www.spri.cam.ac.uk/bob/periant.htm
+# From Paul Eggert (2025-08-16):
+# To keep things manageable, list only locations occupied year-round; see
+# Antarctic Facilities Information
+# https://www.comnap.aq/antarctic-facilities-information
 # for information.
 # Unless otherwise specified, we have no time zone information.
 
@@ -167,6 +164,7 @@ Zone Antarctica/Mawson	0	-	-00	1954 Feb 13
 # China - year-round bases
 # Great Wall, King George Island, -6213-05858, since 1985-02-20
 # Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26
+# Qinling, Inexpressible I, Terra Nova Bay, -7456+16343, since 2024-02-07
 
 # France - year-round bases (also see "France & Italy")
 #
diff --git a/src/java.base/share/data/tzdata/asia b/src/java.base/share/data/tzdata/asia
index 55b13134f9c..005abd01793 100644
--- a/src/java.base/share/data/tzdata/asia
+++ b/src/java.base/share/data/tzdata/asia
@@ -27,9 +27,9 @@
 # 2009-05-17 by Arthur David Olson.
 
 # This file is by no means authoritative; if you think you know better,
-# go ahead and edit the file (and please send any changes to
-# tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING in the tz distribution.
+# go ahead and edit the file, and please send any changes to
+# the public mailing list tz@iana.org for general use in the future.
+# For more, please see the file CONTRIBUTING in the tz distribution.
 
 # From Paul Eggert (2019-07-11):
 #
diff --git a/src/java.base/share/data/tzdata/australasia b/src/java.base/share/data/tzdata/australasia
index d659d1fb4b1..638789f42da 100644
--- a/src/java.base/share/data/tzdata/australasia
+++ b/src/java.base/share/data/tzdata/australasia
@@ -960,9 +960,9 @@ Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13 # Vila
 # NOTES
 
 # This file is by no means authoritative; if you think you know better,
-# go ahead and edit the file (and please send any changes to
-# tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING in the tz distribution.
+# go ahead and edit the file, and please send any changes to
+# the public mailing list tz@iana.org for general use in the future.
+# For more, please see the file CONTRIBUTING in the tz distribution.
 
 # From Paul Eggert (2018-11-18):
 #
@@ -2011,6 +2011,7 @@ Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13 # Vila
 # From Paul Eggert (2018-11-19):
 # The 1921-01-15 introduction of standard time is in Shanks; it is also in
 # "Standard Time Throughout the World", US National Bureau of Standards (1935),
+# https://nvlpubs.nist.gov/nistpubs/Legacy/circ/nbscircular406.pdf
 # page 3, which does not give the UT offset.  In response to a comment by
 # Phake Nick I set the Nauru time of occupation by Japan to
 # 1942-08-29/1945-09-08 by using dates from:
@@ -2078,9 +2079,10 @@ Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13 # Vila
 # https://webspace.science.uu.nl/~gent0113/idl/idl_alaska_samoa.htm
 
 # Although Shanks & Pottenger says they both switched to UT -11:30
-# in 1911, and to -11 in 1950. many earlier sources give -11
+# in 1911, and to -11 in 1950, many earlier sources give -11
 # for American Samoa, e.g., the US National Bureau of Standards
 # circular "Standard Time Throughout the World", 1932.
+# https://nvlpubs.nist.gov/nistpubs/Legacy/circ/nbscircular399.pdf
 # Assume American Samoa switched to -11 in 1911, not 1950,
 # and that after 1950 they agreed until (western) Samoa skipped a
 # day in 2011.  Assume also that the Samoas follow the US and New
diff --git a/src/java.base/share/data/tzdata/europe b/src/java.base/share/data/tzdata/europe
index 7ba6c679609..b82ca6f67bb 100644
--- a/src/java.base/share/data/tzdata/europe
+++ b/src/java.base/share/data/tzdata/europe
@@ -27,9 +27,9 @@
 # 2009-05-17 by Arthur David Olson.
 
 # This file is by no means authoritative; if you think you know better,
-# go ahead and edit the file (and please send any changes to
-# tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING in the tz distribution.
+# go ahead and edit the file, and please send any changes to
+# the public mailing list tz@iana.org for general use in the future.
+# For more, please see the file CONTRIBUTING in the tz distribution.
 
 # From Paul Eggert (2017-02-10):
 #
@@ -65,7 +65,7 @@
 #	<https://www.jstor.org/stable/1774359>.  He writes:
 #	"It is requested that corrections and additions to these tables
 #	may be sent to Mr. John Milne, Royal Geographical Society,
-#	Savile Row, London."  Nowadays please email them to tz@iana.org.
+#	Savile Row, London."  Nowadays please see the file CONTRIBUTING.
 #
 #	Byalokoz EL. New Counting of Time in Russia since July 1, 1919.
 #	This Russian-language source was consulted by Vladimir Karpinsky; see
@@ -77,7 +77,7 @@
 #	Десятая гос. тип., 1919.
 #	http://resolver.gpntb.ru/purl?docushare/dsweb/Get/Resource-2011/Byalokoz__E.L.__Novyy__schet__vremeni__v__techenie__sutok__izd__2(1).pdf
 #
-#	Brazil's Divisão Serviço da Hora (DSHO),
+#	Brazil's Divisão de Serviços da Hora (DISHO)
 #	History of Summer Time
 #	<http://pcdsh01.on.br/HISTHV.htm>
 #	(1998-09-21, in Portuguese)
@@ -937,7 +937,7 @@ Rule	Belgium	1922	1927	-	Oct	Sat>=1	23:00s	0	-
 Rule	Belgium	1923	only	-	Apr	21	23:00s	1:00	S
 Rule	Belgium	1924	only	-	Mar	29	23:00s	1:00	S
 Rule	Belgium	1925	only	-	Apr	 4	23:00s	1:00	S
-# DSH writes that a royal decree of 1926-02-22 specified the Sun following 3rd
+# DISHO writes that a royal decree of 1926-02-22 specified the Sun following 3rd
 # Sat in Apr (except if it's Easter, in which case it's one Sunday earlier),
 # to Sun following 1st Sat in Oct, and that a royal decree of 1928-09-15
 # changed the transition times to 02:00 GMT.
@@ -1333,6 +1333,13 @@ Zone	Europe/Helsinki	1:39:49 -	LMT	1878 May 31
 # France
 # Monaco
 
+# From Robert H. van Gent (2025-07-21):
+# The most recent issue of the Annuaire [par le Bureau des Longitudes]
+# on Gallica (2021) ... lists information for France
+# https://gallica.bnf.fr/ark:/12148/bpt6k9127672b/f52.item
+# From Paul Eggert (2025-07-21):
+# Go with the 2020 Annuaire (published 2021) except as noted below.
+
 # From Ciro Discepolo (2000-12-20):
 #
 # Henri Le Corre, Régimes horaires pour le monde entier, Éditions
@@ -1394,7 +1401,6 @@ Zone	Europe/Helsinki	1:39:49 -	LMT	1878 May 31
 # problems in Algiers, Monaco and Tunis.
 
 #
-# Shank & Pottenger seem to use '24:00' ambiguously; resolve it with Whitman.
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
 Rule	France	1916	only	-	Jun	14	23:00s	1:00	S
 Rule	France	1916	1919	-	Oct	Sun>=1	23:00s	0	-
@@ -1406,9 +1412,25 @@ Rule	France	1920	only	-	Oct	23	23:00s	0	-
 Rule	France	1921	only	-	Mar	14	23:00s	1:00	S
 Rule	France	1921	only	-	Oct	25	23:00s	0	-
 Rule	France	1922	only	-	Mar	25	23:00s	1:00	S
-# DSH writes that a law of 1923-05-24 specified 3rd Sat in Apr at 23:00 to 1st
-# Sat in Oct at 24:00; and that in 1930, because of Easter, the transitions
-# were Apr 12 and Oct 5.  Go with Shanks & Pottenger.
+# From Robert H. van Gent (2025-07-22):
+# There is a curious history behind the erroneous date for the start of
+# daylight saving in France in 1923 as listed in the current issues of
+# the Annuaire du Bureau des Longitudes.  [See:]
+# https://lists.iana.org/hyperkitty/list/tz@iana.org/message/MYQEJMSXO2AIEZ3UIXZKMTTAIPY7KNT2/
+# From Brian Inglis (2025-07-23):
+# Légifrance JORF No. 0073 du 15 mars 1922
+# https://www.legifrance.gouv.fr/jorf/jo/id/JORFCONT000000008324
+# Légifrance JORF No. 0139 du 25 mai 1923
+# https://www.legifrance.gouv.fr/jorf/jo/id/JORFCONT000000008416
+# From Paul Eggert (2025-07-23):
+# The latter specifies March's last Saturday at 23:00 to October's first
+# Saturday at 24:00, except that if neighboring allies agree the dates
+# can be moved to April's third Saturday and September's third Saturday.
+# Apparently spring 1923 was tricky.  DISHO writes that in 1930,
+# because of Easter, the transitions were Apr 12 and Oct 5.
+# Use the 2020 Annuaire dates, except for spring 1923 where
+# Shanks & Pottenger's May 26 matches the dates given in the 1924 and
+# 1961-2001 issues of the Annuaire.
 Rule	France	1922	1938	-	Oct	Sat>=1	23:00s	0	-
 Rule	France	1923	only	-	May	26	23:00s	1:00	S
 Rule	France	1924	only	-	Mar	29	23:00s	1:00	S
@@ -2119,12 +2141,10 @@ Zone	Europe/Warsaw	1:24:00 -	LMT	1880
 # all clocks therefore having to be advanced or set back correspondingly ...
 
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
-# From Tim Parenti (2024-07-01), per Paul Eggert (1999-01-30):
-# DSH writes in their history that Decreto 1469 of 1915-03-30 established
-# summer time and that, "despite" this, the change to the clocks was not done
-# every year, depending on what Spain did, because of railroad schedules.
-# In fact, that decree had nothing to do with DST; rather, it regulated the
-# sending of time signals.  But we do see linkage to Spain in the 1920s below.
+# From Tim Parenti (2024-07-01):
+# Decreto 1469 of 1915-03-30 ... had nothing to do with DST;
+# rather it regulated the sending of time signals.
+# But we do see linkage to Spain in the 1920s below.
 # https://dre.pt/dr/detalhe/decreto/1469-1915-285721
 # https://dre.pt/application/conteudo/285721
 #
diff --git a/src/java.base/share/data/tzdata/iso3166.tab b/src/java.base/share/data/tzdata/iso3166.tab
index 7fa350ecbe3..ddcc841fe97 100644
--- a/src/java.base/share/data/tzdata/iso3166.tab
+++ b/src/java.base/share/data/tzdata/iso3166.tab
@@ -26,22 +26,22 @@
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
-# From Paul Eggert (2023-09-06):
+# From Paul Eggert (2025-07-01):
 # This file contains a table of two-letter country codes.  Columns are
-# separated by a single tab.  Lines beginning with '#' are comments.
+# separated by a single tab.  Lines beginning with ‘#’ are comments.
 # All text uses UTF-8 encoding.  The columns of the table are as follows:
 #
 # 1.  ISO 3166-1 alpha-2 country code, current as of
-#     ISO/TC 46 N1108 (2023-04-05).  See: ISO/TC 46 Documents
+#     ISO/TC 46 N1127 (2024-02-29).  See: ISO/TC 46 Documents
 #     https://www.iso.org/committee/48750.html?view=documents
 # 2.  The usual English name for the coded region.  This sometimes
 #     departs from ISO-listed names, sometimes so that sorted subsets
-#     of names are useful (e.g., "Samoa (American)" and "Samoa
-#     (western)" rather than "American Samoa" and "Samoa"),
+#     of names are useful (e.g., “Samoa (American)” and “Samoa
+#     (western)” rather than “American Samoa” and “Samoa”),
 #     sometimes to avoid confusion among non-experts (e.g.,
-#     "Czech Republic" and "Turkey" rather than "Czechia" and "Türkiye"),
-#     and sometimes to omit needless detail or churn (e.g., "Netherlands"
-#     rather than "Netherlands (the)" or "Netherlands (Kingdom of the)").
+#     “Czech Republic” and “Turkey” rather than “Czechia” and “Türkiye”),
+#     and sometimes to omit needless detail or churn (e.g., “Netherlands”
+#     rather than “Netherlands (the)” or “Netherlands (Kingdom of the)”).
 #
 # The table is sorted by country code.
 #
@@ -94,7 +94,7 @@ CD	Congo (Dem. Rep.)
 CF	Central African Rep.
 CG	Congo (Rep.)
 CH	Switzerland
-CI	Côte d'Ivoire
+CI	Côte d’Ivoire
 CK	Cook Islands
 CL	Chile
 CM	Cameroon
diff --git a/src/java.base/share/data/tzdata/leapseconds b/src/java.base/share/data/tzdata/leapseconds
index 042a32b052c..9426b40f07e 100644
--- a/src/java.base/share/data/tzdata/leapseconds
+++ b/src/java.base/share/data/tzdata/leapseconds
@@ -28,7 +28,8 @@
 # This file is generated automatically from the data in the public-domain
 # NIST/IERS format leap-seconds.list file, which can be copied from
 # <https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list>
-# or, in a variant with different comments, from
+# or via a less-secure protocol and with different comments and
+# less volatile last-modified and expiration timestamps, from
 # <ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.list>.
 # For more about leap-seconds.list, please see
 # The NTP Timescale and Leap Seconds
@@ -92,11 +93,17 @@ Leap	2016	Dec	31	23:59:60	+	S
 # Any additional leap seconds will come after this.
 # This Expires line is commented out for now,
 # so that pre-2020a zic implementations do not reject this file.
-#Expires 2025	Dec	28	00:00:00
+#Expires 2026	Jun	28	00:00:00
 
-# POSIX timestamps for the data in this file:
-#updated 1736208000 (2025-01-07 00:00:00 UTC)
-#expires 1766880000 (2025-12-28 00:00:00 UTC)
+# Here are POSIX timestamps for the data in this file.
+# "#updated" gives the last time the leap seconds data changed
+# or, if this file was derived from the IERS leap-seconds.list,
+# the last time that file changed in any way.
+# "#expires" gives the first time this file might be wrong;
+# if this file was derived from the IERS leap-seconds.list,
+# this is typically a bit less than one year after "updated".
+#updated 1751846400 (2025-07-07 00:00:00 UTC)
+#expires 1782604800 (2026-06-28 00:00:00 UTC)
 
 #	Updated through IERS Bulletin C (https://hpiers.obspm.fr/iers/bul/bulc/bulletinc.dat)
-#	File expires on 28 December 2025
+#	File expires on 28 June 2026
diff --git a/src/java.base/share/data/tzdata/northamerica b/src/java.base/share/data/tzdata/northamerica
index 21f178ee8cb..f20879e9063 100644
--- a/src/java.base/share/data/tzdata/northamerica
+++ b/src/java.base/share/data/tzdata/northamerica
@@ -29,9 +29,9 @@
 # also includes Central America and the Caribbean
 
 # This file is by no means authoritative; if you think you know better,
-# go ahead and edit the file (and please send any changes to
-# tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING in the tz distribution.
+# go ahead and edit the file, and please send any changes to
+# the public mailing list tz@iana.org for general use in the future.
+# For more, please see the file CONTRIBUTING in the tz distribution.
 
 # From Paul Eggert (1999-03-22):
 # A reliable and entertaining source about time zones is
@@ -1241,6 +1241,16 @@ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
 # _Los Angeles Times_ (1998-11-10), A1, A10; it cites
 # Jimmy Skaggs, _The Great Guano Rush_ (1994).
 
+# From Rob van Gent (2025-07-23):
+# Another useful source for historical time zone information appears to be
+# a series of circulars with the title "Standard Time Throughout the World"
+# issued between 1925 and 1950 by the U.S. Bureau of Standards.
+# I found the following issues online:
+# https://nvlpubs.nist.gov/nistpubs/Legacy/circ/nbscircular280.pdf (1925)
+# https://nvlpubs.nist.gov/nistpubs/Legacy/circ/nbscircular399.pdf (1932)
+# https://nvlpubs.nist.gov/nistpubs/Legacy/circ/nbscircular406.pdf (1935)
+# https://nvlpubs.nist.gov/nistpubs/Legacy/circ/nbscircular496.pdf (1950)
+
 ################################################################################
 
 
@@ -2457,12 +2467,35 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
 # on the same dates or with a difference of one day.
 # So it may be easier to implement these changes as DST with rule CA
 # during this whole period.
+
+# From Alois Treindl (2025-07-29):
+# I did a quick newspaper archive research on https://hndm.iib.unam.mx/
+# and found that Periódico Oficial del Estado de Baja California Norte
+# (1973-04-20) states clearly that DST was observed from last Sunday
+# in April to last Sunday in October....  I have a few more data from the
+# official bulletin for DST begin or end in Baja California 1964 1967 1969
+# 1972 1973 (already sent) 1974 1975 1976 I do not know whether it is safe to
+# assume that it also applied in the years where I did not yet find proof.
+# The 1974 end of DST contains a reference to an Acuerdo of 1973-dec-20 which
+# I could not find....  One might assume that Baja California, which followed
+# US-CA in all these other yours, did the same.
 #
-# From Paul Eggert (2024-08-18):
-# For now, maintain the slightly-different history for Baja California,
+# From Paul Eggert (2025-08-04):
+# Assume that Tijuana agreed with San Diego from 1953 through 1996,
+# as this agrees with Alois Treindl's data and with Shanks.
+# For now, keep the slightly-different 1948/1952 history for Baja California,
 # as we have no information on whether 1948/1952 clocks in Tijuana followed
 # the decrees or followed San Diego.
 
+# From Mark Schapiro, writing in The Nation (2002-10-28):
+# https://www.thenation.com/article/archive/sowing-disaster/
+# When Mexican clocks were turned back for daylight saving time in the spring,
+# the Zapotecs refused to make the adjustment, insisting that they live in
+# "God's time," not in what they derisively call "Fox time," referring to
+# President Vicente Fox in far-off Mexico City.
+# From Paul Eggert (2025-08-04):
+# Unfortunately we have no data to track this informal practice.
+
 # From Alan Perry (1996-02-15):
 # A guy from our Mexico subsidiary finally found the Presidential Decree
 # outlining the timezone changes in Mexico.
@@ -2728,7 +2761,7 @@ Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1  7:00u
 # Chihuahua (near US border - western side)
 # This includes the municipios of Janos, Ascensión, Juárez, Guadalupe, and
 # Práxedis G Guerrero.
-# http://gaceta.diputados.gob.mx/PDF/65/2a022/nov/20221124-VII.pdf
+# https://gaceta.diputados.gob.mx/PDF/65/2022/nov/20221124-VII.pdf
 Zone America/Ciudad_Juarez -7:05:56 -	LMT	1922 Jan  1  7:00u
 			-7:00	-	MST	1927 Jun 10
 			-6:00	-	CST	1930 Nov 15
@@ -2743,7 +2776,7 @@ Zone America/Ciudad_Juarez -7:05:56 -	LMT	1922 Jan  1  7:00u
 # Chihuahua (near US border - eastern side)
 # This includes the municipios of Coyame del Sotol, Ojinaga, and Manuel
 # Benavides.
-# http://gaceta.diputados.gob.mx/PDF/65/2a022/nov/20221124-VII.pdf
+# https://gaceta.diputados.gob.mx/PDF/65/2022/nov/20221124-VII.pdf
 Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan  1  7:00u
 			-7:00	-	MST	1927 Jun 10
 			-6:00	-	CST	1930 Nov 15
@@ -2840,9 +2873,7 @@ Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  7:00u
 			-8:00	1:00	PDT	1951 Sep 30  2:00
 			-8:00	-	PST	1952 Apr 27  2:00
 			-8:00	1:00	PDT	1952 Sep 28  2:00
-			-8:00	-	PST	1954
-			-8:00	CA	P%sT	1961
-			-8:00	-	PST	1976
+			-8:00	CA	P%sT	1967
 			-8:00	US	P%sT	1996
 			-8:00	Mexico	P%sT	2001
 			-8:00	US	P%sT	2002 Feb 20
diff --git a/src/java.base/share/data/tzdata/southamerica b/src/java.base/share/data/tzdata/southamerica
index ca3c338591f..f932d5a72a1 100644
--- a/src/java.base/share/data/tzdata/southamerica
+++ b/src/java.base/share/data/tzdata/southamerica
@@ -27,9 +27,9 @@
 # 2009-05-17 by Arthur David Olson.
 
 # This file is by no means authoritative; if you think you know better,
-# go ahead and edit the file (and please send any changes to
-# tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING in the tz distribution.
+# go ahead and edit the file, and please send any changes to
+# the public mailing list tz@iana.org for general use in the future.
+# For more, please see the file CONTRIBUTING in the tz distribution.
 
 # From Paul Eggert (2016-12-05):
 #
diff --git a/src/java.base/share/man/java.md b/src/java.base/share/man/java.md
index 8517e161e3f..30661a3f387 100644
--- a/src/java.base/share/man/java.md
+++ b/src/java.base/share/man/java.md
@@ -3002,6 +3002,8 @@ No documented java options have been removed in JDK @@VERSION_SPECIFICATION@@.
 
 For the lists and descriptions of options removed in previous releases see the *Removed Java Options* section in:
 
+-   [The `java` Command, Release 26](https://docs.oracle.com/en/java/javase/26/docs/specs/man/java.html)
+
 -   [The `java` Command, Release 25](https://docs.oracle.com/en/java/javase/25/docs/specs/man/java.html)
 
 -   [The `java` Command, Release 24](https://docs.oracle.com/en/java/javase/24/docs/specs/man/java.html)
diff --git a/src/java.base/share/native/libjava/VirtualThread.c b/src/java.base/share/native/libjava/VirtualThread.c
index 5936031f926..850a600726e 100644
--- a/src/java.base/share/native/libjava/VirtualThread.c
+++ b/src/java.base/share/native/libjava/VirtualThread.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/share/native/libjimage/imageDecompressor.cpp b/src/java.base/share/native/libjimage/imageDecompressor.cpp
index 65bda0957b8..748bbf8203f 100644
--- a/src/java.base/share/native/libjimage/imageDecompressor.cpp
+++ b/src/java.base/share/native/libjimage/imageDecompressor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -111,11 +111,11 @@ ImageDecompressor* ImageDecompressor::get_decompressor(const char * decompressor
 u8 ImageDecompressor::getU8(u1* ptr, Endian *endian) {
     u8 ret;
     if (endian->is_big_endian()) {
-        ret = (u8)ptr[0] << 56 | (u8)ptr[1] << 48 | (u8)ptr[2]<<40 | (u8)ptr[3]<<32 |
-                ptr[4]<<24 | ptr[5]<<16 | ptr[6]<<8 | ptr[7];
+        ret = (u8)ptr[0] << 56 | (u8)ptr[1] << 48 | (u8)ptr[2] << 40 | (u8)ptr[3] << 32 |
+                (u8)ptr[4] << 24 | (u8)ptr[5] << 16 | (u8)ptr[6] << 8 | (u8)ptr[7];
     } else {
-        ret = ptr[0] | ptr[1]<<8 | ptr[2]<<16 | ptr[3]<<24 | (u8)ptr[4]<<32 |
-                (u8)ptr[5]<<40 | (u8)ptr[6]<<48 | (u8)ptr[7]<<56;
+        ret = (u8)ptr[0] | (u8)ptr[1] << 8 | (u8)ptr[2] << 16 | (u8)ptr[3] << 24 |
+                (u8)ptr[4] << 32 | (u8)ptr[5] << 40 | (u8)ptr[6] << 48 | (u8)ptr[7] << 56;
     }
     return ret;
 }
@@ -123,9 +123,9 @@ u8 ImageDecompressor::getU8(u1* ptr, Endian *endian) {
 u4 ImageDecompressor::getU4(u1* ptr, Endian *endian) {
     u4 ret;
     if (endian->is_big_endian()) {
-        ret = ptr[0] << 24 | ptr[1]<<16 | (ptr[2]<<8) | ptr[3];
+        ret = (u4)ptr[0] << 24 | (u4)ptr[1] << 16 | (u4)ptr[2] << 8 | (u4)ptr[3];
     } else {
-        ret = ptr[0] | ptr[1]<<8 | (ptr[2]<<16) | ptr[3]<<24;
+        ret = (u4)ptr[0] | (u4)ptr[1] << 8 | (u4)ptr[2] << 16 | (u4)ptr[3] << 24;
     }
     return ret;
 }
diff --git a/src/java.base/share/native/libnet/net_util.c b/src/java.base/share/native/libnet/net_util.c
index 5b356d04b3c..2a89d0711bc 100644
--- a/src/java.base/share/native/libnet/net_util.c
+++ b/src/java.base/share/native/libnet/net_util.c
@@ -81,12 +81,11 @@ DEF_JNI_OnLoad(JavaVM *vm, void *reserved)
      * supporting socket APIs are available
      */
     IPv4_available = IPv4_supported();
-    IPv6_available = IPv6_supported() & (!preferIPv4Stack);
+    IPv6_available = IPv6_supported() && !preferIPv4Stack;
 
     /* check if SO_REUSEPORT is supported on this platform */
     REUSEPORT_available = reuseport_supported(IPv6_available);
 
-
     return JNI_VERSION_1_2;
 }
 
diff --git a/src/java.base/share/native/libverify/check_code.c b/src/java.base/share/native/libverify/check_code.c
index 32df102dcb3..5a8f50cd0a0 100644
--- a/src/java.base/share/native/libverify/check_code.c
+++ b/src/java.base/share/native/libverify/check_code.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/unix/classes/java/lang/ProcessImpl.java b/src/java.base/unix/classes/java/lang/ProcessImpl.java
index 390a4f28477..00b51fb3389 100644
--- a/src/java.base/unix/classes/java/lang/ProcessImpl.java
+++ b/src/java.base/unix/classes/java/lang/ProcessImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/unix/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java b/src/java.base/unix/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
index dc56abb86df..efe72fc760f 100644
--- a/src/java.base/unix/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
+++ b/src/java.base/unix/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@ import java.net.URL;
 import java.security.GeneralSecurityException;
 import java.util.Base64;
 import java.util.Locale;
-import java.util.Properties;
 
 import sun.net.www.HeaderParser;
 import sun.net.www.protocol.http.AuthenticationInfo;
@@ -203,10 +202,10 @@ public final class NTLMAuthentication extends AuthenticationInfo {
      * @param p A source of header values for this connection, not used because
      *          HeaderParser converts the fields to lower case, use raw instead
      * @param raw The raw header field.
-     * @return true if all goes well, false if no headers were set.
+     * @throws IOException if no headers were set
      */
     @Override
-    public boolean setHeaders(HttpURLConnection conn, HeaderParser p, String raw) {
+    public void setHeaders(HttpURLConnection conn, HeaderParser p, String raw) throws IOException {
         // no need to synchronize here:
         //   already locked by s.n.w.p.h.HttpURLConnection
         assert conn.isLockHeldByCurrentThread();
@@ -220,9 +219,8 @@ public final class NTLMAuthentication extends AuthenticationInfo {
                 response = buildType3Msg (msg);
             }
             conn.setAuthenticationProperty(getHeaderName(), response);
-            return true;
-        } catch (IOException | GeneralSecurityException e) {
-            return false;
+        } catch (GeneralSecurityException e) {
+            throw new IOException(e);
         }
     }
 
@@ -232,8 +230,7 @@ public final class NTLMAuthentication extends AuthenticationInfo {
         return result;
     }
 
-    private String buildType3Msg (String challenge) throws GeneralSecurityException,
-                                                           IOException  {
+    private String buildType3Msg (String challenge) throws GeneralSecurityException {
         /* First decode the type2 message to get the server nonce */
         /* nonce is located at type2[24] for 8 bytes */
 
diff --git a/src/java.base/unix/classes/sun/nio/ch/FileKey.java b/src/java.base/unix/classes/sun/nio/ch/FileKey.java
index f08d92dc06b..7e9c69c2e90 100644
--- a/src/java.base/unix/classes/sun/nio/ch/FileKey.java
+++ b/src/java.base/unix/classes/sun/nio/ch/FileKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java
index a84a1b4547c..402f26120c7 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java
index 55661ff12a3..d41df6dd5be 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -98,7 +98,8 @@ class UnixFileAttributes
                                                   path, flag, attrs);
         if (errno == 0)
             return attrs;
-        else if (errno == UnixConstants.ENOENT)
+        else if (errno == UnixConstants.ENOENT ||
+                 errno == UnixConstants.ENOTDIR)
             return null;
         else
             throw new UnixException(errno);
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java
index 60c7e2a96f8..ae2888a02a9 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
index 1d16af23460..fffa978236b 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/unix/native/jspawnhelper/jspawnhelper.c b/src/java.base/unix/native/jspawnhelper/jspawnhelper.c
index 071be59504d..d2302d0c2e7 100644
--- a/src/java.base/unix/native/jspawnhelper/jspawnhelper.c
+++ b/src/java.base/unix/native/jspawnhelper/jspawnhelper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/unix/native/launcher/relauncher.c b/src/java.base/unix/native/launcher/relauncher.c
index f95e3b38caa..8ddbeb98ab0 100644
--- a/src/java.base/unix/native/launcher/relauncher.c
+++ b/src/java.base/unix/native/launcher/relauncher.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/unix/native/libjava/locale_str.h b/src/java.base/unix/native/libjava/locale_str.h
index ea1a8c8fd47..fd8724a33d9 100644
--- a/src/java.base/unix/native/libjava/locale_str.h
+++ b/src/java.base/unix/native/libjava/locale_str.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/unix/native/libjli/java_md_common.c b/src/java.base/unix/native/libjli/java_md_common.c
index f67a50304d0..45509c7d25d 100644
--- a/src/java.base/unix/native/libjli/java_md_common.c
+++ b/src/java.base/unix/native/libjli/java_md_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -259,29 +259,6 @@ JLI_ReportExceptionDescription(JNIEnv * env) {
   (*env)->ExceptionDescribe(env);
 }
 
-/*
- *      Since using the file system as a registry is a bit risky, perform
- *      additional sanity checks on the identified directory to validate
- *      it as a valid JDK.
- *
- *      Return 0 if the tests fail; otherwise return non-zero (true).
- *
- *      Note that checking for anything more than the existence of an
- *      executable object at bin/java relative to the path being checked
- *      will break the regression tests.
- */
-static int
-CheckSanity(char *path, char *dir)
-{
-    char    buffer[PATH_MAX];
-
-    if (JLI_StrLen(path) + JLI_StrLen(dir) + 11 > PATH_MAX)
-        return (0);     /* Silently reject "impossibly" long paths */
-
-    JLI_Snprintf(buffer, sizeof(buffer), "%s/%s/bin/java", path, dir);
-    return ((access(buffer, X_OK) == 0) ? 1 : 0);
-}
-
 /*
  * "Borrowed" from Solaris 10 where the unsetenv() function is being added
  * to libc thanks to SUSv3 (Standard Unix Specification, version 3). As
diff --git a/src/java.base/unix/native/libnet/Inet4AddressImpl.c b/src/java.base/unix/native/libnet/Inet4AddressImpl.c
index fff524e03ae..9bddbcaede7 100644
--- a/src/java.base/unix/native/libnet/Inet4AddressImpl.c
+++ b/src/java.base/unix/native/libnet/Inet4AddressImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -108,7 +108,8 @@ Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
     hints.ai_flags = AI_CANONNAME;
     hints.ai_family = AF_INET;
 
-    error = getaddrinfo(hostname, NULL, &hints, &res);
+    NET_RESTARTABLE(error, getaddrinfo(hostname, NULL, &hints, &res),
+                    error == EAI_SYSTEM && errno == EINTR);
 
     if (error) {
 #if defined(MACOSX)
@@ -229,17 +230,21 @@ Java_java_net_Inet4AddressImpl_getHostByAddr(JNIEnv *env, jobject this,
     sa.sin_addr.s_addr = htonl(addr);
     sa.sin_family = AF_INET;
 
-    if (getnameinfo((struct sockaddr *)&sa, sizeof(struct sockaddr_in),
-                    host, sizeof(host), NULL, 0, NI_NAMEREQD)) {
-        JNU_ThrowByName(env, "java/net/UnknownHostException", NULL);
-    } else {
+    int r;
+
+    NET_RESTARTABLE(r, getnameinfo((struct sockaddr *)&sa, sizeof(struct sockaddr_in),
+                                   host, sizeof(host), NULL, 0, NI_NAMEREQD),
+                    r == EAI_SYSTEM && errno == EINTR);
+
+    if (r == 0) {
         ret = (*env)->NewStringUTF(env, host);
-        if (ret == NULL) {
-            JNU_ThrowByName(env, "java/net/UnknownHostException", NULL);
+        if (ret != NULL) {
+            return ret;
         }
     }
 
-    return ret;
+    JNU_ThrowByName(env, "java/net/UnknownHostException", NULL);
+    return NULL;
 }
 
 /**
@@ -283,7 +288,8 @@ tcp_ping4(JNIEnv *env, SOCKETADDRESS *sa, SOCKETADDRESS *netif, jint timeout,
     SET_NONBLOCKING(fd);
 
     sa->sa4.sin_port = htons(7); // echo port
-    connect_rv = connect(fd, &sa->sa, sizeof(struct sockaddr_in));
+    NET_RESTARTABLE(connect_rv, connect(fd, &sa->sa, sizeof(struct sockaddr_in)),
+                    connect_rv == -1 && errno == EINTR);
 
     // connection established or refused immediately, either way it means
     // we were able to reach the host!
@@ -397,8 +403,11 @@ ping4(JNIEnv *env, jint fd, SOCKETADDRESS *sa, SOCKETADDRESS *netif,
         icmp->icmp_cksum = 0;
         // manually calculate checksum
         icmp->icmp_cksum = in_cksum((u_short *)icmp, plen);
+
         // send it
-        n = sendto(fd, sendbuf, plen, 0, &sa->sa, sizeof(struct sockaddr_in));
+        NET_RESTARTABLE(n, sendto(fd, sendbuf, plen, 0, &sa->sa, sizeof(struct sockaddr_in)),
+                        n == -1 && errno == EINTR)
+
         if (n < 0 && errno != EINPROGRESS) {
 #if defined(__linux__)
             /*
@@ -422,8 +431,9 @@ ping4(JNIEnv *env, jint fd, SOCKETADDRESS *sa, SOCKETADDRESS *netif,
             tmout2 = NET_Wait(env, fd, NET_WAIT_READ, tmout2);
             if (tmout2 >= 0) {
                 len = sizeof(sa_recv);
-                n = recvfrom(fd, recvbuf, sizeof(recvbuf), 0,
-                             (struct sockaddr *)&sa_recv, &len);
+                NET_RESTARTABLE(n, recvfrom(fd, recvbuf, sizeof(recvbuf), 0,
+                                      (struct sockaddr *)&sa_recv, &len),
+                                      n == -1 && errno == EINTR);
                 // check if we received enough data
                 if (n < (jint)sizeof(struct ip)) {
                     continue;
diff --git a/src/java.base/unix/native/libnet/Inet6AddressImpl.c b/src/java.base/unix/native/libnet/Inet6AddressImpl.c
index 83354356936..8dce4f9cc6b 100644
--- a/src/java.base/unix/native/libnet/Inet6AddressImpl.c
+++ b/src/java.base/unix/native/libnet/Inet6AddressImpl.c
@@ -227,7 +227,8 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
     hints.ai_flags = AI_CANONNAME;
     hints.ai_family = lookupCharacteristicsToAddressFamily(characteristics);
 
-    error = getaddrinfo(hostname, NULL, &hints, &res);
+    NET_RESTARTABLE(error, getaddrinfo(hostname, NULL, &hints, &res),
+                                      error == EAI_SYSTEM && errno == EINTR);
 
     if (error) {
 #if defined(MACOSX)
@@ -430,16 +431,20 @@ Java_java_net_Inet6AddressImpl_getHostByAddr(JNIEnv *env, jobject this,
         len = sizeof(struct sockaddr_in6);
     }
 
-    if (getnameinfo(&sa.sa, len, host, sizeof(host), NULL, 0, NI_NAMEREQD)) {
-        JNU_ThrowByName(env, "java/net/UnknownHostException", NULL);
-    } else {
+    int r;
+
+    NET_RESTARTABLE(r, getnameinfo(&sa.sa, len, host, sizeof(host), NULL, 0, NI_NAMEREQD),
+                    r == EAI_SYSTEM && errno == EINTR);
+
+    if (r == 0) {
         ret = (*env)->NewStringUTF(env, host);
-        if (ret == NULL) {
-            JNU_ThrowByName(env, "java/net/UnknownHostException", NULL);
+        if (ret != NULL) {
+            return ret;
         }
     }
 
-    return ret;
+    JNU_ThrowByName(env, "java/net/UnknownHostException", NULL);
+    return NULL;
 }
 
 /**
@@ -483,7 +488,8 @@ tcp_ping6(JNIEnv *env, SOCKETADDRESS *sa, SOCKETADDRESS *netif, jint timeout,
     SET_NONBLOCKING(fd);
 
     sa->sa6.sin6_port = htons(7); // echo port
-    connect_rv = connect(fd, &sa->sa, sizeof(struct sockaddr_in6));
+    NET_RESTARTABLE(connect_rv, connect(fd, &sa->sa, sizeof(struct sockaddr_in6)),
+                    connect_rv == -1 && errno == EINTR);
 
     // connection established or refused immediately, either way it means
     // we were able to reach the host!
@@ -604,7 +610,10 @@ ping6(JNIEnv *env, jint fd, SOCKETADDRESS *sa, SOCKETADDRESS *netif,
         memcpy(sendbuf + sizeof(struct icmp6_hdr), &tv, sizeof(tv));
         icmp6->icmp6_cksum = 0;
         // send it
-        n = sendto(fd, sendbuf, plen, 0, &sa->sa, sizeof(struct sockaddr_in6));
+
+        NET_RESTARTABLE(n, sendto(fd, sendbuf, plen, 0, &sa->sa, sizeof(struct sockaddr_in6)),
+                        n == -1 && errno == EINTR);
+
         if (n < 0 && errno != EINPROGRESS) {
 #if defined(__linux__)
             /*
@@ -628,8 +637,9 @@ ping6(JNIEnv *env, jint fd, SOCKETADDRESS *sa, SOCKETADDRESS *netif,
             tmout2 = NET_Wait(env, fd, NET_WAIT_READ, tmout2);
             if (tmout2 >= 0) {
                 len = sizeof(sa_recv);
-                n = recvfrom(fd, recvbuf, sizeof(recvbuf), 0,
-                             (struct sockaddr *)&sa_recv, &len);
+                NET_RESTARTABLE(n, recvfrom(fd, recvbuf, sizeof(recvbuf), 0,
+                                   (struct sockaddr *)&sa_recv, &len),
+                                   n == -1 && errno == EINTR);
                 // check if we received enough data
                 if (n < (jint)sizeof(struct icmp6_hdr)) {
                     continue;
diff --git a/src/java.base/unix/native/libnet/NetworkInterface.c b/src/java.base/unix/native/libnet/NetworkInterface.c
index ceb5dd5f751..f5025b9f488 100644
--- a/src/java.base/unix/native/libnet/NetworkInterface.c
+++ b/src/java.base/unix/native/libnet/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/unix/native/libnet/net_util_md.c b/src/java.base/unix/native/libnet/net_util_md.c
index 9bb6a026961..1496be5f5c6 100644
--- a/src/java.base/unix/native/libnet/net_util_md.c
+++ b/src/java.base/unix/native/libnet/net_util_md.c
@@ -76,9 +76,6 @@ NET_ThrowNew(JNIEnv *env, int errorNumber, char *msg) {
         jio_snprintf(fullMsg, sizeof(fullMsg), "socket closed: %s", msg);
         JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", fullMsg);
         break;
-    case EINTR:
-        JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException", msg);
-        break;
     default:
         errno = errorNumber;
         JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", msg);
@@ -282,7 +279,7 @@ NET_InetAddressToSockaddr(JNIEnv *env, jobject iaObj, int port,
     } else {
         jint address;
         if (family != java_net_InetAddress_IPv4) {
-            JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Protocol family unavailable");
+            JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "IPv6 protocol family unavailable");
             return -1;
         }
         address = getInetAddress_addr(env, iaObj);
@@ -627,11 +624,11 @@ NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout)
         pfd.fd = fd;
         pfd.events = 0;
         if (flags & NET_WAIT_READ)
-          pfd.events |= POLLIN;
+            pfd.events |= POLLIN;
         if (flags & NET_WAIT_WRITE)
-          pfd.events |= POLLOUT;
+            pfd.events |= POLLOUT;
         if (flags & NET_WAIT_CONNECT)
-          pfd.events |= POLLOUT;
+            pfd.events |= POLLOUT;
 
         errno = 0;
         read_rv = poll(&pfd, 1, nanoTimeout / NET_NSEC_PER_MSEC);
@@ -639,13 +636,13 @@ NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout)
         newNanoTime = JVM_NanoTime(env, 0);
         nanoTimeout -= (newNanoTime - prevNanoTime);
         if (nanoTimeout < NET_NSEC_PER_MSEC) {
-          return read_rv > 0 ? 0 : -1;
+            return read_rv > 0 ? 0 : -1;
         }
         prevNanoTime = newNanoTime;
 
         if (read_rv > 0) {
-          break;
+            break;
         }
-      } /* while */
+    } /* while */
     return (nanoTimeout / NET_NSEC_PER_MSEC);
 }
diff --git a/src/java.base/unix/native/libnet/net_util_md.h b/src/java.base/unix/native/libnet/net_util_md.h
index 902cf96732f..dca6e97755a 100644
--- a/src/java.base/unix/native/libnet/net_util_md.h
+++ b/src/java.base/unix/native/libnet/net_util_md.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -80,4 +80,17 @@ void NET_ThrowUnknownHostExceptionWithGaiError(JNIEnv *env,
 void NET_ThrowByNameWithLastError(JNIEnv *env, const char *name,
                                   const char *defaultDetail);
 
+/**
+ * Invokes CALL in a loop, setting RET to return value.
+ * Invokes PREDICATE for condition to restart CALL (in loop)
+ * Return RET otherwise
+ */
+#define NET_RESTARTABLE(RET,CALL,PREDICATE)     \
+    while (1) {                                 \
+        RET = CALL;                             \
+        if (!(PREDICATE)) {                     \
+            break;                              \
+        }                                       \
+    }
+
 #endif /* NET_UTILS_MD_H */
diff --git a/src/java.base/windows/classes/java/lang/ProcessImpl.java b/src/java.base/windows/classes/java/lang/ProcessImpl.java
index 78180cce678..1a08aca52e9 100644
--- a/src/java.base/windows/classes/java/lang/ProcessImpl.java
+++ b/src/java.base/windows/classes/java/lang/ProcessImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java b/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
index 517b4801e2c..f972f64c9ec 100644
--- a/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
+++ b/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -91,6 +91,7 @@ public class NTLMAuthSequence {
 
     private native long getCredentialsHandle (String user, String domain, String password);
 
-    private native byte[] getNextToken (long crdHandle, byte[] lastToken, Status returned);
+    private native byte[] getNextToken (long crdHandle, byte[] lastToken, Status returned)
+            throws IOException;
 }
 
diff --git a/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java b/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
index a7056082e12..75a9dc027b1 100644
--- a/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
+++ b/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,7 @@
 package sun.net.www.protocol.http.ntlm;
 
 import java.io.IOException;
-import java.net.InetAddress;
 import java.net.PasswordAuthentication;
-import java.net.UnknownHostException;
 import java.net.URL;
 import java.util.Locale;
 import sun.net.NetProperties;
@@ -204,10 +202,10 @@ public final class NTLMAuthentication extends AuthenticationInfo {
      * @param p A source of header values for this connection, not used because
      *          HeaderParser converts the fields to lower case, use raw instead
      * @param raw The raw header field.
-     * @return true if all goes well, false if no headers were set.
+     * @throws IOException if no headers were set
      */
     @Override
-    public boolean setHeaders(HttpURLConnection conn, HeaderParser p, String raw) {
+    public void setHeaders(HttpURLConnection conn, HeaderParser p, String raw) throws IOException {
 
         // no need to synchronize here:
         //   already locked by s.n.w.p.h.HttpURLConnection
@@ -224,10 +222,9 @@ public final class NTLMAuthentication extends AuthenticationInfo {
             if (seq.isComplete()) {
                 conn.authObj(null);
             }
-            return true;
         } catch (IOException e) {
             conn.authObj(null);
-            return false;
+            throw e;
         }
     }
 }
diff --git a/src/java.base/windows/classes/sun/nio/ch/PipeImpl.java b/src/java.base/windows/classes/sun/nio/ch/PipeImpl.java
index 1e4b6a05ce1..f15f39f0d52 100644
--- a/src/java.base/windows/classes/sun/nio/ch/PipeImpl.java
+++ b/src/java.base/windows/classes/sun/nio/ch/PipeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java b/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
index 5df8aef7431..b8fc058bb29 100644
--- a/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
+++ b/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
@@ -452,7 +452,7 @@ public class WindowsAsynchronousFileChannelImpl
                 address = IOUtil.bufferAddress(dst) + pos;
             } else {
                 buf = Util.getTemporaryDirectBuffer(rem);
-                address = IOUtil.bufferAddress(buf) + pos;
+                address = IOUtil.bufferAddress(buf);
             }
 
             boolean pending = false;
@@ -640,7 +640,7 @@ public class WindowsAsynchronousFileChannelImpl
                 // temporarily restore position as we don't know how many bytes
                 // will be written
                 src.position(pos);
-                address = IOUtil.bufferAddress(buf) + pos;
+                address = IOUtil.bufferAddress(buf);
             }
 
             try {
diff --git a/src/java.base/windows/native/launcher/relauncher.c b/src/java.base/windows/native/launcher/relauncher.c
index 6487406c04e..77b9dfa99ad 100644
--- a/src/java.base/windows/native/launcher/relauncher.c
+++ b/src/java.base/windows/native/launcher/relauncher.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.base/windows/native/libjava/WinCAPISeedGenerator.c b/src/java.base/windows/native/libjava/WinCAPISeedGenerator.c
index e447ecc43a9..deb79c7e4cb 100644
--- a/src/java.base/windows/native/libjava/WinCAPISeedGenerator.c
+++ b/src/java.base/windows/native/libjava/WinCAPISeedGenerator.c
@@ -31,10 +31,6 @@
 /*
  * Get a random seed from the MS CryptoAPI. Return true if successful, false
  * otherwise.
- *
- * Some early versions of Windows 95 do not support the required functions.
- * Use runtime linking to avoid problems.
- *
  */
 JNIEXPORT jboolean JNICALL Java_sun_security_provider_NativeSeedGenerator_nativeGenerateSeed
   (JNIEnv *env, jclass clazz, jbyteArray randArray)
diff --git a/src/java.base/windows/native/libnet/NTLMAuthSequence.c b/src/java.base/windows/native/libnet/NTLMAuthSequence.c
index 507409e0ae6..0da2675b886 100644
--- a/src/java.base/windows/native/libnet/NTLMAuthSequence.c
+++ b/src/java.base/windows/native/libnet/NTLMAuthSequence.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -230,6 +230,8 @@ JNIEXPORT jbyteArray JNICALL Java_sun_net_www_protocol_http_ntlm_NTLMAuthSequenc
     }
 
     if (ss < 0) {
+        SetLastError(ss);
+        JNU_ThrowIOExceptionWithLastError(env, "InitializeSecurityContext");
         endSequence (pCred, pCtx, env, status);
         return 0;
     }
@@ -238,6 +240,8 @@ JNIEXPORT jbyteArray JNICALL Java_sun_net_www_protocol_http_ntlm_NTLMAuthSequenc
         ss = CompleteAuthToken( pCtx, &OutBuffDesc );
 
         if (ss < 0) {
+            SetLastError(ss);
+            JNU_ThrowIOExceptionWithLastError(env, "CompleteAuthToken");
             endSequence (pCred, pCtx, env, status);
             return 0;
         }
diff --git a/src/java.base/windows/native/libnet/net_util_md.c b/src/java.base/windows/native/libnet/net_util_md.c
index 410d141e790..bac3d1438ab 100644
--- a/src/java.base/windows/native/libnet/net_util_md.c
+++ b/src/java.base/windows/native/libnet/net_util_md.c
@@ -513,7 +513,7 @@ NET_InetAddressToSockaddr(JNIEnv *env, jobject iaObj, int port,
     } else {
         jint address;
         if (family != java_net_InetAddress_IPv4) {
-            JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Protocol family unavailable");
+            JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "IPv6 protocol family unavailable");
             return -1;
         }
         address = getInetAddress_addr(env, iaObj);
diff --git a/src/java.compiler/share/classes/javax/tools/JavaFileManager.java b/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
index 92c002fd3e7..de7c50a5b90 100644
--- a/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
+++ b/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.compiler/share/classes/javax/tools/StandardLocation.java b/src/java.compiler/share/classes/javax/tools/StandardLocation.java
index 92459d4cb24..06c8f2ea8fa 100644
--- a/src/java.compiler/share/classes/javax/tools/StandardLocation.java
+++ b/src/java.compiler/share/classes/javax/tools/StandardLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/aix/classes/sun/awt/X11InputMethod.java b/src/java.desktop/aix/classes/sun/awt/X11InputMethod.java
index 93098a04842..5e52421700c 100644
--- a/src/java.desktop/aix/classes/sun/awt/X11InputMethod.java
+++ b/src/java.desktop/aix/classes/sun/awt/X11InputMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java
index f28e05d1877..5bcd729a804 100644
--- a/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java
+++ b/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/apple/laf/JRSUIFocus.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIFocus.java
index e990273b200..3c6704093e6 100644
--- a/src/java.desktop/macosx/classes/apple/laf/JRSUIFocus.java
+++ b/src/java.desktop/macosx/classes/apple/laf/JRSUIFocus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java
index 62176e40497..bc2446a5b62 100644
--- a/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java
+++ b/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/apple/laf/JRSUIStateFactory.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIStateFactory.java
index 52913b9ed23..fccc1669e26 100644
--- a/src/java.desktop/macosx/classes/apple/laf/JRSUIStateFactory.java
+++ b/src/java.desktop/macosx/classes/apple/laf/JRSUIStateFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
index 217985eecfa..fbd993d3fd3 100644
--- a/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
+++ b/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationBeanInfo.java b/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationBeanInfo.java
index 9fc34576857..e3f8a103d79 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationBeanInfo.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationBeanInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenAdapter.java b/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenAdapter.java
index c1fdb932c90..5b50b1961bb 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenAdapter.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/MacQuitResponse.java b/src/java.desktop/macosx/classes/com/apple/eawt/MacQuitResponse.java
index c207e8d58a8..1ad917083fd 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/MacQuitResponse.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/MacQuitResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/_AppDockIconHandler.java b/src/java.desktop/macosx/classes/com/apple/eawt/_AppDockIconHandler.java
index 0fcbdce4720..02abb13f357 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/_AppDockIconHandler.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/_AppDockIconHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java b/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java
index 3cf6a1ba1d6..d1b747a8f30 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java b/src/java.desktop/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java
index d891c65acf5..e62c8c557da 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/_AppMiscHandlers.java b/src/java.desktop/macosx/classes/com/apple/eawt/_AppMiscHandlers.java
index 5870b8d3586..73792c83499 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/_AppMiscHandlers.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/_AppMiscHandlers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/event/FullScreenEvent.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/FullScreenEvent.java
index cf4ec3bea99..6ccc0043393 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/event/FullScreenEvent.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/event/FullScreenEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureAdapter.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureAdapter.java
index 1b1da4fb095..77ea46851ca 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureAdapter.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureHandler.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureHandler.java
index e3ff511f6f0..13bccecbbdc 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureHandler.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/event/GesturePhaseEvent.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/GesturePhaseEvent.java
index befad3d2633..7cce50518ca 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/event/GesturePhaseEvent.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/event/GesturePhaseEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/event/MagnificationEvent.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/MagnificationEvent.java
index 3e771e21833..d6227829c76 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/event/MagnificationEvent.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/event/MagnificationEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/event/RotationEvent.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/RotationEvent.java
index 3b8375f83c2..6e3b3fff264 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/event/RotationEvent.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/event/RotationEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/event/SwipeEvent.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/SwipeEvent.java
index 07ea97fcb7c..660cc68718b 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/event/SwipeEvent.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/event/SwipeEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java b/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java
index ce206446ce5..375591bcdd8 100644
--- a/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java
+++ b/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonCheckBoxUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonCheckBoxUI.java
index 0e92da43084..958d5103771 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonCheckBoxUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonCheckBoxUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java
index 0927df6aa9e..129175eef7b 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java
index c4e2e1b8a5e..4e49c791928 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonRadioUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonRadioUI.java
index 1fdb8a30f5d..0aa81c57958 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonRadioUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonRadioUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonToggleUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonToggleUI.java
index 5eb0fbbccb6..740c7715d3f 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonToggleUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonToggleUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java
index eaf84295c11..4e032d6afba 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaCaret.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxButton.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxButton.java
index e691153df73..310166c6151 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxButton.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxButton.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java
index 02e0cc7aaf6..fa57316a7c6 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java
index ac76eb0f771..97edcdadffe 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxRendererInternal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java
index a4c85a7676f..9e90ae3c397 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaEditorPaneUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaEditorPaneUI.java
index 2f2e8e6c107..ba58f505b31 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaEditorPaneUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaEditorPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java
index feeec997ea4..023551e8f58 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java
index 1c0b01e0a36..af7c9c09021 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java
index 6a2c9f9466b..e271fdb391e 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaFocus.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaFocus.java
index c8ce8dd058b..33176e0b5e1 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaFocus.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaFocus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaFocusHandler.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaFocusHandler.java
index a245ae35d8c..351fa8ea9cc 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaFocusHandler.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaFocusHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaFonts.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaFonts.java
index 21886f9709f..b8761beafb9 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaFonts.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaFonts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaGroupBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaGroupBorder.java
index d85025a3b77..dc0382350c8 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaGroupBorder.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaGroupBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaHighlighter.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaHighlighter.java
index cdb36932893..1ba237afeff 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaHighlighter.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaHighlighter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaIcon.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaIcon.java
index 07287402b97..4dd6c9a7bb9 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaIcon.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaIcon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java
index 679632db107..880235ee9b2 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorder.java
index 7d988912829..32fe22dafd2 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorder.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameManager.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameManager.java
index 388710e5416..4196f10c5b2 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameManager.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java
index a41cee6ca30..b1103d3571b 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java
index 56829f8abf7..f82d14d0df0 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java
index bff6d13106d..2109758ac1e 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaListUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaListUI.java
index f0760c1f551..a15678b9357 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaListUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaListUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java
index 633b292dbc3..ccc52fd0105 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarBorder.java
index ed70450ce88..7b5562d9a4a 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarBorder.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java
index d1804c8ae29..d499b40f238 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBorder.java
index 1712b4c2448..187532e315b 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBorder.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuItemUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuItemUI.java
index 901fbd7b2c6..340f48534a3 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuItemUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuItemUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuPainter.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuPainter.java
index b7878b67483..c2007ef2774 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuPainter.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuPainter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuUI.java
index 7057e583c58..75e4bd98954 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java
index 22457379fa1..ed68924ff4f 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaNativeResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaOptionPaneUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaOptionPaneUI.java
index b3312d9fa7b..59b00b315e3 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaOptionPaneUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaOptionPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaPainter.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaPainter.java
index 910907134ee..a5ebcbaef4c 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaPainter.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaPainter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaPanelUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaPanelUI.java
index 3db2eca1754..bec82195ec5 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaPanelUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaPanelUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuSeparatorUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuSeparatorUI.java
index 3b7388062cc..7e2e7849f42 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuSeparatorUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuSeparatorUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuUI.java
index 4b9d9a301ba..64b3f1e35b1 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaPopupMenuUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java
index b6e5fb5f170..58aee090712 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollBarUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollBarUI.java
index d8cc229eb55..6bbc31c3a35 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollBarUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollBarUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollPaneUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollPaneUI.java
index f1f30e39cc9..c8d2b73b2bb 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollPaneUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollRegionBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollRegionBorder.java
index 4c03991e55d..8f5bbc7c087 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollRegionBorder.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollRegionBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaSliderUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaSliderUI.java
index 9f8b4458f73..2486dbb6213 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaSliderUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaSliderUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaSpinnerUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaSpinnerUI.java
index 057e898519a..4e4f5a315e2 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaSpinnerUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaSpinnerUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java
index 7a4bc27470b..339484347aa 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneUI.java
index 62e77a378dc..1b0ffe6caab 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaSplitPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java
index 121af1c8bdc..bcbbe14557b 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java
index 649b9d0f345..205226991b3 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java
index 3e9a98d220b..1c9b33e3b75 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java
index 0fd3d30e8be..506a59a1a2a 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderUI.java
index b614ff2a5ab..0ea0b5d2121 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTableHeaderUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaTableUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTableUI.java
index 31702152c3c..95ba34eeb1f 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTableUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTableUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaTextAreaUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextAreaUI.java
index 6ce1372c8f5..d968412da76 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTextAreaUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextAreaUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldBorder.java
index eb07bb25724..effb97293e8 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldBorder.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldBorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldFormattedUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldFormattedUI.java
index 0bfbc556920..50085a9db9b 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldFormattedUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldFormattedUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldSearch.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldSearch.java
index 20b179da7d1..a8ae7fa3809 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldSearch.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextFieldSearch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPaneUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPaneUI.java
index 6fc391c5fec..571cbf6369a 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPaneUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPasswordFieldUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPasswordFieldUI.java
index da52600075a..12b94e60243 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPasswordFieldUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTextPasswordFieldUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarSeparatorUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarSeparatorUI.java
index 09bd21f8c72..fc17d498a31 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarSeparatorUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarSeparatorUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarUI.java
index 7adea86121e..0d15dd81f30 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaToolBarUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaToolTipUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaToolTipUI.java
index e872cad0b94..38057c03f17 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaToolTipUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaToolTipUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaTreeUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTreeUI.java
index 4a7aaff738e..2efb2bab994 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTreeUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTreeUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java
index d5974049f30..48ecce0ecf4 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaUtilControlSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java
index 610407e6160..da1785a9a63 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBar.java b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBar.java
index 83e37170fae..0b19064b96f 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBar.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItem.java b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItem.java
index 0e827e9b990..11eab4e2b36 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItem.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java
index 4528d94df38..b5746a0ab90 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuPropertyListener.java b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuPropertyListener.java
index 5d04929fad6..c90991db597 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuPropertyListener.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuPropertyListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/ScreenPopupFactory.java b/src/java.desktop/macosx/classes/com/apple/laf/ScreenPopupFactory.java
index 2eda60c4e30..ff9cadae1b8 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/ScreenPopupFactory.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/ScreenPopupFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java b/src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java
index 0ca85104817..a73809f0a4d 100644
--- a/src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java
+++ b/src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java b/src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java
index 99e078c3064..292355ac2cf 100644
--- a/src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java
+++ b/src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/awt/PlatformGraphicsInfo.java b/src/java.desktop/macosx/classes/sun/awt/PlatformGraphicsInfo.java
index 97d4e444454..55eeda9b3e8 100644
--- a/src/java.desktop/macosx/classes/sun/awt/PlatformGraphicsInfo.java
+++ b/src/java.desktop/macosx/classes/sun/awt/PlatformGraphicsInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/font/CCompositeGlyphMapper.java b/src/java.desktop/macosx/classes/sun/font/CCompositeGlyphMapper.java
index b290d9a06e1..d9c2dadc87e 100644
--- a/src/java.desktop/macosx/classes/sun/font/CCompositeGlyphMapper.java
+++ b/src/java.desktop/macosx/classes/sun/font/CCompositeGlyphMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/font/CFont.java b/src/java.desktop/macosx/classes/sun/font/CFont.java
index f187c5bb14c..76409fb0b6a 100644
--- a/src/java.desktop/macosx/classes/sun/font/CFont.java
+++ b/src/java.desktop/macosx/classes/sun/font/CFont.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/font/CFontConfiguration.java b/src/java.desktop/macosx/classes/sun/font/CFontConfiguration.java
index 6a711537be8..ba05dd733e3 100644
--- a/src/java.desktop/macosx/classes/sun/font/CFontConfiguration.java
+++ b/src/java.desktop/macosx/classes/sun/font/CFontConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/font/CFontManager.java b/src/java.desktop/macosx/classes/sun/font/CFontManager.java
index 72a9db3a01d..6504b71a27f 100644
--- a/src/java.desktop/macosx/classes/sun/font/CFontManager.java
+++ b/src/java.desktop/macosx/classes/sun/font/CFontManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/font/CStrike.java b/src/java.desktop/macosx/classes/sun/font/CStrike.java
index 4b0ac9fd8d3..bffb76fb1ad 100644
--- a/src/java.desktop/macosx/classes/sun/font/CStrike.java
+++ b/src/java.desktop/macosx/classes/sun/font/CStrike.java
@@ -222,12 +222,6 @@ public final class CStrike extends PhysicalStrike {
         return getNativeGlyphOutline(getNativeStrikePtr(), glyphCode, x, y);
     }
 
-    // should implement, however not called though any path that is publicly exposed
-    @Override
-    GeneralPath getGlyphVectorOutline(int[] glyphs, float x, float y) {
-        throw new Error("not implemented yet");
-    }
-
     // called from the Sun2D renderer
     @Override
     long getGlyphImagePtr(int glyphCode) {
diff --git a/src/java.desktop/macosx/classes/sun/font/CStrikeDisposer.java b/src/java.desktop/macosx/classes/sun/font/CStrikeDisposer.java
index c37209c8396..665f6465261 100644
--- a/src/java.desktop/macosx/classes/sun/font/CStrikeDisposer.java
+++ b/src/java.desktop/macosx/classes/sun/font/CStrikeDisposer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/font/NativeFont.java b/src/java.desktop/macosx/classes/sun/font/NativeFont.java
index 6faf4adfb53..f81540f795c 100644
--- a/src/java.desktop/macosx/classes/sun/font/NativeFont.java
+++ b/src/java.desktop/macosx/classes/sun/font/NativeFont.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/font/NativeStrike.java b/src/java.desktop/macosx/classes/sun/font/NativeStrike.java
index d7c16150328..4ea267a4bd7 100644
--- a/src/java.desktop/macosx/classes/sun/font/NativeStrike.java
+++ b/src/java.desktop/macosx/classes/sun/font/NativeStrike.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,6 @@ public class NativeStrike extends PhysicalStrike {
         throw new RuntimeException("NativeFont not used on Windows");
     }
 
-
     @Override
     void getGlyphImagePtrs(int[] glyphCodes, long[] images,int  len) {
     }
@@ -81,14 +80,9 @@ public class NativeStrike extends PhysicalStrike {
     Rectangle2D.Float getGlyphOutlineBounds(int glyphCode) {
         return null;
     }
+
     @Override
     GeneralPath getGlyphOutline(int glyphCode, float x, float y) {
         return null;
     }
-
-    @Override
-    GeneralPath getGlyphVectorOutline(int[] glyphs, float x, float y) {
-        return null;
-    }
-
 }
diff --git a/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java b/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java
index 9dd2c3a0bc7..72cd4316b47 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java b/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java
index e23bcbdbbee..fec991ae418 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/DataBufferNIOInt.java b/src/java.desktop/macosx/classes/sun/java2d/DataBufferNIOInt.java
index 3627a8f47f3..b00d05cead2 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/DataBufferNIOInt.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/DataBufferNIOInt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java b/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java
index 65631c0de86..fdc0aa4e3b8 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/MacOSFlags.java b/src/java.desktop/macosx/classes/sun/java2d/MacOSFlags.java
index 14a8231d890..c7a7791b405 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/MacOSFlags.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/MacOSFlags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java b/src/java.desktop/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java
index 9685ee859ad..fda9b3b1127 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java b/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java
index 1051fbda4cb..84b58087def 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLBlitLoops.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLBlitLoops.java
index d807f954d71..89692fac220 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLBlitLoops.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLBlitLoops.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLBufImgOps.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLBufImgOps.java
index 534ab101075..06c9eb8e8e3 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLBufImgOps.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLBufImgOps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLContext.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLContext.java
index b3bcf6633c6..b18e993ab56 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLContext.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLDrawImage.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLDrawImage.java
index cb24cfdea2c..185154a1679 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLDrawImage.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLDrawImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLGraphicsConfig.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLGraphicsConfig.java
index 0278a6bce36..641cb93714c 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLGraphicsConfig.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLGraphicsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLLayer.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLLayer.java
index 645b2e8a2f5..aafd465bbd2 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLLayer.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLLayer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLMaskBlit.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLMaskBlit.java
index 3cc61ead145..95a0827b28c 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLMaskBlit.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLMaskBlit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLMaskFill.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLMaskFill.java
index a6876c919e5..9b208dd5e0a 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLMaskFill.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLMaskFill.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLPaints.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLPaints.java
index 79625b875ce..556d09e1430 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLPaints.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLPaints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLRenderQueue.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLRenderQueue.java
index f63ed523454..2fb06f0aa5b 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLRenderQueue.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLRenderQueue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLRenderer.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLRenderer.java
index 9ef4dc9c3ab..3f402914614 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLRenderer.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLSurfaceData.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLSurfaceData.java
index c8259f9056b..929c7c4794d 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLSurfaceData.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLSurfaceData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLSurfaceDataProxy.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLSurfaceDataProxy.java
index a73728c7b03..0c6edc90be9 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLSurfaceDataProxy.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLSurfaceDataProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLTextRenderer.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLTextRenderer.java
index ad7bd95071e..05f45ba79e8 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLTextRenderer.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLTextRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLVolatileSurfaceManager.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLVolatileSurfaceManager.java
index e7d4b166eef..3ea03265e91 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLVolatileSurfaceManager.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLVolatileSurfaceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
index fb058fb38bf..b3dfbc1ba3c 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLLayer.java b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLLayer.java
index aa75a142e57..01ce48d0cb4 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLLayer.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLLayer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java
index 592d3783aba..e93a25473e9 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java
index 86fe9387554..bbf3bef7555 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java
index 918bef702b1..0f3cc07c447 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/LWLightweightFramePeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWLightweightFramePeer.java
index 89b4a02c9d7..f1cc05fea27 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWLightweightFramePeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWLightweightFramePeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/LWListPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWListPeer.java
index 905a66b3212..e2f26201919 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWListPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWListPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,10 @@ import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
+import static java.awt.event.ItemEvent.DESELECTED;
+import static java.awt.event.ItemEvent.ITEM_STATE_CHANGED;
+import static java.awt.event.ItemEvent.SELECTED;
+
 /**
  * Lightweight implementation of {@link ListPeer}. Delegates most of the work to
  * the {@link JList}, which is placed inside {@link JScrollPane}.
@@ -86,8 +90,11 @@ final class LWListPeer extends LWComponentPeer<List, LWListPeer.ScrollableJList>
         final int[] selectedIndices = getTarget().getSelectedIndexes();
         synchronized (getDelegateLock()) {
             getDelegate().setSkipStateChangedEvent(true);
-            getDelegate().getView().setSelectedIndices(selectedIndices);
-            getDelegate().setSkipStateChangedEvent(false);
+            try {
+                getDelegate().getView().setSelectedIndices(selectedIndices);
+            } finally {
+                getDelegate().setSkipStateChangedEvent(false);
+            }
         }
     }
 
@@ -111,24 +118,39 @@ final class LWListPeer extends LWComponentPeer<List, LWListPeer.ScrollableJList>
     @Override
     public void add(final String item, final int index) {
         synchronized (getDelegateLock()) {
-            getDelegate().getModel().add(index, item);
-            revalidate();
+            getDelegate().setSkipStateChangedEvent(true);
+            try {
+                getDelegate().getModel().add(index, item);
+                revalidate();
+            } finally {
+                getDelegate().setSkipStateChangedEvent(false);
+            }
         }
     }
 
     @Override
     public void delItems(final int start, final int end) {
         synchronized (getDelegateLock()) {
-            getDelegate().getModel().removeRange(start, end);
-            revalidate();
+            getDelegate().setSkipStateChangedEvent(true);
+            try {
+                getDelegate().getModel().removeRange(start, end);
+                revalidate();
+            } finally {
+                getDelegate().setSkipStateChangedEvent(false);
+            }
         }
     }
 
     @Override
     public void removeAll() {
         synchronized (getDelegateLock()) {
-            getDelegate().getModel().removeAllElements();
-            revalidate();
+            getDelegate().setSkipStateChangedEvent(true);
+            try {
+                getDelegate().getModel().removeAllElements();
+                revalidate();
+            } finally {
+                getDelegate().setSkipStateChangedEvent(false);
+            }
         }
     }
 
@@ -136,16 +158,23 @@ final class LWListPeer extends LWComponentPeer<List, LWListPeer.ScrollableJList>
     public void select(final int index) {
         synchronized (getDelegateLock()) {
             getDelegate().setSkipStateChangedEvent(true);
-            getDelegate().getView().setSelectedIndex(index);
-            getDelegate().setSkipStateChangedEvent(false);
+            try {
+                getDelegate().getView().setSelectedIndex(index);
+            } finally {
+                getDelegate().setSkipStateChangedEvent(false);
+            }
         }
     }
 
     @Override
     public void deselect(final int index) {
         synchronized (getDelegateLock()) {
-            getDelegate().getView().getSelectionModel().
-                    removeSelectionInterval(index, index);
+            getDelegate().setSkipStateChangedEvent(true);
+            try {
+                getDelegate().getView().removeSelectionInterval(index, index);
+            } finally {
+                getDelegate().setSkipStateChangedEvent(false);
+            }
         }
     }
 
@@ -255,21 +284,18 @@ final class LWListPeer extends LWComponentPeer<List, LWListPeer.ScrollableJList>
 
         @Override
         public void valueChanged(final ListSelectionEvent e) {
-            if (!e.getValueIsAdjusting() && !isSkipStateChangedEvent()) {
-                final JList<?> source = (JList<?>) e.getSource();
-                for(int i = 0 ; i < source.getModel().getSize(); i++) {
-
-                    final boolean wasSelected = Arrays.binarySearch(oldSelectedIndices, i) >= 0;
-                    final boolean isSelected = source.isSelectedIndex(i);
-
-                    if (wasSelected == isSelected) {
-                        continue;
+            if (!e.getValueIsAdjusting()) {
+                JList<?> source = (JList<?>) e.getSource();
+                if (!isSkipStateChangedEvent()) {
+                    for (int i = 0; i < source.getModel().getSize(); i++) {
+                        boolean wasSelected =
+                                Arrays.binarySearch(oldSelectedIndices, i) >= 0;
+                        if (wasSelected != source.isSelectedIndex(i)) {
+                            int state = wasSelected ? DESELECTED : SELECTED;
+                            LWListPeer.this.postEvent(new ItemEvent(getTarget(),
+                                                ITEM_STATE_CHANGED, i, state));
+                        }
                     }
-
-                    final int state = !wasSelected && isSelected ? ItemEvent.SELECTED: ItemEvent.DESELECTED;
-
-                    LWListPeer.this.postEvent(new ItemEvent(getTarget(), ItemEvent.ITEM_STATE_CHANGED,
-                            i, state));
                 }
                 oldSelectedIndices = source.getSelectedIndices();
             }
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/LWMouseInfoPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWMouseInfoPeer.java
index cd25f2328c2..95b5f475f07 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWMouseInfoPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWMouseInfoPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
index 73e13908fbf..11099f6a8e6 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibleText.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibleText.java
index 1ad04eab47b..b87be60180e 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibleText.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibleText.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java
index 21021b2e9d0..30ed1d1bba0 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCustomCursor.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCustomCursor.java
index a2c749fcc79..f24419cbc8c 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCustomCursor.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCustomCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java
index 065163adbb1..ed8ca73a613 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java
index 35ef3c3897c..b5ac470d1f8 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java
index b35eb9afd5d..a4e07d46aab 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java
index fc9618ccf04..780437cd423 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFileDialog.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFileDialog.java
index 8becf91f114..3f33f748154 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFileDialog.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CFileDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java
index 84cb12586e0..d3f26285255 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java
index fc504cc297d..1eb896bf291 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java
index b681efc198b..b11ddba10be 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java
index e23dcf19f1c..60269921d69 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java
index 5b447d857f3..3c17e8f89d8 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java
index 43c40647e99..1c453b72881 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java
index 460c4235075..9e11e19ba95 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java
index 1b87b31740b..f6b2151486b 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java
index 5cdbbded9ac..852b6380808 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
index baaad51d953..2f74a16ef0f 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java
index 68bae1f112b..98888230d31 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CSystemTray.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CSystemTray.java
index adbd79de28d..2a63be1c5fd 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CSystemTray.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CSystemTray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java
index 6fdda409ce5..cf4a6e72136 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -97,8 +97,14 @@ public class CTextPipe implements TextPipe {
         if (f2d instanceof CFont) {
             CompositeFont cf = ((CFont)f2d).getCompositeFont2D();
             PhysicalFont pf = cf.getSlotFont(slot);
-            Font f = new Font(pf.getFontName(null),
-                              font.getStyle(), font.getSize());
+            String name = pf.getFontName(null);
+            Font f = new Font(name, font.getStyle(), font.getSize());
+            if (font.isTransformed()) {
+                f = f.deriveFont(font.getTransform());
+            }
+            if (font.hasLayoutAttributes()) {
+                f = f.deriveFont(font.getAttributes());
+            }
             return f;
         }
         return null;
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java
index 27c4a3e5740..166b3ac0024 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java
index 3851bd18339..77639a262d5 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java
index 177184282e0..fc4c38129a0 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java
index 118e9258531..642f506f3d1 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
index 14ad9621bbd..0e5bfc44bc5 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/classes/sun/print/PlatformPrinterJobProxy.java b/src/java.desktop/macosx/classes/sun/print/PlatformPrinterJobProxy.java
index 92e821f2e42..76172fd6f1b 100644
--- a/src/java.desktop/macosx/classes/sun/print/PlatformPrinterJobProxy.java
+++ b/src/java.desktop/macosx/classes/sun/print/PlatformPrinterJobProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m
index e81335c0d9e..f5dab40f0aa 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m
index 32164493f9f..2e1833430e4 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,16 +60,14 @@ static int getBPPFromModeString(CFStringRef mode)
 }
 
 static BOOL isValidDisplayMode(CGDisplayModeRef mode) {
-    // Workaround for apple bug FB13261205, since it only affects arm based macs
-    // and arm support started with macOS 11 ignore the workaround for previous versions
-    if (@available(macOS 11, *)) {
-        if (architecture == -1) {
-            architecture = [[NSRunningApplication currentApplication] executableArchitecture];
-        }
-        if (architecture == NSBundleExecutableArchitectureARM64) {
-            return (CGDisplayModeGetPixelWidth(mode) >= 800);
-        }
+    // Workaround for apple bug FB13261205, only affects arm based macs
+    if (architecture == -1) {
+        architecture = [[NSRunningApplication currentApplication] executableArchitecture];
     }
+    if (architecture == NSBundleExecutableArchitectureARM64) {
+        return (CGDisplayModeGetPixelWidth(mode) >= 800);
+    }
+
     return (1 < CGDisplayModeGetWidth(mode) && 1 < CGDisplayModeGetHeight(mode));
 }
 
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsEnv.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsEnv.m
index 2fea4a1a4f7..d9d432fb96c 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsEnv.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsEnv.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m
index 9db38ee21ff..9cc0a18564f 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.m
index 7eb7b104bcd..4cf9c91fad3 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/TabButtonAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/TabButtonAccessibility.m
index 26f381ad475..7a156ef6523 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/TabButtonAccessibility.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/TabButtonAccessibility.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, JetBrains s.r.o.. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m b/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m
index 614fd7ec535..558c7754950 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java
index e009e33d8a0..31f47d606c9 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java
index b88574edd6e..036fc9045ba 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java
index d56bc89035b..447db2ef803 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java
index 1c8c1e88be4..7c243396dda 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -122,6 +122,7 @@ class GTKColorChooserPanel extends AbstractColorChooserPanel implements
     /**
      * Returns a user presentable description of this GTKColorChooserPane.
      */
+    @Override
     public String getDisplayName() {
         return (String)UIManager.get("GTKColorChooserPanel.nameText");
     }
@@ -129,6 +130,7 @@ class GTKColorChooserPanel extends AbstractColorChooserPanel implements
     /**
      * Returns the mnemonic to use with <code>getDisplayName</code>.
      */
+    @Override
     public int getMnemonic() {
         String m = (String)UIManager.get("GTKColorChooserPanel.mnemonic");
 
@@ -145,6 +147,7 @@ class GTKColorChooserPanel extends AbstractColorChooserPanel implements
     /**
      * Character to underline that represents the mnemonic.
      */
+    @Override
     public int getDisplayedMnemonicIndex() {
         String m = (String)UIManager.get(
                            "GTKColorChooserPanel.displayedMnemonicIndex");
@@ -159,14 +162,17 @@ class GTKColorChooserPanel extends AbstractColorChooserPanel implements
         return -1;
     }
 
+    @Override
     public Icon getSmallDisplayIcon() {
         return null;
     }
 
+    @Override
     public Icon getLargeDisplayIcon() {
         return null;
     }
 
+    @Override
     public void uninstallChooserPanel(JColorChooser enclosingChooser) {
         super.uninstallChooserPanel(enclosingChooser);
         removeAll();
@@ -175,6 +181,7 @@ class GTKColorChooserPanel extends AbstractColorChooserPanel implements
     /**
      * Builds and configures the widgets for the GTKColorChooserPanel.
      */
+    @Override
     protected void buildChooser() {
         triangle = new ColorTriangle();
         triangle.setName("GTKColorChooserPanel.triangle");
@@ -307,6 +314,7 @@ class GTKColorChooserPanel extends AbstractColorChooserPanel implements
     /**
      * Refreshes the display from the model.
      */
+    @Override
     public void updateChooser() {
         if (!settingColor) {
             lastLabel.setBackground(getColorFromModel());
@@ -490,6 +498,7 @@ class GTKColorChooserPanel extends AbstractColorChooserPanel implements
     /**
      * ChangeListener method, updates the necessary display widgets.
      */
+    @Override
     public void stateChanged(ChangeEvent e) {
         if (settingColor) {
             return;
@@ -687,6 +696,7 @@ class GTKColorChooserPanel extends AbstractColorChooserPanel implements
             return circleY + getIndicatorSize() / 2 - getWheelYOrigin();
         }
 
+        @Override
         protected void processEvent(AWTEvent e) {
 
             if (!(getGTKColorChooserPanel().isEnabled())) {
@@ -741,6 +751,7 @@ class GTKColorChooserPanel extends AbstractColorChooserPanel implements
             super.processEvent(e);
         }
 
+        @Override
         public void paintComponent(Graphics g) {
             super.paintComponent(g);
 
@@ -1259,6 +1270,7 @@ class GTKColorChooserPanel extends AbstractColorChooserPanel implements
             this.type = type;
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             ColorTriangle triangle = (ColorTriangle)e.getSource();
 
@@ -1318,6 +1330,7 @@ class GTKColorChooserPanel extends AbstractColorChooserPanel implements
 
     @SuppressWarnings("serial") // Superclass is not serializable across versions
     private static class OpaqueLabel extends JLabel {
+        @Override
         public boolean isOpaque() {
             return true;
         }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java
index 2540f6e7880..4aa8afd3e56 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java
index 4f18dc84f4a..29d77650cb4 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java
@@ -188,6 +188,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         super(filechooser);
     }
 
+    @Override
     protected ActionMap createActionMap() {
         ActionMap map = new ActionMapUIResource();
         map.put("approveSelection", getApproveSelectionAction());
@@ -197,6 +198,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         return map;
     }
 
+    @Override
     @SuppressWarnings("deprecation")
     public String getFileName() {
         JFileChooser fc = getFileChooser();
@@ -243,6 +245,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         return sb.toString();
     }
 
+    @Override
     public void setFileName(String fileName) {
         if (fileNameTextField != null) {
             fileNameTextField.setText(fileName);
@@ -253,18 +256,22 @@ class GTKFileChooserUI extends SynthFileChooserUI {
 //      return pathField.getText();
 //     }
 
+    @Override
     public void setDirectoryName(String dirname) {
         pathField.setText(dirname);
     }
 
+    @Override
     public void ensureFileIsVisible(JFileChooser fc, File f) {
         // PENDING
     }
 
+    @Override
     public void rescanCurrentDirectory(JFileChooser fc) {
         getModel().validateFileCache();
     }
 
+    @Override
     public JPanel getAccessoryPanel() {
         return accessoryPanel;
     }
@@ -273,6 +280,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
     // * FileView operations *
     // ***********************
 
+    @Override
     public FileView getFileView(JFileChooser fc) {
         return fileView;
     }
@@ -282,16 +290,20 @@ class GTKFileChooserUI extends SynthFileChooserUI {
             iconCache = null;
         }
 
+        @Override
         public void clearIconCache() {
         }
 
+        @Override
         public Icon getCachedIcon(File f) {
             return null;
         }
 
+        @Override
         public void cacheIcon(File f, Icon i) {
         }
 
+        @Override
         public Icon getIcon(File f) {
             return (f != null && f.isDirectory()) ? directoryIcon : fileIcon;
         }
@@ -317,6 +329,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         }
     }
 
+    @Override
     protected void doSelectedFileChanged(PropertyChangeEvent e) {
         super.doSelectedFileChanged(e);
         File f = (File) e.getNewValue();
@@ -325,6 +338,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         }
     }
 
+    @Override
     protected void doDirectoryChanged(PropertyChangeEvent e) {
         directoryList.clearSelection();
         ListSelectionModel sm = directoryList.getSelectionModel();
@@ -357,6 +371,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         super.doDirectoryChanged(e);
     }
 
+    @Override
     protected void doAccessoryChanged(PropertyChangeEvent e) {
         if (getAccessoryPanel() != null) {
             if (e.getOldValue() != null) {
@@ -374,6 +389,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         }
     }
 
+    @Override
     protected void doFileSelectionModeChanged(PropertyChangeEvent e) {
         directoryList.clearSelection();
         rightPanel.setVisible(((Integer)e.getNewValue()).intValue() != JFileChooser.DIRECTORIES_ONLY);
@@ -381,6 +397,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         super.doFileSelectionModeChanged(e);
     }
 
+    @Override
     protected void doMultiSelectionChanged(PropertyChangeEvent e) {
         if (getFileChooser().isMultiSelectionEnabled()) {
             fileList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
@@ -395,6 +412,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         super.doMultiSelectionChanged(e);
     }
 
+    @Override
     protected void doControlButtonsChanged(PropertyChangeEvent e) {
         super.doControlButtonsChanged(e);
 
@@ -407,6 +425,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         updateDefaultButton();
     }
 
+    @Override
     protected void doAncestorChanged(PropertyChangeEvent e) {
         if (e.getOldValue() == null && e.getNewValue() != null) {
             // Ancestor was added, set initial focus
@@ -424,6 +443,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
     // ************ Create Listeners **************
     // ********************************************
 
+    @Override
     public ListSelectionListener createListSelectionListener(JFileChooser fc) {
         return new SelectionListener();
     }
@@ -434,6 +454,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
             this.list = list;
         }
 
+        @Override
         public void mouseClicked(MouseEvent e) {
 
             if (!getFileChooser().isEnabled()) {
@@ -464,6 +485,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
             }
         }
 
+        @Override
         public void mouseEntered(MouseEvent evt) {
             if (list != null) {
                 TransferHandler th1 = getFileChooser().getTransferHandler();
@@ -478,6 +500,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         }
     }
 
+    @Override
     protected MouseListener createDoubleClickListener(JFileChooser fc, JList<?> list) {
         return new DoubleClickListener(list);
     }
@@ -486,6 +509,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
 
     @SuppressWarnings("deprecation")
     protected class SelectionListener implements ListSelectionListener {
+        @Override
         public void valueChanged(ListSelectionEvent e) {
             if (!e.getValueIsAdjusting()) {
                 JFileChooser chooser = getFileChooser();
@@ -547,6 +571,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         return new GTKFileChooserUI((JFileChooser)c);
     }
 
+    @Override
     public void installUI(JComponent c) {
         accessoryPanel = new JPanel(new BorderLayout(10, 10));
         accessoryPanel.setName("GTKFileChooser.accessoryPanel");
@@ -554,6 +579,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         super.installUI(c);
     }
 
+    @Override
     public void uninstallUI(JComponent c) {
         c.removePropertyChangeListener(filterComboBoxModel);
         super.uninstallUI(c);
@@ -565,6 +591,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         getFileChooser().removeAll();
     }
 
+    @Override
     public void installComponents(JFileChooser fc) {
         super.installComponents(fc);
 
@@ -623,6 +650,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
 
         JPanel comboBoxPanel = new JPanel(new FlowLayout(FlowLayout.CENTER,
                                                          0, 0) {
+            @Override
             public void layoutContainer(Container target) {
                 super.layoutContainer(target);
                 JComboBox<?> comboBox = directoryComboBox;
@@ -733,6 +761,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
             curDirName = currentDirectory.getPath();
         }
         JLabel tmp = new JLabel(curDirName) {
+            @Override
             public Dimension getMaximumSize() {
                 Dimension d = super.getMaximumSize();
                 d.height = getPreferredSize().height;
@@ -747,6 +776,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
 
         // add the fileName field
         JTextField tmp2 = new JTextField() {
+            @Override
             public Dimension getMaximumSize() {
                 Dimension d = super.getMaximumSize();
                 d.height = getPreferredSize().height;
@@ -811,6 +841,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         }
     }
 
+    @Override
     protected void installListeners(JFileChooser fc) {
         super.installListeners(fc);
 
@@ -822,6 +853,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         return SwingUtilities2.getUIDefaultsInt(key, l);
     }
 
+    @Override
     protected void uninstallListeners(JFileChooser fc) {
         super.uninstallListeners(fc);
 
@@ -831,6 +863,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
     }
 
     private class GTKFCPropertyChangeListener implements PropertyChangeListener {
+        @Override
         public void propertyChange(PropertyChangeEvent e) {
             String prop = e.getPropertyName();
             if (prop.equals("GTKFileChooser.showDirectoryIcons")) {
@@ -841,6 +874,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         }
     }
 
+    @Override
     protected void installDefaults(JFileChooser fc) {
         super.installDefaults(fc);
         readOnly = UIManager.getBoolean("FileChooser.readOnly");
@@ -850,11 +884,13 @@ class GTKFileChooserUI extends SynthFileChooserUI {
             Boolean.TRUE.equals(fc.getClientProperty("GTKFileChooser.showFileIcons"));
     }
 
+    @Override
     protected void installIcons(JFileChooser fc) {
         directoryIcon    = UIManager.getIcon("FileView.directoryIcon");
         fileIcon         = UIManager.getIcon("FileView.fileIcon");
     }
 
+    @Override
     protected void installStrings(JFileChooser fc) {
         super.installStrings(fc);
 
@@ -894,6 +930,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         filterLabelMnemonic = UIManager.getInt("FileChooser.filterLabelMnemonic");
     }
 
+    @Override
     protected void uninstallStrings(JFileChooser fc) {
         super.uninstallStrings(fc);
 
@@ -972,14 +1009,17 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         return scrollpane;
     }
 
+    @Override
     protected void createModel() {
         model = new GTKDirectoryModel();
     }
 
+    @Override
     public BasicDirectoryModel getModel() {
         return model;
     }
 
+    @Override
     public Action getApproveSelectionAction() {
         return approveSelectionAction;
     }
@@ -990,6 +1030,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
             super(getFileChooser());
         }
 
+        @Override
         protected void sort(Vector<? extends File> v) {
             FileSystemView fsv = getFileChooser().getFileSystemView();
             if (fsv == null) {
@@ -1028,6 +1069,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
             directoryChanged();
         }
 
+        @Override
         public int getSize() {
             return getModel().getDirectories().size() + 1;
         }
@@ -1038,10 +1080,12 @@ class GTKFileChooserUI extends SynthFileChooserUI {
                     curDir;
         }
 
+        @Override
         public void intervalAdded(ListDataEvent e) {
             fireIntervalAdded(this, e.getIndex0(), e.getIndex1());
         }
 
+        @Override
         public void intervalRemoved(ListDataEvent e) {
             fireIntervalRemoved(this, e.getIndex0(), e.getIndex1());
         }
@@ -1055,6 +1099,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
 
         // PENDING - fire the correct interval changed - currently sending
         // out that everything has changed
+        @Override
         public void contentsChanged(ListDataEvent e) {
             fireContentsChanged();
         }
@@ -1071,6 +1116,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
             getModel().addListDataListener(this);
         }
 
+        @Override
         public int getSize() {
             return getModel().getFiles().size();
         }
@@ -1088,10 +1134,12 @@ class GTKFileChooserUI extends SynthFileChooserUI {
             return getModel().getFiles().elementAt(index);
         }
 
+        @Override
         public void intervalAdded(ListDataEvent e) {
             fireIntervalAdded(this, e.getIndex0(), e.getIndex1());
         }
 
+        @Override
         public void intervalRemoved(ListDataEvent e) {
             fireIntervalRemoved(this, e.getIndex0(), e.getIndex1());
         }
@@ -1104,6 +1152,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         }
 
         // PENDING - fire the interval changed
+        @Override
         public void contentsChanged(ListDataEvent e) {
             fireContentsChanged();
         }
@@ -1112,6 +1161,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
 
     @SuppressWarnings("serial") // Superclass is not serializable across versions
     protected class FileCellRenderer extends DefaultListCellRenderer  {
+        @Override
         public Component getListCellRendererComponent(JList<?> list, Object value, int index,
                                                       boolean isSelected, boolean cellHasFocus) {
 
@@ -1129,6 +1179,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
 
     @SuppressWarnings("serial") // Superclass is not serializable across versions
     protected class DirectoryCellRenderer extends DefaultListCellRenderer  {
+        @Override
         public Component getListCellRendererComponent(JList<?> list, Object value, int index,
                                                       boolean isSelected, boolean cellHasFocus) {
 
@@ -1178,6 +1229,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         c.setAlignmentY(JComponent.TOP_ALIGNMENT);
     }
 
+    @Override
     public Action getNewFolderAction() {
         if (newFolderAction == null) {
             newFolderAction = new NewFolderAction();
@@ -1252,15 +1304,18 @@ class GTKFileChooserUI extends SynthFileChooserUI {
             setSelectedItem(canonical);
         }
 
+        @Override
         public void setSelectedItem(Object selectedDirectory) {
             this.selectedDirectory = (File)selectedDirectory;
             fireContentsChanged(this, -1, -1);
         }
 
+        @Override
         public Object getSelectedItem() {
             return selectedDirectory;
         }
 
+        @Override
         public int getSize() {
             return directories.size();
         }
@@ -1280,6 +1335,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
             super("DirectoryComboBoxAction");
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             File f = (File)directoryComboBox.getSelectedItem();
             getFileChooser().setCurrentDirectory(f);
@@ -1294,6 +1350,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         protected NewFolderAction() {
             super(FilePane.ACTION_NEW_FOLDER);
         }
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (readOnly) {
                 return;
@@ -1327,6 +1384,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
 
     @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class GTKApproveSelectionAction extends ApproveSelectionAction {
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (isDirectorySelected()) {
                 File dir = getDirectory();
@@ -1362,6 +1420,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
         protected RenameFileAction() {
             super(FilePane.ACTION_EDIT_FILE_NAME);
         }
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (getFileName().isEmpty()) {
                 return;
@@ -1405,6 +1464,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
      */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
     public class FilterComboBoxRenderer extends DefaultListCellRenderer {
+        @Override
         public String getName() {
             // As SynthComboBoxRenderer's are asked for a size BEFORE they
             // are parented getName is overridden to force the name to be
@@ -1417,6 +1477,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
             return name;
         }
 
+        @Override
         public Component getListCellRendererComponent(JList<?> list, Object value,
                                                       int index, boolean isSelected,
                                                       boolean cellHasFocus) {
@@ -1457,6 +1518,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
             filters = getFileChooser().getChoosableFileFilters();
         }
 
+        @Override
         public void propertyChange(PropertyChangeEvent e) {
             String prop = e.getPropertyName();
             if (prop == JFileChooser.CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY) {
@@ -1467,6 +1529,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
             }
         }
 
+        @Override
         public void setSelectedItem(Object filter) {
             if (filter != null) {
                 getFileChooser().setFileFilter((FileFilter) filter);
@@ -1474,6 +1537,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
             }
         }
 
+        @Override
         public Object getSelectedItem() {
             // Ensure that the current filter is in the list.
             // NOTE: we shouldn't have to do this, since JFileChooser adds
@@ -1495,6 +1559,7 @@ class GTKFileChooserUI extends SynthFileChooserUI {
             return getFileChooser().getFileFilter();
         }
 
+        @Override
         public int getSize() {
             if (filters != null) {
                 return filters.length;
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java
index 2a0aa7be41c..49062277086 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,7 @@ import sun.swing.MnemonicHandler;
  * @author Joshua Outwater
  */
 class GTKGraphicsUtils extends SynthGraphicsUtils {
+    @Override
     public void paintText(SynthContext context, Graphics g, String text,
                           int x, int y, int mnemonicIndex) {
         if (text == null || text.length() <= 0) {
@@ -83,6 +84,7 @@ class GTKGraphicsUtils extends SynthGraphicsUtils {
      * @param bounds Bounds of the text to be drawn.
      * @param mnemonicIndex Index to draw string at.
      */
+    @Override
     public void paintText(SynthContext context, Graphics g, String text,
                           Rectangle bounds, int mnemonicIndex) {
         if (text == null || text.length() <= 0) {
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java
index 4f04d729099..ffd7df909b5 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -163,6 +163,7 @@ class GTKIconFactory {
             this.method = methodName;
         }
 
+        @Override
         public void paintIcon(SynthContext context, Graphics g,
                               int x, int y, int w, int h) {
             if (context != null) {
@@ -171,10 +172,12 @@ class GTKIconFactory {
             }
         }
 
+        @Override
         public int getIconWidth(SynthContext context) {
             return getIconDimension(context);
         }
 
+        @Override
         public int getIconHeight(SynthContext context) {
             return getIconDimension(context);
         }
@@ -248,6 +251,7 @@ class GTKIconFactory {
             super(method);
         }
 
+        @Override
         public void paintIcon(SynthContext context, Graphics g, int x, int y,
                               int w, int h) {
             if (context != null) {
@@ -256,6 +260,7 @@ class GTKIconFactory {
             }
         }
 
+        @Override
         int getIconDimension(SynthContext context) {
             updateSizeIfNecessary(context);
             return (iconDimension == -1) ? DEFAULT_ICON_SIZE :
@@ -285,10 +290,12 @@ class GTKIconFactory {
             super(TOOL_BAR_HANDLE_ICON);
         }
 
+        @Override
         protected Class<?>[] getMethodParamTypes() {
             return PARAM_TYPES;
         }
 
+        @Override
         public void paintIcon(SynthContext context, Graphics g, int x, int y,
                               int w, int h) {
             if (context != null) {
@@ -309,6 +316,7 @@ class GTKIconFactory {
             }
         }
 
+        @Override
         public int getIconWidth(SynthContext context) {
             if (context == null) {
                 return 10;
@@ -321,6 +329,7 @@ class GTKIconFactory {
             }
         }
 
+        @Override
         public int getIconHeight(SynthContext context) {
             if (context == null) {
                 return 10;
@@ -344,10 +353,12 @@ class GTKIconFactory {
             super(MENU_ARROW_ICON);
         }
 
+        @Override
         protected Class<?>[] getMethodParamTypes() {
             return PARAM_TYPES;
         }
 
+        @Override
         public void paintIcon(SynthContext context, Graphics g, int x, int y,
                               int w, int h) {
             if (context != null) {
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
index 480b8bacb30..24a1997bdc1 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -261,6 +261,7 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
                 region == Region.TREE);
     }
 
+    @Override
     public UIDefaults getDefaults() {
         // We need to call super for basic's properties file.
         UIDefaults table = super.getDefaults();
@@ -301,6 +302,7 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
                              "com.sun.java.swing.plaf.gtk.resources.gtk");
     }
 
+    @Override
     protected void initComponentDefaults(UIDefaults table) {
         // For compatibility with apps expecting certain defaults we'll
         // populate the table with the values from basic.
@@ -511,6 +513,7 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
             FontLazyValue(Region region) {
                 this.region = region;
             }
+            @Override
             public Object createValue(UIDefaults table) {
                 SynthStyleFactory factory = getStyleFactory();
                 GTKStyle style = (GTKStyle)factory.getStyle(null, region);
@@ -556,6 +559,7 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
 
             "ColorChooser.showPreviewPanelText", Boolean.FALSE,
             "ColorChooser.panels", new UIDefaults.ActiveValue() {
+                @Override
                 public Object createValue(UIDefaults table) {
                     return new AbstractColorChooserPanel[] {
                                        new GTKColorChooserPanel() };
@@ -1168,6 +1172,7 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
 
             "TitledBorder.titleColor", controlText,
             "TitledBorder.border", new UIDefaults.LazyValue() {
+                @Override
                 public Object createValue(UIDefaults table) {
                     return new GTKPainter.TitledBorder();
                 }
@@ -1184,6 +1189,7 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
 
             "ToolBar.separatorSize", new DimensionUIResource(10, 10),
             "ToolBar.handleIcon", new UIDefaults.ActiveValue() {
+                @Override
                 public Object createValue(UIDefaults table) {
                     return GTKIconFactory.getToolBarHandleIcon();
                 }
@@ -1312,6 +1318,7 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
         }
     }
 
+    @Override
     protected void initSystemColorDefaults(UIDefaults table) {
         SynthStyleFactory factory = getStyleFactory();
         GTKStyle windowStyle =
@@ -1492,6 +1499,7 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
 
         public String getKey() { return key; }
 
+        @Override
         public void propertyChange(final PropertyChangeEvent pce) {
             final GTKLookAndFeel lnf = get();
 
@@ -1504,6 +1512,7 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
                 // We are using invokeLater here because we are getting called
                 // on the AWT-Motif thread which can cause a deadlock.
                 SwingUtilities.invokeLater(new Runnable() {
+                    @Override
                     public void run() {
                         String name = pce.getPropertyName();
                         /* We are listening for GTK desktop text AA settings:
@@ -1531,30 +1540,36 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
         }
     }
 
+    @Override
     public boolean isSupportedLookAndFeel() {
         Toolkit toolkit = Toolkit.getDefaultToolkit();
         return (toolkit instanceof SunToolkit &&
                 ((SunToolkit)toolkit).isNativeGTKAvailable());
     }
 
+    @Override
     public boolean isNativeLookAndFeel() {
         return true;
     }
 
+    @Override
     public String getDescription() {
         return "GTK look and feel";
     }
 
+    @Override
     public String getName() {
         return "GTK look and feel";
     }
 
+    @Override
     public String getID() {
         return "GTK";
     }
 
     // Subclassed to pass in false to the superclass, we don't want to try
     // and load the system colors.
+    @Override
     protected void loadSystemColors(UIDefaults table, String[] systemColors, boolean useNative) {
         super.loadSystemColors(table, systemColors, false);
     }
@@ -1663,6 +1678,7 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
      * <code>SynthStyles</code> from the <code>SynthStyleFactory</code>
      * when the ancestor changed.
      */
+    @Override
     public boolean shouldUpdateStyleOnAncestorChanged() {
         return true;
     }
@@ -1670,6 +1686,7 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
     /**
      * {@inheritDoc}
      */
+    @Override
     public LayoutStyle getLayoutStyle() {
         return GnomeLayoutStyle.INSTANCE;
     }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
index fa28eb3ca71..cf9cd0f2551 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,17 +77,20 @@ class GTKPainter extends SynthPainter {
                context.getComponent().getName();
     }
 
+    @Override
     public void paintCheckBoxBackground(SynthContext context,
             Graphics g, int x, int y, int w, int h) {
         paintRadioButtonBackground(context, g, x, y, w, h);
     }
 
+    @Override
     public void paintCheckBoxMenuItemBackground(SynthContext context,
             Graphics g, int x, int y, int w, int h) {
         paintRadioButtonMenuItemBackground(context, g, x, y, w, h);
     }
 
     // FORMATTED_TEXT_FIELD
+    @Override
     public void paintFormattedTextFieldBackground(SynthContext context,
                                           Graphics g, int x, int y,
                                           int w, int h) {
@@ -97,6 +100,7 @@ class GTKPainter extends SynthPainter {
     //
     // TOOL_BAR_DRAG_WINDOW
     //
+    @Override
     public void paintToolBarDragWindowBackground(SynthContext context,
                                      Graphics g, int x, int y,
                                      int w, int h) {
@@ -107,6 +111,7 @@ class GTKPainter extends SynthPainter {
     //
     // TOOL_BAR
     //
+    @Override
     public void paintToolBarBackground(SynthContext context,
                                      Graphics g, int x, int y,
                                      int w, int h) {
@@ -126,6 +131,7 @@ class GTKPainter extends SynthPainter {
         }
     }
 
+    @Override
     public void paintToolBarContentBackground(SynthContext context,
                                               Graphics g,
                                               int x, int y, int w, int h) {
@@ -144,6 +150,7 @@ class GTKPainter extends SynthPainter {
     //
     // PASSWORD_FIELD
     //
+    @Override
     public void paintPasswordFieldBackground(SynthContext context,
                                      Graphics g, int x, int y,
                                      int w, int h) {
@@ -153,6 +160,7 @@ class GTKPainter extends SynthPainter {
     //
     // TEXT_FIELD
     //
+    @Override
     public void paintTextFieldBackground(SynthContext context, Graphics g,
                                          int x, int y, int w, int h) {
         if (getName(context) == "Tree.cellEditor") {
@@ -166,6 +174,7 @@ class GTKPainter extends SynthPainter {
     // RADIO_BUTTON
     //
     // NOTE: this is called for JCheckBox too
+    @Override
     public void paintRadioButtonBackground(SynthContext context,
                                      Graphics g, int x, int y,
                                      int w, int h) {
@@ -204,6 +213,7 @@ class GTKPainter extends SynthPainter {
     // RADIO_BUTTON_MENU_ITEM
     //
     // NOTE: this is called for JCheckBoxMenuItem too
+    @Override
     public void paintRadioButtonMenuItemBackground(SynthContext context,
                                      Graphics g, int x, int y,
                                      int w, int h) {
@@ -218,6 +228,7 @@ class GTKPainter extends SynthPainter {
     //
     // LABEL
     //
+    @Override
     public void paintLabelBackground(SynthContext context,
                                      Graphics g, int x, int y,
                                      int w, int h) {
@@ -247,6 +258,7 @@ class GTKPainter extends SynthPainter {
     //
     // INTERNAL_FRAME
     //
+    @Override
     public void paintInternalFrameBorder(SynthContext context,
                                       Graphics g, int x, int y,
                                       int w, int h) {
@@ -256,6 +268,7 @@ class GTKPainter extends SynthPainter {
     //
     // DESKTOP_PANE
     //
+    @Override
     public void paintDesktopPaneBackground(SynthContext context,
                                            Graphics g, int x, int y,
                                            int w, int h) {
@@ -266,12 +279,14 @@ class GTKPainter extends SynthPainter {
     //
     // DESKTOP_ICON
     //
+    @Override
     public void paintDesktopIconBorder(SynthContext context,
                                            Graphics g, int x, int y,
                                            int w, int h) {
         Metacity.INSTANCE.paintFrameBorder(context, g, x, y, w, h);
     }
 
+    @Override
     public void paintButtonBackground(SynthContext context, Graphics g,
                                       int x, int y, int w, int h) {
         String name = getName(context);
@@ -388,6 +403,7 @@ class GTKPainter extends SynthPainter {
     //
     // ARROW_BUTTON
     //
+    @Override
     public void paintArrowButtonForeground(SynthContext context, Graphics g,
                                            int x, int y, int w, int h,
                                            int direction) {
@@ -437,6 +453,7 @@ class GTKPainter extends SynthPainter {
         }
     }
 
+    @Override
     public void paintArrowButtonBackground(SynthContext context,
             Graphics g, int x, int y, int w, int h) {
         Region id = context.getRegion();
@@ -515,12 +532,14 @@ class GTKPainter extends SynthPainter {
     //
     // LIST
     //
+    @Override
     public void paintListBackground(SynthContext context, Graphics g,
                                     int x, int y, int w, int h) {
         // Does not call into ENGINE for better performance
         fillArea(context, g, x, y, w, h, GTKColorType.TEXT_BACKGROUND);
     }
 
+    @Override
     public void paintMenuBarBackground(SynthContext context, Graphics g,
                                        int x, int y, int w, int h) {
         Region id = context.getRegion();
@@ -544,6 +563,7 @@ class GTKPainter extends SynthPainter {
     //
     // MENU
     //
+    @Override
     public void paintMenuBackground(SynthContext context,
                                      Graphics g,
                                      int x, int y, int w, int h) {
@@ -551,6 +571,7 @@ class GTKPainter extends SynthPainter {
     }
 
     // This is called for both MENU and MENU_ITEM
+    @Override
     public void paintMenuItemBackground(SynthContext context,
                                      Graphics g,
                                      int x, int y, int w, int h) {
@@ -561,6 +582,7 @@ class GTKPainter extends SynthPainter {
         }
     }
 
+    @Override
     public void paintPopupMenuBackground(SynthContext context, Graphics g,
                                         int x, int y, int w, int h) {
         Region id = context.getRegion();
@@ -604,6 +626,7 @@ class GTKPainter extends SynthPainter {
         }
     }
 
+    @Override
     public void paintProgressBarBackground(SynthContext context,
                                             Graphics g,
                                             int x, int y, int w, int h) {
@@ -618,6 +641,7 @@ class GTKPainter extends SynthPainter {
         }
     }
 
+    @Override
     public void paintProgressBarForeground(SynthContext context, Graphics g,
                                             int x, int y, int w, int h,
                                             int orientation) {
@@ -637,6 +661,7 @@ class GTKPainter extends SynthPainter {
         }
     }
 
+    @Override
     public void paintViewportBorder(SynthContext context, Graphics g,
                                            int x, int y, int w, int h) {
         Region id = context.getRegion();
@@ -650,6 +675,7 @@ class GTKPainter extends SynthPainter {
         }
     }
 
+    @Override
     public void paintSeparatorBackground(SynthContext context,
                                           Graphics g,
                                           int x, int y, int w, int h,
@@ -768,6 +794,7 @@ class GTKPainter extends SynthPainter {
         }
     }
 
+    @Override
     public void paintSliderTrackBackground(SynthContext context,
                                        Graphics g,
                                        int x, int y, int w,int h) {
@@ -830,6 +857,7 @@ class GTKPainter extends SynthPainter {
         }
     }
 
+    @Override
     public void paintSliderThumbBackground(SynthContext context,
             Graphics g, int x, int y, int w, int h, int dir) {
         Region id = context.getRegion();
@@ -856,6 +884,7 @@ class GTKPainter extends SynthPainter {
     //
     // SPINNER
     //
+    @Override
     public void paintSpinnerBackground(SynthContext context,
                                         Graphics g,
                                         int x, int y, int w, int h) {
@@ -865,6 +894,7 @@ class GTKPainter extends SynthPainter {
     //
     // SPLIT_PANE_DIVIDER
     //
+    @Override
     public void paintSplitPaneDividerBackground(SynthContext context,
                                        Graphics g,
                                        int x, int y, int w, int h) {
@@ -886,12 +916,14 @@ class GTKPainter extends SynthPainter {
         }
     }
 
+    @Override
     public void paintSplitPaneDragDivider(SynthContext context,
                                        Graphics g,int x, int y, int w, int h,
                                        int orientation) {
         paintSplitPaneDividerForeground(context, g, x, y, w, h, orientation);
     }
 
+    @Override
     public void paintTabbedPaneContentBackground(SynthContext context,
                                       Graphics g, int x, int y, int w, int h) {
         JTabbedPane pane = (JTabbedPane)context.getComponent();
@@ -931,6 +963,7 @@ class GTKPainter extends SynthPainter {
         }
     }
 
+    @Override
     public void paintTabbedPaneTabBackground(SynthContext context,
                                            Graphics g,
                                            int x, int y, int w, int h,
@@ -958,6 +991,7 @@ class GTKPainter extends SynthPainter {
     //
     // TEXT_PANE
     //
+    @Override
     public void paintTextPaneBackground(SynthContext context, Graphics g,
                                         int x, int y, int w, int h) {
         paintTextAreaBackground(context, g, x, y, w, h);
@@ -966,6 +1000,7 @@ class GTKPainter extends SynthPainter {
     //
     // EDITOR_PANE
     //
+    @Override
     public void paintEditorPaneBackground(SynthContext context, Graphics g,
                                           int x, int y, int w, int h) {
         paintTextAreaBackground(context, g, x, y, w, h);
@@ -974,6 +1009,7 @@ class GTKPainter extends SynthPainter {
     //
     // TEXT_AREA
     //
+    @Override
     public void paintTextAreaBackground(SynthContext context, Graphics g,
                                         int x, int y, int w, int h) {
         // Does not call into ENGINE for better performance
@@ -1076,6 +1112,7 @@ class GTKPainter extends SynthPainter {
     //
     // ROOT_PANE
     //
+    @Override
     public void paintRootPaneBackground(SynthContext context, Graphics g,
                                         int x, int y, int w, int h) {
         // Does not call into ENGINE for better performance
@@ -1085,6 +1122,7 @@ class GTKPainter extends SynthPainter {
     //
     // TOGGLE_BUTTON
     //
+    @Override
     public void paintToggleButtonBackground(SynthContext context,
                                             Graphics g,
                                             int x, int y, int w, int h) {
@@ -1103,6 +1141,7 @@ class GTKPainter extends SynthPainter {
     //
     // SCROLL_BAR
     //
+    @Override
     public void paintScrollBarBackground(SynthContext context,
                                           Graphics g,
                                           int x, int y, int w,int h) {
@@ -1148,6 +1187,7 @@ class GTKPainter extends SynthPainter {
     //
     // SCROLL_BAR_THUMB
     //
+    @Override
     public void paintScrollBarThumbBackground(SynthContext context,
             Graphics g, int x, int y, int w, int h, int dir) {
         Region id = context.getRegion();
@@ -1206,6 +1246,7 @@ class GTKPainter extends SynthPainter {
     //
     // TOOL_TIP
     //
+    @Override
     public void paintToolTipBackground(SynthContext context, Graphics g,
                                         int x, int y, int w,int h) {
         Region id = context.getRegion();
@@ -1224,6 +1265,7 @@ class GTKPainter extends SynthPainter {
     //
     // TREE_CELL
     //
+    @Override
     public void paintTreeCellBackground(SynthContext context, Graphics g,
                                         int x, int y, int w, int h) {
         Region id = context.getRegion();
@@ -1243,6 +1285,7 @@ class GTKPainter extends SynthPainter {
         }
     }
 
+    @Override
     public void paintTreeCellFocus(SynthContext context, Graphics g,
                                     int x, int y, int w, int h) {
         Region id = Region.TREE_CELL;
@@ -1254,6 +1297,7 @@ class GTKPainter extends SynthPainter {
     //
     // TREE
     //
+    @Override
     public void paintTreeBackground(SynthContext context, Graphics g,
                                     int x, int y, int w, int h) {
         // As far as I can tell, these don't call into the ENGINE.
@@ -1264,6 +1308,7 @@ class GTKPainter extends SynthPainter {
     //
     // VIEWPORT
     //
+    @Override
     public void paintViewportBackground(SynthContext context, Graphics g,
                                         int x, int y, int w, int h) {
         // As far as I can tell, these don't call into the ENGINE.
@@ -1509,6 +1554,7 @@ class GTKPainter extends SynthPainter {
             return context;
         }
 
+        @Override
         public void paintBorder(Component c, Graphics g, int x, int y,
                                 int w, int h) {
             if (focusedCell) {
@@ -1523,6 +1569,7 @@ class GTKPainter extends SynthPainter {
             }
         }
 
+        @Override
         public Insets getBorderInsets(Component c, Insets i) {
             SynthContext context = getContext(c);
 
@@ -1533,6 +1580,7 @@ class GTKPainter extends SynthPainter {
             return i;
         }
 
+        @Override
         public boolean isBorderOpaque() {
             return true;
         }
@@ -1542,6 +1590,7 @@ class GTKPainter extends SynthPainter {
     @SuppressWarnings("serial") // Superclass is not serializable across versions
     static class TitledBorder extends AbstractBorder implements UIResource {
 
+        @Override
         public void paintBorder(Component c, Graphics g, int x, int y,
                                 int w, int h) {
             SynthContext context = getContext((JComponent)c);
@@ -1559,11 +1608,13 @@ class GTKPainter extends SynthPainter {
             }
         }
 
+        @Override
         public Insets getBorderInsets(Component c, Insets i) {
             SynthContext context = getContext((JComponent)c);
             return context.getStyle().getInsets(context, i);
         }
 
+        @Override
         public boolean isBorderOpaque() {
             return true;
         }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java
index cc7a1333b64..baeb249eaa8 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -142,6 +142,7 @@ class GTKStyle extends SynthStyle implements GTKConstants {
         return GTKPainter.INSTANCE;
     }
 
+    @Override
     protected Color getColorForState(SynthContext context, ColorType type) {
         if (type == ColorType.FOCUS || type == GTKColorType.BLACK) {
             return BLACK_COLOR;
@@ -292,6 +293,7 @@ class GTKStyle extends SynthStyle implements GTKConstants {
         return font;
     }
 
+    @Override
     protected Font getFontForState(SynthContext context) {
         Font propFont = UIManager
                               .getFont(context.getRegion().getName() + ".font");
@@ -1053,6 +1055,7 @@ class GTKStyle extends SynthStyle implements GTKConstants {
             this.size = size;
         }
 
+        @Override
         public void paintIcon(SynthContext context, Graphics g, int x,
                               int y, int w, int h) {
             Icon icon = getIcon(context);
@@ -1067,6 +1070,7 @@ class GTKStyle extends SynthStyle implements GTKConstants {
             }
         }
 
+        @Override
         public int getIconWidth(SynthContext context) {
             Icon icon = getIcon(context);
 
@@ -1076,6 +1080,7 @@ class GTKStyle extends SynthStyle implements GTKConstants {
             return 0;
         }
 
+        @Override
         public int getIconHeight(SynthContext context) {
             Icon icon = getIcon(context);
 
@@ -1135,6 +1140,7 @@ class GTKStyle extends SynthStyle implements GTKConstants {
             this.methodName = methodName;
         }
 
+        @Override
         @SuppressWarnings("deprecation")
         public Object createValue(UIDefaults table) {
             try {
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java
index 9683ba06788..4127e39c172 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,6 +58,7 @@ class GTKStyleFactory extends SynthStyleFactory {
      * @param c this parameter isn't used, may be null.
      * @param id of the region to get the style.
      */
+    @Override
     public synchronized SynthStyle getStyle(JComponent c, Region id) {
         WidgetType wt = GTKEngine.getWidgetType(c, id);
 
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java
index 4f7d19355c8..6e8f64b457d 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -693,6 +693,7 @@ class Metacity implements SynthConstants {
             return new ImageIcon(context.getComponent().createImage(producer)).getImage();
         }
 
+        @Override
         public int filterRGB(int x, int y, int rgb) {
             // Assume all rgb values are shades of gray
             double grayLevel = 2 * (rgb & 0xff) / 255.0;
@@ -729,12 +730,16 @@ class Metacity implements SynthConstants {
 
 
     protected class TitlePaneLayout implements LayoutManager {
+        @Override
         public void addLayoutComponent(String name, Component c) {}
+        @Override
         public void removeLayoutComponent(Component c) {}
+        @Override
         public Dimension preferredLayoutSize(Container c)  {
             return minimumLayoutSize(c);
         }
 
+        @Override
         public Dimension minimumLayoutSize(Container c) {
             JComponent titlePane = (JComponent)c;
             Container titlePaneParent = titlePane.getParent();
@@ -794,6 +799,7 @@ class Metacity implements SynthConstants {
             return new Dimension(width, height);
         }
 
+        @Override
         public void layoutContainer(Container c) {
             JComponent titlePane = (JComponent)c;
             Container titlePaneParent = titlePane.getParent();
@@ -1943,10 +1949,12 @@ class Metacity implements SynthConstants {
             return token;
         }
 
+        @Override
         public boolean hasMoreTokens() {
             return (token != null || super.hasMoreTokens());
         }
 
+        @Override
         public String nextToken() {
             if (token != null) {
                 String t = token;
@@ -2000,18 +2008,22 @@ class Metacity implements SynthConstants {
             this.archeight = arch;
         }
 
+        @Override
         public double getX() {
             return (double)x;
         }
 
+        @Override
         public double getY() {
             return (double)y;
         }
 
+        @Override
         public double getWidth() {
             return (double)width;
         }
 
+        @Override
         public double getHeight() {
             return (double)height;
         }
@@ -2024,10 +2036,12 @@ class Metacity implements SynthConstants {
             return (double)archeight;
         }
 
+        @Override
         public boolean isEmpty() {
             return false;  // Not called
         }
 
+        @Override
         public Rectangle2D getBounds2D() {
             return null;  // Not called
         }
@@ -2036,10 +2050,12 @@ class Metacity implements SynthConstants {
             return corners;
         }
 
+        @Override
         public void setFrame(double x, double y, double w, double h) {
             // Not called
         }
 
+        @Override
         public boolean contains(double x, double y) {
             return false;  // Not called
         }
@@ -2048,14 +2064,17 @@ class Metacity implements SynthConstants {
             return 0;  // Not called
         }
 
+        @Override
         public boolean intersects(double x, double y, double w, double h) {
             return false;  // Not called
         }
 
+        @Override
         public boolean contains(double x, double y, double w, double h) {
             return false;  // Not called
         }
 
+        @Override
         public PathIterator getPathIterator(AffineTransform at) {
             return new RoundishRectIterator(this, at);
         }
@@ -2148,18 +2167,22 @@ class Metacity implements SynthConstants {
                 }
             }
 
+            @Override
             public int getWindingRule() {
                 return WIND_NON_ZERO;
             }
 
+            @Override
             public boolean isDone() {
                 return index >= ctrlpts.length;
             }
 
+            @Override
             public void next() {
                 index++;
             }
 
+            @Override
             public int currentSegment(float[] coords) {
                 if (isDone()) {
                     throw new NoSuchElementException("roundrect iterator out of bounds");
@@ -2176,6 +2199,7 @@ class Metacity implements SynthConstants {
                 return types[index];
             }
 
+            @Override
             public int currentSegment(double[] coords) {
                 if (isDone()) {
                     throw new NoSuchElementException("roundrect iterator out of bounds");
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
index 342583aaa46..7d820930415 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/Dialog.java b/src/java.desktop/share/classes/java/awt/Dialog.java
index 0fa4a74b61a..83aa89b9bf7 100644
--- a/src/java.desktop/share/classes/java/awt/Dialog.java
+++ b/src/java.desktop/share/classes/java/awt/Dialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/EventQueue.java b/src/java.desktop/share/classes/java/awt/EventQueue.java
index be13548e998..571ec9f7e88 100644
--- a/src/java.desktop/share/classes/java/awt/EventQueue.java
+++ b/src/java.desktop/share/classes/java/awt/EventQueue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/Font.java b/src/java.desktop/share/classes/java/awt/Font.java
index 2da68fd8618..0614163fb7f 100644
--- a/src/java.desktop/share/classes/java/awt/Font.java
+++ b/src/java.desktop/share/classes/java/awt/Font.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java b/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java
index ecaf5ae4e27..92bf16ec466 100644
--- a/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java
+++ b/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/HeadlessException.java b/src/java.desktop/share/classes/java/awt/HeadlessException.java
index cff97ee8c3c..b8717be69eb 100644
--- a/src/java.desktop/share/classes/java/awt/HeadlessException.java
+++ b/src/java.desktop/share/classes/java/awt/HeadlessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java b/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java
index 6c6e4044131..348d0772cf4 100644
--- a/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java
+++ b/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/Polygon.java b/src/java.desktop/share/classes/java/awt/Polygon.java
index 3c91aaba90f..bbe6ed77b8b 100644
--- a/src/java.desktop/share/classes/java/awt/Polygon.java
+++ b/src/java.desktop/share/classes/java/awt/Polygon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/PrintJob.java b/src/java.desktop/share/classes/java/awt/PrintJob.java
index 926de65608b..52216b9cf08 100644
--- a/src/java.desktop/share/classes/java/awt/PrintJob.java
+++ b/src/java.desktop/share/classes/java/awt/PrintJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/SystemTray.java b/src/java.desktop/share/classes/java/awt/SystemTray.java
index b51702bd125..bf1871765eb 100644
--- a/src/java.desktop/share/classes/java/awt/SystemTray.java
+++ b/src/java.desktop/share/classes/java/awt/SystemTray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html b/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html
index 22df108b91a..f4b0cf9d3d3 100644
--- a/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html
+++ b/src/java.desktop/share/classes/java/awt/doc-files/FocusSpec.html
@@ -5,7 +5,7 @@
   <title>The AWT Focus Subsystem</title>
 </head>
 <!--
- Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/doc-files/Modality.html b/src/java.desktop/share/classes/java/awt/doc-files/Modality.html
index 94491dd3edc..8f10d5cfe90 100644
--- a/src/java.desktop/share/classes/java/awt/doc-files/Modality.html
+++ b/src/java.desktop/share/classes/java/awt/doc-files/Modality.html
@@ -8,7 +8,7 @@
   </style>
 </head>
 <!--
- Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/font/FontRenderContext.java b/src/java.desktop/share/classes/java/awt/font/FontRenderContext.java
index e6cac8fe4a9..60e7e6e5ebd 100644
--- a/src/java.desktop/share/classes/java/awt/font/FontRenderContext.java
+++ b/src/java.desktop/share/classes/java/awt/font/FontRenderContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,19 +62,18 @@ import java.awt.geom.AffineTransform;
 *   @see java.awt.Graphics2D#getFontRenderContext()
 *   @see java.awt.font.LineMetrics
 */
-
 public class FontRenderContext {
-    private transient AffineTransform tx;
-    private transient Object aaHintValue;
-    private transient Object fmHintValue;
-    private transient boolean defaulting;
+    private final transient AffineTransform tx;
+    private final transient Object aaHintValue;
+    private final transient Object fmHintValue;
+    private final transient boolean defaulting;
 
     /**
      * Constructs a new {@code FontRenderContext}
      * object.
-     *
      */
     protected FontRenderContext() {
+        tx = null;
         aaHintValue = VALUE_TEXT_ANTIALIAS_DEFAULT;
         fmHintValue = VALUE_FRACTIONALMETRICS_DEFAULT;
         defaulting = true;
@@ -105,6 +104,8 @@ public class FontRenderContext {
                             boolean usesFractionalMetrics) {
         if (tx != null && !tx.isIdentity()) {
             this.tx = new AffineTransform(tx);
+        } else {
+            this.tx = null;
         }
         if (isAntiAliased) {
             aaHintValue = VALUE_TEXT_ANTIALIAS_ON;
@@ -116,6 +117,7 @@ public class FontRenderContext {
         } else {
             fmHintValue = VALUE_FRACTIONALMETRICS_OFF;
         }
+        defaulting = false;
     }
 
     /**
@@ -145,6 +147,8 @@ public class FontRenderContext {
     public FontRenderContext(AffineTransform tx, Object aaHint, Object fmHint){
         if (tx != null && !tx.isIdentity()) {
             this.tx = new AffineTransform(tx);
+        } else {
+            this.tx = null;
         }
         try {
             if (KEY_TEXT_ANTIALIASING.isCompatibleValue(aaHint)) {
@@ -164,6 +168,7 @@ public class FontRenderContext {
         } catch (Exception e) {
             throw new IllegalArgumentException("FM hint:" +fmHint);
         }
+        defaulting = false;
     }
 
     /**
diff --git a/src/java.desktop/share/classes/java/awt/font/TextLine.java b/src/java.desktop/share/classes/java/awt/font/TextLine.java
index 6db1bc72360..57b9c0c642a 100644
--- a/src/java.desktop/share/classes/java/awt/font/TextLine.java
+++ b/src/java.desktop/share/classes/java/awt/font/TextLine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -396,10 +396,7 @@ final class TextLine {
                                                  BufferedImage.TYPE_INT_ARGB);
 
             Graphics2D g2d = im.createGraphics();
-            g2d.setColor(Color.WHITE);
-            g2d.fillRect(0, 0, im.getWidth(), im.getHeight());
-
-            g2d.setColor(Color.BLACK);
+            g2d.setColor(Color.WHITE); // white over transparent black bg
             draw(g2d, rx + MARGIN - bounds.x, ry + MARGIN - bounds.y);
 
             result = computePixelBounds(im);
@@ -428,7 +425,7 @@ final class TextLine {
             loop: while (++t < h) {
                 im.getRGB(0, t, buf.length, 1, buf, 0, w); // w ignored
                 for (int i = 0; i < buf.length; i++) {
-                    if (buf[i] != -1) {
+                    if (buf[i] != 0) {
                         break loop;
                     }
                 }
@@ -441,7 +438,7 @@ final class TextLine {
             loop: while (--b > t) {
                 im.getRGB(0, b, buf.length, 1, buf, 0, w); // w ignored
                 for (int i = 0; i < buf.length; ++i) {
-                    if (buf[i] != -1) {
+                    if (buf[i] != 0) {
                         break loop;
                     }
                 }
@@ -454,7 +451,7 @@ final class TextLine {
             loop: while (++l < r) {
                 for (int i = t; i < b; ++i) {
                     int v = im.getRGB(l, i);
-                    if (v != -1) {
+                    if (v != 0) {
                         break loop;
                     }
                 }
@@ -466,7 +463,7 @@ final class TextLine {
             loop: while (--r > l) {
                 for (int i = t; i < b; ++i) {
                     int v = im.getRGB(r, i);
-                    if (v != -1) {
+                    if (v != 0) {
                         break loop;
                     }
                 }
diff --git a/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java b/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java
index 229c8a20d35..a7f014d7a59 100644
--- a/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java b/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java
index 89a72b18dea..d15a8d214aa 100644
--- a/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/image/LookupOp.java b/src/java.desktop/share/classes/java/awt/image/LookupOp.java
index c8d8a703a3f..dba17fe5926 100644
--- a/src/java.desktop/share/classes/java/awt/image/LookupOp.java
+++ b/src/java.desktop/share/classes/java/awt/image/LookupOp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java b/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
index e40da604887..a79ddf52cd9 100644
--- a/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/image/SampleModel.java b/src/java.desktop/share/classes/java/awt/image/SampleModel.java
index 0ecd4162c60..134d7866340 100644
--- a/src/java.desktop/share/classes/java/awt/image/SampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/SampleModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java b/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
index a75b5197c44..d12c151a8fd 100644
--- a/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/beans/Beans.java b/src/java.desktop/share/classes/java/beans/Beans.java
index a95aeb45cbb..db94f413ccc 100644
--- a/src/java.desktop/share/classes/java/beans/Beans.java
+++ b/src/java.desktop/share/classes/java/beans/Beans.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/java/beans/DesignMode.java b/src/java.desktop/share/classes/java/beans/DesignMode.java
index 36cff7a41e1..855a7aee6c0 100644
--- a/src/java.desktop/share/classes/java/beans/DesignMode.java
+++ b/src/java.desktop/share/classes/java/beans/DesignMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/imageio/ImageReader.java b/src/java.desktop/share/classes/javax/imageio/ImageReader.java
index 281e7298354..f00378182b8 100644
--- a/src/java.desktop/share/classes/javax/imageio/ImageReader.java
+++ b/src/java.desktop/share/classes/javax/imageio/ImageReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/imageio/ImageWriter.java b/src/java.desktop/share/classes/javax/imageio/ImageWriter.java
index fd8cc3a753d..f378e969a5a 100644
--- a/src/java.desktop/share/classes/javax/imageio/ImageWriter.java
+++ b/src/java.desktop/share/classes/javax/imageio/ImageWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java
index 9f47a582e5b..3f7cacdaaf0 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java b/src/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java
index 4f8ae8f2d1e..93caed1823f 100644
--- a/src/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java
+++ b/src/java.desktop/share/classes/javax/imageio/spi/IIORegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java b/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java
index be9f40e13df..7eaa14133c5 100644
--- a/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java
+++ b/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java
index 4f44ad1ab2a..de5f705facc 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java
index 13269832ab5..8c80d3488e1 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStreamImpl.java b/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStreamImpl.java
index f21f9ec5ade..103fe4019e4 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStreamImpl.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStreamImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java
index 0630e19e98c..0f259a9ce46 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/package-info.java b/src/java.desktop/share/classes/javax/imageio/stream/package-info.java
index 56dccaa9823..198cb6fe51f 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/package-info.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/Action.java b/src/java.desktop/share/classes/javax/swing/Action.java
index b1b092e2104..9d9cf435946 100644
--- a/src/java.desktop/share/classes/javax/swing/Action.java
+++ b/src/java.desktop/share/classes/javax/swing/Action.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java b/src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java
index 02df96b435d..a2ae940d79c 100644
--- a/src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java
+++ b/src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/JComponent.java b/src/java.desktop/share/classes/javax/swing/JComponent.java
index de3d7d128e9..f515115bade 100644
--- a/src/java.desktop/share/classes/javax/swing/JComponent.java
+++ b/src/java.desktop/share/classes/javax/swing/JComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/JEditorPane.java b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
index e715b88603f..2f8f0f30722 100644
--- a/src/java.desktop/share/classes/javax/swing/JEditorPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/JFileChooser.java b/src/java.desktop/share/classes/javax/swing/JFileChooser.java
index ddb3a3911a6..689615b95f6 100644
--- a/src/java.desktop/share/classes/javax/swing/JFileChooser.java
+++ b/src/java.desktop/share/classes/javax/swing/JFileChooser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/JOptionPane.java b/src/java.desktop/share/classes/javax/swing/JOptionPane.java
index bff597dd22c..707b9febf10 100644
--- a/src/java.desktop/share/classes/javax/swing/JOptionPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JOptionPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/JRootPane.java b/src/java.desktop/share/classes/javax/swing/JRootPane.java
index 61d3b3e707e..2e930914531 100644
--- a/src/java.desktop/share/classes/javax/swing/JRootPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JRootPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java
index e9ae9d82166..6e64b216d58 100644
--- a/src/java.desktop/share/classes/javax/swing/JTable.java
+++ b/src/java.desktop/share/classes/javax/swing/JTable.java
@@ -4454,8 +4454,6 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
             // The whole thing changed
             clearSelectionAndLeadAnchor();
 
-            rowModel = null;
-
             if (sortManager != null) {
                 try {
                     ignoreSortChange = true;
diff --git a/src/java.desktop/share/classes/javax/swing/JViewport.java b/src/java.desktop/share/classes/javax/swing/JViewport.java
index e7b1e1eacf0..5c31dce562a 100644
--- a/src/java.desktop/share/classes/javax/swing/JViewport.java
+++ b/src/java.desktop/share/classes/javax/swing/JViewport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java b/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java
index b81c80dbf35..fb3d4c5e5c3 100644
--- a/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java
+++ b/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java b/src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java
index 329fe52ade5..4a7b0821a3d 100644
--- a/src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java
+++ b/src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/SwingUtilities.java b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
index 4633e9c4756..bc6441212de 100644
--- a/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
+++ b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1813,6 +1813,9 @@ public class SwingUtilities implements SwingConstants
 
         while (map != null) {
             InputMap parent = map.getParent();
+            if (uiInputMap == null) {
+                map.clear();
+            }
             if (parent == null || (parent instanceof UIResource)) {
                 map.setParent(uiInputMap);
                 return;
@@ -1837,6 +1840,9 @@ public class SwingUtilities implements SwingConstants
 
         while (map != null) {
             ActionMap parent = map.getParent();
+            if (uiActionMap == null) {
+                map.clear();
+            }
             if (parent == null || (parent instanceof UIResource)) {
                 map.setParent(uiActionMap);
                 return;
diff --git a/src/java.desktop/share/classes/javax/swing/Timer.java b/src/java.desktop/share/classes/javax/swing/Timer.java
index 38ced6f3102..2cb8381d7d3 100644
--- a/src/java.desktop/share/classes/javax/swing/Timer.java
+++ b/src/java.desktop/share/classes/javax/swing/Timer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/ToolTipManager.java b/src/java.desktop/share/classes/javax/swing/ToolTipManager.java
index 1f77980f896..a9e2c6e69bb 100644
--- a/src/java.desktop/share/classes/javax/swing/ToolTipManager.java
+++ b/src/java.desktop/share/classes/javax/swing/ToolTipManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/UIManager.java b/src/java.desktop/share/classes/javax/swing/UIManager.java
index e86d9caee6d..7a2ae226f33 100644
--- a/src/java.desktop/share/classes/javax/swing/UIManager.java
+++ b/src/java.desktop/share/classes/javax/swing/UIManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/package-info.java b/src/java.desktop/share/classes/javax/swing/package-info.java
index a1492cb7b28..f1e51002e95 100644
--- a/src/java.desktop/share/classes/javax/swing/package-info.java
+++ b/src/java.desktop/share/classes/javax/swing/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
index 032db36b87e..00f7b95eb30 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java
index ad6b226dd70..9dd072aa451 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
index 4d9fa9eaaff..8c9162cc38e 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java
index ee50976bbf4..a300110cced 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -216,11 +216,9 @@ public class SynthProgressBarUI extends BasicProgressBarUI
 
         SynthLookAndFeel.update(context, g);
 
-        if (((JProgressBar) c).isBorderPainted()) {
-            context.getPainter().paintProgressBarBackground(context,
-                    g, 0, 0, c.getWidth(), c.getHeight(),
-                    progressBar.getOrientation());
-        }
+        context.getPainter().paintProgressBarBackground(context,
+                g, 0, 0, c.getWidth(), c.getHeight(),
+                progressBar.getOrientation());
         paint(context, g);
     }
 
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd
index 3433d48fc39..6abe1a9486b 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd
@@ -2,7 +2,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
index 87c5e747374..974ee0b27c2 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8"/>
   <title>Synth File Format</title>
 <!--
- Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java b/src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java
index 5ffb7ee347b..00bd11eee4d 100644
--- a/src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java
+++ b/src/java.desktop/share/classes/javax/swing/table/DefaultTableCellRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,9 @@ import java.awt.Component;
 import java.awt.Color;
 import java.awt.Rectangle;
 
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.Serial;
 import java.io.Serializable;
 import sun.swing.DefaultLookup;
 import sun.swing.SwingUtilities2;
@@ -373,6 +376,17 @@ public class DefaultTableCellRenderer extends JLabel
         setText((value == null) ? "" : value.toString());
     }
 
+    /**
+     * See readObject() and writeObject() in JComponent for more
+     * information about serialization in Swing.
+     */
+    @Serial
+    private void writeObject(ObjectOutputStream s) throws IOException {
+        s.defaultWriteObject();
+        setForeground(null);
+        setBackground(null);
+    }
+
 
     /**
      * A subclass of <code>DefaultTableCellRenderer</code> that
diff --git a/src/java.desktop/share/classes/javax/swing/text/StringContent.java b/src/java.desktop/share/classes/javax/swing/text/StringContent.java
index 1ce375fa3ab..2fa1c130e34 100644
--- a/src/java.desktop/share/classes/javax/swing/text/StringContent.java
+++ b/src/java.desktop/share/classes/javax/swing/text/StringContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/parser/Entity.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/Entity.java
index 0b2a9b013af..88be0dcf8e1 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/Entity.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/Entity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/sun/awt/AppContext.java b/src/java.desktop/share/classes/sun/awt/AppContext.java
index 040861ce8a4..39df737badb 100644
--- a/src/java.desktop/share/classes/sun/awt/AppContext.java
+++ b/src/java.desktop/share/classes/sun/awt/AppContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java b/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java
index 654cd04ff93..8310b7cb604 100644
--- a/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java
+++ b/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/sun/awt/SunToolkit.java b/src/java.desktop/share/classes/sun/awt/SunToolkit.java
index 0f1edaf6a0e..1f92189a62f 100644
--- a/src/java.desktop/share/classes/sun/awt/SunToolkit.java
+++ b/src/java.desktop/share/classes/sun/awt/SunToolkit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java b/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java
index 775e7803c5b..65eb12788d0 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/sun/awt/image/SunVolatileImage.java b/src/java.desktop/share/classes/sun/awt/image/SunVolatileImage.java
index 4bcd5f6b443..a1ad33ece6d 100644
--- a/src/java.desktop/share/classes/sun/awt/image/SunVolatileImage.java
+++ b/src/java.desktop/share/classes/sun/awt/image/SunVolatileImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java b/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java
index 9b86d469d98..2defd8b7ddb 100644
--- a/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java
+++ b/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/sun/awt/util/PerformanceLogger.java b/src/java.desktop/share/classes/sun/awt/util/PerformanceLogger.java
index 117ff4bec2a..4a1dde6538d 100644
--- a/src/java.desktop/share/classes/sun/awt/util/PerformanceLogger.java
+++ b/src/java.desktop/share/classes/sun/awt/util/PerformanceLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/sun/font/CompositeStrike.java b/src/java.desktop/share/classes/sun/font/CompositeStrike.java
index be6092f61f8..9974332a314 100644
--- a/src/java.desktop/share/classes/sun/font/CompositeStrike.java
+++ b/src/java.desktop/share/classes/sun/font/CompositeStrike.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -175,43 +175,4 @@ public final class CompositeStrike extends FontStrike {
             return path;
         }
     }
-
-    /* The physical font slot for each glyph is encoded in the glyph ID
-     * To be as efficient as possible we find a run of glyphs from the
-     * same slot and create a temporary array of these glyphs decoded
-     * to the slot. The slot font is then queried for the GeneralPath
-     * for that run of glyphs. GeneralPaths from each run are appended
-     * to create the shape for the whole glyph array.
-     */
-    GeneralPath getGlyphVectorOutline(int[] glyphs, float x, float y) {
-        GeneralPath path = null;
-        GeneralPath gp;
-        int glyphIndex = 0;
-        int[] tmpGlyphs;
-
-        while (glyphIndex < glyphs.length) {
-            int start = glyphIndex;
-            int slot = glyphs[glyphIndex] >>> 24;
-            while (glyphIndex < glyphs.length &&
-                   (glyphs[glyphIndex+1] >>> 24) == slot) {
-                glyphIndex++;
-            }
-            int tmpLen = glyphIndex-start+1;
-            tmpGlyphs = new int[tmpLen];
-            for (int i=0;i<tmpLen;i++) {
-                tmpGlyphs[i] = glyphs[i] & SLOTMASK;
-            }
-            gp = getStrikeForSlot(slot).getGlyphVectorOutline(tmpGlyphs, x, y);
-            if (path == null) {
-                path = gp;
-            } else if (gp != null) {
-                path.append(gp, false);
-            }
-        }
-        if (path == null) {
-            return new GeneralPath();
-        } else {
-            return path;
-        }
-    }
 }
diff --git a/src/java.desktop/share/classes/sun/font/FileFont.java b/src/java.desktop/share/classes/sun/font/FileFont.java
index 2703af8396a..6983eb3538e 100644
--- a/src/java.desktop/share/classes/sun/font/FileFont.java
+++ b/src/java.desktop/share/classes/sun/font/FileFont.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/sun/font/FileFontStrike.java b/src/java.desktop/share/classes/sun/font/FileFontStrike.java
index 01e682e8390..a195e0347c0 100644
--- a/src/java.desktop/share/classes/sun/font/FileFontStrike.java
+++ b/src/java.desktop/share/classes/sun/font/FileFontStrike.java
@@ -39,7 +39,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import static sun.awt.SunHints.*;
 import sun.java2d.pipe.OutlineTextRenderer;
 
-
 public class FileFontStrike extends PhysicalStrike {
 
     /* fffe and ffff are values we specially interpret as meaning
@@ -931,11 +930,6 @@ public class FileFontStrike extends PhysicalStrike {
         return gp;
     }
 
-    GeneralPath getGlyphVectorOutline(int[] glyphs, float x, float y) {
-        return fileFont.getGlyphVectorOutline(pScalerContext,
-                                              glyphs, glyphs.length, x, y);
-    }
-
     protected void adjustPoint(Point2D.Float pt) {
         if (invertDevTx != null) {
             invertDevTx.deltaTransform(pt, pt);
diff --git a/src/java.desktop/share/classes/sun/font/FontManager.java b/src/java.desktop/share/classes/sun/font/FontManager.java
index def0e411853..3ece68f7b8a 100644
--- a/src/java.desktop/share/classes/sun/font/FontManager.java
+++ b/src/java.desktop/share/classes/sun/font/FontManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/sun/font/FontStrike.java b/src/java.desktop/share/classes/sun/font/FontStrike.java
index 2eff2f8169f..a02ba58b995 100644
--- a/src/java.desktop/share/classes/sun/font/FontStrike.java
+++ b/src/java.desktop/share/classes/sun/font/FontStrike.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,20 +32,12 @@ import java.awt.geom.Point2D;
 
 public abstract class FontStrike {
 
-
     protected FontStrikeDisposer disposer;
     protected FontStrikeDesc desc;
     protected StrikeMetrics strikeMetrics;
     protected boolean algoStyle = false;
     protected float boldness = 1f;
     protected float italic = 0f;
-    /*
-     * lastLookupTime is updated by Font2D.getStrike and can be used to
-     * choose strikes that have not been newly referenced for purging when
-     * memory usage gets too high. Active strikes will never be purged
-     * because purging is via GC of WeakReferences.
-     */
-    //protected long lastlookupTime/* = System.currentTimeMillis()*/;
 
     public abstract int getNumGlyphs();
 
@@ -70,11 +62,5 @@ public abstract class FontStrike {
 
     abstract Rectangle2D.Float getGlyphOutlineBounds(int glyphCode);
 
-    abstract GeneralPath
-        getGlyphOutline(int glyphCode, float x, float y);
-
-    abstract GeneralPath
-        getGlyphVectorOutline(int[] glyphs, float x, float y);
-
-
+    abstract GeneralPath getGlyphOutline(int glyphCode, float x, float y);
 }
diff --git a/src/java.desktop/share/classes/sun/font/StandardGlyphVector.java b/src/java.desktop/share/classes/sun/font/StandardGlyphVector.java
index e333a9de291..d44bd9a00e5 100644
--- a/src/java.desktop/share/classes/sun/font/StandardGlyphVector.java
+++ b/src/java.desktop/share/classes/sun/font/StandardGlyphVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -608,11 +608,13 @@ public class StandardGlyphVector extends GlyphVector {
         }
 
         Rectangle2D vb = getGlyphVisualBounds(ix).getBounds2D();
-        Point2D pt = getGlyphPosition(ix);
-        vb.setRect(vb.getMinX() - pt.getX(),
-                   vb.getMinY() - pt.getY(),
-                   vb.getWidth(),
-                   vb.getHeight());
+        if (!vb.isEmpty()) {
+            Point2D pt = getGlyphPosition(ix);
+            vb.setRect(vb.getMinX() - pt.getX(),
+                       vb.getMinY() - pt.getY(),
+                       vb.getWidth(),
+                       vb.getHeight());
+        }
         Point2D.Float adv =
             getGlyphStrike(ix).strike.getGlyphMetrics(glyphs[ix]);
         GlyphMetrics gm = new GlyphMetrics(true, adv.x, adv.y,
diff --git a/src/java.desktop/share/classes/sun/font/SunFontManager.java b/src/java.desktop/share/classes/sun/font/SunFontManager.java
index 1194a1c5816..85a948ef594 100644
--- a/src/java.desktop/share/classes/sun/font/SunFontManager.java
+++ b/src/java.desktop/share/classes/sun/font/SunFontManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/sun/java2d/marlin/DMarlinRenderingEngine.java b/src/java.desktop/share/classes/sun/java2d/marlin/DMarlinRenderingEngine.java
index f829872a8a8..807525986dd 100644
--- a/src/java.desktop/share/classes/sun/java2d/marlin/DMarlinRenderingEngine.java
+++ b/src/java.desktop/share/classes/sun/java2d/marlin/DMarlinRenderingEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java
index a0904588019..7d59d9542d6 100644
--- a/src/java.desktop/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java
+++ b/src/java.desktop/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/sun/java2d/pipe/BufferedContext.java b/src/java.desktop/share/classes/sun/java2d/pipe/BufferedContext.java
index 83e63fc75d8..a121f792186 100644
--- a/src/java.desktop/share/classes/sun/java2d/pipe/BufferedContext.java
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/BufferedContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/sun/print/PathGraphics.java b/src/java.desktop/share/classes/sun/print/PathGraphics.java
index 9a45b06657f..5c4c34748ee 100644
--- a/src/java.desktop/share/classes/sun/print/PathGraphics.java
+++ b/src/java.desktop/share/classes/sun/print/PathGraphics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/sun/swing/FilePane.java b/src/java.desktop/share/classes/sun/swing/FilePane.java
index 976201c5721..3fcceb9dfe4 100644
--- a/src/java.desktop/share/classes/sun/swing/FilePane.java
+++ b/src/java.desktop/share/classes/sun/swing/FilePane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java b/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
index c57912448af..05482227069 100644
--- a/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
+++ b/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/conf/psfontj2d.properties b/src/java.desktop/share/conf/psfontj2d.properties
index 8030a82bc4f..8baf0dd6fd3 100644
--- a/src/java.desktop/share/conf/psfontj2d.properties
+++ b/src/java.desktop/share/conf/psfontj2d.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.c b/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.c
index 75b585e3496..224565ba88e 100644
--- a/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.c
+++ b/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.h b/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.h
index b042c091b3a..abfc0e49027 100644
--- a/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.h
+++ b/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/native/libawt/java2d/SurfaceData.h b/src/java.desktop/share/native/libawt/java2d/SurfaceData.h
index f7124961392..0079812b805 100644
--- a/src/java.desktop/share/native/libawt/java2d/SurfaceData.h
+++ b/src/java.desktop/share/native/libawt/java2d/SurfaceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/native/libawt/java2d/loops/Blit.c b/src/java.desktop/share/native/libawt/java2d/loops/Blit.c
index 8a41584deef..dd7a8548ea5 100644
--- a/src/java.desktop/share/native/libawt/java2d/loops/Blit.c
+++ b/src/java.desktop/share/native/libawt/java2d/loops/Blit.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/share/native/libfontmanager/freetypeScaler.c b/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
index f46b8a45aca..3bd2b3d07ae 100644
--- a/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
+++ b/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/FcFontManager.java b/src/java.desktop/unix/classes/sun/awt/FcFontManager.java
index 0d787ceb1af..707ea1c9ac7 100644
--- a/src/java.desktop/unix/classes/sun/awt/FcFontManager.java
+++ b/src/java.desktop/unix/classes/sun/awt/FcFontManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java
index 7bd6bcb306f..99036e1b2f5 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
index ede95bea3e8..bab0f34f90f 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java b/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java
index 6b6e8ad0c6d..38dcc880be8 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java
index 2e0fe9717d8..f5a3822f006 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java
index ee1c5afcdf9..f14d8f958c5 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java
index fa8f7f46fc1..c6e3725332c 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/Native.java b/src/java.desktop/unix/classes/sun/awt/X11/Native.java
index 784328262b9..ed62e384660 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/Native.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/Native.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/UnsafeXDisposerRecord.java b/src/java.desktop/unix/classes/sun/awt/X11/UnsafeXDisposerRecord.java
index 492fc0a0827..682f7cd5006 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/UnsafeXDisposerRecord.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/UnsafeXDisposerRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java b/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java
index 38ae4efbac0..482635d2995 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/WindowPropertyGetter.java b/src/java.desktop/unix/classes/sun/awt/X11/WindowPropertyGetter.java
index c39802d08b8..10db025ba57 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/WindowPropertyGetter.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/WindowPropertyGetter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java b/src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java
index 96aa097cb8f..c96f5411924 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java b/src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java
index ed333a0b4e7..abc2e900856 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java b/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java
index c70183e8d4e..3a985542058 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XAtomList.java b/src/java.desktop/unix/classes/sun/awt/X11/XAtomList.java
index 2ac6d42719c..7ec335f9f4e 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XAtomList.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XAtomList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java b/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java
index 16b2bc64120..35ed6e56e78 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java
index d562ae52969..f8fcb30d8d8 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java
index 8c0e5075ee0..c6d7b09959f 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java
index 49827f4af30..dd1478f7885 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XCanvasPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XCanvasPeer.java
index 13c6e9c35f6..c1c1f74508c 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XCanvasPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XCanvasPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java
index f5bfc10120f..03e082de8aa 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java
index 59011f4d729..f4dd3baacdd 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java b/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java
index 156b128d857..09139dcfdb2 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java
index ae99cb44760..1f6834d7c02 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XCreateWindowParams.java b/src/java.desktop/unix/classes/sun/awt/X11/XCreateWindowParams.java
index a0365604b81..fd032822901 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XCreateWindowParams.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XCreateWindowParams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XCustomCursor.java b/src/java.desktop/unix/classes/sun/awt/X11/XCustomCursor.java
index d4cf4a2aa4b..7e8d1cf9255 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XCustomCursor.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XCustomCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java
index 7ec8e191ab5..4402ff41b6e 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java
index d70a46517e1..ca3b1ebe15b 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java
index f609e585369..0365b3842b0 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDialogPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDialogPeer.java
index fb76ef2274a..fc0dc269b28 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDialogPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDialogPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDnDConstants.java b/src/java.desktop/unix/classes/sun/awt/X11/XDnDConstants.java
index b4a43b6df63..76589c74237 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDnDConstants.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDnDConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDnDDragSourceProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XDnDDragSourceProtocol.java
index 92a1244c631..c22735d997a 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDnDDragSourceProtocol.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDnDDragSourceProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java
index 4466d8d6eed..560749a4bfb 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java
index 907f0efbc96..a51abb96b1a 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocol.java
index 24de318359f..b8563f28771 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocol.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java
index dbf27c55537..a7130fa7fe9 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java
index 387b1e84f44..bc1b3ac9f4b 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxy.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxy.java
index e2c37541201..db3c6fc1067 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxy.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java
index 7204570afd7..efae47d6f23 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedClientHelper.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedClientHelper.java
index 4a359644dfe..53ed0c15ec2 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedClientHelper.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedClientHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java
index b9f1caff48a..61c260e9e61 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java
index 699c18c253b..f98a6a66bc7 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFramePeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFramePeer.java
index d1e6e5ad979..78fad30f554 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFramePeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFramePeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddingContainer.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddingContainer.java
index fe4c59b19b8..a03b37b7441 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddingContainer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddingContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandler.java b/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandler.java
index 8d2d4715ce1..e6b2b3b4f2c 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandler.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XException.java b/src/java.desktop/unix/classes/sun/awt/X11/XException.java
index 6577e6a45e6..4e6154d3fb6 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XException.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XFocusProxyWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XFocusProxyWindow.java
index e6096eba5f3..18d558d26ca 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XFocusProxyWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XFocusProxyWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XFontPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XFontPeer.java
index 7e8271a7358..9717c0a8f30 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XFontPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XFontPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XGlobalCursorManager.java b/src/java.desktop/unix/classes/sun/awt/X11/XGlobalCursorManager.java
index af77656706d..6b61ea22cc3 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XGlobalCursorManager.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XGlobalCursorManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XHorizontalScrollbar.java b/src/java.desktop/unix/classes/sun/awt/X11/XHorizontalScrollbar.java
index 1f9cee8a7d9..71744522b8e 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XHorizontalScrollbar.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XHorizontalScrollbar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java
index c68e6dbd239..98919b3dc56 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XInputMethod.java b/src/java.desktop/unix/classes/sun/awt/X11/XInputMethod.java
index 332b9860c19..19dd6e87100 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XInputMethod.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XInputMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XInputMethodDescriptor.java b/src/java.desktop/unix/classes/sun/awt/X11/XInputMethodDescriptor.java
index d6fa0bdefd7..059ee8fe98f 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XInputMethodDescriptor.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XInputMethodDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java
index fb0e163ef8b..03e92d1b1b1 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XLabelPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XLabelPeer.java
index 5575f521284..9011ab0130d 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XLabelPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XLabelPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XLightweightFramePeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XLightweightFramePeer.java
index fb8880f36c5..b10f45b2ff8 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XLightweightFramePeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XLightweightFramePeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java
index eb1e9eab039..81348327294 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java b/src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java
index b4345111d11..e1f9390fa62 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java
index 2369e1c5614..0848cde81fa 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java
index 1d8c594e04c..c88a38735f0 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XMenuPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XMenuPeer.java
index 080193a70fd..21e5d907d0a 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XMenuPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XMenuPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java
index 42f0de8eb6c..1aaee911218 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XMouseDragGestureRecognizer.java b/src/java.desktop/unix/classes/sun/awt/X11/XMouseDragGestureRecognizer.java
index 04ff27759c9..32ae73ce29b 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XMouseDragGestureRecognizer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XMouseDragGestureRecognizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java
index 590dc43d322..312b5c8ccd8 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XPanelPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XPanelPeer.java
index 9be81191770..13892dc41e9 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XPanelPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XPanelPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java
index 1bde8734a70..4c2e6680f40 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XPropertyCache.java b/src/java.desktop/unix/classes/sun/awt/X11/XPropertyCache.java
index d00c06e5a6e..76116879441 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XPropertyCache.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XPropertyCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XQueryTree.java b/src/java.desktop/unix/classes/sun/awt/X11/XQueryTree.java
index 8f566792abc..9c58133a70f 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XQueryTree.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XQueryTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XRepaintArea.java b/src/java.desktop/unix/classes/sun/awt/X11/XRepaintArea.java
index 790023031bd..2ba1566ddbe 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XRepaintArea.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XRepaintArea.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XRootWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XRootWindow.java
index 99062a57903..94e1b68ec5d 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XRootWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XRootWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java
index e02ddae753a..ff445259762 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java b/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java
index 3ec52c8c4f0..1b1dddb0b8b 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java
index 05088daa8e7..39fffd2e15e 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java b/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java
index ef43cb2d243..f7a40312fe7 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java
index 01c2ec22ca3..473b638cb74 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java
index 042a3e8ac21..0bd25fe26c6 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java b/src/java.desktop/unix/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java
index 82dc03d54a0..f0ee1c53972 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XTranslateCoordinates.java b/src/java.desktop/unix/classes/sun/awt/X11/XTranslateCoordinates.java
index 5928e9ef628..e7796388db2 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XTranslateCoordinates.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XTranslateCoordinates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
index 443d7ea7c1f..9f0ac241f5b 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XVerticalScrollbar.java b/src/java.desktop/unix/classes/sun/awt/X11/XVerticalScrollbar.java
index 4ecb86ea78a..57108f14b9f 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XVerticalScrollbar.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XVerticalScrollbar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java
index 5d0bd01084e..bdf25522bea 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
index 7165b1701fa..b79f2f9033f 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XWindowAttributesData.java b/src/java.desktop/unix/classes/sun/awt/X11/XWindowAttributesData.java
index ccf8edc70d0..dd1ad65862d 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWindowAttributesData.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWindowAttributesData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XWrapperBase.java b/src/java.desktop/unix/classes/sun/awt/X11/XWrapperBase.java
index 438053e6353..f7f1fcd9f6c 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWrapperBase.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWrapperBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XlibUtil.java b/src/java.desktop/unix/classes/sun/awt/X11/XlibUtil.java
index c2cdfc0433c..626a09f5603 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XlibUtil.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XlibUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java b/src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java
index 48223e291e5..d0ec3723dc4 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11FontManager.java b/src/java.desktop/unix/classes/sun/awt/X11FontManager.java
index 1d0452128df..817a9e011b6 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11FontManager.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11FontManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java
index e8b311aa25b..bb5ab5ab350 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java
index c4076949c0d..03f22574b05 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java b/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java
index 86f0fd868f7..3b349904352 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11InputMethodBase.java b/src/java.desktop/unix/classes/sun/awt/X11InputMethodBase.java
index 674b909d213..d9eaa9629d1 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11InputMethodBase.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11InputMethodBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java b/src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java
index 305d513de6d..e378ac2f79d 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/awt/XSettings.java b/src/java.desktop/unix/classes/sun/awt/XSettings.java
index b36475c5cc1..8b5ff142c81 100644
--- a/src/java.desktop/unix/classes/sun/awt/XSettings.java
+++ b/src/java.desktop/unix/classes/sun/awt/XSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/DelegateStrike.java b/src/java.desktop/unix/classes/sun/font/DelegateStrike.java
index ea9c6b0eb0a..201ffebbb0d 100644
--- a/src/java.desktop/unix/classes/sun/font/DelegateStrike.java
+++ b/src/java.desktop/unix/classes/sun/font/DelegateStrike.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -116,10 +116,4 @@ final class DelegateStrike extends NativeStrike {
     GeneralPath getGlyphOutline(int glyphCode, float x, float y) {
         return delegateStrike.getGlyphOutline(glyphCode, x, y);
     }
-
-    @Override
-    GeneralPath getGlyphVectorOutline(int[] glyphs, float x, float y) {
-        return delegateStrike.getGlyphVectorOutline(glyphs, x, y);
-    }
-
 }
diff --git a/src/java.desktop/unix/classes/sun/font/DoubleByteEncoder.java b/src/java.desktop/unix/classes/sun/font/DoubleByteEncoder.java
index d42b6eda80d..4c7ae6cff5a 100644
--- a/src/java.desktop/unix/classes/sun/font/DoubleByteEncoder.java
+++ b/src/java.desktop/unix/classes/sun/font/DoubleByteEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java b/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java
index 27d6773105e..0bcdf17d527 100644
--- a/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java
+++ b/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/FontConfigManager.java b/src/java.desktop/unix/classes/sun/font/FontConfigManager.java
index c70fe7dd940..aa3693743c2 100644
--- a/src/java.desktop/unix/classes/sun/font/FontConfigManager.java
+++ b/src/java.desktop/unix/classes/sun/font/FontConfigManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java b/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java
index f5a8fe8b3c0..6f4df1a6d01 100644
--- a/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java
+++ b/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/NativeFont.java b/src/java.desktop/unix/classes/sun/font/NativeFont.java
index 871db2a70d1..a3617fc3cd9 100644
--- a/src/java.desktop/unix/classes/sun/font/NativeFont.java
+++ b/src/java.desktop/unix/classes/sun/font/NativeFont.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/NativeStrike.java b/src/java.desktop/unix/classes/sun/font/NativeStrike.java
index 3e6996d83fe..ef2e70f61ee 100644
--- a/src/java.desktop/unix/classes/sun/font/NativeStrike.java
+++ b/src/java.desktop/unix/classes/sun/font/NativeStrike.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -295,10 +295,4 @@ class NativeStrike extends PhysicalStrike {
      GeneralPath getGlyphOutline(int glyphCode, float x, float y) {
          return new GeneralPath();
      }
-
-     @Override
-     GeneralPath getGlyphVectorOutline(int[] glyphs, float x, float y) {
-         return new GeneralPath();
-     }
-
 }
diff --git a/src/java.desktop/unix/classes/sun/font/NativeStrikeDisposer.java b/src/java.desktop/unix/classes/sun/font/NativeStrikeDisposer.java
index b19995a34f6..405add399fa 100644
--- a/src/java.desktop/unix/classes/sun/font/NativeStrikeDisposer.java
+++ b/src/java.desktop/unix/classes/sun/font/NativeStrikeDisposer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/X11Dingbats.java b/src/java.desktop/unix/classes/sun/font/X11Dingbats.java
index cef94fdf9c8..0a4eef31c4d 100644
--- a/src/java.desktop/unix/classes/sun/font/X11Dingbats.java
+++ b/src/java.desktop/unix/classes/sun/font/X11Dingbats.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java b/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java
index 7b06d785d99..0ddd22d121b 100644
--- a/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java
+++ b/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java b/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java
index 9f06ea30ac7..22eb73d29f1 100644
--- a/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java
+++ b/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/X11GB2312.java b/src/java.desktop/unix/classes/sun/font/X11GB2312.java
index 70643edbea3..d94d88fc37a 100644
--- a/src/java.desktop/unix/classes/sun/font/X11GB2312.java
+++ b/src/java.desktop/unix/classes/sun/font/X11GB2312.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/X11GBK.java b/src/java.desktop/unix/classes/sun/font/X11GBK.java
index 612b41c95c0..d246bdf6547 100644
--- a/src/java.desktop/unix/classes/sun/font/X11GBK.java
+++ b/src/java.desktop/unix/classes/sun/font/X11GBK.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/X11Johab.java b/src/java.desktop/unix/classes/sun/font/X11Johab.java
index ff79e4833f5..6ded1f41efb 100644
--- a/src/java.desktop/unix/classes/sun/font/X11Johab.java
+++ b/src/java.desktop/unix/classes/sun/font/X11Johab.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/X11KSC5601.java b/src/java.desktop/unix/classes/sun/font/X11KSC5601.java
index e1ffd133215..29adf818e15 100644
--- a/src/java.desktop/unix/classes/sun/font/X11KSC5601.java
+++ b/src/java.desktop/unix/classes/sun/font/X11KSC5601.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java b/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java
index 89b568ecd0f..62a3e253908 100644
--- a/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java
+++ b/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/X11TextRenderer.java b/src/java.desktop/unix/classes/sun/font/X11TextRenderer.java
index 86c9fd26a7f..068ac8de70a 100644
--- a/src/java.desktop/unix/classes/sun/font/X11TextRenderer.java
+++ b/src/java.desktop/unix/classes/sun/font/X11TextRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/XMap.java b/src/java.desktop/unix/classes/sun/font/XMap.java
index 5935ce1aa97..65cbc0f8825 100644
--- a/src/java.desktop/unix/classes/sun/font/XMap.java
+++ b/src/java.desktop/unix/classes/sun/font/XMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/XRGlyphCache.java b/src/java.desktop/unix/classes/sun/font/XRGlyphCache.java
index 6c8ce7960cd..09eff046779 100644
--- a/src/java.desktop/unix/classes/sun/font/XRGlyphCache.java
+++ b/src/java.desktop/unix/classes/sun/font/XRGlyphCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java b/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java
index 62956f488a8..10c52de4cf6 100644
--- a/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java
+++ b/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/font/XRTextRenderer.java b/src/java.desktop/unix/classes/sun/font/XRTextRenderer.java
index 8662b48cf3f..0a40cf3dd25 100644
--- a/src/java.desktop/unix/classes/sun/font/XRTextRenderer.java
+++ b/src/java.desktop/unix/classes/sun/font/XRTextRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java
index 1b7a4364ce4..58dadbfe01f 100644
--- a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java
+++ b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXSurfaceData.java b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXSurfaceData.java
index b810a4d1e9a..3b947823b9f 100644
--- a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXSurfaceData.java
+++ b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXSurfaceData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java
index 73974ab2703..7fd134b9c39 100644
--- a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java
+++ b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitBgLoops.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitBgLoops.java
index f8ea7dd759a..9c20ada45aa 100644
--- a/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitBgLoops.java
+++ b/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitBgLoops.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitLoops.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitLoops.java
index a6effd74fe8..d18b4de2fd6 100644
--- a/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitLoops.java
+++ b/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitLoops.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java
index 5c65c2f51da..5c68ea805a5 100644
--- a/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java
+++ b/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java
index 39e34e40b16..ba2aaa1fc82 100644
--- a/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java
+++ b/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceDataProxy.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceDataProxy.java
index 70ec7f8724a..2fc8ed7a83a 100644
--- a/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceDataProxy.java
+++ b/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceDataProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/x11/X11VolatileSurfaceManager.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11VolatileSurfaceManager.java
index 88609597f05..07660201cec 100644
--- a/src/java.desktop/unix/classes/sun/java2d/x11/X11VolatileSurfaceManager.java
+++ b/src/java.desktop/unix/classes/sun/java2d/x11/X11VolatileSurfaceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/DirtyRegion.java b/src/java.desktop/unix/classes/sun/java2d/xr/DirtyRegion.java
index bc0cc0b7b77..2e91761b1b4 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/DirtyRegion.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/DirtyRegion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/GrowableByteArray.java b/src/java.desktop/unix/classes/sun/java2d/xr/GrowableByteArray.java
index 1a5b615c96d..c98f99e81c1 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/GrowableByteArray.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/GrowableByteArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/GrowableEltArray.java b/src/java.desktop/unix/classes/sun/java2d/xr/GrowableEltArray.java
index 7ec0665db5c..2817ce2c9fc 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/GrowableEltArray.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/GrowableEltArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/GrowablePointArray.java b/src/java.desktop/unix/classes/sun/java2d/xr/GrowablePointArray.java
index 1f3eb88e91c..a5d9bef4225 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/GrowablePointArray.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/GrowablePointArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/GrowableRectArray.java b/src/java.desktop/unix/classes/sun/java2d/xr/GrowableRectArray.java
index e611aae4e3b..5b49c8f0aec 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/GrowableRectArray.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/GrowableRectArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/MaskTile.java b/src/java.desktop/unix/classes/sun/java2d/xr/MaskTile.java
index d2d0f09ad0a..eec4e570cee 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/MaskTile.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/MaskTile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/MaskTileManager.java b/src/java.desktop/unix/classes/sun/java2d/xr/MaskTileManager.java
index 7e58e530353..ab1303eb50b 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/MaskTileManager.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/MaskTileManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/MutableInteger.java b/src/java.desktop/unix/classes/sun/java2d/xr/MutableInteger.java
index 62bb8c255e9..8ebcdc55824 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/MutableInteger.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/MutableInteger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java b/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java
index 359c4d9f536..3b2123d0898 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java
index 589f17968c4..88a72e10fa9 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRColor.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRColor.java
index eb1604374bb..41585619c6e 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRColor.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRColor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java
index 14182011345..9e315805aea 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java
index c78303236c6..f7c0dd84c2d 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawLine.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawLine.java
index 6b76e4ee388..d1710892d4f 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawLine.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawLine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java
index 748286a0828..fd7e6ba28bf 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskBlit.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskBlit.java
index 0600f6c4bcf..bbfc5153e9a 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskBlit.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskBlit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskFill.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskFill.java
index 993b329e3bc..4dcc7713faa 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskFill.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskFill.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskImage.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskImage.java
index cae3b6af563..8b022649eda 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskImage.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java
index 260bd629094..2ce93d60a0d 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java
index 8720dca6094..7cac5bdafc5 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java
index a142d9efda7..e1fbeca0f94 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRSolidSrcPict.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRSolidSrcPict.java
index 8acad667203..352d00cc33b 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRSolidSrcPict.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRSolidSrcPict.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java
index 54ad6334076..a7d34c72b63 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceDataProxy.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceDataProxy.java
index b05b90fe267..8f0d29ecec0 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceDataProxy.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceDataProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRUtils.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRUtils.java
index 3a4887e167f..ef8a0eaf225 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRUtils.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRVolatileSurfaceManager.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRVolatileSurfaceManager.java
index ad29d553055..14f3c895b99 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRVolatileSurfaceManager.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRVolatileSurfaceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java b/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java
index 58369b5a866..4be3e61cb9b 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/print/AttributeClass.java b/src/java.desktop/unix/classes/sun/print/AttributeClass.java
index f8eee08411b..10d0714a059 100644
--- a/src/java.desktop/unix/classes/sun/print/AttributeClass.java
+++ b/src/java.desktop/unix/classes/sun/print/AttributeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java b/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java
index a7f8d3dc24d..5ec90efbac6 100644
--- a/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java
+++ b/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/print/IPPPrintService.java b/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
index cdc8d6e4a0e..2bf326fca57 100644
--- a/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
+++ b/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java b/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java
index f9445a78ede..5853298a40b 100644
--- a/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java
+++ b/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/classes/sun/print/UnixPrintService.java b/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
index 46211ba5960..b5292770fd8 100644
--- a/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
+++ b/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/native/common/awt/awt_GraphicsEnv.h b/src/java.desktop/unix/native/common/awt/awt_GraphicsEnv.h
index 82e956d4074..3953a52042b 100644
--- a/src/java.desktop/unix/native/common/awt/awt_GraphicsEnv.h
+++ b/src/java.desktop/unix/native/common/awt/awt_GraphicsEnv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/native/common/awt/fontpath.c b/src/java.desktop/unix/native/common/awt/fontpath.c
index d3821504bfb..cb8e91a373b 100644
--- a/src/java.desktop/unix/native/common/awt/fontpath.c
+++ b/src/java.desktop/unix/native/common/awt/fontpath.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c b/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c
index 356b52dfb34..cd07c347c9e 100644
--- a/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c
+++ b/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
index fc2dece1919..db2473e40da 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/AnimationController.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/AnimationController.java
index a91e1a97ee1..4fb843543e3 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/AnimationController.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/AnimationController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/TMSchema.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/TMSchema.java
index 93628d85766..7dcfe3d1ca8 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/TMSchema.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/TMSchema.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java
index 31a490bebcc..81766db8116 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java
index 33dea2b3b08..0c86bd33e10 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
index 3ead1228b0e..3c869efc97b 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java
index 59eace01a4c..5716a875cd7 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
index f37ce17d876..fdc9b03ae7d 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java
index 8da4bd7921b..47ecdf5747b 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java
index 355f70b4607..79d81bad089 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -80,10 +80,13 @@ public final class WindowsDesktopManager extends DefaultDesktopManager
                         if (f.isMaximizable()) {
                             if (!f.isMaximum()) {
                                 f.setMaximum(true);
-                            } else if (f.isMaximum() && f.isIcon()) {
-                                f.setIcon(false);
                             } else {
-                                f.setMaximum(false);
+                                // If frame being activated is set to maximised
+                                // and iconified, let it be maximised
+                                // else remain non-maximised
+                                if (f.isIcon()) {
+                                    f.setIcon(false);
+                                }
                             }
                         }
                     }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java
index 49ab809dddd..dabbe3fb992 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java
index abccb6b9a48..44cb0e9634c 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java
index b5859b08ea8..ba5b7cb58e2 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java
index 5c331533af9..9db31ba38f9 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
index d10f3f47c3c..403468af0af 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
index d1ee714f362..ce7ed3177d1 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java
index f663d8d1e90..3d3cf5feee7 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java
index 5ced1659adf..05c1b177705 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java
index 1f64c18e61f..6adf6e402ec 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java
index 9d67278526a..576549ae482 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java
index 4df236115fb..1361286df4a 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java
index b58ad07a57b..02705d7c3b7 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
index 8fdc1a315c9..2a784a470a4 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java
index 19bfad0a1da..5e08dcf5605 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java
index c8d62e52834..04a9f2e97cf 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java
index 393f7595402..48e7a8c02fb 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java
index 9ce5db3b4ef..2a2caef60d2 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java
index 88dc91d572b..731775a2575 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java
index bad66ce3a04..a8e2a2ddcf1 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java
index 95062ef586f..a132756bbee 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java
index 8c50e391164..481fa466a5b 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java
index 86e2ee1fc52..874b5c65c6e 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java
index b670bd294b0..de8f18b4ea1 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java
index e695d9f6708..78cceff2a0c 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java
index 508d260895c..5846dcb9f09 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java
index 7858a1195e8..2c645903e51 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java
index 89180ffdd5f..62987e43ec8 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java
index 0f468fdf6b1..5e94ebdb2cc 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java
index 5350de9ae5c..47175b83d30 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java
index 68e077fa350..025c30c5c96 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java
index 6ab2352641f..78384bbd18a 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java
index 89751f6dc94..0731b038939 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/PlatformGraphicsInfo.java b/src/java.desktop/windows/classes/sun/awt/PlatformGraphicsInfo.java
index c888106d779..46742f5fd59 100644
--- a/src/java.desktop/windows/classes/sun/awt/PlatformGraphicsInfo.java
+++ b/src/java.desktop/windows/classes/sun/awt/PlatformGraphicsInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/Win32ColorModel24.java b/src/java.desktop/windows/classes/sun/awt/Win32ColorModel24.java
index fe55cacf833..43fa22db878 100644
--- a/src/java.desktop/windows/classes/sun/awt/Win32ColorModel24.java
+++ b/src/java.desktop/windows/classes/sun/awt/Win32ColorModel24.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java b/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java
index 5084d0bcabe..da469f7208f 100644
--- a/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java
+++ b/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java
index 31fc0847d3b..a00e664d269 100644
--- a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java
+++ b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java
index fedc7f38980..d52c7689457 100644
--- a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java
+++ b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java
index 2e11d551059..9d09f13e525 100644
--- a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java
+++ b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java b/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java
index 94a2c4df0a9..0dd40025222 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java
index 8b3218de667..1b3fb9a85e9 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java b/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java
index 068d577995f..b8278279ae8 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WDefaultFontCharset.java b/src/java.desktop/windows/classes/sun/awt/windows/WDefaultFontCharset.java
index 09c317c81f2..d66de5ebaa1 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WDefaultFontCharset.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WDefaultFontCharset.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java b/src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java
index 6e3de090ee8..5c2e873c72b 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WDragSourceContextPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WDragSourceContextPeer.java
index 43a91c3c7ab..beb88623d88 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WDragSourceContextPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WDragSourceContextPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java b/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
index dcdee830edc..9a74a1c25f7 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
index bab79c38ff4..57d89647e10 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java b/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java
index 0e4e5bd585e..a9237e21ff6 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WLabelPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WLabelPeer.java
index c5267e52793..f865b4f5c40 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WLabelPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WLabelPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WLightweightFramePeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WLightweightFramePeer.java
index 994b81e372e..5651d952c03 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WLightweightFramePeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WLightweightFramePeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
index f2961f79a04..4abb9fa84ae 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WMouseInfoPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WMouseInfoPeer.java
index 4b785aaba69..6cd5be241a4 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WMouseInfoPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WMouseInfoPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WPopupMenuPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WPopupMenuPeer.java
index d89cbcfa53a..bc0bb20d012 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WPopupMenuPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WPopupMenuPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java
index 3a0d7bf3a71..bb0cfcfb732 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WScrollbarPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WScrollbarPeer.java
index cfc227d29d6..908ec65cc7a 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WScrollbarPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WScrollbarPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java
index d6c311d3f48..7cf92292a32 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
index 0ba2217dde5..f678be9f1ab 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WingDings.java b/src/java.desktop/windows/classes/sun/awt/windows/WingDings.java
index ae7573ac4e2..d77a8f2eec3 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WingDings.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WingDings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/font/NativeFont.java b/src/java.desktop/windows/classes/sun/font/NativeFont.java
index 9b0e6492d67..80ae50e1cef 100644
--- a/src/java.desktop/windows/classes/sun/font/NativeFont.java
+++ b/src/java.desktop/windows/classes/sun/font/NativeFont.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/font/NativeStrike.java b/src/java.desktop/windows/classes/sun/font/NativeStrike.java
index 7b2b947d722..eaf2eb5532f 100644
--- a/src/java.desktop/windows/classes/sun/font/NativeStrike.java
+++ b/src/java.desktop/windows/classes/sun/font/NativeStrike.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,6 @@ public class NativeStrike extends PhysicalStrike {
         throw new RuntimeException("NativeFont not used on Windows");
     }
 
-
     @Override
     void getGlyphImagePtrs(int[] glyphCodes, long[] images,int  len) {
     }
@@ -81,14 +80,9 @@ public class NativeStrike extends PhysicalStrike {
     Rectangle2D.Float getGlyphOutlineBounds(int glyphCode) {
         return null;
     }
+
     @Override
     GeneralPath getGlyphOutline(int glyphCode, float x, float y) {
         return null;
     }
-
-    @Override
-    GeneralPath getGlyphVectorOutline(int[] glyphs, float x, float y) {
-        return null;
-    }
-
 }
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBlitLoops.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBlitLoops.java
index 9aa9837b191..3483d000c12 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBlitLoops.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBlitLoops.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBufImgOps.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBufImgOps.java
index 7ca0130391b..a12b9dbd351 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBufImgOps.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBufImgOps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DContext.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DContext.java
index 5d9b6c30b5b..504dea93f26 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DContext.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DDrawImage.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DDrawImage.java
index e847c7ba7cd..33e375bc629 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DDrawImage.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DDrawImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java
index 8b001317dca..fc057eb2f1b 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java
index 1c838d0d32d..2545f068855 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskBlit.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskBlit.java
index 6ba766d2b13..16b55b761f5 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskBlit.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskBlit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskFill.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskFill.java
index d00e3fe2ee1..0ea049a67ea 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskFill.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskFill.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java
index 74b7cfc6967..2690fb98d6b 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderQueue.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderQueue.java
index be20e1c4e4c..f84ef6cf76c 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderQueue.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderQueue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderer.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderer.java
index 7361a09973b..2e831567d50 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderer.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java
index 58dfd17dea7..d656108c286 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java
index 374fce63db0..07eeafd3cb8 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java
index 6ea095666b3..97e8ad681ff 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DTextRenderer.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DTextRenderer.java
index 31b2cc207cd..4abc3c12d3d 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DTextRenderer.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DTextRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java
index 0fedb478362..e2728184bb8 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
index 40d2af5c12a..b59bebbe0d7 100644
--- a/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
+++ b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/opengl/WGLSurfaceData.java b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLSurfaceData.java
index 8f97980811f..bb0660ca3c8 100644
--- a/src/java.desktop/windows/classes/sun/java2d/opengl/WGLSurfaceData.java
+++ b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLSurfaceData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java
index c90f8102e7e..f8fc092127f 100644
--- a/src/java.desktop/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java
+++ b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/windows/GDIBlitLoops.java b/src/java.desktop/windows/classes/sun/java2d/windows/GDIBlitLoops.java
index 18d44ea6a49..bd90e9443c9 100644
--- a/src/java.desktop/windows/classes/sun/java2d/windows/GDIBlitLoops.java
+++ b/src/java.desktop/windows/classes/sun/java2d/windows/GDIBlitLoops.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java b/src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java
index 9bb3ba38b20..5820ed233da 100644
--- a/src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java
+++ b/src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java b/src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java
index 38b57f77bce..59b490462f7 100644
--- a/src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java
+++ b/src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/print/PlatformPrinterJobProxy.java b/src/java.desktop/windows/classes/sun/print/PlatformPrinterJobProxy.java
index 677831a9245..4a46f42f215 100644
--- a/src/java.desktop/windows/classes/sun/print/PlatformPrinterJobProxy.java
+++ b/src/java.desktop/windows/classes/sun/print/PlatformPrinterJobProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java b/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java
index 7af6f1b61f8..6c8540fd67f 100644
--- a/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java
+++ b/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java b/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java
index 3cb8c858e39..1a5b2dd6601 100644
--- a/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java
+++ b/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java b/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java
index cd4eec9926b..0afd0ed60c7 100644
--- a/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java
+++ b/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/print/Win32PrintService.java b/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
index 3bca5b581bb..1f5373c1f4b 100644
--- a/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
+++ b/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java b/src/java.desktop/windows/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java
index f1180b3ae38..53f6c628712 100644
--- a/src/java.desktop/windows/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java
+++ b/src/java.desktop/windows/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Dialog.h b/src/java.desktop/windows/native/libawt/windows/awt_Dialog.h
index 91886c46a9a..c81e38fb3ac 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Dialog.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Dialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.cpp b/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.cpp
index 90d7854d0c8..0f46eb59001 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_InputMethod.cpp b/src/java.desktop/windows/native/libawt/windows/awt_InputMethod.cpp
index 87087870b5d..d7e18e5eaf4 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_InputMethod.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_InputMethod.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Mlib.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Mlib.cpp
index 5b189796ed1..fcfcf477d0d 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Mlib.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Mlib.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp b/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp
index 9d45c3f083b..8d016d8b39f 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_new.cpp b/src/java.desktop/windows/native/libawt/windows/awt_new.cpp
index fdd1d79ba2c..3dff2e02c7f 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_new.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_new.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.logging/share/classes/java/util/logging/ConsoleHandler.java b/src/java.logging/share/classes/java/util/logging/ConsoleHandler.java
index 1561c7edebf..0fb0db09e27 100644
--- a/src/java.logging/share/classes/java/util/logging/ConsoleHandler.java
+++ b/src/java.logging/share/classes/java/util/logging/ConsoleHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java b/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java
index c29ddf60213..e8bd455b31e 100644
--- a/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java
+++ b/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.management/share/classes/javax/management/remote/JMXConnectorServer.java b/src/java.management/share/classes/javax/management/remote/JMXConnectorServer.java
index 05fd8df8f55..2b9a78ed487 100644
--- a/src/java.management/share/classes/javax/management/remote/JMXConnectorServer.java
+++ b/src/java.management/share/classes/javax/management/remote/JMXConnectorServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.management/share/classes/javax/management/remote/JMXConnectorServerMBean.java b/src/java.management/share/classes/javax/management/remote/JMXConnectorServerMBean.java
index 4d8602bb81b..109b96f643e 100644
--- a/src/java.management/share/classes/javax/management/remote/JMXConnectorServerMBean.java
+++ b/src/java.management/share/classes/javax/management/remote/JMXConnectorServerMBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.management/share/classes/sun/management/MemoryImpl.java b/src/java.management/share/classes/sun/management/MemoryImpl.java
index 3e27ba2e5bb..5e5d1942b84 100644
--- a/src/java.management/share/classes/sun/management/MemoryImpl.java
+++ b/src/java.management/share/classes/sun/management/MemoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.management/share/classes/sun/management/VMManagement.java b/src/java.management/share/classes/sun/management/VMManagement.java
index 3e227225ccd..29391cf53ba 100644
--- a/src/java.management/share/classes/sun/management/VMManagement.java
+++ b/src/java.management/share/classes/sun/management/VMManagement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,9 @@ public interface VMManagement {
     public boolean isGcNotificationSupported();
     public boolean isRemoteDiagnosticCommandsSupported();
 
+    // AOT Subsystem
+    public boolean endAOTRecording();
+
     // Class Loading Subsystem
     public long    getTotalClassCount();
     public int     getLoadedClassCount();
diff --git a/src/java.management/share/classes/sun/management/VMManagementImpl.java b/src/java.management/share/classes/sun/management/VMManagementImpl.java
index b8c7a2921d4..0fd0d8ad562 100644
--- a/src/java.management/share/classes/sun/management/VMManagementImpl.java
+++ b/src/java.management/share/classes/sun/management/VMManagementImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -117,6 +117,9 @@ class VMManagementImpl implements VMManagement {
     public native boolean isThreadCpuTimeEnabled();
     public native boolean isThreadAllocatedMemoryEnabled();
 
+    // AOT Subsystem
+    public native boolean endAOTRecording();
+
     // Class Loading Subsystem
     public int    getLoadedClassCount() {
         long count = getTotalClassCount() - getUnloadedClassCount();
diff --git a/src/java.management/share/native/libmanagement/VMManagementImpl.c b/src/java.management/share/native/libmanagement/VMManagementImpl.c
index d5141c71ee7..e6570d06bdd 100644
--- a/src/java.management/share/native/libmanagement/VMManagementImpl.c
+++ b/src/java.management/share/native/libmanagement/VMManagementImpl.c
@@ -101,6 +101,13 @@ Java_sun_management_VMManagementImpl_getVmArguments0
     return JVM_GetVmArguments(env);
 }
 
+JNIEXPORT jboolean JNICALL
+Java_sun_management_VMManagementImpl_endAOTRecording
+  (JNIEnv *env, jobject dummy)
+{
+    return JVM_AOTEndRecording(env);
+}
+
 JNIEXPORT jlong JNICALL
 Java_sun_management_VMManagementImpl_getTotalClassCount
   (JNIEnv *env, jobject dummy)
diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/DefaultResponseControlFactory.java b/src/java.naming/share/classes/com/sun/jndi/ldap/DefaultResponseControlFactory.java
index 534aa95a916..1f82b4d9da6 100644
--- a/src/java.naming/share/classes/com/sun/jndi/ldap/DefaultResponseControlFactory.java
+++ b/src/java.naming/share/classes/com/sun/jndi/ldap/DefaultResponseControlFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.naming/share/classes/javax/naming/ldap/PagedResultsControl.java b/src/java.naming/share/classes/javax/naming/ldap/PagedResultsControl.java
index 83391ba9c74..8e993f7ce74 100644
--- a/src/java.naming/share/classes/javax/naming/ldap/PagedResultsControl.java
+++ b/src/java.naming/share/classes/javax/naming/ldap/PagedResultsControl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http1Response.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Response.java
index f9442df9ac4..35ce4972ed9 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http1Response.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Response.java
@@ -30,6 +30,7 @@ import java.lang.System.Logger.Level;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.net.http.HttpResponse.BodySubscriber;
+import java.net.ProtocolException;
 import java.nio.ByteBuffer;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
@@ -46,6 +47,7 @@ import jdk.internal.net.http.common.MinimalFuture;
 import jdk.internal.net.http.common.Utils;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpResponse.BodySubscribers.discarding;
+import static jdk.internal.net.http.common.Utils.readContentLength;
 import static jdk.internal.net.http.common.Utils.wrapWithExtraDetail;
 import static jdk.internal.net.http.RedirectFilter.HTTP_NOT_MODIFIED;
 
@@ -272,16 +274,31 @@ class Http1Response<T> {
     }
 
     /**
-     * Read up to MAX_IGNORE bytes discarding
+     * Reads the body, if it is present and less than {@value MAX_IGNORE} bytes.
+     * Otherwise, just the connection is closed.
      */
     public CompletableFuture<Void> ignoreBody(Executor executor) {
-        int clen = (int)headers.firstValueAsLong("Content-Length").orElse(-1);
-        if (clen == -1 || clen > MAX_IGNORE) {
+
+        // Read the `Content-Length` header
+        long clen;
+        try {
+            clen = readContentLength(headers, "", -1);
+        } catch (ProtocolException pe) {
+            return MinimalFuture.failedFuture(pe);
+        }
+
+        // Read the body, if it is present and less than `MAX_IGNORE` bytes.
+        //
+        // We proceed with reading the body even when `Content-Length: 0` to
+        // ensure that the happy path is taken, and upon success, the connection
+        // is returned back to the pool.
+        if (clen != -1 && clen <= MAX_IGNORE) {
+            return readBody(discarding(), !request.isWebSocket(), executor);
+        } else {
             connection.close();
             return MinimalFuture.completedFuture(null); // not treating as error
-        } else {
-            return readBody(discarding(), !request.isWebSocket(), executor);
         }
+
     }
 
     // Used for those response codes that have no body associated
@@ -308,11 +325,28 @@ class Http1Response<T> {
         this.return2Cache = return2Cache;
         final BodySubscriber<U> subscriber = p;
 
-
         final CompletableFuture<U> cf = new MinimalFuture<>();
 
-        long clen0 = headers.firstValueAsLong("Content-Length").orElse(-1L);
-        final long clen = fixupContentLen(clen0);
+        Consumer<Throwable> errorNotifier = error -> {
+            try {
+                subscriber.onError(error);
+                cf.completeExceptionally(error);
+            } finally {
+                asyncReceiver.setRetryOnError(false);
+                asyncReceiver.onReadError(error);
+            }
+        };
+
+        // Read the content length
+        long clen;
+        try {
+            long clen0 = readContentLength(headers, "", -1);
+            clen = fixupContentLen(clen0);
+        } catch (ProtocolException pe) {
+            errorNotifier.accept(pe);
+            connection.close(pe);
+            return cf;
+        }
 
         // expect-continue reads headers and body twice.
         // if we reach here, we must reset the headersReader state.
@@ -398,12 +432,7 @@ class Http1Response<T> {
             }
         });
 
-        ResponseSubscribers.getBodyAsync(executor, p, cf, (t) -> {
-            subscriber.onError(t);
-            cf.completeExceptionally(t);
-            asyncReceiver.setRetryOnError(false);
-            asyncReceiver.onReadError(t);
-        });
+        ResponseSubscribers.getBodyAsync(executor, p, cf, errorNotifier);
 
         return cf.whenComplete((s,t) -> {
             if (t != null) {
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http3ExchangeImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http3ExchangeImpl.java
index 81475a47c4a..4625968682f 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http3ExchangeImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http3ExchangeImpl.java
@@ -81,6 +81,8 @@ import jdk.internal.net.http.qpack.writers.HeaderFrameWriter;
 import jdk.internal.net.http.quic.streams.QuicBidiStream;
 import jdk.internal.net.http.quic.streams.QuicStreamReader;
 import jdk.internal.net.http.quic.streams.QuicStreamWriter;
+
+import static jdk.internal.net.http.common.Utils.readContentLength;
 import static jdk.internal.net.http.http3.ConnectionSettings.UNLIMITED_MAX_FIELD_SECTION_SIZE;
 
 /**
@@ -1293,12 +1295,16 @@ final class Http3ExchangeImpl<T> extends Http3Stream<T> {
         if (Set.of("PUT", "DELETE", "OPTIONS", "TRACE").contains(method)) {
             throw new ProtocolException("push method not allowed pushId=" + pushId);
         }
-        long clen = promiseHeaders.firstValueAsLong("Content-Length").orElse(-1);
+
+        // Read & validate `Content-Length`
+        long clen = readContentLength(
+                promiseHeaders, "illegal push headers for pushId=%s: ".formatted(pushId), -1);
         if (clen > 0) {
-            throw new ProtocolException("push headers contain non-zero Content-Length for pushId=" + pushId);
+            throw new ProtocolException("push headers contain non-zero \"Content-Length\" for pushId=" + pushId);
         }
+
         if (promiseHeaders.firstValue("Transfer-Encoding").isPresent()) {
-            throw new ProtocolException("push headers contain Transfer-Encoding for pushId=" + pushId);
+            throw new ProtocolException("push headers contain \"Transfer-Encoding\" for pushId=" + pushId);
         }
 
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http3Stream.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http3Stream.java
index cdac68b47f1..14e440a0e33 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http3Stream.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http3Stream.java
@@ -31,7 +31,6 @@ import java.net.ProtocolException;
 import java.net.http.HttpHeaders;
 import java.nio.ByteBuffer;
 import java.util.List;
-import java.util.OptionalLong;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -58,6 +57,8 @@ import jdk.internal.net.http.quic.streams.QuicStreamReader;
 
 import static jdk.internal.net.http.Exchange.MAX_NON_FINAL_RESPONSES;
 import static jdk.internal.net.http.RedirectFilter.HTTP_NOT_MODIFIED;
+import static jdk.internal.net.http.common.Utils.readContentLength;
+import static jdk.internal.net.http.common.Utils.readStatusCode;
 
 /**
  * A common super class for the HTTP/3 request/response stream ({@link Http3ExchangeImpl}
@@ -606,23 +607,17 @@ sealed abstract class Http3Stream<T> extends ExchangeImpl<T> permits Http3Exchan
          }
 
          int responseCode;
-         boolean finalResponse = false;
          try {
-             responseCode = (int) responseHeaders
-                     .firstValueAsLong(":status")
-                     .orElseThrow(() -> new IOException("no statuscode in response"));
-         } catch (IOException | NumberFormatException exception) {
+             responseCode = readStatusCode(responseHeaders, "");
+         } catch (ProtocolException pe) {
              // RFC-9114: 4.1.2.  Malformed Requests and Responses:
              //  "Malformed requests or responses that are
              //   detected MUST be treated as a stream error of type H3_MESSAGE_ERROR"
-             cancelImpl(exception, Http3Error.H3_MESSAGE_ERROR);
-             return;
-         }
-         if (responseCode < 100 || responseCode > 999) {
-             cancelImpl(new IOException("Unexpected :status header value"), Http3Error.H3_MESSAGE_ERROR);
+             cancelImpl(pe, Http3Error.H3_MESSAGE_ERROR);
              return;
          }
 
+         boolean finalResponse = false;
          if (responseCode >= 200) {
              responseState = ResponseState.PERMIT_TRAILER;
              finalResponse = true;
@@ -653,23 +648,21 @@ sealed abstract class Http3Stream<T> extends ExchangeImpl<T> permits Http3Exchan
                      responseHeaders);
          }
 
-         try {
-             OptionalLong cl = responseHeaders.firstValueAsLong("content-length");
-             if (finalResponse && cl.isPresent()) {
-                 long cll = cl.getAsLong();
-                 if (cll < 0) {
-                     cancelImpl(new IOException("Invalid content-length value "+cll), Http3Error.H3_MESSAGE_ERROR);
-                     return;
-                 }
-                 if (!(exchange.request().method().equalsIgnoreCase("HEAD") || responseCode == HTTP_NOT_MODIFIED)) {
-                     // HEAD response and 304 response might have a content-length header,
-                     // but it carries no meaning
-                     contentLength = cll;
-                 }
+         if (finalResponse) {
+             long cl;
+             try {
+                 cl = readContentLength(responseHeaders, "", -1);
+             } catch (ProtocolException pe) {
+                 cancelImpl(pe, Http3Error.H3_MESSAGE_ERROR);
+                 return;
+             }
+             if (cl != -1 &&
+                     !(exchange.request().method().equalsIgnoreCase("HEAD") ||
+                             responseCode == HTTP_NOT_MODIFIED)) {
+                 // HEAD response and 304 response might have a content-length header,
+                 // but it carries no meaning
+                 contentLength = cl;
              }
-         } catch (NumberFormatException nfe) {
-             cancelImpl(nfe, Http3Error.H3_MESSAGE_ERROR);
-             return;
          }
 
          if (Log.headers() || debug.on()) {
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java b/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
index 60eb55ec0ad..671874b8fb5 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
@@ -28,8 +28,11 @@ package jdk.internal.net.http;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.net.ConnectException;
+import java.net.ProtocolException;
+import java.net.ProtocolException;
 import java.net.http.HttpClient.Version;
 import java.net.http.HttpConnectTimeoutException;
+import java.net.http.HttpHeaders;
 import java.net.http.StreamLimitException;
 import java.time.Duration;
 import java.util.List;
@@ -47,7 +50,6 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 
 import java.net.http.HttpClient;
-import java.net.http.HttpHeaders;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodySubscriber;
@@ -62,6 +64,7 @@ import jdk.internal.net.http.common.Utils;
 import static jdk.internal.net.http.common.MinimalFuture.completedFuture;
 import static jdk.internal.net.http.common.MinimalFuture.failedFuture;
 import static jdk.internal.net.http.AltSvcProcessor.processAltSvcHeader;
+import static jdk.internal.net.http.common.Utils.readContentLength;
 
 
 /**
@@ -358,13 +361,22 @@ class MultiExchange<T> implements Cancelable {
         return r.statusCode == 204;
     }
 
-    private boolean bodyIsPresent(Response r) {
-        HttpHeaders headers = r.headers();
-        if (headers.firstValueAsLong("Content-length").orElse(0L) != 0L)
-            return true;
-        if (headers.firstValue("Transfer-encoding").isPresent())
-            return true;
-        return false;
+    private void ensureNoBody(HttpHeaders headers) throws ProtocolException {
+
+        // Check `Content-Length`
+        var contentLength = readContentLength(headers, "", 0);
+        if (contentLength > 0) {
+            throw new ProtocolException(
+                    "Unexpected \"Content-Length\" header in a 204 response: " + contentLength);
+        }
+
+        // Check `Transfer-Encoding`
+        var transferEncoding = headers.firstValue("Transfer-Encoding");
+        if (transferEncoding.isPresent()) {
+            throw new ProtocolException(
+                    "Unexpected \"Transfer-Encoding\" header in a 204 response: " + transferEncoding.get());
+        }
+
     }
 
     // Call the user's body handler to get an empty body object
@@ -405,13 +417,13 @@ class MultiExchange<T> implements Cancelable {
                         if (bodyNotPermitted(r)) {
                             // No response body consumption is expected, we can cancel the timer right away
                             cancelTimer();
-                            if (bodyIsPresent(r)) {
-                                IOException ioe = new IOException(
-                                    "unexpected content length header with 204 response");
-                                exch.cancel(ioe);
-                                return MinimalFuture.failedFuture(ioe);
-                            } else
-                                return handleNoBody(r, exch);
+                            try {
+                                ensureNoBody(r.headers);
+                            } catch (ProtocolException pe) {
+                                exch.cancel(pe);
+                                return MinimalFuture.failedFuture(pe);
+                            }
+                            return handleNoBody(r, exch);
                         }
                         return exch.readBodyAsync(responseHandler)
                             .thenApply((T body) -> setNewResponse(r.request, r, body, exch));
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
index bf9170f8f51..9826b280438 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
@@ -61,6 +61,7 @@ import jdk.internal.net.http.hpack.DecodingCallback;
 import static jdk.internal.net.http.AltSvcProcessor.processAltSvcFrame;
 
 import static jdk.internal.net.http.Exchange.MAX_NON_FINAL_RESPONSES;
+import static jdk.internal.net.http.common.Utils.readStatusCode;
 
 /**
  * Http/2 Stream handling.
@@ -615,18 +616,14 @@ class Stream<T> extends ExchangeImpl<T> {
         return null;
     }
 
-    protected void handleResponse(HeaderFrame hf) throws IOException {
+    protected void handleResponse(HeaderFrame hf) {
         HttpHeaders responseHeaders = responseHeadersBuilder.build();
 
         if (!finalResponseCodeReceived) {
             try {
-                responseCode = (int) responseHeaders
-                        .firstValueAsLong(":status")
-                        .orElseThrow(() -> new ProtocolException(String.format(
-                                "Stream %s PROTOCOL_ERROR: no status code in response",
-                                streamid)));
-            } catch (ProtocolException cause) {
-                cancelImpl(cause, ResetFrame.PROTOCOL_ERROR);
+                responseCode = readStatusCode(responseHeaders, "Stream %s PROTOCOL_ERROR: ".formatted(streamid));
+            } catch (ProtocolException pe) {
+                cancelImpl(pe, ResetFrame.PROTOCOL_ERROR);
                 rspHeadersConsumer.reset();
                 return;
             }
@@ -1730,21 +1727,18 @@ class Stream<T> extends ExchangeImpl<T> {
             HttpHeaders responseHeaders = responseHeadersBuilder.build();
 
             if (!finalPushResponseCodeReceived) {
-                responseCode = (int)responseHeaders
-                    .firstValueAsLong(":status")
-                    .orElse(-1);
-
-                if (responseCode == -1) {
-                    cancelImpl(new ProtocolException("No status code"), ResetFrame.PROTOCOL_ERROR);
+                try {
+                    responseCode = readStatusCode(responseHeaders, "");
+                    if (responseCode >= 100 && responseCode < 200) {
+                        String protocolErrorMsg = checkInterimResponseCountExceeded();
+                        if (protocolErrorMsg != null) {
+                            throw new ProtocolException(protocolErrorMsg);
+                        }
+                    }
+                } catch (ProtocolException pe) {
+                    cancelImpl(pe, ResetFrame.PROTOCOL_ERROR);
                     rspHeadersConsumer.reset();
                     return;
-                } else if (responseCode >= 100 && responseCode < 200) {
-                    String protocolErrorMsg = checkInterimResponseCountExceeded();
-                    if (protocolErrorMsg != null) {
-                        cancelImpl(new ProtocolException(protocolErrorMsg), ResetFrame.PROTOCOL_ERROR);
-                        rspHeadersConsumer.reset();
-                        return;
-                    }
                 }
 
                 this.finalPushResponseCodeReceived = true;
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java
index 20b0338215c..e5ea07c3b97 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java
@@ -39,6 +39,7 @@ import java.lang.System.Logger.Level;
 import java.net.ConnectException;
 import java.net.Inet6Address;
 import java.net.InetSocketAddress;
+import java.net.ProtocolException;
 import java.net.SocketAddress;
 import java.net.StandardSocketOptions;
 import java.net.Proxy;
@@ -1354,6 +1355,47 @@ public final class Utils {
     }
     // -- toAsciiString-like support to encode path and query URI segments
 
+    public static int readStatusCode(HttpHeaders headers, String errorPrefix) throws ProtocolException {
+        var s = headers.firstValue(":status").orElse(null);
+        if (s == null) {
+            throw new ProtocolException(errorPrefix + "missing status code");
+        }
+        Throwable t = null;
+        int i = 0;
+        try {
+            i = Integer.parseInt(s);
+        } catch (NumberFormatException nfe) {
+            t = nfe;
+        }
+        if (t != null || i < 100 || i > 999) {
+            var pe = new ProtocolException(errorPrefix + "invalid status code: " + s);
+            pe.initCause(t);
+            throw pe;
+        }
+        return i;
+    }
+
+    public static long readContentLength(HttpHeaders headers, String errorPrefix, long defaultIfMissing) throws ProtocolException {
+        var k = "Content-Length";
+        var s = headers.firstValue(k).orElse(null);
+        if (s == null) {
+            return defaultIfMissing;
+        }
+        Throwable t = null;
+        long i = 0;
+        try {
+            i = Long.parseLong(s);
+        } catch (NumberFormatException nfe) {
+            t = nfe;
+        }
+        if (t != null || i < 0) {
+            var pe = new ProtocolException("%sinvalid \"%s\": %s".formatted(errorPrefix, k, s));
+            pe.initCause(t);
+            throw pe;
+        }
+        return i;
+    }
+
     // Encodes all characters >= \u0080 into escaped, normalized UTF-8 octets,
     // assuming that s is otherwise legal
     //
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/ConnectionTerminatorImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/ConnectionTerminatorImpl.java
index 7870f4f1d8e..5e2384dce27 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/ConnectionTerminatorImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/ConnectionTerminatorImpl.java
@@ -344,10 +344,6 @@ final class ConnectionTerminatorImpl implements ConnectionTerminator {
             }
         }
         failHandshakeCFs();
-        // remap the connection to a draining connection
-        final QuicEndpoint endpoint = this.connection.endpoint();
-        assert endpoint != null : "QUIC endpoint is null";
-        endpoint.draining(connection);
         discardConnectionState();
         connection.streams.terminate(terminationCause);
         if (Log.quic()) {
@@ -439,7 +435,7 @@ final class ConnectionTerminatorImpl implements ConnectionTerminator {
         final ProtectionRecord protectionRecord = ProtectionRecord.single(packet,
                 connection::allocateDatagramForEncryption);
         // while sending the packet containing the CONNECTION_CLOSE frame, the pushDatagram will
-        // remap (or remove) the QuicConnectionImpl in QuicEndpoint.
+        // remap the QuicConnectionImpl in QuicEndpoint.
         connection.pushDatagram(protectionRecord);
     }
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
index c07df1c6eb2..580bbe23d31 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
@@ -2811,7 +2811,7 @@ public class QuicConnectionImpl extends QuicConnection implements QuicPacketRece
                 // a CONNECTION_CLOSE frame is being sent to the peer when the local
                 // connection state is in DRAINING. This implies that the local endpoint
                 // is responding to an incoming CONNECTION_CLOSE frame from the peer.
-                // we remove the connection from the endpoint for such cases.
+                // we switch this connection to one that does not respond to incoming packets.
                 endpoint.pushClosedDatagram(this, peerAddress(), datagram);
             } else if (stateHandle.isMarked(QuicConnectionState.CLOSING)) {
                 // a CONNECTION_CLOSE frame is being sent to the peer when the local
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicEndpoint.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicEndpoint.java
index b1de5ef4bfd..91b4a678a23 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicEndpoint.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicEndpoint.java
@@ -1509,7 +1509,8 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
     /**
      * Called to schedule sending of a datagram that contains a single {@code ConnectionCloseFrame}
      * sent in response to a {@code ConnectionClose} frame.
-     * This will completely remove the connection from the connection map.
+     * This will replace the {@link QuicConnectionImpl} with a {@link DrainingConnection} that
+     * will discard all incoming packets.
      * @param connection   the connection being closed
      * @param destination  the peer address
      * @param datagram     the datagram
@@ -1518,7 +1519,7 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
                                    InetSocketAddress destination,
                                    ByteBuffer datagram) {
         if (debug.on()) debug.log("Pushing closed datagram for " + connection.logTag());
-        removeConnection(connection);
+        draining(connection);
         pushDatagram(connection, destination, datagram);
     }
 
@@ -1581,34 +1582,30 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
         peerIssuedResetTokens.replaceAll((tok, c) -> c == from ? to : c);
     }
 
-    public void draining(final QuicPacketReceiver connection) {
+    public void draining(final QuicConnectionImpl connection) {
         // remap the connection to a DrainingConnection
         if (closed) return;
+
+        final long idleTimeout = connection.peerPtoMs() * 3; // 3 PTO
+        connection.localConnectionIdManager().close();
+        DrainingConnection draining = new DrainingConnection(connection.connectionIds(), idleTimeout);
+        // we can ignore stateless reset in the draining state.
+        remapPeerIssuedResetToken(connection, draining);
+
         connection.connectionIds().forEach((id) ->
-                connections.compute(id, this::remapDraining));
+                connections.compute(id, (i, r) -> remapDraining(i, r, draining)));
+        draining.startTimer();
         assert !connections.containsValue(connection) : connection;
     }
 
-    private DrainingConnection remapDraining(QuicConnectionId id, QuicPacketReceiver conn) {
+    private DrainingConnection remapDraining(QuicConnectionId id, QuicPacketReceiver conn, DrainingConnection draining) {
         if (closed) return null;
         var debugOn =  debug.on() && !Thread.currentThread().isVirtual();
-        if (conn instanceof ClosingConnection closing) {
+        if (conn instanceof QuicConnectionImpl || conn instanceof ClosingConnection) {
             if (debugOn) debug.log("remapping %s to DrainingConnection", id);
-            final var draining = closing.toDraining();
-            remapPeerIssuedResetToken(closing, draining);
-            draining.startTimer();
-            return draining;
-        } else if (conn instanceof DrainingConnection draining) {
-            return draining;
-        } else if (conn instanceof QuicConnectionImpl impl) {
-            final long idleTimeout = impl.peerPtoMs() * 3; // 3 PTO
-            impl.localConnectionIdManager().close();
-            if (debugOn) debug.log("remapping %s to DrainingConnection", id);
-            var draining = new DrainingConnection(conn.connectionIds(), idleTimeout);
-            // we can ignore stateless reset in the draining state.
-            remapPeerIssuedResetToken(impl, draining);
-            draining.startTimer();
             return draining;
+        } else if (conn instanceof DrainingConnection d) {
+            return d;
         } else if (conn == null) {
             // connection absent (was probably removed), don't remap to draining
             if (debugOn) {
@@ -1623,30 +1620,32 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
 
     protected void closing(QuicConnectionImpl connection, ByteBuffer datagram) {
         if (closed) return;
-        ByteBuffer closing = ByteBuffer.allocate(datagram.limit());
-        closing.put(datagram.slice());
-        closing.flip();
+        ByteBuffer closingDatagram = ByteBuffer.allocate(datagram.limit());
+        closingDatagram.put(datagram.slice());
+        closingDatagram.flip();
+
+        final long idleTimeout = connection.peerPtoMs() * 3; // 3 PTO
+        connection.localConnectionIdManager().close();
+        var closingConnection = new ClosingConnection(connection.connectionIds(), idleTimeout, datagram);
+        remapPeerIssuedResetToken(connection, closingConnection);
+
         connection.connectionIds().forEach((id) ->
-                connections.compute(id, (i, r) -> remapClosing(i, r, closing)));
+                connections.compute(id, (i, r) -> remapClosing(i, r, closingConnection)));
+        closingConnection.startTimer();
         assert !connections.containsValue(connection) : connection;
     }
 
-    private ClosedConnection remapClosing(QuicConnectionId id, QuicPacketReceiver conn, ByteBuffer datagram) {
+    private ClosedConnection remapClosing(QuicConnectionId id, QuicPacketReceiver conn, ClosingConnection closingConnection) {
         if (closed) return null;
         var debugOn =  debug.on() && !Thread.currentThread().isVirtual();
-        if (conn instanceof ClosingConnection closing) {
+        if (conn instanceof QuicConnectionImpl) {
+            if (debugOn) debug.log("remapping %s to ClosingConnection", id);
+            return closingConnection;
+        } else if (conn instanceof ClosingConnection closing) {
             // we already have a closing datagram, drop the new one
             return closing;
         } else if (conn instanceof DrainingConnection draining) {
             return draining;
-        } else if (conn instanceof QuicConnectionImpl impl) {
-            final long idleTimeout = impl.peerPtoMs() * 3; // 3 PTO
-            impl.localConnectionIdManager().close();
-            if (debugOn) debug.log("remapping %s to ClosingConnection", id);
-            var closing = new ClosingConnection(conn.connectionIds(), idleTimeout, datagram);
-            remapPeerIssuedResetToken(impl, closing);
-            closing.startTimer();
-            return closing;
         } else if (conn == null) {
             // connection absent (was probably removed), don't remap to closing
             if (debugOn) {
@@ -1896,10 +1895,6 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
                 debug.log("ClosingConnection(%s): dropping %s packet", localConnectionIds, headersType);
             }
         }
-
-        private DrainingConnection toDraining() {
-            return new DrainingConnection(localConnectionIds, maxIdleTimeMs);
-        }
     }
 
     /**
diff --git a/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java b/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java
index 7853d47c0d7..33bda82c15c 100644
--- a/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java
+++ b/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java
index 7aaa8975185..3fba1dc4460 100644
--- a/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java
+++ b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.security.sasl/share/classes/com/sun/security/sasl/Provider.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/Provider.java
index c3d4cdcc54b..6a6c1bb3ce3 100644
--- a/src/java.security.sasl/share/classes/com/sun/security/sasl/Provider.java
+++ b/src/java.security.sasl/share/classes/com/sun/security/sasl/Provider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
  */
 package com.sun.security.sasl;
 
+import java.io.Serial;
 import java.security.NoSuchAlgorithmException;
 import java.security.InvalidParameterException;
 import java.security.ProviderException;
@@ -45,6 +46,7 @@ import static sun.security.util.SecurityConstants.PROVIDER_VER;
 
 public final class Provider extends java.security.Provider {
 
+    @Serial
     private static final long serialVersionUID = 8622598936488630849L;
 
     private static final String info = "Sun SASL provider" +
diff --git a/src/java.security.sasl/share/classes/javax/security/sasl/AuthenticationException.java b/src/java.security.sasl/share/classes/javax/security/sasl/AuthenticationException.java
index b61981bc16f..c9c3a274c44 100644
--- a/src/java.security.sasl/share/classes/javax/security/sasl/AuthenticationException.java
+++ b/src/java.security.sasl/share/classes/javax/security/sasl/AuthenticationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package javax.security.sasl;
 
+import java.io.Serial;
+
 /**
  * This exception is thrown by a SASL mechanism implementation
  * to indicate that the SASL
@@ -79,5 +81,6 @@ public class AuthenticationException extends SaslException {
     }
 
     /** Use serialVersionUID from JSR 28 RI for interoperability */
+    @Serial
     private static final long serialVersionUID = -3579708765071815007L;
 }
diff --git a/src/java.security.sasl/share/classes/javax/security/sasl/AuthorizeCallback.java b/src/java.security.sasl/share/classes/javax/security/sasl/AuthorizeCallback.java
index e0f323d36c9..a254159229b 100644
--- a/src/java.security.sasl/share/classes/javax/security/sasl/AuthorizeCallback.java
+++ b/src/java.security.sasl/share/classes/javax/security/sasl/AuthorizeCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package javax.security.sasl;
 
+import java.io.Serial;
+
 import javax.security.auth.callback.Callback;
 
 /**
@@ -141,5 +143,6 @@ public class AuthorizeCallback implements Callback, java.io.Serializable {
         authorizedID = id;
     }
 
+    @Serial
     private static final long serialVersionUID = -2353344186490470805L;
 }
diff --git a/src/java.security.sasl/share/classes/javax/security/sasl/RealmCallback.java b/src/java.security.sasl/share/classes/javax/security/sasl/RealmCallback.java
index af14158aa77..4d87b4da9d9 100644
--- a/src/java.security.sasl/share/classes/javax/security/sasl/RealmCallback.java
+++ b/src/java.security.sasl/share/classes/javax/security/sasl/RealmCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package javax.security.sasl;
 
+import java.io.Serial;
+
 import javax.security.auth.callback.TextInputCallback;
 
 /**
@@ -63,5 +65,6 @@ public class RealmCallback extends TextInputCallback {
         super(prompt, defaultRealmInfo);
     }
 
+    @Serial
     private static final long serialVersionUID = -4342673378785456908L;
 }
diff --git a/src/java.security.sasl/share/classes/javax/security/sasl/RealmChoiceCallback.java b/src/java.security.sasl/share/classes/javax/security/sasl/RealmChoiceCallback.java
index 61d9c0edd35..6a782268fb6 100644
--- a/src/java.security.sasl/share/classes/javax/security/sasl/RealmChoiceCallback.java
+++ b/src/java.security.sasl/share/classes/javax/security/sasl/RealmChoiceCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package javax.security.sasl;
 
+import java.io.Serial;
+
 import javax.security.auth.callback.ChoiceCallback;
 
 /**
@@ -58,5 +60,6 @@ public class RealmChoiceCallback extends ChoiceCallback {
         super(prompt, choices, defaultChoice, multiple);
     }
 
+    @Serial
     private static final long serialVersionUID = -8588141348846281332L;
 }
diff --git a/src/java.security.sasl/share/classes/javax/security/sasl/SaslException.java b/src/java.security.sasl/share/classes/javax/security/sasl/SaslException.java
index 0398d8d7277..4d07eb18d36 100644
--- a/src/java.security.sasl/share/classes/javax/security/sasl/SaslException.java
+++ b/src/java.security.sasl/share/classes/javax/security/sasl/SaslException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 package javax.security.sasl;
 
 import java.io.IOException;
+import java.io.Serial;
 
 /**
  * This class represents an error that has occurred when using SASL.
@@ -125,5 +126,6 @@ public class SaslException extends IOException {
     }
 
     /** Use serialVersionUID from JSR 28 RI for interoperability */
+    @Serial
     private static final long serialVersionUID = 4579784287983423626L;
 }
diff --git a/src/java.sql/share/classes/java/sql/Statement.java b/src/java.sql/share/classes/java/sql/Statement.java
index 4da510f6749..3570e8734a6 100644
--- a/src/java.sql/share/classes/java/sql/Statement.java
+++ b/src/java.sql/share/classes/java/sql/Statement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java
index b3eb14a9ddf..bfec96e1af7 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java
index 13ca0a84cfa..7c210773d33 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java
index 9b94a1dcf2d..881a3f2ebea 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
index bcdb0f59f5c..906bbb88252 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java
index 8555d69597b..d5a1b0edb35 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java
index c5ae6af08c0..12799a16b8b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
index c16620ec7b1..d3216907d2f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java
index 48f7d63f353..dd5c24af4bf 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java
index 0affded17e3..a7bb6933e9d 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
index c93e05d74e4..4f7894780b4 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java
index 941c1c38c00..8d154bda1c6 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java
index 55484c2b10c..40dbeda7fcd 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
index 654a313f6c9..6d1d65731f2 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
 #
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
index 2e2c30909ad..b297e229501 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/jdk.accessibility/windows/native/jabswitch/jabswitch.cpp b/src/jdk.accessibility/windows/native/jabswitch/jabswitch.cpp
index 62546b4dd78..fdd7ff524da 100644
--- a/src/jdk.accessibility/windows/native/jabswitch/jabswitch.cpp
+++ b/src/jdk.accessibility/windows/native/jabswitch/jabswitch.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -226,9 +226,9 @@ int modify(bool enable) {
                 printf("Couldn't create file: %s\n", path);
                 perror("Error");
             } else {
-                char str[100] = "assistive_technologies=com.sun.java.accessibility.AccessBridge\n";
-                strcat_s(str, "screen_magnifier_present=true\n");
-                fprintf(origFile, str);
+                fprintf(origFile, "%s",
+                    "assistive_technologies=com.sun.java.accessibility.AccessBridge\n"
+                    "screen_magnifier_present=true\n");
                 fclose(origFile);
             }
         } else {
@@ -314,11 +314,11 @@ void printVersion() {
                pVSInfo->dwProductVersionMS & 0xFFFF,
                pVSInfo->dwProductVersionLS >> 16,
                pVSInfo->dwProductVersionLS & 0xFFFF );
-    char outputString[100];
-    strcpy_s(outputString, "jabswitch ");
-    strcat_s(outputString, versionString);
-    strcat_s(outputString, "\njabswitch enables or disables the Java Access Bridge.\n");
-    printf(outputString);
+    printf(
+        "jabswitch %s\n"
+        "jabswitch enables or disables the Java Access Bridge.\n",
+        versionString
+    );
 }
 
 int regEnable() {
diff --git a/src/jdk.accessibility/windows/native/toolscommon/AccessInfo.cpp b/src/jdk.accessibility/windows/native/toolscommon/AccessInfo.cpp
index b9cd8434fc7..256f123c83a 100644
--- a/src/jdk.accessibility/windows/native/toolscommon/AccessInfo.cpp
+++ b/src/jdk.accessibility/windows/native/toolscommon/AccessInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -97,8 +97,7 @@ void logString(FILE *logfile, const char *msg, ...) {
     va_start(argprt, msg);
     vsnprintf(tmpbuf, sizeof(tmpbuf), msg, argprt);
 
-    fprintf(logfile, tmpbuf);
-    fprintf(logfile, "\n");
+    fprintf(logfile, "%s\n", tmpbuf);
     fflush(logfile);
 }
 
diff --git a/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java
index 5c786db1366..a7a348affe3 100644
--- a/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -28,9 +28,13 @@ import com.sun.tools.attach.AgentLoadException;
 import com.sun.tools.attach.AttachNotSupportedException;
 import com.sun.tools.attach.spi.AttachProvider;
 
+import sun.jvmstat.PlatformSupport;
+
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -39,14 +43,17 @@ import static java.nio.charset.StandardCharsets.UTF_8;
  */
 @SuppressWarnings("restricted")
 public class VirtualMachineImpl extends HotSpotVirtualMachine {
-    // "tmpdir" is used as a global well-known location for the files
-    // .java_pid<pid>. and .attach_pid<pid>. It is important that this
-    // location is the same for all processes, otherwise the tools
-    // will not be able to find all Hotspot processes.
-    // This is intentionally not the same as java.io.tmpdir, since
-    // the latter can be changed by the user.
-    // Any changes to this needs to be synchronized with HotSpot.
-    private static final String tmpdir;
+
+    /**
+     * HotSpot PerfData file prefix
+     */
+    private static final String HSPERFDATA_PREFIX = "hsperfdata_";
+
+    /**
+     * Use platform specific methods for looking up temporary directories.
+     */
+    private static final PlatformSupport platformSupport = PlatformSupport.getInstance();
+
     String socket_path;
     private OperationProperties props = new OperationProperties(VERSION_1); // updated in ctor
 
@@ -67,10 +74,12 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
         // Find the socket file. If not found then we attempt to start the
         // attach mechanism in the target VM by sending it a QUIT signal.
         // Then we attempt to find the socket file again.
-        File socket_file = new File(tmpdir, ".java_pid" + pid);
+        // In macOS the socket file is located in per-user temp directory.
+        String tempdir = getTempDirFromPid(pid);
+        File socket_file = new File(tempdir, ".java_pid" + pid);
         socket_path = socket_file.getPath();
         if (!socket_file.exists()) {
-            File f = createAttachFile(pid);
+            File f = createAttachFile(tempdir, pid);
             try {
                 checkCatchesAndSendQuitTo(pid, false);
 
@@ -211,12 +220,34 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
         }
     }
 
-    private File createAttachFile(int pid) throws IOException {
+    private File createAttachFile(String tmpdir, int pid) throws IOException {
         File f = new File(tmpdir, ".attach_pid" + pid);
         createAttachFile0(f.getPath());
         return f;
     }
 
+    /*
+     * Returns a platform-specific temporary directory for a given process.
+     * In VMs running as unprivileged user it returns the default platform-specific
+     * temporary directory. In VMs running as root it searches over the list of
+     * temporary directories for one containing HotSpot PerfData directory.
+     */
+    private String getTempDirFromPid(int pid) {
+        ProcessHandle ph = ProcessHandle.of(pid).orElse(null);
+        if (ph != null) {
+            String user = ph.info().user().orElse(null);
+            if (user != null) {
+                for (String dir : platformSupport.getTemporaryDirectories(pid)) {
+                    Path fullPath = Path.of(dir, HSPERFDATA_PREFIX + user, String.valueOf(pid));
+                    if (Files.exists(fullPath)) {
+                        return dir;
+                    }
+                }
+            }
+        }
+        return PlatformSupport.getTemporaryDirectory();
+    }
+
     //-- native methods
 
     static native boolean checkCatchesAndSendQuitTo(int pid, boolean throwIfNotReady) throws IOException, AttachNotSupportedException;
@@ -235,10 +266,7 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
 
     static native void createAttachFile0(String path);
 
-    static native String getTempDir();
-
     static {
         System.loadLibrary("attach");
-        tmpdir = getTempDir();
     }
 }
diff --git a/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c
index d105d7d3b1b..5b2579eba39 100644
--- a/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c
+++ b/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -335,27 +335,3 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_createAttachFile
         JNU_ReleaseStringPlatformChars(env, path, _path);
     }
 }
-
-/*
- * Class:     sun_tools_attach_BSDVirtualMachine
- * Method:    getTempDir
- * Signature: (V)Ljava.lang.String;
- */
-JNIEXPORT jstring JNICALL Java_sun_tools_attach_VirtualMachineImpl_getTempDir(JNIEnv *env, jclass cls)
-{
-    // This must be hard coded because it's the system's temporary
-    // directory not the java application's temp directory, ala java.io.tmpdir.
-
-#ifdef __APPLE__
-    // macosx has a secure per-user temporary directory.
-    // Don't cache the result as this is only called once.
-    char path[PATH_MAX];
-    int pathSize = confstr(_CS_DARWIN_USER_TEMP_DIR, path, PATH_MAX);
-    if (pathSize == 0 || pathSize > PATH_MAX) {
-        strlcpy(path, "/tmp", sizeof(path));
-    }
-    return JNU_NewStringPlatform(env, path);
-#else /* __APPLE__ */
-    return (*env)->NewStringUTF(env, "/tmp");
-#endif /* __APPLE__ */
-}
diff --git a/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template b/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template
index f3d03a9e9c7..4fc0b2796ee 100644
--- a/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template
+++ b/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template
@@ -309,7 +309,7 @@ public class EUC_JP
 
             try {
                 if (enc0201.isASCIICompatible()) {
-                    int n = JLA.encodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
+                    int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
                     sp += n;
                     dp += n;
                 }
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/UsesTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/UsesTree.java
index d14257de626..1878a868588 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/UsesTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/UsesTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index b13c9e0fe2b..22cb796870b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -1152,7 +1152,7 @@ public class LambdaToMethod extends TreeTranslator {
                     propagateAnnos = false;
                     break;
                 case LOCAL_VAR:
-                    ret = new VarSymbol(sym.flags() & FINAL, sym.name, sym.type, translatedSym);
+                    ret = new VarSymbol(sym.flags(), sym.name, sym.type, translatedSym);
                     ret.pos = sym.pos;
                     // If sym.data == ElementKind.EXCEPTION_PARAMETER,
                     // set ret.data = ElementKind.EXCEPTION_PARAMETER too.
@@ -1164,7 +1164,8 @@ public class LambdaToMethod extends TreeTranslator {
                     }
                     break;
                 case PARAM:
-                    ret = new VarSymbol((sym.flags() & FINAL) | PARAMETER, sym.name, types.erasure(sym.type), translatedSym);
+                    Assert.check((sym.flags() & PARAMETER) != 0);
+                    ret = new VarSymbol(sym.flags(), sym.name, types.erasure(sym.type), translatedSym);
                     ret.pos = sym.pos;
                     break;
                 default:
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
index 07f2a742bcb..d88180bb15c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -3843,12 +3843,15 @@ public class Resolve {
         Env<AttrContext> env1 = env;
         boolean staticOnly = false;
         while (env1.outer != null) {
+            // If the local class is defined inside a static method, and the instance creation expression
+            // occurs in that same method, the creation occurs (technically) inside a static context, but that's ok.
             if (env1.info.scope.owner == owner) {
                 return (staticOnly) ?
                     new BadLocalClassCreation(c) :
                     owner;
+            } else if (isStatic(env1) || env1.enclClass.sym.isStatic()) {
+                staticOnly = true;
             }
-            if (isStatic(env1)) staticOnly = true;
             env1 = env1.outer;
         }
         return owner.kind == MTH ?
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
index 0787c839cb4..b8fa413adba 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
@@ -292,10 +292,10 @@ compiler.err.annotation.decl.not.allowed.here=Annotationsschnittstellendeklarati
 compiler.err.cant.inherit.from.final=Erben aus finalem {0}-Element nicht möglich
 
 # 0: symbol or name
-compiler.err.cant.ref.before.ctor.called={0} kann nicht referenziert werden, bevor der Supertypkonstruktor aufgerufen wurde
+compiler.err.cant.ref.before.ctor.called=Referenz zu {0} darf nur nach einem expliziten Konstruktoraufruf angezeigt werden
 
 # 0: symbol or name
-compiler.err.cant.assign.initialized.before.ctor.called=Initialisiertes Feld "{0}" kann nicht zugewiesen werden, bevor der Supertypkonstruktor aufgerufen wurde
+compiler.err.cant.assign.initialized.before.ctor.called=Zuweisung zu initialisiertem Feld "{0}" darf nur nach einem expliziten Konstruktoraufruf angezeigt werden
 
 compiler.err.cant.select.static.class.from.param.type=Statische Klasse kann nicht aus einem parametrisierten Typ ausgewählt werden
 
@@ -649,11 +649,14 @@ compiler.err.limit.string.overflow=UTF8-Darstellung für Zeichenfolge "{0}..." i
 
 compiler.err.malformed.fp.lit=Nicht wohlgeformtes Gleitkommaliteral
 
-compiler.err.method.does.not.override.superclass=Methode überschreibt oder implementiert keine Methode aus einem Supertyp
+# 0: symbol, 1: symbol
+compiler.err.method.does.not.override.superclass={0} in {1} überschreibt oder implementiert keine Methode aus einem Supertyp
 
-compiler.err.static.methods.cannot.be.annotated.with.override=Statische Methoden können nicht mit @Override-Annotation versehen werden
+# 0: symbol, 1: symbol
+compiler.err.static.methods.cannot.be.annotated.with.override=Statische Methode {0} in {1} kann nicht mit @Override-Annotation versehen werden
 
-compiler.err.missing.meth.body.or.decl.abstract=Methodenbody fehlt oder als abstrakt deklarieren
+# 0: symbol, 1: symbol
+compiler.err.missing.meth.body.or.decl.abstract=In Methode {0} in {1} fehlt ein Methodenbody, oder sie muss als abstrakt deklariert werden
 
 compiler.err.missing.ret.stmt=Rückgabeanweisung fehlt
 
@@ -1139,6 +1142,7 @@ compiler.err.multi-module.outdir.cannot.be.exploded.module=Im Modus für mehrere
 
 # 0: path
 # lint: path
+# flags: default-enabled
 compiler.warn.outdir.is.in.exploded.module=Das Ausgabeverzeichnis befindet sich in einem entpackten Modul: {0}
 
 # 0: file object
@@ -1198,6 +1202,7 @@ compiler.warn.output.file.clash=Ausgabedatei mehrmals geschrieben: {0}
 ## The following string will appear before all messages keyed as:
 ## "compiler.note".
 
+# flags: mandatory
 compiler.note.compressed.diags=Einige Meldungen wurden vereinfacht. Wiederholen Sie die Kompilierung mit -Xdiags:verbose, um die vollständige Ausgabe abzurufen
 
 # 0: boolean, 1: symbol
@@ -1378,17 +1383,17 @@ compiler.warn.incubating.modules=Inkubatormodul(e) verwendet: {0}
 
 # 0: symbol, 1: symbol
 # lint: deprecation
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.has.been.deprecated={0} in {1} ist veraltet
 
 # 0: symbol, 1: symbol
 # lint: removal
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.has.been.deprecated.for.removal={0} in {1} ist veraltet und wurde zum Entfernen markiert
 
 # 0: symbol
 # lint: preview
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.is.preview={0} ist eine Vorschau-API, die in einem zukünftigen Release entfernt werden kann.
 
 # 0: symbol
@@ -1396,7 +1401,7 @@ compiler.err.is.preview={0} ist eine Vorschau-API, die standardmäßig deaktivie
 
 # 0: symbol
 # lint: preview
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.is.preview.reflective={0} ist eine reflektive Vorschau-API, die in einem zukünftigen Release entfernt werden kann.
 
 # 0: symbol, 1: symbol
@@ -1405,12 +1410,12 @@ compiler.warn.restricted.method={0}.{1} ist eine eingeschränkte Methode.\n(Eing
 
 # 0: symbol
 # lint: deprecation
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.has.been.deprecated.module=Modul {0} ist veraltet
 
 # 0: symbol
 # lint: removal
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.has.been.deprecated.for.removal.module=Modul {0} ist veraltet und wurde zum Entfernen markiert
 
 # 0: symbol
@@ -1583,10 +1588,12 @@ compiler.warn.static.not.qualified.by.type2={0} (statisch) darf nicht als Member
 
 # 0: string, 1: fragment
 # lint: options
+# flags: default-enabled
 compiler.warn.source.no.bootclasspath=Bootstrap Classpath ist nicht zusammen mit -source {0} festgelegt\n{1}
 
 # 0: string, 1: fragment
 # lint: options
+# flags: default-enabled
 compiler.warn.source.no.system.modules.path=Systemmodulpfad ist nicht zusammen mit -source {0} festgelegt\n{1}
 
 # 0: string
@@ -1603,10 +1610,12 @@ compiler.misc.source.no.system.modules.path.with.target=Wenn Sie den Speicherort
 
 # 0: string
 # lint: options
+# flags: default-enabled
 compiler.warn.option.obsolete.source=Quellwert {0} ist veraltet und wird in einem zukünftigen Release entfernt
 
 # 0: target
 # lint: options
+# flags: default-enabled
 compiler.warn.option.obsolete.target=Zielwert {0} ist veraltet und wird in einem zukünftigen Release entfernt
 
 # 0: string, 1: string
@@ -1616,12 +1625,17 @@ compiler.err.option.removed.source=Quelloption {0} wird nicht mehr unterstützt.
 compiler.err.option.removed.target=Zieloption {0} wird nicht mehr unterstützt. Verwenden Sie {1} oder höher.
 
 # lint: options
+# flags: default-enabled
 compiler.warn.option.obsolete.suppression=Verwenden Sie -Xlint:-options, um Warnungen zu veralteten Optionen zu unterdrücken.
 
 # 0: name, 1: number, 2: number, 3: number, 4: number
 # lint: classfile
 compiler.warn.future.attr={0}-Attribut, das in Klassendateien der Version {1}.{2} eingeführt wurde, wird in Klassendateien der Version {3}.{4} ignoriert
 
+# 0: symbol, 1: file object
+# lint: classfile
+compiler.warn.inconsistent.inner.classes=InnerClasses-Attribut für {0} in {1} inkonsistent mit Quellcode\n({1} muss möglicherweise mit {0} neu kompiliert werden)
+
 # lint: requires-automatic
 compiler.warn.requires.automatic=Erfordert Direktive für ein automatisches Modul
 
@@ -1706,17 +1720,21 @@ compiler.warn.try.resource.not.referenced=Automatisch schließbare Ressource {0}
 # lint: try
 compiler.warn.try.resource.throws.interrupted.exc=Automatisch schließbare Ressource {0} umfasst die Mitgliedsmethode close(), die InterruptedException auslösen könnte
 
+# 0: type
+# lint: try
+compiler.warn.try.resource.can.throw.interrupted.exc=close()-Methode kann InterruptedException in automatisch schließbarer Klasse {0} auslösen
+
 # lint: unchecked
 compiler.warn.unchecked.assign=Nicht geprüfte Zuweisung: {0} zu {1}
 
 # 0: symbol, 1: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.unchecked.assign.to.var=Nicht geprüfte Zuweisung zu Variable {0} als Mitglied des Raw-Typs {1}
 
 # 0: symbol, 1: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.unchecked.call.mbr.of.raw.type=Nicht geprüfter Aufruf von {0} als Mitglied des Raw-Typs {1}
 
 # lint: unchecked
@@ -1724,17 +1742,17 @@ compiler.warn.unchecked.cast.to.type=Nicht geprüftes Casting zu Typ {0}
 
 # 0: kind name, 1: name, 2: object, 3: object, 4: kind name, 5: symbol
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.unchecked.meth.invocation.applied=Nicht geprüfter Methodenaufruf: {0} {1} in {4} {5} wird auf die angegebenen Typen angewendet\nErforderlich: {2}\nErmittelt:    {3}
 
 # 0: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.unchecked.generic.array.creation=Nicht geprüfte Erstellung eines generischen Arrays für varargs-Parameter des Typs {0}
 
 # 0: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.unchecked.varargs.non.reifiable.type=Möglich Heap-Beschädigung aus parametrisiertem vararg-Typ {0}
 
 # 0: symbol
@@ -1772,6 +1790,10 @@ compiler.err.no.zipfs.for.archive=Kein Dateisystemprovider zur Verarbeitung dies
 # lint: divzero
 compiler.warn.div.zero=Division durch Null
 
+# 0: type, 1: long, 2: number
+# lint: lossy-conversions
+compiler.warn.bit.shift.out.of.range=Das Verschieben von {0} um {1} Bit entspricht einer Verschiebung um {2} Bit
+
 # lint: empty
 compiler.warn.empty.if=Leere Anweisung nach "if"
 
@@ -2023,7 +2045,7 @@ compiler.misc.prob.found.req=Inkompatible Typen: {0}
 
 # 0: message segment, 1: type, 2: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.prob.found.req={0}\nErforderlich: {2}\nErmittelt:    {1}
 
 # 0: type, 1: type
@@ -2297,12 +2319,12 @@ compiler.err.override.incompatible.ret={0}\nRückgabetyp {1} ist nicht mit {2} k
 
 # 0: message segment, 1: type, 2: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.override.unchecked.ret={0}\nRückgabetyp erfordert eine nicht geprüfte Konvertierung von {1} in {2}
 
 # 0: message segment, 1: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.override.unchecked.thrown={0}\nAußer Kraft gesetzte Methode löst nicht {1} aus
 
 # 0: symbol
@@ -2377,16 +2399,17 @@ compiler.err.preview.feature.disabled.classfile=Klassendatei für {0} verwendet
 
 # 0: message segment (feature)
 # lint: preview
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.preview.feature.use={0} ist ein Vorschaufeature, das in einem zukünftigen Release entfernt werden kann.
 
 # 0: message segment (feature)
 # lint: preview
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.preview.feature.use.plural={0} sind ein Vorschaufeature, das in einem zukünftigen Release entfernt werden kann.
 
 # 0: file object (classfile), 1: string (expected version)
 # lint: preview
+# flags: mandatory
 compiler.warn.preview.feature.use.classfile=Klassendatei für {0} verwendet Vorschaufeatures von Java SE {1}.
 
 compiler.misc.feature.modules=Module
@@ -2783,6 +2806,7 @@ compiler.err.bad.name.for.option=Ungültiger Name im Wert für {0}-Option: "{1}"
 
 # 0: option name, 1: symbol
 # lint: options
+# flags: default-enabled
 compiler.warn.module.for.option.not.found=Modulname in {0}-Option nicht gefunden: {1}
 
 compiler.err.addmods.all.module.path.invalid=--add-modules ALL-MODULE-PATH kann nur beim Kompilieren des unbenannten Moduls oder beim Kompilieren im Kontext eines automatischen Moduls verwendet werden
@@ -2794,6 +2818,7 @@ compiler.err.add.exports.with.release=Export eines Packages aus Systemmodul {0}
 compiler.err.add.reads.with.release=Hinzufügen von Lese-Edges für Systemmodul {0} ist mit --release nicht zulässig
 
 # lint: options
+# flags: default-enabled
 compiler.warn.addopens.ignored=--add-opens hat zur Kompilierungszeit keine Auswirkungen
 
 compiler.misc.locn.module_source_path=Modulquellpfad
@@ -3060,7 +3085,7 @@ compiler.err.incorrect.number.of.nested.patterns=Falsche Anzahl verschachtelter
 
 # 0: kind name, 1: symbol
 # lint: preview
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.declared.using.preview={0} {1} ist mit einem Vorschaufeature deklariert, das in einem zukünftigen Release entfernt werden kann.
 
 # lint: identity
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
index 291d8aeeec5..89bdc893a43 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
@@ -292,10 +292,10 @@ compiler.err.annotation.decl.not.allowed.here=ここでは注釈インタフェ
 compiler.err.cant.inherit.from.final=final {0}からは継承できません
 
 # 0: symbol or name
-compiler.err.cant.ref.before.ctor.called=スーパータイプのコンストラクタの呼出し前は{0}を参照できません
+compiler.err.cant.ref.before.ctor.called={0}への参照は、明示的なコンストラクタの呼出しの後にのみ表示されます
 
 # 0: symbol or name
-compiler.err.cant.assign.initialized.before.ctor.called=スーパータイプのコンストラクタの呼出し前は、初期化されたフィールド''{0}''を割り当てられません
+compiler.err.cant.assign.initialized.before.ctor.called=初期化されたフィールド''{0}''への割当ては、明示的なコンストラクタの呼出しの後にのみ表示されます
 
 compiler.err.cant.select.static.class.from.param.type=パラメータにされた型からstaticクラスを選択することはできません
 
@@ -649,11 +649,14 @@ compiler.err.limit.string.overflow=文字列"{0}..."のUTF8表現が、定数プ
 
 compiler.err.malformed.fp.lit=浮動小数点リテラルが不正です
 
-compiler.err.method.does.not.override.superclass=メソッドはスーパータイプのメソッドをオーバーライドまたは実装しません
+# 0: symbol, 1: symbol
+compiler.err.method.does.not.override.superclass={1}の{0}はスーパータイプのメソッドをオーバーライドまたは実装しません
 
-compiler.err.static.methods.cannot.be.annotated.with.override=staticメソッドは@Overrideで注釈付けすることはできません
+# 0: symbol, 1: symbol
+compiler.err.static.methods.cannot.be.annotated.with.override={1}のstaticメソッド{0}は@Overrideで注釈付けすることはできません
 
-compiler.err.missing.meth.body.or.decl.abstract=メソッド本体がないか、abstractとして宣言されています
+# 0: symbol, 1: symbol
+compiler.err.missing.meth.body.or.decl.abstract={1}のメソッド{0}にメソッド本体がないか、abstractを宣言する必要があります
 
 compiler.err.missing.ret.stmt=return文が指定されていません
 
@@ -1139,6 +1142,7 @@ compiler.err.multi-module.outdir.cannot.be.exploded.module=複数モジュール
 
 # 0: path
 # lint: path
+# flags: default-enabled
 compiler.warn.outdir.is.in.exploded.module=出力ディレクトリは展開したモジュール内です: {0}
 
 # 0: file object
@@ -1198,6 +1202,7 @@ compiler.warn.output.file.clash=出力ファイルへの書込みが複数回あ
 ## The following string will appear before all messages keyed as:
 ## "compiler.note".
 
+# flags: mandatory
 compiler.note.compressed.diags=一部のメッセージは簡略化されています。-Xdiags:verboseで再コンパイルして完全な出力を取得してください
 
 # 0: boolean, 1: symbol
@@ -1378,17 +1383,17 @@ compiler.warn.incubating.modules=実験的なモジュールを使用してい
 
 # 0: symbol, 1: symbol
 # lint: deprecation
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.has.been.deprecated={1}の{0}は推奨されません
 
 # 0: symbol, 1: symbol
 # lint: removal
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.has.been.deprecated.for.removal={1}の{0}は推奨されておらず、削除用にマークされています
 
 # 0: symbol
 # lint: preview
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.is.preview={0}はプレビューAPIであり、今後のリリースで削除される可能性があります。
 
 # 0: symbol
@@ -1396,7 +1401,7 @@ compiler.err.is.preview={0}はプレビューAPIであり、デフォルトで
 
 # 0: symbol
 # lint: preview
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.is.preview.reflective={0}はリフレクティブ・プレビューAPIであり、今後のリリースで削除される可能性があります。
 
 # 0: symbol, 1: symbol
@@ -1405,12 +1410,12 @@ compiler.warn.restricted.method={0}.{1}は制限されたメソッドです。\n
 
 # 0: symbol
 # lint: deprecation
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.has.been.deprecated.module=モジュール{0}は推奨されません
 
 # 0: symbol
 # lint: removal
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.has.been.deprecated.for.removal.module=モジュール{0}は推奨されておらず、削除用にマークされています
 
 # 0: symbol
@@ -1583,10 +1588,12 @@ compiler.warn.static.not.qualified.by.type2=static {0}を匿名クラスのメ
 
 # 0: string, 1: fragment
 # lint: options
+# flags: default-enabled
 compiler.warn.source.no.bootclasspath=ブートストラップ・クラス・パスが-source {0}と一緒に設定されていません\n{1}
 
 # 0: string, 1: fragment
 # lint: options
+# flags: default-enabled
 compiler.warn.source.no.system.modules.path=システム・モジュールの場所が-source {0}と一緒に設定されていません\n{1}
 
 # 0: string
@@ -1603,10 +1610,12 @@ compiler.misc.source.no.system.modules.path.with.target=システム・モジュ
 
 # 0: string
 # lint: options
+# flags: default-enabled
 compiler.warn.option.obsolete.source=ソース値{0}は廃止されていて、今後のリリースで削除される予定です
 
 # 0: target
 # lint: options
+# flags: default-enabled
 compiler.warn.option.obsolete.target=ターゲット値{0}は廃止されていて、今後のリリースで削除される予定です
 
 # 0: string, 1: string
@@ -1616,12 +1625,17 @@ compiler.err.option.removed.source=ソース・オプション{0}は現在サポ
 compiler.err.option.removed.target=ターゲット・オプション{0}は現在サポートされていません。{1}以降を使用してください。
 
 # lint: options
+# flags: default-enabled
 compiler.warn.option.obsolete.suppression=廃止されたオプションについての警告を表示しないようにするには、-Xlint:オプションを使用します。
 
 # 0: name, 1: number, 2: number, 3: number, 4: number
 # lint: classfile
 compiler.warn.future.attr=バージョン{1}.{2}のクラス・ファイルで導入された{0}属性は、バージョン{3}.{4}のクラス・ファイルでは無視されます
 
+# 0: symbol, 1: file object
+# lint: classfile
+compiler.warn.inconsistent.inner.classes={1}の{0}のInnerClasses属性はソース・コードと一貫性がありません\n({1}は{0}で再コンパイルする必要がある場合があります)
+
 # lint: requires-automatic
 compiler.warn.requires.automatic=自動モジュールにはディレクティブが必要です
 
@@ -1706,17 +1720,21 @@ compiler.warn.try.resource.not.referenced=自動クローズ可能なリソー
 # lint: try
 compiler.warn.try.resource.throws.interrupted.exc=自動クローズ可能なリソース{0}に、InterruptedExceptionをスローする可能性があるメンバー・メソッドclose()があります
 
+# 0: type
+# lint: try
+compiler.warn.try.resource.can.throw.interrupted.exc=close()メソッドは、自動クローズ可能なクラス{0}でInterruptedExceptionをスローできます
+
 # lint: unchecked
 compiler.warn.unchecked.assign={0}から{1}への無検査代入です
 
 # 0: symbol, 1: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.unchecked.assign.to.var=raw型{1}のメンバーとして変数{0}への無検査代入です
 
 # 0: symbol, 1: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.unchecked.call.mbr.of.raw.type=raw型{1}のメンバーとしての{0}への無検査呼出しです
 
 # lint: unchecked
@@ -1724,17 +1742,17 @@ compiler.warn.unchecked.cast.to.type=型{0}への無検査キャストです
 
 # 0: kind name, 1: name, 2: object, 3: object, 4: kind name, 5: symbol
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.unchecked.meth.invocation.applied=無検査メソッド呼出し: {4} {5}の{0} {1}は指定された型に適用されます\n期待値: {2}\n検出値:    {3}
 
 # 0: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.unchecked.generic.array.creation=型{0}の可変引数パラメータに対する総称型配列の無検査作成です
 
 # 0: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.unchecked.varargs.non.reifiable.type=パラメータ化された可変引数型{0}からのヒープ汚染の可能性があります
 
 # 0: symbol
@@ -1772,6 +1790,10 @@ compiler.err.no.zipfs.for.archive=このファイルの処理に使用できる
 # lint: divzero
 compiler.warn.div.zero=ゼロで除算
 
+# 0: type, 1: long, 2: number
+# lint: lossy-conversions
+compiler.warn.bit.shift.out.of.range={0}を{1}ビットでシフトすることは、{2}ビットでシフトすることと同等です
+
 # lint: empty
 compiler.warn.empty.if=if以降が空の文です
 
@@ -2023,7 +2045,7 @@ compiler.misc.prob.found.req=不適合な型: {0}
 
 # 0: message segment, 1: type, 2: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.prob.found.req={0}\n期待値: {2}\n検出値:    {1}
 
 # 0: type, 1: type
@@ -2297,12 +2319,12 @@ compiler.err.override.incompatible.ret={0}\n戻り値の型{1}は{2}と互換性
 
 # 0: message segment, 1: type, 2: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.override.unchecked.ret={0}\n戻り値の型は{1}から{2}への無検査変換が必要です
 
 # 0: message segment, 1: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.override.unchecked.thrown={0}\nオーバーライドされたメソッドは{1}をスローしません
 
 # 0: symbol
@@ -2377,16 +2399,17 @@ compiler.err.preview.feature.disabled.classfile={0}のクラス・ファイル
 
 # 0: message segment (feature)
 # lint: preview
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.preview.feature.use={0}はプレビュー機能であり、今後のリリースで削除される可能性があります。
 
 # 0: message segment (feature)
 # lint: preview
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.preview.feature.use.plural={0}はプレビュー機能であり、今後のリリースで削除される可能性があります。
 
 # 0: file object (classfile), 1: string (expected version)
 # lint: preview
+# flags: mandatory
 compiler.warn.preview.feature.use.classfile={0}のクラス・ファイルはJava SE {1}のプレビュー機能を使用します。
 
 compiler.misc.feature.modules=モジュール
@@ -2783,6 +2806,7 @@ compiler.err.bad.name.for.option={0}オプションの値に含まれる名前
 
 # 0: option name, 1: symbol
 # lint: options
+# flags: default-enabled
 compiler.warn.module.for.option.not.found={0}オプション内にモジュール名が見つかりません: {1}
 
 compiler.err.addmods.all.module.path.invalid=--add-modules ALL-MODULE-PATHは、名前のないモジュールのコンパイル時または自動モジュールのコンテキストでのコンパイル時のみ使用できます
@@ -2794,6 +2818,7 @@ compiler.err.add.exports.with.release=システム・モジュール{0}からの
 compiler.err.add.reads.with.release=システム・モジュール{0}の読取りエッジの追加は--releaseを指定して実行できません
 
 # lint: options
+# flags: default-enabled
 compiler.warn.addopens.ignored=--add-opensは、コンパイル時には無効です
 
 compiler.misc.locn.module_source_path=モジュール・ソース・パス
@@ -3060,7 +3085,7 @@ compiler.err.incorrect.number.of.nested.patterns=ネスト・パターンの数
 
 # 0: kind name, 1: symbol
 # lint: preview
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.declared.using.preview={0} {1}はプレビュー機能を使用して宣言されており、今後のリリースで削除される可能性があります。
 
 # lint: identity
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
index 268ce26bd49..861f371632d 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
@@ -292,10 +292,10 @@ compiler.err.annotation.decl.not.allowed.here=此处不允许批注接口声明
 compiler.err.cant.inherit.from.final=无法从最终{0}进行继承
 
 # 0: symbol or name
-compiler.err.cant.ref.before.ctor.called=无法在调用超类型构造器之前引用{0}
+compiler.err.cant.ref.before.ctor.called=对 {0} 的引用只能在显式调用构造器后显示
 
 # 0: symbol or name
-compiler.err.cant.assign.initialized.before.ctor.called=无法在调用超类型构造器之前分配初始化字段 ''{0}''
+compiler.err.cant.assign.initialized.before.ctor.called=对初始化字段 ''{0}'' 的分配只能在显式调用构造器后显示
 
 compiler.err.cant.select.static.class.from.param.type=无法从参数化的类型中选择静态类
 
@@ -649,11 +649,14 @@ compiler.err.limit.string.overflow=对于常量池来说, 字符串 "{0}..." 的
 
 compiler.err.malformed.fp.lit=浮点文字的格式错误
 
-compiler.err.method.does.not.override.superclass=方法不会覆盖或实现超类型的方法
+# 0: symbol, 1: symbol
+compiler.err.method.does.not.override.superclass={1} 中的 {0} 不会覆盖或实现超类型中的方法
 
-compiler.err.static.methods.cannot.be.annotated.with.override=不能使用 @Override 对静态方法进行批注
+# 0: symbol, 1: symbol
+compiler.err.static.methods.cannot.be.annotated.with.override=不能使用 @Override 对 {1} 中的静态方法 {0} 进行批注
 
-compiler.err.missing.meth.body.or.decl.abstract=缺少方法主体, 或声明抽象
+# 0: symbol, 1: symbol
+compiler.err.missing.meth.body.or.decl.abstract={1} 中的方法 {0} 缺少方法主体，或者应声明为抽象方法
 
 compiler.err.missing.ret.stmt=缺少返回语句
 
@@ -1139,6 +1142,7 @@ compiler.err.multi-module.outdir.cannot.be.exploded.module=在多模块模式下
 
 # 0: path
 # lint: path
+# flags: default-enabled
 compiler.warn.outdir.is.in.exploded.module=输出目录位于展开的模块中: {0}
 
 # 0: file object
@@ -1198,6 +1202,7 @@ compiler.warn.output.file.clash=多次写入输出文件：{0}
 ## The following string will appear before all messages keyed as:
 ## "compiler.note".
 
+# flags: mandatory
 compiler.note.compressed.diags=某些消息已经过简化; 请使用 -Xdiags:verbose 重新编译以获得完整输出
 
 # 0: boolean, 1: symbol
@@ -1378,17 +1383,17 @@ compiler.warn.incubating.modules=使用 incubating 模块: {0}
 
 # 0: symbol, 1: symbol
 # lint: deprecation
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.has.been.deprecated={1}中的{0}已过时
 
 # 0: symbol, 1: symbol
 # lint: removal
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.has.been.deprecated.for.removal={1} 中的 {0} 已过时, 且标记为待删除
 
 # 0: symbol
 # lint: preview
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.is.preview={0} 是预览 API，可能会在未来发行版中删除。
 
 # 0: symbol
@@ -1396,7 +1401,7 @@ compiler.err.is.preview={0} 是预览 API，默认情况下处于禁用状态。
 
 # 0: symbol
 # lint: preview
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.is.preview.reflective={0} 是反射预览 API，可能会在未来发行版中删除。
 
 # 0: symbol, 1: symbol
@@ -1405,12 +1410,12 @@ compiler.warn.restricted.method={0}.{1} 是受限制的方法。\n（受限制
 
 # 0: symbol
 # lint: deprecation
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.has.been.deprecated.module=模块 {0} 已过时
 
 # 0: symbol
 # lint: removal
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.has.been.deprecated.for.removal.module=模块 {0} 已过时, 且标记为待删除
 
 # 0: symbol
@@ -1583,10 +1588,12 @@ compiler.warn.static.not.qualified.by.type2=static {0} 不应用作匿名类的
 
 # 0: string, 1: fragment
 # lint: options
+# flags: default-enabled
 compiler.warn.source.no.bootclasspath=未与 -source {0} 一起设置引导类路径\n{1}
 
 # 0: string, 1: fragment
 # lint: options
+# flags: default-enabled
 compiler.warn.source.no.system.modules.path=未与 -source {0} 一起设置系统模块的位置\n{1}
 
 # 0: string
@@ -1603,10 +1610,12 @@ compiler.misc.source.no.system.modules.path.with.target=不设置系统模块的
 
 # 0: string
 # lint: options
+# flags: default-enabled
 compiler.warn.option.obsolete.source=源值 {0} 已过时，将在未来发行版中删除
 
 # 0: target
 # lint: options
+# flags: default-enabled
 compiler.warn.option.obsolete.target=目标值 {0} 已过时，将在未来发行版中删除
 
 # 0: string, 1: string
@@ -1616,12 +1625,17 @@ compiler.err.option.removed.source=不再支持源选项 {0}。请使用 {1} 或
 compiler.err.option.removed.target=不再支持目标选项 {0}。请使用 {1} 或更高版本。
 
 # lint: options
+# flags: default-enabled
 compiler.warn.option.obsolete.suppression=要隐藏有关已过时选项的警告, 请使用 -Xlint:-options。
 
 # 0: name, 1: number, 2: number, 3: number, 4: number
 # lint: classfile
 compiler.warn.future.attr={1}.{2} 版类文件中引入的 {0} 属性在 {3}.{4} 版类文件中被忽略
 
+# 0: symbol, 1: file object
+# lint: classfile
+compiler.warn.inconsistent.inner.classes={1} 中 {0} 的 InnerClasses 属性与源代码不一致\n（可能需要使用 {0} 重新编译 {1}）
+
 # lint: requires-automatic
 compiler.warn.requires.automatic=需要自动模块的指令
 
@@ -1706,17 +1720,21 @@ compiler.warn.try.resource.not.referenced=不能在相应的 try 语句的正文
 # lint: try
 compiler.warn.try.resource.throws.interrupted.exc=可自动关闭的资源{0}包含的成员方法 close() 可能抛出 InterruptedException
 
+# 0: type
+# lint: try
+compiler.warn.try.resource.can.throw.interrupted.exc=在可自动关闭的类 {0} 中，close() 方法可能抛出 InterruptedException
+
 # lint: unchecked
 compiler.warn.unchecked.assign=未经检查的分配: 将{0}分配给{1}
 
 # 0: symbol, 1: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.unchecked.assign.to.var=对作为原始类型{1}的成员的变量{0}的分配未经过检查
 
 # 0: symbol, 1: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.unchecked.call.mbr.of.raw.type=对作为原始类型{1}的成员的{0}的调用未经过检查
 
 # lint: unchecked
@@ -1724,17 +1742,17 @@ compiler.warn.unchecked.cast.to.type=向类型{0}的转换未经过检查
 
 # 0: kind name, 1: name, 2: object, 3: object, 4: kind name, 5: symbol
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.unchecked.meth.invocation.applied=方法调用未经过检查: 将{4} {5}中的{0} {1}应用到给定的类型\n需要: {2}\n找到:    {3}
 
 # 0: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.unchecked.generic.array.creation=对于类型为{0}的 varargs 参数, 泛型数组创建未经过检查
 
 # 0: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.unchecked.varargs.non.reifiable.type=参数化 vararg 类型{0}的堆可能已受污染
 
 # 0: symbol
@@ -1772,6 +1790,10 @@ compiler.err.no.zipfs.for.archive=没有任何文件系统提供方可处理此
 # lint: divzero
 compiler.warn.div.zero=除数为零
 
+# 0: type, 1: long, 2: number
+# lint: lossy-conversions
+compiler.warn.bit.shift.out.of.range=按 {1} 位移动 {0} 相当于按 {2} 位移动
+
 # lint: empty
 compiler.warn.empty.if=if 之后没有语句
 
@@ -2023,7 +2045,7 @@ compiler.misc.prob.found.req=不兼容的类型: {0}
 
 # 0: message segment, 1: type, 2: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.prob.found.req={0}\n需要: {2}\n找到:    {1}
 
 # 0: type, 1: type
@@ -2297,12 +2319,12 @@ compiler.err.override.incompatible.ret={0}\n返回类型{1}与{2}不兼容
 
 # 0: message segment, 1: type, 2: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.override.unchecked.ret={0}\n返回类型需要从{1}到{2}的未经检查的转换
 
 # 0: message segment, 1: type
 # lint: unchecked
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.override.unchecked.thrown={0}\n被覆盖的方法未抛出{1}
 
 # 0: symbol
@@ -2377,16 +2399,17 @@ compiler.err.preview.feature.disabled.classfile={0} 的类文件使用 Java SE {
 
 # 0: message segment (feature)
 # lint: preview
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.preview.feature.use={0} 是预览功能，可能会在未来发行版中删除。
 
 # 0: message segment (feature)
 # lint: preview
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.preview.feature.use.plural={0} 是预览功能，可能会在未来发行版中删除。
 
 # 0: file object (classfile), 1: string (expected version)
 # lint: preview
+# flags: mandatory
 compiler.warn.preview.feature.use.classfile={0} 的类文件使用 Java SE {1} 的预览功能。
 
 compiler.misc.feature.modules=模块
@@ -2783,6 +2806,7 @@ compiler.err.bad.name.for.option={0} 选项的值中有错误的名称: ''{1}''
 
 # 0: option name, 1: symbol
 # lint: options
+# flags: default-enabled
 compiler.warn.module.for.option.not.found=找不到 {0} 选项中的模块名称: {1}
 
 compiler.err.addmods.all.module.path.invalid=--add-modules ALL-MODULE-PATH 只能在编译未命名模块或在自动模块的上下文中编译时使用
@@ -2794,6 +2818,7 @@ compiler.err.add.exports.with.release=不允许在使用 --release 时从系统
 compiler.err.add.reads.with.release=不允许在使用 --release 时为系统模块 {0} 添加读取维边:
 
 # lint: options
+# flags: default-enabled
 compiler.warn.addopens.ignored=--add-opens 在编译时没有任何效果
 
 compiler.misc.locn.module_source_path=模块源路径
@@ -3060,7 +3085,7 @@ compiler.err.incorrect.number.of.nested.patterns=嵌套模式数不正确\n需
 
 # 0: kind name, 1: symbol
 # lint: preview
-# flags: aggregate
+# flags: aggregate, mandatory, default-enabled
 compiler.warn.declared.using.preview={0} {1} 是使用预览功能声明的，可能会在未来发行版中删除。
 
 # lint: identity
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties
index 1a00fad1dd0..b36ad3d00ac 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties
@@ -60,6 +60,8 @@ javac.opt.target=Generiert Klassendateien, die sich für das angegebene Java SE-
 javac.opt.release=Kompiliert für das angegebene Java SE-Release.\nUnterstützte Releases: \n    {0}
 javac.opt.source=Liefert Quellkompatibilität mit dem angegebenen Release von Java SE.\nUnterstützte Releases: \n    {0}
 javac.opt.Werror=Kompilierung beenden, wenn Warnungen auftreten
+javac.opt.arg.Werror=<Schlüssel>(,<Schlüssel>)*
+javac.opt.Werror.custom=Geben Sie Lint-Kategorien, für die die Kompilierung durch Warnungen beendet werden soll,\ndurch Komma getrennt an. \nStellen Sie einem Schlüssel "-" voran, um die angegebene Kategorie auszuschließen. Verwenden Sie --help-lint, um die unterstützten Schlüssel anzuzeigen.
 javac.opt.A=Optionen zur Übergabe an die Annotationsprozessoren
 javac.opt.implicit=Gibt an, ob Klassendateien für implizit referenzierte Dateien generiert werden
 javac.opt.pkginfo=Gibt an, wie package-info-Dateien behandelt werden sollen
@@ -97,12 +99,12 @@ javac.opt.arg.pathname=<Pfadname>
 javac.opt.arg.file=<Dateiname>
 javac.opt.Xbootclasspath.p=Dem Bootstrap Classpath voranstellen
 javac.opt.Xbootclasspath.a=An Bootstrap Classpath anhängen
-javac.opt.Xlint=Empfohlene Warnungskategorien aktivieren
-javac.opt.Xlint.all=Alle Warnungskategorien aktivieren
-javac.opt.Xlint.none=Alle Warnungskategorien deaktivieren
+javac.opt.Xlint=Aktivieren Sie empfohlene Lint-Warnungskategorien. In diesem Release werden alle\nverfügbaren Lint-Warnungskategorien empfohlen.
+javac.opt.Xlint.all=Alle Lint-Warnungskategorien aktivieren
+javac.opt.Xlint.none=Alle Lint-Warnungskategorien deaktivieren
 #L10N: do not localize: -Xlint
 javac.opt.arg.Xlint=<Schlüssel>(,<Schlüssel>)*
-javac.opt.Xlint.custom=Durch Komma getrennte Warnungskategorien, die aktiviert oder deaktiviert werden sollen.\nStellen Sie einem Schlüssel "-" voran, um die angegebene Warnung zu deaktivieren.\nVerwenden Sie "--help-lint", um die unterstützten Schlüssel anzuzeigen.
+javac.opt.Xlint.custom=Lint-Warnungskategorien, die aktiviert oder deaktiviert werden sollen, durch Komma getrennt. \nStellen Sie einem Schlüssel "-" voran, um die angegebene Kategorie zu deaktivieren. Verwenden Sie\n''--help-lint'', um unterstützte Schlüssel und die standardmäßig aktivierten\nKategorien anzuzeigen.
 javac.opt.Xlint.desc.auxiliaryclass=Warnt vor Auxiliary-Klassen, die in einer Quelldatei verborgen sind und aus anderen Dateien heraus verwendet werden.
 
 javac.opt.Xlint.desc.cast=Warnt vor unnötigen Umwandlungen mit Cast.
@@ -129,7 +131,7 @@ javac.opt.Xlint.desc.finally=Warnt vor Finally-Klauseln, die nicht normal beende
 
 javac.opt.Xlint.desc.incubating=Warnt vor der Verwendung von Inkubatormodulen.
 
-javac.opt.Xlint.desc.lossy-conversions=Warnung über möglichen Verlust von Konvertierungen in zusammengesetzten Zuweisungen.
+javac.opt.Xlint.desc.lossy-conversions=Warnung über möglichen Verlust von Konvertierungen in zusammengesetzten Zuweisungen und Bitverschiebungsvorgängen.
 
 javac.opt.Xlint.desc.module=Warnt vor Problemen im Zusammenhang mit dem Modulsystem.
 
@@ -175,11 +177,10 @@ javac.opt.Xlint.desc.preview=Warnt vor Verwendung von Vorschausprachfeatures.
 
 javac.opt.Xlint.desc.restricted=Warnt vor der Verwendung eingeschränkter Methoden.
 
-# L10N: do not localize: identity synchronization
-javac.opt.Xlint.desc.synchronization=Warnt vor Synchronisierungsversuchen mit Instanzen wertbasierter Klassen.\n                         Dieser Schlüssel ist ein veralteter Alias für die Kategorie "identity", die dieselben Verwendungen und\n                         Effekte hat. Benutzern wird empfohlen, die Kategorie "identity" für alle zukünftigen\n                         und vorhandenen Verwendungen von "synchronization" zu verwenden.
-
 javac.opt.Xlint.desc.identity=Warnt vor Verwendungen wertbasierter Klassen, wenn eine Identitätsklasse erwartet wird.
 
+javac.opt.Xlint.alias.of=Veralteter Alias für "{0}" mit identischem Effekt. Benutzern wird empfohlen,\n                        "{0}" anstatt "{1}" für alle aktuellen und zukünftigen Verwendungen zu nutzen.
+
 javac.opt.Xdoclint=Empfohlene Prüfungen für Probleme in javadoc-Kommentaren aktivieren
 # L10N: do not localize: all none
 javac.opt.Xdoclint.subopts = (all|none|[-]<Gruppe>)[/<Zugriff>]
@@ -195,14 +196,17 @@ javac.opt.Xdoclint.package.desc=Aktiviert oder deaktiviert Prüfungen in bestimm
 javac.opt.Xstdout=Leitet die Standardausgabe um
 javac.opt.X=Gibt Hilfe zu zusätzlichen Optionen aus
 javac.opt.help=Gibt diese Hilfemeldung aus
-javac.opt.help.lint=Gibt die unterstützten Schlüssel für -Xlint aus
+javac.opt.help.lint=Gibt die unterstützten Schlüssel für -Xlint und -Werror aus
 javac.opt.help.lint.header=Die unterstützten Schlüssel für -Xlint sind:
+javac.opt.help.lint.enabled.by.default=Die folgenden Lint-Warnungskategorien sind standardmäßig aktiviert:
+javac.opt.help.lint.footer=Kategorien und die zugehörigen Aliasnamen können austauschbar verwendet werden. Beispiel: Das Kennzeichen\n"-Xlint:{0},{1}" wäre redundant.
 javac.opt.print=Gibt eine Textdarstellung der angegebenen Typen aus
 javac.opt.printRounds=Gibt Informationen zu Durchläufen der Annotationsverarbeitung aus
 javac.opt.printProcessorInfo=Gibt Informationen dazu aus, welche Annotationen ein Prozessor\nverarbeiten soll
 javac.opt.userpathsfirst=Durchsucht classpath und sourcepath vor anstatt nach bootclasspath nach Klassen
 javac.opt.prefer=Gibt an, welche Datei gelesen werden soll, wenn sowohl eine Quell- als auch eine Klassendatei für eine implizit kompilierte Klasse gefunden werden
-javac.opt.preview=Aktiviert Vorschausprachfeatures.\nWird in Verbindung mit -source oder --release verwendet.
+# L10N: do not localize: ''preview''
+javac.opt.preview=Aktiviert Vorschausprachfeatures. \nDeaktiviert auch die Lint-Kategorie ''preview''. \nWird in Verbindung mit -source oder --release verwendet.
 javac.opt.AT=Liest Optionen und Dateinamen aus Datei
 javac.opt.diags=Wählt einen Diagnosemodus aus
 javac.opt.addExports=Gibt an, dass ein Package als aus seinem definierenden Modul in\nweitere Module oder, wenn <Anderes Modul> ALL-UNNAMED lautet, in alle unbenannten Module\nexportiert betrachtet werden soll.
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
index 3b967d368ae..0ea1796a8e6 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
@@ -59,7 +59,9 @@ javac.opt.profile=使用されているAPIが、指定したプロファイル
 javac.opt.target=指定されたJava SEリリースに適したクラス・ファイルを生成します。サポートされているリリース: \n    {0}
 javac.opt.release=指定されたJava SEリリースに対してコンパイルします。サポートされているリリース: \n    {0}
 javac.opt.source=指定されたJava SEリリースとソースの互換性を保持します。サポートされているリリース: \n    {0}
-javac.opt.Werror=警告が発生した場合にコンパイルを終了する
+javac.opt.Werror=警告が発生した場合にコンパイルを終了します
+javac.opt.arg.Werror=<key>(,<key>)*
+javac.opt.Werror.custom=コンパイルを終了する警告のlintカテゴリを\nコンマで区切って指定します。\n指定したカテゴリを除外するには、キーの前に''-''を指定します。\nサポートされているキーを表示するには--help-lintを使用します。
 javac.opt.A=注釈プロセッサに渡されるオプション
 javac.opt.implicit=暗黙的に参照されるファイルについてクラス・ファイルを生成するかどうかを指定する
 javac.opt.pkginfo=package-infoファイルの処理を指定する
@@ -97,12 +99,12 @@ javac.opt.arg.pathname=<pathname>
 javac.opt.arg.file=<filename>
 javac.opt.Xbootclasspath.p=ブートストラップ・クラス・パスの先頭に付加する
 javac.opt.Xbootclasspath.a=ブートストラップ・クラス・パスに追加する
-javac.opt.Xlint=推奨の警告カテゴリを有効にします
-javac.opt.Xlint.all=すべての警告カテゴリを有効にします
-javac.opt.Xlint.none=すべての警告カテゴリを無効にします
+javac.opt.Xlint=推奨lint警告カテゴリを有効にします。このリリースでは、\n使用可能なすべてのlint警告カテゴリが推奨されます。
+javac.opt.Xlint.all=すべてのlint警告カテゴリを有効にします
+javac.opt.Xlint.none=すべてのlint警告カテゴリを無効にします
 #L10N: do not localize: -Xlint
 javac.opt.arg.Xlint=<key>(,<key>)*
-javac.opt.Xlint.custom=有効または無効にする警告カテゴリ(カンマ区切り)。\n指定した警告を無効にするには、キーの前に''-''を指定します。\nサポートされているキーを表示するには--help-lintを使用します。
+javac.opt.Xlint.custom=有効または無効にするLint警告カテゴリ(カンマ区切り)。\n指定されたカテゴリを無効にするには、キーの前に''-''を指定します。サポートされているキーと\nデフォルトで有効になっているカテゴリを表示するには、\n''--help-lint''を使用します。
 javac.opt.Xlint.desc.auxiliaryclass=ソース・ファイルで非表示になっているが他のファイルから使用されている補助クラスについて警告します。
 
 javac.opt.Xlint.desc.cast=不要なキャストの使用について警告します。
@@ -129,7 +131,7 @@ javac.opt.Xlint.desc.finally=正常に完了しないfinally節について警
 
 javac.opt.Xlint.desc.incubating=実験的なモジュールの使用について警告します。
 
-javac.opt.Xlint.desc.lossy-conversions=複合代入における精度が失われる可能性がある変換についての警告。
+javac.opt.Xlint.desc.lossy-conversions=複合代入およびビット・シフト操作における精度が失われている可能性がある変換についての警告。
 
 javac.opt.Xlint.desc.module=モジュール・システム関連の問題について警告します。
 
@@ -175,11 +177,10 @@ javac.opt.Xlint.desc.preview=プレビュー言語機能の使用について警
 
 javac.opt.Xlint.desc.restricted=制限されたメソッドの使用について警告します。
 
-# L10N: do not localize: identity synchronization
-javac.opt.Xlint.desc.synchronization=値ベース・クラスのインスタンスでの同期の試行について警告します。\n                         このキーは、''identity''の非推奨のエイリアスであり、同じ使用方法と効果を\n                         持ちます。ユーザーには、今後および既存の''synchronization''の使用に対して''identity''カテゴリを\n                         使用することをお薦めします。
-
 javac.opt.Xlint.desc.identity=アイデンティティ・クラスが必要な場所での値ベース・クラスの使用について警告します。
 
+javac.opt.Xlint.alias.of=同じ効果を持つ''{0}''の非推奨の別名。ユーザーは現在および将来のすべての使用で\n                         ''{1}''のかわりに''{0}''の使用が推奨されます。
+
 javac.opt.Xdoclint=javadocコメントの問題に関する推奨チェックを有効にします
 # L10N: do not localize: all none
 javac.opt.Xdoclint.subopts = (all|none|[-]<group>)[/<access>]
@@ -195,14 +196,17 @@ javac.opt.Xdoclint.package.desc=特定のパッケージのチェックを有効
 javac.opt.Xstdout=標準出力をリダイレクトする
 javac.opt.X=追加オプションのヘルプを出力します
 javac.opt.help=このヘルプ・メッセージを出力します
-javac.opt.help.lint=-Xlintにサポートされているキーを出力します
+javac.opt.help.lint=-Xlintおよび-Werrorにサポートされているキーを出力します
 javac.opt.help.lint.header=-Xlintにサポートされているキーは次のとおりです:
+javac.opt.help.lint.enabled.by.default=次のlint警告カテゴリはデフォルトで有効になっています:
+javac.opt.help.lint.footer=カテゴリとその別名は同じ意味で使用できます。たとえば、フラグ\n''-Xlint:{0},{1}''は冗長です。
 javac.opt.print=指定した型のテキスト表示を出力する
 javac.opt.printRounds=注釈処理の往復についての情報を印刷する
 javac.opt.printProcessorInfo=プロセッサが処理を依頼される注釈についての情報を印刷する
 javac.opt.userpathsfirst=ブート・クラスパスの後ではなく、ブート・クラスパスの前にクラスのクラスパスおよびソース・パスを検索する
 javac.opt.prefer=暗黙的にコンパイルされるクラスについて、ソース・ファイルとクラス・ファイルの両方が見つかった際どちらを読み込むか指定する
-javac.opt.preview=プレビュー言語機能を有効にします。-sourceまたは--releaseとともに使用されます。
+# L10N: do not localize: ''preview''
+javac.opt.preview=プレビュー言語機能を有効にします。\nまた、''preview'' lintカテゴリも無効にします。\n-sourceまたは--releaseとともに使用されます。
 javac.opt.AT=ファイルからの読取りオプションおよびファイル名
 javac.opt.diags=診断モードの選択
 javac.opt.addExports=<other-module>がALL-UNNAMEDである場合、その定義モジュールから、追加モジュールまたは\n        すべての名前のないモジュールにエクスポート済とみなされるようにパッケージを指定します。
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
index a24b5511c9c..0cbfac7e778 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
@@ -59,7 +59,9 @@ javac.opt.profile=检查使用的 API 在指定的配置文件中是否可用。
 javac.opt.target=生成适合指定的 Java SE 发行版的类文件。支持的发行版：{0}
 javac.opt.release=为指定的 Java SE 发行版编译。支持的发行版：{0}
 javac.opt.source=提供与指定的 Java SE 发行版的源兼容性。支持的发行版：{0}
-javac.opt.Werror=出现警告时终止编译
+javac.opt.Werror=出现任何警告时终止编译
+javac.opt.arg.Werror=<key>(,<key>)*
+javac.opt.Werror.custom=指定出现警告时应终止编译的 lint 类别，\n以逗号分隔。\n在关键字前面加上 ''-'' 可排除指定的类别。\n使用 --help-lint 可查看支持的关键字。
 javac.opt.A=传递给批注处理程序的选项
 javac.opt.implicit=指定是否为隐式引用文件生成类文件
 javac.opt.pkginfo=指定 package-info 文件的处理
@@ -97,12 +99,12 @@ javac.opt.arg.pathname=<pathname>
 javac.opt.arg.file=<filename>
 javac.opt.Xbootclasspath.p=置于引导类路径之前
 javac.opt.Xbootclasspath.a=置于引导类路径之后
-javac.opt.Xlint=启用建议的警告类别
-javac.opt.Xlint.all=启用所有警告类别
-javac.opt.Xlint.none=禁用所有警告类别
+javac.opt.Xlint=启用建议的 lint 警告类别。在此发行版中，\n建议使用所有可用的 lint 警告类别。
+javac.opt.Xlint.all=启用所有 lint 警告类别
+javac.opt.Xlint.none=禁用所有 lint 警告类别
 #L10N: do not localize: -Xlint
 javac.opt.arg.Xlint=<key>(,<key>)*
-javac.opt.Xlint.custom=要启用或禁用的警告类别（以逗号分隔）。\n在关键字前面加上 ''-'' 可禁用指定的警告。\n使用 --help-lint 可查看受支持的关键字。
+javac.opt.Xlint.custom=要启用或禁用的 lint 警告类别（以逗号分隔）。\n在关键字前面加上 ''-'' 可禁用指定的类别。\n使用 ''--help-lint'' 可显示支持的关键字和\n默认情况下启用的类别。
 javac.opt.Xlint.desc.auxiliaryclass=有关辅助类在源文件中隐藏, 但在其他文件中使用的警告。
 
 javac.opt.Xlint.desc.cast=有关使用了不必要转换的警告。
@@ -129,7 +131,7 @@ javac.opt.Xlint.desc.finally=有关 finally 子句未正常终止的警告。
 
 javac.opt.Xlint.desc.incubating=有关使用 incubating 模块的警告。
 
-javac.opt.Xlint.desc.lossy-conversions=有关复合赋值中的转换可能会有损失的警告。
+javac.opt.Xlint.desc.lossy-conversions=有关复合赋值和移位操作中的转换可能会有损失的警告。
 
 javac.opt.Xlint.desc.module=有关模块系统相关问题的警告。
 
@@ -175,11 +177,10 @@ javac.opt.Xlint.desc.preview=有关使用预览语言功能的警告。
 
 javac.opt.Xlint.desc.restricted=有关使用受限制方法的警告。
 
-# L10N: do not localize: identity synchronization
-javac.opt.Xlint.desc.synchronization=有关尝试在基于值的类的实例上同步的警告。\n                         此密钥是 ''identity'' 的已过时别名，具有相同的用法和\n                         效果。建议用户在 ''synchronization'' 的所有未来和现有\n                         用法中使用 ''identity'' 类别。
-
 javac.opt.Xlint.desc.identity=有关在需要身份类的情况下使用基于值的类的警告。
 
+javac.opt.Xlint.alias.of=具有相同效果的 ''{0}'' 的别名已过时。建议用户当前和将来\n                         都使用 ''{0}'' 而不是 ''{1}''。
+
 javac.opt.Xdoclint=为 javadoc 注释中的问题启用建议的检查
 # L10N: do not localize: all none
 javac.opt.Xdoclint.subopts = (all|none|[-]<group>)[/<access>]
@@ -195,14 +196,17 @@ javac.opt.Xdoclint.package.desc=在特定的程序包中启用或禁用检查。
 javac.opt.Xstdout=重定向标准输出
 javac.opt.X=输出额外选项的帮助
 javac.opt.help=输出此帮助消息
-javac.opt.help.lint=输出 -Xlint 支持的关键字
+javac.opt.help.lint=输出 -Xlint 和 -Werror 支持的关键字
 javac.opt.help.lint.header=-Xlint 支持的关键字包括：
+javac.opt.help.lint.enabled.by.default=默认情况下会启用以下 lint 警告类别：
+javac.opt.help.lint.footer=类别及其别名可以互换使用；例如，标记\n''-Xlint:{0},{1}'' 将是冗余的。
 javac.opt.print=输出指定类型的文本表示
 javac.opt.printRounds=输出有关批注处理循环的信息
 javac.opt.printProcessorInfo=输出有关请求处理程序处理哪些批注的信息
 javac.opt.userpathsfirst=在引导类路径之前而不是之后搜索类的类路径和源路径
 javac.opt.prefer=指定读取文件, 当同时找到隐式编译类的源文件和类文件时
-javac.opt.preview=启用预览语言功能。要与 -source 或 --release 一起使用。
+# L10N: do not localize: ''preview''
+javac.opt.preview=启用预览语言功能。\n还禁用''preview''lint 类别。\n要与 -source 或 --release 一起使用。
 javac.opt.AT=从文件读取选项和文件名
 javac.opt.diags=选择诊断模式
 javac.opt.addExports=指定被视为已从其定义模块导出到其他模块或者导出到所有\n        未命名模块 (如果 <other-module> 为 ALL-UNNAMED) 的程序包。
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties
index 1edda5da22f..bb0f14ab833 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties
@@ -111,6 +111,9 @@ launcher.err.cant.access.main.method=kein Zugriff auf Methode "main" in Klasse:
 # 0: string
 launcher.err.cant.find.constructor=No-Argument-Konstruktor nicht gefunden in Klasse: {0}
 
+# 0: string
+launcher.err.cant.use.private.constructor=Kein nicht privater Null-Argument-Konstruktor in Klasse {0} gefunden\nEntfernen Sie die Eigenschaft "private" aus dem vorhandenen Konstruktor, oder definieren Sie ihn als:\n   public {0}()
+
 # 0: string
 launcher.err.cant.access.constructor=Kein Zugriff auf No-Argument-Konstruktor in Klasse: {0}
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_ja.properties
index be1feb4a8a9..ed940e731bd 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_ja.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_ja.properties
@@ -111,6 +111,9 @@ launcher.err.cant.access.main.method=クラスのメイン・メソッドにア
 # 0: string
 launcher.err.cant.find.constructor=クラスに引数なしのコンストラクタが見つかりません: {0}
 
+# 0: string
+launcher.err.cant.use.private.constructor=非privateのゼロ引数コンストラクタがクラス{0}に見つかりません\n既存のコンストラクタからprivateを削除するか、次のように定義してください:\n   public {0}()
+
 # 0: string
 launcher.err.cant.access.constructor=クラスの引数なしのコンストラクタにアクセスできません: {0}
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_zh_CN.properties
index 5367036d82f..1fafa95c146 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_zh_CN.properties
@@ -111,6 +111,9 @@ launcher.err.cant.access.main.method=无法访问类 {0} 中的 main 方法
 # 0: string
 launcher.err.cant.find.constructor=在类 {0} 中找不到无参数构造器
 
+# 0: string
+launcher.err.cant.use.private.constructor=在类 {0} 中未找到 non-private 零参数构造器\n请从现有构造器中删除 private，或者定义为：\n   public {0}()
+
 # 0: string
 launcher.err.cant.access.constructor=无法访问类 {0} 中的无参数构造器
 
diff --git a/src/jdk.compiler/share/data/symbols/java.base-Q.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-Q.sym.txt
index fb1ec6ec7bb..29ecd9f0304 100644
--- a/src/jdk.compiler/share/data/symbols/java.base-Q.sym.txt
+++ b/src/jdk.compiler/share/data/symbols/java.base-Q.sym.txt
@@ -83,6 +83,11 @@ method name close descriptor ()V thrownTypes java/io/IOException flags 1
 
 -class name java/lang/StableValue
 
+class name java/lang/String
+field name UNICODE_CASEFOLD_ORDER descriptor Ljava/util/Comparator; flags 19 signature Ljava/util/Comparator<Ljava/lang/String;>;
+method name equalsFoldCase descriptor (Ljava/lang/String;)Z flags 1
+method name compareToFoldCase descriptor (Ljava/lang/String;)I flags 1
+
 class name java/lang/Thread
 -method name stop descriptor ()V
 
@@ -464,6 +469,16 @@ innerclass innerClass java/lang/Thread$State outerClass java/lang/Thread innerCl
 innerclass innerClass java/util/concurrent/StructuredTaskScope$Subtask outerClass java/util/concurrent/StructuredTaskScope innerClassName Subtask flags 609
 innerclass innerClass java/util/concurrent/StructuredTaskScope$Subtask$State outerClass java/util/concurrent/StructuredTaskScope$Subtask innerClassName State flags 4019
 
+class name java/util/concurrent/ThreadLocalRandom
+method name nextGaussian descriptor ()D flags 1
+
+class name java/util/jar/JarFile
+header extends java/util/zip/ZipFile flags 21
+innerclass innerClass java/lang/Runtime$Version outerClass java/lang/Runtime innerClassName Version flags 19
+innerclass innerClass java/util/jar/Attributes$Name outerClass java/util/jar/Attributes innerClassName Name flags 9
+innerclass innerClass java/lang/ScopedValue$Carrier outerClass java/lang/ScopedValue innerClassName Carrier flags 19
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
 class name java/util/stream/Collectors
 header extends java/lang/Object flags 31 runtimeAnnotations @Ljdk/internal/vm/annotation/AOTSafeClassInitializer;
 innerclass innerClass java/util/stream/Collector$Characteristics outerClass java/util/stream/Collector innerClassName Characteristics flags 4019
@@ -486,6 +501,35 @@ method name getKey descriptor (Ljava/security/Key;Ljava/security/Provider;)Ljava
 method name getKeyPair descriptor ([C)Ljava/security/KeyPair; thrownTypes java/security/NoSuchAlgorithmException,java/security/InvalidKeyException flags 1 classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;PEM_API;)
 method name getKeyPair descriptor (Ljava/security/Key;Ljava/security/Provider;)Ljava/security/KeyPair; thrownTypes java/security/NoSuchAlgorithmException,java/security/InvalidKeyException flags 1 classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;PEM_API;)
 
+class name javax/crypto/spec/HPKEParameterSpec
+header extends java/lang/Object implements java/security/spec/AlgorithmParameterSpec flags 31
+field name KEM_DHKEM_P_256_HKDF_SHA256 descriptor I constantValue 16 flags 19
+field name KEM_DHKEM_P_384_HKDF_SHA384 descriptor I constantValue 17 flags 19
+field name KEM_DHKEM_P_521_HKDF_SHA512 descriptor I constantValue 18 flags 19
+field name KEM_DHKEM_X25519_HKDF_SHA256 descriptor I constantValue 32 flags 19
+field name KEM_DHKEM_X448_HKDF_SHA512 descriptor I constantValue 33 flags 19
+field name KDF_HKDF_SHA256 descriptor I constantValue 1 flags 19
+field name KDF_HKDF_SHA384 descriptor I constantValue 2 flags 19
+field name KDF_HKDF_SHA512 descriptor I constantValue 3 flags 19
+field name AEAD_AES_128_GCM descriptor I constantValue 1 flags 19
+field name AEAD_AES_256_GCM descriptor I constantValue 2 flags 19
+field name AEAD_CHACHA20_POLY1305 descriptor I constantValue 3 flags 19
+field name EXPORT_ONLY descriptor I constantValue 65535 flags 19
+method name of descriptor (III)Ljavax/crypto/spec/HPKEParameterSpec; flags 9
+method name withInfo descriptor ([B)Ljavax/crypto/spec/HPKEParameterSpec; flags 1
+method name withPsk descriptor (Ljavax/crypto/SecretKey;[B)Ljavax/crypto/spec/HPKEParameterSpec; flags 1
+method name withEncapsulation descriptor ([B)Ljavax/crypto/spec/HPKEParameterSpec; flags 1
+method name withAuthKey descriptor (Ljava/security/AsymmetricKey;)Ljavax/crypto/spec/HPKEParameterSpec; flags 1
+method name kem_id descriptor ()I flags 1
+method name kdf_id descriptor ()I flags 1
+method name aead_id descriptor ()I flags 1
+method name info descriptor ()[B flags 1
+method name psk descriptor ()Ljavax/crypto/SecretKey; flags 1
+method name psk_id descriptor ()[B flags 1
+method name authKey descriptor ()Ljava/security/AsymmetricKey; flags 1
+method name encapsulation descriptor ()[B flags 1
+method name toString descriptor ()Ljava/lang/String; flags 1
+
 class name jdk/internal/classfile/impl/DirectCodeBuilder
 header extends jdk/internal/classfile/impl/AbstractDirectBuilder implements jdk/internal/classfile/impl/TerminalCodeBuilder flags 31 signature Ljdk/internal/classfile/impl/AbstractDirectBuilder<Ljava/lang/classfile/CodeModel;>;Ljdk/internal/classfile/impl/TerminalCodeBuilder;
 innerclass innerClass jdk/internal/classfile/impl/AbstractPseudoInstruction$ExceptionCatchImpl outerClass jdk/internal/classfile/impl/AbstractPseudoInstruction innerClassName ExceptionCatchImpl flags 19
diff --git a/src/jdk.compiler/share/data/symbols/java.sql-Q.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql-Q.sym.txt
new file mode 100644
index 00000000000..a8f41a27db0
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/java.sql-Q.sym.txt
@@ -0,0 +1,64 @@
+#
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name java/sql/Array
+header extends java/lang/Object implements java/lang/AutoCloseable flags 601
+method name close descriptor ()V thrownTypes java/sql/SQLException flags 1
+
+class name java/sql/Blob
+header extends java/lang/Object implements java/lang/AutoCloseable flags 601
+method name close descriptor ()V thrownTypes java/sql/SQLException flags 1
+
+class name java/sql/Clob
+header extends java/lang/Object implements java/lang/AutoCloseable flags 601
+method name close descriptor ()V thrownTypes java/sql/SQLException flags 1
+
+class name java/sql/Connection
+method name enquoteLiteral descriptor (Ljava/lang/String;)Ljava/lang/String; thrownTypes java/sql/SQLException flags 1
+method name enquoteIdentifier descriptor (Ljava/lang/String;Z)Ljava/lang/String; thrownTypes java/sql/SQLException flags 1
+method name isSimpleIdentifier descriptor (Ljava/lang/String;)Z thrownTypes java/sql/SQLException flags 1
+method name enquoteNCharLiteral descriptor (Ljava/lang/String;)Ljava/lang/String; thrownTypes java/sql/SQLException flags 1
+
+class name java/sql/JDBCType
+field name DECFLOAT descriptor Ljava/sql/JDBCType; flags 4019
+field name JSON descriptor Ljava/sql/JDBCType; flags 4019
+
+class name java/sql/SQLPermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="26")
+
+class name java/sql/SQLXML
+header extends java/lang/Object implements java/lang/AutoCloseable flags 601
+method name close descriptor ()V thrownTypes java/sql/SQLException flags 1
+
+class name java/sql/Statement
+header extends java/lang/Object implements java/sql/Wrapper,java/lang/AutoCloseable flags 601 classAnnotations @Ljdk/Profile+Annotation;(value=I2)
+
+class name java/sql/Types
+field name DECFLOAT descriptor I constantValue 2015 flags 19
+field name JSON descriptor I constantValue 2016 flags 19
+
diff --git a/src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-Q.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-Q.sym.txt
new file mode 100644
index 00000000000..2d774f83cf1
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-Q.sym.txt
@@ -0,0 +1,43 @@
+#
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name jdk/internal/foreign/AbstractMemorySegmentImpl
+header extends java/lang/Object implements java/lang/foreign/MemorySegment,java/lang/foreign/SegmentAllocator sealed true permittedSubclasses jdk/internal/foreign/HeapMemorySegmentImpl,jdk/internal/foreign/NativeMemorySegmentImpl flags 421
+innerclass innerClass java/lang/foreign/ValueLayout$OfByte outerClass java/lang/foreign/ValueLayout innerClassName OfByte flags 609
+innerclass innerClass java/lang/foreign/ValueLayout$OfBoolean outerClass java/lang/foreign/ValueLayout innerClassName OfBoolean flags 609
+innerclass innerClass java/lang/foreign/ValueLayout$OfChar outerClass java/lang/foreign/ValueLayout innerClassName OfChar flags 609
+innerclass innerClass java/lang/foreign/ValueLayout$OfShort outerClass java/lang/foreign/ValueLayout innerClassName OfShort flags 609
+innerclass innerClass java/lang/foreign/ValueLayout$OfInt outerClass java/lang/foreign/ValueLayout innerClassName OfInt flags 609
+innerclass innerClass java/lang/foreign/ValueLayout$OfFloat outerClass java/lang/foreign/ValueLayout innerClassName OfFloat flags 609
+innerclass innerClass java/lang/foreign/ValueLayout$OfLong outerClass java/lang/foreign/ValueLayout innerClassName OfLong flags 609
+innerclass innerClass java/lang/foreign/ValueLayout$OfDouble outerClass java/lang/foreign/ValueLayout innerClassName OfDouble flags 609
+innerclass innerClass java/lang/foreign/MemorySegment$Scope outerClass java/lang/foreign/MemorySegment innerClassName Scope flags 609
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+-method name apply descriptor (Ljava/lang/String;Ljava/util/List;)Ljava/lang/RuntimeException;
+-method name apply descriptor (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
diff --git a/src/jdk.compiler/share/data/symbols/jdk.jpackage-Q.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jpackage-Q.sym.txt
new file mode 100644
index 00000000000..27fd9e69203
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/jdk.jpackage-Q.sym.txt
@@ -0,0 +1,31 @@
+#
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+module name jdk.jpackage
+header requires name\u0020;java.base\u0020;flags\u0020;8000,name\u0020;jdk.internal.opt\u0020;flags\u0020;0,name\u0020;jdk.jlink\u0020;flags\u0020;0,name\u0020;java.naming\u0020;flags\u0020;0,name\u0020;java.desktop\u0020;flags\u0020;0 uses jdk/jpackage/internal/cli/CliBundlingEnvironment provides interface\u0020;java/util/spi/ToolProvider\u0020;impls\u0020;jdk/jpackage/internal/cli/Main$Provider,interface\u0020;jdk/jpackage/internal/cli/CliBundlingEnvironment\u0020;impls\u0020;jdk/jpackage/internal/MacBundlingEnvironment target macos-aarch64 moduleMainClass jdk/jpackage/main/Main flags 8000
+
diff --git a/src/jdk.compiler/share/data/symbols/jdk.management-Q.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management-Q.sym.txt
new file mode 100644
index 00000000000..6d553af80d5
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/jdk.management-Q.sym.txt
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name jdk/management/HotSpotAOTCacheMXBean
+header extends java/lang/Object implements java/lang/management/PlatformManagedObject flags 601
+method name endRecording descriptor ()Z flags 401
+
diff --git a/src/jdk.compiler/share/data/symbols/symbols b/src/jdk.compiler/share/data/symbols/symbols
index 4bc5127310f..f31e521513c 100644
--- a/src/jdk.compiler/share/data/symbols/symbols
+++ b/src/jdk.compiler/share/data/symbols/symbols
@@ -48,4 +48,4 @@ platform version M base L files java.base-M.sym.txt:java.compiler-M.sym.txt:java
 platform version N base M files java.base-N.sym.txt:java.compiler-N.sym.txt:java.desktop-N.sym.txt:java.management-N.sym.txt:java.management.rmi-N.sym.txt:jdk.compiler-N.sym.txt:jdk.httpserver-N.sym.txt:jdk.incubator.foreign-N.sym.txt:jdk.javadoc-N.sym.txt:jdk.jshell-N.sym.txt:jdk.localedata-N.sym.txt:jdk.unsupported-N.sym.txt
 platform version O base N files java.base-O.sym.txt:java.compiler-O.sym.txt:java.datatransfer-O.sym.txt:java.desktop-O.sym.txt:java.instrument-O.sym.txt:java.logging-O.sym.txt:java.management-O.sym.txt:java.management.rmi-O.sym.txt:java.naming-O.sym.txt:java.net.http-O.sym.txt:java.prefs-O.sym.txt:java.rmi-O.sym.txt:java.scripting-O.sym.txt:java.se-O.sym.txt:java.security.jgss-O.sym.txt:java.security.sasl-O.sym.txt:java.smartcardio-O.sym.txt:java.sql-O.sym.txt:java.sql.rowset-O.sym.txt:java.transaction.xa-O.sym.txt:java.xml-O.sym.txt:java.xml.crypto-O.sym.txt:jdk.accessibility-O.sym.txt:jdk.attach-O.sym.txt:jdk.charsets-O.sym.txt:jdk.compiler-O.sym.txt:jdk.crypto.cryptoki-O.sym.txt:jdk.dynalink-O.sym.txt:jdk.editpad-O.sym.txt:jdk.hotspot.agent-O.sym.txt:jdk.httpserver-O.sym.txt:jdk.incubator.foreign-O.sym.txt:jdk.incubator.vector-O.sym.txt:jdk.jartool-O.sym.txt:jdk.javadoc-O.sym.txt:jdk.jcmd-O.sym.txt:jdk.jconsole-O.sym.txt:jdk.jdeps-O.sym.txt:jdk.jdi-O.sym.txt:jdk.jdwp.agent-O.sym.txt:jdk.jfr-O.sym.txt:jdk.jlink-O.sym.txt:jdk.jpackage-O.sym.txt:jdk.jshell-O.sym.txt:jdk.jsobject-O.sym.txt:jdk.jstatd-O.sym.txt:jdk.localedata-O.sym.txt:jdk.management-O.sym.txt:jdk.management.agent-O.sym.txt:jdk.management.jfr-O.sym.txt:jdk.naming.dns-O.sym.txt:jdk.naming.rmi-O.sym.txt:jdk.net-O.sym.txt:jdk.nio.mapmode-O.sym.txt:jdk.sctp-O.sym.txt:jdk.security.auth-O.sym.txt:jdk.security.jgss-O.sym.txt:jdk.unsupported-O.sym.txt:jdk.xml.dom-O.sym.txt:jdk.zipfs-O.sym.txt
 platform version P base O files java.base-P.sym.txt:java.compiler-P.sym.txt:java.desktop-P.sym.txt:java.logging-P.sym.txt:java.management-P.sym.txt:java.net.http-P.sym.txt:java.security.jgss-P.sym.txt:java.xml.crypto-P.sym.txt:jdk.attach-P.sym.txt:jdk.compiler-P.sym.txt:jdk.incubator.foreign-P.sym.txt:jdk.incubator.vector-P.sym.txt:jdk.jdi-P.sym.txt:jdk.jfr-P.sym.txt:jdk.jpackage-P.sym.txt:jdk.jshell-P.sym.txt:jdk.net-P.sym.txt:jdk.security.jgss-P.sym.txt
-platform version Q base P files java.base-Q.sym.txt:java.compiler-Q.sym.txt:java.desktop-Q.sym.txt:java.management-Q.sym.txt:java.net.http-Q.sym.txt:jdk.httpserver-Q.sym.txt:jdk.incubator.vector-Q.sym.txt:jdk.jartool-Q.sym.txt:jdk.jdeps-Q.sym.txt:jdk.jfr-Q.sym.txt:jdk.jlink-Q.sym.txt:jdk.jshell-Q.sym.txt:jdk.jsobject-Q.sym.txt:jdk.localedata-Q.sym.txt
+platform version Q base P files java.base-Q.sym.txt:java.compiler-Q.sym.txt:java.desktop-Q.sym.txt:java.management-Q.sym.txt:java.net.http-Q.sym.txt:java.sql-Q.sym.txt:jdk.httpserver-Q.sym.txt:jdk.incubator.foreign-Q.sym.txt:jdk.incubator.vector-Q.sym.txt:jdk.jartool-Q.sym.txt:jdk.jdeps-Q.sym.txt:jdk.jfr-Q.sym.txt:jdk.jlink-Q.sym.txt:jdk.jpackage-Q.sym.txt:jdk.jshell-Q.sym.txt:jdk.jsobject-Q.sym.txt:jdk.localedata-Q.sym.txt:jdk.management-Q.sym.txt
diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp b/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp
index 4b8c5e55f63..caf948019af 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019, 2021, NTT DATA.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java
index 897ea5da85f..e1715b5e024 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java
index 4ffd0434e86..cb708f9b284 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Debugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Debugger.java
index 81e620ff1fb..a6ef3b72544 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Debugger.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/Debugger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java
index c119e374d66..01a71c8f44c 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -86,18 +86,22 @@ class BsdCDebugger implements CDebugger {
     String cpu = dbg.getCPU();
     if (cpu.equals("amd64") || cpu.equals("x86_64")) {
        AMD64ThreadContext context = (AMD64ThreadContext) thread.getContext();
+       Address rsp = context.getRegisterAsAddress(AMD64ThreadContext.RSP);
+       if (rsp == null) return null;
        Address rbp = context.getRegisterAsAddress(AMD64ThreadContext.RBP);
        if (rbp == null) return null;
        Address pc  = context.getRegisterAsAddress(AMD64ThreadContext.RIP);
        if (pc == null) return null;
-       return new BsdAMD64CFrame(dbg, rbp, pc);
+       return new BsdAMD64CFrame(dbg, rsp, rbp, pc);
     } else if (cpu.equals("aarch64")) {
        AARCH64ThreadContext context = (AARCH64ThreadContext) thread.getContext();
+       Address sp = context.getRegisterAsAddress(AARCH64ThreadContext.SP);
+       if (sp == null) return null;
        Address fp = context.getRegisterAsAddress(AARCH64ThreadContext.FP);
        if (fp == null) return null;
        Address pc  = context.getRegisterAsAddress(AARCH64ThreadContext.PC);
        if (pc == null) return null;
-       return new BsdAARCH64CFrame(dbg, fp, pc);
+       return new BsdAARCH64CFrame(dbg, sp, fp, pc);
     } else {
        throw new DebuggerException(cpu + " is not yet supported");
     }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java
index c4a3a4850ff..3dbcd8b8112 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/aarch64/BsdAARCH64CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/aarch64/BsdAARCH64CFrame.java
index ebc5c7d716e..185148b39b4 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/aarch64/BsdAARCH64CFrame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/aarch64/BsdAARCH64CFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015, Red Hat Inc.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,15 +26,19 @@
 
 package sun.jvm.hotspot.debugger.bsd.aarch64;
 
+import sun.jvm.hotspot.code.*;
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.debugger.aarch64.*;
 import sun.jvm.hotspot.debugger.bsd.*;
 import sun.jvm.hotspot.debugger.cdbg.*;
 import sun.jvm.hotspot.debugger.cdbg.basic.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.runtime.aarch64.*;
 
 public final class BsdAARCH64CFrame extends BasicCFrame {
-   public BsdAARCH64CFrame(BsdDebugger dbg, Address fp, Address pc) {
+   public BsdAARCH64CFrame(BsdDebugger dbg, Address sp, Address fp, Address pc) {
       super(dbg.getCDebugger());
+      this.sp = sp;
       this.fp = fp;
       this.pc = pc;
       this.dbg = dbg;
@@ -54,28 +58,65 @@ public final class BsdAARCH64CFrame extends BasicCFrame {
       return fp;
    }
 
+   @Override
    public CFrame sender(ThreadProxy thread) {
-      AARCH64ThreadContext context = (AARCH64ThreadContext) thread.getContext();
-      Address rsp = context.getRegisterAsAddress(AARCH64ThreadContext.SP);
+      return sender(thread, null, null, null);
+   }
 
-      if ((fp == null) || fp.lessThan(rsp)) {
+   @Override
+   public CFrame sender(ThreadProxy thread, Address nextSP, Address nextFP, Address nextPC) {
+      // Check fp
+      // Skip if both nextFP and nextPC are given - do not need to load from fp.
+      if (nextFP == null && nextPC == null) {
+        if (fp == null) {
+          return null;
+        }
+
+        // Check alignment of fp
+        if (dbg.getAddressValue(fp) % (2 * ADDRESS_SIZE) != 0) {
+          return null;
+        }
+      }
+
+      if (nextFP == null) {
+        nextFP = fp.getAddressAt(0);
+      }
+      if (nextFP == null) {
         return null;
       }
 
-      // Check alignment of fp
-      if (dbg.getAddressValue(fp) % (2 * ADDRESS_SIZE) != 0) {
-        return null;
+      if (nextPC == null) {
+        nextPC = fp.getAddressAt(ADDRESS_SIZE);
       }
-
-      Address nextFP = fp.getAddressAt(0 * ADDRESS_SIZE);
-      if (nextFP == null || nextFP.lessThanOrEqual(fp)) {
-        return null;
-      }
-      Address nextPC  = fp.getAddressAt(1 * ADDRESS_SIZE);
       if (nextPC == null) {
         return null;
       }
-      return new BsdAARCH64CFrame(dbg, nextFP, nextPC);
+
+      if (nextSP == null) {
+        CodeCache cc = VM.getVM().getCodeCache();
+        CodeBlob currentBlob = cc.findBlobUnsafe(pc());
+
+        // This case is different from HotSpot. See JDK-8371194 for details.
+        if (currentBlob != null && (currentBlob.isContinuationStub() || currentBlob.isNativeMethod())) {
+          // Use FP since it should always be valid for these cases.
+          // TODO: These should be walked as Frames not CFrames.
+          nextSP = fp.addOffsetTo(2 * ADDRESS_SIZE);
+        } else {
+          CodeBlob codeBlob = cc.findBlobUnsafe(nextPC);
+          boolean useCodeBlob = codeBlob != null && codeBlob.getFrameSize() > 0;
+          nextSP = useCodeBlob ? nextFP.addOffsetTo((2 * ADDRESS_SIZE) - codeBlob.getFrameSize()) : nextFP;
+        }
+      }
+      if (nextSP == null) {
+        return null;
+      }
+
+      return new BsdAARCH64CFrame(dbg, nextSP, nextFP, nextPC);
+   }
+
+   @Override
+   public Frame toFrame() {
+      return new AARCH64Frame(sp, fp, pc);
    }
 
    // package/class internals only
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java
index 8d0d94b11b7..9077e0007a5 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,10 +29,13 @@ import sun.jvm.hotspot.debugger.amd64.*;
 import sun.jvm.hotspot.debugger.bsd.*;
 import sun.jvm.hotspot.debugger.cdbg.*;
 import sun.jvm.hotspot.debugger.cdbg.basic.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.runtime.amd64.*;
 
 public final class BsdAMD64CFrame extends BasicCFrame {
-   public BsdAMD64CFrame(BsdDebugger dbg, Address rbp, Address rip) {
+   public BsdAMD64CFrame(BsdDebugger dbg, Address rsp, Address rbp, Address rip) {
       super(dbg.getCDebugger());
+      this.rsp = rsp;
       this.rbp = rbp;
       this.rip = rip;
       this.dbg = dbg;
@@ -52,32 +55,49 @@ public final class BsdAMD64CFrame extends BasicCFrame {
       return rbp;
    }
 
+   @Override
    public CFrame sender(ThreadProxy thread) {
-      AMD64ThreadContext context = (AMD64ThreadContext) thread.getContext();
-      Address rsp = context.getRegisterAsAddress(AMD64ThreadContext.RSP);
+      return sender(thread, null, null, null);
+   }
 
-      if ( (rbp == null) || rbp.lessThan(rsp) ) {
-        return null;
+   @Override
+   public CFrame sender(ThreadProxy thread, Address sp, Address fp, Address pc) {
+      // Check fp
+      // Skip if both fp and pc are given - do not need to load from rbp.
+      if (fp == null && pc == null) {
+        if (rbp == null) {
+          return null;
+        }
+
+        // Check alignment of rbp
+        if (dbg.getAddressValue(rbp) % ADDRESS_SIZE != 0) {
+          return null;
+        }
       }
 
-      // Check alignment of rbp
-      if (dbg.getAddressValue(rbp) % ADDRESS_SIZE != 0) {
+      Address nextRSP = sp != null ? sp : rbp.addOffsetTo(2 * ADDRESS_SIZE);
+      if (nextRSP == null) {
         return null;
       }
-
-      Address nextRBP = rbp.getAddressAt( 0 * ADDRESS_SIZE);
-      if (nextRBP == null || nextRBP.lessThanOrEqual(rbp)) {
+      Address nextRBP = fp != null ? fp : rbp.getAddressAt(0);
+      if (nextRBP == null) {
         return null;
       }
-      Address nextPC  = rbp.getAddressAt( 1 * ADDRESS_SIZE);
+      Address nextPC  = pc != null ? pc : rbp.getAddressAt(ADDRESS_SIZE);
       if (nextPC == null) {
         return null;
       }
-      return new BsdAMD64CFrame(dbg, nextRBP, nextPC);
+      return new BsdAMD64CFrame(dbg, nextRSP, nextRBP, nextPC);
+   }
+
+   @Override
+   public Frame toFrame() {
+      return new AMD64Frame(rsp, rbp, rip);
    }
 
    // package/class internals only
    private static final int ADDRESS_SIZE = 8;
+   private Address rsp;
    private Address rip;
    private Address rbp;
    private BsdDebugger dbg;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java
index 88863e76285..d20b998aa64 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java
index 3833680d96c..851dc5ad09c 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java
index 6fbea538488..46edb2f55b2 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java
index b45dbd23405..9ed05b31319 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
index 918d34940f4..0550052dff4 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
index 9d5c0dec9fb..94200e31b7e 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java
index a2808bfff31..f6d33d3c7e8 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java
index 1dc67330d3d..11f03a6003e 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java
index e85973773dc..030d502075d 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64RegisterMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64RegisterMap.java
index b1ae1e8a001..dd8834f3d38 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64RegisterMap.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64RegisterMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java
index a2cdac72add..483c3e5dfde 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_amd64/LinuxAMD64JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_amd64/LinuxAMD64JavaThreadPDAccess.java
index f8672066189..5eb39ed66a8 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_amd64/LinuxAMD64JavaThreadPDAccess.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_amd64/LinuxAMD64JavaThreadPDAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java
index a573b9a383a..9e47bf57602 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/AnnotatedMemoryPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/AnnotatedMemoryPanel.java
index 76b8595e3b2..05044ec8afc 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/AnnotatedMemoryPanel.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/AnnotatedMemoryPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
index 53fa5204349..2ca720dd573 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp b/src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp
index 74be5db0d79..f2994c0d827 100644
--- a/src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp
+++ b/src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Authenticator.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Authenticator.java
index ddef30f0c5c..6bb97e0799a 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Authenticator.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Authenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@ public abstract class Authenticator {
     /**
      * Constructor for subclasses to call.
      */
-    protected Authenticator () { }
+    protected Authenticator() { }
 
     /**
      * Base class for return type from {@link #authenticate(HttpExchange)} method.
@@ -50,7 +50,7 @@ public abstract class Authenticator {
         /**
          * Constructor for subclasses to call.
          */
-        protected Result () {}
+        protected Result() {}
     }
 
     /**
@@ -67,7 +67,7 @@ public abstract class Authenticator {
          * @param responseCode the response code to associate with this
          *                     {@code Failure} instance
          */
-        public Failure (int responseCode) {
+        public Failure(int responseCode) {
             this.responseCode = responseCode;
         }
 
@@ -94,7 +94,7 @@ public abstract class Authenticator {
          *
          * @param p the authenticated user you wish to set as {@code Principal}
          */
-        public Success (HttpPrincipal p) {
+        public Success(HttpPrincipal p) {
             principal = p;
         }
 
@@ -126,7 +126,7 @@ public abstract class Authenticator {
          * @param responseCode the response code to associate with this
          *                     {@code Retry} instance
          */
-        public Retry (int responseCode) {
+        public Retry(int responseCode) {
             this.responseCode = responseCode;
         }
 
@@ -158,5 +158,5 @@ public abstract class Authenticator {
      * @param exch the {@code HttpExchange} upon which authenticate is called
      * @return the result
      */
-    public abstract Result authenticate (HttpExchange exch);
+    public abstract Result authenticate(HttpExchange exch);
 }
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
index b2cf78dd992..8c306888370 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 /**
  * BasicAuthenticator provides an implementation of HTTP Basic
  * authentication. It is an abstract class and must be extended
- * to provide an implementation of {@link #checkCredentials(String,String)}
+ * to provide an implementation of {@link #checkCredentials(String, String)}
  * which is called to verify each incoming request.
  *
  * @since 1.6
@@ -104,34 +104,34 @@ public abstract class BasicAuthenticator extends Authenticator {
      *
      * @return the authenticator's realm string
      */
-    public String getRealm () {
+    public String getRealm() {
         return realm;
     }
 
-    public Result authenticate (HttpExchange t)
+    public Result authenticate(HttpExchange t)
     {
         Headers rmap = t.getRequestHeaders();
         /*
          * look for auth token
          */
-        String auth = rmap.getFirst ("Authorization");
+        String auth = rmap.getFirst("Authorization");
         if (auth == null) {
             setAuthHeader(t);
-            return new Authenticator.Retry (401);
+            return new Authenticator.Retry(401);
         }
-        int sp = auth.indexOf (' ');
+        int sp = auth.indexOf(' ');
         if (sp == -1 || !auth.substring(0, sp).equalsIgnoreCase("Basic")) {
-            return new Authenticator.Failure (401);
+            return new Authenticator.Failure(401);
         }
         byte[] b = Base64.getDecoder().decode(auth.substring(sp+1));
-        String userpass = new String (b, charset);
-        int colon = userpass.indexOf (':');
-        String uname = userpass.substring (0, colon);
-        String pass = userpass.substring (colon+1);
+        String userpass = new String(b, charset);
+        int colon = userpass.indexOf(':');
+        String uname = userpass.substring(0, colon);
+        String pass = userpass.substring(colon+1);
 
-        if (checkCredentials (uname, pass)) {
-            return new Authenticator.Success (
-                new HttpPrincipal (
+        if (checkCredentials(uname, pass)) {
+            return new Authenticator.Success(
+                new HttpPrincipal(
                     uname, realm
                 )
             );
@@ -146,7 +146,7 @@ public abstract class BasicAuthenticator extends Authenticator {
         Headers map = t.getResponseHeaders();
         var authString = "Basic realm=" + "\"" + realm + "\"" +
             (isUTF8 ? ", charset=\"UTF-8\"" : "");
-        map.set ("WWW-Authenticate", authString);
+        map.set("WWW-Authenticate", authString);
     }
 
     /**
@@ -159,6 +159,6 @@ public abstract class BasicAuthenticator extends Authenticator {
      * @param password the password from the request
      * @return {@code true} if the credentials are valid, {@code false} otherwise
      */
-    public abstract boolean checkCredentials (String username, String password);
+    public abstract boolean checkCredentials(String username, String password);
 }
 
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Filter.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Filter.java
index 7dacefcb59b..906e8448c54 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Filter.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Filter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ public abstract class Filter {
     /**
      * Constructor for subclasses to call.
      */
-    protected Filter () {}
+    protected Filter() {}
 
     /**
      * A chain of filters associated with a {@link HttpServer}.
@@ -76,7 +76,7 @@ public abstract class Filter {
          * @param handler the {@link HttpHandler} that will be invoked after
          *                the final {@code Filter} has finished
          */
-        public Chain (List<Filter> filters, HttpHandler handler) {
+        public Chain(List<Filter> filters, HttpHandler handler) {
             iter = filters.listIterator();
             this.handler = handler;
         }
@@ -93,12 +93,12 @@ public abstract class Filter {
          * @throws IOException if an I/O error occurs
          * @throws NullPointerException if exchange is {@code null}
          */
-        public void doFilter (HttpExchange exchange) throws IOException {
+        public void doFilter(HttpExchange exchange) throws IOException {
             if (!iter.hasNext()) {
-                handler.handle (exchange);
+                handler.handle(exchange);
             } else {
                 Filter f = iter.next();
-                f.doFilter (exchange, this);
+                f.doFilter(exchange, this);
             }
         }
     }
@@ -135,14 +135,14 @@ public abstract class Filter {
      * must be rethrown again
      * @throws NullPointerException if either exchange or chain are {@code null}
      */
-    public abstract void doFilter (HttpExchange exchange, Chain chain)
+    public abstract void doFilter(HttpExchange exchange, Chain chain)
         throws IOException;
     /**
      * Returns a short description of this {@code Filter}.
      *
      * @return a {@code String} describing the {@code Filter}
      */
-    public abstract String description ();
+    public abstract String description();
 
     /**
      * Returns a pre-processing {@code Filter} with the given description and
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java
index 7d11bd42c94..2decd48c806 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java
@@ -62,9 +62,9 @@ import sun.net.httpserver.UnmodifiableHeaders;
  * <ul>
  *     <li>{@link #getFirst(String)} returns a single valued header or the first
  *     value of a multi-valued header.
- *     <li>{@link #add(String,String)} adds the given header value to the list
+ *     <li>{@link #add(String, String)} adds the given header value to the list
  *     for the given key.
- *     <li>{@link #set(String,String)} sets the given header field to the single
+ *     <li>{@link #set(String, String)} sets the given header field to the single
  *     value given overwriting any existing values in the value list.
  * </ul>
  *
@@ -80,9 +80,9 @@ import sun.net.httpserver.UnmodifiableHeaders;
  * {@code null} keys will never be present in HTTP request or response headers.
  * @since 1.6
  */
-public class Headers implements Map<String,List<String>> {
+public class Headers implements Map<String, List<String>> {
 
-    HashMap<String,List<String>> map;
+    HashMap<String, List<String>> map;
 
     /**
      * Creates an empty instance of {@code Headers}.
@@ -99,7 +99,7 @@ public class Headers implements Map<String,List<String>> {
      *                              null.
      * @since 18
      */
-    public Headers(Map<String,List<String>> headers) {
+    public Headers(Map<String, List<String>> headers) {
         Objects.requireNonNull(headers);
         var h = headers.entrySet().stream()
                 .collect(Collectors.toUnmodifiableMap(
@@ -234,7 +234,7 @@ public class Headers implements Map<String,List<String>> {
         List<String> l = map.get(k);
         if (l == null) {
             l = new LinkedList<>();
-            map.put(k,l);
+            map.put(k, l);
         }
         l.add(value);
     }
@@ -372,7 +372,7 @@ public class Headers implements Map<String,List<String>> {
      *                              null.
      * @since 18
      */
-    public static Headers of(Map<String,List<String>> headers) {
+    public static Headers of(Map<String, List<String>> headers) {
         return new UnmodifiableHeaders(new Headers(headers));
     }
 }
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpContext.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpContext.java
index 12529d88385..1c9e41e866c 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpContext.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -90,7 +90,7 @@ public abstract class HttpContext {
      *
      * @return a {@code Map} containing the attributes of this context
      */
-    public abstract Map<String,Object> getAttributes() ;
+    public abstract Map<String, Object> getAttributes() ;
 
     /**
      * Returns this context's {@link List} of {@linkplain Filter filters}. This
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java
index 7ea43c0418e..a56c20b53af 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java
@@ -48,7 +48,7 @@ import java.net.URI;
  *     should be closed.
  *     <li>{@link #getResponseHeaders()} to set any response headers, except
  *     content-length.
- *     <li>{@link #sendResponseHeaders(int,long)} to send the response headers.
+ *     <li>{@link #sendResponseHeaders(int, long)} to send the response headers.
  *     Must be called before next step.
  *     <li>{@link #getResponseBody()} to get a {@link OutputStream} to
  *     send the response body. When the response body has been written, the
@@ -73,7 +73,7 @@ public abstract class HttpExchange implements AutoCloseable, Request {
 
     /*
      * Symbolic values for the responseLength parameter of
-     * sendResponseHeaders(int,long)
+     * sendResponseHeaders(int, long)
      */
 
     /**
@@ -163,7 +163,7 @@ public abstract class HttpExchange implements AutoCloseable, Request {
 
     /**
      * Returns a stream to which the response body must be
-     * written. {@link #sendResponseHeaders(int,long)}) must be called prior to
+     * written. {@link #sendResponseHeaders(int, long)}) must be called prior to
      * calling this method. Multiple calls to this method (for the same exchange)
      * will return the same stream. In order to correctly terminate each exchange,
      * the output stream must be closed, even if no response body is being sent.
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandler.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandler.java
index 1f1fc129c9d..447001a4f53 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandler.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,5 +44,5 @@ public interface HttpHandler {
      * @throws NullPointerException if exchange is {@code null}
      * @throws IOException if an I/O error occurs
      */
-    public abstract void handle (HttpExchange exchange) throws IOException;
+    public abstract void handle(HttpExchange exchange) throws IOException;
 }
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java
index 8ed0172690f..a0271fed146 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@ import java.util.concurrent.Executor;
  * a root URI path which represents the location of the application or service
  * on this server. The mapping of a handler to a {@code HttpServer} is
  * encapsulated by a {@link HttpContext} object. HttpContexts are created by
- * calling {@link #createContext(String,HttpHandler)}.
+ * calling {@link #createContext(String, HttpHandler)}.
  * Any request for which no handler can be found is rejected with a 404 response.
  * Management of threads can be done external to this object by providing a
  * {@link java.util.concurrent.Executor} object. If none is provided a default
@@ -117,13 +117,13 @@ public abstract class HttpServer {
      * Creates a {@code HttpServer} instance which is initially not bound to any
      * local address/port. The {@code HttpServer} is acquired from the currently
      * installed {@link HttpServerProvider}. The server must be bound using
-     * {@link #bind(InetSocketAddress,int)} before it can be used.
+     * {@link #bind(InetSocketAddress, int)} before it can be used.
      *
      * @throws IOException if an I/O error occurs
      * @return an instance of {@code HttpServer}
      */
     public static HttpServer create() throws IOException {
-        return create (null, 0);
+        return create(null, 0);
     }
 
     /**
@@ -149,7 +149,7 @@ public abstract class HttpServer {
 
     public static HttpServer create(InetSocketAddress addr, int backlog) throws IOException {
         HttpServerProvider provider = HttpServerProvider.provider();
-        return provider.createHttpServer (addr, backlog);
+        return provider.createHttpServer(addr, backlog);
     }
 
     /**
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsConfigurator.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsConfigurator.java
index 8cd9e3affa2..7f329e02f47 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsConfigurator.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsConfigurator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,11 +38,11 @@ import javax.net.ssl.SSLParameters;
  * <p> The following <a id="example">example</a> shows how this may be done:
  *
  * <blockquote><pre>
- * SSLContext sslContext = SSLContext.getInstance (....);
+ * SSLContext sslContext = SSLContext.getInstance(....);
  * HttpsServer server = HttpsServer.create();
  *
- * server.setHttpsConfigurator (new HttpsConfigurator(sslContext) {
- *     public void configure (HttpsParameters params) {
+ * server.setHttpsConfigurator(new HttpsConfigurator(sslContext) {
+ *     public void configure(HttpsParameters params) {
  *
  *         // get the remote address if needed
  *         InetSocketAddress remote = params.getClientAddress();
@@ -51,7 +51,7 @@ import javax.net.ssl.SSLParameters;
  *
  *         // get the default parameters
  *         SSLParameters sslparams = c.getDefaultSSLParameters();
- *         if (remote.equals (...) ) {
+ *         if (remote.equals(...)) {
  *             // modify the default set for client x
  *         }
  *
@@ -74,7 +74,7 @@ public class HttpsConfigurator {
      */
     public HttpsConfigurator(SSLContext context) {
         if (context == null) {
-            throw new NullPointerException ("null SSLContext");
+            throw new NullPointerException("null SSLContext");
         }
         this.context = context;
     }
@@ -107,6 +107,6 @@ public class HttpsConfigurator {
     * @since 1.6
     */
     public void configure(HttpsParameters params) {
-        params.setSSLParameters (getSSLContext().getDefaultSSLParameters());
+        params.setSSLParameters(getSSLContext().getDefaultSSLParameters());
     }
 }
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsServer.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsServer.java
index 7b3dafd5582..192b8c3d697 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsServer.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpsServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,7 @@ public abstract class HttpsServer extends HttpServer {
      * Creates a {@code HttpsServer} instance which is initially not bound to any
      * local address/port. The {@code HttpsServer} is acquired from the currently
      * installed {@link HttpServerProvider}. The server must be bound using
-     * {@link #bind(InetSocketAddress,int)} before it can be used. The server
+     * {@link #bind(InetSocketAddress, int)} before it can be used. The server
      * must also have a {@code HttpsConfigurator} established with
      * {@link #setHttpsConfigurator(HttpsConfigurator)}.
      *
@@ -80,7 +80,7 @@ public abstract class HttpsServer extends HttpServer {
      * established with {@link #setHttpsConfigurator(HttpsConfigurator)}.
      *
      * @param addr the address to listen on, if {@code null} then
-     *             {@link #bind(InetSocketAddress,int)} must be called to set
+     *             {@link #bind(InetSocketAddress, int)} must be called to set
      *             the address
      * @param backlog the socket backlog. If this value is less than or equal to
      *               zero, then a system default value is used.
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/SimpleFileServer.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/SimpleFileServer.java
index 551f24d3cf0..ba93b81db5a 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/SimpleFileServer.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/SimpleFileServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,7 @@ import sun.net.httpserver.simpleserver.OutputFilter;
  *
  * <h2>Simple file server</h2>
  *
- * <p> The {@link #createFileServer(InetSocketAddress,Path,OutputLevel) createFileServer}
+ * <p> The {@link #createFileServer(InetSocketAddress, Path, OutputLevel) createFileServer}
  * static factory method returns an {@link HttpServer HttpServer} that is a
  * simple out-of-the-box file server. The server comes with an initial handler
  * that serves files from a given directory path (and its subdirectories).
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/package-info.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/package-info.java
index 3b9de3520fb..466b76a6c4a 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/package-info.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -117,26 +117,25 @@
    The following code shows how the SSLContext is then used in a HttpsConfigurator
    and how the SSLContext and HttpsConfigurator are linked to the HttpsServer.
    <blockquote><pre>
-    server.setHttpsConfigurator (new HttpsConfigurator(sslContext) {
-        public void configure (HttpsParameters params) {
+   server.setHttpsConfigurator(new HttpsConfigurator(sslContext) {
+       public void configure(HttpsParameters params) {
 
-        // get the remote address if needed
-        InetSocketAddress remote = params.getClientAddress();
+           // get the remote address if needed
+           InetSocketAddress remote = params.getClientAddress();
 
-        SSLContext c = getSSLContext();
+           SSLContext c = getSSLContext();
 
-        // get the default parameters
-        SSLParameters sslparams = c.getDefaultSSLParameters();
-        if (remote.equals (...) ) {
-            // modify the default set for client x
-        }
+           // get the default parameters
+           SSLParameters sslparams = c.getDefaultSSLParameters();
+           if (remote.equals(...)) {
+               // modify the default set for client x
+           }
 
-        params.setSSLParameters(sslparams);
-        // statement above could throw IAE if any params invalid.
-        // eg. if app has a UI and parameters supplied by a user.
-
-        }
-    });
+           params.setSSLParameters(sslparams);
+           // statement above could throw IAE if any params invalid.
+           // eg. if app has a UI and parameters supplied by a user.
+       }
+   });
    </pre></blockquote>
    @since 1.6
  */
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
index d025e90cf87..9d73f0e7340 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -152,7 +152,7 @@ public abstract class HttpServerProvider {
      *
      * @return  The system-wide default HttpServerProvider
      */
-    public static HttpServerProvider provider () {
+    public static HttpServerProvider provider() {
         synchronized (lock) {
             if (provider != null)
                 return provider;
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java
index 468fa19fe16..4641325af92 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/AuthFilter.java
@@ -33,48 +33,48 @@ public class AuthFilter extends Filter {
 
     private Authenticator authenticator;
 
-    public AuthFilter (Authenticator authenticator) {
+    public AuthFilter(Authenticator authenticator) {
         this.authenticator = authenticator;
     }
 
-    public String description () {
+    public String description() {
         return "Authentication filter";
     }
 
-    public void setAuthenticator (Authenticator a) {
+    public void setAuthenticator(Authenticator a) {
         authenticator = a;
     }
 
-    public void consumeInput (HttpExchange t) throws IOException {
+    public void consumeInput(HttpExchange t) throws IOException {
         InputStream i = t.getRequestBody();
         byte[] b = new byte [4096];
-        while (i.read (b) != -1);
-        i.close ();
+        while (i.read(b) != -1);
+        i.close();
     }
 
     /**
      * The filter's implementation, which is invoked by the server
      */
-    public void doFilter (HttpExchange t, Filter.Chain chain) throws IOException
+    public void doFilter(HttpExchange t, Filter.Chain chain) throws IOException
     {
         if (authenticator != null) {
-            Authenticator.Result r = authenticator.authenticate (t);
+            Authenticator.Result r = authenticator.authenticate(t);
             if (r instanceof Authenticator.Success) {
                 Authenticator.Success s = (Authenticator.Success)r;
-                ExchangeImpl e = ExchangeImpl.get (t);
-                e.setPrincipal (s.getPrincipal());
-                chain.doFilter (t);
+                ExchangeImpl e = ExchangeImpl.get(t);
+                e.setPrincipal(s.getPrincipal());
+                chain.doFilter(t);
             } else if (r instanceof Authenticator.Retry) {
                 Authenticator.Retry ry = (Authenticator.Retry)r;
-                consumeInput (t);
-                t.sendResponseHeaders (ry.getResponseCode(), RSPBODY_EMPTY);
+                consumeInput(t);
+                t.sendResponseHeaders(ry.getResponseCode(), RSPBODY_EMPTY);
             } else if (r instanceof Authenticator.Failure) {
                 Authenticator.Failure f = (Authenticator.Failure)r;
-                consumeInput (t);
-                t.sendResponseHeaders (f.getResponseCode(), RSPBODY_EMPTY);
+                consumeInput(t);
+                t.sendResponseHeaders(f.getResponseCode(), RSPBODY_EMPTY);
             }
         } else {
-            chain.doFilter (t);
+            chain.doFilter(t);
         }
     }
 }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedInputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedInputStream.java
index 34ac72e1fee..0c003378d77 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedInputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@ import com.sun.net.httpserver.*;
 import com.sun.net.httpserver.spi.*;
 
 class ChunkedInputStream extends LeftOverInputStream {
-    ChunkedInputStream (ExchangeImpl t, InputStream src) {
+    ChunkedInputStream(ExchangeImpl t, InputStream src) {
         super (t, src);
     }
 
@@ -48,7 +48,7 @@ class ChunkedInputStream extends LeftOverInputStream {
      */
     private static final int MAX_CHUNK_HEADER_SIZE = 2050;
 
-    private int numeric (char[] arr, int nchars) throws IOException {
+    private int numeric(char[] arr, int nchars) throws IOException {
         assert arr.length >= nchars;
         int len = 0;
         for (int i=0; i<nchars; i++) {
@@ -61,7 +61,7 @@ class ChunkedInputStream extends LeftOverInputStream {
             } else if (c>='A' && c<= 'F') {
                 val = c - 'A' + 10;
             } else {
-                throw new IOException ("invalid chunk length");
+                throw new IOException("invalid chunk length");
             }
             len = len * 16 + val;
         }
@@ -71,10 +71,10 @@ class ChunkedInputStream extends LeftOverInputStream {
     /* read the chunk header line and return the chunk length
      * any chunk extensions are ignored
      */
-    private int readChunkHeader () throws IOException {
+    private int readChunkHeader() throws IOException {
         boolean gotCR = false;
         int c;
-        char[] len_arr = new char [16];
+        char[] len_arr = new char[16];
         int len_size = 0;
         boolean end_of_len = false;
         int read = 0;
@@ -85,11 +85,11 @@ class ChunkedInputStream extends LeftOverInputStream {
             if ((len_size == len_arr.length -1) ||
                 (read > MAX_CHUNK_HEADER_SIZE))
             {
-                throw new IOException ("invalid chunk header");
+                throw new IOException("invalid chunk header");
             }
             if (gotCR) {
                 if (ch == LF) {
-                    int l = numeric (len_arr, len_size);
+                    int l = numeric(len_arr, len_size);
                     return l;
                 } else {
                     gotCR = false;
@@ -107,10 +107,10 @@ class ChunkedInputStream extends LeftOverInputStream {
                 }
             }
         }
-        throw new IOException ("end of stream reading chunk header");
+        throw new IOException("end of stream reading chunk header");
     }
 
-    protected int readImpl (byte[]b, int off, int len) throws IOException {
+    protected int readImpl(byte[] b, int off, int len) throws IOException {
         if (eof) {
             return -1;
         }
@@ -119,7 +119,7 @@ class ChunkedInputStream extends LeftOverInputStream {
             if (remaining == 0) {
                 eof = true;
                 consumeCRLF();
-                t.getServerImpl().requestCompleted (t.getConnection());
+                t.getServerImpl().requestCompleted(t.getConnection());
                 return -1;
             }
             needToReadHeader = false;
@@ -140,15 +140,15 @@ class ChunkedInputStream extends LeftOverInputStream {
         return n;
     }
 
-    private void consumeCRLF () throws IOException {
+    private void consumeCRLF() throws IOException {
         char c;
         c = (char)in.read(); /* CR */
         if (c != CR) {
-            throw new IOException ("invalid chunk end");
+            throw new IOException("invalid chunk end");
         }
         c = (char)in.read(); /* LF */
         if (c != LF) {
-            throw new IOException ("invalid chunk end");
+            throw new IOException("invalid chunk end");
         }
     }
 
@@ -158,7 +158,7 @@ class ChunkedInputStream extends LeftOverInputStream {
      * limitation for the moment. It only affects potential efficiency
      * rather than correctness.
      */
-    public int available () throws IOException {
+    public int available() throws IOException {
         if (eof || closed) {
             return 0;
         }
@@ -170,17 +170,17 @@ class ChunkedInputStream extends LeftOverInputStream {
      * have been read from the underlying channel
      * and buffered internally
      */
-    public boolean isDataBuffered () throws IOException {
+    public boolean isDataBuffered() throws IOException {
         assert eof;
         return in.available() > 0;
     }
 
-    public boolean markSupported () {return false;}
+    public boolean markSupported() {return false;}
 
-    public void mark (int l) {
+    public void mark(int l) {
     }
 
-    public void reset () throws IOException {
-        throw new IOException ("mark/reset not supported");
+    public void reset() throws IOException {
+        throw new IOException("mark/reset not supported");
     }
 }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
index e8e84eb8edd..fd1a940c0a5 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
@@ -57,14 +57,14 @@ class ChunkedOutputStream extends FilterOutputStream
     private byte[] buf = new byte [CHUNK_SIZE+OFFSET+2];
     ExchangeImpl t;
 
-    ChunkedOutputStream (ExchangeImpl t, OutputStream src) {
-        super (src);
+    ChunkedOutputStream(ExchangeImpl t, OutputStream src) {
+        super(src);
         this.t = t;
     }
 
-    public void write (int b) throws IOException {
+    public void write(int b) throws IOException {
         if (closed) {
-            throw new StreamClosedException ();
+            throw new StreamClosedException();
         }
         buf [pos++] = (byte)b;
         count ++;
@@ -74,23 +74,23 @@ class ChunkedOutputStream extends FilterOutputStream
         assert count < CHUNK_SIZE;
     }
 
-    public void write (byte[]b, int off, int len) throws IOException {
+    public void write(byte[] b, int off, int len) throws IOException {
         Objects.checkFromIndexSize(off, len, b.length);
         if (len == 0) {
             return;
         }
         if (closed) {
-            throw new StreamClosedException ();
+            throw new StreamClosedException();
         }
         int remain = CHUNK_SIZE - count;
         if (len > remain) {
-            System.arraycopy (b,off,buf,pos,remain);
+            System.arraycopy(b, off, buf, pos, remain);
             count = CHUNK_SIZE;
             writeChunk();
             len -= remain;
             off += remain;
             while (len >= CHUNK_SIZE) {
-                System.arraycopy (b,off,buf,OFFSET,CHUNK_SIZE);
+                System.arraycopy(b, off, buf, OFFSET, CHUNK_SIZE);
                 len -= CHUNK_SIZE;
                 off += CHUNK_SIZE;
                 count = CHUNK_SIZE;
@@ -98,7 +98,7 @@ class ChunkedOutputStream extends FilterOutputStream
             }
         }
         if (len > 0) {
-            System.arraycopy (b,off,buf,pos,len);
+            System.arraycopy(b, off, buf, pos, len);
             count += len;
             pos += len;
         }
@@ -112,8 +112,8 @@ class ChunkedOutputStream extends FilterOutputStream
      * chunk does not have to be CHUNK_SIZE bytes
      * count must == number of user bytes (<= CHUNK_SIZE)
      */
-    private void writeChunk () throws IOException {
-        char[] c = Integer.toHexString (count).toCharArray();
+    private void writeChunk() throws IOException {
+        char[] c = Integer.toHexString(count).toCharArray();
         int clen = c.length;
         int startByte = 4 - clen;
         int i;
@@ -124,12 +124,12 @@ class ChunkedOutputStream extends FilterOutputStream
         buf[startByte + (i++)] = '\n';
         buf[startByte + (i++) + count] = '\r';
         buf[startByte + (i++) + count] = '\n';
-        out.write (buf, startByte, i+count);
+        out.write(buf, startByte, i+count);
         count = 0;
         pos = OFFSET;
     }
 
-    public void close () throws IOException {
+    public void close() throws IOException {
         if (closed) {
             return;
         }
@@ -156,12 +156,12 @@ class ChunkedOutputStream extends FilterOutputStream
         }
 
         Event e = new Event.WriteFinished(t);
-        t.getHttpContext().getServerImpl().addEvent (e);
+        t.getHttpContext().getServerImpl().addEvent(e);
     }
 
-    public void flush () throws IOException {
+    public void flush() throws IOException {
         if (closed) {
-            throw new StreamClosedException ();
+            throw new StreamClosedException();
         }
         if (count > 0) {
             writeChunk();
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/Code.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/Code.java
index 6b86b8fa5bd..c5391343f96 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/Code.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/Code.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,7 +64,7 @@ class Code {
     public static final int HTTP_GATEWAY_TIMEOUT = 504;
     public static final int HTTP_VERSION = 505;
 
-    static String msg (int code) {
+    static String msg(int code) {
 
       switch (code) {
         case HTTP_OK: return " OK";
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ContextList.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ContextList.java
index cbedb6ca860..96b55575928 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ContextList.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ContextList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,30 +31,30 @@ class ContextList {
 
     private final LinkedList<HttpContextImpl> list = new LinkedList<>();
 
-    public synchronized void add (HttpContextImpl ctx) {
+    public synchronized void add(HttpContextImpl ctx) {
         assert ctx.getPath() != null;
         if (contains(ctx)) {
-            throw new IllegalArgumentException ("cannot add context to list");
+            throw new IllegalArgumentException("cannot add context to list");
         }
-        list.add (ctx);
+        list.add(ctx);
     }
 
     boolean contains(HttpContextImpl ctx) {
         return findContext(ctx.getProtocol(), ctx.getPath(), true) != null;
     }
 
-    public synchronized int size () {
+    public synchronized int size() {
         return list.size();
     }
 
    /* initially contexts are located only by protocol:path.
     * Context with longest prefix matches (currently case-sensitive)
     */
-    synchronized HttpContextImpl findContext (String protocol, String path) {
-        return findContext (protocol, path, false);
+    synchronized HttpContextImpl findContext(String protocol, String path) {
+        return findContext(protocol, path, false);
     }
 
-    synchronized HttpContextImpl findContext (String protocol, String path, boolean exact) {
+    synchronized HttpContextImpl findContext(String protocol, String path, boolean exact) {
         protocol = protocol.toLowerCase(Locale.ROOT);
         String longest = "";
         HttpContextImpl lc = null;
@@ -63,7 +63,7 @@ class ContextList {
                 continue;
             }
             String cpath = ctx.getPath();
-            if (exact && !cpath.equals (path)) {
+            if (exact && !cpath.equals(path)) {
                 continue;
             } else if (!exact && !path.startsWith(cpath)) {
                 continue;
@@ -76,25 +76,25 @@ class ContextList {
         return lc;
     }
 
-    public synchronized void remove (String protocol, String path)
+    public synchronized void remove(String protocol, String path)
         throws IllegalArgumentException
     {
-        HttpContextImpl ctx = findContext (protocol, path, true);
+        HttpContextImpl ctx = findContext(protocol, path, true);
         if (ctx == null) {
-            throw new IllegalArgumentException ("cannot remove element from list");
+            throw new IllegalArgumentException("cannot remove element from list");
         }
-        list.remove (ctx);
+        list.remove(ctx);
     }
 
-    public synchronized void remove (HttpContextImpl context)
+    public synchronized void remove(HttpContextImpl context)
         throws IllegalArgumentException
     {
         for (HttpContextImpl ctx: list) {
-            if (ctx.equals (context)) {
-                list.remove (ctx);
+            if (ctx.equals(context)) {
+                list.remove(ctx);
                 return;
             }
         }
-        throw new IllegalArgumentException ("no such context in list");
+        throw new IllegalArgumentException("no such context in list");
     }
 }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java
index fe746befb9f..7b54ef45e72 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,11 +31,11 @@ import com.sun.net.httpserver.*;
 import com.sun.net.httpserver.spi.*;
 
 public class DefaultHttpServerProvider extends HttpServerProvider {
-    public HttpServer createHttpServer (InetSocketAddress addr, int backlog) throws IOException {
-        return new HttpServerImpl (addr, backlog);
+    public HttpServer createHttpServer(InetSocketAddress addr, int backlog) throws IOException {
+        return new HttpServerImpl(addr, backlog);
     }
 
-    public HttpsServer createHttpsServer (InetSocketAddress addr, int backlog) throws IOException {
-        return new HttpsServerImpl (addr, backlog);
+    public HttpsServer createHttpsServer(InetSocketAddress addr, int backlog) throws IOException {
+        return new HttpsServerImpl(addr, backlog);
     }
 }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
index 17dff13d4e5..8da98cdcfa5 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
@@ -82,12 +82,12 @@ class ExchangeImpl {
     PlaceholderOutputStream uos_orig;
 
     boolean sentHeaders; /* true after response headers sent */
-    final Map<String,Object> attributes;
+    final Map<String, Object> attributes;
     int rcode = -1;
     HttpPrincipal principal;
     ServerImpl server;
 
-    ExchangeImpl (
+    ExchangeImpl(
         String m, URI u, Request req, long len, HttpConnection connection
     ) throws IOException {
         this.req = req;
@@ -107,23 +107,23 @@ class ExchangeImpl {
         server.startExchange();
     }
 
-    public Headers getRequestHeaders () {
+    public Headers getRequestHeaders() {
         return reqHdrs;
     }
 
-    public Headers getResponseHeaders () {
+    public Headers getResponseHeaders() {
         return rspHdrs;
     }
 
-    public URI getRequestURI () {
+    public URI getRequestURI() {
         return uri;
     }
 
-    public String getRequestMethod (){
+    public String getRequestMethod() {
         return method;
     }
 
-    public HttpContextImpl getHttpContext (){
+    public HttpContextImpl getHttpContext() {
         return connection.getHttpContext();
     }
 
@@ -131,7 +131,7 @@ class ExchangeImpl {
         return HEAD.equals(getRequestMethod());
     }
 
-    public void close () {
+    public void close() {
         if (closed) {
             return;
         }
@@ -160,38 +160,38 @@ class ExchangeImpl {
         }
     }
 
-    public InputStream getRequestBody () {
+    public InputStream getRequestBody() {
         if (uis != null) {
             return uis;
         }
         if (reqContentLen == -1L) {
-            uis_orig = new ChunkedInputStream (this, ris);
+            uis_orig = new ChunkedInputStream(this, ris);
             uis = uis_orig;
         } else {
-            uis_orig = new FixedLengthInputStream (this, ris, reqContentLen);
+            uis_orig = new FixedLengthInputStream(this, ris, reqContentLen);
             uis = uis_orig;
         }
         return uis;
     }
 
-    LeftOverInputStream getOriginalInputStream () {
+    LeftOverInputStream getOriginalInputStream() {
         return uis_orig;
     }
 
-    public int getResponseCode () {
+    public int getResponseCode() {
         return rcode;
     }
 
-    public OutputStream getResponseBody () {
+    public OutputStream getResponseBody() {
         /* TODO. Change spec to remove restriction below. Filters
          * cannot work with this restriction
          *
          * if (!sentHeaders) {
-         *    throw new IllegalStateException ("headers not sent");
+         *    throw new IllegalStateException("headers not sent");
          * }
          */
         if (uos == null) {
-            uos_orig = new PlaceholderOutputStream (null);
+            uos_orig = new PlaceholderOutputStream(null);
             uos = uos_orig;
         }
         return uos;
@@ -202,37 +202,37 @@ class ExchangeImpl {
      * returned from the 1st call to getResponseBody()
      * The "real" ouputstream is then placed inside this
      */
-    PlaceholderOutputStream getPlaceholderResponseBody () {
+    PlaceholderOutputStream getPlaceholderResponseBody() {
         getResponseBody();
         return uos_orig;
     }
 
-    public void sendResponseHeaders (int rCode, long contentLen)
+    public void sendResponseHeaders(int rCode, long contentLen)
     throws IOException
     {
         final Logger logger = server.getLogger();
         if (sentHeaders) {
-            throw new IOException ("headers already sent");
+            throw new IOException("headers already sent");
         }
         this.rcode = rCode;
-        String statusLine = "HTTP/1.1 "+rCode+Code.msg(rCode)+"\r\n";
+        String statusLine = "HTTP/1.1 " + rCode + Code.msg(rCode) + "\r\n";
         ByteArrayOutputStream tmpout = new ByteArrayOutputStream();
         PlaceholderOutputStream o = getPlaceholderResponseBody();
-        tmpout.write (bytes(statusLine, 0), 0, statusLine.length());
+        tmpout.write(bytes(statusLine, 0), 0, statusLine.length());
         boolean noContentToSend = false; // assume there is content
         boolean noContentLengthHeader = false; // must not send Content-length is set
         rspHdrs.set("Date", FORMATTER.format(Instant.now()));
 
         /* check for response type that is not allowed to send a body */
 
-        if ((rCode>=100 && rCode <200) /* informational */
+        if ((rCode >= 100 && rCode < 200) /* informational */
             ||(rCode == 204)           /* no content */
             ||(rCode == 304))          /* not modified */
         {
             if (contentLen != RSPBODY_EMPTY) {
-                String msg = "sendResponseHeaders: rCode = "+ rCode
+                String msg = "sendResponseHeaders: rCode = " + rCode
                     + ": forcing contentLen = RSPBODY_EMPTY";
-                logger.log (Level.WARNING, msg);
+                logger.log(Level.WARNING, msg);
             }
             contentLen = RSPBODY_EMPTY;
             noContentLengthHeader = (rCode != 304);
@@ -245,19 +245,19 @@ class ExchangeImpl {
             if (contentLen >= 0) {
                 String msg =
                     "sendResponseHeaders: being invoked with a content length for a HEAD request";
-                logger.log (Level.WARNING, msg);
+                logger.log(Level.WARNING, msg);
             }
             noContentToSend = true;
             contentLen = 0;
-            o.setWrappedStream (new FixedLengthOutputStream (this, ros, contentLen));
+            o.setWrappedStream(new FixedLengthOutputStream(this, ros, contentLen));
         } else { /* not a HEAD request or 304 response */
             if (contentLen == RSPBODY_CHUNKED) {
                 if (http10) {
-                    o.setWrappedStream (new UndefLengthOutputStream (this, ros));
+                    o.setWrappedStream(new UndefLengthOutputStream(this, ros));
                     close = true;
                 } else {
-                    rspHdrs.set ("Transfer-encoding", "chunked");
-                    o.setWrappedStream (new ChunkedOutputStream (this, ros));
+                    rspHdrs.set("Transfer-encoding", "chunked");
+                    o.setWrappedStream(new ChunkedOutputStream(this, ros));
                 }
             } else {
                 if (contentLen == RSPBODY_EMPTY) {
@@ -267,7 +267,7 @@ class ExchangeImpl {
                 if (!noContentLengthHeader) {
                     rspHdrs.set("Content-length", Long.toString(contentLen));
                 }
-                o.setWrappedStream (new FixedLengthOutputStream (this, ros, contentLen));
+                o.setWrappedStream(new FixedLengthOutputStream(this, ros, contentLen));
             }
         }
 
@@ -280,12 +280,12 @@ class ExchangeImpl {
                     Optional.ofNullable(rspHdrs.get("Connection"))
                     .map(List::stream).orElse(Stream.empty());
             if (conheader.anyMatch("close"::equalsIgnoreCase)) {
-                logger.log (Level.DEBUG, "Connection: close requested by handler");
+                logger.log(Level.DEBUG, "Connection: close requested by handler");
                 close = true;
             }
         }
 
-        write (rspHdrs, tmpout);
+        write(rspHdrs, tmpout);
         this.rspContentLen = contentLen;
         tmpout.writeTo(ros);
         sentHeaders = true;
@@ -294,33 +294,33 @@ class ExchangeImpl {
             ros.flush();
             close();
         }
-        server.logReply (rCode, req.requestLine(), null);
+        server.logReply(rCode, req.requestLine(), null);
     }
 
-    void write (Headers map, OutputStream os) throws IOException {
-        Set<Map.Entry<String,List<String>>> entries = map.entrySet();
-        for (Map.Entry<String,List<String>> entry : entries) {
+    void write(Headers map, OutputStream os) throws IOException {
+        Set<Map.Entry<String, List<String>>> entries = map.entrySet();
+        for (Map.Entry<String, List<String>> entry : entries) {
             String key = entry.getKey();
             byte[] buf;
             List<String> values = entry.getValue();
             for (String val : values) {
                 int i = key.length();
-                buf = bytes (key, 2);
+                buf = bytes(key, 2);
                 buf[i++] = ':';
                 buf[i++] = ' ';
-                os.write (buf, 0, i);
-                buf = bytes (val, 2);
+                os.write(buf, 0, i);
+                buf = bytes(val, 2);
                 i = val.length();
                 buf[i++] = '\r';
                 buf[i++] = '\n';
-                os.write (buf, 0, i);
+                os.write(buf, 0, i);
             }
         }
-        os.write ('\r');
-        os.write ('\n');
+        os.write('\r');
+        os.write('\n');
     }
 
-    private byte[] rspbuf = new byte [128]; // used by bytes()
+    private byte[] rspbuf = new byte[128]; // used by bytes()
 
     /**
      * convert string to byte[], using rspbuf
@@ -328,7 +328,7 @@ class ExchangeImpl {
      * of rspbuf. Reallocate rspbuf if not big enough.
      * caller must check return value to see if rspbuf moved
      */
-    private byte[] bytes (String s, int extra) {
+    private byte[] bytes(String s, int extra) {
         int slen = s.length();
         if (slen+extra > rspbuf.length) {
             int diff = slen + extra - rspbuf.length;
@@ -341,27 +341,27 @@ class ExchangeImpl {
         return rspbuf;
     }
 
-    public InetSocketAddress getRemoteAddress (){
+    public InetSocketAddress getRemoteAddress() {
         Socket s = connection.getChannel().socket();
         InetAddress ia = s.getInetAddress();
         int port = s.getPort();
-        return new InetSocketAddress (ia, port);
+        return new InetSocketAddress(ia, port);
     }
 
-    public InetSocketAddress getLocalAddress (){
+    public InetSocketAddress getLocalAddress() {
         Socket s = connection.getChannel().socket();
         InetAddress ia = s.getLocalAddress();
         int port = s.getLocalPort();
-        return new InetSocketAddress (ia, port);
+        return new InetSocketAddress(ia, port);
     }
 
-    public String getProtocol (){
+    public String getProtocol() {
         String reqline = req.requestLine();
-        int index = reqline.lastIndexOf (' ');
-        return reqline.substring (index+1);
+        int index = reqline.lastIndexOf(' ');
+        return reqline.substring(index+1);
     }
 
-    public SSLSession getSSLSession () {
+    public SSLSession getSSLSession() {
         SSLEngine e = connection.getSSLEngine();
         if (e == null) {
             return null;
@@ -369,11 +369,11 @@ class ExchangeImpl {
         return e.getSession();
     }
 
-    public Object getAttribute (String name) {
+    public Object getAttribute(String name) {
         return attributes.get(Objects.requireNonNull(name, "null name parameter"));
     }
 
-    public void setAttribute (String name, Object value) {
+    public void setAttribute(String name, Object value) {
         var key = Objects.requireNonNull(name, "null name parameter");
         if (value != null) {
             attributes.put(key, value);
@@ -382,7 +382,7 @@ class ExchangeImpl {
         }
     }
 
-    public void setStreams (InputStream i, OutputStream o) {
+    public void setStreams(InputStream i, OutputStream o) {
         assert uis != null;
         if (i != null) {
             uis = i;
@@ -395,23 +395,23 @@ class ExchangeImpl {
     /**
      * PP
      */
-    HttpConnection getConnection () {
+    HttpConnection getConnection() {
         return connection;
     }
 
-    ServerImpl getServerImpl () {
+    ServerImpl getServerImpl() {
         return getHttpContext().getServerImpl();
     }
 
-    public HttpPrincipal getPrincipal () {
+    public HttpPrincipal getPrincipal() {
         return principal;
     }
 
-    void setPrincipal (HttpPrincipal principal) {
+    void setPrincipal(HttpPrincipal principal) {
         this.principal = principal;
     }
 
-    static ExchangeImpl get (HttpExchange t) {
+    static ExchangeImpl get(HttpExchange t) {
         if (t instanceof HttpExchangeImpl) {
             return ((HttpExchangeImpl)t).getExchangeImpl();
         } else {
@@ -432,37 +432,37 @@ class PlaceholderOutputStream extends java.io.OutputStream {
 
     OutputStream wrapped;
 
-    PlaceholderOutputStream (OutputStream os) {
+    PlaceholderOutputStream(OutputStream os) {
         wrapped = os;
     }
 
-    void setWrappedStream (OutputStream os) {
+    void setWrappedStream(OutputStream os) {
         wrapped = os;
     }
 
-    boolean isWrapped () {
+    boolean isWrapped() {
         return wrapped != null;
     }
 
-    private void checkWrap () throws IOException {
+    private void checkWrap() throws IOException {
         if (wrapped == null) {
-            throw new IOException ("response headers not sent yet");
+            throw new IOException("response headers not sent yet");
         }
     }
 
     public void write(int b) throws IOException {
         checkWrap();
-        wrapped.write (b);
+        wrapped.write(b);
     }
 
     public void write(byte b[]) throws IOException {
         checkWrap();
-        wrapped.write (b);
+        wrapped.write(b);
     }
 
     public void write(byte b[], int off, int len) throws IOException {
         checkWrap();
-        wrapped.write (b, off, len);
+        wrapped.write(b, off, len);
     }
 
     public void flush() throws IOException {
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthInputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthInputStream.java
index ac6fb7be005..100ba9e1b3b 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthInputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,15 +39,15 @@ import com.sun.net.httpserver.spi.*;
 class FixedLengthInputStream extends LeftOverInputStream {
     private long remaining;
 
-    FixedLengthInputStream (ExchangeImpl t, InputStream src, long len) {
-        super (t, src);
+    FixedLengthInputStream(ExchangeImpl t, InputStream src, long len) {
+        super(t, src);
         if (len < 0) {
             throw new IllegalArgumentException("Content-Length: " + len);
         }
         this.remaining = len;
     }
 
-    protected int readImpl (byte[]b, int off, int len) throws IOException {
+    protected int readImpl(byte[] b, int off, int len) throws IOException {
 
         eof = (remaining == 0L);
         if (eof) {
@@ -60,7 +60,7 @@ class FixedLengthInputStream extends LeftOverInputStream {
         if (n > -1) {
             remaining -= n;
             if (remaining == 0) {
-                t.getServerImpl().requestCompleted (t.getConnection());
+                t.getServerImpl().requestCompleted(t.getConnection());
             }
         }
         if (n < 0 && !eof)
@@ -68,7 +68,7 @@ class FixedLengthInputStream extends LeftOverInputStream {
         return n;
     }
 
-    public int available () throws IOException {
+    public int available() throws IOException {
         if (eof) {
             return 0;
         }
@@ -76,12 +76,12 @@ class FixedLengthInputStream extends LeftOverInputStream {
         return n < remaining? n: (int)remaining;
     }
 
-    public boolean markSupported () {return false;}
+    public boolean markSupported() {return false;}
 
-    public void mark (int l) {
+    public void mark(int l) {
     }
 
-    public void reset () throws IOException {
-        throw new IOException ("mark/reset not supported");
+    public void reset() throws IOException {
+        throw new IOException("mark/reset not supported");
     }
 }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java
index f800bdaba18..95de03d27fa 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java
@@ -42,7 +42,7 @@ class FixedLengthOutputStream extends FilterOutputStream
     private boolean closed = false;
     ExchangeImpl t;
 
-    FixedLengthOutputStream (ExchangeImpl t, OutputStream src, long len) {
+    FixedLengthOutputStream(ExchangeImpl t, OutputStream src, long len) {
         super (src);
         if (len < 0) {
             throw new IllegalArgumentException("Content-Length: " + len);
@@ -51,9 +51,9 @@ class FixedLengthOutputStream extends FilterOutputStream
         this.remaining = len;
     }
 
-    public void write (int b) throws IOException {
+    public void write(int b) throws IOException {
         if (closed) {
-            throw new IOException ("stream closed");
+            throw new IOException("stream closed");
         }
         if (remaining == 0) {
             throw new StreamClosedException();
@@ -62,30 +62,30 @@ class FixedLengthOutputStream extends FilterOutputStream
         remaining --;
     }
 
-    public void write (byte[]b, int off, int len) throws IOException {
+    public void write(byte[] b, int off, int len) throws IOException {
         Objects.checkFromIndexSize(off, len, b.length);
         if (len == 0) {
             return;
         }
         if (closed) {
-            throw new IOException ("stream closed");
+            throw new IOException("stream closed");
         }
         if (len > remaining) {
             // stream is still open, caller can retry
-            throw new IOException ("too many bytes to write to stream");
+            throw new IOException("too many bytes to write to stream");
         }
         out.write(b, off, len);
         remaining -= len;
     }
 
-    public void close () throws IOException {
+    public void close() throws IOException {
         if (closed) {
             return;
         }
         closed = true;
         if (remaining > 0) {
             t.close();
-            throw new IOException ("insufficient bytes written to stream");
+            throw new IOException("insufficient bytes written to stream");
         }
         flush();
         LeftOverInputStream is = t.getOriginalInputStream();
@@ -95,7 +95,7 @@ class FixedLengthOutputStream extends FilterOutputStream
             } catch (IOException e) {}
         }
         Event e = new Event.WriteFinished(t);
-        t.getHttpContext().getServerImpl().addEvent (e);
+        t.getHttpContext().getServerImpl().addEvent(e);
     }
 
     // flush is a pass-through
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpConnection.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpConnection.java
index 38aabe1136e..2be4a37d432 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpConnection.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,14 +73,14 @@ class HttpConnection {
         return sb.toString();
     }
 
-    HttpConnection () {
+    HttpConnection() {
     }
 
-    void setChannel (SocketChannel c) {
+    void setChannel(SocketChannel c) {
         chan = c;
     }
 
-    void setContext (HttpContextImpl ctx) {
+    void setContext(HttpContextImpl ctx) {
         context = ctx;
     }
 
@@ -88,11 +88,11 @@ class HttpConnection {
         return state;
     }
 
-    void setState (State s) {
+    void setState(State s) {
         state = s;
     }
 
-    void setParameters (
+    void setParameters(
         InputStream in, OutputStream rawout, SocketChannel chan,
         SSLEngine engine, SSLStreams sslStreams, SSLContext sslContext, String protocol,
         HttpContextImpl context, InputStream raw
@@ -110,21 +110,21 @@ class HttpConnection {
         this.logger = context.getLogger();
     }
 
-    SocketChannel getChannel () {
+    SocketChannel getChannel() {
         return chan;
     }
 
-    synchronized void close () {
+    synchronized void close() {
         if (closed) {
             return;
         }
         closed = true;
         if (logger != null && chan != null) {
-            logger.log (Level.TRACE, "Closing connection: " + chan.toString());
+            logger.log(Level.TRACE, "Closing connection: " + chan.toString());
         }
 
         if (!chan.isOpen()) {
-            ServerImpl.dprint ("Channel already closed");
+            ServerImpl.dprint("Channel already closed");
             return;
         }
         try {
@@ -133,65 +133,65 @@ class HttpConnection {
                 raw.close();
             }
         } catch (IOException e) {
-            ServerImpl.dprint (e);
+            ServerImpl.dprint(e);
         }
         try {
             if (rawout != null) {
                 rawout.close();
             }
         } catch (IOException e) {
-            ServerImpl.dprint (e);
+            ServerImpl.dprint(e);
         }
         try {
             if (sslStreams != null) {
                 sslStreams.close();
             }
         } catch (IOException e) {
-            ServerImpl.dprint (e);
+            ServerImpl.dprint(e);
         }
         try {
             chan.close();
         } catch (IOException e) {
-            ServerImpl.dprint (e);
+            ServerImpl.dprint(e);
         }
     }
 
     /* remaining is the number of bytes left on the lowest level inputstream
      * after the exchange is finished
      */
-    void setRemaining (int r) {
+    void setRemaining(int r) {
         remaining = r;
     }
 
-    int getRemaining () {
+    int getRemaining() {
         return remaining;
     }
 
-    SelectionKey getSelectionKey () {
+    SelectionKey getSelectionKey() {
         return selectionKey;
     }
 
-    InputStream getInputStream () {
+    InputStream getInputStream() {
             return i;
     }
 
-    OutputStream getRawOutputStream () {
+    OutputStream getRawOutputStream() {
             return rawout;
     }
 
-    String getProtocol () {
+    String getProtocol() {
             return protocol;
     }
 
-    SSLEngine getSSLEngine () {
+    SSLEngine getSSLEngine() {
             return engine;
     }
 
-    SSLContext getSSLContext () {
+    SSLContext getSSLContext() {
             return sslContext;
     }
 
-    HttpContextImpl getHttpContext () {
+    HttpContextImpl getHttpContext() {
             return context;
     }
 }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpContextImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpContextImpl.java
index f1583954115..10cd116a3a0 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpContextImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpContextImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@ import com.sun.net.httpserver.*;
  * to a {@link HttpHandler} which is invoked to handle requests destined
  * for the protocol/path on the associated HttpServer.
  * <p>
- * HttpContext instances are created by {@link HttpServer#createContext(String,String,HttpHandler,Object)}
+ * HttpContext instances are created by {@link HttpServer#createContext(String, String, HttpHandler, Object)}
  * <p>
  */
 class HttpContextImpl extends HttpContext {
@@ -44,7 +44,7 @@ class HttpContextImpl extends HttpContext {
     private final String protocol;
     private final ServerImpl server;
     private final AuthFilter authfilter;
-    private final Map<String,Object> attributes = new ConcurrentHashMap<>();
+    private final Map<String, Object> attributes = new ConcurrentHashMap<>();
     /* system filters, not visible to applications */
     private final List<Filter> sfilters = new CopyOnWriteArrayList<>();
     /* user filters, set by applications */
@@ -55,35 +55,35 @@ class HttpContextImpl extends HttpContext {
     /**
      * constructor is package private.
      */
-    HttpContextImpl (String protocol, String path, HttpHandler cb, ServerImpl server) {
+    HttpContextImpl(String protocol, String path, HttpHandler cb, ServerImpl server) {
         if (path == null || protocol == null || path.length() < 1 || path.charAt(0) != '/') {
-            throw new IllegalArgumentException ("Illegal value for path or protocol");
+            throw new IllegalArgumentException("Illegal value for path or protocol");
         }
         this.protocol = protocol.toLowerCase(Locale.ROOT);
         this.path = path;
-        if (!this.protocol.equals ("http") && !this.protocol.equals ("https")) {
-            throw new IllegalArgumentException ("Illegal value for protocol");
+        if (!this.protocol.equals("http") && !this.protocol.equals("https")) {
+            throw new IllegalArgumentException("Illegal value for protocol");
         }
         this.handler = cb;
         this.server = server;
         authfilter = new AuthFilter(null);
-        sfilters.add (authfilter);
+        sfilters.add(authfilter);
     }
 
     /**
      * returns the handler for this context
      * @return the HttpHandler for this context
      */
-    public HttpHandler getHandler () {
+    public HttpHandler getHandler() {
         return handler;
     }
 
-    public void setHandler (HttpHandler h) {
+    public void setHandler(HttpHandler h) {
         if (h == null) {
-            throw new NullPointerException ("Null handler parameter");
+            throw new NullPointerException("Null handler parameter");
         }
         if (handler != null) {
-            throw new IllegalArgumentException ("handler already set");
+            throw new IllegalArgumentException("handler already set");
         }
         handler = h;
     }
@@ -100,11 +100,11 @@ class HttpContextImpl extends HttpContext {
      * returns the server this context was created with
      * @return this context's server
      */
-    public HttpServer getServer () {
+    public HttpServer getServer() {
         return server.getWrapper();
     }
 
-    ServerImpl getServerImpl () {
+    ServerImpl getServerImpl() {
         return server;
     }
 
@@ -124,29 +124,29 @@ class HttpContextImpl extends HttpContext {
      * Every attribute stored in this Map will be visible to
      * every HttpExchange processed by this context
      */
-    public Map<String,Object> getAttributes() {
+    public Map<String, Object> getAttributes() {
         return attributes;
     }
 
-    public List<Filter> getFilters () {
+    public List<Filter> getFilters() {
         return ufilters;
     }
 
-    List<Filter> getSystemFilters () {
+    List<Filter> getSystemFilters() {
         return sfilters;
     }
 
-    public Authenticator setAuthenticator (Authenticator auth) {
+    public Authenticator setAuthenticator(Authenticator auth) {
         Authenticator old = authenticator;
         authenticator = auth;
-        authfilter.setAuthenticator (auth);
+        authfilter.setAuthenticator(auth);
         return old;
     }
 
-    public Authenticator getAuthenticator () {
+    public Authenticator getAuthenticator() {
         return authenticator;
     }
-    Logger getLogger () {
+    Logger getLogger() {
         return server.getLogger();
     }
 }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpError.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpError.java
index de9dfba8cfb..b201c822193 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpError.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@ package sun.net.httpserver;
 class HttpError extends RuntimeException {
     private static final long serialVersionUID = 8769596371344178179L;
 
-    public HttpError (String msg) {
-        super (msg);
+    public HttpError(String msg) {
+        super(msg);
     }
 }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpExchangeImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpExchangeImpl.java
index 420ef3d9e64..d4606019c56 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpExchangeImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpExchangeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,82 +38,82 @@ class HttpExchangeImpl extends HttpExchange {
 
     ExchangeImpl impl;
 
-    HttpExchangeImpl (ExchangeImpl impl) {
+    HttpExchangeImpl(ExchangeImpl impl) {
         this.impl = impl;
     }
 
-    public Headers getRequestHeaders () {
+    public Headers getRequestHeaders() {
         return impl.getRequestHeaders();
     }
 
-    public Headers getResponseHeaders () {
+    public Headers getResponseHeaders() {
         return impl.getResponseHeaders();
     }
 
-    public URI getRequestURI () {
+    public URI getRequestURI() {
         return impl.getRequestURI();
     }
 
-    public String getRequestMethod (){
+    public String getRequestMethod() {
         return impl.getRequestMethod();
     }
 
-    public HttpContextImpl getHttpContext (){
+    public HttpContextImpl getHttpContext() {
         return impl.getHttpContext();
     }
 
-    public void close () {
+    public void close() {
         impl.close();
     }
 
-    public InputStream getRequestBody () {
+    public InputStream getRequestBody() {
         return impl.getRequestBody();
     }
 
-    public int getResponseCode () {
+    public int getResponseCode() {
         return impl.getResponseCode();
     }
 
-    public OutputStream getResponseBody () {
+    public OutputStream getResponseBody() {
         return impl.getResponseBody();
     }
 
 
-    public void sendResponseHeaders (int rCode, long contentLen)
+    public void sendResponseHeaders(int rCode, long contentLen)
     throws IOException
     {
-        impl.sendResponseHeaders (rCode, contentLen);
+        impl.sendResponseHeaders(rCode, contentLen);
     }
 
-    public InetSocketAddress getRemoteAddress (){
+    public InetSocketAddress getRemoteAddress() {
         return impl.getRemoteAddress();
     }
 
-    public InetSocketAddress getLocalAddress (){
+    public InetSocketAddress getLocalAddress() {
         return impl.getLocalAddress();
     }
 
-    public String getProtocol (){
+    public String getProtocol() {
         return impl.getProtocol();
     }
 
-    public Object getAttribute (String name) {
-        return impl.getAttribute (name);
+    public Object getAttribute(String name) {
+        return impl.getAttribute(name);
     }
 
-    public void setAttribute (String name, Object value) {
-        impl.setAttribute (name, value);
+    public void setAttribute(String name, Object value) {
+        impl.setAttribute(name, value);
     }
 
-    public void setStreams (InputStream i, OutputStream o) {
-        impl.setStreams (i, o);
+    public void setStreams(InputStream i, OutputStream o) {
+        impl.setStreams(i, o);
     }
 
-    public HttpPrincipal getPrincipal () {
+    public HttpPrincipal getPrincipal() {
         return impl.getPrincipal();
     }
 
-    ExchangeImpl getExchangeImpl () {
+    ExchangeImpl getExchangeImpl() {
         return impl;
     }
 }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpServerImpl.java
index dd09957c0c6..93ace4e7bd2 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpServerImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpServerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,50 +35,50 @@ public class HttpServerImpl extends HttpServer {
 
     ServerImpl server;
 
-    HttpServerImpl () throws IOException {
-        this (new InetSocketAddress(80), 0);
+    HttpServerImpl() throws IOException {
+        this(new InetSocketAddress(80), 0);
     }
 
-    HttpServerImpl (
+    HttpServerImpl(
         InetSocketAddress addr, int backlog
     ) throws IOException {
-        server = new ServerImpl (this, "http", addr, backlog);
+        server = new ServerImpl(this, "http", addr, backlog);
     }
 
-    public void bind (InetSocketAddress addr, int backlog) throws IOException {
-        server.bind (addr, backlog);
+    public void bind(InetSocketAddress addr, int backlog) throws IOException {
+        server.bind(addr, backlog);
     }
 
-    public void start () {
+    public void start() {
         server.start();
     }
 
-    public void setExecutor (Executor executor) {
+    public void setExecutor(Executor executor) {
         server.setExecutor(executor);
     }
 
-    public Executor getExecutor () {
+    public Executor getExecutor() {
         return server.getExecutor();
     }
 
-    public void stop (int delay) {
-        server.stop (delay);
+    public void stop(int delay) {
+        server.stop(delay);
     }
 
-    public HttpContextImpl createContext (String path, HttpHandler handler) {
-        return server.createContext (path, handler);
+    public HttpContextImpl createContext(String path, HttpHandler handler) {
+        return server.createContext(path, handler);
     }
 
-    public HttpContextImpl createContext (String path) {
-        return server.createContext (path);
+    public HttpContextImpl createContext(String path) {
+        return server.createContext(path);
     }
 
-    public void removeContext (String path) throws IllegalArgumentException {
-        server.removeContext (path);
+    public void removeContext(String path) throws IllegalArgumentException {
+        server.removeContext(path);
     }
 
-    public void removeContext (HttpContext context) throws IllegalArgumentException {
-        server.removeContext (context);
+    public void removeContext(HttpContext context) throws IllegalArgumentException {
+        server.removeContext(context);
     }
 
     public InetSocketAddress getAddress() {
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsExchangeImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsExchangeImpl.java
index f7f43d7feca..939b88d3928 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsExchangeImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsExchangeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,86 +38,86 @@ class HttpsExchangeImpl extends HttpsExchange {
 
     ExchangeImpl impl;
 
-    HttpsExchangeImpl (ExchangeImpl impl) throws IOException {
+    HttpsExchangeImpl(ExchangeImpl impl) throws IOException {
         this.impl = impl;
     }
 
-    public Headers getRequestHeaders () {
+    public Headers getRequestHeaders() {
         return impl.getRequestHeaders();
     }
 
-    public Headers getResponseHeaders () {
+    public Headers getResponseHeaders() {
         return impl.getResponseHeaders();
     }
 
-    public URI getRequestURI () {
+    public URI getRequestURI() {
         return impl.getRequestURI();
     }
 
-    public String getRequestMethod (){
+    public String getRequestMethod() {
         return impl.getRequestMethod();
     }
 
-    public HttpContextImpl getHttpContext (){
+    public HttpContextImpl getHttpContext() {
         return impl.getHttpContext();
     }
 
-    public void close () {
+    public void close() {
         impl.close();
     }
 
-    public InputStream getRequestBody () {
+    public InputStream getRequestBody() {
         return impl.getRequestBody();
     }
 
-    public int getResponseCode () {
+    public int getResponseCode() {
         return impl.getResponseCode();
     }
 
-    public OutputStream getResponseBody () {
+    public OutputStream getResponseBody() {
         return impl.getResponseBody();
     }
 
 
-    public void sendResponseHeaders (int rCode, long contentLen)
+    public void sendResponseHeaders(int rCode, long contentLen)
     throws IOException
     {
-        impl.sendResponseHeaders (rCode, contentLen);
+        impl.sendResponseHeaders(rCode, contentLen);
     }
 
-    public InetSocketAddress getRemoteAddress (){
+    public InetSocketAddress getRemoteAddress() {
         return impl.getRemoteAddress();
     }
 
-    public InetSocketAddress getLocalAddress (){
+    public InetSocketAddress getLocalAddress() {
         return impl.getLocalAddress();
     }
 
-    public String getProtocol (){
+    public String getProtocol() {
         return impl.getProtocol();
     }
 
-    public SSLSession getSSLSession () {
-        return impl.getSSLSession ();
+    public SSLSession getSSLSession() {
+        return impl.getSSLSession();
     }
 
-    public Object getAttribute (String name) {
-        return impl.getAttribute (name);
+    public Object getAttribute(String name) {
+        return impl.getAttribute(name);
     }
 
-    public void setAttribute (String name, Object value) {
-        impl.setAttribute (name, value);
+    public void setAttribute(String name, Object value) {
+        impl.setAttribute(name, value);
     }
 
-    public void setStreams (InputStream i, OutputStream o) {
-        impl.setStreams (i, o);
+    public void setStreams(InputStream i, OutputStream o) {
+        impl.setStreams(i, o);
     }
 
-    public HttpPrincipal getPrincipal () {
+    public HttpPrincipal getPrincipal() {
         return impl.getPrincipal();
     }
 
-    ExchangeImpl getExchangeImpl () {
+    ExchangeImpl getExchangeImpl() {
         return impl;
     }
 }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsServerImpl.java
index 97312ec29e6..8ef179c1194 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsServerImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/HttpsServerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,58 +35,58 @@ public class HttpsServerImpl extends HttpsServer {
 
     ServerImpl server;
 
-    HttpsServerImpl () throws IOException {
-        this (new InetSocketAddress(443), 0);
+    HttpsServerImpl() throws IOException {
+        this(new InetSocketAddress(443), 0);
     }
 
-    HttpsServerImpl (
+    HttpsServerImpl(
         InetSocketAddress addr, int backlog
     ) throws IOException {
-        server = new ServerImpl (this, "https", addr, backlog);
+        server = new ServerImpl(this, "https", addr, backlog);
     }
 
-    public void setHttpsConfigurator (HttpsConfigurator config) {
-        server.setHttpsConfigurator (config);
+    public void setHttpsConfigurator(HttpsConfigurator config) {
+        server.setHttpsConfigurator(config);
     }
 
-    public HttpsConfigurator getHttpsConfigurator () {
+    public HttpsConfigurator getHttpsConfigurator() {
         return server.getHttpsConfigurator();
     }
 
-    public void bind (InetSocketAddress addr, int backlog) throws IOException {
-        server.bind (addr, backlog);
+    public void bind(InetSocketAddress addr, int backlog) throws IOException {
+        server.bind(addr, backlog);
     }
 
-    public void start () {
+    public void start() {
         server.start();
     }
 
-    public void setExecutor (Executor executor) {
+    public void setExecutor(Executor executor) {
         server.setExecutor(executor);
     }
 
-    public Executor getExecutor () {
+    public Executor getExecutor() {
         return server.getExecutor();
     }
 
-    public void stop (int delay) {
-        server.stop (delay);
+    public void stop(int delay) {
+        server.stop(delay);
     }
 
-    public HttpContextImpl createContext (String path, HttpHandler handler) {
-        return server.createContext (path, handler);
+    public HttpContextImpl createContext(String path, HttpHandler handler) {
+        return server.createContext(path, handler);
     }
 
-    public HttpContextImpl createContext (String path) {
-        return server.createContext (path);
+    public HttpContextImpl createContext(String path) {
+        return server.createContext(path);
     }
 
-    public void removeContext (String path) throws IllegalArgumentException {
-        server.removeContext (path);
+    public void removeContext(String path) throws IllegalArgumentException {
+        server.removeContext(path);
     }
 
-    public void removeContext (HttpContext context) throws IllegalArgumentException {
-        server.removeContext (context);
+    public void removeContext(HttpContext context) throws IllegalArgumentException {
+        server.removeContext(context);
     }
 
     public InetSocketAddress getAddress() {
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/LeftOverInputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/LeftOverInputStream.java
index 772fa621076..ea904835770 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/LeftOverInputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/LeftOverInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,47 +45,47 @@ abstract class LeftOverInputStream extends FilterInputStream {
     final ServerImpl server;
     protected boolean closed = false;
     protected boolean eof = false;
-    byte[] one = new byte [1];
+    byte[] one = new byte[1];
     private static final int MAX_SKIP_BUFFER_SIZE = 2048;
 
-    public LeftOverInputStream (ExchangeImpl t, InputStream src) {
-        super (src);
+    public LeftOverInputStream(ExchangeImpl t, InputStream src) {
+        super(src);
         this.t = t;
         this.server = t.getServerImpl();
     }
     /**
      * if bytes are left over buffered on *the UNDERLYING* stream
      */
-    public boolean isDataBuffered () throws IOException {
+    public boolean isDataBuffered() throws IOException {
         assert eof;
         return super.available() > 0;
     }
 
-    public void close () throws IOException {
+    public void close() throws IOException {
         if (closed) {
             return;
         }
         closed = true;
         if (!eof) {
-            eof = drain (ServerConfig.getDrainAmount());
+            eof = drain(ServerConfig.getDrainAmount());
         }
     }
 
-    public boolean isClosed () {
+    public boolean isClosed() {
         return closed;
     }
 
-    public boolean isEOF () {
+    public boolean isEOF() {
         return eof;
     }
 
-    protected abstract int readImpl (byte[]b, int off, int len) throws IOException;
+    protected abstract int readImpl(byte[] b, int off, int len) throws IOException;
 
-    public synchronized int read () throws IOException {
+    public synchronized int read() throws IOException {
         if (closed) {
-            throw new IOException ("Stream is closed");
+            throw new IOException("Stream is closed");
         }
-        int c = readImpl (one, 0, 1);
+        int c = readImpl(one, 0, 1);
         if (c == -1 || c == 0) {
             return c;
         } else {
@@ -93,11 +93,11 @@ abstract class LeftOverInputStream extends FilterInputStream {
         }
     }
 
-    public synchronized int read (byte[]b, int off, int len) throws IOException {
+    public synchronized int read(byte[] b, int off, int len) throws IOException {
         if (closed) {
-            throw new IOException ("Stream is closed");
+            throw new IOException("Stream is closed");
         }
-        return readImpl (b, off, len);
+        return readImpl(b, off, len);
     }
 
     @Override
@@ -132,7 +132,7 @@ abstract class LeftOverInputStream extends FilterInputStream {
      * is at eof (ie. all bytes were read) or false if not
      * (still bytes to be read)
      */
-    public boolean drain (long l) throws IOException {
+    public boolean drain(long l) throws IOException {
         while (l > 0) {
             long skip = skip(l);
             if (skip <= 0) break; // might return 0 if isFinishing or EOF
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/Request.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/Request.java
index 6c0c2c271ed..75eeb29f015 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/Request.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/Request.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package sun.net.httpserver;
 
+import java.net.ProtocolException;
 import java.nio.*;
 import java.io.*;
 import java.nio.channels.*;
@@ -39,15 +40,18 @@ class Request {
     static final int BUF_LEN = 2048;
     static final byte CR = 13;
     static final byte LF = 10;
+    static final byte FIRST_CHAR = 32;
 
     private String startLine;
     private SocketChannel chan;
     private InputStream is;
     private OutputStream os;
     private final int maxReqHeaderSize;
+    private final boolean firstClearRequest;
 
-    Request (InputStream rawInputStream, OutputStream rawout) throws IOException {
+    Request(InputStream rawInputStream, OutputStream rawout, boolean firstClearRequest) throws IOException {
         this.maxReqHeaderSize = ServerConfig.getMaxReqHeaderSize();
+        this.firstClearRequest = firstClearRequest;
         is = rawInputStream;
         os = rawout;
         do {
@@ -57,15 +61,15 @@ class Request {
     }
 
 
-    char[] buf = new char [BUF_LEN];
+    char[] buf = new char[BUF_LEN];
     int pos;
     StringBuffer lineBuf;
 
-    public InputStream inputStream () {
+    public InputStream inputStream() {
         return is;
     }
 
-    public OutputStream outputStream () {
+    public OutputStream outputStream() {
         return os;
     }
 
@@ -74,10 +78,29 @@ class Request {
      * Not used for reading headers.
      */
 
-    public String readLine () throws IOException {
+    public String readLine() throws IOException {
         boolean gotCR = false, gotLF = false;
         pos = 0; lineBuf = new StringBuffer();
         long lsize = 32;
+
+        // For the first request that comes on a clear connection
+        // we will check that the first non CR/LF char on the
+        // request line is eligible. This should be the first char
+        // of a method name, so it should be at least greater or equal
+        // to 32 (FIRST_CHAR) which is the space character.
+        // The main goal here is to fail fast if we receive 0x16 (22) which
+        // happens to be the first byte of a TLS handshake record.
+        // This is typically what would be received if a TLS client opened
+        // a TLS connection on a non-TLS server.
+        // If we receive 0x16 we should close the connection immediately as
+        // it indicates we're receiving a ClientHello on a clear
+        // connection, and we will never receive the expected CRLF that
+        // terminates the first request line.
+        // Though we could check only for 0x16, any characters < 32
+        // (excluding CRLF) is not expected at this position in a
+        // request line, so we can still fail here early if any of
+        // those are detected.
+        int offset = 0;
         while (!gotLF) {
             int c = is.read();
             if (c == -1) {
@@ -88,15 +111,27 @@ class Request {
                     gotLF = true;
                 } else {
                     gotCR = false;
-                    consume (CR);
-                    consume (c);
+                    consume(CR);
+                    if (firstClearRequest && offset == 0) {
+                        if (c < FIRST_CHAR) {
+                            throw new ProtocolException("Unexpected start of request line");
+                        }
+                        offset++;
+                    }
+                    consume(c);
                     lsize = lsize + 2;
                 }
             } else {
                 if (c == CR) {
                     gotCR = true;
                 } else {
-                    consume (c);
+                    if (firstClearRequest && offset == 0) {
+                        if (c < FIRST_CHAR) {
+                            throw new ProtocolException("Unexpected start of request line");
+                        }
+                        offset++;
+                    }
+                    consume(c);
                     lsize = lsize + 1;
                 }
             }
@@ -106,13 +141,13 @@ class Request {
                         ServerConfig.getMaxReqHeaderSize() + ".");
             }
         }
-        lineBuf.append (buf, 0, pos);
-        return new String (lineBuf);
+        lineBuf.append(buf, 0, pos);
+        return new String(lineBuf);
     }
 
-    private void consume (int c) throws IOException {
+    private void consume(int c) throws IOException {
         if (pos == BUF_LEN) {
-            lineBuf.append (buf);
+            lineBuf.append(buf);
             pos = 0;
         }
         buf[pos++] = (char)c;
@@ -121,13 +156,13 @@ class Request {
     /**
      * returns the request line (first line of a request)
      */
-    public String requestLine () {
+    public String requestLine() {
         return startLine;
     }
 
     Headers hdrs = null;
     @SuppressWarnings("fallthrough")
-    Headers headers () throws IOException {
+    Headers headers() throws IOException {
         if (hdrs != null) {
             return hdrs;
         }
@@ -239,7 +274,7 @@ class Request {
             if (k == null) {  // Headers disallows null keys, use empty string
                 k = "";       // instead to represent invalid key
             }
-            hdrs.add (k,v);
+            hdrs.add(k, v);
             len = 0;
         }
         return hdrs;
@@ -262,21 +297,21 @@ class Request {
         ServerImpl server;
         static final int BUFSIZE = 8 * 1024;
 
-        public ReadStream (ServerImpl server, SocketChannel chan) throws IOException {
+        public ReadStream(ServerImpl server, SocketChannel chan) throws IOException {
             this.channel = chan;
             this.server = server;
-            chanbuf = ByteBuffer.allocate (BUFSIZE);
+            chanbuf = ByteBuffer.allocate(BUFSIZE);
             chanbuf.clear();
             one = new byte[1];
             closed = marked = reset = false;
         }
 
-        public synchronized int read (byte[] b) throws IOException {
-            return read (b, 0, b.length);
+        public synchronized int read(byte[] b) throws IOException {
+            return read(b, 0, b.length);
         }
 
-        public synchronized int read () throws IOException {
-            int result = read (one, 0, 1);
+        public synchronized int read() throws IOException {
+            int result = read(one, 0, 1);
             if (result == 1) {
                 return one[0] & 0xFF;
             } else {
@@ -284,12 +319,12 @@ class Request {
             }
         }
 
-        public synchronized int read (byte[] b, int off, int srclen) throws IOException {
+        public synchronized int read(byte[] b, int off, int srclen) throws IOException {
 
             int canreturn, willreturn;
 
             if (closed)
-                throw new IOException ("Stream closed");
+                throw new IOException("Stream closed");
 
             if (eof) {
                 return -1;
@@ -300,30 +335,30 @@ class Request {
             Objects.checkFromIndexSize(off, srclen, b.length);
 
             if (reset) { /* satisfy from markBuf */
-                canreturn = markBuf.remaining ();
+                canreturn = markBuf.remaining();
                 willreturn = canreturn>srclen ? srclen : canreturn;
                 markBuf.get(b, off, willreturn);
                 if (canreturn == willreturn) {
                     reset = false;
                 }
             } else { /* satisfy from channel */
-                chanbuf.clear ();
+                chanbuf.clear();
                 if (srclen <  BUFSIZE) {
-                    chanbuf.limit (srclen);
+                    chanbuf.limit(srclen);
                 }
                 do {
-                    willreturn = channel.read (chanbuf);
+                    willreturn = channel.read(chanbuf);
                 } while (willreturn == 0);
                 if (willreturn == -1) {
                     eof = true;
                     return -1;
                 }
-                chanbuf.flip ();
+                chanbuf.flip();
                 chanbuf.get(b, off, willreturn);
 
                 if (marked) { /* copy into markBuf */
                     try {
-                        markBuf.put (b, off, willreturn);
+                        markBuf.put(b, off, willreturn);
                     } catch (BufferOverflowException e) {
                         marked = false;
                     }
@@ -332,14 +367,14 @@ class Request {
             return willreturn;
         }
 
-        public boolean markSupported () {
+        public boolean markSupported() {
             return true;
         }
 
         /* Does not query the OS socket */
-        public synchronized int available () throws IOException {
+        public synchronized int available() throws IOException {
             if (closed)
-                throw new IOException ("Stream is closed");
+                throw new IOException("Stream is closed");
 
             if (eof)
                 return -1;
@@ -350,31 +385,31 @@ class Request {
             return chanbuf.remaining();
         }
 
-        public void close () throws IOException {
+        public void close() throws IOException {
             if (closed) {
                 return;
             }
-            channel.close ();
+            channel.close();
             closed = true;
         }
 
-        public synchronized void mark (int readlimit) {
+        public synchronized void mark(int readlimit) {
             if (closed)
                 return;
             this.readlimit = readlimit;
-            markBuf = ByteBuffer.allocate (readlimit);
+            markBuf = ByteBuffer.allocate(readlimit);
             marked = true;
             reset = false;
         }
 
-        public synchronized void reset () throws IOException {
+        public synchronized void reset() throws IOException {
             if (closed )
                 return;
             if (!marked)
-                throw new IOException ("Stream not marked");
+                throw new IOException("Stream not marked");
             marked = false;
             reset = true;
-            markBuf.flip ();
+            markBuf.flip();
         }
     }
 
@@ -386,50 +421,50 @@ class Request {
         byte[] one;
         ServerImpl server;
 
-        public WriteStream (ServerImpl server, SocketChannel channel) throws IOException {
+        public WriteStream(ServerImpl server, SocketChannel channel) throws IOException {
             this.channel = channel;
             this.server = server;
             assert channel.isBlocking();
             closed = false;
             one = new byte [1];
-            buf = ByteBuffer.allocate (4096);
+            buf = ByteBuffer.allocate(4096);
         }
 
-        public synchronized void write (int b) throws IOException {
+        public synchronized void write(int b) throws IOException {
             one[0] = (byte)b;
             write (one, 0, 1);
         }
 
-        public synchronized void write (byte[] b) throws IOException {
+        public synchronized void write(byte[] b) throws IOException {
             write (b, 0, b.length);
         }
 
-        public synchronized void write (byte[] b, int off, int len) throws IOException {
+        public synchronized void write(byte[] b, int off, int len) throws IOException {
             int l = len;
             if (closed)
-                throw new IOException ("stream is closed");
+                throw new IOException("stream is closed");
 
             int cap = buf.capacity();
             if (cap < len) {
                 int diff = len - cap;
-                buf = ByteBuffer.allocate (2*(cap+diff));
+                buf = ByteBuffer.allocate(2*(cap+diff));
             }
             buf.clear();
-            buf.put (b, off, len);
-            buf.flip ();
+            buf.put(b, off, len);
+            buf.flip();
             int n;
-            while ((n = channel.write (buf)) < l) {
+            while ((n = channel.write(buf)) < l) {
                 l -= n;
                 if (l == 0)
                     return;
             }
         }
 
-        public void close () throws IOException {
+        public void close() throws IOException {
             if (closed)
                 return;
-            //server.logStackTrace ("Request.OS.close: isOpen="+channel.isOpen());
-            channel.close ();
+            //server.logStackTrace("Request.OS.close: isOpen="+channel.isOpen());
+            channel.close();
             closed = true;
         }
     }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/SSLStreams.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/SSLStreams.java
index 5cc16befa96..5f5eef0c684 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/SSLStreams.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/SSLStreams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,35 +53,35 @@ class SSLStreams {
     /* held by thread doing the hand-shake on this connection */
     Lock handshaking = new ReentrantLock();
 
-    SSLStreams (ServerImpl server, SSLContext sslctx, SocketChannel chan) throws IOException {
+    SSLStreams(ServerImpl server, SSLContext sslctx, SocketChannel chan) throws IOException {
         this.server = server;
         this.sslctx= sslctx;
         this.chan= chan;
         InetSocketAddress addr =
                 (InetSocketAddress)chan.socket().getRemoteSocketAddress();
-        engine = sslctx.createSSLEngine (addr.getHostName(), addr.getPort());
-        engine.setUseClientMode (false);
+        engine = sslctx.createSSLEngine(addr.getHostName(), addr.getPort());
+        engine.setUseClientMode(false);
         HttpsConfigurator cfg = server.getHttpsConfigurator();
-        configureEngine (cfg, addr);
-        wrapper = new EngineWrapper (chan, engine);
+        configureEngine(cfg, addr);
+        wrapper = new EngineWrapper(chan, engine);
     }
 
     @SuppressWarnings("deprecation")
-    private void configureEngine(HttpsConfigurator cfg, InetSocketAddress addr){
+    private void configureEngine(HttpsConfigurator cfg, InetSocketAddress addr) {
         if (cfg != null) {
-            Parameters params = new Parameters (cfg, addr);
+            Parameters params = new Parameters(cfg, addr);
 //BEGIN_TIGER_EXCLUDE
-            cfg.configure (params);
+            cfg.configure(params);
             SSLParameters sslParams = params.getSSLParameters();
             if (sslParams != null) {
-                engine.setSSLParameters (sslParams);
+                engine.setSSLParameters(sslParams);
             } else
 //END_TIGER_EXCLUDE
             {
                 /* tiger compatibility */
                 if (params.getCipherSuites() != null) {
                     try {
-                        engine.setEnabledCipherSuites (
+                        engine.setEnabledCipherSuites(
                             params.getCipherSuites()
                         );
                     } catch (IllegalArgumentException e) { /* LOG */}
@@ -93,7 +93,7 @@ class SSLStreams {
                 }
                 if (params.getProtocols() != null) {
                     try {
-                        engine.setEnabledProtocols (
+                        engine.setEnabledProtocols(
                             params.getProtocols()
                         );
                     } catch (IllegalArgumentException e) { /* LOG */}
@@ -106,11 +106,11 @@ class SSLStreams {
         InetSocketAddress addr;
         HttpsConfigurator cfg;
 
-        Parameters (HttpsConfigurator cfg, InetSocketAddress addr) {
+        Parameters(HttpsConfigurator cfg, InetSocketAddress addr) {
             this.addr = addr;
             this.cfg = cfg;
         }
-        public InetSocketAddress getClientAddress () {
+        public InetSocketAddress getClientAddress() {
             return addr;
         }
         public HttpsConfigurator getHttpsConfigurator() {
@@ -118,10 +118,10 @@ class SSLStreams {
         }
 //BEGIN_TIGER_EXCLUDE
         SSLParameters params;
-        public void setSSLParameters (SSLParameters p) {
+        public void setSSLParameters(SSLParameters p) {
             params = p;
         }
-        SSLParameters getSSLParameters () {
+        SSLParameters getSSLParameters() {
             return params;
         }
 //END_TIGER_EXCLUDE
@@ -130,14 +130,14 @@ class SSLStreams {
     /**
      * cleanup resources allocated inside this object
      */
-    void close () throws IOException {
+    void close() throws IOException {
         wrapper.close();
     }
 
     /**
      * return the SSL InputStream
      */
-    InputStream getInputStream () throws IOException {
+    InputStream getInputStream() throws IOException {
         if (is == null) {
             is = new InputStream();
         }
@@ -147,14 +147,14 @@ class SSLStreams {
     /**
      * return the SSL OutputStream
      */
-    OutputStream getOutputStream () throws IOException {
+    OutputStream getOutputStream() throws IOException {
         if (os == null) {
             os = new OutputStream();
         }
         return os;
     }
 
-    SSLEngine getSSLEngine () {
+    SSLEngine getSSLEngine() {
         return engine;
     }
 
@@ -183,11 +183,11 @@ class SSLStreams {
         PACKET, APPLICATION
     };
 
-    private ByteBuffer allocate (BufType type) {
-        return allocate (type, -1);
+    private ByteBuffer allocate(BufType type) {
+        return allocate(type, -1);
     }
 
-    private ByteBuffer allocate (BufType type, int len) {
+    private ByteBuffer allocate(BufType type, int len) {
         assert engine != null;
         synchronized (this) {
             int size;
@@ -210,7 +210,7 @@ class SSLStreams {
                 }
                 size = app_buf_size;
             }
-            return ByteBuffer.allocate (size);
+            return ByteBuffer.allocate(size);
         }
     }
 
@@ -222,10 +222,10 @@ class SSLStreams {
      * flip is set to true if the old buffer needs to be flipped
      * before it is copied.
      */
-    private ByteBuffer realloc (ByteBuffer b, boolean flip, BufType type) {
+    private ByteBuffer realloc(ByteBuffer b, boolean flip, BufType type) {
         synchronized (this) {
             int nsize = 2 * b.capacity();
-            ByteBuffer n = allocate (type, nsize);
+            ByteBuffer n = allocate(type, nsize);
             if (flip) {
                 b.flip();
             }
@@ -252,7 +252,7 @@ class SSLStreams {
         boolean closed = false;
         int u_remaining; // the number of bytes left in unwrap_src after an unwrap()
 
-        EngineWrapper (SocketChannel chan, SSLEngine engine) throws IOException {
+        EngineWrapper(SocketChannel chan, SSLEngine engine) throws IOException {
             this.chan = chan;
             this.engine = engine;
             wrapLock = new Object();
@@ -261,7 +261,7 @@ class SSLStreams {
             wrap_dst = allocate(BufType.PACKET);
         }
 
-        void close () throws IOException {
+        void close() throws IOException {
         }
 
         /* try to wrap and send the data in src. Handles OVERFLOW.
@@ -275,17 +275,17 @@ class SSLStreams {
 
         WrapperResult wrapAndSendX(ByteBuffer src, boolean ignoreClose) throws IOException {
             if (closed && !ignoreClose) {
-                throw new IOException ("Engine is closed");
+                throw new IOException("Engine is closed");
             }
             Status status;
             WrapperResult r = new WrapperResult();
             synchronized (wrapLock) {
                 wrap_dst.clear();
                 do {
-                    r.result = engine.wrap (src, wrap_dst);
+                    r.result = engine.wrap(src, wrap_dst);
                     status = r.result.getStatus();
                     if (status == Status.BUFFER_OVERFLOW) {
-                        wrap_dst = realloc (wrap_dst, true, BufType.PACKET);
+                        wrap_dst = realloc(wrap_dst, true, BufType.PACKET);
                     }
                 } while (status == Status.BUFFER_OVERFLOW);
                 if (status == Status.CLOSED && !ignoreClose) {
@@ -296,7 +296,7 @@ class SSLStreams {
                     int l = wrap_dst.remaining();
                     assert l == r.result.bytesProduced();
                     while (l>0) {
-                        l -= chan.write (wrap_dst);
+                        l -= chan.write(wrap_dst);
                     }
                 }
             }
@@ -313,7 +313,7 @@ class SSLStreams {
             WrapperResult r = new WrapperResult();
             r.buf = dst;
             if (closed) {
-                throw new IOException ("Engine is closed");
+                throw new IOException("Engine is closed");
             }
             boolean needData;
             if (u_remaining > 0) {
@@ -329,19 +329,19 @@ class SSLStreams {
                 do {
                     if (needData) {
                         do {
-                        x = chan.read (unwrap_src);
+                        x = chan.read(unwrap_src);
                         } while (x == 0);
                         if (x == -1) {
-                            throw new IOException ("connection closed for reading");
+                            throw new IOException("connection closed for reading");
                         }
                         unwrap_src.flip();
                     }
-                    r.result = engine.unwrap (unwrap_src, r.buf);
+                    r.result = engine.unwrap(unwrap_src, r.buf);
                     status = r.result.getStatus();
                     if (status == Status.BUFFER_UNDERFLOW) {
                         if (unwrap_src.limit() == unwrap_src.capacity()) {
                             /* buffer not big enough */
-                            unwrap_src = realloc (
+                            unwrap_src = realloc(
                                 unwrap_src, false, BufType.PACKET
                             );
                         } else {
@@ -349,12 +349,12 @@ class SSLStreams {
                              * data off the channel. Reset pointers
                              * for reading off SocketChannel
                              */
-                            unwrap_src.position (unwrap_src.limit());
-                            unwrap_src.limit (unwrap_src.capacity());
+                            unwrap_src.position(unwrap_src.limit());
+                            unwrap_src.limit(unwrap_src.capacity());
                         }
                         needData = true;
                     } else if (status == Status.BUFFER_OVERFLOW) {
-                        r.buf = realloc (r.buf, true, BufType.APPLICATION);
+                        r.buf = realloc(r.buf, true, BufType.APPLICATION);
                         needData = false;
                     } else if (status == Status.CLOSED) {
                         closed = true;
@@ -374,13 +374,13 @@ class SSLStreams {
      * all of the given user data has been sent and any handshake has been
      * completed. Caller should check if engine has been closed.
      */
-    public WrapperResult sendData (ByteBuffer src) throws IOException {
+    public WrapperResult sendData(ByteBuffer src) throws IOException {
         WrapperResult r=null;
         while (src.remaining() > 0) {
             r = wrapper.wrapAndSend(src);
             Status status = r.result.getStatus();
             if (status == Status.CLOSED) {
-                doClosure ();
+                doClosure();
                 return r;
             }
             HandshakeStatus hs_status = r.result.getHandshakeStatus();
@@ -399,16 +399,16 @@ class SSLStreams {
      * and returned. This call handles handshaking automatically.
      * Caller should check if engine has been closed.
      */
-    public WrapperResult recvData (ByteBuffer dst) throws IOException {
+    public WrapperResult recvData(ByteBuffer dst) throws IOException {
         /* we wait until some user data arrives */
         WrapperResult r = null;
         assert dst.position() == 0;
         while (dst.position() == 0) {
-            r = wrapper.recvAndUnwrap (dst);
+            r = wrapper.recvAndUnwrap(dst);
             dst = (r.buf != dst) ? r.buf: dst;
             Status status = r.result.getStatus();
             if (status == Status.CLOSED) {
-                doClosure ();
+                doClosure();
                 return r;
             }
 
@@ -416,7 +416,7 @@ class SSLStreams {
             if (hs_status != HandshakeStatus.FINISHED &&
                 hs_status != HandshakeStatus.NOT_HANDSHAKING)
             {
-                doHandshake (hs_status);
+                doHandshake(hs_status);
             }
         }
         dst.flip();
@@ -426,7 +426,7 @@ class SSLStreams {
     /* we've received a close notify. Need to call wrap to send
      * the response
      */
-    void doClosure () throws IOException {
+    void doClosure() throws IOException {
         try {
             handshaking.lock();
             ByteBuffer tmp = allocate(BufType.APPLICATION);
@@ -435,8 +435,8 @@ class SSLStreams {
             HandshakeStatus hs;
             do {
                 tmp.clear();
-                tmp.flip ();
-                r = wrapper.wrapAndSendX (tmp, true);
+                tmp.flip();
+                r = wrapper.wrapAndSendX(tmp, true);
                 hs = r.result.getHandshakeStatus();
                 st = r.result.getStatus();
             } while (st != Status.CLOSED &&
@@ -452,7 +452,7 @@ class SSLStreams {
      * is called with no data to send then there must be no problem
      */
     @SuppressWarnings("fallthrough")
-    void doHandshake (HandshakeStatus hs_status) throws IOException {
+    void doHandshake(HandshakeStatus hs_status) throws IOException {
         try {
             handshaking.lock();
             ByteBuffer tmp = allocate(BufType.APPLICATION);
@@ -478,7 +478,7 @@ class SSLStreams {
 
                     case NEED_UNWRAP:
                         tmp.clear();
-                        r = wrapper.recvAndUnwrap (tmp);
+                        r = wrapper.recvAndUnwrap(tmp);
                         if (r.buf != tmp) {
                             tmp = r.buf;
                         }
@@ -507,27 +507,27 @@ class SSLStreams {
 
         boolean needData = true;
 
-        InputStream () {
-            bbuf = allocate (BufType.APPLICATION);
+        InputStream() {
+            bbuf = allocate(BufType.APPLICATION);
         }
 
-        public int read (byte[] buf, int off, int len) throws IOException {
+        public int read(byte[] buf, int off, int len) throws IOException {
             if (closed) {
-                throw new IOException ("SSL stream is closed");
+                throw new IOException("SSL stream is closed");
             }
             if (eof) {
                 return -1;
             }
-            int available=0;
+            int available = 0;
             if (!needData) {
                 available = bbuf.remaining();
-                needData = (available==0);
+                needData = (available == 0);
             }
             if (needData) {
                 bbuf.clear();
-                WrapperResult r = recvData (bbuf);
-                bbuf = r.buf== bbuf? bbuf: r.buf;
-                if ((available=bbuf.remaining()) == 0) {
+                WrapperResult r = recvData(bbuf);
+                bbuf = r.buf == bbuf ? bbuf: r.buf;
+                if ((available = bbuf.remaining()) == 0) {
                     eof = true;
                     return -1;
                 } else {
@@ -538,26 +538,26 @@ class SSLStreams {
             if (len > available) {
                 len = available;
             }
-            bbuf.get (buf, off, len);
+            bbuf.get(buf, off, len);
             return len;
         }
 
-        public int available () throws IOException {
+        public int available() throws IOException {
             return bbuf.remaining();
         }
 
-        public boolean markSupported () {
+        public boolean markSupported() {
             return false; /* not possible with SSLEngine */
         }
 
-        public void reset () throws IOException {
-            throw new IOException ("mark/reset not supported");
+        public void reset() throws IOException {
+            throw new IOException("mark/reset not supported");
         }
 
-        public long skip (long s) throws IOException {
+        public long skip(long s) throws IOException {
             int n = (int)s;
             if (closed) {
-                throw new IOException ("SSL stream is closed");
+                throw new IOException("SSL stream is closed");
             }
             if (eof) {
                 return 0;
@@ -565,13 +565,13 @@ class SSLStreams {
             int ret = n;
             while (n > 0) {
                 if (bbuf.remaining() >= n) {
-                    bbuf.position (bbuf.position()+n);
+                    bbuf.position(bbuf.position()+n);
                     return ret;
                 } else {
                     n -= bbuf.remaining();
                     bbuf.clear();
-                    WrapperResult r = recvData (bbuf);
-                    bbuf = r.buf==bbuf? bbuf: r.buf;
+                    WrapperResult r = recvData(bbuf);
+                    bbuf = r.buf == bbuf ? bbuf: r.buf;
                 }
             }
             return ret; /* not reached */
@@ -582,22 +582,22 @@ class SSLStreams {
          * before this is called. Otherwise an exception will be thrown.
          * [Note. May need to revisit this. not quite the normal close() semantics
          */
-        public void close () throws IOException {
+        public void close() throws IOException {
             eof = true;
-            engine.closeInbound ();
+            engine.closeInbound();
         }
 
-        public int read (byte[] buf) throws IOException {
-            return read (buf, 0, buf.length);
+        public int read(byte[] buf) throws IOException {
+            return read(buf, 0, buf.length);
         }
 
         byte single[] = new byte [1];
 
-        public int read () throws IOException {
+        public int read() throws IOException {
             if (eof) {
                 return -1;
             }
-            int n = read (single, 0, 1);
+            int n = read(single, 0, 1);
             if (n <= 0) {
                 return -1;
             } else {
@@ -622,28 +622,28 @@ class SSLStreams {
 
         public void write(int b) throws IOException {
             single[0] = (byte)b;
-            write (single, 0, 1);
+            write(single, 0, 1);
         }
 
         public void write(byte b[]) throws IOException {
-            write (b, 0, b.length);
+            write(b, 0, b.length);
         }
         public void write(byte b[], int off, int len) throws IOException {
             if (closed) {
-                throw new IOException ("output stream is closed");
+                throw new IOException("output stream is closed");
             }
             while (len > 0) {
                 int l = len > buf.capacity() ? buf.capacity() : len;
                 buf.clear();
-                buf.put (b, off, l);
+                buf.put(b, off, l);
                 len -= l;
                 off += l;
                 buf.flip();
-                WrapperResult r = sendData (buf);
+                WrapperResult r = sendData(buf);
                 if (r.result.getStatus() == Status.CLOSED) {
                     closed = true;
                     if (len > 0) {
-                        throw new IOException ("output stream is closed");
+                        throw new IOException("output stream is closed");
                     }
                 }
             }
@@ -654,13 +654,13 @@ class SSLStreams {
         }
 
         public void close() throws IOException {
-            WrapperResult r=null;
+            WrapperResult r = null;
             engine.closeOutbound();
             closed = true;
             HandshakeStatus stat = HandshakeStatus.NEED_WRAP;
             buf.clear();
             while (stat == HandshakeStatus.NEED_WRAP) {
-                r = wrapper.wrapAndSend (buf);
+                r = wrapper.wrapAndSend(buf);
                 stat = r.result.getHandshakeStatus();
             }
             assert r.result.getStatus() == Status.CLOSED
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
index 217ae86f5d3..e8c8d336e03 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
@@ -45,6 +45,7 @@ import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
 import java.net.BindException;
 import java.net.InetSocketAddress;
+import java.net.ProtocolException;
 import java.net.ServerSocket;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -128,61 +129,61 @@ class ServerImpl {
     private final Logger logger;
     private Thread dispatcherThread;
 
-    ServerImpl (
+    ServerImpl(
         HttpServer wrapper, String protocol, InetSocketAddress addr, int backlog
     ) throws IOException {
 
         this.protocol = protocol;
         this.wrapper = wrapper;
-        this.logger = System.getLogger ("com.sun.net.httpserver");
-        ServerConfig.checkLegacyProperties (logger);
-        https = protocol.equalsIgnoreCase ("https");
+        this.logger = System.getLogger("com.sun.net.httpserver");
+        ServerConfig.checkLegacyProperties(logger);
+        https = protocol.equalsIgnoreCase("https");
         this.address = addr;
         contexts = new ContextList();
         schan = ServerSocketChannel.open();
         if (addr != null) {
             ServerSocket socket = schan.socket();
-            socket.bind (addr, backlog);
+            socket.bind(addr, backlog);
             bound = true;
         }
-        selector = Selector.open ();
-        schan.configureBlocking (false);
-        listenerKey = schan.register (selector, SelectionKey.OP_ACCEPT);
+        selector = Selector.open();
+        schan.configureBlocking(false);
+        listenerKey = schan.register(selector, SelectionKey.OP_ACCEPT);
         dispatcher = new Dispatcher();
-        idleConnections = Collections.synchronizedSet (new HashSet<HttpConnection>());
-        allConnections = Collections.synchronizedSet (new HashSet<HttpConnection>());
-        reqConnections = Collections.synchronizedSet (new HashSet<HttpConnection>());
-        rspConnections = Collections.synchronizedSet (new HashSet<HttpConnection>());
+        idleConnections = Collections.synchronizedSet(new HashSet<HttpConnection>());
+        allConnections = Collections.synchronizedSet(new HashSet<HttpConnection>());
+        reqConnections = Collections.synchronizedSet(new HashSet<HttpConnection>());
+        rspConnections = Collections.synchronizedSet(new HashSet<HttpConnection>());
         newlyAcceptedConnections = Collections.synchronizedSet(new HashSet<>());
-        timer = new Timer ("idle-timeout-task", true);
-        timer.schedule (new IdleTimeoutTask(), IDLE_TIMER_TASK_SCHEDULE, IDLE_TIMER_TASK_SCHEDULE);
+        timer = new Timer("idle-timeout-task", true);
+        timer.schedule(new IdleTimeoutTask(), IDLE_TIMER_TASK_SCHEDULE, IDLE_TIMER_TASK_SCHEDULE);
         if (reqRspTimeoutEnabled) {
-            timer1 = new Timer ("req-rsp-timeout-task", true);
-            timer1.schedule (new ReqRspTimeoutTask(), REQ_RSP_TIMER_SCHEDULE, REQ_RSP_TIMER_SCHEDULE);
+            timer1 = new Timer("req-rsp-timeout-task", true);
+            timer1.schedule(new ReqRspTimeoutTask(), REQ_RSP_TIMER_SCHEDULE, REQ_RSP_TIMER_SCHEDULE);
             logger.log(Level.DEBUG, "HttpServer request/response timeout task schedule ms: ",
                     REQ_RSP_TIMER_SCHEDULE);
-            logger.log (Level.DEBUG, "MAX_REQ_TIME:  "+MAX_REQ_TIME);
-            logger.log (Level.DEBUG, "MAX_RSP_TIME:  "+MAX_RSP_TIME);
+            logger.log(Level.DEBUG, "MAX_REQ_TIME:  "+MAX_REQ_TIME);
+            logger.log(Level.DEBUG, "MAX_RSP_TIME:  "+MAX_RSP_TIME);
         }
         events = new ArrayList<>();
-        logger.log (Level.DEBUG, "HttpServer created "+protocol+" "+ addr);
+        logger.log(Level.DEBUG, "HttpServer created "+protocol+" "+ addr);
     }
 
-    public void bind (InetSocketAddress addr, int backlog) throws IOException {
+    public void bind(InetSocketAddress addr, int backlog) throws IOException {
         if (bound) {
-            throw new BindException ("HttpServer already bound");
+            throw new BindException("HttpServer already bound");
         }
         if (addr == null) {
-            throw new NullPointerException ("null address");
+            throw new NullPointerException("null address");
         }
         ServerSocket socket = schan.socket();
-        socket.bind (addr, backlog);
+        socket.bind(addr, backlog);
         bound = true;
     }
 
-    public void start () {
+    public void start() {
         if (!bound || started || finished()) {
-            throw new IllegalStateException ("server in wrong state");
+            throw new IllegalStateException("server in wrong state");
         }
         if (executor == null) {
             executor = new DefaultExecutor();
@@ -192,39 +193,39 @@ class ServerImpl {
         dispatcherThread.start();
     }
 
-    public void setExecutor (Executor executor) {
+    public void setExecutor(Executor executor) {
         if (started) {
-            throw new IllegalStateException ("server already started");
+            throw new IllegalStateException("server already started");
         }
         this.executor = executor;
     }
 
     private static class DefaultExecutor implements Executor {
-        public void execute (Runnable task) {
+        public void execute(Runnable task) {
             task.run();
         }
     }
 
-    public Executor getExecutor () {
+    public Executor getExecutor() {
         return executor;
     }
 
-    public void setHttpsConfigurator (HttpsConfigurator config) {
+    public void setHttpsConfigurator(HttpsConfigurator config) {
         if (config == null) {
-            throw new NullPointerException ("null HttpsConfigurator");
+            throw new NullPointerException("null HttpsConfigurator");
         }
         if (started) {
-            throw new IllegalStateException ("server already started");
+            throw new IllegalStateException("server already started");
         }
         this.httpsConfig = config;
         sslContext = config.getSSLContext();
     }
 
-    public HttpsConfigurator getHttpsConfigurator () {
+    public HttpsConfigurator getHttpsConfigurator() {
         return httpsConfig;
     }
 
-    private final boolean finished(){
+    private final boolean finished() {
         // if the latch is 0, the server is finished
         return finishedLatch.getCount() == 0;
     }
@@ -242,9 +243,9 @@ class ServerImpl {
      *
      * @param delay maximum delay to wait for exchanges completion, in seconds
      */
-    public void stop (int delay) {
+    public void stop(int delay) {
         if (delay < 0) {
-            throw new IllegalArgumentException ("negative delay parameter");
+            throw new IllegalArgumentException("negative delay parameter");
         }
 
         logger.log(Level.TRACE, "stopping");
@@ -298,49 +299,49 @@ class ServerImpl {
 
     Dispatcher dispatcher;
 
-    public synchronized HttpContextImpl createContext (String path, HttpHandler handler) {
+    public synchronized HttpContextImpl createContext(String path, HttpHandler handler) {
         if (handler == null || path == null) {
-            throw new NullPointerException ("null handler, or path parameter");
+            throw new NullPointerException("null handler, or path parameter");
         }
-        HttpContextImpl context = new HttpContextImpl (protocol, path, handler, this);
-        contexts.add (context);
-        logger.log (Level.DEBUG, "context created: " + path);
+        HttpContextImpl context = new HttpContextImpl(protocol, path, handler, this);
+        contexts.add(context);
+        logger.log(Level.DEBUG, "context created: " + path);
         return context;
     }
 
-    public synchronized HttpContextImpl createContext (String path) {
+    public synchronized HttpContextImpl createContext(String path) {
         if (path == null) {
-            throw new NullPointerException ("null path parameter");
+            throw new NullPointerException("null path parameter");
         }
-        HttpContextImpl context = new HttpContextImpl (protocol, path, null, this);
-        contexts.add (context);
-        logger.log (Level.DEBUG, "context created: " + path);
+        HttpContextImpl context = new HttpContextImpl(protocol, path, null, this);
+        contexts.add(context);
+        logger.log(Level.DEBUG, "context created: " + path);
         return context;
     }
 
-    public synchronized void removeContext (String path) throws IllegalArgumentException {
+    public synchronized void removeContext(String path) throws IllegalArgumentException {
         if (path == null) {
-            throw new NullPointerException ("null path parameter");
+            throw new NullPointerException("null path parameter");
         }
-        contexts.remove (protocol, path);
-        logger.log (Level.DEBUG, "context removed: " + path);
+        contexts.remove(protocol, path);
+        logger.log(Level.DEBUG, "context removed: " + path);
     }
 
-    public synchronized void removeContext (HttpContext context) throws IllegalArgumentException {
+    public synchronized void removeContext(HttpContext context) throws IllegalArgumentException {
         if (!(context instanceof HttpContextImpl)) {
-            throw new IllegalArgumentException ("wrong HttpContext type");
+            throw new IllegalArgumentException("wrong HttpContext type");
         }
-        contexts.remove ((HttpContextImpl)context);
-        logger.log (Level.DEBUG, "context removed: " + context.getPath());
+        contexts.remove((HttpContextImpl)context);
+        logger.log(Level.DEBUG, "context removed: " + context.getPath());
     }
 
     public InetSocketAddress getAddress() {
         return (InetSocketAddress) schan.socket().getLocalSocketAddress();
     }
 
-    void addEvent (Event r) {
+    void addEvent(Event r) {
         synchronized (lolock) {
-            events.add (r);
+            events.add(r);
             selector.wakeup();
         }
     }
@@ -413,7 +414,7 @@ class ServerImpl {
      */
     class Dispatcher implements Runnable {
 
-        private void handleEvent (Event r) {
+        private void handleEvent(Event r) {
 
             // Stopping marking the state as finished if stop is requested,
             // termination is in progress and exchange count is 0
@@ -450,22 +451,22 @@ class ServerImpl {
                             requestCompleted(c);
                         }
                     }
-                    responseCompleted (c);
+                    responseCompleted(c);
                     if (t.close) {
                         c.close();
-                        allConnections.remove (c);
+                        allConnections.remove(c);
                     } else {
                         if (is.isDataBuffered()) {
                             /* don't re-enable the interestops, just handle it */
-                            requestStarted (c);
-                            handle (c.getChannel(), c);
+                            requestStarted(c);
+                            handle(c.getChannel(), c);
                         } else {
-                            connsToRegister.add (c);
+                            connsToRegister.add(c);
                         }
                     }
                 }
             } catch (IOException e) {
-                logger.log (
+                logger.log(
                     Level.TRACE, "Dispatcher (1)", e
                 );
                 c.close();
@@ -474,18 +475,18 @@ class ServerImpl {
 
         final ArrayList<HttpConnection> connsToRegister = new ArrayList<>();
 
-        void reRegister (HttpConnection c) {
+        void reRegister(HttpConnection c) {
             /* re-register with selector */
             try {
                 SocketChannel chan = c.getChannel();
-                chan.configureBlocking (false);
-                SelectionKey key = chan.register (selector, SelectionKey.OP_READ);
-                key.attach (c);
+                chan.configureBlocking(false);
+                SelectionKey key = chan.register(selector, SelectionKey.OP_READ);
+                key.attach(c);
                 c.selectionKey = key;
                 markIdle(c);
             } catch (IOException e) {
                 dprint(e);
-                logger.log (Level.TRACE, "Dispatcher(8)", e);
+                logger.log(Level.TRACE, "Dispatcher (8)", e);
                 c.close();
             }
         }
@@ -504,7 +505,7 @@ class ServerImpl {
 
                     if (list != null) {
                         for (Event r: list) {
-                            handleEvent (r);
+                            handleEvent(r);
                         }
                     }
 
@@ -525,7 +526,7 @@ class ServerImpl {
                     for (final SelectionKey key : selected.toArray(SelectionKey[]::new)) {
                         // remove the key from the original selected keys (live) Set
                         selected.remove(key);
-                        if (key.equals (listenerKey)) {
+                        if (key.equals(listenerKey)) {
                             if (terminating) {
                                 continue;
                             }
@@ -546,15 +547,15 @@ class ServerImpl {
                                 if (ServerConfig.noDelay()) {
                                     chan.socket().setTcpNoDelay(true);
                                 }
-                                chan.configureBlocking (false);
+                                chan.configureBlocking(false);
                                 SelectionKey newkey =
-                                    chan.register (selector, SelectionKey.OP_READ);
-                                HttpConnection c = new HttpConnection ();
+                                    chan.register(selector, SelectionKey.OP_READ);
+                                HttpConnection c = new HttpConnection();
                                 c.selectionKey = newkey;
-                                c.setChannel (chan);
-                                newkey.attach (c);
+                                c.setChannel(chan);
+                                newkey.attach(c);
                                 markNewlyAccepted(c);
-                                allConnections.add (c);
+                                allConnections.add(c);
                             }
                         } else {
                             try {
@@ -563,7 +564,7 @@ class ServerImpl {
                                     HttpConnection conn = (HttpConnection)key.attachment();
 
                                     key.cancel();
-                                    chan.configureBlocking (true);
+                                    chan.configureBlocking(true);
                                     // check if connection is being closed
                                     if (newlyAcceptedConnections.remove(conn)
                                             || idleConnections.remove(conn)) {
@@ -571,7 +572,7 @@ class ServerImpl {
                                         // connection. In either case, we mark that the request
                                         // has now started on this connection.
                                         requestStarted(conn);
-                                        handle (chan, conn);
+                                        handle(chan, conn);
                                     }
                                 } else {
                                     assert false : "Unexpected non-readable key:" + key;
@@ -586,56 +587,56 @@ class ServerImpl {
                     // call the selector just to process the cancelled keys
                     selector.selectNow();
                 } catch (IOException e) {
-                    logger.log (Level.TRACE, "Dispatcher (4)", e);
+                    logger.log(Level.TRACE, "Dispatcher (4)", e);
                 } catch (Exception e) {
-                    logger.log (Level.TRACE, "Dispatcher (7)", e);
+                    logger.log(Level.TRACE, "Dispatcher (7)", e);
                 }
             }
-            try {selector.close(); } catch (Exception e) {}
+            try { selector.close(); } catch (Exception e) {}
         }
 
-        private void handleException (SelectionKey key, Exception e) {
+        private void handleException(SelectionKey key, Exception e) {
             HttpConnection conn = (HttpConnection)key.attachment();
             if (e != null) {
-                logger.log (Level.TRACE, "Dispatcher (2)", e);
+                logger.log(Level.TRACE, "Dispatcher (2)", e);
             }
             closeConnection(conn);
         }
 
-        public void handle (SocketChannel chan, HttpConnection conn)
+        public void handle(SocketChannel chan, HttpConnection conn)
         {
             try {
-                Exchange t = new Exchange (chan, protocol, conn);
-                executor.execute (t);
+                Exchange t = new Exchange(chan, protocol, conn);
+                executor.execute(t);
             } catch (HttpError e1) {
-                logger.log (Level.TRACE, "Dispatcher (4)", e1);
+                logger.log(Level.TRACE, "Dispatcher (4)", e1);
                 closeConnection(conn);
             } catch (IOException e) {
-                logger.log (Level.TRACE, "Dispatcher (5)", e);
+                logger.log(Level.TRACE, "Dispatcher (5)", e);
                 closeConnection(conn);
             } catch (Throwable e) {
-                logger.log (Level.TRACE, "Dispatcher (6)", e);
+                logger.log(Level.TRACE, "Dispatcher (6)", e);
                 closeConnection(conn);
             }
         }
     }
 
-    static boolean debug = ServerConfig.debugEnabled ();
+    static boolean debug = ServerConfig.debugEnabled();
 
-    static synchronized void dprint (String s) {
+    static synchronized void dprint(String s) {
         if (debug) {
-            System.out.println (s);
+            System.out.println(s);
         }
     }
 
-    static synchronized void dprint (Exception e) {
+    static synchronized void dprint(Exception e) {
         if (debug) {
-            System.out.println (e);
+            System.out.println(e);
             e.printStackTrace();
         }
     }
 
-    Logger getLogger () {
+    Logger getLogger() {
         return logger;
     }
 
@@ -675,13 +676,13 @@ class ServerImpl {
         HttpContextImpl ctx;
         boolean rejected = false;
 
-        Exchange (SocketChannel chan, String protocol, HttpConnection conn) throws IOException {
+        Exchange(SocketChannel chan, String protocol, HttpConnection conn) throws IOException {
             this.chan = chan;
             this.connection = conn;
             this.protocol = protocol;
         }
 
-        public void run () {
+        public void run() {
             /* context will be null for new connections */
             logger.log(Level.TRACE, "exchange started");
 
@@ -702,7 +703,7 @@ class ServerImpl {
             String requestLine = null;
             SSLStreams sslStreams = null;
             try {
-                if (context != null ) {
+                if (context != null) {
                     this.rawin = connection.getInputStream();
                     this.rawout = connection.getRawOutputStream();
                     newconnection = false;
@@ -711,21 +712,21 @@ class ServerImpl {
                     newconnection = true;
                     if (https) {
                         if (sslContext == null) {
-                            logger.log (Level.WARNING,
+                            logger.log(Level.WARNING,
                                 "SSL connection received. No https context created");
-                            throw new HttpError ("No SSL context established");
+                            throw new HttpError("No SSL context established");
                         }
-                        sslStreams = new SSLStreams (ServerImpl.this, sslContext, chan);
+                        sslStreams = new SSLStreams(ServerImpl.this, sslContext, chan);
                         rawin = sslStreams.getInputStream();
                         rawout = sslStreams.getOutputStream();
                         engine = sslStreams.getSSLEngine();
                         connection.sslStreams = sslStreams;
                     } else {
                         rawin = new BufferedInputStream(
-                            new Request.ReadStream (
+                            new Request.ReadStream(
                                 ServerImpl.this, chan
                         ));
-                        rawout = new Request.WriteStream (
+                        rawout = new Request.WriteStream(
                             ServerImpl.this, chan
                         );
                     }
@@ -733,7 +734,16 @@ class ServerImpl {
                     connection.raw = rawin;
                     connection.rawout = rawout;
                 }
-                Request req = new Request (rawin, rawout);
+
+                Request req;
+                try {
+                    req = new Request(rawin, rawout, newconnection && !https);
+                } catch (ProtocolException pe) {
+                    logger.log(Level.DEBUG, "closing due to: " + pe);
+                    reject(Code.HTTP_BAD_REQUEST, "", pe.getMessage());
+                    return;
+                }
+
                 requestLine = req.requestLine();
                 if (requestLine == null) {
                     /* connection closed */
@@ -742,31 +752,31 @@ class ServerImpl {
                     return;
                 }
                 logger.log(Level.DEBUG, "Exchange request line: {0}", requestLine);
-                int space = requestLine.indexOf (' ');
+                int space = requestLine.indexOf(' ');
                 if (space == -1) {
-                    reject (Code.HTTP_BAD_REQUEST,
+                    reject(Code.HTTP_BAD_REQUEST,
                             requestLine, "Bad request line");
                     return;
                 }
-                String method = requestLine.substring (0, space);
+                String method = requestLine.substring(0, space);
                 int start = space+1;
                 space = requestLine.indexOf(' ', start);
                 if (space == -1) {
-                    reject (Code.HTTP_BAD_REQUEST,
+                    reject(Code.HTTP_BAD_REQUEST,
                             requestLine, "Bad request line");
                     return;
                 }
-                String uriStr = requestLine.substring (start, space);
+                String uriStr = requestLine.substring(start, space);
                 URI uri;
                 try {
-                    uri = new URI (uriStr);
+                    uri = new URI(uriStr);
                 } catch (URISyntaxException e3) {
                     reject(Code.HTTP_BAD_REQUEST,
                             requestLine, "URISyntaxException thrown");
                     return;
                 }
                 start = space+1;
-                String version = requestLine.substring (start);
+                String version = requestLine.substring(start);
                 Headers headers = req.headers();
                 /* check key for illegal characters */
                 for (var k : headers.keySet()) {
@@ -817,32 +827,32 @@ class ServerImpl {
                         requestCompleted(connection);
                     }
                 }
-                ctx = contexts.findContext (protocol, uri.getPath());
+                ctx = contexts.findContext(protocol, uri.getPath());
                 if (ctx == null) {
-                    reject (Code.HTTP_NOT_FOUND,
+                    reject(Code.HTTP_NOT_FOUND,
                             requestLine, "No context found for request");
                     return;
                 }
-                connection.setContext (ctx);
+                connection.setContext(ctx);
                 if (ctx.getHandler() == null) {
-                    reject (Code.HTTP_INTERNAL_ERROR,
+                    reject(Code.HTTP_INTERNAL_ERROR,
                             requestLine, "No handler for context");
                     return;
                 }
-                tx = new ExchangeImpl (
+                tx = new ExchangeImpl(
                     method, uri, req, clen, connection
                 );
                 String chdr = headers.getFirst("Connection");
                 Headers rheaders = tx.getResponseHeaders();
 
-                if (chdr != null && chdr.equalsIgnoreCase ("close")) {
+                if (chdr != null && chdr.equalsIgnoreCase("close")) {
                     tx.close = true;
                 }
-                if (version.equalsIgnoreCase ("http/1.0")) {
+                if (version.equalsIgnoreCase("http/1.0")) {
                     tx.http10 = true;
                     if (chdr == null) {
                         tx.close = true;
-                        rheaders.set ("Connection", "close");
+                        rheaders.set("Connection", "close");
                     } else if (chdr.equalsIgnoreCase("keep-alive")) {
                         rheaders.set("Connection", "keep-alive");
                         int idleSeconds = (int) (ServerConfig.getIdleIntervalMillis() / 1000);
@@ -852,7 +862,7 @@ class ServerImpl {
                 }
 
                 if (newconnection) {
-                    connection.setParameters (
+                    connection.setParameters(
                         rawin, rawout, chan, engine, sslStreams,
                         sslContext, protocol, ctx, rawin
                     );
@@ -863,9 +873,9 @@ class ServerImpl {
                  * be involved in this process.
                  */
                 String exp = headers.getFirst("Expect");
-                if (exp != null && exp.equalsIgnoreCase ("100-continue")) {
-                    logReply (100, requestLine, null);
-                    sendReply (
+                if (exp != null && exp.equalsIgnoreCase("100-continue")) {
+                    logReply(100, requestLine, null);
+                    sendReply(
                         Code.HTTP_CONTINUE, false, null
                     );
                 }
@@ -880,19 +890,19 @@ class ServerImpl {
                 final List<Filter> uf = ctx.getFilters();
 
                 final Filter.Chain sc = new Filter.Chain(sf, ctx.getHandler());
-                final Filter.Chain uc = new Filter.Chain(uf, new LinkHandler (sc));
+                final Filter.Chain uc = new Filter.Chain(uf, new LinkHandler(sc));
 
                 /* set up the two stream references */
                 tx.getRequestBody();
                 tx.getResponseBody();
                 if (https) {
-                    uc.doFilter (new HttpsExchangeImpl (tx));
+                    uc.doFilter(new HttpsExchangeImpl(tx));
                 } else {
-                    uc.doFilter (new HttpExchangeImpl (tx));
+                    uc.doFilter(new HttpExchangeImpl(tx));
                 }
 
             } catch (Exception e) {
-                logger.log (Level.TRACE, "ServerImpl.Exchange", e);
+                logger.log(Level.TRACE, "ServerImpl.Exchange", e);
                 if (tx == null || !tx.writefinished) {
                     closeConnection(connection);
                 }
@@ -907,59 +917,59 @@ class ServerImpl {
         class LinkHandler implements HttpHandler {
             Filter.Chain nextChain;
 
-            LinkHandler (Filter.Chain nextChain) {
+            LinkHandler(Filter.Chain nextChain) {
                 this.nextChain = nextChain;
             }
 
-            public void handle (HttpExchange exchange) throws IOException {
-                nextChain.doFilter (exchange);
+            public void handle(HttpExchange exchange) throws IOException {
+                nextChain.doFilter(exchange);
             }
         }
 
-        void reject (int code, String requestStr, String message) {
+        void reject(int code, String requestStr, String message) {
             rejected = true;
-            logReply (code, requestStr, message);
-            sendReply (
+            logReply(code, requestStr, message);
+            sendReply(
                 code, true, "<h1>"+code+Code.msg(code)+"</h1>"+message
             );
         }
 
-        void sendReply (
+        void sendReply(
             int code, boolean closeNow, String text)
         {
             try {
-                StringBuilder builder = new StringBuilder (512);
-                builder.append ("HTTP/1.1 ")
-                    .append (code).append (Code.msg(code)).append ("\r\n");
+                StringBuilder builder = new StringBuilder(512);
+                builder.append("HTTP/1.1 ")
+                    .append(code).append(Code.msg(code)).append("\r\n");
 
                 if (text != null && text.length() != 0) {
-                    builder.append ("Content-Length: ")
-                        .append (text.length()).append ("\r\n")
-                        .append ("Content-Type: text/html\r\n");
+                    builder.append("Content-Length: ")
+                        .append(text.length()).append("\r\n")
+                        .append("Content-Type: text/html\r\n");
                 } else {
-                    builder.append ("Content-Length: 0\r\n");
+                    builder.append("Content-Length: 0\r\n");
                     text = "";
                 }
                 if (closeNow) {
-                    builder.append ("Connection: close\r\n");
+                    builder.append("Connection: close\r\n");
                 }
-                builder.append ("\r\n").append (text);
+                builder.append("\r\n").append(text);
                 String s = builder.toString();
                 byte[] b = s.getBytes(ISO_8859_1);
-                rawout.write (b);
+                rawout.write(b);
                 rawout.flush();
                 if (closeNow) {
                     closeConnection(connection);
                 }
             } catch (IOException e) {
-                logger.log (Level.TRACE, "ServerImpl.sendReply", e);
+                logger.log(Level.TRACE, "ServerImpl.sendReply", e);
                 closeConnection(connection);
             }
         }
 
     }
 
-    void logReply (int code, String requestStr, String text) {
+    void logReply(int code, String requestStr, String text) {
         if (!logger.isLoggable(Level.DEBUG)) {
             return;
         }
@@ -968,18 +978,18 @@ class ServerImpl {
         }
         String r;
         if (requestStr.length() > 80) {
-           r = requestStr.substring (0, 80) + "<TRUNCATED>";
+           r = requestStr.substring(0, 80) + "<TRUNCATED>";
         } else {
            r = requestStr;
         }
         String message = r + " [" + code + " " +
                     Code.msg(code) + "] ("+text+")";
-        logger.log (Level.DEBUG, message);
+        logger.log(Level.DEBUG, message);
     }
 
     private int exchangeCount = 0;
 
-    synchronized void startExchange () {
+    synchronized void startExchange() {
         exchangeCount ++;
     }
 
@@ -987,20 +997,20 @@ class ServerImpl {
         return exchangeCount;
     }
 
-    synchronized int endExchange () {
+    synchronized int endExchange() {
         exchangeCount --;
         assert exchangeCount >= 0;
         return exchangeCount;
     }
 
-    HttpServer getWrapper () {
+    HttpServer getWrapper() {
         return wrapper;
     }
 
-    void requestStarted (HttpConnection c) {
+    void requestStarted(HttpConnection c) {
         c.reqStartedTime = System.currentTimeMillis();
-        c.setState (State.REQUEST);
-        reqConnections.add (c);
+        c.setState(State.REQUEST);
+        reqConnections.add(c);
     }
 
     void markIdle(HttpConnection c) {
@@ -1037,21 +1047,21 @@ class ServerImpl {
     // that ensures the client reads the response in a timely
     // fashion.
 
-    void requestCompleted (HttpConnection c) {
+    void requestCompleted(HttpConnection c) {
         State s = c.getState();
         assert s == State.REQUEST : "State is not REQUEST ("+s+")";
-        reqConnections.remove (c);
+        reqConnections.remove(c);
         c.rspStartedTime = System.currentTimeMillis();
-        rspConnections.add (c);
-        c.setState (State.RESPONSE);
+        rspConnections.add(c);
+        c.setState(State.RESPONSE);
     }
 
     // called after response has been sent
-    void responseCompleted (HttpConnection c) {
+    void responseCompleted(HttpConnection c) {
         State s = c.getState();
         assert s == State.RESPONSE : "State is not RESPONSE ("+s+")";
-        rspConnections.remove (c);
-        c.setState (State.IDLE);
+        rspConnections.remove(c);
+        c.setState(State.IDLE);
     }
 
     /**
@@ -1059,7 +1069,7 @@ class ServerImpl {
      * TimerTask run every CLOCK_TICK ms
      */
     class IdleTimeoutTask extends TimerTask {
-        public void run () {
+        public void run() {
             closeConnections(idleConnections, IDLE_INTERVAL);
             // if any newly accepted connection has been idle (i.e. no byte has been sent on that
             // connection during the configured idle timeout period) then close it as well
@@ -1095,20 +1105,20 @@ class ServerImpl {
     class ReqRspTimeoutTask extends TimerTask {
 
         // runs every TIMER_MILLIS
-        public void run () {
+        public void run() {
             ArrayList<HttpConnection> toClose = new ArrayList<>();
             final long currentTime = System.currentTimeMillis();
             synchronized (reqConnections) {
                 if (MAX_REQ_TIME != -1) {
                     for (HttpConnection c : reqConnections) {
                         if (currentTime - c.reqStartedTime >= MAX_REQ_TIME) {
-                            toClose.add (c);
+                            toClose.add(c);
                         }
                     }
                     for (HttpConnection c : toClose) {
-                        logger.log (Level.DEBUG, "closing: no request: " + c);
-                        reqConnections.remove (c);
-                        allConnections.remove (c);
+                        logger.log(Level.DEBUG, "closing: no request: " + c);
+                        reqConnections.remove(c);
+                        allConnections.remove(c);
                         c.close();
                     }
                 }
@@ -1118,13 +1128,13 @@ class ServerImpl {
                 if (MAX_RSP_TIME != -1) {
                     for (HttpConnection c : rspConnections) {
                         if (currentTime - c.rspStartedTime >= MAX_RSP_TIME) {
-                            toClose.add (c);
+                            toClose.add(c);
                         }
                     }
                     for (HttpConnection c : toClose) {
-                        logger.log (Level.DEBUG, "closing: no response: " + c);
-                        rspConnections.remove (c);
-                        allConnections.remove (c);
+                        logger.log(Level.DEBUG, "closing: no response: " + c);
+                        rspConnections.remove(c);
+                        allConnections.remove(c);
                         c.close();
                     }
                 }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java
index 7bfc39c84a1..ecda32ecc31 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java
@@ -40,30 +40,30 @@ class UndefLengthOutputStream extends FilterOutputStream
     private boolean closed = false;
     ExchangeImpl t;
 
-    UndefLengthOutputStream (ExchangeImpl t, OutputStream src) {
-        super (src);
+    UndefLengthOutputStream(ExchangeImpl t, OutputStream src) {
+        super(src);
         this.t = t;
     }
 
-    public void write (int b) throws IOException {
+    public void write(int b) throws IOException {
         if (closed) {
-            throw new IOException ("stream closed");
+            throw new IOException("stream closed");
         }
         out.write(b);
     }
 
-    public void write (byte[]b, int off, int len) throws IOException {
+    public void write(byte[] b, int off, int len) throws IOException {
         Objects.checkFromIndexSize(off, len, b.length);
         if (len == 0) {
             return;
         }
         if (closed) {
-            throw new IOException ("stream closed");
+            throw new IOException("stream closed");
         }
         out.write(b, off, len);
     }
 
-    public void close () throws IOException {
+    public void close() throws IOException {
         if (closed) {
             return;
         }
@@ -76,7 +76,7 @@ class UndefLengthOutputStream extends FilterOutputStream
             } catch (IOException e) {}
         }
         Event e = new Event.WriteFinished(t);
-        t.getHttpContext().getServerImpl().addEvent (e);
+        t.getHttpContext().getServerImpl().addEvent(e);
     }
 
     // flush is a pass-through
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/UnmodifiableHeaders.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/UnmodifiableHeaders.java
index 91bfc186828..503004b35e0 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/UnmodifiableHeaders.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/UnmodifiableHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,32 +62,32 @@ public class UnmodifiableHeaders extends Headers {
 
     @Override
     public List<String> put(String key, List<String> value) {
-        throw new UnsupportedOperationException ("unsupported operation");
+        throw new UnsupportedOperationException("unsupported operation");
     }
 
     @Override
     public void add(String key, String value) {
-        throw new UnsupportedOperationException ("unsupported operation");
+        throw new UnsupportedOperationException("unsupported operation");
     }
 
     @Override
     public void set(String key, String value) {
-        throw new UnsupportedOperationException ("unsupported operation");
+        throw new UnsupportedOperationException("unsupported operation");
     }
 
     @Override
     public List<String> remove(Object key) {
-        throw new UnsupportedOperationException ("unsupported operation");
+        throw new UnsupportedOperationException("unsupported operation");
     }
 
     @Override
     public void putAll(Map<? extends String,? extends List<String>> t)  {
-        throw new UnsupportedOperationException ("unsupported operation");
+        throw new UnsupportedOperationException("unsupported operation");
     }
 
     @Override
     public void clear() {
-        throw new UnsupportedOperationException ("unsupported operation");
+        throw new UnsupportedOperationException("unsupported operation");
     }
 
     @Override
@@ -106,19 +106,19 @@ public class UnmodifiableHeaders extends Headers {
 
     @Override
     public boolean replace(String key, List<String> oldValue, List<String> newValue) {
-        throw new UnsupportedOperationException ("unsupported operation");
+        throw new UnsupportedOperationException("unsupported operation");
     }
 
     @Override
     public void replaceAll(BiFunction<? super String, ? super List<String>, ? extends List<String>> function) {
-        throw new UnsupportedOperationException ("unsupported operation");
+        throw new UnsupportedOperationException("unsupported operation");
     }
 
     @Override
-    public boolean equals(Object o) {return headers.equals(o);}
+    public boolean equals(Object o) { return headers.equals(o); }
 
     @Override
-    public int hashCode() {return headers.hashCode();}
+    public int hashCode() { return headers.hashCode(); }
 
     @Override
     public String toString() {
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java
index 3a3654d4a73..cbf032e8398 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java
@@ -367,7 +367,7 @@ public final class FileServerHandler implements HttpHandler {
 
     // A non-exhaustive map of reserved-HTML and special characters to their
     // equivalent entity.
-    private static final Map<Integer,String> RESERVED_CHARS = Map.of(
+    private static final Map<Integer, String> RESERVED_CHARS = Map.of(
             (int) '&'  , "&amp;"   ,
             (int) '<'  , "&lt;"    ,
             (int) '>'  , "&gt;"    ,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java
index 45773cd29db..350931cd443 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16.java
index 335cbef2331..dfdd2a304c6 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16.java
@@ -260,6 +260,9 @@ public final class Float16
      * Float#toString(float)} in the handling of special values
      * (signed zeros, infinities, and NaN) and the generation of a
      * decimal string that will convert back to the argument value.
+     * However, the range for plain notation is defined to be the interval
+     * [10<sup>-3</sup>, 10<sup>3</sup>) rather than the interval used
+     * for {@code float} and {@code double}.
      *
      * @param   f16   the {@code Float16} to be converted.
      * @return a string representation of the argument.
@@ -2106,7 +2109,7 @@ public final class Float16
             int h = (int) (f * 107_375L >>> 30);
             int l = f - 10_000 * h;
 
-            if (0 < e && e <= 7) {
+            if (0 < e && e <= 3) {
                 return toChars1(h, l, e);
             }
             if (-3 < e && e <= 0) {
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Vector.java
index 0e4516efa86..68b4a35067c 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMask.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMask.java
index 5695dff62fb..eb231597e85 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMask.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMath.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMath.java
index 67c9387dfd6..814ca2e2043 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMath.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java
index f4da4f42934..34ab05046e0 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorSpecies.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorSpecies.java
index e14cdecbc4a..e80bbf231ea 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorSpecies.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorSpecies.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/package-info.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/package-info.java
index 859c66c5f63..f257c222eca 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/package-info.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.jvmstat/macosx/classes/sun/jvmstat/PlatformSupportImpl.java b/src/jdk.internal.jvmstat/macosx/classes/sun/jvmstat/PlatformSupportImpl.java
new file mode 100644
index 00000000000..f858fde4dce
--- /dev/null
+++ b/src/jdk.internal.jvmstat/macosx/classes/sun/jvmstat/PlatformSupportImpl.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, BELLSOFT. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.jvmstat;
+
+import java.io.IOException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+/*
+ * macOS specific implementation of the PlatformSupport routines
+ * providing temporary directory support.
+ */
+public class PlatformSupportImpl extends PlatformSupport {
+
+    private static final String VAR_FOLDERS_PATH = "/var/folders";
+    private static final String USER_NAME_SYSTEM_PROPERTY = "user.name";
+    private static final String USER_NAME_ROOT = "root";
+    private static final String DIRHELPER_TEMP_STR = "T";
+
+    private static final boolean isCurrentUserRoot =
+            System.getProperty(USER_NAME_SYSTEM_PROPERTY).equals(USER_NAME_ROOT);
+
+    public PlatformSupportImpl() {
+        super();
+    }
+
+    /*
+     * Return a list of the temporary directories that the VM uses
+     * for the attach and perf data files.
+     *
+     * This function returns the traditional temp directory. Additionally,
+     * when called by root, it returns other temporary directories of non-root
+     * users.
+     *
+     * macOS per-user temp directories are located under /var/folders
+     * and have the form /var/folders/<BUCKET>/<ENCODED_UUID_UID>/T
+     */
+    @Override
+    public List<String> getTemporaryDirectories(int pid) {
+        if (!isCurrentUserRoot) {
+            // early exit for non-root
+            return List.of(PlatformSupport.getTemporaryDirectory());
+        }
+        List<String> result = new ArrayList<>();
+        try (DirectoryStream<Path> bs = Files.newDirectoryStream(Path.of(VAR_FOLDERS_PATH))) {
+            for (Path bucket : bs) {
+                try (DirectoryStream<Path> encUuids = Files.newDirectoryStream(bucket)) {
+                    for (Path encUuid : encUuids) {
+                        try {
+                            Path tempDir = encUuid.resolve(DIRHELPER_TEMP_STR);
+                            if (Files.isDirectory(tempDir) && Files.isReadable(tempDir)) {
+                                result.add(tempDir.toString());
+                            }
+                        } catch (Exception ignore) { // ignored unreadable bucket/encUuid, continue
+                        }
+                    }
+                } catch (IOException ignore) { // IOException ignored, continue to the next bucket
+                }
+            }
+        } catch (Exception ignore) { // var/folders directory is inaccessible / other errors
+        }
+        return result.isEmpty() ? List.of(PlatformSupport.getTemporaryDirectory()) : result;
+    }
+}
diff --git a/src/jdk.internal.jvmstat/share/classes/module-info.java b/src/jdk.internal.jvmstat/share/classes/module-info.java
index 9e12c98b016..d9e1bc68008 100644
--- a/src/jdk.internal.jvmstat/share/classes/module-info.java
+++ b/src/jdk.internal.jvmstat/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,8 @@ module jdk.internal.jvmstat {
         jdk.jstatd;
     exports sun.jvmstat.perfdata.monitor to
         jdk.jstatd;
+    exports sun.jvmstat to
+        jdk.attach;
 
     uses sun.jvmstat.monitor.MonitoredHostService;
 
diff --git a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java
index ba02e792f3e..9a0e31e4c10 100644
--- a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java
+++ b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
index 7d9ba8d2251..f8cc98268a0 100644
--- a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
+++ b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
@@ -1,6 +1,6 @@
 /*
 *
-* Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java
index 46c4b8e3168..ba891b184e8 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/BytecodeFrame.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/BytecodeFrame.java
index 8c698b4ee3d..7b0d3d75387 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/BytecodeFrame.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/BytecodeFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/VirtualObject.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/VirtualObject.java
index 1033fa559f8..6f91bfb6c1f 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/VirtualObject.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/VirtualObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/site/Site.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/site/Site.java
index 7d1239fea0e..d12a78e5106 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/site/Site.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/site/Site.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
index b25f7a09256..ee578cfd5f1 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCode.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCode.java
index 6d1f16d5bd2..dffd54e3117 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCode.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCodeStream.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCodeStream.java
index 2cd5e839ee8..565b38de96e 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCodeStream.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCodeStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java
index e0e93b0f8bc..f532617a09e 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJavaType.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJavaType.java
index 792c7bc00a2..d8fcb61079c 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJavaType.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJavaType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotObjectConstant.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotObjectConstant.java
index bed38f91988..ca54e8325f3 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotObjectConstant.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotObjectConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java
index 1dcc969b3e6..9a067375245 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
index b75edb9df08..ba29cad7849 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
index 224e8b1a070..3c3aaf830fa 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaType.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaType.java
index ab634568a84..e8c7107cd89 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaType.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java
index 1fc5f1bfd6a..5cad3d05bf5 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotSpeculationLog.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotSpeculationLog.java
index 4849750337c..bf9b1875663 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotSpeculationLog.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotSpeculationLog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java
index 15bd58a5a5d..5f921c767dd 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/VMField.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/VMField.java
index 21755445ca0..da9db1ddc32 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/VMField.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/VMField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ConstantPool.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ConstantPool.java
index 0b7fd70762d..ebd0df403a3 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ConstantPool.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ConstantPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/EncodedSpeculationReason.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/EncodedSpeculationReason.java
index 2e72896b31d..02f91082fd5 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/EncodedSpeculationReason.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/EncodedSpeculationReason.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaMethod.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaMethod.java
index f401bc30f83..dcd80170ba9 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaMethod.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaType.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaType.java
index cdb24c5f1ad..4e11cce4f68 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaType.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/JVMCIServiceLocator.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/JVMCIServiceLocator.java
index d5ff0bba9b3..98856337cec 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/JVMCIServiceLocator.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/JVMCIServiceLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/Services.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/Services.java
index 22f8eec7d12..c2bccb1bac1 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/Services.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/Services.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_de.properties b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_de.properties
index c5d9f41ee85..2b76f1408fa 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_de.properties
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_de.properties
@@ -220,3 +220,4 @@ entry.1.is.signed.in.jarinputstream.but.is.not.signed.in.jarfile=Eintrag %s ist
 jar.contains.internal.inconsistencies.result.in.different.contents.via.jarfile.and.jarinputstream=Diese JAR-Datei enthält interne Inkonsistenzen, die zu anderem Inhalt beim Lesen über JarFile als beim Lesen über JarInputStream führen können:
 signature.verification.failed.on.entry.1.when.reading.via.jarinputstream=Signaturverifizierung war für Eintrag %s beim Lesen über JarInputStream nicht erfolgreich
 signature.verification.failed.on.entry.1.when.reading.via.jarfile=Signaturverifizierung war für Eintrag %s beim Lesen über JarFile nicht erfolgreich
+jks.storetype.warning=%1$s verwendet veraltete kryptografische Algorithmen und wird in einer zukünftigen Version entfernt. Migrieren Sie zu PKCS12 mit:\nkeytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_ja.properties b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_ja.properties
index 97ab6a918cb..f2a5ce39be3 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_ja.properties
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_ja.properties
@@ -220,3 +220,4 @@ entry.1.is.signed.in.jarinputstream.but.is.not.signed.in.jarfile=エントリ%s
 jar.contains.internal.inconsistencies.result.in.different.contents.via.jarfile.and.jarinputstream=このJARファイルには内部的な不整合があるため、JarFileとJarInputStreamから読み取る場合にコンテンツが異なる可能性があります:
 signature.verification.failed.on.entry.1.when.reading.via.jarinputstream=JarInputStreamを介して読み取るときに署名検証がエントリ%sで失敗しました
 signature.verification.failed.on.entry.1.when.reading.via.jarfile=JarFileを介して読み取るときに署名検証がエントリ%sで失敗しました
+jks.storetype.warning=%1$sは古い暗号化アルゴリズムを使用しているため、将来のリリースで削除されます。次を使用してPKCS12に移行します:\nkeytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_zh_CN.properties b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_zh_CN.properties
index 378cc3ba9fc..f780bd1f1c3 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_zh_CN.properties
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_zh_CN.properties
@@ -220,3 +220,4 @@ entry.1.is.signed.in.jarinputstream.but.is.not.signed.in.jarfile=条目 %s 已
 jar.contains.internal.inconsistencies.result.in.different.contents.via.jarfile.and.jarinputstream=此 JAR 文件包含内部不一致，通过 JarFile 和 JarInputStream 读取时可能会导致内容不同：
 signature.verification.failed.on.entry.1.when.reading.via.jarinputstream=通过 JarInputStream 读取时，条目 %s 的签名验证失败
 signature.verification.failed.on.entry.1.when.reading.via.jarfile=通过 JarFile 读取时，条目 %s 的签名验证失败
+jks.storetype.warning=%1$s 使用的加密算法已过时，将在未来发行版中删除。请使用以下命令迁移到 PKCS12：\nkeytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties
index 2a5786e10b4..292ec9c963d 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties
@@ -80,6 +80,8 @@ error.validator.info.opens.notequal=module-info.class in einem versionierten Ver
 error.validator.info.provides.notequal=module-info.class in einem versionierten Verzeichnis enthält unterschiedliche "provides"
 error.validator.info.version.notequal={0}: module-info.class in einem versionierten Verzeichnis enthält unterschiedlichen "version"-Wert
 error.validator.info.manclass.notequal={0}: module-info.class in einem versionierten Verzeichnis enthält unterschiedlichen "main-class"-Wert
+error.validator.metainf.wrong.position=Eintrag META-INF/ an Position 0 erwartet, aber an Position {0} gefunden
+error.validator.manifest.wrong.position=Eintrag META-INF/MANIFEST.MF an Position 0 oder 1 erwartet, aber an Position {0} gefunden
 warn.validator.identical.entry=Warnung: Eintrag {0} enthält eine Klasse, die mit\neinem bereits in der JAR-Datei enthaltenen Eintrag identisch ist
 warn.validator.resources.with.same.name=Warnung: Eintrag {0}, mehrere Ressourcen mit demselben Namen
 warn.validator.concealed.public.class=Warnung: Eintrag {0} ist eine öffentliche Klasse\nin einem verdeckten Package. Wenn Sie diese JAR-Datei in den Classpath einfügen, kommt es\nzu nicht kompatiblen öffentlichen Schnittstellen
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
index c7d7c14613a..0d0f91ad791 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
@@ -80,6 +80,8 @@ error.validator.info.opens.notequal=バージョニング・ディレクトリ
 error.validator.info.provides.notequal=バージョニングされたディレクトリのmodule-info.classに異なる"provides"が含まれています
 error.validator.info.version.notequal={0}: バージョニングされたディレクトリのmodule-info.classに異なる"version"が含まれています
 error.validator.info.manclass.notequal={0}: バージョニングされたディレクトリのmodule-info.classに異なる"main-class"が含まれています
+error.validator.metainf.wrong.position=エントリMETA-INF/は0の位置にある必要がありますが、見つかりました: {0}
+error.validator.manifest.wrong.position=エントリMETA-INF/MANIFEST.MFは0または1の位置にある必要がありますが、位置: {0}で見つかりました
 warn.validator.identical.entry=警告 : エントリ{0}には、jarにすでに存在する\nエントリと同じクラスが含まれます
 warn.validator.resources.with.same.name=警告 : エントリ{0}、同じ名前を持つ複数のリソース
 warn.validator.concealed.public.class=警告 : エントリ{0}は、隠しパッケージ内のpublicクラスです。\nクラスパスにこのjarを配置すると、互換性のない\npublicインタフェースが生成されます
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
index 1979f3e2386..41833d28bfc 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
@@ -80,6 +80,8 @@ error.validator.info.opens.notequal=版本化目录中的 module-info.class 包
 error.validator.info.provides.notequal=版本化目录中的 module-info.class 包含不同的 "provides"
 error.validator.info.version.notequal={0}: 版本化目录中的 module-info.class 包含不同的 "version"
 error.validator.info.manclass.notequal={0}: 版本化目录中的 module-info.class 包含不同的 "main-class"
+error.validator.metainf.wrong.position=条目 META-INF/ 应位于位置 0 处，但发现：{0}
+error.validator.manifest.wrong.position=条目 META-INF/MANIFEST.MF 应位于位置 0 或 1 处，但发现该条目位于位置 {0} 处
 warn.validator.identical.entry=警告: 条目 {0} 包含与 jar 中的\n现有条目相同的类
 warn.validator.resources.with.same.name=警告: 条目 {0}, 多个资源具有相同名称
 warn.validator.concealed.public.class=警告: 条目 {0} 是已隐藏程序包中的\n公共类, 将此 jar 放置在类路径中\n将导致公共接口不兼容
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java
index 6ad1d2107c6..edc2b4f1f3f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
index 60c99dfa76a..c91ee348c11 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
index 1f2c4d97dd3..86ac3a892fd 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
@@ -243,8 +243,12 @@ public abstract class HtmlDocletWriter {
         if (generating) {
             writeGenerating();
         }
+        CURRENT_PATH.set(path.getPath());
     }
 
+    /** Temporary workaround to share current path with taglets, see 8373909 */
+    public static final ThreadLocal<String> CURRENT_PATH = new ThreadLocal<>();
+
     /**
      * The top-level method to generate and write the page represented by this writer.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
index cb8b3dbfd40..21b3a07b70b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriter.java
index 1847ddf979f..b8acc4d40fe 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriter.java
index dbc0c7ceaf3..e81ad2f39af 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java
index 37edd800328..383bde4a63d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyles.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyles.java
index 7f33ebedfa4..9b59cb0cb47 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyles.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
index 4cbb4b97774..a380b29d553 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
@@ -190,6 +190,10 @@ doclet.Window_Help_title=API-Hilfe
 doclet.references={0} Referenzen
 doclet.Window_Search_title=Suchen
 doclet.search.main_heading=Suchen
+doclet.theme.select_theme=Theme auswählen
+doclet.theme.light=Hell
+doclet.theme.dark=Dunkel
+doclet.theme.system=Systemeinstellung
 
 # label for link/button element to show the information below
 doclet.search.show_more=Zusätzliche Ressourcen
@@ -539,3 +543,5 @@ doclet.NoFrames_specified=Die Option --no-frames wird nicht mehr benötigt und w
 
 # L10N: do not localize the option name -footer
 doclet.footer_specified=Die Option -footer wird nicht mehr unterstützt und wird ignoriert.\nSie wird möglicherweise in einem zukünftigen Release entfernt.
+
+doclet.selectModule=Wählen Sie das Modul aus, in dem gesucht werden soll.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
index 2151b3f4a2e..69cdc862b4c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
@@ -190,6 +190,10 @@ doclet.Window_Help_title=APIヘルプ
 doclet.references={0}の参照
 doclet.Window_Search_title=検索
 doclet.search.main_heading=検索
+doclet.theme.select_theme=テーマを選択
+doclet.theme.light=明るい
+doclet.theme.dark=暗い
+doclet.theme.system=システム設定
 
 # label for link/button element to show the information below
 doclet.search.show_more=その他のリソース
@@ -539,3 +543,5 @@ doclet.NoFrames_specified=--no-framesオプションは必須ではなくなり
 
 # L10N: do not localize the option name -footer
 doclet.footer_specified=-footerオプションはサポートされなくなったため、無視されます。\n将来のリリースで削除される可能性があります。
+
+doclet.selectModule=検索するモジュールを選択します。
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
index 66620d158bb..b3a0a3a1197 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
@@ -190,6 +190,10 @@ doclet.Window_Help_title=API 帮助
 doclet.references={0} 个引用
 doclet.Window_Search_title=搜索
 doclet.search.main_heading=搜索
+doclet.theme.select_theme=选择主题
+doclet.theme.light=浅色
+doclet.theme.dark=深色
+doclet.theme.system=系统设置
 
 # label for link/button element to show the information below
 doclet.search.show_more=其他资源
@@ -539,3 +543,5 @@ doclet.NoFrames_specified=--no-frames 选项不再是必需的，可能\n会在
 
 # L10N: do not localize the option name -footer
 doclet.footer_specified=-footer 选项不再受支持并将被忽略。\n可能会在未来发行版中删除此选项。
+
+doclet.selectModule=选择要在其中搜索的模块。
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
index 62b003afd96..e239feed0e7 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java
index f415a673345..cda8c2fa740 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/CommentUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java
index b1266516586..c26e507279e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
index 0ee34071c93..a6dbf050bf3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
@@ -65,6 +65,7 @@ doclet.JavaScript_in_comment=JavaScript in Dokumentationskommentar gefunden.\nVe
 doclet.JavaScript_in_option=Option {0} enthält JavaScript.\nVerwenden Sie --allow-script-in-comments, um die Verwendung von JavaScript zuzulassen.
 doclet.Link_icon=Linksymbol
 doclet.Link_to_section=Link zu diesem Abschnitt
+doclet.Toggle_member_listing=Zwischen kurzer und detaillierter Listenansicht umschalten
 doclet.Packages=Packages
 doclet.All_Packages=Alle Packages
 doclet.Modules=Module
@@ -114,7 +115,7 @@ doclet.inheritDocWithinInappropriateTag=@inheritDoc kann in diesem Tag nicht ver
 doclet.inheritDocNoDoc=überschriebene Methoden dokumentieren Ausnahmetyp {0} nicht
 doclet.throwsInheritDocUnsupported=@inheritDoc wird für Parameter vom Typ Ausnahme, die nicht von einer Methode deklariert werden, nicht unterstützt. Dokumentieren Sie solche Ausnahmetypen direkt.
 doclet.noInheritedDoc=@inheritDoc wurde verwendet, aber mit {0} wird keine Methode außer Kraft gesetzt oder implementiert.
-doclet.tag_misuse=Tag {0} kann nicht in {1}-Dokumentation verwendet werden. Es kann nur in folgenden Dokumentationstypen verwendet werden: {2}.
+doclet.tag_misuse=Tag {0} kann nicht in Dokumentation {1} verwendet werden. Es kann nur in folgenden Dokumentationstypen verwendet werden: {2}.
 doclet.Package_Summary=Packageübersicht
 doclet.Requires_Summary=Erfordernisse
 doclet.Indirect_Requires_Summary=Indirekte Erfordernisse
@@ -226,7 +227,7 @@ doclet.search=Suchen
 doclet.search_placeholder=In Dokumentation suchen ("/" eingeben)
 doclet.search_in_documentation=In Dokumentation suchen
 doclet.search_reset=Zurücksetzen
-doclet.Member=Mitglied
+doclet.Member=Member
 doclet.Field=Feld
 doclet.Property=Eigenschaft
 doclet.Constructor=Konstruktor
@@ -240,11 +241,14 @@ doclet.Description=Beschreibung
 doclet.ConstantField=Konstantenfeld
 doclet.Value=Wert
 doclet.table_of_contents=Inhaltsverzeichnis
+doclet.Sort_lexicographically=Member-Details lexikographisch sortieren
+doclet.Sort_by_source_order=Member-Details nach Quellreihenfolge sortieren
 doclet.hide_sidebar=Randleiste ausblenden
 doclet.show_sidebar=Randleiste einblenden
 doclet.filter_label=Inhalt filtern ("." eingeben)
 doclet.filter_table_of_contents=Inhaltsverzeichnis filtern
 doclet.filter_reset=Zurücksetzen
+doclet.sort_table_of_contents=Member-Details in lexikographischer Reihenfolge sortieren
 doclet.linkMismatch_PackagedLinkedtoModule=Der Code, der dokumentiert wird, verwendet Packages im unbenannten Modul, aber die in {0} definierten Packages befinden sich in benannten Modulen.
 doclet.linkMismatch_ModuleLinkedtoPackage=Der Code, der dokumentiert wird, verwendet Module, aber die in {0} definierten Packages befinden sich im unbenannten Modul.
 doclet.urlRedirected=URL {0} wurde umgeleitet an {1} - Aktualisieren Sie die Befehlszeilenoptionen, um diese Warnung zu unterdrücken.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
index 2b10f4e6e9a..1970203da38 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
@@ -65,6 +65,7 @@ doclet.JavaScript_in_comment=ドキュメント・コメントにJavaScriptが
 doclet.JavaScript_in_option=オプション{0}にJavaScriptが含まれています。\n--allow-script-in-commentsを使用して、JavaScriptの使用を許可してください。
 doclet.Link_icon=リンク・アイコン
 doclet.Link_to_section=このセクションにリンク
+doclet.Toggle_member_listing=短いリスト・ビューと詳細リスト・ビューの切替え
 doclet.Packages=パッケージ
 doclet.All_Packages=すべてのパッケージ
 doclet.Modules=モジュール
@@ -240,11 +241,14 @@ doclet.Description=説明
 doclet.ConstantField=定数フィールド
 doclet.Value=値
 doclet.table_of_contents=目次
+doclet.Sort_lexicographically=メンバー詳細を辞書順にソート
+doclet.Sort_by_source_order=メンバー詳細をソース順序にソート
 doclet.hide_sidebar=サイドバーの非表示
 doclet.show_sidebar=サイドバーの表示
 doclet.filter_label=コンテンツのフィルタ(.と入力)
 doclet.filter_table_of_contents=目次のフィルタ
 doclet.filter_reset=リセット
+doclet.sort_table_of_contents=メンバー詳細を辞書順にソート
 doclet.linkMismatch_PackagedLinkedtoModule=ドキュメント化しようとしているコードでは名前のないモジュールのパッケージが使用されていますが、{0}で定義されているパッケージは名前のあるモジュールのものです。
 doclet.linkMismatch_ModuleLinkedtoPackage=ドキュメント化しようとしているコードではモジュールが使用されていますが、{0}で定義されているパッケージは名前のないモジュールのものです。
 doclet.urlRedirected=URL {0}は{1}にリダイレクトされました -- コマンドライン・オプションを更新してこの警告を表示しないようにしてください。
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
index f2c8762b283..62e51c2c1c4 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
@@ -65,6 +65,7 @@ doclet.JavaScript_in_comment=文档注释中发现 JavaScript。\n使用 --allow
 doclet.JavaScript_in_option=选项 {0} 包含 JavaScript。\n使用 --allow-script-in-comments 可允许使用 JavaScript。
 doclet.Link_icon=链接图标
 doclet.Link_to_section=链接到此节
+doclet.Toggle_member_listing=在简短列表视图和详细列表视图之间切换
 doclet.Packages=程序包
 doclet.All_Packages=所有程序包
 doclet.Modules=模块
@@ -240,11 +241,14 @@ doclet.Description=说明
 doclet.ConstantField=常量字段
 doclet.Value=值
 doclet.table_of_contents=目录
+doclet.Sort_lexicographically=按字典顺序对成员详细信息进行排序
+doclet.Sort_by_source_order=按源顺序对成员详细信息进行排序
 doclet.hide_sidebar=隐藏子工具栏
 doclet.show_sidebar=显示子工具栏
 doclet.filter_label=筛选内容（键入 .）
 doclet.filter_table_of_contents=筛选目录
 doclet.filter_reset=重置
+doclet.sort_table_of_contents=按字典顺序对成员详细信息进行排序
 doclet.linkMismatch_PackagedLinkedtoModule=进行文档化的代码使用了未命名模块中的程序包，但在 {0} 中定义的程序包在命名模块中。
 doclet.linkMismatch_ModuleLinkedtoPackage=进行文档化的代码使用了模块，但在 {0} 中定义的程序包在未命名模块中。
 doclet.urlRedirected=URL {0} 已重定向到 {1} — 更新命令行选项以隐藏此警告。
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFile.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFile.java
index 26e9635b9db..a25879f4052 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFile.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
index 43405c3ebb0..b5399d0fef9 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Content.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Content.java
index f582dbdc76a..9a6cae7e141 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Content.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Content.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/ContentBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/ContentBuilder.java
index abcd8e199bb..5aab7cb56c9 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/ContentBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/ContentBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Entity.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Entity.java
index 5d080c19c67..a37a4d95565 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Entity.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Entity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/RawHtml.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/RawHtml.java
index 38be7799c4e..bcd71006cbd 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/RawHtml.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/RawHtml.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties
index 7829d2d7e27..57137ffe75d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties
@@ -52,7 +52,7 @@ main.opt.package.desc=Zeigt Package-/geschützte/öffentliche Typen und Mitglied
 main.opt.private.desc=Zeigt alle Typen und Mitglieder. Zeigt bei benannten Modulen\nalle Packages und alle Moduldetails.
 
 main.opt.show.members.arg=<Wert>
-main.opt.show.members.desc=Gibt an, welche Member (Felder, Methoden oder Konstruktoren) dokumentiert\nwerden, wobei der Wert "public", "protected",\n"package" oder "private" lauten kann. Der Standardwert ist "protected"\nund zeigt öffentliche und geschützte Member an. "public" zeigt nur\nöffentliche Member, "package" zeigt öffentliche, geschützte und\nPackage-Member, und "private" zeigt alle Member an.
+main.opt.show.members.desc=Gibt an, welche Members (Felder, Methoden oder Konstruktoren) dokumentiert\nwerden, wobei der Wert "public", "protected",\n"package" oder "private" lauten kann. Der Standardwert ist "protected"\nund zeigt öffentliche und geschützte Members an. "public" zeigt nur\nöffentliche Members, "package" zeigt öffentliche, geschützte und\nPackage-Members, und "private" zeigt alle Members an.
 
 main.opt.show.types.arg=<Wert>
 main.opt.show.types.desc=Gibt an, welche Typen (Klassen, Schnittstellen usw.) dokumentiert\nwerden, wobei der Wert "public", "protected",\n"package" oder "private" lauten kann. Der Standardwert ist "protected"\nund zeigt öffentliche und geschützte Typen, "public" zeigt nur\nöffentliche Typen, "package" zeigt öffentliche, geschützte und\nPackagetypen, und "private" zeigt alle Typen.
diff --git a/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionExecuter.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionExecuter.java
index 860fd832197..649e878d340 100644
--- a/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionExecuter.java
+++ b/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionExecuter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionResolver.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionResolver.java
index f0e1bc371e3..9e43b079793 100644
--- a/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionResolver.java
+++ b/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jcmd/share/classes/sun/tools/jstat/Parser.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/Parser.java
index cf1790d65e6..06de56533a6 100644
--- a/src/jdk.jcmd/share/classes/sun/tools/jstat/Parser.java
+++ b/src/jdk.jcmd/share/classes/sun/tools/jstat/Parser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options b/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options
index 6bf67b9bdc4..1589526db0e 100644
--- a/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options
+++ b/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/Main.java b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/Main.java
index 9aa77a947a9..7d645025630 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/Main.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequestManager.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequestManager.java
index 3bd363af56e..de13561a4fc 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequestManager.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/request/EventRequestManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -251,13 +251,13 @@ public interface EventRequestManager extends Mirror {
      * after the first step is detected.  Thus a next line method
      * would do the following:
      * <pre>{@code
-     *     EventRequestManager mgr = myVM.{@link VirtualMachine#eventRequestManager eventRequestManager}();
+     *     EventRequestManager mgr = myVM.eventRequestManager();
      *     StepRequest request = mgr.createStepRequest(myThread,
-     *                                                 StepRequest.{@link StepRequest#STEP_LINE STEP_LINE},
-     *                                                 StepRequest.{@link StepRequest#STEP_OVER STEP_OVER});
-     *     request.{@link EventRequest#addCountFilter addCountFilter}(1);  // next step only
+     *                                                 StepRequest.STEP_LINE,
+     *                                                 StepRequest.STEP_OVER);
+     *     request.addCountFilter(1);  // next step only
      *     request.enable();
-     *     myVM.{@link VirtualMachine#resume resume}();
+     *     myVM.resume();
      * }</pre>
      *
      * @param thread the thread in which to step
@@ -382,7 +382,7 @@ public interface EventRequestManager extends Mirror {
      *   Iterator iter = requestManager.stepRequests().iterator();
      *   while (iter.hasNext()) {
      *      requestManager.deleteEventRequest(iter.next());
-     *  }
+     *   }
      * </PRE>
      * may cause a {@link java.util.ConcurrentModificationException}.
      * Instead use
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java
index e5dce0718f4..766c65ea195 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.c b/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.c
index df07b753f0e..3badeb74207 100644
--- a/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.c
+++ b/src/jdk.jdi/windows/native/libdt_shmem/shmem_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/EventRequestImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/EventRequestImpl.c
index 3eddb01eaa5..2bc6fa5259e 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/EventRequestImpl.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/EventRequestImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,12 +84,10 @@ readAndSetFilters(JNIEnv *env, PacketInputStream *in, HandlerNode *node,
             }
 
             case JDWP_REQUEST_MODIFIER(LocationOnly): {
-                jbyte tag;
                 jclass clazz;
                 jmethodID method;
                 jlocation location;
-                tag = inStream_readByte(in); /* not currently used */
-                tag = tag; /* To shut up lint */
+                (void)inStream_readByte(in); /* not currently used */
                 if ( (serror = inStream_error(in)) != JDWP_ERROR(NONE) )
                     break;
                 clazz = inStream_readClassRef(env, in);
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/SDE.c b/src/jdk.jdwp.agent/share/native/libjdwp/SDE.c
index b1f18dd10be..4334b4cbc63 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/SDE.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/SDE.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -718,19 +718,6 @@ private jboolean isValid(void);
                                    lineTable[lti].jplsLineInc));
     }
 
-    private int fileTableIndex(int sti, int fileId) {
-        int i;
-        int fileIndexStart = stratumTable[sti].fileIndex;
-        /* one past end */
-        int fileIndexEnd = stratumTable[sti+1].fileIndex;
-        for (i = fileIndexStart; i < fileIndexEnd; ++i) {
-            if (fileTable[i].fileId == fileId) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
     private jboolean isValid(void) {
         return sourceMapIsValid;
     }
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c b/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c
index 2bed6b6bb28..1911ff1bed4 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c
@@ -181,11 +181,11 @@ DEF_Agent_OnLoad(JavaVM *vm, char *options, void *reserved)
     vmInitialized = JNI_FALSE;
     gdata->vmDead = JNI_FALSE;
 
-    jvmtiCompileTimeMajorVersion  = ( JVMTI_VERSION & JVMTI_VERSION_MASK_MAJOR )
+    jvmtiCompileTimeMajorVersion  = ((unsigned)JVMTI_VERSION & JVMTI_VERSION_MASK_MAJOR)
                                         >> JVMTI_VERSION_SHIFT_MAJOR;
-    jvmtiCompileTimeMinorVersion  = ( JVMTI_VERSION & JVMTI_VERSION_MASK_MINOR )
+    jvmtiCompileTimeMinorVersion  = ((unsigned)JVMTI_VERSION & JVMTI_VERSION_MASK_MINOR)
                                         >> JVMTI_VERSION_SHIFT_MINOR;
-    jvmtiCompileTimeMicroVersion  = ( JVMTI_VERSION & JVMTI_VERSION_MASK_MICRO )
+    jvmtiCompileTimeMicroVersion  = ((unsigned)JVMTI_VERSION & JVMTI_VERSION_MASK_MICRO)
                                         >> JVMTI_VERSION_SHIFT_MICRO;
 
     /* Get the JVMTI Env, IMPORTANT: Do this first! For jvmtiAllocate(). */
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/error_messages.c b/src/jdk.jdwp.agent/share/native/libjdwp/error_messages.c
index a37b88e70df..6ddc6fe739a 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/error_messages.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/error_messages.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,8 @@
  *    NOTE: This function is at the lowest level of the call tree.
  *          Do not use the ERROR* macros here.
  */
+
+ATTRIBUTE_PRINTF(4, 0)
 static void
 vprint_message(FILE *fp, const char *prefix, const char *suffix,
                const char *format, va_list ap)
@@ -84,6 +86,7 @@ vprint_message(FILE *fp, const char *prefix, const char *suffix,
  *    NOTE: This function is at the lowest level of the call tree.
  *          Do not use the ERROR* macros here.
  */
+ATTRIBUTE_PRINTF(4, 5)
 void
 print_message(FILE *fp, const char *prefix,  const char *suffix,
               const char *format, ...)
@@ -96,6 +99,7 @@ print_message(FILE *fp, const char *prefix,  const char *suffix,
 }
 
 /* Generate error message */
+ATTRIBUTE_PRINTF(1, 2)
 void
 error_message(const char *format, ...)
 {
@@ -110,6 +114,7 @@ error_message(const char *format, ...)
 }
 
 /* Print plain message to stdout. */
+ATTRIBUTE_PRINTF(1, 2)
 void
 tty_message(const char *format, ...)
 {
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c b/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c
index 3ba875e88cd..6fe01044a2c 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -976,7 +976,6 @@ eventFilter_setSourceNameMatchFilter(HandlerNode *node,
 
 jvmtiError eventFilter_setPlatformThreadsOnlyFilter(HandlerNode *node, jint index)
 {
-    PlatformThreadsFilter *filter = &FILTER(node, index).u.PlatformThreadsOnly;
     if (index >= FILTER_COUNT(node)) {
         return AGENT_ERROR_ILLEGAL_ARGUMENT;
     }
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/inStream.c b/src/jdk.jdwp.agent/share/native/libjdwp/inStream.c
index 232da2cb348..de424853175 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/inStream.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/inStream.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -470,6 +470,7 @@ inStream_readValue(PacketInputStream *stream)
                 break;
             default:
                 stream->error = JDWP_ERROR(INVALID_TAG);
+                value.j = 0L; // to make compiler happy
                 break;
         }
     }
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/log_messages.c b/src/jdk.jdwp.agent/share/native/libjdwp/log_messages.c
index ebc39febff9..e24fcd57156 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/log_messages.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/log_messages.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -155,6 +155,7 @@ standard_logging_format(FILE *fp,
 }
 
 /* End a log entry */
+ATTRIBUTE_PRINTF(1, 2)
 void
 log_message_end(const char *format, ...)
 {
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
index 8a02f3f9ee9..7b0adab8ca5 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
@@ -2667,12 +2667,16 @@ threadControl_setEventMode(jvmtiEventMode mode, EventIndex ei, jthread thread)
 
 /*
  * Returns the current thread.
+ * Returns NULL on error (JVMTI_ERROR_WRONG_PHASE, JVMTI_ERROR_UNATTACHED_THREAD).
  */
 jthread
 threadControl_currentThread(void)
 {
     jthread thread = NULL;
     jvmtiError error = JVMTI_FUNC_PTR(gdata->jvmti,GetCurrentThread)(gdata->jvmti, &thread);
+    if (error != JVMTI_ERROR_NONE) {
+        return NULL;
+    }
     return thread;
 }
 
@@ -2700,11 +2704,9 @@ threadControl_getFrameGeneration(jthread thread)
 jthread *
 threadControl_allVThreads(jint *numVThreads)
 {
-    JNIEnv *env;
     ThreadNode *node;
     jthread* vthreads;
 
-    env = getEnv();
     debugMonitorEnter(threadLock);
     *numVThreads = numRunningVThreads;
 
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c b/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c
index f5573930d34..6bae02fce54 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -173,7 +173,7 @@ int JNICALL utf8mToUtf8sLength(jbyte *string, int length) {
 
     newLength = 0;
     for ( i = 0 ; i < length ; i++ ) {
-        unsigned byte1, byte2, byte3, byte4, byte5, byte6;
+        unsigned byte1, byte2, byte4, byte5, byte6;
 
         byte1 = (unsigned char)string[i];
         if ( (byte1 & 0x80) == 0 ) { /* 1byte encoding */
@@ -196,7 +196,7 @@ int JNICALL utf8mToUtf8sLength(jbyte *string, int length) {
                 break; /* Error condition */
             }
             byte2 = (unsigned char)string[++i];
-            byte3 = (unsigned char)string[++i];
+            ++i; // byte3 is not used
             newLength += 3;
             /* Possible process a second 3byte encoding */
             if ( (i+3) < length && byte1 == 0xED && (byte2 & 0xF0) == 0xA0 ) {
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/util.h b/src/jdk.jdwp.agent/share/native/libjdwp/util.h
index a48c8ba2c09..0975ddeb4fd 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/util.h
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/util.h
@@ -59,6 +59,14 @@
 #include "error_messages.h"
 #include "debugInit.h"
 
+/* To handle "format string is not a string literal" warning. */
+#if !defined(_MSC_VER)
+  #define ATTRIBUTE_PRINTF(fmt_pos_num, vargs_pos_num) \
+          __attribute__((format(printf, fmt_pos_num, vargs_pos_num)))
+#else
+  #define ATTRIBUTE_PRINTF(fmt_pos_num, vargs_pos_num)
+#endif
+
 /* Definition of a CommonRef tracked by the backend for the frontend */
 typedef struct RefNode {
     jlong        seqNum;        /* ID of reference, also key for hash table */
diff --git a/src/jdk.jdwp.agent/windows/native/libjdwp/proc_md.h b/src/jdk.jdwp.agent/windows/native/libjdwp/proc_md.h
index 6c86473625f..e8877f862f8 100644
--- a/src/jdk.jdwp.agent/windows/native/libjdwp/proc_md.h
+++ b/src/jdk.jdwp.agent/windows/native/libjdwp/proc_md.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ConstantMap.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ConstantMap.java
index 3b6859304b8..b6f1273eb9e 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ConstantMap.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ConstantMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/Dispatcher.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/Dispatcher.java
index 61072e03e79..266756d49e9 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/Dispatcher.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/Dispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/FieldBuilder.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/FieldBuilder.java
index df6fb9f2a9a..64791b1976a 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/FieldBuilder.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/FieldBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryResolver.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryResolver.java
index 1b68a038a17..1bc21131cc1 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryResolver.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Query.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Query.java
index ec0407a6f04..280bef55af4 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Query.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Query.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jfr/share/man/jfr.md b/src/jdk.jfr/share/man/jfr.md
index f7ff1b62775..b3b7ab1c0b4 100644
--- a/src/jdk.jfr/share/man/jfr.md
+++ b/src/jdk.jfr/share/man/jfr.md
@@ -1,5 +1,5 @@
 ---
-# Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage.properties b/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage.properties
index 3042823130c..ac13505a0d9 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage_de.properties
index fd30f5385e8..62bfd36181f 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage_de.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage_ja.properties b/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage_ja.properties
index 66471e23b38..7ab6d7f655f 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage_ja.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage_zh_CN.properties b/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage_zh_CN.properties
index 8355ed5595e..37954b9b743 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage_zh_CN.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
index 03b9611c179..825672cfe6d 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Snippets.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Snippets.java
index d662e297f9a..c5bfeb08d33 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Snippets.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Snippets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ModuleDescriptorBuilder.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ModuleDescriptorBuilder.java
index 87f4ddcdbc6..2fdb37410ae 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ModuleDescriptorBuilder.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ModuleDescriptorBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripJavaDebugAttributesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripJavaDebugAttributesPlugin.java
index 4a6b54a3b6c..72b20cd2d43 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripJavaDebugAttributesPlugin.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripJavaDebugAttributesPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java
index 1c126d7321c..533c216c735 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
index 9b776745c66..40022a5532b 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
@@ -78,7 +78,8 @@ err.runtime.link.patched.module=jlink unterstützt keine Verknüpfung vom Laufze
 err.no.module.path=Option --module-path muss mit --add-modules ALL-MODULE-PATH angegeben werden
 err.empty.module.path=Kein Modul im Modulpfad "{0}" mit --add-modules ALL-MODULE-PATH gefunden
 err.limit.modules=--limit-modules nicht mit --add-modules ALL-MODULE-PATH zulässig
-err.jlink.version.mismatch=jlink-Version {0}.{1} stimmt nicht mit Ziel-java.base-Version {2}.{3} überein
+err.jlink.version.mismatch=jlink-Build "{0}" stimmt nicht mit dem java.base-Ziel-Build "{1}" überein
+err.jlink.version.missing=jlink-Build "{0}" kann die Build-Signatur nicht im Modul java.base finden, das im Modulpfad angegebenen wird. Wahrscheinlich stammt es aus einem früheren Build.
 err.automatic.module:automatisches Modul kann nicht mit jlink verwendet werden: {0} aus {1}
 err.unknown.byte.order:unbekannte Bytereihenfolge {0}
 err.launcher.main.class.empty:Launcher-Hauptklassenname darf nicht leer sein: {0}
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties
index c925f250c41..9519a24c96e 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_ja.properties
@@ -78,7 +78,8 @@ err.runtime.link.patched.module=--patch-moduleを使用してパッチ済ラン
 err.no.module.path=--module-pathオプションは--add-modules ALL-MODULE-PATHで指定する必要があります
 err.empty.module.path=モジュール・パス''{0}''に--add-modules ALL-MODULE-PATHを使用したモジュールが見つかりません
 err.limit.modules=--limit-modulesは--add-modules ALL-MODULE-PATHとともに指定できません
-err.jlink.version.mismatch=jlinkバージョン{0}.{1}がターゲットのjava.baseバージョン{2}.{3}と一致しません
+err.jlink.version.mismatch=jlinkビルド''{0}''がターゲットのjava.baseビルド''{1}''と一致しません
+err.jlink.version.missing=jlinkビルド''{0}''では、モジュール・パスで指定されたjava.baseにビルド署名が見つかりません(おそらく以前のビルドから)。
 err.automatic.module:jlinkでは自動モジュールは使用できません: {1}からの{0}
 err.unknown.byte.order:不明なバイト順{0}
 err.launcher.main.class.empty:起動ツールのメイン・クラス名は空にできません: {0}
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties
index b7526c9f57a..81af170ae7f 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_zh_CN.properties
@@ -78,7 +78,8 @@ err.runtime.link.patched.module=当使用 --patch-module 在打补丁的运行
 err.no.module.path=--module-path 选项必须与 --add-modules ALL-MODULE-PATH 一起指定
 err.empty.module.path=在随 --add-modules ALL-MODULE-PATH 提供的模块路径 ''{0}'' 中找不到模块
 err.limit.modules=不允许将 --limit-modules 与 --add-modules ALL-MODULE-PATH 一起使用
-err.jlink.version.mismatch=jlink 版本 {0}.{1} 与目标 java.base 版本 {2}.{3} 不匹配
+err.jlink.version.mismatch=jlink 工作版本 ''{0}'' 与目标 java.base 工作版本 ''{1}'' 不匹配
+err.jlink.version.missing=jlink 工作版本 ''{0}'' 在模块路径中指定的 java.base 中找不到工作版本签名，可能来自早期工作版本。
 err.automatic.module:自动模块不能用于来自 {1} 的 jlink: {0}
 err.unknown.byte.order:未知的字节顺序 {0}
 err.launcher.main.class.empty:启动程序主类名不能为空: {0}
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
index 4713eabed85..80d1ba6e05f 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,9 +31,9 @@ add-options.usage=\  --add-options <Optionen>   Stellt die angegebene <Optionen>
 
 release-info.argument=<Datei>|add:<Schlüssel1>=<Wert1>:<Schlüssel2>=<Wert2>:...|del:<Schlüsselliste>
 
-release-info.description=<Datei>-Option lädt Releaseeigenschaften aus der angegebenen Datei.\nadd: fügt der Datei "release" Eigenschaften hinzu.\nEine beliebige Anzahl von <Schlüssel>=<Wert>-Paaren kann übergeben werden.\ndel: löscht die Liste der Schlüssel in der Releasedatei.
+release-info.description=Option <Datei> lädt Releaseeigenschaften aus der angegebenen Datei.\n       Die angegebene Datei soll erwartungsgemäß in UTF-8 codiert sein.\nadd: fügt der Datei "release" Eigenschaften hinzu.\nEine beliebige Anzahl von <Schlüssel>=<Wert>-Paaren kann übergeben werden.\ndel: löscht die Liste der Schlüssel in der Releasedatei.
 
-release-info.usage=\  --release-info <Datei>|add:<Schlüssel1>=<Wert1>:<Schlüssel2>=<Wert2>:...|del:<Schlüsselliste>\n                            Option <Datei> löscht Releaseeigenschaften aus\n                            der angegebenen Datei.\n                            add: fügt Eigenschaften der Datei "release" hinzu.\n                            Eine beliebige Anzahl <Schlüssel>=<Wert>-Paare kann übergeben werden.\n                            del: löscht die Liste der Schlüssel in der Releasedatei.
+release-info.usage=\  --release-info <Datei>|add:<Schlüssel1>=<Wert1>:<Schlüssel2>=<Wert2>:...|del:<Schlüsselliste>\n                            Option <Datei> lädt Releaseeigenschaften aus\n                            der angegebenen Datei. Die angegebene Datei soll erwartungsgemäß\n                            in UTF-8 codiert sein.\n                            add: fügt der Datei "release" Eigenschaften hinzu.\n                            Eine beliebige Anzahl <Schlüssel>=<Wert>-Paare kann übergeben werden.\n                            del: löscht die Liste der Schlüssel in der Releasedatei.
 
 class-for-name.argument=
 
@@ -41,11 +41,11 @@ class-for-name.description=Klassenoptimierung: Konvertiert Class.forName-Aufrufe
 
 class-for-name.usage=\  --class-for-name          Klassenoptimierung: Konvertiert Class.forName-Aufrufe in Konstantenladevorgänge.
 
-compress.argument=<zip-[0-9]>[:filter=<Musterliste>]
+compress.argument=<zip-'{0-9}'>[:filter=<Musterliste>]
 
 compress.description= Zu verwendende Komprimierung für Ressourcen.
 
-compress.usage=\  --compress <compress>     Zu verwendende Komprimierung für Ressourcen:\n                            Zulässige Werte:\n                            zip-[0-9], wobei "zip-0" für keine Komprimierung\n                            und "zip-9" für die beste Komprimierung steht.\n                            Standardwert ist "zip-6".
+compress.usage=\  --compress <Komprimierung>     Zu verwendende Komprimierung für Ressourcen:\n                            Zulässige Werte:\n                            zip-'{0-9}', wobei "zip-0" für keine Komprimierung\n                            und "zip-9" für die beste Komprimierung steht.\n                            Standardwert ist "zip-6".
 
 compress.warn.argumentdeprecated=Warnung: Das Argument {0} für --compress ist veraltet und wird möglicherweise in einem zukünftigen Release entfernt
 
@@ -170,7 +170,7 @@ plugin.opt.resources-last-sorter=\      --resources-last-sorter <Name>    Das le
 
 plugin.opt.disable-plugin=\      --disable-plugin <Plug-in-Name>     Deaktiviert das angegebene Plug-in
 
-plugin.opt.compress=\      --compress <compress>             Zu verwendende Komprimierung für Ressourcen:\n                                        Zulässige Werte:\n                                        zip-[0-9], wobei "zip-0" für keine Komprimierung\n                                        und "zip-9" für die beste Komprimierung steht.\n                                        Standardwert ist "zip-6".\n                                        Veraltete Werte, die in einem zukünftigen Release entfernt werden:\n                                        0: Keine Komprimierung. Entspricht "zip-0".\n                                        1: Gemeinsame Verwendung konstanter Zeichenfolgen\n                                        2: Entspricht "zip-6".
+plugin.opt.compress=\      --compress <Komprimierung>             Komprimiert alle Ressourcen im Ausgabeimage:\n                                        Zulässige Werte:\n                                        zip-'{0-9}', wobei "zip-0" für keine Komprimierung\n                                        und "zip-9" für die beste Komprimierung steht.\n                                        Standardwert ist "zip-6."\n                                        Veraltete Werte, die in einem zukünftigen Release entfernt werden:\n                                        0:  Keine Komprimierung. Verwenden Sie stattdessen "zip-0".\n                                        1:  Gemeinsame Verwendung konstanter Zeichenfolgen\n                                        2:  ZIP. Verwenden Sie stattdessen "zip-6".
 
 plugin.opt.strip-debug=\  -G, --strip-debug                     Entfernt Debuginformationen
 
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
index 1cf3ba5b0c0..6ed0a486132 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,9 +31,9 @@ add-options.usage=\  --add-options <options>   指定した<options>文字列を
 
 release-info.argument=<file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>
 
-release-info.description=<file>オプションは指定されたファイルからリリース・プロパティをロードします。\nadd:はリリース・ファイルにプロパティを追加します。\n任意の数の<key>=<value>のペアを渡すことができます。\ndel:はリリース・ファイルのキーのリストを削除します。
+release-info.description=<file>オプションは指定されたファイルからリリース・プロパティをロードします。\n       指定されたファイルはUTF-8でエンコードされる必要があります。\nadd:はリリース・ファイルにプロパティを追加します。\n任意の数の<key>=<value>のペアを渡すことができます。\ndel:はリリース・ファイルのキーのリストを削除します。
 
-release-info.usage=\  --release-info <file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>\n                            <file>オプションは指定されたファイルからリリース・プロパティを\n                            ロードします。\n                            add:はリリース・ファイルにプロパティを追加します。\n                            任意の数の<key>=<value>ペアを渡すことができます。\n                            del:はリリース・ファイルのキーのリストを削除します。
+release-info.usage=\  --release-info <file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>\n                            <file>オプションは指定されたファイルからリリース・プロパティを\n                            ロードします。指定されたファイルはUTF-8で\n                            エンコードされる必要があります。\n                            add:はリリース・ファイルにプロパティを追加します。\n                            任意の数の<key>=<value>ペアを渡すことができます。\n                            del:はリリース・ファイルのキーのリストを削除します。
 
 class-for-name.argument=
 
@@ -41,11 +41,11 @@ class-for-name.description=クラスの最適化: Class.forName呼出しを定
 
 class-for-name.usage=\  --class-for-name          クラスの最適化: Class.forName呼出しを定数のロードに変換します。
 
-compress.argument=<zip-[0-9]>[:filter=<pattern-list>]
+compress.argument=<zip-'{0-9}'>[:filter=<pattern-list>]
 
 compress.description= リソースの圧縮に使用する圧縮。
 
-compress.usage=\  --compress <compress>     リソースの圧縮に使用する圧縮:\n                            使用可能な値は\n                            zip-[0-9]です。zip-0では圧縮は行われず、\n                            zip-9では最適な圧縮が行われます。\n                            デフォルトはzip-6です。
+compress.usage=\  --compress <compress>     リソースの圧縮に使用する圧縮:\n                            使用可能な値は\n                            zip-'{0-9}'です。zip-0では圧縮は行われず、\n                            zip-9では最適な圧縮が行われます。\n                            デフォルトはzip-6です。
 
 compress.warn.argumentdeprecated=警告:  --compressの{0}引数は非推奨であり、今後のリリースで削除される可能性があります
 
@@ -170,7 +170,7 @@ plugin.opt.resources-last-sorter=\      --resources-last-sorter <name>    最後
 
 plugin.opt.disable-plugin=\      --disable-plugin <pluginname>     指定したプラグインを無効にします
 
-plugin.opt.compress=\      --compress <compress>             リソースの圧縮に使用する圧縮:\n                                        使用可能な値は\n                                        zip-[0-9]です。zip-0では圧縮は行われず、\n                                        zip-9では最適な圧縮が行われます。\n                                        デフォルトはzip-6です。\n                                        今後のリリースで削除される非推奨の値:\n                                        0:  圧縮なし。zip-0と同等。\n                                        1:  定数文字列の共有\n                                        2:  zip-6と同等。
+plugin.opt.compress=\      --compress <compress>             出力イメージ内のすべてのリソースを圧縮します:\n                                        使用可能な値は\n                                        zip-'{0-9}'です。zip-0では圧縮は行われず、\n                                        zip-9では最適な圧縮が行われます。\n                                        デフォルトはzip-6です。\n                                        今後のリリースで削除される非推奨の値:\n                                        0:  圧縮なし。かわりにzip-0を使用。\n                                        1:  定数文字列の共有\n                                        2:  ZIP。かわりにzip-6を使用。
 
 plugin.opt.strip-debug=\  -G, --strip-debug                     デバッグ情報を削除します
 
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
index 819238e7d04..a0480a31fc3 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,9 +31,9 @@ add-options.usage=\  --add-options <options>   在生成的映像中调用虚拟
 
 release-info.argument=<file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>
 
-release-info.description=<file> 选项：从提供的文件加载 release 属性。\nadd：向 'release' 文件中添加属性。\n可以传递任意数量的 <key>=<value> 对。\ndel：删除 release 文件中的关键字列表。
+release-info.description=<file> 选项：从提供的文件加载 release 属性。\n       指定的文件应采用 UTF-8 编码。\nadd：向 'release' 文件中添加属性。\n可以传递任意数量的 <key>=<value> 对。\ndel：删除 release 文件中的关键字列表。
 
-release-info.usage=\  --release-info <file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>\n                            <file> 选项：从提供的文件\n                            加载 release 属性。\n                            add：向 'release' 文件中添加属性。\n                            可以传递任意数量的 <key>=<value> 对。\n                            del：删除 release 文件中的关键字列表。
+release-info.usage=\  --release-info <file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>\n                            <file> 选项：从提供的文件\n                            加载 release 属性。指定的文件\n                            应采用 UTF-8 编码。\n                            add：向 'release' 文件中添加属性。\n                            可以传递任意数量的 <key>=<value> 对。\n                            del：删除 release 文件中的关键字列表。
 
 class-for-name.argument=
 
@@ -41,11 +41,11 @@ class-for-name.description=类优化：将 Class.forName 调用转换为常量
 
 class-for-name.usage=\  --class-for-name          类优化：将 Class.forName 调用转换为常量负载。
 
-compress.argument=<zip-[0-9]>[:filter=<pattern-list>]
+compress.argument=<zip-'{0-9}'>[:filter=<pattern-list>]
 
 compress.description= 要在压缩资源时使用的压缩。
 
-compress.usage=\  --compress <compress>     要在压缩资源时使用的压缩：\n                            接受的值为：\n                            zip-[0-9]，其中 zip-0 表示无压缩，\n                            zip-9 表示最佳压缩。\n                            默认值为 zip-6。
+compress.usage=\  --compress <compress>     要在压缩资源时使用的压缩：\n                            接受的值为：\n                            zip-'{0-9}'，其中 zip-0 表示无压缩，\n                            zip-9 表示最佳压缩。\n                            默认值为 zip-6。
 
 compress.warn.argumentdeprecated=警告：--compress 的 {0} 参数已过时，可能会在未来发行版中删除
 
@@ -170,7 +170,7 @@ plugin.opt.resources-last-sorter=\      --resources-last-sorter <name>    允许
 
 plugin.opt.disable-plugin=\      --disable-plugin <pluginname>     禁用所提及的插件
 
-plugin.opt.compress=\      --compress <compress>             要在压缩资源时使用的压缩：\n                                        接受的值为：\n                                        zip-[0-9]，其中 zip-0 表示无压缩，\n                                        zip-9 表示最佳压缩。\n                                        默认值为 zip-6。\n                                        要在未来发行版中删除的已过时值：\n                                        0：无压缩。等同于 zip-0。\n                                        1：常量字符串共享\n                                        2：等同于 zip-6。
+plugin.opt.compress=\      --compress <compress>             在输出映像中压缩所有资源：\n                                        接受的值包括：\n                                        zip-'{0-9}'，其中 zip-0 表示无压缩，\n                                        zip-9 表示最佳压缩。\n                                        默认值为 zip-6。\n                                        要在未来发行版中删除的已过时值：\n                                        0：无压缩。改为使用 zip-0。\n                                        1：常量字符串共享\n                                        2：ZIP。改为使用 zip-6。
 
 plugin.opt.strip-debug=\  -G, --strip-debug                     去除调试信息
 
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java b/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java
index 5345ee4253c..d4d7171d799 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties
index 126e04d0b58..386fd199d86 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jlink/share/man/jlink.md b/src/jdk.jlink/share/man/jlink.md
index 0d16e69c9ef..5c77202434c 100644
--- a/src/jdk.jlink/share/man/jlink.md
+++ b/src/jdk.jlink/share/man/jlink.md
@@ -1,5 +1,5 @@
 ---
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -70,6 +70,7 @@ Developers are responsible for updating their custom runtime images.
     and zip-9 provides the best compression. Default is zip-6.
 
 :   Deprecated values to be removed in a future release:
+
     -   `0`: No compression. Use zip-0 instead.
     -   `1`: Constant string sharing
     -   `2`: ZIP. Use zip-6 instead.
@@ -182,6 +183,7 @@ Description
     and zip-9 provides the best compression. Default is zip-6.
 
 :   Deprecated values to be removed in a future release:
+
     -   Level 0: No compression. Use zip-0 instead.
     -   Level 1: Constant string sharing
     -   Level 2: ZIP. Use zip-6 instead.
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxBundlingEnvironment.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxBundlingEnvironment.java
index cfd8ab391bb..6e438e66a26 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxBundlingEnvironment.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxBundlingEnvironment.java
@@ -56,7 +56,7 @@ public class LinuxBundlingEnvironment extends DefaultBundlingEnvironment {
     private static void createDebPackage(Options options, LinuxDebSystemEnvironment sysEnv) {
 
         createNativePackage(options,
-                LinuxFromOptions::createLinuxDebPackage,
+                LinuxFromOptions.createLinuxDebPackage(options),
                 buildEnv()::create,
                 LinuxBundlingEnvironment::buildPipeline,
                 (env, pkg, outputDir) -> {
@@ -67,7 +67,7 @@ public class LinuxBundlingEnvironment extends DefaultBundlingEnvironment {
     private static void createRpmPackage(Options options, LinuxRpmSystemEnvironment sysEnv) {
 
         createNativePackage(options,
-                LinuxFromOptions::createLinuxRpmPackage,
+                LinuxFromOptions.createLinuxRpmPackage(options),
                 buildEnv()::create,
                 LinuxBundlingEnvironment::buildPipeline,
                 (env, pkg, outputDir) -> {
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties
index 2f8fcddff73..345ed36b7be 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties
@@ -23,12 +23,7 @@
 # questions.
 #
 #
-app.bundler.name=Linux-Anwendungsimage
-deb.bundler.name=DEB-Bundle
-rpm.bundler.name=RPM-Bundle
-
 param.license-type.default=Unbekannt
-param.menu-group.default=Unbekannt
 
 resource.deb-control-file=DEB-Kontrolldatei
 resource.deb-preinstall-script=DEB-Preinstall-Skript
@@ -59,7 +54,6 @@ message.output-to-location=Package (.deb) gespeichert in: {0}.
 message.debs-like-licenses=Debian-Packages müssen eine Lizenz angeben. Bei fehlender Lizenz geben einige Linux-Distributionen eine Meldung über eine Beeinträchtigung der Anwendungsqualität aus.
 message.outputting-bundle-location=RPM für Installationsprogramm wird generiert in: {0}.
 message.output-bundle-location=Package (.rpm) gespeichert in: {0}.
-message.creating-association-with-null-extension=Verknüpfung mit Nullerweiterung wird erstellt.
 
 message.ldd-not-available=ldd-Befehl nicht gefunden. Packageabhängigkeiten werden nicht generiert.
 message.deb-ldd-not-available.advice=Installieren Sie das DEB-Package "libc-bin", um ldd abzurufen.
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
index be2cd00b42c..d0bc4f73407 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
@@ -23,12 +23,7 @@
 # questions.
 #
 #
-app.bundler.name=Linuxアプリケーション・イメージ
-deb.bundler.name=DEBバンドル
-rpm.bundler.name=RPMバンドル
-
 param.license-type.default=不明
-param.menu-group.default=不明
 
 resource.deb-control-file=DEB制御ファイル
 resource.deb-preinstall-script=DEBインストール前スクリプト
@@ -59,7 +54,6 @@ message.output-to-location=パッケージ(.deb)は次に保存されました:
 message.debs-like-licenses=Debianパッケージではライセンスを指定する必要があります。ライセンスがない場合、一部のLinuxディストリビューションでアプリケーションの品質に問題が発生する場合があります。
 message.outputting-bundle-location=インストーラのRPMを次に生成しています: {0}
 message.output-bundle-location=パッケージ(.rpm)は次に保存されました: {0}
-message.creating-association-with-null-extension=null拡張子との関連付けを作成しています。
 
 message.ldd-not-available=lddコマンドが見つかりませんでした。パッケージ依存性は生成されません。
 message.deb-ldd-not-available.advice="libc-bin" DEBパッケージをインストールしてlddを取得します。
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
index 5b583062ab6..f3d62675c4d 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
@@ -23,12 +23,7 @@
 # questions.
 #
 #
-app.bundler.name=Linux 应用程序映像
-deb.bundler.name=DEB 包
-rpm.bundler.name=RPM 包
-
 param.license-type.default=未知
-param.menu-group.default=未知
 
 resource.deb-control-file=DEB 控制文件
 resource.deb-preinstall-script=DEB 安装前脚本
@@ -59,7 +54,6 @@ message.output-to-location=程序包 (.deb) 已保存到: {0}。
 message.debs-like-licenses=Debian 程序包应指定许可证。缺少许可证将导致某些 Linux 分发投诉应用程序质量。
 message.outputting-bundle-location=正在为安装程序生成 RPM, 位置: {0}。
 message.output-bundle-location=程序包 (.rpm) 已保存到: {0}。
-message.creating-association-with-null-extension=正在使用空扩展名创建关联。
 
 message.ldd-not-available=未找到 ldd 命令。将不生成程序包被依赖对象。
 message.deb-ldd-not-available.advice=安装 "libc-bin" DEB 程序包以获取 ldd。
diff --git a/src/jdk.jpackage/linux/native/libapplauncher/LinuxLauncherLib.cpp b/src/jdk.jpackage/linux/native/libapplauncher/LinuxLauncherLib.cpp
index 7d7c8b7213d..561e2a942bb 100644
--- a/src/jdk.jpackage/linux/native/libapplauncher/LinuxLauncherLib.cpp
+++ b/src/jdk.jpackage/linux/native/libapplauncher/LinuxLauncherLib.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBundlingEnvironment.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBundlingEnvironment.java
index 371a3c7307a..3cecb2cd243 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBundlingEnvironment.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBundlingEnvironment.java
@@ -51,7 +51,7 @@ public class MacBundlingEnvironment extends DefaultBundlingEnvironment {
 
     private static void createDmdPackage(Options options, MacDmgSystemEnvironment sysEnv) {
         createNativePackage(options,
-                MacFromOptions::createMacDmgPackage,
+                MacFromOptions.createMacDmgPackage(options),
                 buildEnv()::create,
                 MacBundlingEnvironment::buildPipeline,
                 (env, pkg, outputDir) -> {
@@ -62,7 +62,7 @@ public class MacBundlingEnvironment extends DefaultBundlingEnvironment {
 
     private static void createPkgPackage(Options options) {
         createNativePackage(options,
-                MacFromOptions::createMacPkgPackage,
+                MacFromOptions.createMacPkgPackage(options),
                 buildEnv()::create,
                 MacBundlingEnvironment::buildPipeline,
                 (env, pkg, outputDir) -> {
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromOptions.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromOptions.java
index 074014dede0..b1094331740 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromOptions.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromOptions.java
@@ -49,7 +49,7 @@ import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_RUNTIME_IMAGE;
 import static jdk.jpackage.internal.model.MacPackage.RUNTIME_BUNDLE_LAYOUT;
 import static jdk.jpackage.internal.model.StandardPackageType.MAC_DMG;
 import static jdk.jpackage.internal.model.StandardPackageType.MAC_PKG;
-import static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
+import static jdk.jpackage.internal.util.function.ExceptionBox.toUnchecked;
 
 import java.nio.file.Path;
 import java.util.Objects;
@@ -106,7 +106,7 @@ final class MacFromOptions {
         final boolean sign = MAC_SIGN.findIn(options).orElse(false);
         final boolean appStore = MAC_APP_STORE.findIn(options).orElse(false);
 
-        final var appResult = Result.create(() -> createMacApplicationInternal(options));
+        final var appResult = Result.of(() -> createMacApplicationInternal(options));
 
         final Optional<MacPkgPackageBuilder> pkgBuilder;
         if (appResult.hasValue()) {
@@ -146,18 +146,18 @@ final class MacFromOptions {
 
                 final var expiredAppCertException = appResult.firstError().orElseThrow();
 
-                final var pkgSignConfigResult = Result.create(signingIdentityBuilder::create);
+                final var pkgSignConfigResult = Result.of(signingIdentityBuilder::create);
                 try {
                     rethrowIfNotExpiredCertificateException(pkgSignConfigResult);
                     // The certificate for the package signing config is also expired!
                 } catch (RuntimeException ex) {
                     // Some error occurred trying to configure the signing config for the package.
                     // Ignore it, bail out with the first error.
-                    rethrowUnchecked(expiredAppCertException);
+                    throw toUnchecked(expiredAppCertException);
                 }
 
                 Log.error(pkgSignConfigResult.firstError().orElseThrow().getMessage());
-                rethrowUnchecked(expiredAppCertException);
+                throw toUnchecked(expiredAppCertException);
             }
         }
 
@@ -303,7 +303,7 @@ final class MacFromOptions {
             }
         }
 
-        rethrowUnchecked(ex);
+        throw toUnchecked(ex);
     }
 
     private static SigningIdentityBuilder createSigningIdentityBuilder(Options options) {
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgInstallerScripts.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgInstallerScripts.java
index ecd3d19ac17..d0313af1efa 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgInstallerScripts.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgInstallerScripts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
index 9a57ce1e697..0f753c07569 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,7 @@ import javax.naming.ldap.Rdn;
 import javax.security.auth.x500.X500Principal;
 import jdk.jpackage.internal.MacCertificateUtils.CertificateHash;
 import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.JPackageException;
 import jdk.jpackage.internal.model.SigningIdentity;
 
 final class SigningIdentityBuilder {
@@ -147,10 +148,9 @@ final class SigningIdentityBuilder {
         Objects.requireNonNull(keychain);
         switch (certs.size()) {
             case 0 -> {
-                Log.error(I18N.format("error.cert.not.found", certificateSelector.signingIdentities().getFirst(),
+                throw new JPackageException(I18N.format("error.cert.not.found",
+                        certificateSelector.signingIdentities().getFirst(),
                         keychain.map(Keychain::name).orElse("")));
-                throw I18N.buildConfigException("error.explicit-sign-no-cert")
-                        .advice("error.explicit-sign-no-cert.advice").create();
             }
             case 1 -> {
                 return certs.getFirst();
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/TempKeychain.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/TempKeychain.java
index 97709678c67..b38faecd96f 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/TempKeychain.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/TempKeychain.java
@@ -35,7 +35,7 @@ import jdk.jpackage.internal.util.function.ThrowingConsumer;
 
 final class TempKeychain implements Closeable {
 
-    static void withKeychains(ThrowingConsumer<List<Keychain>> keychainConsumer, List<Keychain> keychains) throws Throwable {
+    static void withKeychains(ThrowingConsumer<List<Keychain>, ? extends Exception> keychainConsumer, List<Keychain> keychains) throws Exception {
         keychains.forEach(Objects::requireNonNull);
         if (keychains.isEmpty() || OSVersion.current().compareTo(new OSVersion(10, 12)) < 0) {
             keychainConsumer.accept(keychains);
@@ -47,7 +47,7 @@ final class TempKeychain implements Closeable {
         }
     }
 
-    static void withKeychain(ThrowingConsumer<Keychain> keychainConsumer, Keychain keychain) throws Throwable {
+    static void withKeychain(ThrowingConsumer<Keychain, ? extends Exception> keychainConsumer, Keychain keychain) throws Exception {
         Objects.requireNonNull(keychainConsumer);
         withKeychains(keychains -> {
             keychainConsumer.accept(keychains.getFirst());
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
index d01297aa814..240e82dcc9b 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,6 @@
 #
 #
 error.invalid-cfbundle-version.advice=Set a compatible 'app-version' value. Valid versions are one to three integers separated by dots.
-error.explicit-sign-no-cert=Signature explicitly requested but no signing certificate found
-error.explicit-sign-no-cert.advice=Specify a valid mac-signing-key-user-name and mac-signing-keychain
 error.certificate.expired=Certificate expired {0}
 error.cert.not.found=No certificate found matching [{0}] using keychain [{1}]
 error.multiple.certs.found=Multiple certificates matching name [{0}] found in keychain [{1}]
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
index 7e36a260c3f..3cc56bb6cdf 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
@@ -23,24 +23,19 @@
 # questions.
 #
 #
-
-app.bundler.name=Mac-Anwendungsimage
-store.bundler.name=Mac App Store-fähiger Bundler
-dmg.bundler.name=Mac-DMG-Package
-pkg.bundler.name=Mac-PKG-Package
-
 error.invalid-cfbundle-version.advice=Legen Sie einen kompatiblen Wert für "app-version" fest. Gültige Versionsnummern sind ein bis drei durch Punkte getrennte Ganzzahlen.
 error.explicit-sign-no-cert=Signatur wurde explizit angefordert, doch es wurde kein Signaturzertifikat gefunden
 error.explicit-sign-no-cert.advice=Geben Sie gültige Werte für mac-signing-key-user-name und mac-signing-keychain an
-error.must-sign-app-store=Mac App Store-Apps müssen signiert werden. Die Signierung wurde von der Bundler-Konfiguration deaktiviert
-error.must-sign-app-store.advice=Verwenden Sie die Option --mac-sign mit entsprechenden Werten für user-name und keychain
-error.certificate.expired=Fehler: Zertifikat abgelaufen {0}
+error.certificate.expired=Zertifikat abgelaufen {0}
 error.cert.not.found=Kein Zertifikat gefunden, das [{0}] mit Schlüsselbund [{1}] entspricht
-error.multiple.certs.found=WARNUNG: Mehrere Zertifikate gefunden, die [{0}] mit Schlüsselbund [{1}] entsprechen. Es wird das erste Zertifikat verwendet
-error.app-image.mac-sign.required=Fehler: Die Option "--mac-sign" ist mit einem vordefinierten Anwendungsimage und Typ [app-image] erforderlich
-error.tool.failed.with.output=Fehler: "{0}" nicht erfolgreich mit folgender Ausgabe:
-resource.bundle-config-file=Bundle-Konfigurationsdatei
+error.multiple.certs.found=Mehrere Zertifikate mit Namen [{0}] in Schlüsselbund [{1}] gefunden
+error.app-image.mac-sign.required=Die Option --mac-sign ist mit einem vordefinierten Anwendungsimage und Typ [app-image] erforderlich
+error.tool.failed.with.output="{0}" war mit folgender Ausgabe nicht erfolgreich:
+error.invalid-runtime-image-missing-file=Im Laufzeitimage "{0}" fehlt die Datei "{1}"
+error.invalid-runtime-image-bin-dir=Laufzeitimage "{0}" darf keinen Ordner "bin" enthalten
+error.invalid-runtime-image-bin-dir.advice=Verwenden Sie die jlink-Option --strip-native-commands, wenn das Laufzeitimage mit Option {0} generiert wird
 resource.app-info-plist=Info.plist der Anwendung
+resource.app-runtime-info-plist=Eingebettete Info.plist von Java Runtime
 resource.runtime-info-plist=Info.plist von Java Runtime
 resource.entitlements=Mac-Berechtigungen
 resource.dmg-setup-script=DMG-Setupskript
@@ -56,21 +51,15 @@ resource.pkg-background-image=PKG-Hintergrundbild
 resource.pkg-pdf=Projektdefinitionsdatei
 resource.launchd-plist-file=launchd-PLIST-Datei
 
-
 message.bundle-name-too-long-warning={0} ist auf "{1}" gesetzt. Dies ist länger als 16 Zeichen. Kürzen Sie den Wert, um die Mac-Nutzungserfahrung zu verbessern.
 message.preparing-info-plist=Info.plist wird vorbereitet: {0}.
 message.icon-not-icns= Das angegebene Symbol "{0}" ist keine ICNS-Datei und wird nicht verwendet. Stattdessen wird das Standardsymbol verwendet.
 message.version-string-too-many-components="app-version" darf ein bis drei Zahlen aufweisen: 1, 1.2, 1.2.3.
 message.version-string-first-number-not-zero=Die erste Zahl in app-version darf nicht null oder negativ sein.
-message.creating-association-with-null-extension=Verknüpfung mit Nullerweiterung wird erstellt.
-message.ignoring.symlink=Warnung: codesign überspringt den Symlink {0}.
-message.already.signed=Datei ist bereits signiert: {0}.
-message.keychain.error=Fehler: Schlüsselbundliste kann nicht abgerufen werden.
-message.building-bundle=Mac App Store-Package für {0} wird erstellt.
+message.keychain.error=Schlüsselbundliste kann nicht abgerufen werden.
 message.invalid-identifier=Ungültige Mac-Bundle-ID [{0}].
 message.invalid-identifier.advice=Geben Sie die ID mit "--mac-package-identifier" an.
 message.building-dmg=DMG-Package für {0} wird erstellt.
-message.running-script=Shellskript wird auf Anwendungsimage [{0}] ausgeführt.
 message.preparing-dmg-setup=DMG-Setup wird vorbereitet: {0}.
 message.creating-dmg-file=DMG-Datei wird erstellt: {0}.
 message.dmg-cannot-be-overwritten=DMG-Datei [{0}] ist vorhanden und kann nicht entfernt werden.
@@ -84,3 +73,5 @@ message.codesign.failed.reason.app.content="codesign" war nicht erfolgreich, und
 message.codesign.failed.reason.xcode.tools=Möglicher Grund für "codesign"-Fehler ist fehlender Xcode mit Befehlszeilen-Entwicklertools. Installieren Sie Xcode mit Befehlszeilen-Entwicklertools, und prüfen Sie, ob das Problem dadurch beseitigt wird.
 warning.unsigned.app.image=Warnung: Nicht signiertes app-image wird zum Erstellen von signiertem {0} verwendet.
 warning.per.user.app.image.signed=Warnung: Konfiguration der installierten Anwendung pro Benutzer wird nicht unterstützt, da "{0}" im vordefinierten signierten Anwendungsimage fehlt.
+warning.non.standard.contents.sub.dir=Warnung: Der Dateiname des Verzeichnisses "{0}", das für die Option --app-content angegeben wurde, ist kein Standardunterverzeichnisname im Verzeichnis "Contents" des Anwendungs-Bundles. Möglicherweise verläuft die Codesignierung und/oder Notarisierung im Ergebnisanwendungs-Bundle nicht erfolgreich.
+warning.app.content.is.not.dir=Warnung: Der Wert "{0}" der Option --app-content ist kein Verzeichnis. Möglicherweise verläuft die Codesignierung und/oder Notarisierung im Ergebnisanwendungs-Bundle nicht erfolgreich.
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
index 4384d6507f9..d3150a34a86 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
@@ -23,24 +23,19 @@
 # questions.
 #
 #
-
-app.bundler.name=Macアプリケーション・イメージ
-store.bundler.name=Mac App Storeの準備完了バンドラ
-dmg.bundler.name=Mac DMGパッケージ
-pkg.bundler.name=Mac PKGパッケージ
-
 error.invalid-cfbundle-version.advice=互換性のある'app-version'値を設定します。有効なバージョンは、ドットで区切られた1から3つの整数です。
 error.explicit-sign-no-cert=署名が明示的に要求されましたが、署名証明書が見つかりません
 error.explicit-sign-no-cert.advice=有効なmac-signing-key-user-nameおよびmac-signing-keychainを指定してください
-error.must-sign-app-store=Mac App Storeアプリケーションは署名されている必要がありますが、署名はバンドラ構成によって無効化されています
-error.must-sign-app-store.advice=--mac-signオプションを適切なuser-nameおよびkeychain付きで使用してください
-error.certificate.expired=エラー: 証明書は{0}に期限が切れました
+error.certificate.expired=証明書が期限切れです{0}
 error.cert.not.found=キーチェーン[{1}]を使用する[{0}]と一致する証明書が見つかりません
-error.multiple.certs.found=警告: キーチェーン[{1}]を使用する[{0}]と一致する複数の証明書が見つかりました。最初のものを使用します
-error.app-image.mac-sign.required=エラー: --mac-signオプションは、事前定義済アプリケーション・イメージおよびタイプ[app-image]で必要です
-error.tool.failed.with.output=エラー: "{0}"は次の出力で失敗しました:
-resource.bundle-config-file=バンドル構成ファイル
+error.multiple.certs.found=名前[{0}]に一致する複数の証明書がキーチェーン[{1}]で見つかりました
+error.app-image.mac-sign.required=--mac-signオプションは、事前定義済アプリケーション・イメージおよびタイプ[app-image]で必要です
+error.tool.failed.with.output="{0}"は次の出力で失敗しました:
+error.invalid-runtime-image-missing-file=ランタイム・イメージ"{0}"に"{1}"ファイルがありません
+error.invalid-runtime-image-bin-dir=ランタイム・イメージ"{0}"に"bin"フォルダを含めることはできません
+error.invalid-runtime-image-bin-dir.advice={0}オプションとともに使用されるランタイム・イメージを生成する場合は、--strip-native-commands jlinkオプションを使用します
 resource.app-info-plist=アプリケーションのInfo.plist
+resource.app-runtime-info-plist=埋込みJavaランタイムのInfo.plist
 resource.runtime-info-plist=JavaランタイムのInfo.plist
 resource.entitlements=Mac権限
 resource.dmg-setup-script=DMG設定スクリプト
@@ -56,21 +51,15 @@ resource.pkg-background-image=pkg背景イメージ
 resource.pkg-pdf=プロジェクト定義ファイル
 resource.launchd-plist-file=launchd plistファイル
 
-
 message.bundle-name-too-long-warning={0}が16文字を超える''{1}''に設定されています。Macでの操作性をより良くするために短くすることを検討してください。
 message.preparing-info-plist=Info.plistを準備しています: {0}。
 message.icon-not-icns= 指定したアイコン"{0}"はICNSファイルではなく、使用されません。デフォルト・アイコンがその位置に使用されます。
 message.version-string-too-many-components='app-version'には、1、1.2、1.2.3など1から3の数字を使用できます。
 message.version-string-first-number-not-zero=pp-versionの最初の数字は、ゼロまたは負の値にできません。
-message.creating-association-with-null-extension=null拡張子との関連付けを作成しています。
-message.ignoring.symlink=警告: codesignがsymlink {0}をスキップしています
-message.already.signed=ファイルはすでに署名されています: {0}。
-message.keychain.error=エラー: キーチェーン・リストを取得できません。
-message.building-bundle={0}のMac App Storeパッケージを作成しています。
+message.keychain.error=キーチェーン・リストを取得できません。
 message.invalid-identifier=macバンドル識別子[{0}]が無効です。
 message.invalid-identifier.advice="--mac-package-identifier"で識別子を指定してください。
 message.building-dmg={0}のDMGパッケージを作成しています
-message.running-script=アプリケーション・イメージ[{0}]でシェル・スクリプトを実行しています。
 message.preparing-dmg-setup=dmgの設定を準備しています: {0}
 message.creating-dmg-file=DMGファイルを作成しています: {0}
 message.dmg-cannot-be-overwritten=Dmgファイルは存在し[{0}]、削除できません。
@@ -84,3 +73,5 @@ message.codesign.failed.reason.app.content="codesign"が失敗したため、追
 message.codesign.failed.reason.xcode.tools="codesign"失敗の考えられる理由は、Xcodeとコマンドライン・デベロッパ・ツールの欠落です。Xcodeとコマンドライン・デベロッパ・ツールをインストールして、問題が解決されるかを確認してください。
 warning.unsigned.app.image=警告: 署名されていないapp-imageを使用して署名された{0}を作成します。
 warning.per.user.app.image.signed=警告: 事前定義済の署名付きアプリケーション・イメージに"{0}"がないため、インストール済アプリケーションのユーザーごとの構成はサポートされません。
+warning.non.standard.contents.sub.dir=警告: --app-contentオプションに指定されたディレクトリ"{0}"のファイル名が、アプリケーション・バンドルの"Contents"ディレクトリ内の標準サブディレクトリ名ではありません。結果アプリケーション・バンドルは、コード署名および/または公証に失敗することがあります。
+warning.app.content.is.not.dir=警告: --app-contentオプションの値"{0}"はディレクトリではありません。結果アプリケーション・バンドルは、コード署名または公証(あるいはその両方)に失敗することがあります。
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
index 09c6d77694a..8ca2219b72f 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
@@ -23,24 +23,19 @@
 # questions.
 #
 #
-
-app.bundler.name=Mac 应用程序映像
-store.bundler.name=支持 Mac App Store 的打包程序
-dmg.bundler.name=Mac DMG 程序包
-pkg.bundler.name=Mac PKG 程序包
-
 error.invalid-cfbundle-version.advice=设置兼容的 'app-version' 值。有效版本包含一到三个用点分隔的整数。
 error.explicit-sign-no-cert=已明确请求签名，但找不到签名证书
 error.explicit-sign-no-cert.advice=指定有效的 mac-signing-key-user-name 和 mac-signing-keychain
-error.must-sign-app-store=Mac App Store 应用程序必须签名, 而打包程序配置已禁用签名
-error.must-sign-app-store.advice=将 --mac-sign 选项用于适当的用户名和密钥链
-error.certificate.expired=错误: 证书已失效 {0}
+error.certificate.expired=证书已到期 {0}
 error.cert.not.found=使用密钥链 [{1}] 找不到与 [{0}] 匹配的证书
-error.multiple.certs.found=警告：使用密钥链 [{1}] 找到多个与 [{0}] 匹配的证书，将使用第一个证书
-error.app-image.mac-sign.required=错误：预定义的应用程序映像和类型 [app image] 需要 --mac-sign 选项
-error.tool.failed.with.output=错误："{0}" 失败，显示以下输出：
-resource.bundle-config-file=包配置文件
+error.multiple.certs.found=在密钥链 [{1}] 中找到多个与名称 [{0}] 匹配的证书
+error.app-image.mac-sign.required=预定义的应用程序映像和类型 [app-image] 需要 --mac-sign 选项
+error.tool.failed.with.output="{0}" 失败，显示以下输出：
+error.invalid-runtime-image-missing-file=运行时映像 "{0}" 缺少 "{1}" 文件
+error.invalid-runtime-image-bin-dir=运行时映像 "{0}" 不应包含 "bin" 文件夹
+error.invalid-runtime-image-bin-dir.advice=生成与 {0} 选项一起使用的运行时映像时，使用 --strip-native-commands jlink 选项
 resource.app-info-plist=应用程序 Info.plist
+resource.app-runtime-info-plist=嵌入式 Java 运行时 Info.plist
 resource.runtime-info-plist=Java 运行时 Info.plist
 resource.entitlements=Mac 权利
 resource.dmg-setup-script=DMG 设置脚本
@@ -56,21 +51,15 @@ resource.pkg-background-image=pkg 背景图像
 resource.pkg-pdf=项目定义文件
 resource.launchd-plist-file=launchd plist 文件
 
-
 message.bundle-name-too-long-warning={0}已设置为 ''{1}'', 其长度超过了 16 个字符。为了获得更好的 Mac 体验, 请考虑将其缩短。
 message.preparing-info-plist=正在准备 Info.plist: {0}。
 message.icon-not-icns= 指定的图标 "{0}" 不是 ICNS 文件, 不会使用。将使用默认图标代替。
 message.version-string-too-many-components='app-version' 可以包含 1 到 3 个数字：1、1.2、1.2.3。
 message.version-string-first-number-not-zero=app-version 中的第一个数字不能为零或负数。
-message.creating-association-with-null-extension=正在使用空扩展名创建关联。
-message.ignoring.symlink=警告: codesign 正在跳过符号链接 {0}。
-message.already.signed=文件已签名：{0}。
-message.keychain.error=错误：无法获取密钥链列表。
-message.building-bundle=正在为 {0} 构建 Mac App Store 程序包。
-message.invalid-identifier=无效的 Mac 包标识符 [{0}]。
+message.keychain.error=无法获取密钥链列表。
+message.invalid-identifier=mac 包标识符 [{0}] 无效。
 message.invalid-identifier.advice=请使用 "--mac-package-identifier" 指定标识符。
 message.building-dmg=正在为 {0} 构建 DMG 程序包。
-message.running-script=正在应用程序映像 [{0}] 上运行 shell 脚本。
 message.preparing-dmg-setup=正在准备 dmg 设置: {0}。
 message.creating-dmg-file=正在创建 DMG 文件: {0}。
 message.dmg-cannot-be-overwritten=Dmg 文件已存在 [{0}] 且无法删除。
@@ -84,3 +73,5 @@ message.codesign.failed.reason.app.content="codesign" 失败，并通过 "--app-
 message.codesign.failed.reason.xcode.tools="codesign" 失败可能是因为缺少带命令行开发人员工具的 Xcode。请安装带命令行开发人员工具的 Xcode，看看是否可以解决问题。
 warning.unsigned.app.image=警告：使用未签名的 app-image 生成已签名的 {0}。
 warning.per.user.app.image.signed=警告：由于预定义的已签名应用程序映像中缺少 "{0}"，不支持对已安装应用程序的每用户配置提供支持。
+warning.non.standard.contents.sub.dir=警告：为 --app-content 选项指定的目录 "{0}" 的文件名不是应用程序包的 "Contents" 目录中的标准子目录名称。结果应用程序包可能会使代码签名和/或公证失败。
+warning.app.content.is.not.dir=警告：--app-content 选项的值 "{0}" 不是目录。结果应用程序包可能会使代码签名和/或公证失败。
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
index b6b4322302e..5f473b554be 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
@@ -198,7 +198,7 @@ final class AppImageFile {
 
         } catch (XPathExpressionException ex) {
             // This should never happen as XPath expressions should be correct
-            throw ExceptionBox.rethrowUnchecked(ex);
+            throw ExceptionBox.toUnchecked(ex);
         } catch (SAXException ex) {
             // Malformed input XML
             throw new JPackageException(I18N.format("error.malformed-app-image-file", relativeAppImageFilePath, appImageDir), ex);
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DefaultBundlingEnvironment.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DefaultBundlingEnvironment.java
index 0bf7d6f41b2..05e080f240a 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DefaultBundlingEnvironment.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DefaultBundlingEnvironment.java
@@ -144,29 +144,27 @@ class DefaultBundlingEnvironment implements CliBundlingEnvironment {
     }
 
     static <T extends Package> void createNativePackage(Options options,
-            Function<Options, T> createPackage,
+            T pkg,
             BiFunction<Options, T, BuildEnv> createBuildEnv,
             PackagingPipeline.Builder pipelineBuilder,
             Packager.PipelineBuilderMutatorFactory<T> pipelineBuilderMutatorFactory) {
 
         Objects.requireNonNull(pipelineBuilder);
-        createNativePackage(options, createPackage, createBuildEnv, _ -> pipelineBuilder, pipelineBuilderMutatorFactory);
+        createNativePackage(options, pkg, createBuildEnv, _ -> pipelineBuilder, pipelineBuilderMutatorFactory);
     }
 
     static <T extends Package> void createNativePackage(Options options,
-            Function<Options, T> createPackage,
+            T pkg,
             BiFunction<Options, T, BuildEnv> createBuildEnv,
             Function<T, PackagingPipeline.Builder> createPipelineBuilder,
             Packager.PipelineBuilderMutatorFactory<T> pipelineBuilderMutatorFactory) {
 
         Objects.requireNonNull(options);
-        Objects.requireNonNull(createPackage);
+        Objects.requireNonNull(pkg);
         Objects.requireNonNull(createBuildEnv);
         Objects.requireNonNull(createPipelineBuilder);
         Objects.requireNonNull(pipelineBuilderMutatorFactory);
 
-        var pkg = Objects.requireNonNull(createPackage.apply(options));
-
         Packager.<T>build().pkg(pkg)
             .outputDir(OptionUtils.outputDir(options))
             .env(Objects.requireNonNull(createBuildEnv.apply(options, pkg)))
@@ -207,7 +205,9 @@ class DefaultBundlingEnvironment implements CliBundlingEnvironment {
     }
 
     private Supplier<Result<Consumer<Options>>> getBundlerSupplier(BundlingOperationDescriptor op) {
-        return Optional.ofNullable(bundlers.get(op)).orElseThrow(NoSuchElementException::new);
+        return Optional.ofNullable(bundlers.get(op)).orElseThrow(() -> {
+            throw new NoSuchElementException(String.format("Unsupported bundling operation: %s", op));
+        });
     }
 
     private String bundleTypeDescription(PackageType type, OperatingSystem os) {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherBuilder.java
index e3720e0a776..5658760b4d6 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherBuilder.java
@@ -50,13 +50,16 @@ final class LauncherBuilder {
 
         final var fa = createFileAssociations(faSources, Optional.ofNullable(faTraits).orElse(DEFAULT_FA_TRAITS));
 
-        Objects.requireNonNull(defaultIconResourceName);
-
         final var nonNullName = deriveNonNullName();
 
-        return new Stub(nonNullName, Optional.ofNullable(startupInfo), fa,
-                isService, Optional.ofNullable(description).orElse(nonNullName),
-                Optional.ofNullable(icon), defaultIconResourceName,
+        return new Stub(
+                nonNullName,
+                Optional.ofNullable(startupInfo),
+                fa,
+                isService,
+                Optional.ofNullable(description).orElse(nonNullName),
+                Optional.ofNullable(icon),
+                Optional.ofNullable(defaultIconResourceName).orElseGet(LauncherBuilder::defaultIconResourceName),
                 Optional.ofNullable(extraAppImageFileData).orElseGet(Map::of));
     }
 
@@ -170,6 +173,23 @@ final class LauncherBuilder {
         return FileAssociationGroup.flatMap(groups.stream()).toList();
     }
 
+    private static String defaultIconResourceName() {
+        switch (OperatingSystem.current()) {
+            case WINDOWS -> {
+                return "JavaApp.ico";
+            }
+            case LINUX -> {
+                return "JavaApp.png";
+            }
+            case MACOS -> {
+                return "JavaApp.icns";
+            }
+            default -> {
+                throw new UnsupportedOperationException();
+            }
+        }
+    }
+
     private String name;
     private LauncherStartupInfo startupInfo;
     private List<FileAssociationGroup> faSources = List.of();
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromOptions.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromOptions.java
index 0749cc48b9b..ed030a4a726 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromOptions.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromOptions.java
@@ -45,7 +45,6 @@ import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.stream.IntStream;
-import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.internal.FileAssociationGroup.FileAssociationException;
 import jdk.jpackage.internal.FileAssociationGroup.FileAssociationNoExtensionsException;
 import jdk.jpackage.internal.FileAssociationGroup.FileAssociationNoMimesException;
@@ -82,7 +81,7 @@ final class LauncherFromOptions {
     }
 
     Launcher create(Options options) {
-        final var builder = new LauncherBuilder().defaultIconResourceName(defaultIconResourceName());
+        final var builder = new LauncherBuilder();
 
         DESCRIPTION.ifPresentIn(options, builder::description);
         builder.icon(toLauncherIcon(ICON.findIn(options).orElse(null)));
@@ -167,23 +166,6 @@ final class LauncherFromOptions {
         }
     }
 
-    private static String defaultIconResourceName() {
-        switch (OperatingSystem.current()) {
-            case WINDOWS -> {
-                return "JavaApp.ico";
-            }
-            case LINUX -> {
-                return "JavaApp.png";
-            }
-            case MACOS -> {
-                return "JavaApp.icns";
-            }
-            default -> {
-                throw new UnsupportedOperationException();
-            }
-        }
-    }
-
     private BiConsumer<FileAssociationGroup.Builder, LauncherBuilder> faGroupBuilderMutator;
     private BiFunction<Options, FileAssociation, FileAssociation> faMapper;
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java
index a2750fee260..c94dada9262 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java
@@ -508,7 +508,7 @@ final class PackagingPipeline {
         try {
             builder.create().call();
         } catch (Exception ex) {
-            throw ExceptionBox.rethrowUnchecked(ex);
+            throw ExceptionBox.toUnchecked(ex);
         }
     }
 
@@ -632,7 +632,7 @@ final class PackagingPipeline {
             final var accepted = withAction && context.test(id);
 
             if (TRACE_TASK_ACTION) {
-                var sb = new StringBuffer();
+                var sb = new StringBuilder();
                 sb.append("Execute task=[").append(id).append("]: ");
                 if (!withAction) {
                     sb.append("no action");
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Main.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Main.java
index f377b22374d..9feb5b40944 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Main.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Main.java
@@ -31,6 +31,7 @@ import static jdk.jpackage.internal.cli.StandardOption.VERSION;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.UncheckedIOException;
 import java.nio.file.NoSuchFileException;
@@ -47,6 +48,7 @@ import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.internal.Log;
 import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.JPackageException;
+import jdk.jpackage.internal.util.Slot;
 import jdk.jpackage.internal.util.function.ExceptionBox;
 
 /**
@@ -65,6 +67,21 @@ public final class Main {
         public int run(PrintWriter out, PrintWriter err, String... args) {
             return Main.run(out, err, args);
         }
+
+        @Override
+        public int run(PrintStream out, PrintStream err, String... args) {
+            PrintWriter outWriter = new PrintWriter(out, true);
+            PrintWriter errWriter = new PrintWriter(err, true);
+            try {
+                try {
+                    return run(outWriter, errWriter, args);
+                } finally {
+                    outWriter.flush();
+                }
+            } finally {
+                errWriter.flush();
+            }
+        }
     }
 
 
@@ -78,27 +95,45 @@ public final class Main {
     }
 
     public static int run(PrintWriter out, PrintWriter err, String... args) {
+        Objects.requireNonNull(args);
+        for (String arg : args) {
+            Objects.requireNonNull(arg);
+        }
         Objects.requireNonNull(out);
         Objects.requireNonNull(err);
 
         Log.setPrintWriter(out, err);
 
+        final var runner = new Runner(t -> {
+            new ErrorReporter(_ -> {
+                t.printStackTrace(err);
+            }, Log::fatalError, Log.isVerbose()).reportError(t);
+        });
+
         try {
-            try {
-                args = CommandLine.parse(args);
-            } catch (FileNotFoundException|NoSuchFileException ex) {
-                Log.fatalError(I18N.format("ERR_CannotParseOptions", ex.getMessage()));
-                return 1;
-            } catch (IOException ex) {
-                throw ExceptionBox.rethrowUnchecked(ex);
+            var mappedArgs = Slot.<String[]>createEmpty();
+
+            int preprocessStatus = runner.run(() -> {
+                try {
+                    mappedArgs.set(CommandLine.parse(args));
+                    return List.of();
+                } catch (FileNotFoundException | NoSuchFileException ex) {
+                    return List.of(new JPackageException(I18N.format("ERR_CannotParseOptions", ex.getMessage()), ex));
+                } catch (IOException ex) {
+                    return List.of(ex);
+                }
+            });
+
+            if (preprocessStatus != 0) {
+                return preprocessStatus;
             }
 
             final var bundlingEnv = ServiceLoader.load(CliBundlingEnvironment.class,
                     CliBundlingEnvironment.class.getClassLoader()).findFirst().orElseThrow();
 
-            final var parseResult = Utils.buildParser(OperatingSystem.current(), bundlingEnv).create().apply(args);
+            final var parseResult = Utils.buildParser(OperatingSystem.current(), bundlingEnv).create().apply(mappedArgs.get());
 
-            return new Runner().run(() -> {
+            return runner.run(() -> {
                 final var parsedOptionsBuilder = parseResult.orElseThrow();
 
                 final var options = parsedOptionsBuilder.create();
@@ -144,13 +179,35 @@ public final class Main {
         }
     }
 
+    /*
+     * Exception (error) reporting:
+     *
+     * There are two types of exceptions to handle:
+     *
+     * 1. Exceptions explicitly thrown by jpackage code with localized,
+     *    jpackage-specific error messages. These are usually instances of
+     *    JPackageException.
+     *
+     * 2. Exceptions thrown by JDK code (for example, an NPE from Optional.of(...)).
+     *    These should normally not occur or should be handled at the point
+     *    where they arise. If they reach this level of exception handling,
+     *    it indicates a flaw in jpackage’s internal logic.
+     *
+     * Always print stack traces for exceptions of type #2.
+     * Print stack traces for exceptions of type #1 only in verbose mode.
+     * Always print the messages for exceptions of any type.
+     */
 
-    record ErrorReporter(Consumer<Throwable> stackTracePrinter, Consumer<String> messagePrinter) {
+    record ErrorReporter(Consumer<Throwable> stackTracePrinter, Consumer<String> messagePrinter, boolean verbose) {
         ErrorReporter {
             Objects.requireNonNull(stackTracePrinter);
             Objects.requireNonNull(messagePrinter);
         }
 
+        ErrorReporter(Consumer<Throwable> stackTracePrinter, Consumer<String> messagePrinter) {
+            this(stackTracePrinter, messagePrinter, true);
+        }
+
         void reportError(Throwable t) {
             if (t instanceof ConfigException cfgEx) {
                 printError(cfgEx, Optional.ofNullable(cfgEx.getAdvice()));
@@ -164,10 +221,14 @@ public final class Main {
         }
 
         private void printError(Throwable t, Optional<String> advice) {
-            stackTracePrinter.accept(t);
+            var isAlienException = isAlienExceptionType(t);
+
+            if (isAlienException || verbose) {
+                stackTracePrinter.accept(t);
+            }
 
             String msg;
-            if (isAlienExceptionType(t)) {
+            if (isAlienException) {
                 msg = t.toString();
             } else {
                 msg = t.getMessage();
@@ -196,15 +257,18 @@ public final class Main {
     }
 
 
-    static final class Runner {
+    record Runner(Consumer<Throwable> errorReporter) {
+
+        Runner {
+            Objects.requireNonNull(errorReporter);
+        }
 
         int run(Supplier<? extends Collection<? extends Exception>> r) {
             final var exceptions = runIt(r);
             if (exceptions.isEmpty()) {
                 return 0;
             } else {
-                var errorReporter = new ErrorReporter(Log::verbose, Log::fatalError);
-                exceptions.forEach(errorReporter::reportError);
+                exceptions.forEach(errorReporter);
                 return 1;
             }
         }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecMapperOptionScope.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecMapperOptionScope.java
index ec781e107ea..7b517f768bf 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecMapperOptionScope.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecMapperOptionScope.java
@@ -111,7 +111,7 @@ interface OptionSpecMapperOptionScope<T, U> extends OptionScope {
             if (contextOptionScope.isEmpty()) {
                 var mutators = new AccumulatingContextOptionScope<T, U>(optionSpecBuilder, contextType);
                 mutators.addMutator(optionSpecBuilderMutator);
-                scope = SetBuilder.build(OptionScope.class).add(scope).add(mutators).create();
+                scope = SetBuilder.<OptionScope>build().add(scope).add(mutators).create();
             }
 
             return scope;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsProcessor.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsProcessor.java
index 1bc5c36989f..54003b714a2 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsProcessor.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsProcessor.java
@@ -87,7 +87,7 @@ final class OptionsProcessor {
         final var untypedOptions = optionsBuilder.create();
 
         // Create command line structure analyzer.
-        final var analyzerResult = Result.create(() -> new OptionsAnalyzer(untypedOptions, bundlingEnv));
+        final var analyzerResult = Result.of(() -> new OptionsAnalyzer(untypedOptions, bundlingEnv));
         if (analyzerResult.hasErrors()) {
             // Failed to derive the bundling operation from the command line.
             allErrors.addAll(analyzerResult.mapErrors().errors());
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardBundlingOperation.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardBundlingOperation.java
index 988589884cc..45f9194db0b 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardBundlingOperation.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardBundlingOperation.java
@@ -53,9 +53,32 @@ public enum StandardBundlingOperation implements BundlingOperationOptionScope {
     CREATE_LINUX_DEB(StandardPackageType.LINUX_DEB, "^(?!(win-|mac-|linux-rpm-))", OperatingSystem.LINUX),
     CREATE_MAC_PKG(StandardPackageType.MAC_PKG, "^(?!(linux-|win-|mac-dmg-))", OperatingSystem.MACOS),
     CREATE_MAC_DMG(StandardPackageType.MAC_DMG, "^(?!(linux-|win-|mac-pkg-))", OperatingSystem.MACOS),
-    SIGN_MAC_APP_IMAGE(APP_IMAGE, OperatingSystem.MACOS, "sign");
+    SIGN_MAC_APP_IMAGE(APP_IMAGE, OperatingSystem.MACOS, Verb.SIGN);
 
-    StandardBundlingOperation(PackageType packageType, String optionNameRegexp, OperatingSystem os, String descriptorVerb) {
+    /**
+     * Supported values of the {@link BundlingOperationDescriptor#verb()} property.
+     */
+    private enum Verb {
+        CREATE(BundlingOperationDescriptor.VERB_CREATE_BUNDLE),
+        SIGN("sign"),
+        ;
+
+        Verb(String value) {
+            this.value = Objects.requireNonNull(value);
+        }
+
+        String value() {
+            return value;
+        }
+
+        boolean createBundle() {
+            return this == CREATE;
+        }
+
+        private final String value;
+    }
+
+    StandardBundlingOperation(PackageType packageType, String optionNameRegexp, OperatingSystem os, Verb descriptorVerb) {
         this.packageType = Objects.requireNonNull(packageType);
         optionNamePredicate = Pattern.compile(optionNameRegexp).asPredicate();
         this.os = Objects.requireNonNull(os);
@@ -63,17 +86,17 @@ public enum StandardBundlingOperation implements BundlingOperationOptionScope {
     }
 
     StandardBundlingOperation(PackageType packageType, String optionNameRegexp, OperatingSystem os) {
-        this(packageType, optionNameRegexp, os, "create");
+        this(packageType, optionNameRegexp, os, Verb.CREATE);
     }
 
-    StandardBundlingOperation(PackageType packageType, OperatingSystem os, String descriptorVerb) {
+    StandardBundlingOperation(PackageType packageType, OperatingSystem os, Verb descriptorVerb) {
         this.packageType = Objects.requireNonNull(packageType);
         optionNamePredicate = v -> false;
         this.os = Objects.requireNonNull(os);
         this.descriptorVerb = Objects.requireNonNull(descriptorVerb);
     }
 
-    OperatingSystem os() {
+    public OperatingSystem os() {
         return os;
     }
 
@@ -89,9 +112,17 @@ public enum StandardBundlingOperation implements BundlingOperationOptionScope {
         return packageType;
     }
 
+    /**
+     * Returns {@code true} if this bundling operation will create a new bundle and
+     * {@code false} otherwise.
+     */
+    public boolean isCreateBundle() {
+        return descriptorVerb.createBundle();
+    }
+
     @Override
     public BundlingOperationDescriptor descriptor() {
-        return new BundlingOperationDescriptor(os(), packageTypeValue(), descriptorVerb);
+        return new BundlingOperationDescriptor(os(), packageTypeValue(), descriptorVerb.value());
     }
 
     public static Optional<StandardBundlingOperation> valueOf(BundlingOperationDescriptor descriptor) {
@@ -101,10 +132,17 @@ public enum StandardBundlingOperation implements BundlingOperationOptionScope {
         }).findFirst();
     }
 
-    static Stream<StandardBundlingOperation> ofPlatform(OperatingSystem os) {
+    public static Stream<StandardBundlingOperation> ofPlatform(OperatingSystem os) {
         return Stream.of(values()).filter(platform(os));
     }
 
+    public static Predicate<StandardBundlingOperation> platform(OperatingSystem os) {
+        Objects.requireNonNull(os);
+        return op -> {
+            return  op.os() == os;
+        };
+    }
+
     static Set<BundlingOperationOptionScope> fromOptionName(String optionName) {
         Objects.requireNonNull(optionName);
         return Stream.of(StandardBundlingOperation.values()).filter(v -> {
@@ -112,13 +150,6 @@ public enum StandardBundlingOperation implements BundlingOperationOptionScope {
         }).collect(Collectors.toUnmodifiableSet());
     }
 
-    static Predicate<StandardBundlingOperation> platform(OperatingSystem os) {
-        Objects.requireNonNull(os);
-        return op -> {
-            return  op.os() == os;
-        };
-    }
-
     static Stream<StandardBundlingOperation> narrow(Stream<OptionScope> scope) {
         return scope.filter(StandardBundlingOperation.class::isInstance).map(StandardBundlingOperation.class::cast);
     }
@@ -145,8 +176,8 @@ public enum StandardBundlingOperation implements BundlingOperationOptionScope {
 
     static final Set<BundlingOperationOptionScope> LINUX = LINUX_CREATE_BUNDLE;
 
-    static final Set<BundlingOperationOptionScope> MACOS = SetBuilder.build(
-            BundlingOperationOptionScope.class).add(MACOS_CREATE_BUNDLE).add(SIGN_MAC_APP_IMAGE).create();
+    static final Set<BundlingOperationOptionScope> MACOS = SetBuilder.<BundlingOperationOptionScope>build(
+            ).add(MACOS_CREATE_BUNDLE).add(SIGN_MAC_APP_IMAGE).create();
 
     static final Set<BundlingOperationOptionScope> MACOS_APP_IMAGE = Set.of(
             SIGN_MAC_APP_IMAGE, CREATE_MAC_APP_IMAGE);
@@ -169,5 +200,5 @@ public enum StandardBundlingOperation implements BundlingOperationOptionScope {
     private final Predicate<String> optionNamePredicate;
     private final OperatingSystem os;
     private final PackageType packageType;
-    private final String descriptorVerb;
+    private final Verb descriptorVerb;
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java
index 6de3b7e5c5c..ec63c1fb498 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java
@@ -543,7 +543,7 @@ public final class StandardOption {
                 .description("help.option." + name)
                 .scope(fromOptionName(name))
                 .scope(scope -> {
-                    return SetBuilder.build(OptionScope.class)
+                    return SetBuilder.<OptionScope>build()
                             .add(scope)
                             .add(BundlingOperationModifier.values())
                             .create();
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java
index 943a42712c8..5b20a0690d3 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java
@@ -40,7 +40,7 @@ import java.util.stream.Stream;
  *
  * @see Package
  */
-public interface Application extends BundleSpec {
+public non-sealed interface Application extends BundleSpec {
 
     /**
      * Gets the name of this application.
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleSpec.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleSpec.java
index d91662075e3..e6426a9c1b5 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleSpec.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleSpec.java
@@ -27,5 +27,5 @@ package jdk.jpackage.internal.model;
 /**
  * A generic bundle specification.
  */
-public interface BundleSpec {
+public sealed interface BundleSpec permits Application, Package {
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperationDescriptor.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperationDescriptor.java
index 70e51c849eb..7a736d95514 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperationDescriptor.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperationDescriptor.java
@@ -41,6 +41,10 @@ public record BundlingOperationDescriptor(OperatingSystem os, String bundleType,
         Objects.requireNonNull(verb);
     }
 
+    public BundlingOperationDescriptor(OperatingSystem os, String bundleType) {
+        this(os, bundleType, VERB_CREATE_BUNDLE);
+    }
+
     @Override
     public String toString() {
         return os.name() + ":" + verb + ":" + bundleType;
@@ -50,4 +54,6 @@ public record BundlingOperationDescriptor(OperatingSystem os, String bundleType,
         final var components = str.split(":");
         return new BundlingOperationDescriptor(OperatingSystem.valueOf(components[0]), components[1], components[2]);
     }
+
+    public static final String VERB_CREATE_BUNDLE = "create";
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Package.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Package.java
index 33c707b776f..ec5d6341d4d 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Package.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Package.java
@@ -66,7 +66,7 @@ import java.util.Optional;
  * </tr>
  * </table>
  */
-public interface Package extends BundleSpec {
+public non-sealed interface Package extends BundleSpec {
 
     /**
      * Gets the application of this package.
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
index c1cb5bf4283..5b9a5728912 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,19 +24,163 @@
 #
 #
 
-MSG_Help=Verwendung: jpackage <Optionen>\n\nBeispielverwendungen:\n--------------\n    Generiert ein für das Hostsystem geeignetes Anwendungspackage:\n        Für eine modulare Anwendung:\n            jpackage -n name -p modulePath -m moduleName/className\n        Für eine nicht modulare Anwendung:\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        Aus einem vorab erstellten Anwendungsimage:\n            jpackage -n name --app-image appImageDir\n    Generiert ein Anwendungsimage:\n        Für eine modulare Anwendung:\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        Für eine nicht modulare Anwendung:\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        Um eigene Optionen für jlink anzugeben, führen Sie jlink separat aus:\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<zusätzliche jlink-Optionen>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    Generiert ein Java Runtime-Package:\n        jpackage -n name --runtime-image <Laufzeitimage>\n{6}\nAllgemeine Optionen:\n  @<Dateiname > \n          Liest Optionen und/oder Modus aus einer Datei \n          Diese Option kann mehrmals verwendet werden.\n  --type -t <Typ> \n          Der zu erstellende Packagetyp\n          Gültige Werte: {1} \n          Bei fehlender Angabe dieser Option wird ein plattformabhängiger\n          Standardtyp erstellt.\n  --app-version <Version>\n          Version der Anwendung und/oder des Packages\n  --copyright <Copyright-Zeichenfolge>\n          Copyright für die Anwendung\n  --description <Zeichenfolge für Beschreibung>\n          Beschreibung der Anwendung\n  --help -h \n          Gibt den Verwendungstext mit einer Liste und Beschreibung jeder gültigen\n          Option für die aktuelle Plattform an den Ausgabestream aus und beendet den Vorgang\n  --icon <Dateipfad>\n          Pfad des Symbols für das Anwendungspackage\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --name -n <Name>\n          Name der Anwendung und/oder des Packages\n  --dest -d <Zielpfad>\n          Pfad, in den die generierte Ausgabedatei abgelegt wird\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Standardmäßig wird das aktuelle Arbeitsverzeichnis verwendet.\n  --temp <Verzeichnispfad>\n          Pfad eines neuen oder leeren Verzeichnisses zum Erstellen temporärer Dateien\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Falls angegeben, wird das temporäre Verzeichnis beim Abschließen der Aufgabe\n          nicht entfernt und muss manuell entfernt werden.\n          Bei fehlender Angabe wird ein temporäres Verzeichnis erstellt und\n          beim Abschließen der Aufgabe entfernt.\n  --vendor <Zeichenfolge für Anbieter>\n          Anbieter der Anwendung\n  --verbose\n          Aktiviert Ausgabe im Verbose-Modus\n  --version\n          Gibt die Produktversion an den Outputstream aus und beendet den Vorgang.\n\nOptionen für das Erstellen des Laufzeitimages:\n  --add-modules <Modulname>[,<Modulname>...]\n          Eine per Komma (",") getrennte Liste hinzuzufügender Module\n          Diese Modulliste wird zusammen mit dem Hauptmodul (sofern angegeben)\n          als Argument --add-module an jlink übergeben.\n          Bei fehlender Angabe wird entweder nur das Hauptmodul (sofern --module\n          angegeben ist) oder das Standardset an Modulen (sofern --main-jar \n          angegeben ist) verwendet.\n          Diese Option kann mehrmals verwendet werden.\n  --module-path -p <Modulpfad>...\n          \
-Eine per {0} getrennte Pfadliste\n          Jeder Pfad ist entweder ein Verzeichnis mit Modulen oder der Pfad zu einer\n          JAR-Datei eines Moduls.\n          (Jeder Pfad ist absolut oder relativ zum aktuellen Verzeichnis.)\n          Diese Option kann mehrmals verwendet werden.\n  --jlink-options <jlink-Optionen> \n          Eine per Leerzeichen getrennte Liste mit an jlink zu übergebenden Optionen \n          Bei fehlender Angabe wird standardmäßig "--strip-native-commands \n          --strip-debug --no-man-pages --no-header-files" verwendet. \n          Diese Option kann mehrmals verwendet werden.\n  --runtime-image <Verzeichnispfad>\n          Pfad des vordefinierten Laufzeitimages, das in\n          das Anwendungsimage kopiert wird\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Wenn --runtime-image nicht angegeben wird, führt jpackage jlink aus, um\n          das Laufzeitimage mit folgenden Optionen zu erstellen:\n          --strip-debug, --no-header-files, --no-man-pages und\n          --strip-native-commands.\n\nOptionen für das Erstellen des Anwendungsimages:\n  --input -i <Verzeichnispfad>\n          Pfad des Eingabeverzeichnisses mit den zu verpackenden Dateien\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Alle Dateien im Eingabeverzeichnis werden verpackt für das\n          Anwendungsimage integriert.\n  --app-content <zusätzlicher Inhalt>[,<zusätzlicher Inhalt>...]\n          Eine per Komma getrennte Liste mit Pfaden zu Dateien und/oder Verzeichnissen,\n          die zur Anwendungs-Payload hinzugefügt werden sollen.\n          Diese Option kann mehrmals verwendet werden.\n\nOptionen für das Erstellen des Anwendungs-Launchers:\n  --add-launcher <Launcher-Name>=<Dateipfad>\n          Name des Launchers sowie ein Pfad zu einer Eigenschaftendatei mit\n          einer Liste von Schlüssel/Wert-Paaren\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Die Schlüssel "module", "main-jar", "main-class", "description",\n          "arguments", "java-options", "app-version", "icon",\n          "launcher-as-service",\n          "win-console", "win-shortcut", "win-menu",\n          "linux-app-category" und "linux-shortcut" können verwendet werden.\n          Diese Optionen werden den ursprünglichen Befehlszeilenoptionen hinzugefügt\n          (oder überschreiben diese), um einen zusätzlichen, alternativen Launcher zu erstellen.\n          Der Hauptanwendungs-Launcher wird aus den Befehlszeilenoptionen\n          erstellt. Mit dieser Option können zusätzliche alternative Launcher\n          erstellt werden. Außerdem kann diese Option mehrmals verwendet werden,\n          um mehrere zusätzliche Launcher zu erstellen. \n  --arguments <Hauptklassenargumente>\n          Befehlszeilenargumente, die an die Hauptklasse übergeben werden, falls\n          keine Befehlszeilenargumente an den Launcher übergeben werden\n          Diese Option kann mehrmals verwendet werden.\n  --java-options <Java-Optionen>\n          Optionen, die an Java Runtime übergeben werden\n          Diese Option kann mehrmals verwendet werden.\n  --main-class <Klassenname>\n          Qualifizierter Name der auszuführenden Anwendungshauptklasse\n          Diese Option kann nur bei Angabe von --main-jar verwendet werden.\n  --main-jar <Haupt-JAR-Datei>\n          Die Haupt-JAR-Datei der Anwendung, die die Hauptklasse enthält\n          (angegeben als Pfad relativ zum Eingabepfad)\n          Es kann entweder die Option --module oder die Option --main-jar angegeben werden, nicht jedoch\n          beides.\n  --module -m <Modulname>[/<Hauptklasse>]\n          Das Hauptmodul (und optional die Hauptklasse) der Anwendung\n          Dieses Modul muss unter dem Modulpfad gespeichert sein.\n          Bei Angabe dieser Option wird das Hauptmodul\n          \
-im Java Runtime-Image verknüpft. Es kann entweder die Option --module oder die Option --main-jar\n          angegeben werden, nicht jedoch beides.\n{2}\nOptionen für das Erstellen des Anwendungspackages:\n  --about-url <URL>\n          URL der Homepage der Anwendung\n  --app-image <Verzeichnispfad>\n          {5}          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --file-associations <Dateipfad>\n          Pfad zu einer Eigenschaftendatei mit einer Liste von Schlüssel/Wert-Paaren\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Mit den Schlüsseln "extension", "mime-type", "icon" und "description"\n          kann die Verknüpfung beschrieben werden.\n          Diese Option kann mehrmals verwendet werden.\n  --install-dir <Verzeichnispfad>\n          {4}  --license-file <Dateipfad>\n          Pfad zur Lizenzdatei\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --resource-dir <Verzeichnispfad>\n          Pfad zum Überschreiben von jpackage-Ressourcen\n          Symbole, Vorlagendateien und weitere Ressourcen von jpackage können\n          durch Hinzufügen von Ersetzungsressourcen zu diesem Verzeichnis überschrieben werden.\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --runtime-image <Verzeichnispfad>\n          Pfad des zu installierenden vordefinierten Laufzeitimages\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Option muss beim Erstellen eines Laufzeitpackages angegeben werden.\n  --launcher-as-service\n          Anforderung zum Erstellen eines Installationsprogramms, das den\n          Hauptanwendungs-Launcher als Hintergrundserviceanwendung registriert.\n\nPlattformabhängige Optionen für das Erstellen des Anwendungspackages:\n{3}
+help.header=Verwendung: jpackage <Optionen>
+
+help.short=Verwenden Sie jpackage --help (oder -h), um eine Liste möglicher Optionen aufzurufen
+
+help.option-group.sample.create-native-package=\    Generieren Sie ein Anwendungspackage, das für das Hostsystem geeignet ist:\n        Für eine modulare Anwendung:\n            jpackage -n name -p modulePath -m moduleName/className\n        Für eine nicht modulare Anwendung:\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        Aus einem vordefinierten Anwendungsimage:\n            jpackage -n name --app-image appImageDir
+
+help.option-group.sample.create-app-image=\    Generieren Sie ein Anwendungspackage:\n        Für eine modulare Anwendung:\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        Für eine nicht modulare Anwendung:\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        Um eigene Optionen für jlink anzugeben, führen Sie jlink separat aus:\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<zusätzliche jlink-Optionen>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage
+
+help.option-group.sample.create-runtime-installer=\    Generieren Sie ein Java-Laufzeitpackage:\n        jpackage -n name --runtime-image <Laufzeitimage>
+
+help.option-group.sample.sign-app-image=\    Vordefiniertes Anwendungsimage signieren:\n        jpackage --type app-image --app-image <app-image> \\\n            --mac-sign [<additional signing options>...]\n        Hinweis: In diesem Modus sind nur die folgenden zusätzlichen Optionen zulässig:\n              Das Set der zusätzlichen Mac-Signaturoptionen und --verbose
+
+help.option-group.sample=Beispielverwendungen
+help.option-group.generic=Allgemeine Optionen
+help.option-group.runtime-image=Optionen für das Erstellen des Laufzeitimages
+help.option-group.app-image=Optionen für das Erstellen des Anwendungsimages
+help.option-group.launcher=Optionen für das Erstellen der Anwendungslauncher:
+help.option-group.launcher-platform=Plattformabhängige Option für das Erstellen des Anwendungslaunchers
+help.option-group.package=Optionen für das Erstellen des Anwendungspackages
+help.option-group.package-platform=Plattformabhängige Optionen für das Erstellen des Anwendungspackages
+
+help.option.argument-file=\          Leseoptionen und/oder -modus aus einer Datei\n        Diese Option kann mehrmals verwendet werden.
+
+help.option.about-url=\          URL der Homepage der Anwendung
+
+help.option.add-launcher.win=\          Name des Launchers sowie ein Pfad zu einer Eigenschaftendatei mit\n         einer Liste von Schlüssel/Wert-Paaren\n        (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n        Die Schlüssel "arguments", "description", "icon", "java-options",\n        "launcher-as-service", "main-class", "main-jar", "module",\n        "win-console", "win-menu" und "win-shortcut" können verwendet werden. \n        Diese Optionen werden den ursprünglichen\n        Befehlszeilenoptionen hinzugefügt (oder überschreiben diese), um einen zusätzlichen, alternativen Launcher zu erstellen.\n        Der Hauptanwendungslauncher wird aus den Befehlszeilenoptionen\n        erstellt. Mit dieser Option können zusätzliche alternative Launcher\n         erstellt werden. Außerdem kann diese Option mehrmals verwendet werden,\n        um mehrere zusätzliche Launcher zu erstellen.
+
+help.option.add-launcher.linux=\          Name des Launchers sowie ein Pfad zu einer Eigenschaftendatei mit\n         einer Liste von Schlüssel/Wert-Paaren\n        (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n        Die Schlüssel "arguments", "description", "icon", "java-options",\n        "launcher-as-service", "linux-shortcut", "main-class", "main-jar"\n        und "module" können verwendet werden. \n        Diese Optionen werden den ursprünglichen Befehlszeilenoptionen hinzugefügt\n        (oder überschreiben diese), um einen zusätzlichen, alternativen Launcher zu erstellen. \n        Der Hauptanwendungslauncher wird aus den Befehlszeilenoptionen\n        erstellt. Mit dieser Option können zusätzliche alternative Launcher\n         erstellt werden. Außerdem kann diese Option mehrmals verwendet werden,\n        um mehrere zusätzliche Launcher zu erstellen.
+
+help.option.add-launcher.mac=\          Name des Launchers sowie ein Pfad zu einer Eigenschaftendatei mit\n         einer Liste von Schlüssel/Wert-Paaren\n        (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n        Die Schlüssel "arguments", "description", "icon", "java-options",\n        "launcher-as-service", "main-class", "main-jar"\n        und "module" können verwendet werden. \n        Diese Optionen werden den ursprünglichen Befehlszeilenoptionen hinzugefügt\n        (oder überschreiben diese), um einen zusätzlichen, alternativen Launcher zu erstellen. \n        Der Hauptanwendungslauncher wird aus den Befehlszeilenoptionen\n        erstellt. Mit dieser Option können zusätzliche alternative Launcher\n         erstellt werden. Außerdem kann diese Option mehrmals verwendet werden,\n        um mehrere zusätzliche Launcher zu erstellen.
+
+help.option.add-modules=\          Eine per Komma (",") getrennte Liste hinzuzufügender Module\n        Diese Modulliste wird zusammen mit dem Hauptmodul (sofern angegeben)\n        als Argument --add-module an jlink übergeben. \n        Bei fehlender Angabe wird entweder nur das Hauptmodul (sofern --module\n         angegeben ist) oder das Standardset an Modulen (sofern --main-jar\n         angegeben ist) verwendet. \n        Diese Option kann mehrmals verwendet werden.
+
+help.option.app-content=\          Eine per Komma getrennte Liste mit Pfaden zu Dateien und/oder Verzeichnissen,\n        die zur Anwendungs-Payload hinzugefügt werden sollen.\n        Diese Option kann mehrmals verwendet werden.
+
+help.option.app-content.mac=\          Eine per Komma getrennte Liste mit Pfaden zu Dateien und/oder Verzeichnissen,\n        die zur Anwendungs-Payload hinzugefügt werden sollen. \n        Diese Option kann mehrmals verwendet werden. \n        Hinweis: Der Wert muss ein Verzeichnis mit dem Unterverzeichnis "Resources" sein\n        Unterverzeichnis (oder ein anderes Verzeichnis, das im Verzeichnis "Contents"\n        des Anwendungs-Bundles gültig ist). Andernfalls produziert jpackage möglicherweise ein\n        ungültiges Anwendungs-Bundle, bei dem die Codesignatur und/oder Notarisierung nicht erfolgreich\n        verläuft.
+
+help.option.app-image=\          Speicherort des vordefinierten Anwendungsimages, mit dem\n        ein installierbares Package erstellt wird\n        (absoluter Pfad oder relativ zum aktuellen Verzeichnis)
+
+help.option.app-image.mac=\          Speicherort des vordefinierten Anwendungsimages, mit dem\n        ein installierbares Package erstellt oder das vordefinierte\n        Anwendungsimage signiert wird\n        (absoluter Pfad bzw. relativ zum aktuellen Verzeichnis)
+
+help.option.app-version=\          Version der Anwendung und/oder des Packages
+
+help.option.arguments=\          Befehlszeilenargumente, die an die Hauptklasse übergeben werden, falls\n        keine Befehlszeilenargumente an den Launcher übergeben werden\n        Diese Option kann mehrmals verwendet werden.
+
+help.option.copyright=\          Copyright für die Anwendung
+
+help.option.description=\          Beschreibung der Anwendung
+
+help.option.dest=\          Pfad, in dem die generierte Ausgabedatei abgelegt wird\n        (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n        Standardmäßig wird das aktuelle Arbeitsverzeichnis verwendet.
+
+help.option.file-associations=\          Pfad zu einer Eigenschaftendatei mit einer Liste von Schlüssel/Wert-Paaren\n        (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n        Mit den Schlüsseln "extension", "mime-type", "icon" und "description"\n        kann die Verknüpfung beschrieben werden.\n        Diese Option kann mehrmals verwendet werden.
+
+help.option.help=\          Gibt den Verwendungstext mit einer Liste und Beschreibung jeder gültigen\n        Option für die aktuelle Plattform an den Outputstream aus und beendet den Vorgang
+
+help.option.icon=\          Pfad des Symbols für das Anwendungspackage\n        (absoluter Pfad oder relativ zum aktuellen Verzeichnis)
+
+help.option.input=\          Pfad des Eingabeverzeichnisses mit den zu verpackenden Dateien\n        (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n        Alle Dateien im Eingabeverzeichnis werden als Package in das\n        Anwendungsimage integriert.
+
+help.option.install-dir=\          Absoluter Pfad des Installationsverzeichnisses der Anwendung
+
+help.option.install-dir.win=\          Relativer Unterpfad des Installationsverzeichnisses der\n        Anwendung, wie "Programme" oder "AppData".
+
+help.option.installer-runtime-image=\          Pfad des zu installierenden vordefinierten Laufzeitimages\n        (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n        Option muss beim Erstellen eines Laufzeitpackages angegeben werden.
+
+help.option.java-options=\          Optionen, die an Java Runtime übergeben werden\n        Diese Option kann mehrmals verwendet werden.
+
+help.option.jlink-options=\          Eine per Leerzeichen getrennte Liste mit an jlink zu übergebenden Optionen\n        Bei fehlender Angabe wird standardmäßig "--strip-native-commands\n        --strip-debug --no-man-pages --no-header-files" verwendet. \n        Diese Option kann mehrmals verwendet werden.
+
+help.option.launcher-as-service=\          Anforderung zum Erstellen eines Installationsprogramms, das den\n        Hauptanwendungslauncher als Hintergrundserviceanwendung registriert.
+
+help.option.license-file=\          Pfad zur Lizenzdatei\n        (absoluter Pfad oder relativ zum aktuellen Verzeichnis)
+
+help.option.linux-app-category=\          Gruppenwert der RPM-Datei <Name>.spec oder\n        Abschnittswert der DEB-Kontrolldatei
+
+help.option.linux-app-release=\          Releasewert der RPM-Datei <Name>.spec oder\n        Debian-Revisionswert der DEB-Kontrolldatei
+
+help.option.linux-deb-maintainer=\           Maintainer für DEB-Package
+
+help.option.linux-menu-group=\          Menügruppe, in der diese Anwendung abgelegt wird
+
+help.option.linux-package-deps=\          Erforderliche Packages oder Funktionen für die Anwendung
+
+help.option.linux-package-name=\          Name für das Linux-Package, Standardwert: Anwendungsname
+
+help.option.linux-rpm-license-type=\          Lizenztyp ("Lizenz: <Wert>" der RPM-SPEC-Datei)
+
+help.option.linux-shortcut=\          Erstellt eine Verknüpfung für die Anwendung.
+
+help.option.mac-app-category=\          Zeichenfolge für das Erstellen von LSApplicationCategoryType in\n          Anwendungs-plist. Standardwert: "utilities".
+
+help.option.mac-app-image-sign-identity=\          Zum Signieren des Anwendungsimages verwendete Identität. Dieser Wert wird direkt\n        an die Option --sign des Tools "codesign" übergeben. Diese Option kann nicht\n        mit --mac-signing-key-user-name kombiniert werden.
+
+help.option.mac-app-store=\          Gibt an, dass die jpackage-Ausgabe für den\n        Mac App Store vorgesehen ist.
+
+help.option.mac-dmg-content=\          Nimmt den gesamten referenzierten Inhalt in die DMG-Datei auf.\n          Diese Option kann mehrmals verwendet werden.
+
+help.option.mac-entitlements=\          Pfad zu einer Datei mit Berechtigungen, die beim Signieren von ausführbaren\n        Dateien und Librarys im Bundle verwendet werden sollen.
+
+help.option.mac-installer-sign-identity=\          Zum Signieren des Installationsprogramms "pkg" verwendete Identität. Dieser Wert wird direkt\n        an die Option --sign des Tools "productbuild"-übergeben. Diese Option\n        kann nicht mit --mac-signing-key-user-name kombiniert werden.
+
+help.option.mac-package-identifier=\          Eine ID, die die Anwendung für macOS eindeutig identifiziert\n        Standardwert ist der Hauptklassenname. \n        Es dürfen nur alphanumerische Zeichen (A-Z, a-z, 0-9), Bindestriche (-)\n          und Punkte (.) verwendet werden.
+
+help.option.mac-package-name=\          Name der Anwendung, wie in der Menüleiste angezeigt\n          Dieser kann vom Anwendungsnamen abweichen.\n          Er darf maximal 15 Zeichen enthalten und muss für die Anzeige\n          in der Menüleiste und im Infofenster der Anwendung geeignet sein.\n          Standardwert: Anwendungsname.
+
+help.option.mac-package-signing-prefix=\          Beim Signieren des Anwendungspackages wird dieser Wert\n          allen zu signierenden Komponenten ohne vorhandene\n          Package-ID als Präfix vorangestellt.
+
+help.option.mac-sign=\          Anforderung zum Signieren des Packages oder des vordefinierten\n          Anwendungsimages.
+
+help.option.mac-signing-keychain=\          Name des Schlüsselbundes für die Suche nach der Signaturidentität\n          Bei fehlender Angabe werden die Standardschlüsselbunde verwendet.
+
+help.option.mac-signing-key-user-name=\          Team- oder Benutzernamensteil der Apple-Signaturidentitäten. Um direkt zu steuern,\n          welche Signaturidentität zum Signieren eines Anwendungsimages oder\n          Installationsprogramms verwendet wird, verwenden Sie --mac-app-image-sign-identity und/oder\n          --mac-installer-sign-identity. Diese Option kann nicht mit\n          --mac-app-image-sign-identity oder --mac-installer-sign-identity kombiniert werden.
+
+help.option.main-class=\          Qualifizierter Name der auszuführenden Anwendungshauptklasse\n        Diese Option kann nur bei Angabe von --main-jar verwendet werden.
+
+help.option.main-jar=\          Die Haupt-JAR-Datei der Anwendung, die die Hauptklasse enthält\n        (angegeben als Pfad relativ zum Eingabepfad)\n        Es kann entweder die Option --module oder die Option --main-jar angegeben werden, nicht jedoch\n        beides.
+
+help.option.module=\          Das Hauptmodul (und optional die Hauptklasse) der Anwendung\n        Dieses Modul muss unter dem Modulpfad gespeichert sein. \n        Bei Angabe dieser Option wird das Hauptmodul\n        im Java Runtime-Image verknüpft. Es kann entweder die Option --module oder die Option --main-jar\n        angegeben werden, nicht jedoch beides.
+
+help.option.module-path=\          Eine per Doppelpunkt (:) getrennte Pfadliste\n        Jeder Pfad ist entweder ein Verzeichnis mit Modulen oder der Pfad zu einer\n        modularen JAR-Datei.\n        (Jeder Pfad ist absolut oder relativ zum aktuellen Verzeichnis.)\n        Diese Option kann mehrmals verwendet werden.
+help.option.module-path.win=\          Eine per Semikolon (;) getrennte Pfadliste\n        Jeder Pfad ist entweder ein Verzeichnis mit Modulen oder der Pfad zu einer\n        modularen JAR-Datei.\n        (Jeder Pfad ist absolut oder relativ zum aktuellen Verzeichnis.)\n        Diese Option kann mehrmals verwendet werden.
+
+help.option.name=\          Name der Anwendung und/oder des Packages
+
+help.option.resource-dir=\          Pfad zum Überschreiben von jpackage-Ressourcen\n        Symbole, Vorlagendateien und weitere Ressourcen von jpackage können\n         durch Hinzufügen von Ersetzungsressourcen zu diesem Verzeichnis überschrieben werden.\n        (absoluter Pfad oder relativ zum aktuellen Verzeichnis)
+
+help.option.runtime-image=\          Pfad des vordefinierten Laufzeitimages, das in\n        das Anwendungsimage kopiert wird\n        (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n        Wenn --runtime-image nicht angegeben wird, führt jpackage jlink aus, um\n         das Laufzeitimage mit folgenden Optionen zu erstellen:\n        --strip-debug, --no-header-files, --no-man-pages und\n        --strip-native-commands.
+
+help.option.temp=\          Pfad eines neuen oder leeren Verzeichnisses zum Erstellen temporärer Dateien\n        (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n        Falls angegeben, wird das temporäre Verzeichnis beim Abschließen der Aufgabe\n        nicht entfernt und muss manuell entfernt werden. \n        Bei fehlender Angabe wird ein temporäres Verzeichnis erstellt und\n        beim Abschließen der Aufgabe entfernt.
+
+help.option.type.win=\          Der zu erstellende Packagetyp\n        Gültige Werte sind: {"app-image", "exe", "msi"}\n        Bei fehlender Angabe dieser Option wird ein plattformabhängiger\n        Standardtyp erstellt.
+help.option.type.linux=\          Der zu erstellende Packagetyp\n        Gültige Werte sind: {"app-image", "deb", "rpm"}\n        Bei fehlender Angabe dieser Option wird ein plattformabhängiger\n        Standardtyp erstellt.
+help.option.type.mac=\          Der zu erstellende Packagetyp\n        Gültige Werte sind: {"app-image", "dmg", "pkg"}\n        Bei fehlender Angabe dieser Option wird ein plattformabhängiger\n        Standardtyp erstellt.
+
+help.option.vendor=\          Anbieter der Anwendung
+
+help.option.verbose=\          Aktiviert Ausgabe im Verbose-Modus
+
+help.option.version=\          Gibt die Produktversion an den Outputstream aus und beendet den Vorgang.
+
+help.option.win-console=\          Erstellt einen Konsolenlauncher für die Anwendung. Sollte für\n        Anwendungen angegeben werden, die Konsoleninteraktionen erfordern
+
+help.option.win-dir-chooser=\          Fügt ein Dialogfeld hinzu, in dem der Benutzer das Verzeichnis auswählen kann, in dem\n        das Produkt installiert wird.
+
+help.option.win-help-url=\          URL, unter der der Benutzer weitere Informationen oder technische Unterstützung erhält
+
+help.option.win-menu=\          Anforderung zum Hinzufügen einer Startmenüverknüpfung für diese Anwendung
+
+help.option.win-menu-group=\          Startmenügruppe, in der diese Anwendung abgelegt wird
+
+help.option.win-per-user-install=\          Anforderung zum Ausführen einer Installation pro Benutzer
+
+help.option.win-shortcut=\          Anforderung zum Hinzufügen einer Desktopverknüpfung für diese Anwendung
+
+help.option.win-shortcut-prompt=\          Fügt ein Dialogfeld hinzu, in dem der Benutzer auswählen kann, ob Verknüpfungen\n        vom Installationsprogramm erstellt werden.
+
+help.option.win-update-url=\          URL der verfügbaren Anwendungsaktualisierungsinformationen
+
+help.option.win-upgrade-uuid=\          UUID für Upgrades für dieses Package
 
-MSG_Help_win_launcher=\nPlattformabhängige Option für das Erstellen des Anwendungs-Launchers:\n  --win-console\n          Erstellt einen Konsolen-Launcher für die Anwendung. Sollte für\n          Anwendungen angegeben werden, die Konsoleninteraktionen erfordern\n
-MSG_Help_win_install=\  --win-dir-chooser\n          Fügt ein Dialogfeld hinzu, in dem der Benutzer das Verzeichnis auswählen kann, in dem\n          das Produkt installiert wird.\n  --win-help-url <URL>\n          URL, unter der der Benutzer weitere Informationen oder technische Unterstützung erhält\n  --win-menu\n          Anforderung zum Hinzufügen einer Startmenüverknüpfung für diese Anwendung\n  --win-menu-group <Menügruppenname>\n          Startmenügruppe, in der diese Anwendung abgelegt wird\n  --win-per-user-install\n          Anforderung zum Ausführen einer Installation pro Benutzer\n  --win-shortcut\n          Anforderung zum Hinzufügen einer Desktopverknüpfung für diese Anwendung\n  --win-shortcut-prompt\n          Fügt ein Dialogfeld hinzu, in dem der Benutzer auswählen kann, ob Verknüpfungen\n          vom Installationsprogramm erstellt werden sollen.\n  --win-update-url <URL>\n          URL verfügbarer Anwendungsupdateinformationen\n  --win-upgrade-uuid <ID-Zeichenfolge>\n          UUID, die mit Upgrades für dieses Package verknüpft ist\n
-MSG_Help_win_install_dir=Relativer Unterpfad unter dem Standardinstallationsverzeichnis\n
-MSG_Help_mac_install=\  --mac-dmg-content <Pfad zu zusätzlichem Inhalt>[,<Pfad zu zusätzlichem Inhalt>...]\n          Nimmt den gesamten referenzierten Inhalt in die DMG-Datei auf.\n          Diese Option kann mehrmals verwendet werden. \n
-MSG_Help_mac_launcher=\  --mac-package-identifier <ID-Zeichenfolge>\n          Eine ID, die die Anwendung für macOS eindeutig identifiziert\n          Standardwert ist der Hauptklassenname.\n          Es dürfen nur alphanumerische Zeichen (A-Z, a-z, 0-9), Bindestriche (-)\n          und Punkte (.) verwendet werden.\n  --mac-package-name <Namenszeichenfolge>\n          Name der Anwendung, wie in der Menüleiste angezeigt\n          Dieser kann vom Anwendungsnamen abweichen.\n          Er darf maximal 15 Zeichen enthalten und muss für die Anzeige\n          in der Menüleiste und im Infofenster der Anwendung geeignet sein.\n          Standardwert: Anwendungsname.\n  --mac-package-signing-prefix <Präfixzeichenfolge>\n          Beim Signieren des Anwendungspackages wird dieser Wert\n          allen zu signierenden Komponenten ohne vorhandene\n          Package-ID als Präfix vorangestellt.\n  --mac-sign\n          Anforderung zum Signieren des Packages oder des vordefinierten\nAnwendungsimages\n  --mac-signing-keychain <Schlüsselbundname>\n          Name des Schlüsselbundes für die Suche nach der Signaturidentität\n          Bei fehlender Angabe werden die Standardschlüsselbunde verwendet.\n  --mac-signing-key-user-name <Teamname>\n          Team- oder Benutzernamensteil der Apple-Signaturidentitäten. Um direkt zu steuern,\n          welche Signaturidentität zum Signieren eines Anwendungsimages oder\n          Installationsprogramms verwendet wird, verwenden Sie --mac-app-image-sign-identity und/oder\n          --mac-installer-sign-identity. Diese Option kann nicht mit\n          --mac-app-image-sign-identity oder --mac-installer-sign-identity kombiniert werden.\n  --mac-app-image-sign-identity <identity>\n          Zum Signieren des Anwendungsimages verwendete Identität. Dieser Wert wird\n          direkt an die Option --sign des Tools "codesign" übergeben. Diese Option kann nicht\n          mit --mac-signing-key-user-name kombiniert werden.\n  --mac-installer-sign-identity <identity>\n          Zum Signieren des Installationsprogramms "pkg" verwendete Identität. Dieser Wert wird\n          direkt an die Option --sign des Tools "productbuild" übergeben. Diese Option\n          kann nicht mit --mac-signing-key-user-name kombiniert werden.\n  --mac-app-store\n          Gibt an, dass die jpackage-Ausgabe für den\n          Mac App Store bestimmt ist.\n  --mac-entitlements <Dateipfad>\n          Pfad zu einer Datei mit Berechtigungen, die beim Signieren\n          von ausführbaren Dateien und Librarys im Bundle verwendet werden sollen.\n  --mac-app-category <Kategoriezeichenfolge>\n          Zeichenfolge für das Erstellen von LSApplicationCategoryType in\n          Anwendungs-plist. Standardwert: "utilities".\n
-MSG_Help_linux_install=\  --linux-package-name <Packagename>\n          Name für das Linux-Package, Standardwert: Anwendungsname\n  --linux-deb-maintainer <E-Mail-Adresse>\n          Maintainer für .deb-Package\n  --linux-menu-group <Menügruppenname>\n          Menügruppe, in der diese Anwendung abgelegt wird\n  --linux-package-deps <package-dep-string>\n          Erforderliche Packages oder Funktionen für die Anwendung\n  --linux-rpm-license-type <Typzeichenfolge>\n          Typ der Lizenz ("License: <Wert>" der RPM-SPEC-Datei)\n  --linux-app-release <Releasewert>\n          Releasewert der RPM-Datei <Name>.spec oder \n          Debian-Revisionswert der DEB-Kontrolldatei\n  --linux-app-category <Kategoriewert>\n          Gruppenwert der RPM-Datei <Name>.spec oder \n          Abschnittswert der DEB-Kontrolldatei\n  --linux-shortcut\n          Erstellt einen Shortcut für die Anwendung.\n
-MSG_Help_mac_linux_install_dir=Absoluter Pfad des Installationsverzeichnisses der Anwendung\n
-MSG_Help_default_install_dir=Absoluter Pfad des Installationsverzeichnisses der Anwendung auf OS X\n          oder Linux. Relativer Unterpfad des Installationsverzeichnisses der\n          Anwendung wie "Programme" oder "AppData" unter Windows.\n
-MSG_Help_no_args=Verwendung: jpackage <Optionen>\nVerwenden Sie jpackage --help (oder -h), um eine Liste möglicher Optionen aufzurufen
-MSG_Help_default_app_image=Speicherort des vordefinierten Anwendungsimages, mit dem\n          ein installierbares Package erstellt wird\n
-MSG_Help_mac_app_image=Speicherort des vordefinierten Anwendungsimages, mit dem\n          ein installierbares Package erstellt oder das vordefinierte\n          Anwendungsimage signiert wird\n
-MSG_Help_mac_sign_sample_usage=\    Vordefiniertes Anwendungsimage signieren:\n        jpackage --type app-image --app-image <app-image> \\\n            --mac-sign [<additional signing options>...]\n        Hinweis: In diesem Modus sind nur die folgenden zusätzlichen Optionen zulässig:\n              Das Set der zusätzlichen Mac-Signaturoptionen und --verbose\n
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
index cae6ae216d3..ca606dda9f8 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,22 +24,163 @@
 #
 #
 
-MSG_Help=使用方法: jpackage <options>\n\n使用例:\n--------------\n    ホスト・システムに適したアプリケーション・パッケージを生成します。\n        モジュラ・アプリケーションの場合:\n            jpackage -n name -p modulePath -m moduleName/className\n        非モジュラ・アプリケーションの場合:\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        事前作成されたアプリケーション・イメージから:\n            jpackage -n name --app-image appImageDir\n    アプリケーション・イメージの生成:\n        モジュラ・アプリケーションの場合:\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        非モジュラ・アプリケーションの場合:\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        jlinkに独自のオプションを指定するには、jlinkを別個に実行します。\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<additional jlink options>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    Javaランタイム・パッケージを生成します。\n        jpackage -n name --runtime-image <runtime-image>\n{6}\n一般的なオプション:\n  @<filename> \n          ファイルからの読取りオプションおよびモード \n          このオプションは複数回使用できます。\n  --type -t <type> \n          作成するパッケージのタイプ\n          有効な値: {1} \n          このオプションが指定されていない場合、プラットフォーム依存の\n          デフォルト・タイプが作成されます\n  --app-version <version>\n          アプリケーションおよびパッケージのバージョン\n  --copyright <copyright string>\n          アプリケーションのコピーライト\n  --description <description string>\n          アプリケーションの説明\n  --help -h \n          使用方法テキストと現在のプラットフォームの有効なオプションのリストと説明を\n          出力ストリームに出力して、終了します\n  --icon <file path>\n          アプリケーション・パッケージのアイコンのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n  \
---name -n <name>\n          アプリケーションおよびパッケージの名前\n  --dest -d <destination path>\n          生成された出力ファイルが配置されるパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          デフォルトは現在の作業ディレクトリです。\n  --temp <directory path>\n          一時ファイルの作成に使用される新規または空のディレクトリのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          指定した場合、タスク完了時に一時ディレクトリは削除されないため\n          手動で削除する必要があります\n          指定しなかった場合、一時ディレクトリが作成され\n          タスク完了時に削除されます。\n  --vendor <vendor string>\n          アプリケーションのベンダー\n  --verbose\n          詳細な出力を有効にします\n  --version\n          製品バージョンを出力ストリームに出力して終了します\n\nランタイム・イメージを作成するためのオプション:\n  --add-modules <module name>[,<module name>...]\n          追加するモジュールのカンマ(",")区切りリスト\n          このモジュール・リストとメイン・モジュール(指定した場合)\n          が--add-module引数としてjlinkに渡されます。\n          指定しなかった場合、メイン・モジュールのみ(--moduleが\n          指定された場合)、またはデフォルトのモジュール・セット(--main-jarが \n          指定された場合)が使用されます。\n          このオプションは複数回使用できます。\n  --module-path -p <module path>...\n          パスの{0}区切りリスト\n          各パスは、モジュールのディレクトリまたは\n          モジュラjarへのパスです。\n          (各パスは、絶対パスまたは現在のディレクトリからの相対パスです。)\n          このオプションは複数回使用できます。\n  --jlink-options <jlink options> \n          jlinkに渡すオプションのスペース区切りのリスト \n          指定しない場合、"--strip-native-commands \n          --strip-debug \
---no-man-pages --no-header-files"。 \n          このオプションは複数回使用できます。\n  --runtime-image <directory path>\n          アプリケーション・イメージにコピーされる、事前定義済みのランタイム・イメージ\n          のパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          --runtime-imageが指定されていない場合、jpackageはjlinkを実行し、\n          次のオプションを使用してランタイム・イメージを作成します:\n          --strip-debug、--no-header-files、--no-man-pagesおよび\n          --strip-native-commands。\n\nアプリケーション・イメージを作成するためのオプション:\n  --input -i <directory path>\n          パッケージ化するファイルを含む入力ディレクトリへのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          入力ディレクトリのすべてのファイルは、アプリケーション・イメージに\n          パッケージ化されます。\n  --app-content <additional content>[,<additional content>...]\n          ファイルまたはディレクトリ(あるいは両方)のパスのカンマ区切りのリスト\n          アプリケーション・ペイロードに追加します。\n          このオプションは複数回使用できます。\n\nアプリケーション・ランチャを作成するためのオプション:\n  --add-launcher <launcher name>=<file path>\n          ランチャの名前、およびキー、値のペアのリスト\n          を含むプロパティ・ファイルへのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          キー"module"、"main-jar"、"main-class"、"description"、\n          "arguments"、"java-options"、"app-version"、"icon"、\n          "launcher-as-service"、\n          "win-console"、"win-shortcut"、"win-menu"、\n          "linux-app-category"および"linux-shortcut"を使用できます。\n          これらのオプションを元のコマンドライン・オプションに追加するか、これらのオプションを\n          使用して元のコマンドライン・オプションを上書きして、追加の代替ランチャを作成します。\n          \
-メイン・アプリケーション・ランチャはコマンドライン・オプションから作成されます。\n          このオプションを使用して追加の代替ランチャを作成でき、\n          このオプションを複数回使用して\n          複数の追加のランチャを作成できます。 \n  --arguments <main class arguments>\n          ランチャにコマンド・ライン引数が指定されていない場合にメイン・クラスに渡す\n          コマンド・ライン引数\n          このオプションは複数回使用できます。\n  --java-options <java options>\n          Javaランタイムに渡すオプション\n          このオプションは複数回使用できます。\n  --main-class <class name>\n          実行するアプリケーション・メイン・クラスの修飾名\n          このオプションを使用できるのは、--main-jarが指定されている場合だけです。\n  --main-jar <main jar file>\n          メイン・クラスを含む、アプリケーションのメインJAR\n          (入力パスからの相対パスとして指定)\n          --moduleまたは--main-jarオプションを指定できますが、両方は\n          指定できません。\n  --module -m <module name>[/<main class>]\n          アプリケーションのメイン・モジュール(およびオプションでメイン・クラス)\n          このモジュールは、モジュール・パスに置かれている必要があります。\n          このオプションが指定されている場合、メイン・モジュールは\n          Javaランタイム・イメージ内でリンクされます。--moduleまたは--main-jar\n          オプションを指定できますが、両方は指定できません。\n{2}\nアプリケーション・パッケージを作成するためのオプション:\n  --about-url <url>\n          アプリケーションのホームページのURL\n  --app-image <directory path>\n          {5}          (絶対パスまたは現在のディレクトリからの相対パス)\n  --file-associations <file path>\n          キー、値のペアのリストを含むプロパティ・ファイルへのパス\n          \
-(絶対パスまたは現在のディレクトリからの相対パス)\n          キー"extension"、"mime-type"、"icon"、"description"\n          を使用して関連付けを記述できます。\n          このオプションは複数回使用できます。\n  --install-dir <directory path>\n          {4}  --license-file <file path>\n          ライセンス・ファイルへのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n  --resource-dir <directory path>\n          オーバーライドjpackageリソースへのパス\n          アイコン、テンプレート・ファイルおよびjpackageのその他のリソースは、\n          このディレクトリに置換リソースを追加することでオーバーライドできます。\n          (絶対パスまたは現在のディレクトリからの相対パス)\n  --runtime-image <directory path>\n          インストールする事前定義済みのランタイム・イメージのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          ランタイム・パッケージの作成時には、オプションが必要です。\n  --launcher-as-service\n          次として登録するインストーラの作成をリクエストします: \n          バックグラウンド・サービス・タイプ・アプリケーションとしてのメイン・アプリケーション・ランチャ。\n\nアプリケーション・パッケージを作成するためのプラットフォーム依存オプション:\n{3}
+help.header=使用方法: jpackage <options>
+
+help.short=利用可能なオプションのリストについては、jpackage --help (or -h)を使用します
+
+help.option-group.sample.create-native-package=\    ホスト・システムに適したアプリケーション・パッケージを生成します:\n        モジュラ・アプリケーションの場合:\n            jpackage -n name -p modulePath -m moduleName/className\n        非モジュラ・アプリケーションの場合:\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        事前作成されたアプリケーション・イメージから:\n            jpackage -n name --app-image appImageDir
+
+help.option-group.sample.create-app-image=\    アプリケーション・イメージの生成:\n        モジュラ・アプリケーションの場合:\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        非モジュラ・アプリケーションの場合:\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        jlinkに独自のオプションを指定するには、jlinkを別個に実行します:\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<additional jlink options>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage
+
+help.option-group.sample.create-runtime-installer=\    Javaランタイム・パッケージを生成します:\n        jpackage -n name --runtime-image <runtime-image>
+
+help.option-group.sample.sign-app-image=\    事前定義済みアプリケーション・イメージへの署名:\n        jpackage --type app-image --app-image <app-image> \\\n            --mac-sign [<additional signing options>...]\n        ノート: このモードで許可される唯一の追加オプション:\n              追加のmac署名オプションのセットおよび--verbose
+
+help.option-group.sample=使用例
+help.option-group.generic=一般的なオプション
+help.option-group.runtime-image=ランタイム・イメージを作成するためのオプション
+help.option-group.app-image=アプリケーション・イメージを作成するためのオプション
+help.option-group.launcher=アプリケーション・ランチャを作成するためのオプション
+help.option-group.launcher-platform=アプリケーション・ランチャを作成するためのプラットフォーム依存オプション
+help.option-group.package=アプリケーション・パッケージを作成するためのオプション
+help.option-group.package-platform=アプリケーション・パッケージを作成するためのプラットフォーム依存オプション
+
+help.option.argument-file=\          ファイルからの読取りオプションまたはモード(あるいはその両方)\n          このオプションは複数回使用できます。
+
+help.option.about-url=\          アプリケーションのホームページのURL
+
+help.option.add-launcher.win=\          ランチャの名前、およびキー、値のペアのリスト\n          を含むプロパティ・ファイルへのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          キー"arguments"、"description"、"icon"、"java-options"、\n          "launcher-as-service"、"main-class"、"main-jar"、"module"、\n          "win-console"、"win-menu"、"win-shortcut"が使用できます。\n          これらのオプションを元のコマンドライン・オプションに追加するか、これらのオプションを\n          使用して元のコマンドライン・オプションを上書きして、追加の代替ランチャを作成します。\n          メイン・アプリケーション・ランチャはコマンドライン・オプションから作成されます。\n          このオプションを使用して追加の代替ランチャを作成でき、\n          このオプションを複数回使用して\n          複数の追加のランチャを作成できます。
+
+help.option.add-launcher.linux=\          ランチャの名前、およびキー、値のペアのリスト\n          を含むプロパティ・ファイルへのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          キー"arguments"、"description"、"icon"、"java-options"、\n          "launcher-as-service"、"linux-shortcut"、"main-class"、"main-jar"、\n          "module"が使用できます。\n          これらのオプションを元のコマンドライン・オプションに追加するか、これらのオプションを\n          使用して元のコマンドライン・オプションを上書きして、追加の代替ランチャを作成します。\n          メイン・アプリケーション・ランチャはコマンドライン・オプションから作成されます。\n          このオプションを使用して追加の代替ランチャを作成でき、\n          このオプションを複数回使用して\n          複数の追加のランチャを作成できます。
+
+help.option.add-launcher.mac=\          ランチャの名前、およびキー、値のペアのリスト\n          を含むプロパティ・ファイルへのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          キー"arguments"、"description"、"icon"、"java-options"、\n          "launcher-as-service"、"main-class"、"main-jar"、"module"\n          が使用できます。\n          これらのオプションを元のコマンドライン・オプションに追加するか、これらのオプションを\n          使用して元のコマンドライン・オプションを上書きして、追加の代替ランチャを作成します。\n          メイン・アプリケーション・ランチャはコマンドライン・オプションから作成されます。\n          このオプションを使用して追加の代替ランチャを作成でき、\n          このオプションを複数回使用して\n          複数の追加のランチャを作成できます。
+
+help.option.add-modules=\          追加するモジュールのカンマ(",")区切りリスト\n          このモジュール・リストとメイン・モジュール(指定した場合)\n          が--add-module引数としてjlinkに渡されます。\n          指定しなかった場合、メイン・モジュールのみ(--moduleが\n          指定された場合)、またはデフォルトのモジュール・セット(--main-jarが\n          指定された場合)が使用されます。\n          このオプションは複数回使用できます。
+
+help.option.app-content=\          アプリケーション・ペイロードに追加するファイルまたはディレクトリ(あるいはその両方)\n          のパスのカンマ区切りのリスト。\n          このオプションは複数回使用できます。
+
+help.option.app-content.mac=\          アプリケーション・ペイロードに追加するファイルまたはディレクトリ(あるいはその両方)\n          のパスのカンマ区切りのリスト。\n          このオプションは複数回使用できます。\n          ノート: 値は"Resources"サブディレクトリ\n          (またはアプリケーション・バンドルの"Contents"ディレクトリで有効なその他のディレクトリ)\n          を含むディレクトリである必要があります。それ以外の場合は、jpackageによって無効なアプリケーション・バンドルが生成される場合があり、\n          コード署名または公証(あるいはその両方)に失敗する\n          場合があります。
+
+help.option.app-image=\          インストール可能なパッケージの作成に使用する、事前定義済\n          アプリケーション・イメージの場所\n          (絶対パスまたは現在のディレクトリからの相対パス)
+
+help.option.app-image.mac=\          インストール可能なパッケージの作成または事前定義済\n          アプリケーション・イメージの署名に使用する、事前定義済\n          アプリケーション・イメージの場所\n          (絶対パスまたは現在のディレクトリからの相対パス)
+
+help.option.app-version=\          アプリケーションおよびパッケージのバージョン
+
+help.option.arguments=\          コマンドライン引数がランチャに指定されていない場合に、\n          メイン・クラスに渡されるコマンドライン引数\n          このオプションは複数回使用できます。
+
+help.option.copyright=\          アプリケーションのコピーライト
+
+help.option.description=\          アプリケーションの説明
+
+help.option.dest=\          生成された出力ファイルが配置されるパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          現在の作業ディレクトリにデフォルト設定されています。
+
+help.option.file-associations=\          キー、値のペアのリストを含むプロパティ・ファイルへのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          キー"extension"、"mime-type"、"icon"、"description"\n          を使用して関連付けを記述できます。\n          このオプションは複数回使用できます。
+
+help.option.help=\          使用方法テキストと現在のプラットフォームの有効なオプションのリストと説明を\n          出力ストリームに出力して、終了します
+
+help.option.icon=\          アプリケーション・パッケージのアイコンのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)
+
+help.option.input=\          パッケージ化するファイルを含む入力ディレクトリのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          入力ディレクトリのすべてのファイルは、アプリケーション・イメージに\n          パッケージ化されます。
+
+help.option.install-dir=\          アプリケーションのインストール・ディレクトリの絶対パス
+
+help.option.install-dir.win=\          "プログラム・ファイル"または"AppData"など、\n          アプリケーションのインストール場所の相対サブパス。
+
+help.option.installer-runtime-image=\          インストールする事前定義済のランタイム・イメージのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          ランタイム・パッケージの作成時には、オプションが必要です。
+
+help.option.java-options=\          Javaランタイムに渡すオプション\n          このオプションは複数回使用できます。
+
+help.option.jlink-options=\          jlinkに渡すオプションのスペース区切りのリスト\n          指定しない場合、"--strip-native-commands\n          --strip-debug --no-man-pages --no-header-files"にデフォルト設定されます。\n          このオプションは複数回使用できます。
+
+help.option.launcher-as-service=\          バックグラウンド・サービス・タイプ・アプリケーションとしてメイン・\n          アプリケーション・ランチャを登録するインストーラの作成をリクエストします。
+
+help.option.license-file=\          ライセンス・ファイルへのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)
+
+help.option.linux-app-category=\          RPM <name>.specファイルのグループ値または\n          DEB制御ファイルのセクション値
+
+help.option.linux-app-release=\          RPM <name>.specファイルのリリース値または\n          DEB制御ファイルのDebianリビジョン値
+
+help.option.linux-deb-maintainer=\          .debパッケージのメンテナ
+
+help.option.linux-menu-group=\          このアプリケーションを配置するメニュー・グループ
+
+help.option.linux-package-deps=\          アプリケーションに必要なパッケージまたは機能
+
+help.option.linux-package-name=\          Linuxパッケージの名前。アプリケーション名にデフォルト設定されています
+
+help.option.linux-rpm-license-type=\          ライセンスのタイプ(RPM .specの"License: <value>")
+
+help.option.linux-shortcut=\          アプリケーションのショートカットを作成します。
+
+help.option.mac-app-category=\          アプリケーションplistのLSApplicationCategoryTypeの構築に\n          使用する文字列。デフォルト値は"utilities"です。
+
+help.option.mac-app-image-sign-identity=\          アプリケーション・イメージの署名に使用するアイデンティティ。この値は直接\n          "codesign"ツールの--signオプションに渡されます。このオプションは\n          --mac-signing-key-user-nameと組み合せることはできません。
+
+help.option.mac-app-store=\          jpackage出力がMac App Store用であること\n          を示します。
+
+help.option.mac-dmg-content=\          dmgに参照されたコンテンツをすべて含めます。\n          このオプションは複数回使用できます。
+
+help.option.mac-entitlements=\          バンドルの実行可能ファイルおよびライブラリの署名時に\n          使用する権限を含むファイルのパス。
+
+help.option.mac-installer-sign-identity=\          "pkg"インストーラの署名に使用するアイデンティティ。この値は直接\n          "productbuild"ツールの--signオプションに渡されます。このオプションは\n          --mac-signing-key-user-nameと組み合せることはできません。
+
+help.option.mac-package-identifier=\          MacOSのアプリケーションを一意に識別する識別子。\n          メイン・クラス名にデフォルト設定されています。\n          英数字(A-Z、a-z、0-9)、ハイフン(-)、\n          およびピリオド(.)のみを使用できます。
+
+help.option.mac-package-name=\          メニュー・バーに表示されるアプリケーションの名前\n          アプリケーション名とは異なります。\n          この名前は16文字未満にする必要があり、メニュー・バー\n          およびアプリケーション情報ウィンドウに表示するのに適している必要があります。\n          アプリケーション名にデフォルト設定されています。
+
+help.option.mac-package-signing-prefix=\          アプリケーション・パッケージに署名する際、既存のパッケージIDのない\n          署名が必要なすべてのコンポーネントに、\n          この値が接頭辞として付けられます。
+
+help.option.mac-sign=\          パッケージまたは事前定義済アプリケーション・イメージに署名するよう\n          リクエストします。
+
+help.option.mac-signing-keychain=\          署名アイデンティティを検索するキーチェーンの名前\n          指定しなかった場合、標準のキーチェーンが使用されます。
+
+help.option.mac-signing-key-user-name=\          Apple署名アイデンティティのチームまたはユーザー名部分。\n          アプリケーション・イメージまたはインストーラの署名に使用する署名アイデンティティの\n          直接制御には、--mac-app-image-sign-identityまたは\n          --mac-installer-sign-identity(あるいはその両方)を使用します。このオプションは\n          --mac-app-image-sign-identityまたは--mac-installer-sign-identityと組み合せることはできません。
+
+help.option.main-class=\          実行するアプリケーション・メイン・クラスの修飾名\n          このオプションを使用できるのは、--main-jarが指定されている場合だけです。
+
+help.option.main-jar=\          メイン・クラスを含む、アプリケーションのメインJAR\n          (入力パスからの相対パスとして指定)\n          --moduleまたは--main-jarオプションを指定できますが、両方は\n          指定できません。
+
+help.option.module=\          アプリケーションのメイン・モジュール(およびオプションでメイン・クラス)\n          このモジュールは、モジュール・パスに置かれている必要があります。\n          このオプションが指定されている場合、メイン・モジュールは\n          Javaランタイム・イメージ内でリンクされます。--moduleまたは--main-jar\n          オプションを指定できますが、両方は指定できません。
+
+help.option.module-path=\          :で区切られたパスのリスト\n          各パスは、モジュールのディレクトリまたは\n          モジュラjarへのパスです。\n          (各パスは、絶対パスまたは現在のディレクトリからの相対パスです。)\n          このオプションは複数回使用できます。
+help.option.module-path.win=\          ;で区切られたパスのリスト\n          各パスは、モジュールのディレクトリまたは\n          モジュラjarへのパスです。\n          (各パスは、絶対パスまたは現在のディレクトリからの相対パスです。)\n          このオプションは複数回使用できます。
+
+help.option.name=\          アプリケーションおよびパッケージの名前
+
+help.option.resource-dir=\          オーバーライドjpackageリソースへのパス\n          アイコン、テンプレート・ファイルおよびjpackageのその他のリソースは、\n          このディレクトリに置換リソースを追加することでオーバーライドできます。\n          (絶対パスまたは現在のディレクトリからの相対パス)
+
+help.option.runtime-image=\          アプリケーション・イメージにコピーされる、事前定義済のランタイム・イメージ\n          のパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          --runtime-imageが指定されていない場合、jpackageはjlinkを実行し、\n          次のオプションを使用してランタイム・イメージを作成します:\n          --strip-debug、--no-header-files、--no-man-pagesおよび\n          --strip-native-commands。
+
+help.option.temp=\          一時ファイルの作成に使用される新規または空のディレクトリのパス\n          (絶対パスまたは現在のディレクトリからの相対パス)\n          指定した場合、タスク完了時に一時ディレクトリは削除されないため\n          手動で削除する必要があります。\n          指定しなかった場合、一時ディレクトリが作成され\n          タスク完了時に削除されます。
+
+help.option.type.win=\          作成するパッケージのタイプ\n          有効な値: {"app-image", "exe", "msi"}\n          このオプションを指定しない場合、プラットフォーム依存の\n          デフォルト・タイプが作成されます。
+help.option.type.linux=\          作成するパッケージのタイプ\n          有効な値: {"app-image", "deb", "rpm"}\n          このオプションを指定しない場合、プラットフォーム依存の\n          デフォルト・タイプが作成されます。
+help.option.type.mac=\          作成するパッケージのタイプ\n          有効な値: {"app-image", "dmg", "pkg"}\n          このオプションを指定しない場合、プラットフォーム依存の\n          デフォルト・タイプが作成されます。
+
+help.option.vendor=\          アプリケーションのベンダー
+
+help.option.verbose=\          詳細な出力を有効にします
+
+help.option.version=\          製品バージョンを出力ストリームに出力して終了します
+
+help.option.win-console=\          アプリケーションのコンソール・ランチャを作成します。コンソール・\n          インタラクションが必要なアプリケーションに指定する必要があります
+
+help.option.win-dir-chooser=\          製品をインストールするディレクトリをユーザーが\n          選択できるダイアログを追加します。
+
+help.option.win-help-url=\          ユーザーが詳細情報または技術サポートを取得できるURL
+
+help.option.win-menu=\          このアプリケーションのスタート・メニューのショートカットを追加するリクエスト
+
+help.option.win-menu-group=\          このアプリケーションを配置するスタート・メニュー・グループ
+
+help.option.win-per-user-install=\          ユーザーごとにインストールを実行するリクエスト
+
+help.option.win-shortcut=\          このアプリケーションのデスクトップのショートカットを追加するリクエスト
+
+help.option.win-shortcut-prompt=\          ショートカットをインストーラで作成するかどうかをユーザーが\n          選択できるダイアログを追加します。
+
+help.option.win-update-url=\          使用可能なアプリケーション更新情報のURL
+
+help.option.win-upgrade-uuid=\          このパッケージのアップグレードに関連付けられているUUID
 
-MSG_Help_win_launcher=\nアプリケーション・ランチャを作成するためのプラットフォーム依存オプション:\n  --win-console\n          アプリケーションのコンソール・ランチャを作成します。コンソール・\n          インタラクションが必要なアプリケーションに指定する必要があります\n
-MSG_Help_win_install=\  --win-dir-chooser\n          ユーザーが製品をインストールするディレクトリを選択するための\n          ダイアログを追加します。\n  --win-help-url <url>\n          ユーザーが詳細情報または技術的なサポートを取得できるURL\n  --win-menu\n          このアプリケーションのスタート・メニュー・ショートカットを追加するようにリクエストします\n  --win-menu-group <menu group name>\n          このアプリケーションを配置するスタート・メニュー・グループ\n  --win-per-user-install\n          ユーザーごとにインストールを実行するようにリクエストします\n  --win-shortcut\n          このアプリケーションのデスクトップ・ショートカットを追加するようにリクエストします\n  --win-shortcut-prompt\n          ショートカットをインストーラで作成するかどうかをユーザーが選択できるようにする\n          ダイアログを追加します。\n  --win-update-url <url>\n          使用可能なアプリケーションの更新情報のURL\n  --win-upgrade-uuid <id string>\n          このパッケージのアップグレードに関連付けられたUUID\n
-MSG_Help_win_install_dir=デフォルトのインストール場所の下の相対サブパス\n
-MSG_Help_mac_install=\  --mac-dmg-content <additional content path>[,<additional content path>...]\n          dmgに参照されたコンテンツをすべて含めます。\n          このオプションは複数回使用できます。 \n
-MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          macOSのアプリケーションを一意に識別するID\n          メイン・クラス名にデフォルト設定されています。\n          英数字(A-Z、a-z、0-9)、ハイフン(-)およびピリオド(.)文字のみ\n          使用できます。\n  --mac-package-name <name string>\n          メニュー・バーに表示されるアプリケーションの名前\n          アプリケーション名とは異なります。\n          この名前は16文字未満にする必要があり、メニュー・バーおよびアプリケーション情報ウィンドウに\n          表示するのに適している必要があります。\n          アプリケーション名にデフォルト設定されています。\n  --mac-package-signing-prefix <prefix string>\n          アプリケーション・パッケージに署名する際、\n          既存のパッケージIDのない署名が必要なすべてのコンポーネントに、\n          この値が接頭辞として付けられます。\n  --mac-sign\n          パッケージまたは事前定義済アプリケーション・イメージに署名するよう\n          リクエストします。\n  --mac-signing-keychain <keychain name>\n          署名アイデンティティを検索するキーチェーンの名前\n          指定しなかった場合、標準のキーチェーンが使用されます。\n  --mac-signing-key-user-name <team name>\n          Apple署名アイデンティティのチームまたはユーザー名部分。\n          アプリケーション・イメージまたはインストーラの署名に使用する署名アイデンティティの\n          直接制御には、--mac-app-image-sign-identityまたは\n          --mac-installer-sign-identity(あるいは両方)を使用します。このオプションは\n          --mac-app-image-sign-identityまたは--mac-installer-sign-identityと組み合せることはできません。\n  --mac-app-image-sign-identity <identity>\n          アプリケーション・イメージの署名に使用するアイデンティティ。この値は直接\n          "codesign"ツールの--signオプションに渡されます。このオプションは\n          \
---mac-signing-key-user-nameと組み合せることはできません。\n  --mac-installer-sign-identity <identity>\n          "pkg"インストーラの署名に使用するアイデンティティ。この値は直接\n          "productbuild"ツールの--signオプションに渡されます。このオプションは\n          --mac-signing-key-user-nameと組み合せることはできません。\n  --mac-app-store\n          jpackage出力がMac App Store用であること\n          を示します。\n  --mac-entitlements <file path>\n          バンドルの実行可能ファイルおよびライブラリの署名時に\n          使用する権限を含むファイルのパス。\n  --mac-app-category <category string>\n          アプリケーションのplistのLSApplicationCategoryTypeを生成する際に使用する文字列。\n          デフォルト値は"utilities"です。\n
-MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linuxパッケージの名前。アプリケーション名にデフォルト設定されています\n  --linux-deb-maintainer <email address>\n          .debパッケージのMaintainer\n  --linux-menu-group <menu-group-name>\n          このアプリケーションが配置されているメニュー・グループ\n  --linux-package-deps <package-dep-string>\n          アプリケーションに必要なパッケージまたは機能\n  --linux-rpm-license-type <type string>\n          ライセンスのタイプ(RPM .specの"License: <value>")\n  --linux-app-release <release value>\n          RPM <name>.specファイルのリリース値または\n          DEBコントロール・ファイルのDebianリビジョン値。\n  --linux-app-category <category value>\n          RPM <name>.specファイルのグループ値または \n           DEBコントロール・ファイルのセクション値\n  --linux-shortcut\n          アプリケーションのショートカットを作成します。\n
-MSG_Help_mac_linux_install_dir=アプリケーションのインストール・ディレクトリの絶対パス\n
-MSG_Help_default_install_dir=OS XまたはLinux上のアプリケーションのインストール・ディレクトリの絶対パス。\n          "プログラム・ファイル"や"AppData"など、Windows上のアプリケーションの\n          インストール場所の相対サブパス。\n
-MSG_Help_no_args=使用方法: jpackage <options>\n利用可能なオプションのリストについては、jpackage --help (or -h)を使用します
-MSG_Help_default_app_image=インストール可能なパッケージの作成に使用する、事前定義済み\n          アプリケーション・イメージの場所\n
-MSG_Help_mac_app_image=インストール可能なパッケージの作成または事前定義済みアプリケーション・\n          イメージへの署名に使用する、事前定義済みアプリケーション・\n          イメージの場所\n
-MSG_Help_mac_sign_sample_usage=\    事前定義済みアプリケーション・イメージへの署名:\n        jpackage --type app-image --app-image <app-image> \\\n            --mac-sign [<additional signing options>...]\n        ノート: このモードで許可される唯一の追加オプション:\n              追加のmac署名オプションのセットおよび--verbose\n
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
index 6adf62ef1f8..ac72c67ee2f 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,20 +24,163 @@
 #
 #
 
-MSG_Help=用法：jpackage <options>\n\n示例用法:\n--------------\n    生成适合主机系统的应用程序包：\n        对于模块化应用程序：\n            jpackage -n name -p modulePath -m moduleName/className\n        对于非模块化应用程序：\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        从预构建的应用程序映像：\n            jpackage -n name --app-image appImageDir\n    生成应用程序映像：\n        对于模块化应用程序：\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        对于非模块化应用程序：\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        要为 jlink 提供您自己的选项，请单独运行 jlink：\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<additional jlink options>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    生成 Java 运行时程序包：\n        jpackage -n name --runtime-image <runtime-image>\n{6}\n一般选项：\n  @<filename> \n          从文件读取选项和/或模式 \n          可以多次使用此选项。\n  --type -t <type> \n          要创建的程序包的类型\n          有效值为：{1} \n          如果未指定此选项，则将创建与平台相关的\n          默认类型。\n  --app-version <version>\n          应用程序和/或程序包的版本\n  --copyright <copyright string>\n          应用程序的版权\n  --description <description string>\n          应用程序的说明\n  --help -h \n          将用法文本输出到输出流并退出，用法文本中包含\n          适用于当前平台的每个有效选项的列表和说明\n  --icon <file path>\n          应用程序包图标的路径\n          （绝对路径或相对于当前目录的路径）\n  --name -n <name>\n          应用程序和/或程序包的名称\n  --dest -d <destination path>\n          用来放置所生成的输出文件的路径\n          （绝对路径或相对于当前目录的路径）\n          默认为当前的工作目录。\n  --temp <directory path>\n          用来创建临时文件的新目录或空白目录的路径\n          （绝对路径或相对于当前目录的路径）\n          如果指定，则在任务完成时将不删除临时目录，\n          必须手动删除临时目录。\n          如果未指定，则将创建一个临时目录，\n          \
-并在任务完成时删除该临时目录。\n  --vendor <vendor string>\n          应用程序的供应商\n  --verbose\n          启用详细的输出\n  --version\n          将产品版本输出到输出流并退出。\n\n用来创建运行时映像的选项：\n  --add-modules <模块名称>[,<模块名称>...]\n          要添加的模块的逗号 (",") 分隔列表\n          此模块列表连同主模块（如果指定）\n          将作为 --add-module 参数传递到 jlink。\n          如果未指定，则仅使用主模块（如果指定了 --module），\n          或者使用默认的模块集（如果指定了  \n          --main-jar）。\n          可以多次使用此选项。\n  --module-path -p <module path>...\n          路径的 {0} 分隔列表\n          每个路径要么是模块的目录，要么是\n          模块化 jar 的路径。\n          （每个路径可以是绝对路径，也可以是相对于当前目录的路径。）\n          可以多次使用此选项。\n  --jlink-options <jlink 选项> \n          要传递给 jlink 的选项列表（用空格分隔） \n          如果未指定，则默认为 "--strip-native-commands \n          --strip-debug --no-man-pages --no-header-files"。 \n          可以多次使用此选项。\n  --runtime-image <directory path>\n          将复制到应用程序映像的预定义\n          运行时映像的路径\n          （绝对路径或相对于当前目录的路径）\n          如果未指定 --runtime-image，jpackage 将运行 jlink 以\n          使用如下选项创建运行时映像：\n          --strip-debug、--no-header-files、--no-man-pages 和 \n          --strip-native-commands。\n\n用来创建应用程序映像的选项：\n  --input -i <directory path>\n          包含要打包的文件的输入目录的路径\n          （绝对路径或相对于当前目录的路径）\n          输入目录中的所有文件将打包到\n          应用程序映像中。\n  --app-content <additional content>[,<additional content>...]\n          要添加到应用程序有效负载中的文件和/或\n          目录的逗号分隔路径列表。\n          此选项可以多次使用。\n\n用来创建应用程序启动程序的选项：\n  --add-launcher <launcher name>=<file path>\n          启动程序的名称和包含关键字-值对列表的\n          属性文件的路径\n          （绝对路径或相对于当前目录的路径）\n          \
-可以使用关键字 "module"、"main-jar"、"main-class"、"description"、\n          "arguments"、"java-options"、"app-version"、"icon"、\n          "launcher-as-service"、\n          "win-console"、"win-shortcut"、"win-menu"、\n          "linux-app-category" 和 "linux-shortcut"。\n          这些选项将添加到原始命令行选项中或者用来覆盖\n          原始命令行选项，以构建额外的替代启动程序。\n          将从命令行选项构建主应用程序启动程序。\n          可以使用此选项构建额外的替代启动程序，\n          可以多次使用此选项来构建\n          多个额外的启动程序。 \n  --arguments <main class arguments>\n          在没有为启动程序提供命令行参数时，\n          要传递到主类的命令行参数\n          可以多次使用此选项。\n  --java-options <java options>\n          要传递到 Java 运行时的选项\n          可以多次使用此选项。\n  --main-class <class name>\n          要执行的应用程序主类的限定名称\n          只有在指定了 --main-jar 时才能使用此选项。\n  --main-jar <main jar file>\n          应用程序的主 JAR；包含主类\n          （指定为相对于输入路径的路径）\n          可以指定 --module 或 --main-jar 选项，但是不能同时指定\n          两者。\n  --module -m <module name>[/<main class>]\n          应用程序的主模块（以及可选的主类）\n          此模块必须位于模块路径中。\n          如果指定了此选项，则将在 Java 运行时映像中\n          链接主模块。可以指定 --module 或 --main-jar 选项，\n          但是不能同时指定这两个选项。\n{2}\n用来创建应用程序包的选项：\n  --about-url <url>\n          应用程序主页的 URL\n  --app-image <directory path>\n          {5}          （绝对路径或相对于当前目录的路径）\n  --file-associations <file path>\n          包含关键字-值对列表的属性文件的路径\n          （绝对路径或相对于当前目录的路径）\n          可以使用关键字 "extension"、"mime-type"、"icon" 和 "description" \n          来描述此关联。\n          可以多次使用此选项。\n  --install-dir <directory path>\n          {4}  --license-file <file path>\n          许可证文件的路径\n          （绝对路径或相对于当前目录的路径）\n  --resource-dir <directory path>\n          覆盖 jpackage 资源的路径\n          \
-可以通过向该目录中添加替代资源来覆盖 jpackage 的\n          图标、模板文件和其他资源。\n          （绝对路径或相对于当前目录的路径）\n  --runtime-image <directory path>\n          要安装的预定义运行时映像的路径\n          （绝对路径或相对于当前目录的路径）\n          在创建运行时程序包时需要使用选项。\n  --launcher-as-service\n          请求创建安装程序，以将主\n          应用程序启动程序注册为后台服务类型应用程序。\n\n用来创建应用程序包的与平台相关的选项：\n{3}
+help.header=用法：jpackage <options>
+
+help.short=使用 jpackage --help（或 -h）可获取可能选项的列表
+
+help.option-group.sample.create-native-package=\    生成适用于主机系统的应用程序包：\n        对于模块化应用程序：\n            jpackage -n name -p modulePath -m moduleName/className\n        对于非模块化应用程序：\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        从预构建的应用程序映像：\n            jpackage -n name --app-image appImageDir
+
+help.option-group.sample.create-app-image=\    生成应用程序映像：\n        对于模块化应用程序：\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n         对于非模块化应用程序：\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        要向 jlink 提供您自己的选项，请分别运行 jlink：\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<additional jlink options>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage
+
+help.option-group.sample.create-runtime-installer=\    生成 Java 运行时程序包：\n        jpackage -n name --runtime-image <runtime-image>
+
+help.option-group.sample.sign-app-image=\    对预定义应用程序映像进行签名：\n        jpackage --type app-image --app-image <app-image> \\\n            --mac-sign [<additional signing options>...]\n        注：此模式下允许的其他选项只有：\n              一组其他 mac 签名选项和 --verbose
+
+help.option-group.sample=示例用法
+help.option-group.generic=一般选项
+help.option-group.runtime-image=用来创建运行时映像的选项
+help.option-group.app-image=用来创建应用程序映像的选项
+help.option-group.launcher=用来创建应用程序启动程序的选项
+help.option-group.launcher-platform=用来创建应用程序启动程序的平台相关选项
+help.option-group.package=用来创建应用程序包的选项
+help.option-group.package-platform=用来创建应用程序包的与平台相关的选项
+
+help.option.argument-file=\          从文件读取选项和/或模式\n          可以多次使用此选项。
+
+help.option.about-url=\          应用程序主页的 URL
+
+help.option.add-launcher.win=\          启动程序的名称，以及包含\n          键值对列表的属性文件的路径\n          （绝对路径或相对于当前目录的路径）\n          可以使用键 "arguments"、"description"、"icon"、"java-options"、\n          "launcher-as-service"、"main-class"、"main-jar"、"module"、\n          "win-console"、"win-menu" 和 "win-shortcut"。\n          这些选项添加到或用于覆盖原始\n          命令行选项以构建其他替代启动程序。\n          将从命令行选项构建主应用程序启动程序。\n          可以使用此选项构建其他替代启动程序，\n          并且可以多次使用此选项\n          构建多个其他启动程序。
+
+help.option.add-launcher.linux=\          启动程序的名称，以及包含\n          键值对列表的属性文件的路径\n          （绝对路径或相对于当前目录的路径）\n          可以使用键 "arguments"、"description"、"icon"、"java-options"、\n          "launcher-as-service"、"linux-shortcut"、"main-class"、"main-jar" \n          和 "module"。\n          这些选项添加到或用于覆盖原始\n          命令行选项以构建其他替代启动程序。\n          将从命令行选项构建主应用程序启动程序。\n          可以使用此选项构建其他替代启动程序，\n          并且可以多次使用此选项\n          构建多个其他启动程序。
+
+help.option.add-launcher.mac=\          启动程序的名称，以及包含\n          键值对列表的属性文件的路径\n          （绝对路径或相对于当前目录的路径）\n          可以使用键 "arguments"、"description"、"icon"、"java-options"、\n          "launcher-as-service"、"main-class"、"main-jar" 和\n          "module"。\n          这些选项添加到或用于覆盖原始\n          命令行选项以构建其他替代启动程序。\n          将从命令行选项构建主应用程序启动程序。\n          可以使用此选项构建其他替代启动程序，\n          并且可以多次使用此选项\n          构建多个其他启动程序。
+
+help.option.add-modules=\          要添加的模块列表（以逗号 (",") 分隔）\n          此模块列表以及主模块（如果指定）\n          将作为 --add-module 参数传递到 jlink。\n          如果未指定，则仅使用主模块\n          （如果指定 --module）或默认模块集\n          （如果指定 --main-jar）。\n          可以多次使用此选项。
+
+help.option.app-content=\          要添加到应用程序有效负载中的文件\n          和/或目录路径的逗号分隔列表。\n          可以多次使用此选项。
+
+help.option.app-content.mac=\          要添加到应用程序有效负载中的文件\n          和/或目录路径的逗号分隔列表。\n          可以多次使用此选项。\n          注：该值应为具有 "Resources" 子目录的\n          目录（或应用程序包的 "Contents" 目录中\n          有效的任何其他目录）。否则，jpackage \n          可能会生成无效的应用程序包，此应用程序包\n          可能会使代码签名和/或公证失败。
+
+help.option.app-image=\          用来构建可安装程序包的\n          预定义应用程序映像的位置\n          （绝对路径或相对于当前目录的路径）
+
+help.option.app-image.mac=\          用来构建可安装程序包或对预定义应用程序\n          映像进行签名的预定义应用程序\n          映像的位置\n          （绝对路径或相对于当前目录的路径）
+
+help.option.app-version=\          应用程序和/或程序包的版本
+
+help.option.arguments=\          在没有为启动程序提供命令行参数时，\n          要传递到主类的命令行参数\n          可以多次使用此选项。
+
+help.option.copyright=\          应用程序的版权
+
+help.option.description=\          应用程序的说明
+
+help.option.dest=\          放置生成的输出文件的路径\n          （绝对路径或相对于当前目录的路径）\n          默认为当前工作目录。
+
+help.option.file-associations=\          包含键值对列表的属性文件的路径\n          （绝对路径或相对于当前目录的路径）\n          键 "extension"、"mime-type"、"icon" 和 "description"\n          可用于描述关联。\n          可以多次使用此选项。
+
+help.option.help=\          将用法文本输出到输出流并退出，用法文本中包含\n          适用于当前平台的每个有效选项的列表和说明
+
+help.option.icon=\          应用程序包图标的路径\n          （绝对路径或相对于当前目录的路径）
+
+help.option.input=\          包含要打包的文件的输入目录的路径\n          （绝对路径或相对于当前目录的路径）\n          输入目录中的所有文件将打包到\n          应用程序映像中。
+
+help.option.install-dir=\          应用程序安装目录的绝对路径
+
+help.option.install-dir.win=\          应用程序安装位置的相对子路径\n          例如 "Program Files" 或 "AppData"。
+
+help.option.installer-runtime-image=\          要安装的预定义运行时映像的路径\n          （绝对路径或相对于当前目录的路径）\n          创建运行时程序包时需要提供选项。
+
+help.option.java-options=\          传递到 Java 运行时的选项\n          可以多次使用此选项。
+
+help.option.jlink-options=\          要传递到 jlink 的选项列表（以空格分隔）\n          如果未指定，则默认为 "--strip-native-commands\n          --strip-debug --no-man-pages --no-header-files"。\n          可以多次使用此选项。
+
+help.option.launcher-as-service=\          请求创建安装程序，以将主应用程序\n          启动程序注册为后台服务类型应用程序。
+
+help.option.license-file=\          许可证文件的路径\n          （绝对路径或相对于当前目录的路径）
+
+help.option.linux-app-category=\          RPM <name>.spec 文件的组值或\n           DEB 控制文件的节值
+
+help.option.linux-app-release=\          RPM <name>.spec 文件的发行版值或\n           DEB 控制文件的 Debian 修订版值
+
+help.option.linux-deb-maintainer=\          .deb 程序包的维护程序
+
+help.option.linux-menu-group=\          此应用程序所在的菜单组
+
+help.option.linux-package-deps=\          应用程序所需的程序包或功能
+
+help.option.linux-package-name=\          Linux 程序包的名称，默认为应用程序名称
+
+help.option.linux-rpm-license-type=\          许可证类型（RPM .spec 的 "License: <value>"）
+
+help.option.linux-shortcut=\          为应用程序创建快捷方式。
+
+help.option.mac-app-category=\          用于构造应用程序 plist 中的 LSApplicationCategoryType 的\n          字符串。默认值为 "utilities"。
+
+help.option.mac-app-image-sign-identity=\          用于对应用程序映像进行签名的身份。此值将\n          直接传递到 "codesign" 工具的 --sign 选项。此选项\n          不能与 --mac-signing-key-user-name 结合使用。
+
+help.option.mac-app-store=\          指示 jpackage 输出面向\n          Mac App Store。
+
+help.option.mac-dmg-content=\          包括 dmg 中引用的所有内容。\n          可以多次使用此选项。
+
+help.option.mac-entitlements=\          包含对包中的可执行文件和库进行签名时\n          要使用的权利的文件路径。
+
+help.option.mac-installer-sign-identity=\          用于对 "pkg" 安装程序进行签名的身份。此值将\n          直接传递到 "productbuild" 工具的 --sign 选项。此选项\n          不能与 --mac-signing-key-user-name 结合使用。
+
+help.option.mac-package-identifier=\          唯一标识 macOS 应用程序的标识符\n          默认为主类名称。\n          只能使用字母数字 (A-Z,a-z,0-9)、连字符 (-)\n          和句点 (.) 字符。
+
+help.option.mac-package-name=\          应用程序在菜单栏中显示的名称\n          此名称可以与应用程序名称不同。\n          此名称的长度必须少于 16 个字符，并且\n          适合显示在菜单栏和应用程序“信息”窗口中。\n          默认为应用程序名称。
+
+help.option.mac-package-signing-prefix=\          对应用程序包进行签名时，此值将作为\n          前缀添加到需要签名但当前没有程序包\n          标识符的所有组件。
+
+help.option.mac-sign=\          请求对程序包或预定义的应用程序映像\n          进行签名。
+
+help.option.mac-signing-keychain=\          要用来搜索签名身份的密钥链的名称\n          如果未指定，则使用标准密钥链。
+
+help.option.mac-signing-key-user-name=\          Apple 签名身份的团队或用户名称部分。为了直接\n          控制用于对应用程序映像或安装程序进行签名的\n          签名身份，请使用 --mac-app-image-sign-identity 和/或\n          --mac-installer-sign-identity。此选项不能与\n          --mac-app-image-sign-identity 或 --mac-installer-sign-identity 结合使用。
+
+help.option.main-class=\          要执行的应用程序主类的限定名称\n          只有在指定了 --main-jar 时才能使用此选项。
+
+help.option.main-jar=\          应用程序的主 JAR；包含主类\n          （指定为相对于输入路径的路径）\n          可以指定 --module 或 --main-jar 选项，\n          但不能同时指定这两个选项。
+
+help.option.module=\          应用程序的主模块（以及可选的主类）\n          此模块必须位于模块路径中。\n          指定了此选项时，将在 Java 运行时映像中\n          链接主模块。可以指定 --module 或 --main-jar \n          选项，但不能同时指定这两个选项。
+
+help.option.module-path=\          以 : 分隔的路径列表\n          每个路径是模块的目录或\n          模块化 jar 的路径。\n          （每个路径可以是绝对路径，也可以是相对于当前目录的路径。）\n          可以多次使用此选项。
+help.option.module-path.win=\          以 ; 分隔的路径列表\n          每个路径是模块的目录或\n          模块化 jar 的路径。\n          （每个路径可以是绝对路径，也可以是相对于当前目录的路径。）\n          可以多次使用此选项。
+
+help.option.name=\          应用程序和/或程序包的名称
+
+help.option.resource-dir=\          覆盖 jpackage 资源的路径\n          可以通过向此目录中添加替换资源来覆盖 jpackage 的\n          图标、模板文件和其他资源。\n          （绝对路径或相对于当前目录的路径）
+
+help.option.runtime-image=\          将复制到应用程序映像中的预定义\n          运行时映像的路径\n          （绝对路径或相对于当前目录的路径）\n          如果未指定 --runtime-image，jpackage 将运行 jlink 以\n          使用以下选项创建运行时映像：\n          --strip-debug、--no-header-files、--no-man-pages 和\n          --strip-native-commands。
+
+help.option.temp=\          用于创建临时文件的新目录或空目录的路径\n          （绝对路径或相对于当前目录的路径）\n          如果指定，则在任务完成时将不删除\n          临时目录，必须手动删除临时目录。\n          如果未指定，将创建临时目录并\n          并在任务完成时删除该临时目录。
+
+help.option.type.win=\          要创建的程序包的类型\n          有效值为：{"app-image", "exe", "msi"}\n          如果未指定此选项，则将创建与平台相关的\n          默认类型。
+help.option.type.linux=\          要创建的程序包的类型\n          有效值为：{"app-image", "deb", "rpm"}\n          如果未指定此选项，则将创建与平台相关的\n          默认类型。
+help.option.type.mac=\          要创建的程序包的类型\n          有效值为：{"app-image", "dmg", "pkg"}\n          如果未指定此选项，则将创建与平台相关的\n          默认类型。
+
+help.option.vendor=\          应用程序的供应商
+
+help.option.verbose=\          启用详细的输出
+
+help.option.version=\          将产品版本输出到输出流并退出。
+
+help.option.win-console=\          为应用程序创建控制台启动程序，应当为\n          需要控制台交互的应用程序指定
+
+help.option.win-dir-chooser=\          添加一个对话框以允许用户选择\n          产品的安装目录。
+
+help.option.win-help-url=\          用户可以从中获取更多信息或技术支持的 URL
+
+help.option.win-menu=\          请求为此应用程序添加“开始”菜单快捷方式
+
+help.option.win-menu-group=\          此应用程序所在的“开始”菜单组
+
+help.option.win-per-user-install=\          请求基于每个用户执行安装
+
+help.option.win-shortcut=\          请求为此应用程序添加桌面快捷方式
+
+help.option.win-shortcut-prompt=\          添加一个对话框以允许用户选择是否将由安装程序\n          创建快捷方式。
+
+help.option.win-update-url=\          可用应用程序更新信息的 URL
+
+help.option.win-upgrade-uuid=\          与此程序包的升级关联的 UUID
 
-MSG_Help_win_launcher=\n用来创建应用程序启动程序的与平台相关的选项：\n  --win-console\n          为应用程序创建控制台启动程序，应当为\n          需要控制台交互的应用程序指定\n
-MSG_Help_win_install=\  --win-dir-chooser\n          添加一个对话框以允许用户选择\n          产品的安装目录。\n  --win-help-url <url>\n          用户可以从中获取更多信息或技术支持的 URL\n  --win-menu\n          请求为此应用程序添加开始菜单快捷方式\n  --win-menu-group <menu group name>\n          此应用程序所在的开始菜单组\n  --win-per-user-install\n          请求基于每个用户执行安装\n  --win-shortcut\n          请求为此应用程序添加桌面快捷方式\n  --win-shortcut-prompt\n          添加一个对话框以允许用户选择是否将由安装程序\n          创建快捷方式。\n  --win-update-url <url>\n          可用应用程序更新信息的 URL\n  --win-upgrade-uuid <id string>\n          与此程序包的升级相关联的 UUID\n
-MSG_Help_win_install_dir=默认安装位置下面的相对子路径\n
-MSG_Help_mac_install=\  --mac-dmg-content <additional content path>[,<additional content path>...]\n          包括 DMG 中引用的所有内容。\n          此选项可以使用多次。\n
-MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          用来唯一地标识 macOS 应用程序的标识符\n          默认为主类名称。\n          只能使用字母数字 (A-Z,a-z,0-9)、连字符 (-) 和\n          句点 (.) 字符。\n  --mac-package-name <name string>\n          出现在菜单栏中的应用程序名称\n          这可以与应用程序名称不同。\n          此名称的长度必须小于 16 个字符，适合\n          显示在菜单栏中和应用程序“信息”窗口中。\n          默认为应用程序名称。\n  --mac-package-signing-prefix <prefix string>\n          在对应用程序包签名时，会在所有需要签名\n          但当前没有程序包标识符的组件的\n          前面加上此值。\n  --mac-sign\n          请求对程序包或预定义的应用程序映像\n          进行签名。\n  --mac-signing-keychain <keychain name>\n          要用来搜索签名身份的密钥链的名称\n          如果未指定，则使用标准的密钥链。\n  --mac-signing-key-user-name <team name>\n          Apple 签名身份的团队或用户名称部分。为了直接\n          控制用于对应用程序映像或安装程序进行签名的\n          签名身份，请使用 --mac-app-image-sign-identity 和/或\n          --mac-installer-sign-identity。此选项不能与\n          --mac-app-image-sign-identity 或 --mac-installer-sign-identity 结合使用。\n  --mac-app-image-sign-identity <identity>\n          用于对应用程序映像进行签名的身份。此值将直接\n          传递至 "codesign" 工具的 --sign 选项。此选项不能\n          与 --mac-signing-key-user-name 结合使用。\n  --mac-installer-sign-identity <identity>\n          用于对 "pkg" 安装程序进行签名的身份。此值将直接\n          传递至 "productbuild" 工具的 --sign 选项。此选项不能\n          与 --mac-signing-key-user-name 结合使用。\n  --mac-app-store\n          指示 jpackage 输出面向\n          Mac App Store。\n  --mac-entitlements <file path>\n          包含一些权利的文件的路径，在对捆绑包中的可执行文件\n          和库进行签名时会使用这些权利。\n  --mac-app-category <category string>\n          用于构造应用程序 plist 中 LSApplicationCategoryType 的\n          字符串。默认值为 "utilities"。\n
-MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux 程序包的名称，默认为应用程序名称\n  --linux-deb-maintainer <email address>\n          .deb 程序包的维护程序\n  --linux-menu-group <menu-group-name>\n          此应用程序所在的菜单组\n  --linux-package-deps <package-dep-string>\n          应用程序所需的程序包或功能\n  --linux-rpm-license-type <type string>\n          许可证的类型（RPM .spec 的 "License: <value>"）\n  --linux-app-release <release value>\n          RPM <name>.spec 文件的发行版值或 \n          DEB 控制文件的 Debian 修订版值\n  --linux-app-category <category value>\n          RPM <name>.spec 文件的组值或 \n          DEB 控制文件的节值\n  --linux-shortcut\n          为应用程序创建快捷方式。\n
-MSG_Help_mac_linux_install_dir=应用程序安装目录的绝对路径\n
-MSG_Help_default_install_dir=OS X 或 Linux 上应用程序安装目录的绝对路径。\n          Windows 上应用程序安装位置的相对子路径\n          （如 "Program Files" 或 "AppData"）。\n
-MSG_Help_no_args=用法：jpackage <options>\n使用 jpackage --help（或 -h）可获取可能选项的列表
-MSG_Help_default_app_image=用来构建可安装程序包的\n          预定义应用程序映像的位置\n
-MSG_Help_mac_app_image=用来构建可安装程序包的\n          或对预定义应用程序映像进行签名的\n          预定义应用程序映像的位置\n
-MSG_Help_mac_sign_sample_usage=\    对预定义应用程序映像进行签名：\n        jpackage --type app-image --app-image <app-image> \\\n            --mac-sign [<additional signing options>...]\n        注：此模式下允许的其他选项只有：\n              一组其他 mac 签名选项和 --verbose\n
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
index c61e60fe4ec..c5ea583514f 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
@@ -48,7 +48,7 @@ message.debug-working-directory=Kept working directory for debug: {0}
 message.bundle-created=Succeeded in building {0} package
 message.module-version=Using version "{0}" from module "{1}" as application version
 
-message.error-header={0}
+message.error-header=Error: {0}
 message.advice-header=Advice to fix: {0}
 
 error.version-string-empty=Version may not be empty string
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties
index 2426b97c7e2..7816f8ee71a 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties
@@ -24,25 +24,32 @@
 #
 #
 
-jpackage.description=Eigenständige Java-Anwendung verpacken
-
 param.copyright.default=Copyright (C) {0,date,YYYY}
-param.description.default=Kein Wert
 param.vendor.default=Unbekannt
 
+bundle-type.win-app=Windows-Anwendungsimage
+bundle-type.win-exe=EXE-Installationsprogrammpackage
+bundle-type.win-msi=MSI-Installationsprogrammpackage
+bundle-type.mac-app=Mac-Anwendungsimage
+bundle-type.mac-dmg=Mac-DMG-Package
+bundle-type.mac-pkg=Mac-PKG-Package
+bundle-type.linux-app=Linux-Anwendungsimage
+bundle-type.linux-deb=DEB-Bundle
+bundle-type.linux-rpm=RPM-Bundle
+
 resource.post-app-image-script=Auszuführendes Skript nach dem Auffüllen des Anwendungsimages
 
 message.using-default-resource=Standardpackageressource {0} {1} wird verwendet (durch Hinzufügen von {2} zu resource-dir ist eine Anpassung möglich).
-message.no-default-resource=Keine Standardpackageressource {0} {1} (durch Hinzufügen von {2} zu resource-dir ist eine Anpassung möglich).
+message.no-default-resource=Keine Standardpackageressource {0} (durch Hinzufügen von {1} zu resource-dir ist eine Anpassung möglich).
 message.using-custom-resource-from-file=Benutzerdefinierte Packageressource {0} wird verwendet (aus Datei {1} geladen).
 message.using-custom-resource=Benutzerdefinierte Packageressource {0} wird verwendet (aus {1} geladen).
 message.creating-app-bundle=Anwendungspackage {0} wird in {1} erstellt
-message.runtime-image-dir-does-not-exist=Angegebenes Laufzeitimageverzeichnis {0}: {1} ist nicht vorhanden
-message.resource-dir-does-not-exist=Angegebenes Ressourcenverzeichnis {0}: {1} ist nicht vorhanden
 message.debug-working-directory=Arbeitsverzeichnis für Debug beibehalten: {0}
 message.bundle-created={0}-Package wurde erfolgreich erstellt
 message.module-version=Version "{0}" aus Modul "{1}" wird als Anwendungsversion verwendet
-message.module-class=Klasse "{0}" aus Modul "{1}" wird als Anwendungshauptklasse verwendet
+
+message.error-header={0}
+message.advice-header=Empfehlung zur Behebung: {0}
 
 error.version-string-empty=Version darf keine leere Zeichenfolge sein
 error.version-string-zero-length-component=Version [{0}] enthält eine Komponente mit Nulllänge
@@ -50,64 +57,69 @@ error.version-string-invalid-component=Version [{0}] enthält ungültige Kompone
 
 error.cannot-create-output-dir=Zielverzeichnis {0} kann nicht erstellt werden
 error.cannot-write-to-output-dir=Zielverzeichnis {0} ist schreibgeschützt
-error.root-exists=Fehler: Anwendungszielverzeichnis {0} ist bereits vorhanden
+error.root-exists=Anwendungszielverzeichnis {0} ist bereits vorhanden
 error.no-main-class-with-main-jar=Es wurde keine Hauptklasse angegeben oder in der JAR-Datei {0} gefunden
 error.no-main-class-with-main-jar.advice=Geben Sie eine Hauptklasse an, oder stellen Sie sicher, dass die JAR-Datei {0} eine Hauptklasse im Manifest angibt
-error.no-main-class=Es wurde keine Hauptklasse angegeben oder in den angegebenen Anwendungsressourcen gefunden
-error.no-main-class.advice=Geben Sie eine Anwendungsklasse an, oder stellen Sie sicher, dass die appResources eine JAR-Datei mit einer Anwendungsklasse im Manifest enthalten
 error.main-jar-does-not-exist=Die konfigurierte Haupt-JAR-Datei ist im Eingabeverzeichnis nicht vorhanden {0}
 error.main-jar-does-not-exist.advice=Die Haupt-JAR-Datei muss relativ zum Eingabeverzeichnis (nicht als absoluter Pfad) angegeben werden und muss in diesem Verzeichnis vorhanden sein
 error.no-module-in-path="{0}-Modul im Modulpfad nicht gefunden"
-error.not-path-parameter="Ungültiger Wert für Parameter {0}: {1}"
 error.no-input-parameter="--input-Parameter für nicht modulare Anwendung fehlt"
 
+error.non-option-arguments={0} Argumente, die keine Option sind, in der Befehlszeile gefunden. Argumente, die keine Option sind, sind nicht zulässig
+error.undefined-default-bundling-operation=Standard-Bundling-Vorgang ist nicht definiert
+error.undefined-default-bundling-operation.advice=Parameter {0} zur Befehlszeile hinzufügen
+error.parameter-not-uuid=Der für Parameter {1} angegebene Wert "{0}" ist keine gültige UUID
+error.parameter-not-path=Der für Parameter {1} angegebene Wert "{0}" ist kein gültiger Pfad
+error.parameter-not-file=Der für Parameter {1} angegebene Wert "{0}" ist keine Datei
+error.parameter-not-directory=Der für Parameter {1} angegebene Wert "{0}" ist kein Verzeichnis
+error.parameter-not-empty-directory=Der für Parameter {1} angegebene Wert "{0}" ist kein leeres Verzeichnis oder kein vorhandener Pfad
+error.parameter-not-url=Der für Parameter {1} angegebene Wert "{0}" ist keine gültige URL
+error.parameter-not-launcher-shortcut-dir=Der für Parameter {1} angegebene Wert "{0}" ist kein gültiges Verknüpfungsstartverzeichnis
+error.path-parameter-ioexception=I/O-Fehler beim Zugriff auf Pfadwert "{0}" von Parameter {1}
+error.parameter-add-launcher-malformed=Der für Parameter {1} angegebene Wert "{0}" stimmt nicht mit dem Muster <Name>=<Dateipfad> überein
+error.parameter-add-launcher-not-file=Der Wert des Pfades zu einer Eigenschaftendatei "{0}", der für den zusätzlichen Launcher "{1}" bereitgestellt wird, ist kein gültiger Dateipfad
+error.properties-parameter-not-path=Der für Eigenschaft "{1}" in Datei "{2}" angegebene Wert "{0}" ist kein gültiger Pfad
+error.properties-parameter-not-file=Der für Eigenschaft "{1}" in Datei "{2}" angegebene Wert "{0}" ist keine Datei
+error.properties-parameter-not-launcher-shortcut-dir=Der für Eigenschaft "{1}" in Datei "{2}" angegebene Wert "{0}" ist kein gültiges Verknüpfungsstartverzeichnis
+
 error.no-content-types-for-file-association=Für Dateiverknüpfungsnummer {0} wurden keine MIME-Typen angegeben
 error.no-content-types-for-file-association.advice=Geben Sie einen MIME-Typ für Dateiverknüpfungsnummer {0} an
 error.too-many-content-types-for-file-association=Für Dateiverknüpfungsnummer {0} wurde mehr als ein MIME-Typ angegeben
 error.too-many-content-types-for-file-association.advice=Geben Sie nur einen MIME-Typ für Dateiverknüpfungsnummer {0} an
 
-error.tool-not-found={0} kann nicht gefunden werden. Grund: {1}
-error.tool-not-found.advice=Installieren Sie {0}
-error.tool-old-version={0} {1} oder eine neuere Version kann nicht gefunden werden
-error.tool-old-version.advice=Installieren Sie {0} {1} oder eine neuere Version
+error.launcher-duplicate-name=Mehrere Launcher haben denselben Namen "{0}". Launcher müssen eindeutige Namen haben
+
+error.tool-error=Validieren von "{0}" nicht möglich. Grund: {1}
+error.tool-not-executable="{0}" ist nicht ausführbar
+error.tool-not-found="{0}" kann nicht gefunden werden
+error.tool-not-found.advice=Installieren Sie "{0}"
+error.tool-old-version="{0}" {1} oder eine neuere Version kann nicht gefunden werden
+error.tool-old-version.advice=Installieren Sie "{0}" {1} oder eine neuere Version
+
 error.jlink.failed=jlink nicht erfolgreich mit: {0}
 error.blocked.option=jlink-Option [{0}] ist in --jlink-options nicht zulässig
 error.no.name=Name nicht mit --name angegeben. Es kann auch kein Name aus app-image abgeleitet werden
 error.no.name.advice=Geben Sie den Namen mit --name an
 
-warning.no.jdk.modules.found=Warnung: Keine JDK-Module gefunden
-
-error.foreign-app-image=Fehler : Fehlende .jpackage.xml-Datei in app-image-Verzeichnis "{0}"
-error.invalid-app-image=Fehler: app-image-Verzeichnis "{0}" wurde von einer anderen jpackage-Version generiert, oder Datei "{1}" ist nicht wohlgeformt
+error.missing-app-image-file=Datei "{0}" fehlt im vordefinierten Anwendungsimage "{1}"
+error.invalid-app-image-file=Datei "{0}" im vordefinierten Anwendungsimage "{1}" ist beschädigt oder wurde von einer anderen Version von jpackage erstellt
+error.malformed-app-image-file=Datei "{0}" im vordefinierten Anwendungsimage "{1}" enthält nicht wohlgeformte XML-Daten
+error.reading-app-image-file=Datei "{0}" konnte im vordefinierten Anwendungsimage "{1}" nicht gelesen werden
 
 error.invalid-install-dir=Ungültiges Installationsverzeichnis "{0}"
 
-MSG_BundlerFailed=Fehler: Bundler "{1}" ({0}) konnte kein Package generieren
-MSG_BundlerConfigException=Bundler {0} aufgrund eines Konfigurationsproblems übersprungen: {1} \nEmpfehlung zur Behebung: {2}
-MSG_BundlerConfigExceptionNoAdvice=Bundler {0} aufgrund eines Konfigurationsproblems übersprungen: {1}
-MSG_BundlerRuntimeException=Bundler {0} nicht erfolgreich. Grund: {1}
+ERR_NoMainClass=Hauptanwendungsklasse fehlt
+ERR_UnsupportedOption=Option [{0}] ist auf dieser Plattform ungültig
+ERR_InvalidTypeOption=Option [{0}] ist nicht gültig mit Typ [{1}]
+ERR_NoInstallerEntryPoint=Option [{0}] ist nicht gültig ohne Einstiegspunktoption --module oder --main-jar
+ERR_MutuallyExclusiveOptions=Sich gegenseitig ausschließende Optionen: [{0}] und [{1}]
+ERR_InvalidOptionWithAppImageSigning=Option [{0}] ist nicht gültig beim Signieren eines Anwendungsimages
 
-ERR_NoMainClass=Fehler: Hauptanwendungsklasse fehlt
-ERR_UnsupportedOption=Fehler: Option [{0}] ist auf dieser Plattform ungültig
-ERR_InvalidTypeOption=Fehler: Option [{0}] ist nicht gültig mit Typ [{1}]
-ERR_NoInstallerEntryPoint=Fehler: Option [{0}] ist nicht gültig ohne Einstiegspunktoption --module oder --main-jar
-ERR_MutuallyExclusiveOptions=Fehler: Optionen [{0}] und [{1}] schließen sich gegenseitig aus
-ERR_InvalidOptionWithAppImageSigning=Fehler: Option [{0}] ist nicht gültig beim Signieren eines Anwendungsimages
-
-ERR_MissingArgument=Fehler: Fehlendes Argument: {0}
-ERR_MissingRequiredArgument=Fehler: Für das Argument {0} ist mindestens eines der folgenden Argumente erforderlich: [{1}]
-ERR_AppImageNotExist=Fehler: Anwendungsimageverzeichnis "{0}" ist nicht vorhanden
-ERR_NoAddLauncherName=Fehler: Für Option --add-launcher müssen ein Name und ein Dateipfad angegeben werden (--add-launcher <Name>=<Dateipfad>)
-ERR_NoUniqueName=Fehler: Für --add-launcher <Name>=<Dateipfad> ist ein eindeutiger Name erforderlich
-ERR_InvalidAppName=Fehler: Ungültiger Anwendungsname: {0}
-ERR_InvalidSLName=Fehler: Ungültiger Name für hinzuzufügenden Launcher: {0}
-ERR_IconFileNotExit=Fehler: Die angegebene Symboldatei [{0}] ist nicht vorhanden
-ERR_LicenseFileNotExit=Fehler: Die angegebene Lizenzdatei ist nicht vorhanden
-ERR_BuildRootInvalid=Fehler: Das temporäre Verzeichnis ({0}) darf nicht vorhanden sein oder muss leer sein
-ERR_InvalidOption=Fehler: Ungültige Option: [{0}]
-ERR_InvalidInstallerType=Fehler: Ungültiger oder nicht unterstützter Typ: [{0}]
-ERR_BothMainJarAndModule=Fehler: Die Optionen --main-jar und --module dürfen nicht beide vorhanden sein
-ERR_NoEntryPoint=Fehler: Für das Erstellen des Anwendungsimages muss entweder die Option --main-jar oder die Option --module angegeben werden
-ERR_CannotParseOptions=Fehler: Option @filename wird verarbeitet: {0}
-ERR_MissingJLinkOptMacAppStore=Fehler: Argument "--mac-app-store" erfordert eine {0}-Option für Argument "--jlink-options"
-ERR_MacAppStoreRuntimeBinExists=Fehler: Laufzeitimage "{0}" darf nicht den Ordner "bin" enthalten. Verwenden Sie die jlink-Option "--strip-native-commands" beim Generieren des Laufzeitimages mit dem Argument "--mac-app-store".
+ERR_MissingArgument2=Fehlendes Argument: {0} oder {1}
+ERR_InvalidAppName=Ungültiger Anwendungsname: {0}
+ERR_InvalidSLName=Ungültiger Name für hinzuzufügenden Launcher: {0}
+ERR_InvalidOption=Ungültige Option: [{0}]
+ERR_InvalidInstallerType=Ungültiger oder nicht unterstützter Typ: [{0}]
+ERR_NoEntryPoint=Für das Erstellen des Anwendungsimages muss entweder die Option --main-jar oder die Option --module angegeben werden
+ERR_CannotParseOptions=Option @filename wird verarbeitet: {0}
+ERR_MissingJLinkOptMacAppStore=Argument "--mac-app-store" erfordert eine {0}-Option für Argument "--jlink-options"
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
index e0faf346973..5db5ead7577 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
@@ -24,25 +24,32 @@
 #
 #
 
-jpackage.description=自己完結型Javaアプリケーションをパッケージ化します
-
 param.copyright.default=Copyright (C) {0,date,YYYY}
-param.description.default=なし
 param.vendor.default=不明
 
+bundle-type.win-app=Windowsアプリケーション・イメージ
+bundle-type.win-exe=EXEインストーラ・パッケージ
+bundle-type.win-msi=MSIインストーラ・パッケージ
+bundle-type.mac-app=Macアプリケーション・イメージ
+bundle-type.mac-dmg=Mac DMGパッケージ
+bundle-type.mac-pkg=Mac PKGパッケージ
+bundle-type.linux-app=Linuxアプリケーション・イメージ
+bundle-type.linux-deb=DEBバンドル
+bundle-type.linux-rpm=RPMバンドル
+
 resource.post-app-image-script=アプリケーション・イメージを移入した後に実行するスクリプト
 
 message.using-default-resource=デフォルトのパッケージ・リソース{0} {1}の使用({2}をresource-dirに追加してカスタマイズ)。
-message.no-default-resource=デフォルトのパッケージ・リソース{0} {1}なし({2}をresource-dirに追加してカスタマイズ)。
+message.no-default-resource=デフォルトのパッケージ・リソース{0}なし({1}をresource-dirに追加してカスタマイズ)。
 message.using-custom-resource-from-file=カスタム・パッケージ・リソース{0}の使用(ファイル{1}からロード済)
 message.using-custom-resource=カスタム・パッケージ・リソース{0}の使用({1}からロード済)
 message.creating-app-bundle=アプリケーション・パッケージを作成しています: {1}内の{0}
-message.runtime-image-dir-does-not-exist=指定されたランタイム・イメージ・ディレクトリ{0}: {1}は存在しません
-message.resource-dir-does-not-exist=指定されたリソース・ディレクトリ{0}: {1}は存在しません
 message.debug-working-directory=デバッグの作業ディレクトリが保持されました: {0}
 message.bundle-created={0}パッケージの作成に成功しました
 message.module-version=モジュール"{1}"のバージョン"{0}"をアプリケーション・バージョンとして使用
-message.module-class=モジュール"{1}"のクラス"{0}"をアプリケーション・メイン・クラスとして使用
+
+message.error-header={0}
+message.advice-header=修正のアドバイス: {0}
 
 error.version-string-empty=バージョンを空の文字列にすることはできません
 error.version-string-zero-length-component=バージョン[{0}]に長さゼロのコンポーネントが含まれます
@@ -50,64 +57,69 @@ error.version-string-invalid-component=バージョン[{0}]に無効なコンポ
 
 error.cannot-create-output-dir=宛先ディレクトリ{0}を作成できません。
 error.cannot-write-to-output-dir=宛先ディレクトリ{0}は書込み不可です
-error.root-exists=エラー: アプリケーションの宛先ディレクトリ{0}はすでに存在します
+error.root-exists=アプリケーションの宛先ディレクトリ{0}はすでに存在します
 error.no-main-class-with-main-jar=メイン・クラスが指定されていなかったか、jar {0}に見つかりませんでした
 error.no-main-class-with-main-jar.advice=メイン・クラスを指定するか、jar {0}がマニフェストで指定していることを確認してください
-error.no-main-class=メイン・クラスが指定されていなかったか、指定されたアプリケーション・リソースに見つかりませんでした
-error.no-main-class.advice=アプリケーション・クラスを指定するか、マニフェストでappResourcesにアプリケーション・クラスを含むjarがあることを確認してください
 error.main-jar-does-not-exist=入力ディレクトリで、構成されたメインjarが{0}に存在しません
 error.main-jar-does-not-exist.advice=入力ディレクトリに対して相対的に(絶対パスではない)メインjarを指定する必要があり、そのディレクトリ内に存在する必要があります
 error.no-module-in-path="モジュール・パスに{0}モジュールが見つかりませんでした"
-error.not-path-parameter="{0}パラメータの無効な値: {1}"
 error.no-input-parameter="非モジュラ・アプリケーションに--inputパラメータがありません"
 
+error.non-option-arguments=コマンドラインで{0}個の非オプション引数が見つかりました。非オプション引数は使用できません
+error.undefined-default-bundling-operation=デフォルトのバンドル操作は未定義です
+error.undefined-default-bundling-operation.advice=コマンドラインに{0}パラメータを追加します
+error.parameter-not-uuid=パラメータ{1}に指定された値"{0}"は有効なUUIDではありません
+error.parameter-not-path=パラメータ{1}に指定された値"{0}"は有効なパスではありません
+error.parameter-not-file=パラメータ{1}に指定された値"{0}"はファイルではありません
+error.parameter-not-directory=パラメータ{1}に指定された値"{0}"はディレクトリではありません
+error.parameter-not-empty-directory=パラメータ{1}に指定された値"{0}"が空のディレクトリでないか、存在しないパスです
+error.parameter-not-url=パラメータ{1}に指定された値"{0}"は有効なURLではありません
+error.parameter-not-launcher-shortcut-dir=パラメータ{1}に指定された値"{0}"は、有効なショートカット起動ディレクトリではありません
+error.path-parameter-ioexception=パラメータ{1}のパス値"{0}"へのアクセス中にI/Oエラーが発生しました
+error.parameter-add-launcher-malformed=パラメータ{1}に指定された値"{0}"がパターン<name>=<file path>と一致しません
+error.parameter-add-launcher-not-file=追加のランチャ"{1}"に指定されたプロパティ・ファイル"{0}"へのパスの値は有効なファイル・パスではありません
+error.properties-parameter-not-path="{2}"ファイルのプロパティ"{1}"に指定された値"{0}"は有効なパスではありません
+error.properties-parameter-not-file="{2}"ファイルのプロパティ"{1}"に指定された値"{0}"はファイルではありません
+error.properties-parameter-not-launcher-shortcut-dir="{2}"ファイルのプロパティ"{1}"に指定された値"{0}"は、有効なショートカット起動ディレクトリではありません
+
 error.no-content-types-for-file-association=ファイル・アソシエーション番号{0}にMIMEタイプが指定されませんでした
 error.no-content-types-for-file-association.advice=ファイル・アソシエーション番号{0}にMIMEタイプを指定してください
 error.too-many-content-types-for-file-association=ファイル・アソシエーション番号{0}に複数のMIMEタイプが指定されました
 error.too-many-content-types-for-file-association.advice=ファイル・アソシエーション番号{0}にMIMEタイプを1つのみ指定してください
 
-error.tool-not-found={0}が見つかりません。理由: {1}
-error.tool-not-found.advice={0}をインストールしてください
-error.tool-old-version={0} {1}以降が見つかりません
-error.tool-old-version.advice={0} {1}以降をインストールしてください
+error.launcher-duplicate-name=複数のランチャに同じ名前"{0}"が付いています。ランチャには一意の名前が必要です
+
+error.tool-error="{0}"を検証できません。理由: {1}
+error.tool-not-executable="{0}"は実行可能ではありません
+error.tool-not-found="{0}"が見つかりません
+error.tool-not-found.advice="{0}"をインストールしてください
+error.tool-old-version="{0}" {1}以降が見つかりません
+error.tool-old-version.advice="{0}" {1}以降をインストールしてください
+
 error.jlink.failed=jlinkが次で失敗しました: {0}
 error.blocked.option=jlinkオプション[{0}]は--jlink-optionsでは許可されません
 error.no.name=名前が--nameで指定されておらず、app-imageから推論できません
 error.no.name.advice=--nameで名前を指定します
 
-warning.no.jdk.modules.found=警告: JDKモジュールが見つかりません
-
-error.foreign-app-image=エラー: app-imageディレクトリ"{0}"に.jpackage.xmlファイルがありません
-error.invalid-app-image=エラー: app-imageディレクトリ"{0}"は、別のjpackageバージョンまたは不正な"{1}"ファイルで生成されました
+error.missing-app-image-file=事前定義済アプリケーション・イメージ"{1}"に"{0}"ファイルがありません
+error.invalid-app-image-file=事前定義済アプリケーション・イメージ"{1}"の"{0}"ファイルが破損しているか、別のバージョンのjpackageによって作成されました
+error.malformed-app-image-file=事前定義済アプリケーション・イメージ"{1}"の"{0}"ファイルに不正なXMLデータが含まれています
+error.reading-app-image-file=事前定義済アプリケーション・イメージ"{1}"の"{0}"ファイルの読取りに失敗しました
 
 error.invalid-install-dir=無効なインストール・ディレクトリ"{0}"
 
-MSG_BundlerFailed=エラー: バンドラ"{1}" ({0})がパッケージの生成に失敗しました
-MSG_BundlerConfigException=構成の問題のため、バンドラ{0}がスキップされました: {1} \n次の修正を行ってください: {2}
-MSG_BundlerConfigExceptionNoAdvice=構成の問題のため、バンドラ{0}がスキップされました: {1}
-MSG_BundlerRuntimeException={1}のため、バンドラ{0}が失敗しました
+ERR_NoMainClass=メイン・アプリケーション・クラスがありません
+ERR_UnsupportedOption=オプション[{0}]は、このプラットフォームでは無効です
+ERR_InvalidTypeOption=オプション[{0}]は、タイプ[{1}]では無効です
+ERR_NoInstallerEntryPoint=オプション[{0}]は、--moduleまたは--main-jarエントリ・ポイント・オプションなしでは無効です
+ERR_MutuallyExclusiveOptions=相互排他的なオプション[{0}]と[{1}]
+ERR_InvalidOptionWithAppImageSigning=アプリケーション・イメージへの署名時にオプション[{0}]が有効ではありません
 
-ERR_NoMainClass=エラー: メイン・アプリケーション・クラスがありません
-ERR_UnsupportedOption=エラー: オプション[{0}]は、このプラットフォームでは無効です
-ERR_InvalidTypeOption=エラー: オプション[{0}]は、タイプ[{1}]では無効です
-ERR_NoInstallerEntryPoint=エラー: オプション[{0}]は、--moduleまたは--main-jarエントリ・ポイント・オプションなしでは無効です
-ERR_MutuallyExclusiveOptions=エラー: 相互排他的なオプション[{0}]と[{1}]
-ERR_InvalidOptionWithAppImageSigning=エラー: アプリケーション・イメージへの署名時にオプション[{0}]が有効ではありません
-
-ERR_MissingArgument=エラー: 引数がありません: {0}
-ERR_MissingRequiredArgument=エラー: {0}引数には少なくとも1つの[{1}]引数が必要です
-ERR_AppImageNotExist=エラー: アプリケーション・イメージ・ディレクトリ"{0}"は存在しません
-ERR_NoAddLauncherName=エラー: --add-launcherオプションには名前およびファイル・パスが必要です(--add-launcher <name>=<file path>)
-ERR_NoUniqueName=エラー: --add-launcher <name>=<file path>には一意の名前が必要です
-ERR_InvalidAppName=エラー: 無効なアプリケーション名: {0}
-ERR_InvalidSLName=エラー: 無効な追加ランチャ名: {0}
-ERR_IconFileNotExit=エラー: 指定されたアイコン・ファイル[{0}]は存在しません
-ERR_LicenseFileNotExit=エラー: 指定されたライセンス・ファイルは存在しません
-ERR_BuildRootInvalid=エラー: 一時({0})は存在しないか、空のディレクトリである必要があります
-ERR_InvalidOption=エラー: 無効なオプション: [{0}]
-ERR_InvalidInstallerType=エラー: 無効またはサポートされていないタイプ: [{0}]
-ERR_BothMainJarAndModule=エラー: --main-jarオプションと--moduleオプションの両方を指定することはできません
-ERR_NoEntryPoint=エラー: アプリケーション・イメージの作成には--main-jarまたは--moduleオプションが必要です
-ERR_CannotParseOptions=エラー: @filenameオプションの処理: {0}
-ERR_MissingJLinkOptMacAppStore=エラー: --mac-app-store引数では、--jlink-options引数に{0}オプションが必要です
-ERR_MacAppStoreRuntimeBinExists=エラー: ランタイム・イメージ"{0}"に"bin"フォルダを含めることはできません。--mac-app-store引数で使用されるランタイム・イメージを生成する際に、--strip-native-commands jlinkオプションを使用します。
+ERR_MissingArgument2=引数がありません: {0}または{1}
+ERR_InvalidAppName=無効なアプリケーション名: {0}
+ERR_InvalidSLName=無効な追加ランチャ名: {0}
+ERR_InvalidOption=無効なオプション: [{0}]
+ERR_InvalidInstallerType=無効またはサポートされていないタイプ: [{0}]
+ERR_NoEntryPoint=アプリケーション・イメージの作成には--main-jarまたは--moduleオプションが必要です
+ERR_CannotParseOptions=@filenameオプションの処理: {0}
+ERR_MissingJLinkOptMacAppStore=--mac-app-store引数では、--jlink-options引数に{0}オプションが必要です
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
index 0236ef34077..23540af7db2 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
@@ -24,25 +24,32 @@
 #
 #
 
-jpackage.description=打包自包含 Java 应用程序
-
 param.copyright.default=版权所有 (C) {0,date,YYYY}
-param.description.default=无
 param.vendor.default=未知
 
+bundle-type.win-app=Windows 应用程序映像
+bundle-type.win-exe=EXE 安装程序包
+bundle-type.win-msi=MSI 安装程序包
+bundle-type.mac-app=Mac 应用程序映像
+bundle-type.mac-dmg=Mac DMG 程序包
+bundle-type.mac-pkg=Mac PKG 程序包
+bundle-type.linux-app=Linux 应用程序映像
+bundle-type.linux-deb=DEB 包
+bundle-type.linux-rpm=RPM 包
+
 resource.post-app-image-script=要在填充应用程序映像之后运行的脚本
 
 message.using-default-resource=使用默认程序包资源 {0} {1}（将 {2} 添加到 resource-dir 中以进行定制）。
-message.no-default-resource=无默认程序包资源 {0} {1}（将 {2} 添加到 resource-dir 中以进行定制）。
+message.no-default-resource=无默认程序包资源 {0}（将 {1} 添加到 resource-dir 中以进行定制）。
 message.using-custom-resource-from-file=使用定制程序包资源 {0} (从文件 {1} 加载)。
 message.using-custom-resource=使用定制程序包资源 {0} (从 {1} 加载)。
 message.creating-app-bundle=正在 {1} 中创建应用程序包 {0}
-message.runtime-image-dir-does-not-exist=指定的运行时映像目录 {0}：{1} 不存在
-message.resource-dir-does-not-exist=指定的资源目录 {0}：{1} 不存在
 message.debug-working-directory=用于调试的已保留工作目录: {0}
 message.bundle-created=已成功地构建 {0} 程序包
 message.module-version=正在将模块 "{1}" 中的版本 "{0}" 用作应用程序版本
-message.module-class=正在将模块 "{1}" 中的类 "{0}" 用作应用程序主类
+
+message.error-header={0}
+message.advice-header=修复建议：{0}
 
 error.version-string-empty=版本不能为空字符串
 error.version-string-zero-length-component=版本 [{0}] 包含长度为零的组件
@@ -50,64 +57,69 @@ error.version-string-invalid-component=版本 [{0}] 包含无效组件 [{1}]
 
 error.cannot-create-output-dir=无法创建目标目录 {0}
 error.cannot-write-to-output-dir=目标目录 {0} 不可写
-error.root-exists=错误：应用程序目标目录 {0} 已存在
+error.root-exists=应用程序目标目录 {0} 已存在
 error.no-main-class-with-main-jar=未指定主类，在 jar {0} 中也未找到主类
 error.no-main-class-with-main-jar.advice=请指定主类或确保 jar {0} 在清单中指定一个主类。
-error.no-main-class=未指定主类，在提供的应用程序资源中也未找到主类
-error.no-main-class.advice=请指定应用程序类，或者确保 appResources 中有一个 jar 在清单中包含应用程序类。
 error.main-jar-does-not-exist=配置的主 jar 在输入目录中不存在 {0}
 error.main-jar-does-not-exist.advice=必须使用相对于输入目录的路径（不使用绝对路径）指定主 jar ，并且该目录中存在主 jar
 error.no-module-in-path="无法在模块路径中找到 {0} 模块"
-error.not-path-parameter="{0} 参数的值无效：{1}"
 error.no-input-parameter="非模块化应用程序缺少 --input 参数"
 
+error.non-option-arguments=在命令行上发现 {0} 个非选项参数。不允许使用非选项参数
+error.undefined-default-bundling-operation=未定义默认绑定操作
+error.undefined-default-bundling-operation.advice=将 {0} 参数添加到命令行
+error.parameter-not-uuid=为参数 {1} 提供的值 "{0}" 不是有效的 UUID
+error.parameter-not-path=为参数 {1} 提供的值 "{0}" 不是有效路径
+error.parameter-not-file=为参数 {1} 提供的值 "{0}" 不是文件
+error.parameter-not-directory=为参数 {1} 提供的值 "{0}" 不是目录
+error.parameter-not-empty-directory=为参数 {1} 提供的值 "{0}" 不是空目录或是不存在的路径
+error.parameter-not-url=为参数 {1} 提供的值 "{0}" 不是有效的 URL
+error.parameter-not-launcher-shortcut-dir=为参数 {1} 提供的值 "{0}" 不是有效的快捷方式启动目录
+error.path-parameter-ioexception=访问参数 {1} 的路径值 "{0}" 时出现 I/O 错误
+error.parameter-add-launcher-malformed=为参数 {1} 提供的值 "{0}" 与模式 <name>=<file path> 不匹配
+error.parameter-add-launcher-not-file=为其他启动程序 "{1}" 提供的属性文件 "{0}" 的路径值不是有效的文件路径
+error.properties-parameter-not-path=为 "{2}" 文件中的属性 "{1}" 提供的值 "{0}" 不是有效路径
+error.properties-parameter-not-file=为 "{2}" 文件中的属性 "{1}" 提供的值 "{0}" 不是文件
+error.properties-parameter-not-launcher-shortcut-dir=为 "{2}" 文件中的属性 "{1}" 提供的值 "{0}" 不是有效的快捷方式启动目录
+
 error.no-content-types-for-file-association=没有为文件关联号{0}指定 MIME 类型
 error.no-content-types-for-file-association.advice=为文件关联号 {0} 指定 MIME 类型
 error.too-many-content-types-for-file-association=为文件关联号{0}指定了多个 MIME 类型
 error.too-many-content-types-for-file-association.advice=仅为文件关联号 {0} 指定一个 MIME 类型
 
-error.tool-not-found=找不到 {0}。原因：{1}
-error.tool-not-found.advice=请安装 {0}
-error.tool-old-version=找不到 {0} {1}或更新版本
-error.tool-old-version.advice=请安装 {0} {1}或更新版本
+error.launcher-duplicate-name=多个启动程序具有相同的名称 "{0}"。启动程序应具有唯一名称
+
+error.tool-error=无法验证 "{0}"。原因：{1}
+error.tool-not-executable="{0}" 不可执行
+error.tool-not-found=找不到 "{0}"
+error.tool-not-found.advice=请安装 "{0}"
+error.tool-old-version=找不到 "{0}" {1} 或更新版本
+error.tool-old-version.advice=请安装 "{0}" {1} 或更新版本
+
 error.jlink.failed=jlink 失败，出现 {0}
 error.blocked.option=不允许在 --jlink-options 中使用 jlink 选项 [{0}]
 error.no.name=未使用 --name 指定名称，无法从 app-image 推断名称
 error.no.name.advice=使用 --name 指定名称
 
-warning.no.jdk.modules.found=警告: 未找到 JDK 模块
-
-error.foreign-app-image=错误：app-image 目录 "{0}" 中缺少 .jpackage.xml 文件
-error.invalid-app-image=错误：另一个 jpackage 版本或格式错误的 "{1}" 文件生成了 app-image 目录 "{0}"
+error.missing-app-image-file=预定义的应用程序映像 "{1}" 中缺少 "{0}" 文件
+error.invalid-app-image-file=预定义的应用程序映像 "{1}" 中的 "{0}" 文件已损坏或由其他版本的 jpackage 创建
+error.malformed-app-image-file=预定义的应用程序映像 "{1}" 中的 "{0}" 文件包含格式错误的 XML 数据
+error.reading-app-image-file=无法在预定义的应用程序映像 "{1}" 中读取 "{0}" 文件
 
 error.invalid-install-dir=安装目录 "{0}" 无效
 
-MSG_BundlerFailed=错误：打包程序 "{1}" ({0}) 无法生成程序包
-MSG_BundlerConfigException=由于配置问题, 跳过了打包程序{0}: {1} \n修复建议: {2}
-MSG_BundlerConfigExceptionNoAdvice=由于配置问题, 跳过了打包程序{0}: {1}
-MSG_BundlerRuntimeException=由于{1}, 打包程序{0}失败
+ERR_NoMainClass=缺少主应用程序类
+ERR_UnsupportedOption=选项 [{0}] 在此平台上无效
+ERR_InvalidTypeOption=选项 [{0}] 对于类型 [{1}] 无效
+ERR_NoInstallerEntryPoint=在没有 --module 或 --main-jar 入口点选项时，选项 [{0}] 无效
+ERR_MutuallyExclusiveOptions=选项 [{0}] 和 [{1}] 相互排斥
+ERR_InvalidOptionWithAppImageSigning=对应用程序映像进行签名时，选项 [{0}] 无效
 
-ERR_NoMainClass=错误：缺少主应用程序类
-ERR_UnsupportedOption=错误：选项 [{0}] 在此平台上无效
-ERR_InvalidTypeOption=错误：选项 [{0}] 对于类型 [{1}] 无效
-ERR_NoInstallerEntryPoint=错误：在没有 --module 或 --main-jar 入口点选项时，选项 [{0}] 无效
-ERR_MutuallyExclusiveOptions=错误：选项 [{0}] 和 [{1}] 相互排斥
-ERR_InvalidOptionWithAppImageSigning=错误：对应用程序映像签名时，选项 [{0}] 无效
-
-ERR_MissingArgument=错误: 缺少参数: {0}
-ERR_MissingRequiredArgument=错误：{0} 参数至少需要 [{1}] 参数之一
-ERR_AppImageNotExist=错误：应用程序映像目录 "{0}" 不存在
-ERR_NoAddLauncherName=错误：--add-launcher 选项需要一个名称和一个文件路径 (--add-launcher <name>=<file path>)
-ERR_NoUniqueName=错误：--add-launcher <name>=<file path> 需要一个唯一的名称
-ERR_InvalidAppName=错误：应用程序名称 {0} 无效
-ERR_InvalidSLName=错误：添加启动程序名称 {0} 无效
-ERR_IconFileNotExit=错误：指定的图标文件 [{0}] 不存在
-ERR_LicenseFileNotExit=错误：指定的许可证文件不存在
-ERR_BuildRootInvalid=错误：临时目录 ({0}) 必须是不存在的目录或空白目录
-ERR_InvalidOption=错误：选项 [{0}] 无效
-ERR_InvalidInstallerType=错误：类型 [{0}] 无效或不受支持
-ERR_BothMainJarAndModule=错误：不能同时包含 --main-jar 和 --module 选项
-ERR_NoEntryPoint=错误：创建应用程序映像需要 --main-jar 或 --module 选项
-ERR_CannotParseOptions=错误：正在处理 @filename 选项：{0}
-ERR_MissingJLinkOptMacAppStore=错误：对于 --jlink-options 参数，--mac-app-store 参数需要 {0} 选项
-ERR_MacAppStoreRuntimeBinExists=错误：运行时映像 "{0}" 不应包含 "bin" 文件夹。生成与 --mac-app-store 参数一起使用的运行时映像时，使用 --strip-native-commands jlink 选项。
+ERR_MissingArgument2=缺少参数：{0} 或 {1}
+ERR_InvalidAppName=应用程序名称 {0} 无效
+ERR_InvalidSLName=添加启动程序名称 {0} 无效
+ERR_InvalidOption=选项 [{0}] 无效
+ERR_InvalidInstallerType=类型 [{0}] 无效或不受支持
+ERR_NoEntryPoint=创建应用程序映像需要 --main-jar 或 --module 选项
+ERR_CannotParseOptions=正在处理 @filename 选项：{0}
+ERR_MissingJLinkOptMacAppStore=对于 --jlink-options 参数，--mac-app-store 参数需要 {0} 选项
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/ResourceLocator.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/ResourceLocator.java
index 93d317b0128..cb03a1fee8a 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/ResourceLocator.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/ResourceLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/FileUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/FileUtils.java
index 49c395642f4..2f7f2682a71 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/FileUtils.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/FileUtils.java
@@ -37,7 +37,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import jdk.internal.util.OperatingSystem;
-import jdk.jpackage.internal.util.function.ExceptionBox;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
 
 public final class FileUtils {
@@ -170,15 +169,13 @@ public final class FileUtils {
             }
         }
 
-        private void runActionOnPath(ThrowingConsumer<Path> action, Path path) {
+        private void runActionOnPath(ThrowingConsumer<Path, IOException> action, Path path) {
             try {
                 action.accept(path);
             } catch (IOException ex) {
                 if (this.ex == null) {
                     this.ex = ex;
                 }
-            } catch (Throwable t) {
-                throw ExceptionBox.rethrowUnchecked(t);
             }
         }
 
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/IdentityWrapper.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/IdentityWrapper.java
index 0a7a8cc8d4b..7b4c75630ac 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/IdentityWrapper.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/IdentityWrapper.java
@@ -69,5 +69,9 @@ public final class IdentityWrapper<T> {
         return String.format("Identity[%s]", value);
     }
 
+    public static <T> IdentityWrapper<T> wrapIdentity(T v) {
+        return new IdentityWrapper<>(v);
+    }
+
     private final T value;
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/Result.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/Result.java
index 8a61acafe77..46e99f134df 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/Result.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/Result.java
@@ -24,33 +24,28 @@
  */
 package jdk.jpackage.internal.util;
 
-import static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
-
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
-import java.util.function.UnaryOperator;
 import java.util.stream.StreamSupport;
+import jdk.jpackage.internal.util.function.ExceptionBox;
+import jdk.jpackage.internal.util.function.ThrowingSupplier;
 
 
 public record Result<T>(Optional<T> value, Collection<? extends Exception> errors) {
     public Result {
         if (value.isEmpty() == errors.isEmpty()) {
-            throw new IllegalArgumentException();
+            throw new IllegalArgumentException("'value' and 'errors' cannot both be non-empty or both be empty");
         }
-
-        if (value.isEmpty() && errors.isEmpty()) {
-            throw new IllegalArgumentException("Error collection must be non-empty");
-        }
-
     }
 
     public T orElseThrow() {
         firstError().ifPresent(ex -> {
-            rethrowUnchecked(ex);
+            throw ExceptionBox.toUnchecked(ex);
         });
         return value.orElseThrow();
     }
@@ -64,7 +59,16 @@ public record Result<T>(Optional<T> value, Collection<? extends Exception> error
     }
 
     public <U> Result<U> map(Function<T, U> conv) {
-        return new Result<>(value.map(conv), errors);
+        if (hasValue()) {
+            var mapped = value.map(conv);
+            if (mapped.isEmpty()) {
+                throw new NullPointerException();
+            } else {
+                return new Result<>(mapped, errors);
+            }
+        } else {
+            return mapErrors();
+        }
     }
 
     public <U> Result<U> flatMap(Function<T, Result<U>> conv) {
@@ -73,12 +77,12 @@ public record Result<T>(Optional<T> value, Collection<? extends Exception> error
         });
     }
 
-    public Result<T> mapErrors(UnaryOperator<Collection<? extends Exception>> errorsMapper) {
-        return new Result<>(value, errorsMapper.apply(errors));
-    }
-
+    @SuppressWarnings("unchecked")
     public <U> Result<U> mapErrors() {
-        return new Result<>(Optional.empty(), errors);
+        if (hasValue()) {
+            throw new IllegalStateException("Can not map errors from a result without errors");
+        }
+        return (Result<U>)this;
     }
 
     public Result<T> peekErrors(Consumer<Collection<? extends Exception>> consumer) {
@@ -97,12 +101,31 @@ public record Result<T>(Optional<T> value, Collection<? extends Exception> error
         return errors.stream().findFirst();
     }
 
-    public static <T> Result<T> create(Supplier<T> supplier) {
+    public static <T> Result<T> of(Supplier<T> supplier) {
+        return of(supplier::get, RuntimeException.class);
+    }
+
+    public static <T, E extends Exception> Result<T> of(
+            ThrowingSupplier<T, ? extends E> supplier, Class<? extends E> supplierExceptionType) {
+
+        Objects.requireNonNull(supplier);
+        Objects.requireNonNull(supplierExceptionType);
+
+        T value;
         try {
-            return ofValue(supplier.get());
+            value = supplier.get();
         } catch (Exception ex) {
-            return ofError(ex);
+            if (supplierExceptionType.isInstance(ex)) {
+                return ofError(ex);
+            } else if (ex instanceof RuntimeException rex) {
+                throw rex;
+            } else {
+                // Unreachable because the `supplier` can throw exceptions of type or supertype `E` or runtime exceptions.
+                throw ExceptionBox.reachedUnreachable();
+            }
         }
+
+        return ofValue(value);
     }
 
     public static <T> Result<T> ofValue(T value) {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/SetBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/SetBuilder.java
index 18736b4ed7e..d3d677cba50 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/SetBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/SetBuilder.java
@@ -31,7 +31,7 @@ import java.util.Set;
 
 public final class SetBuilder<T> {
 
-    public static <T> SetBuilder<T> build(Class<? extends T> type) {
+    public static <T> SetBuilder<T> build() {
         return new SetBuilder<>();
     }
 
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/XmlUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/XmlUtils.java
index c8761259254..f62ffee9260 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/XmlUtils.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/XmlUtils.java
@@ -24,7 +24,7 @@
  */
 package jdk.jpackage.internal.util;
 
-import static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
+import static jdk.jpackage.internal.util.function.ExceptionBox.toUnchecked;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -80,7 +80,7 @@ public final class XmlUtils {
             xml.flush();
             xml.close();
         } catch (XMLStreamException ex) {
-            throw rethrowUnchecked(ex);
+            throw toUnchecked(ex);
         }
     }
 
@@ -101,7 +101,7 @@ public final class XmlUtils {
             xml.flush();
             xml.close();
         } catch (XMLStreamException ex) {
-            throw rethrowUnchecked(ex);
+            throw toUnchecked(ex);
         }
     }
 
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ExceptionBox.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ExceptionBox.java
index 8428d5d1e7f..40503469873 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ExceptionBox.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ExceptionBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,23 +30,55 @@ public class ExceptionBox extends RuntimeException {
 
     private static final long serialVersionUID = 1L;
 
-    public static RuntimeException rethrowUnchecked(Throwable throwable) {
-        if (throwable instanceof RuntimeException err) {
-            throw err;
+    public static RuntimeException toUnchecked(Exception ex) {
+        switch (ex) {
+            case RuntimeException rex -> {
+                return rex;
+            }
+            case InvocationTargetException itex -> {
+                var t = itex.getCause();
+                if (t instanceof Exception cause) {
+                    return toUnchecked(cause);
+                } else {
+                    throw (Error)t;
+                }
+            }
+            case InterruptedException _ -> {
+                Thread.currentThread().interrupt();
+                return new ExceptionBox(ex);
+            }
+            default -> {
+                return new ExceptionBox(ex);
+            }
         }
-
-        if (throwable instanceof Error err) {
-            throw err;
-        }
-
-        if (throwable instanceof InvocationTargetException err) {
-            throw rethrowUnchecked(err.getCause());
-        }
-
-        throw new ExceptionBox(throwable);
     }
 
-    private ExceptionBox(Throwable throwable) {
-        super(throwable);
+    public static Exception unbox(Throwable t) {
+        switch (t) {
+            case ExceptionBox ex -> {
+                return unbox(ex.getCause());
+            }
+            case InvocationTargetException ex -> {
+                return unbox(ex.getCause());
+            }
+            case Exception ex -> {
+                return ex;
+            }
+            case Error err -> {
+                throw err;
+            }
+            default -> {
+                // Unreachable
+                throw reachedUnreachable();
+            }
+        }
+    }
+
+    public static Error reachedUnreachable() {
+        return new AssertionError("Reached unreachable!");
+    }
+
+    private ExceptionBox(Exception ex) {
+        super(ex);
     }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingBiConsumer.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingBiConsumer.java
index 3ed0fd67d84..374eaf803d9 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingBiConsumer.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingBiConsumer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,17 @@ package jdk.jpackage.internal.util.function;
 import java.util.function.BiConsumer;
 
 @FunctionalInterface
-public interface ThrowingBiConsumer<T, U> {
+public interface ThrowingBiConsumer<T, U, E extends Exception> {
 
-    void accept(T t, U u) throws Throwable;
+    void accept(T t, U u) throws E;
 
     public static <T, U> BiConsumer<T, U> toBiConsumer(
-            ThrowingBiConsumer<T, U> v) {
+            ThrowingBiConsumer<T, U, ? extends Exception> v) {
         return (t, u) -> {
             try {
                 v.accept(t, u);
-            } catch (Throwable ex) {
-                throw ExceptionBox.rethrowUnchecked(ex);
+            } catch (Exception ex) {
+                throw ExceptionBox.toUnchecked(ex);
             }
         };
     }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingBiFunction.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingBiFunction.java
index 8c2df773eb5..13b0b53c887 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingBiFunction.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingBiFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,17 @@ package jdk.jpackage.internal.util.function;
 import java.util.function.BiFunction;
 
 @FunctionalInterface
-public interface ThrowingBiFunction<T, U, R> {
+public interface ThrowingBiFunction<T, U, R, E extends Exception> {
 
-    R apply(T t, U u) throws Throwable;
+    R apply(T t, U u) throws E;
 
     public static <T, U, R> BiFunction<T, U, R> toBiFunction(
-            ThrowingBiFunction<T, U, R> v) {
+            ThrowingBiFunction<T, U, R, ? extends Exception> v) {
         return (t, u) -> {
             try {
                 return v.apply(t, u);
-            } catch (Throwable ex) {
-                throw ExceptionBox.rethrowUnchecked(ex);
+            } catch (Exception ex) {
+                throw ExceptionBox.toUnchecked(ex);
             }
         };
     }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingConsumer.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingConsumer.java
index ef1b0a61df7..38342a361c0 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingConsumer.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingConsumer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,16 +27,16 @@ package jdk.jpackage.internal.util.function;
 import java.util.function.Consumer;
 
 @FunctionalInterface
-public interface ThrowingConsumer<T> {
+public interface ThrowingConsumer<T, E extends Exception> {
 
-    void accept(T t) throws Throwable;
+    void accept(T t) throws E;
 
-    public static <T> Consumer<T> toConsumer(ThrowingConsumer<T> v) {
+    public static <T> Consumer<T> toConsumer(ThrowingConsumer<T, ? extends Exception> v) {
         return o -> {
             try {
                 v.accept(o);
-            } catch (Throwable ex) {
-                throw ExceptionBox.rethrowUnchecked(ex);
+            } catch (Exception ex) {
+                throw ExceptionBox.toUnchecked(ex);
             }
         };
     }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingFunction.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingFunction.java
index 2b5eae43842..5bbfb254858 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingFunction.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,16 +27,16 @@ package jdk.jpackage.internal.util.function;
 import java.util.function.Function;
 
 @FunctionalInterface
-public interface ThrowingFunction<T, R> {
+public interface ThrowingFunction<T, R, E extends Exception> {
 
-    R apply(T t) throws Throwable;
+    R apply(T t) throws E;
 
-    public static <T, R> Function<T, R> toFunction(ThrowingFunction<T, R> v) {
+    public static <T, R> Function<T, R> toFunction(ThrowingFunction<T, R, ? extends Exception> v) {
         return t -> {
             try {
                 return v.apply(t);
-            } catch (Throwable ex) {
-                throw ExceptionBox.rethrowUnchecked(ex);
+            } catch (Exception ex) {
+                throw ExceptionBox.toUnchecked(ex);
             }
         };
     }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingRunnable.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingRunnable.java
index 7c75c4d9753..f3ce5affbbf 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingRunnable.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,16 @@
 package jdk.jpackage.internal.util.function;
 
 @FunctionalInterface
-public interface ThrowingRunnable {
+public interface ThrowingRunnable<E extends Exception> {
 
-    void run() throws Throwable;
+    void run() throws E;
 
-    public static Runnable toRunnable(ThrowingRunnable v) {
+    public static Runnable toRunnable(ThrowingRunnable<? extends Exception> v) {
         return () -> {
             try {
                 v.run();
-            } catch (Throwable ex) {
-                throw ExceptionBox.rethrowUnchecked(ex);
+            } catch (Exception ex) {
+                throw ExceptionBox.toUnchecked(ex);
             }
         };
     }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingSupplier.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingSupplier.java
index c69c4729190..4f194a0f4d2 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingSupplier.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingSupplier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,16 +27,16 @@ package jdk.jpackage.internal.util.function;
 import java.util.function.Supplier;
 
 @FunctionalInterface
-public interface ThrowingSupplier<T> {
+public interface ThrowingSupplier<T, E extends Exception> {
 
-    T get() throws Throwable;
+    T get() throws E;
 
-    public static <T> Supplier<T> toSupplier(ThrowingSupplier<T> v) {
+    public static <T> Supplier<T> toSupplier(ThrowingSupplier<T, ? extends Exception> v) {
         return () -> {
             try {
                 return v.get();
-            } catch (Throwable ex) {
-                throw ExceptionBox.rethrowUnchecked(ex);
+            } catch (Exception ex) {
+                throw ExceptionBox.toUnchecked(ex);
             }
         };
     }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingUnaryOperator.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingUnaryOperator.java
index 7a2a0fd67cf..3d757bbec48 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingUnaryOperator.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ThrowingUnaryOperator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,17 @@ package jdk.jpackage.internal.util.function;
 import java.util.function.UnaryOperator;
 
 @FunctionalInterface
-public interface ThrowingUnaryOperator<T> {
+public interface ThrowingUnaryOperator<T, E extends Exception> {
 
-    T apply(T t) throws Throwable;
+    T apply(T t) throws E;
 
     public static <T> UnaryOperator<T> toUnaryOperator(
-            ThrowingUnaryOperator<T> v) {
+            ThrowingUnaryOperator<T, ? extends Exception> v) {
         return t -> {
             try {
                 return v.apply(t);
-            } catch (Throwable ex) {
-                throw ExceptionBox.rethrowUnchecked(ex);
+            } catch (Exception ex) {
+                throw ExceptionBox.toUnchecked(ex);
             }
         };
     }
diff --git a/src/jdk.jpackage/share/native/applauncher/PackageFile.cpp b/src/jdk.jpackage/share/native/applauncher/PackageFile.cpp
index 31b431215d5..4bf51348d6d 100644
--- a/src/jdk.jpackage/share/native/applauncher/PackageFile.cpp
+++ b/src/jdk.jpackage/share/native/applauncher/PackageFile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/share/native/common/Dll.h b/src/jdk.jpackage/share/native/common/Dll.h
index c84242373a7..bfe9e25238e 100644
--- a/src/jdk.jpackage/share/native/common/Dll.h
+++ b/src/jdk.jpackage/share/native/common/Dll.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/share/native/common/app.cpp b/src/jdk.jpackage/share/native/common/app.cpp
index d9492785f06..a64e84b70fb 100644
--- a/src/jdk.jpackage/share/native/common/app.cpp
+++ b/src/jdk.jpackage/share/native/common/app.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/share/native/common/tstrings.cpp b/src/jdk.jpackage/share/native/common/tstrings.cpp
index b38c811e8bd..7ceb87edfa1 100644
--- a/src/jdk.jpackage/share/native/common/tstrings.cpp
+++ b/src/jdk.jpackage/share/native/common/tstrings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinBundlingEnvironment.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinBundlingEnvironment.java
index 38547999290..dc9891f154a 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinBundlingEnvironment.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinBundlingEnvironment.java
@@ -24,7 +24,7 @@
  */
 package jdk.jpackage.internal;
 
-import static jdk.jpackage.internal.WinFromOpions.createWinApplication;
+import static jdk.jpackage.internal.WinFromOptions.createWinApplication;
 import static jdk.jpackage.internal.WinPackagingPipeline.APPLICATION_LAYOUT;
 import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_WIN_APP_IMAGE;
 import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_WIN_EXE;
@@ -46,7 +46,7 @@ public class WinBundlingEnvironment extends DefaultBundlingEnvironment {
     private static void createMsiPackage(Options options, WinSystemEnvironment sysEnv) {
 
         createNativePackage(options,
-                WinFromOpions::createWinMsiPackage,
+                WinFromOptions.createWinMsiPackage(options),
                 buildEnv()::create,
                 WinPackagingPipeline.build(),
                 (env, pkg, outputDir) -> {
@@ -60,7 +60,7 @@ public class WinBundlingEnvironment extends DefaultBundlingEnvironment {
     private static void createExePackage(Options options, WinSystemEnvironment sysEnv) {
 
         createNativePackage(options,
-                WinFromOpions::createWinExePackage,
+                WinFromOptions.createWinExePackage(options),
                 buildEnv()::create,
                 WinPackagingPipeline.build(),
                 (env, pkg, outputDir) -> {
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromOpions.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromOptions.java
similarity index 99%
rename from src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromOpions.java
rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromOptions.java
index 6fd6d0a7b96..6009e2f6724 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromOpions.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromOptions.java
@@ -49,7 +49,7 @@ import jdk.jpackage.internal.model.WinLauncher;
 import jdk.jpackage.internal.model.WinLauncherMixin;
 import jdk.jpackage.internal.model.WinMsiPackage;
 
-final class WinFromOpions {
+final class WinFromOptions {
 
     static WinApplication createWinApplication(Options options) {
 
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinSystemEnvironment.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinSystemEnvironment.java
index ab0cc37b9fe..c0bea444e00 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinSystemEnvironment.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinSystemEnvironment.java
@@ -34,6 +34,6 @@ record WinSystemEnvironment(WixToolset wixToolset) implements SystemEnvironment
     }
 
     static Result<WinSystemEnvironment> create() {
-        return Result.create(WixTool::createToolset).map(WinSystemEnvironment::new);
+        return Result.of(WixTool::createToolset).map(WinSystemEnvironment::new);
     }
 }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixLauncherAsService.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixLauncherAsService.java
index 833219eaa10..0755a920fd2 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixLauncherAsService.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixLauncherAsService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinApplicationMixin.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinApplicationMixin.java
index 283b5d84ae3..fde29980599 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinApplicationMixin.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinApplicationMixin.java
@@ -30,7 +30,15 @@ public interface WinApplicationMixin {
 
     record Stub(DottedVersion winVersion) implements WinApplicationMixin {
         public Stub(Application app) {
-            this(DottedVersion.greedy(app.version()));
+            this(parse(app.version()));
+        }
+
+        private static DottedVersion parse(String strVersion) {
+            try {
+                return DottedVersion.greedy(strVersion);
+            } catch (IllegalArgumentException ex) {
+                throw new JPackageException(ex.getMessage(), ex);
+            }
         }
     }
 }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties
index 3e6f8e30d6a..baaba64b398 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties
@@ -23,15 +23,9 @@
 # questions.
 #
 #
-
-app.bundler.name=Windows-Anwendungsimage
-exe.bundler.name=EXE-Installationsprogrammpackage
-msi.bundler.name=MSI-Installationsprogrammpackage
-
 param.menu-group.default=Unbekannt
 
 resource.executable-properties-template=Vorlage für das Erstellen der ausführbaren Eigenschaftendatei
-resource.setup-icon=Symbol für Dialogfeld "Setup"
 resource.post-msi-script=Auszuführendes Skript nach dem Erstellen der MSI-Datei für das EXE-Installationsprogramm
 resource.wxl-file=WiX-Lokalisierungsdatei
 resource.main-wix-file=Haupt-WiX-Projektdatei
@@ -65,12 +59,10 @@ message.potential.windows.defender.issue=Warnung: Windows Defender verhindert ev
 message.outputting-to-location=EXE für Installationsprogramm wird generiert in: {0}.
 message.output-location=Installationsprogramm (.exe) gespeichert in: {0}
 message.tool-version=[{0}]-Version [{1}] erkannt.
-message.creating-association-with-null-extension=Verknüpfung mit Nullerweiterung wird erstellt.
 message.wrong-tool-version=[{0}]-Version {1} wurde erkannt. Erforderlich ist jedoch Version {2}.
 message.use-wix36-features=WiX {0} erkannt. Erweiterte Bereinigungsaktion wird aktiviert.
 message.product-code=MSI-ProductCode: {0}.
 message.upgrade-code=MSI-UpgradeCode: {0}.
 message.preparing-msi-config=MSI-Konfiguration wird vorbereitet: {0}.
 message.generating-msi=MSI wird generiert: {0}.
-message.invalid.install.dir=Warnung: Ungültiges Installationsverzeichnis {0}. Installationsverzeichnis muss ein relativer Unterpfad unter dem Standardinstallationsverzeichnis wie "Programme" sein. Der Anwendungsname "{1}" wird als Standardwert verwendet.
 
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
index 07604dc9980..119c7532b1f 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
@@ -23,15 +23,9 @@
 # questions.
 #
 #
-
-app.bundler.name=Windowsアプリケーション・イメージ
-exe.bundler.name=EXEインストーラ・パッケージ
-msi.bundler.name=MSIインストーラ・パッケージ
-
 param.menu-group.default=不明
 
 resource.executable-properties-template=実行可能なプロパティ・ファイル作成用のテンプレート
-resource.setup-icon=設定ダイアログ・アイコン
 resource.post-msi-script=exeインストーラのmsiファイルが作成された後に実行するスクリプト
 resource.wxl-file=WiXローカリゼーション・ファイル
 resource.main-wix-file=メインWiXプロジェクト・ファイル
@@ -65,12 +59,10 @@ message.potential.windows.defender.issue=警告: Windows Defenderが原因でjpa
 message.outputting-to-location=インストーラのEXEを次に生成しています: {0}
 message.output-location=インストーラ(.exe)は次に保存されました: {0}
 message.tool-version=[{0}]バージョン[{1}]が検出されました。
-message.creating-association-with-null-extension=null拡張子との関連付けを作成しています。
 message.wrong-tool-version=[{0}]バージョン{1}が検出されましたが、バージョン{2}が必要です。
 message.use-wix36-features=WiX {0}が検出されました。拡張クリーンアップ・アクションを有効化しています。
 message.product-code=MSI ProductCode: {0}。
 message.upgrade-code=MSI UpgradeCode: {0}。
 message.preparing-msi-config=MSI構成を準備しています: {0}
 message.generating-msi=MSIを生成しています: {0}。
-message.invalid.install.dir=警告: インストール・ディレクトリ{0}が無効です。インストール・ディレクトリはデフォルトのインストール場所("プログラム・ファイル"など)の下の相対サブパスである必要があります。アプリケーション名"{1}"にデフォルト設定されています。
 
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
index 7eae69fba2f..66d8a9d8b96 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
@@ -23,15 +23,9 @@
 # questions.
 #
 #
-
-app.bundler.name=Windows 应用程序映像
-exe.bundler.name=EXE 安装程序包
-msi.bundler.name=MSI 安装程序包
-
 param.menu-group.default=未知
 
 resource.executable-properties-template=用于创建可执行属性文件的模板
-resource.setup-icon=设置对话框图标
 resource.post-msi-script=在为 exe 安装程序创建 msi 文件之后要运行的脚本
 resource.wxl-file=WiX 本地化文件
 resource.main-wix-file=主 WiX 项目文件
@@ -65,12 +59,10 @@ message.potential.windows.defender.issue=警告：Windows Defender 可能会阻
 message.outputting-to-location=正在为安装程序生成 EXE, 位置: {0}。
 message.output-location=安装程序 (.exe) 已保存到: {0}
 message.tool-version=检测到 [{0}] 版本 [{1}]。
-message.creating-association-with-null-extension=正在使用空扩展名创建关联。
 message.wrong-tool-version=检测到 [{0}] 版本 {1}, 但需要版本 {2}。
 message.use-wix36-features=检测到 WiX {0}。正在启用高级清除操作。
 message.product-code=MSI ProductCode：{0}。
 message.upgrade-code=MSI UpgradeCode：{0}。
 message.preparing-msi-config=正在准备 MSI 配置: {0}。
 message.generating-msi=正在生成 MSI: {0}。
-message.invalid.install.dir=警告：安装目录 {0} 无效。安装目录应当是默认安装位置（如 "Program Files"）下面的相对子路径。默认为应用程序名称 "{1}"。
 
diff --git a/src/jdk.jpackage/windows/native/common/MsiUtils.h b/src/jdk.jpackage/windows/native/common/MsiUtils.h
index 26fa9f91045..d501174268d 100644
--- a/src/jdk.jpackage/windows/native/common/MsiUtils.h
+++ b/src/jdk.jpackage/windows/native/common/MsiUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/windows/native/libjpackage/VersionInfo.cpp b/src/jdk.jpackage/windows/native/libjpackage/VersionInfo.cpp
index 122757b3ac3..aa977be8a82 100644
--- a/src/jdk.jpackage/windows/native/libjpackage/VersionInfo.cpp
+++ b/src/jdk.jpackage/windows/native/libjpackage/VersionInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/windows/native/libmsica/Version.cpp b/src/jdk.jpackage/windows/native/libmsica/Version.cpp
index 293f2dd36be..f8c570a1349 100644
--- a/src/jdk.jpackage/windows/native/libmsica/Version.cpp
+++ b/src/jdk.jpackage/windows/native/libmsica/Version.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/windows/native/libmsica/Version.h b/src/jdk.jpackage/windows/native/libmsica/Version.h
index 4ef176d382f..6f91a36765e 100644
--- a/src/jdk.jpackage/windows/native/libmsica/Version.h
+++ b/src/jdk.jpackage/windows/native/libmsica/Version.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/windows/native/libmsica/libmsica.cpp b/src/jdk.jpackage/windows/native/libmsica/libmsica.cpp
index edfea6dc136..f338c8ab103 100644
--- a/src/jdk.jpackage/windows/native/libmsica/libmsica.cpp
+++ b/src/jdk.jpackage/windows/native/libmsica/libmsica.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/IOContext.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/IOContext.java
index e6d43bb346e..d662b62c157 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/IOContext.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/IOContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
index 795321253fd..9a030f7e46b 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
@@ -3362,7 +3362,19 @@ public class JShellTool implements MessageHandler {
             // error occurred, already reported
             return false;
         }
-        try (BufferedWriter writer = Files.newBufferedWriter(toPathResolvingUserHome(filename),
+        // Create missing parent directories before writing to target file
+        Path target;
+        try {
+            target = toPathResolvingUserHome(filename);
+            Path parent = target.getParent();
+            if (parent != null) {
+                Files.createDirectories(parent);
+            }
+        } catch (Exception e) {
+            errormsg("jshell.err.file.exception", "/save", filename, e);
+            return false;
+        }
+        try (BufferedWriter writer = Files.newBufferedWriter(target,
                 Charset.defaultCharset(),
                 CREATE, TRUNCATE_EXISTING, WRITE)) {
             if (at.hasOption("-history")) {
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java
index f2472ee5623..9925a0141f1 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties
index 351a0f812ad..e9918a7f628 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties
index cb93ae4ed57..744e71db667 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
index fa84c3f38fb..becf6854a74 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
index 879e9633e6a..c175db36da6 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jshell/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java b/src/jdk.jshell/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java
index 099aba26968..7a1dd6c9877 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/OuterWrapMap.java b/src/jdk.jshell/share/classes/jdk/jshell/OuterWrapMap.java
index 61fb3bdfc9a..ca1d7cc8fd3 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/OuterWrapMap.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/OuterWrapMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java b/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java
index 992d97a7040..dc82d1d06a1 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiDefaultExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiDefaultExecutionControl.java
index 526580988ab..1df6dc5191b 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiDefaultExecutionControl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiDefaultExecutionControl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java b/src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java
index d5fedf93855..994757f17c3 100644
--- a/src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java
+++ b/src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -135,7 +135,7 @@ import javax.management.DynamicMBean;
  *   </tr>
  *   <tr>
  *     <th scope="row">dcmd.enabled</th><td>boolean</td>
- *     <td>True if the diagnostic command is enabled, false otherwise</td>
+ *     <td>This field is always true -- diagnostic commands cannot be disabled.</td>
  *   </tr>
  *   <tr>
  *     <th scope="row">dcmd.arguments</th><td>Descriptor</td>
diff --git a/src/jdk.management/share/classes/com/sun/management/internal/HotSpotAOTCacheImpl.java b/src/jdk.management/share/classes/com/sun/management/internal/HotSpotAOTCacheImpl.java
new file mode 100644
index 00000000000..4bb556455ea
--- /dev/null
+++ b/src/jdk.management/share/classes/com/sun/management/internal/HotSpotAOTCacheImpl.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2025, Microsoft, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.management.internal;
+
+import javax.management.ObjectName;
+import jdk.management.HotSpotAOTCacheMXBean;
+import sun.management.Util;
+import sun.management.VMManagement;
+
+/**
+ * Implementation class for the AOT Cache subsystem.
+ *
+ * ManagementFactory.getRuntimeMXBean() returns an instance
+ * of this class.
+ */
+public class HotSpotAOTCacheImpl implements HotSpotAOTCacheMXBean {
+
+    private final VMManagement jvm;
+    /**
+     * Constructor of HotSpotAOTCacheImpl class.
+     */
+    HotSpotAOTCacheImpl(VMManagement vm) {
+        this.jvm = vm;
+    }
+
+    public boolean endRecording() {
+        return jvm.endAOTRecording();
+    }
+
+    public ObjectName getObjectName() {
+        return Util.newObjectName("jdk.management:type=HotSpotAOTCache");
+    }
+}
\ No newline at end of file
diff --git a/src/jdk.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java b/src/jdk.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java
index 3a64fe6b858..b000516e626 100644
--- a/src/jdk.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java
+++ b/src/jdk.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.management.DynamicMBean;
+import jdk.management.HotSpotAOTCacheMXBean;
 import jdk.management.VirtualThreadSchedulerMXBean;
 import sun.management.ManagementFactoryHelper;
 import sun.management.spi.PlatformMBeanProvider;
@@ -159,6 +160,41 @@ public final class PlatformMBeanProviderImpl extends PlatformMBeanProvider {
             }
         });
 
+        /**
+        * HotSpotAOTCacheMXBean.
+        */
+        initMBeanList.add(new PlatformComponent<HotSpotAOTCacheMXBean>() {
+            private final Set<Class<? extends HotSpotAOTCacheMXBean>> mbeanInterfaces =
+                    Set.of(HotSpotAOTCacheMXBean.class);
+            private final Set<String> mbeanInterfaceNames =
+                    Set.of(HotSpotAOTCacheMXBean.class.getName());
+            private HotSpotAOTCacheMXBean impl;
+
+            @Override
+            public Set<Class<? extends HotSpotAOTCacheMXBean>> mbeanInterfaces() {
+                return mbeanInterfaces;
+            }
+
+            @Override
+            public Set<String> mbeanInterfaceNames() {
+                return mbeanInterfaceNames;
+            }
+
+            @Override
+            public String getObjectNamePattern() {
+                return "jdk.management:type=HotSpotAOTCache";
+            }
+
+            @Override
+            public Map<String, HotSpotAOTCacheMXBean> nameToMBeanMap() {
+                HotSpotAOTCacheMXBean impl = this.impl;
+                if (impl == null) {
+                    this.impl = impl = new HotSpotAOTCacheImpl(ManagementFactoryHelper.getVMManagement());
+                }
+                return Map.of("jdk.management:type=HotSpotAOTCache", impl);
+            }
+        });
+
         /**
          * VirtualThreadSchedulerMXBean.
          */
diff --git a/src/jdk.management/share/classes/jdk/management/HotSpotAOTCacheMXBean.java b/src/jdk.management/share/classes/jdk/management/HotSpotAOTCacheMXBean.java
new file mode 100644
index 00000000000..f8e1e5a7f05
--- /dev/null
+++ b/src/jdk.management/share/classes/jdk/management/HotSpotAOTCacheMXBean.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2025, Microsoft, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.management;
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.PlatformManagedObject;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+/**
+ * Management interface for the JDK's Ahead of Time (AOT) Cache.
+ *
+ * <p> The management interface is registered with the platform {@link MBeanServer
+ * MBeanServer}. The {@link ObjectName ObjectName} that uniquely identifies the management
+ * interface within the {@code MBeanServer} is {@code jdk.management:type=HotSpotAOTCache}.
+ *
+ * <p> Direct access to the MXBean interface can be obtained with
+ * {@link ManagementFactory#getPlatformMXBean(Class)}.
+ *
+ * @since 26
+ */
+public interface HotSpotAOTCacheMXBean extends PlatformManagedObject {
+    /**
+     * If an AOT recording is in progress, ends the recording. This method returns
+     * after the AOT artifacts have been completely written.
+     *
+     * <p>The JVM will start recording AOT artifacts upon start-up if appropriate JVM options are
+     * given in the command-line. The recording will stop when the JVM exits, or when
+     * the {@code endRecording} method is called. Examples:
+     *
+     * <p> ${@code java -XX:AOTCacheOutput=app.aot ....}
+     *
+     * <blockquote>
+     *    The JVM records optimization information for the current application in the AOT cache file
+     *    {@code app.aot}. In a future run of the application, the option {@code -XX:AOTCache=app.aot} will
+     *    cause the JVM to use the cache to improve the application's startup and warmup performance.
+     * </blockquote>
+     *
+     * <p>  ${@code java -XX:AOTMode=record -XX:AOTConfiguration=app.aotconfig ....}
+     *
+     * <blockquote>
+     *    The JVM records optimization information for the current application in the AOT configuration
+     *    file {@code app.aotconfig}. Subsequently, an AOT cache file can be created with the command:
+     *
+     *    <p>${@code java -XX:AOTMode=create -XX:AOTConfiguration=app.aotconfig  -XX:AOTCache=app.aot ...}
+     *  </blockquote>
+     *
+     * <p>For more information about creating and using the AOT artifacts, and detailed
+     * specification of the corresponding JVM command-line options, please refer
+     * to <a href="https://openjdk.org/jeps/483">JEP 483</a> and <a href="https://openjdk.org/jeps/514">JEP 514</a>.
+     *
+     * <p>Currently there are no APIs to start an AOT recording. AOT recordings must be
+     * started using JVM command-line options such as {@code -XX:AOTCacheOutput}.
+     * There are also no APIs to query whether an AOT recording is in progress, or what AOT
+     * artifacts are being recorded.
+     *
+     * <p> This method enables an application to end its own AOT recording
+     * programatically, but that is not necessarily the best approach. Doing so
+     * requires changing the application’s code, which might not be
+     * feasible. Even when it is feasible, injecting training-specific logic
+     * into the application reduces the similarity between training runs and
+     * production runs, potentially making the AOT cache less effective. It may
+     * be better to arrange for an external agent to end the training run,
+     * thereby creating an AOT cache without interfering with the application’s
+     * code.
+     *
+     * @return {@code true} if a recording was in progress and has been ended
+     * successfully; {@code false} otherwise.
+     */
+    public boolean endRecording();
+}
diff --git a/src/jdk.management/share/classes/jdk/management/VirtualThreadSchedulerMXBean.java b/src/jdk.management/share/classes/jdk/management/VirtualThreadSchedulerMXBean.java
index 556c5184ffe..358ab23ca93 100644
--- a/src/jdk.management/share/classes/jdk/management/VirtualThreadSchedulerMXBean.java
+++ b/src/jdk.management/share/classes/jdk/management/VirtualThreadSchedulerMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,7 +76,7 @@ public interface VirtualThreadSchedulerMXBean extends PlatformManagedObject {
      * @throws IllegalArgumentException if size is less than the minimum, or
      *         greater than the maximum, supported by the scheduler
      * @throws UnsupportedOperationException if changing the target
-     *         parallelism is not suppored by the scheduler
+     *         parallelism is not supported by the scheduler
      *
      * @see ForkJoinPool#setParallelism(int)
      */
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/FreeInteractiveLayoutManager.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/FreeInteractiveLayoutManager.java
index 7aec57ec2a0..ab334007ced 100644
--- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/FreeInteractiveLayoutManager.java
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/FreeInteractiveLayoutManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java
index cb9487ae828..a73d7bb6dde 100644
--- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/LayoutGraph.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/LayoutGraph.java
index 956d72924b9..9c285886e71 100644
--- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/LayoutGraph.java
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/LayoutGraph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/LayoutMover.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/LayoutMover.java
index 48599d78d75..3126a8dba9e 100644
--- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/LayoutMover.java
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/LayoutMover.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/LayoutNode.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/LayoutNode.java
index 2816115080e..2ef3211a3b0 100644
--- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/LayoutNode.java
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/LayoutNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableFreeLayoutAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableFreeLayoutAction.java
index 201fc51e15e..6af8bb851e2 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableFreeLayoutAction.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableFreeLayoutAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/LineWidget.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/LineWidget.java
index 01ebb8ed9e3..0c9f636e373 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/LineWidget.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/LineWidget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java
index 61cbc054200..9a806a85552 100644
--- a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java
+++ b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java
index d230f1b4336..3a9a6c2cbef 100644
--- a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java
+++ b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/GroupJavacBenchmark.java b/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/GroupJavacBenchmark.java
index 5ca3f0bf648..9eb6c893cc6 100644
--- a/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/GroupJavacBenchmark.java
+++ b/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/GroupJavacBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/JavacBenchmark.java b/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/JavacBenchmark.java
index 28c5c57a073..565ea4038c7 100644
--- a/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/JavacBenchmark.java
+++ b/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/JavacBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/SingleJavacBenchmark.java b/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/SingleJavacBenchmark.java
index 2cc5c1a7c83..00c5bd7ee92 100644
--- a/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/SingleJavacBenchmark.java
+++ b/test/benchmarks/micros-javac/src/main/java/org/openjdk/bench/langtools/javac/SingleJavacBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/docs/ProblemList.txt b/test/docs/ProblemList.txt
index 4df8bbcc53c..c846678665d 100644
--- a/test/docs/ProblemList.txt
+++ b/test/docs/ProblemList.txt
@@ -39,7 +39,3 @@
 # More than one label is allowed but must be on the same line.
 #
 #############################################################################
-
-jdk/javadoc/doccheck/checks/jdkCheckLinks.java 8370249 generic-all
-jdk/javadoc/doccheck/checks/jdkCheckHtml.java 8370970 generic-all
-jdk/javadoc/doccheck/checks/jdkDoctypeBadcharsCheck.java 8370970 generic-all
diff --git a/test/failure_handler/src/share/conf/mac.properties b/test/failure_handler/src/share/conf/mac.properties
index e04b49e0fcf..6a4ada31e98 100644
--- a/test/failure_handler/src/share/conf/mac.properties
+++ b/test/failure_handler/src/share/conf/mac.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/gtest/cds/test_archiveWorkers.cpp b/test/hotspot/gtest/cds/test_archiveWorkers.cpp
index 55c3528f0c2..87e55b80b94 100644
--- a/test/hotspot/gtest/cds/test_archiveWorkers.cpp
+++ b/test/hotspot/gtest/cds/test_archiveWorkers.cpp
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,20 +24,21 @@
  */
 
 #include "cds/archiveUtils.hpp"
+#include "runtime/atomic.hpp"
 #include "unittest.hpp"
 
 class TestArchiveWorkerTask : public ArchiveWorkerTask {
 private:
-  volatile int _sum;
-  int _max;
+  Atomic<int> _sum;
+  Atomic<int> _max;
 public:
   TestArchiveWorkerTask() : ArchiveWorkerTask("Test"), _sum(0), _max(0) {}
   void work(int chunk, int max_chunks) override {
-    AtomicAccess::add(&_sum, chunk);
-    AtomicAccess::store(&_max, max_chunks);
+    _sum.add_then_fetch(chunk);
+    _max.store_relaxed(max_chunks);
   }
-  int sum() { return AtomicAccess::load(&_sum); }
-  int max() { return AtomicAccess::load(&_max); }
+  int sum() { return _sum.load_relaxed(); }
+  int max() { return _max.load_relaxed(); }
 };
 
 // Test a repeated cycle of workers init/shutdown without task works.
diff --git a/test/hotspot/gtest/gc/g1/test_g1BatchedGangTask.cpp b/test/hotspot/gtest/gc/g1/test_g1BatchedGangTask.cpp
index 902406eaf65..08df547585a 100644
--- a/test/hotspot/gtest/gc/g1/test_g1BatchedGangTask.cpp
+++ b/test/hotspot/gtest/gc/g1/test_g1BatchedGangTask.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,10 @@
  *
  */
 
+#include "cppstdlib/new.hpp"
 #include "gc/g1/g1BatchedTask.hpp"
 #include "gc/shared/workerThread.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "unittest.hpp"
 
 class G1BatchedTaskWorkers : AllStatic {
@@ -49,26 +50,26 @@ WorkerThreads* G1BatchedTaskWorkers::_workers = nullptr;
 
 class G1TestSubTask : public G1AbstractSubTask {
   mutable uint _phase;
-  volatile uint _num_do_work; // Amount of do_work() has been called.
+  Atomic<uint> _num_do_work; // Amount of do_work() has been called.
 
   void check_and_inc_phase(uint expected) const {
     ASSERT_EQ(_phase, expected);
     _phase++;
   }
 
-  bool volatile* _do_work_called_by;
+  Atomic<bool>* _do_work_called_by;
 
 protected:
   uint _max_workers;
 
   void do_work_called(uint worker_id) {
-    AtomicAccess::inc(&_num_do_work);
-    bool orig_value = AtomicAccess::cmpxchg(&_do_work_called_by[worker_id], false, true);
+    _num_do_work.add_then_fetch(1u);
+    bool orig_value = _do_work_called_by[worker_id].compare_exchange(false, true);
     ASSERT_EQ(orig_value, false);
   }
 
   void verify_do_work_called_by(uint num_workers) {
-    ASSERT_EQ(AtomicAccess::load(&_num_do_work), num_workers);
+    ASSERT_EQ(_num_do_work.load_relaxed(), num_workers);
     // Do not need to check the _do_work_called_by array. The count is already verified
     // by above statement, and we already check that a given flag is only set once.
   }
@@ -86,7 +87,7 @@ public:
 
   ~G1TestSubTask() {
     check_and_inc_phase(3);
-    FREE_C_HEAP_ARRAY(bool, _do_work_called_by);
+    FREE_C_HEAP_ARRAY(Atomic<bool>, _do_work_called_by);
   }
 
   double worker_cost() const override {
@@ -100,9 +101,9 @@ public:
     assert(max_workers >= 1, "must be");
     check_and_inc_phase(2);
 
-    _do_work_called_by = NEW_C_HEAP_ARRAY(bool, max_workers, mtInternal);
+    _do_work_called_by = NEW_C_HEAP_ARRAY(Atomic<bool>, max_workers, mtInternal);
     for (uint i = 0; i < max_workers; i++) {
-      _do_work_called_by[i] = false;
+      ::new (&_do_work_called_by[i]) Atomic<bool>{false};
     }
     _max_workers = max_workers;
   }
diff --git a/test/hotspot/gtest/gc/g1/test_g1CardSet.cpp b/test/hotspot/gtest/gc/g1/test_g1CardSet.cpp
index 70a70dc069f..c2de96bea4f 100644
--- a/test/hotspot/gtest/gc/g1/test_g1CardSet.cpp
+++ b/test/hotspot/gtest/gc/g1/test_g1CardSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 #include "gc/shared/workerThread.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 #include "unittest.hpp"
 #include "utilities/powerOfTwo.hpp"
 
@@ -385,8 +386,8 @@ void G1CardSetTest::cardset_basic_test() {
 class G1CardSetMtTestTask : public WorkerTask {
   G1CardSet* _card_set;
 
-  size_t _added;
-  size_t _found;
+  Atomic<size_t> _added;
+  Atomic<size_t> _found;
 
 public:
   G1CardSetMtTestTask(G1CardSet* card_set) :
@@ -413,12 +414,12 @@ public:
         found++;
       }
     }
-    AtomicAccess::add(&_added, added);
-    AtomicAccess::add(&_found, found);
+    _added.add_then_fetch(added);
+    _found.add_then_fetch(found);
   }
 
-  size_t added() const { return _added; }
-  size_t found() const { return _found; }
+  size_t added() const { return _added.load_relaxed(); }
+  size_t found() const { return _found.load_relaxed(); }
 };
 
 void G1CardSetTest::cardset_mt_test() {
diff --git a/test/hotspot/gtest/gc/g1/test_heapRegion.cpp b/test/hotspot/gtest/gc/g1/test_heapRegion.cpp
index ec7722ad384..8dc609ca69e 100644
--- a/test/hotspot/gtest/gc/g1/test_heapRegion.cpp
+++ b/test/hotspot/gtest/gc/g1/test_heapRegion.cpp
@@ -79,7 +79,6 @@ void VM_HeapRegionApplyToMarkedObjectsTest::doit() {
   bitmap->par_mark(region->bottom() + MARK_OFFSET_1);
   bitmap->par_mark(region->bottom() + MARK_OFFSET_2);
   bitmap->par_mark(region->bottom() + MARK_OFFSET_3);
-  bitmap->par_mark(region->end());
 
   VerifyAndCountMarkClosure cl(bitmap);
 
diff --git a/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp b/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp
index 6b3e9fd50bc..ce6a4f8819e 100644
--- a/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp
+++ b/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 #include "gc/g1/g1RegionToSpaceMapper.hpp"
 #include "gc/shared/workerThread.hpp"
 #include "memory/memoryReserver.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "unittest.hpp"
 
@@ -51,7 +51,7 @@ WorkerThreads* G1MapperWorkers::_workers = nullptr;
 
 class G1TestCommitUncommit : public WorkerTask {
   G1RegionToSpaceMapper* _mapper;
-  uint _claim_id;
+  Atomic<uint> _claim_id;
 public:
   G1TestCommitUncommit(G1RegionToSpaceMapper* mapper) :
       WorkerTask("Stress mapper"),
@@ -59,7 +59,7 @@ public:
       _claim_id(0) { }
 
   void work(uint worker_id) {
-    uint index = AtomicAccess::fetch_then_add(&_claim_id, 1u);
+    uint index = _claim_id.fetch_then_add(1u);
 
     for (int i = 0; i < 100000; i++) {
       // Stress commit and uncommit of a single region. The same
diff --git a/test/hotspot/gtest/gc/shared/test_bufferNodeAllocator.cpp b/test/hotspot/gtest/gc/shared/test_bufferNodeAllocator.cpp
index ec72ce404e3..edcea03d696 100644
--- a/test/hotspot/gtest/gc/shared/test_bufferNodeAllocator.cpp
+++ b/test/hotspot/gtest/gc/shared/test_bufferNodeAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 
 #include "gc/shared/bufferNode.hpp"
 #include "memory/allocation.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/semaphore.inline.hpp"
 #include "runtime/thread.hpp"
@@ -116,16 +116,16 @@ public:
 class BufferNode::TestSupport::AllocatorThread : public JavaTestThread {
   BufferNode::Allocator* _allocator;
   CompletedList* _cbl;
-  volatile size_t* _total_allocations;
-  volatile bool* _continue_running;
+  Atomic<size_t>* _total_allocations;
+  Atomic<bool>* _continue_running;
   size_t _allocations;
 
 public:
   AllocatorThread(Semaphore* post,
                   BufferNode::Allocator* allocator,
                   CompletedList* cbl,
-                  volatile size_t* total_allocations,
-                  volatile bool* continue_running) :
+                  Atomic<size_t>* total_allocations,
+                  Atomic<bool>* continue_running) :
     JavaTestThread(post),
     _allocator(allocator),
     _cbl(cbl),
@@ -135,14 +135,14 @@ public:
   {}
 
   virtual void main_run() {
-    while (AtomicAccess::load_acquire(_continue_running)) {
+    while (_continue_running->load_acquire()) {
       BufferNode* node = _allocator->allocate();
       _cbl->push(node);
       ++_allocations;
       ThreadBlockInVM tbiv(this); // Safepoint check.
     }
     tty->print_cr("allocations: %zu", _allocations);
-    AtomicAccess::add(_total_allocations, _allocations);
+    _total_allocations->add_then_fetch(_allocations);
   }
 };
 
@@ -151,13 +151,13 @@ public:
 class BufferNode::TestSupport::ProcessorThread : public JavaTestThread {
   BufferNode::Allocator* _allocator;
   CompletedList* _cbl;
-  volatile bool* _continue_running;
+  Atomic<bool>* _continue_running;
 
 public:
   ProcessorThread(Semaphore* post,
                   BufferNode::Allocator* allocator,
                   CompletedList* cbl,
-                  volatile bool* continue_running) :
+                  Atomic<bool>* continue_running) :
     JavaTestThread(post),
     _allocator(allocator),
     _cbl(cbl),
@@ -172,7 +172,7 @@ public:
         _allocator->release(node);
       } else if (shutdown_requested) {
         return;
-      } else if (!AtomicAccess::load_acquire(_continue_running)) {
+      } else if (!_continue_running->load_acquire()) {
         // To avoid a race that could leave buffers in the list after this
         // thread has shut down, continue processing until the list is empty
         // *after* the shut down request has been received.
@@ -193,9 +193,9 @@ static void run_test(BufferNode::Allocator* allocator, CompletedList* cbl) {
   constexpr uint milliseconds_to_run = 1000;
 
   Semaphore post;
-  volatile size_t total_allocations = 0;
-  volatile bool allocator_running = true;
-  volatile bool processor_running = true;
+  Atomic<size_t> total_allocations{0};
+  Atomic<bool> allocator_running{true};
+  Atomic<bool> processor_running{true};
 
   ProcessorThread* proc_threads[num_processor_threads] = {};
   for (uint i = 0; i < num_processor_threads; ++i) {
@@ -222,18 +222,18 @@ static void run_test(BufferNode::Allocator* allocator, CompletedList* cbl) {
     ThreadInVMfromNative invm(this_thread);
     this_thread->sleep(milliseconds_to_run);
   }
-  AtomicAccess::release_store(&allocator_running, false);
+  allocator_running.release_store(false);
   for (uint i = 0; i < num_allocator_threads; ++i) {
     ThreadInVMfromNative invm(this_thread);
     post.wait_with_safepoint_check(this_thread);
   }
-  AtomicAccess::release_store(&processor_running, false);
+  processor_running.release_store(false);
   for (uint i = 0; i < num_processor_threads; ++i) {
     ThreadInVMfromNative invm(this_thread);
     post.wait_with_safepoint_check(this_thread);
   }
   ASSERT_TRUE(BufferNode::TestSupport::try_transfer_pending(allocator));
-  tty->print_cr("total allocations: %zu", total_allocations);
+  tty->print_cr("total allocations: %zu", total_allocations.load_relaxed());
   tty->print_cr("allocator free count: %zu", allocator->free_count());
 }
 
diff --git a/test/hotspot/gtest/nmt/test_regions_tree.cpp b/test/hotspot/gtest/nmt/test_regions_tree.cpp
index a7f4a6962ca..7465c84aa72 100644
--- a/test/hotspot/gtest/nmt/test_regions_tree.cpp
+++ b/test/hotspot/gtest/nmt/test_regions_tree.cpp
@@ -48,7 +48,7 @@ TEST_VM_F(NMTRegionsTreeTest, ReserveCommitTwice) {
   }
   {
     VMATree::SummaryDiff diff, not_used;
-    rt.commit_region(0, 50, ncs, not_used);
+    rt.commit_region(nullptr, 50, ncs, not_used);
     rt.reserve_mapping(0, 100, rd, diff);
     EXPECT_EQ(0, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
     EXPECT_EQ(-50, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
@@ -62,10 +62,10 @@ TEST_VM_F(NMTRegionsTreeTest, ReserveCommitTwice) {
 
   {
     VMATree::SummaryDiff diff1, diff2;
-    rt.commit_region(0, 50, ncs, diff1);
+    rt.commit_region(nullptr, 50, ncs, diff1);
     EXPECT_EQ(0, diff1.tag[NMTUtil::tag_to_index(mtGC)].reserve);
     EXPECT_EQ(50, diff1.tag[NMTUtil::tag_to_index(mtGC)].commit);
-    rt.commit_region(0, 50, ncs, diff2);
+    rt.commit_region(nullptr, 50, ncs, diff2);
     EXPECT_EQ(0, diff2.tag[NMTUtil::tag_to_index(mtTest)].reserve);
     EXPECT_EQ(0, diff2.tag[NMTUtil::tag_to_index(mtTest)].commit);
   }
@@ -78,7 +78,7 @@ TEST_VM_F(NMTRegionsTreeTest, CommitUncommitRegion) {
   rt.reserve_mapping(0, 100, rd, not_used);
   {
     VMATree::SummaryDiff diff;
-    rt.commit_region(0, 50, ncs, diff);
+    rt.commit_region(nullptr, 50, ncs, diff);
     EXPECT_EQ(0, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
     EXPECT_EQ(50, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
   }
@@ -90,7 +90,7 @@ TEST_VM_F(NMTRegionsTreeTest, CommitUncommitRegion) {
   }
   {
     VMATree::SummaryDiff diff;
-    rt.uncommit_region(0, 50, diff);
+    rt.uncommit_region(nullptr, 50, diff);
     EXPECT_EQ(0, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
     EXPECT_EQ(-50, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
   }
@@ -153,4 +153,4 @@ TEST_VM_F(NMTRegionsTreeTest, VisitCommittedRegions) {
     return true;
   });
   EXPECT_EQ(count, 4UL);
-}
\ No newline at end of file
+}
diff --git a/test/hotspot/gtest/oops/test_compressedKlass.cpp b/test/hotspot/gtest/oops/test_compressedKlass.cpp
index c2ae7719776..dcdb335adb5 100644
--- a/test/hotspot/gtest/oops/test_compressedKlass.cpp
+++ b/test/hotspot/gtest/oops/test_compressedKlass.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2024, 2025, Red Hat, Inc. All rights reserved.
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@ TEST_VM(CompressedKlass, basics) {
   if (!UseCompressedClassPointers) {
     return;
   }
-  ASSERT_LE((address)0, CompressedKlassPointers::base());
   ASSERT_LE(CompressedKlassPointers::base(), CompressedKlassPointers::klass_range_start());
   ASSERT_LT(CompressedKlassPointers::klass_range_start(), CompressedKlassPointers::klass_range_end());
   ASSERT_LE(CompressedKlassPointers::klass_range_end(), CompressedKlassPointers::encoding_range_end());
@@ -50,7 +49,7 @@ TEST_VM(CompressedKlass, basics) {
     ASSERT_EQ(CompressedKlassPointers::encoding_range_end() - CompressedKlassPointers::base(), (ptrdiff_t)expected_size);
   }
 #else
-  ASSERT_EQ(CompressedKlassPointers::base(), (address)0);
+  ASSERT_EQ(CompressedKlassPointers::base(), nullptr);
   ASSERT_EQ(CompressedKlassPointers::encoding_range_end(), (address)(UINT_MAX));
 #endif // _LP64
 }
diff --git a/test/hotspot/gtest/opto/test_rangeinference.cpp b/test/hotspot/gtest/opto/test_rangeinference.cpp
index 1a62941a486..61a9ff7fb70 100644
--- a/test/hotspot/gtest/opto/test_rangeinference.cpp
+++ b/test/hotspot/gtest/opto/test_rangeinference.cpp
@@ -25,15 +25,16 @@
 #include "opto/rangeinference.hpp"
 #include "opto/type.hpp"
 #include "runtime/os.hpp"
-#include "utilities/intn_t.hpp"
 #include "unittest.hpp"
+#include "utilities/intn_t.hpp"
+#include "utilities/rbTree.hpp"
+#include <array>
+#include <limits>
+#include <type_traits>
 
 template <class U>
-static U uniform_random();
-
-template <>
-juint uniform_random<juint>() {
-  return os::random();
+static U uniform_random() {
+  return U(juint(os::random()));
 }
 
 template <>
@@ -201,7 +202,7 @@ static void test_canonicalize_constraints_random() {
   }
 }
 
-TEST_VM(opto, canonicalize_constraints) {
+TEST(opto, canonicalize_constraints) {
   test_canonicalize_constraints_trivial();
   test_canonicalize_constraints_exhaustive<intn_t<1>, uintn_t<1>>();
   test_canonicalize_constraints_exhaustive<intn_t<2>, uintn_t<2>>();
@@ -212,3 +213,413 @@ TEST_VM(opto, canonicalize_constraints) {
   test_canonicalize_constraints_random<jint, juint>();
   test_canonicalize_constraints_random<jlong, julong>();
 }
+
+// Implementations of TypeIntMirror methods for testing purposes
+template <class S, class U>
+const TypeIntMirror<S, U>* TypeIntMirror<S, U>::operator->() const {
+  return this;
+}
+
+template <class S, class U>
+TypeIntMirror<S, U> TypeIntMirror<S, U>::meet(const TypeIntMirror& o) const {
+  return TypeIntHelper::int_type_union(*this, o);
+}
+
+template <class S, class U>
+bool TypeIntMirror<S, U>::contains(U u) const {
+  S s = S(u);
+  return s >= _lo && s <= _hi && u >= _ulo && u <= _uhi && _bits.is_satisfied_by(u);
+}
+
+template <class S, class U>
+bool TypeIntMirror<S, U>::contains(const TypeIntMirror& o) const {
+  return TypeIntHelper::int_type_is_subset(*this, o);
+}
+
+template <class S, class U>
+bool TypeIntMirror<S, U>::operator==(const TypeIntMirror& o) const {
+  return TypeIntHelper::int_type_is_equal(*this, o);
+}
+
+template <class S, class U>
+template <class T>
+TypeIntMirror<S, U> TypeIntMirror<S, U>::cast() const {
+  static_assert(std::is_same_v<T, TypeIntMirror>);
+  return *this;
+}
+
+// The number of TypeIntMirror instances for integral types with a few bits. These values are
+// calculated once and written down for usage in constexpr contexts.
+template <class CTP>
+static constexpr size_t all_instances_size() {
+  using U = decltype(CTP::_ulo);
+  constexpr juint max_unsigned = juint(std::numeric_limits<U>::max());
+  if constexpr (max_unsigned == 1U) {
+    // 1 bit
+    return 3;
+  } else if constexpr (max_unsigned == 3U) {
+    // 2 bits
+    return 15;
+  } else if constexpr (max_unsigned == 7U) {
+    // 3 bits
+    return 134;
+  } else {
+    // 4 bits
+    static_assert(max_unsigned == 15U);
+    // For more than 4 bits, the number of instances is too large and it is not realistic to
+    // compute all of them.
+    return 1732;
+  }
+}
+
+template <class CTP>
+static std::array<CTP, all_instances_size<CTP>()> compute_all_instances() {
+  using S = decltype(CTP::_lo);
+  using U = decltype(CTP::_ulo);
+
+  class CTPComparator {
+  public:
+    static RBTreeOrdering cmp(const CTP& x, const RBNode<CTP, int>* node) {
+      // Quick helper for the tediousness below
+      auto f = [](auto x, auto y) {
+        assert(x != y, "we only handle lt and gt cases");
+        return x < y ? RBTreeOrdering::LT : RBTreeOrdering::GT;
+      };
+
+      const CTP& y = node->key();
+      if (x._lo != y._lo) {
+        return f(x._lo, y._lo);
+      } else if (x._hi != y._hi) {
+        return f(x._hi, y._hi);
+      } else if (x._ulo != y._ulo) {
+        return f(x._ulo, y._ulo);
+      } else if (x._uhi != y._uhi) {
+        return f(x._uhi, y._uhi);
+      } else if (x._bits._zeros != y._bits._zeros) {
+        return f(x._bits._zeros, y._bits._zeros);
+      } else if (x._bits._ones != y._bits._ones) {
+        return f(x._bits._ones, y._bits._ones);
+      } else {
+        return RBTreeOrdering::EQ;
+      }
+    }
+  };
+
+  RBTreeCHeap<CTP, int, CTPComparator, MemTag::mtCompiler> collector;
+  for (jint lo = jint(std::numeric_limits<S>::min()); lo <= jint(std::numeric_limits<S>::max()); lo++) {
+    for (jint hi = lo; hi <= jint(std::numeric_limits<S>::max()); hi++) {
+      for (juint ulo = 0; ulo <= juint(std::numeric_limits<U>::max()); ulo++) {
+        for (juint uhi = ulo; uhi <= juint(std::numeric_limits<U>::max()); uhi++) {
+          for (juint zeros = 0; zeros <= juint(std::numeric_limits<U>::max()); zeros++) {
+            for (juint ones = 0; ones <= juint(std::numeric_limits<U>::max()); ones++) {
+              TypeIntPrototype<S, U> t{{S(lo), S(hi)}, {U(ulo), U(uhi)}, {U(zeros), U(ones)}};
+              auto canonicalized_t = t.canonicalize_constraints();
+              if (canonicalized_t.empty()) {
+                continue;
+              }
+
+              TypeIntPrototype<S, U> ct = canonicalized_t._data;
+              collector.upsert(CTP{ct._srange._lo, ct._srange._hi, ct._urange._lo, ct._urange._hi, ct._bits}, 0);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  assert(collector.size() == all_instances_size<CTP>(), "unexpected size of all_instance, expected %d, actual %d", jint(all_instances_size<CTP>()), jint(collector.size()));
+  std::array<CTP, all_instances_size<CTP>()> res;
+  size_t idx = 0;
+  collector.visit_in_order([&](RBNode<CTP, int>* node) {
+    res[idx] = node->key();
+    idx++;
+    return true;
+  });
+  return res;
+}
+
+template <class CTP>
+static const std::array<CTP, all_instances_size<CTP>()>& all_instances() {
+  static std::array<CTP, all_instances_size<CTP>()> res = compute_all_instances<CTP>();
+  static_assert(std::is_trivially_destructible_v<decltype(res)>);
+  return res;
+}
+
+// Check the correctness, that is, if v1 is an element of input1, v2 is an element of input2, then
+// op(v1, v2) must be an element of infer(input1, input2). This version does the check exhaustively
+// on all elements of input1 and input2.
+template <class InputType, class Operation, class Inference>
+static void test_binary_instance_correctness_exhaustive(Operation op, Inference infer, const InputType& input1, const InputType& input2) {
+  using S = std::remove_const_t<decltype(input1->_lo)>;
+  using U = std::remove_const_t<decltype(input1->_ulo)>;
+  InputType result = infer(input1, input2);
+
+  for (juint v1 = juint(std::numeric_limits<U>::min()); v1 <= juint(std::numeric_limits<U>::max()); v1++) {
+    if (!input1.contains(U(v1))) {
+      continue;
+    }
+
+    for (juint v2 = juint(std::numeric_limits<U>::min()); v2 <= juint(std::numeric_limits<U>::max()); v2++) {
+      if (!input2.contains(U(v2))) {
+        continue;
+      }
+
+      U r = op(U(v1), U(v2));
+      ASSERT_TRUE(result.contains(r));
+    }
+  }
+}
+
+// Check the correctness, that is, if v1 is an element of input1, v2 is an element of input2, then
+// op(v1, v2) must be an element of infer(input1, input2). This version does the check randomly on
+// a number of elements in input1 and input2.
+template <class InputType, class Operation, class Inference>
+static void test_binary_instance_correctness_samples(Operation op, Inference infer, const InputType& input1, const InputType& input2) {
+  using U = std::remove_const_t<decltype(input1->_ulo)>;
+  auto result = infer(input1, input2);
+
+  constexpr size_t sample_count = 6;
+  U input1_samples[sample_count] {U(input1._lo), U(input1._hi), input1._ulo, input1._uhi, input1._ulo, input1._ulo};
+  U input2_samples[sample_count] {U(input2._lo), U(input2._hi), input2._ulo, input2._uhi, input2._ulo, input2._ulo};
+
+  auto random_sample = [](U* samples, const InputType& input) {
+    constexpr size_t max_tries = 100;
+    constexpr size_t start_random_idx = 4;
+    for (size_t tries = 0, idx = start_random_idx; tries < max_tries && idx < sample_count; tries++) {
+      U n = uniform_random<U>();
+      if (input.contains(n)) {
+        samples[idx] = n;
+        idx++;
+      }
+    }
+  };
+  random_sample(input1_samples, input1);
+  random_sample(input2_samples, input2);
+
+  for (size_t i = 0; i < sample_count; i++) {
+    for (size_t j = 0; j < sample_count; j++) {
+      U r = op(input1_samples[i], input2_samples[j]);
+      ASSERT_TRUE(result.contains(r));
+    }
+  }
+}
+
+// Check the monotonicity, that is, if input1 is a subset of super1, input2 is a subset of super2,
+// then infer(input1, input2) must be a subset of infer(super1, super2). This version does the
+// check exhaustively on all supersets of input1 and input2.
+template <class InputType, class Inference>
+static void test_binary_instance_monotonicity_exhaustive(Inference infer, const InputType& input1, const InputType& input2) {
+  InputType result = infer(input1, input2);
+
+  for (const InputType& super1 : all_instances<InputType>()) {
+    if (!super1.contains(input1) || super1 == input1) {
+      continue;
+    }
+
+    for (const InputType& super2 : all_instances<InputType>()) {
+      if (!super2.contains(input2) || super2 == input2) {
+        continue;
+      }
+
+      ASSERT_TRUE(infer(input1, super2).contains(result));
+      ASSERT_TRUE(infer(super1, input2).contains(result));
+      ASSERT_TRUE(infer(super1, super2).contains(result));
+    }
+  }
+}
+
+// Check the monotonicity, that is, if input1 is a subset of super1, input2 is a subset of super2,
+// then infer(input1, input2) must be a subset of infer(super1, super2). This version does the
+// check randomly on a number of supersets of input1 and input2.
+template <class InputType, class Inference>
+static void test_binary_instance_monotonicity_samples(Inference infer, const InputType& input1, const InputType& input2) {
+  using S = std::remove_const_t<decltype(input1->_lo)>;
+  using U = std::remove_const_t<decltype(input1->_ulo)>;
+  auto result = infer(input1, input2);
+
+  // The set that is a superset of all other sets
+  InputType universe = InputType{std::numeric_limits<S>::min(), std::numeric_limits<S>::max(), U(0), U(-1), {U(0), U(0)}};
+  ASSERT_TRUE(infer(universe, input2).contains(result));
+  ASSERT_TRUE(infer(input1, universe).contains(result));
+  ASSERT_TRUE(infer(universe, universe).contains(result));
+
+  auto random_superset = [](const InputType& input) {
+    S lo = MIN2(input->_lo, S(uniform_random<U>()));
+    S hi = MAX2(input->_hi, S(uniform_random<U>()));
+    U ulo = MIN2(input->_ulo, uniform_random<U>());
+    U uhi = MAX2(input->_uhi, uniform_random<U>());
+    U zeros = input->_bits._zeros & uniform_random<U>();
+    U ones = input->_bits._ones & uniform_random<U>();
+    InputType super = InputType::make(TypeIntPrototype<S, U>{{lo, hi}, {ulo, uhi}, {zeros, ones}}, 0);
+    assert(super.contains(input), "impossible");
+    return super;
+  };
+
+  InputType super1 = random_superset(input1);
+  InputType super2 = random_superset(input2);
+  ASSERT_TRUE(infer(super1, input2).contains(result));
+  ASSERT_TRUE(infer(input1, super2).contains(result));
+  ASSERT_TRUE(infer(super1, super2).contains(result));
+}
+
+// Verify the correctness and monotonicity of an inference function by exhautively analyzing all
+// instances of InputType
+template <class InputType, class Operation, class Inference>
+static void test_binary_exhaustive(Operation op, Inference infer) {
+  for (const InputType& input1 : all_instances<InputType>()) {
+    for (const InputType& input2 : all_instances<InputType>()) {
+      test_binary_instance_correctness_exhaustive(op, infer, input1, input2);
+      if (all_instances<InputType>().size() < 100) {
+        // This effectively covers the cases up to uintn_t<2>
+        test_binary_instance_monotonicity_exhaustive(infer, input1, input2);
+      } else {
+        // This effectively covers the cases of uintn_t<3>
+        test_binary_instance_monotonicity_samples(infer, input1, input2);
+      }
+    }
+  }
+}
+
+// Verify the correctness and monotonicity of an inference function by randomly sampling instances
+// of InputType
+template <class InputType, class Operation, class Inference>
+static void test_binary_random(Operation op, Inference infer) {
+  using S = std::remove_const_t<decltype(InputType::_lo)>;
+  using U = std::remove_const_t<decltype(InputType::_ulo)>;
+
+  constexpr size_t sample_count = 100;
+  InputType samples[sample_count];
+
+  // Fill with {0}
+  for (size_t i = 0; i < sample_count; i++) {
+    samples[i] = InputType::make(TypeIntPrototype<S, U>{{S(0), S(0)}, {U(0), U(0)}, {U(0), U(0)}}, 0);
+  }
+
+  // {1}
+  samples[1] = InputType::make(TypeIntPrototype<S, U>{{S(1), S(1)}, {U(1), U(1)}, {U(0), U(0)}}, 0);
+  // {-1}
+  samples[2] = InputType::make(TypeIntPrototype<S, U>{{S(-1), S(-1)}, {U(-1), U(-1)}, {U(0), U(0)}}, 0);
+  // {0, 1}
+  samples[3] = InputType::make(TypeIntPrototype<S, U>{{S(0), S(1)}, {U(0), U(1)}, {U(0), U(0)}}, 0);
+  // {-1, 0, 1}
+  samples[4] = InputType::make(TypeIntPrototype<S, U>{{S(-1), S(1)}, {U(0), U(-1)}, {U(0), U(0)}}, 0);
+  // {-1, 1}
+  samples[5] = InputType::make(TypeIntPrototype<S, U>{{S(-1), S(1)}, {U(1), U(-1)}, {U(0), U(0)}}, 0);
+  // {0, 1, 2}
+  samples[6] = InputType::make(TypeIntPrototype<S, U>{{S(0), S(2)}, {U(0), U(2)}, {U(0), U(0)}}, 0);
+  // {0, 2}
+  samples[7] = InputType::make(TypeIntPrototype<S, U>{{S(0), S(2)}, {U(0), U(2)}, {U(1), U(0)}}, 0);
+  // [min_signed, max_signed]
+  samples[8] = InputType::make(TypeIntPrototype<S, U>{{std::numeric_limits<S>::min(), std::numeric_limits<S>::max()}, {U(0), U(-1)}, {U(0), U(0)}}, 0);
+  // [0, max_signed]
+  samples[9] = InputType::make(TypeIntPrototype<S, U>{{S(0), std::numeric_limits<S>::max()}, {U(0), U(-1)}, {U(0), U(0)}}, 0);
+  // [min_signed, 0)
+  samples[10] = InputType::make(TypeIntPrototype<S, U>{{std::numeric_limits<S>::min(), S(-1)}, {U(0), U(-1)}, {U(0), U(0)}}, 0);
+
+  constexpr size_t max_tries = 1000;
+  constexpr size_t start_random_idx = 11;
+  for (size_t tries = 0, idx = start_random_idx; tries < max_tries && idx < sample_count; tries++) {
+    // Try to have lo < hi
+    S signed_bound1 = S(uniform_random<U>());
+    S signed_bound2 = S(uniform_random<U>());
+    S lo = MIN2(signed_bound1, signed_bound2);
+    S hi = MAX2(signed_bound1, signed_bound2);
+
+    // Try to have ulo < uhi
+    U unsigned_bound1 = uniform_random<U>();
+    U unsigned_bound2 = uniform_random<U>();
+    U ulo = MIN2(unsigned_bound1, unsigned_bound2);
+    U uhi = MAX2(unsigned_bound1, unsigned_bound2);
+
+    // Try to have (zeros & ones) == 0
+    U zeros = uniform_random<U>();
+    U ones = uniform_random<U>();
+    U common = zeros & ones;
+    zeros = zeros ^ common;
+    ones = ones ^ common;
+
+    TypeIntPrototype<S, U> t{{lo, hi}, {ulo, uhi}, {zeros, ones}};
+    auto canonicalized_t = t.canonicalize_constraints();
+    if (canonicalized_t.empty()) {
+      continue;
+    }
+
+    samples[idx] = TypeIntMirror<S, U>{canonicalized_t._data._srange._lo, canonicalized_t._data._srange._hi,
+                                       canonicalized_t._data._urange._lo, canonicalized_t._data._urange._hi,
+                                       canonicalized_t._data._bits};
+    idx++;
+  }
+
+  for (size_t i = 0; i < sample_count; i++) {
+    for (size_t j = 0; j < sample_count; j++) {
+      test_binary_instance_correctness_samples(op, infer, samples[i], samples[j]);
+      test_binary_instance_monotonicity_samples(infer, samples[i], samples[j]);
+    }
+  }
+}
+
+template <template <class U> class Operation, template <class CTP> class Inference>
+static void test_binary() {
+  test_binary_exhaustive<TypeIntMirror<intn_t<1>, uintn_t<1>>>(Operation<uintn_t<1>>(), Inference<TypeIntMirror<intn_t<1>, uintn_t<1>>>());
+  test_binary_exhaustive<TypeIntMirror<intn_t<2>, uintn_t<2>>>(Operation<uintn_t<2>>(), Inference<TypeIntMirror<intn_t<2>, uintn_t<2>>>());
+  test_binary_exhaustive<TypeIntMirror<intn_t<3>, uintn_t<3>>>(Operation<uintn_t<3>>(), Inference<TypeIntMirror<intn_t<3>, uintn_t<3>>>());
+  test_binary_random<TypeIntMirror<intn_t<4>, uintn_t<4>>>(Operation<uintn_t<4>>(), Inference<TypeIntMirror<intn_t<4>, uintn_t<4>>>());
+  test_binary_random<TypeIntMirror<intn_t<5>, uintn_t<5>>>(Operation<uintn_t<5>>(), Inference<TypeIntMirror<intn_t<5>, uintn_t<5>>>());
+  test_binary_random<TypeIntMirror<intn_t<6>, uintn_t<6>>>(Operation<uintn_t<6>>(), Inference<TypeIntMirror<intn_t<6>, uintn_t<6>>>());
+  test_binary_random<TypeIntMirror<jint, juint>>(Operation<juint>(), Inference<TypeIntMirror<jint, juint>>());
+  test_binary_random<TypeIntMirror<jlong, julong>>(Operation<julong>(), Inference<TypeIntMirror<jlong, julong>>());
+}
+
+template <class U>
+class OpAnd {
+public:
+  U operator()(U v1, U v2) const {
+    return v1 & v2;
+  }
+};
+
+template <class CTP>
+class InferAnd {
+public:
+  CTP operator()(CTP t1, CTP t2) const {
+    return RangeInference::infer_and(t1, t2);
+  }
+};
+
+template <class U>
+class OpOr {
+public:
+  U operator()(U v1, U v2) const {
+    return v1 | v2;
+  }
+};
+
+template <class CTP>
+class InferOr {
+public:
+  CTP operator()(CTP t1, CTP t2) const {
+    return RangeInference::infer_or(t1, t2);
+  }
+};
+
+template <class U>
+class OpXor {
+public:
+  U operator()(U v1, U v2) const {
+    return v1 ^ v2;
+  }
+};
+
+template <class CTP>
+class InferXor {
+public:
+  CTP operator()(CTP t1, CTP t2) const {
+    return RangeInference::infer_xor(t1, t2);
+  }
+};
+
+TEST(opto, range_inference) {
+  test_binary<OpAnd, InferAnd>();
+  test_binary<OpOr, InferOr>();
+  test_binary<OpXor, InferXor>();
+}
diff --git a/test/hotspot/gtest/opto/test_xor_node.cpp b/test/hotspot/gtest/opto/test_xor_node.cpp
deleted file mode 100644
index ff21d9c4a90..00000000000
--- a/test/hotspot/gtest/opto/test_xor_node.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "unittest.hpp"
-#include "opto/utilities/xor.hpp"
-#include "utilities/globalDefinitions.hpp" // For jint, juint
-
-jint test_calc_max(const jint hi_0, const jint hi_1) {
-  return xor_upper_bound_for_ranges<jint, juint>(hi_0, hi_1);
-}
-
-jlong test_calc_max(const jlong hi_0, const jlong hi_1) {
-  return xor_upper_bound_for_ranges<jlong, julong>(hi_0, hi_1);
-}
-
-template <class S>
-void test_xor_bounds(S hi_0, S hi_1, S val_0, S val_1) {
-  ASSERT_GE(hi_0, 0);
-  ASSERT_GE(hi_1, 0);
-
-  // Skip out-of-bounds values for convenience
-  if (val_0 > hi_0 || val_0 < S(0) || val_1 > hi_1 || val_1 < S(0)) {
-    return;
-  }
-
-  S v = val_0 ^ val_1;
-  S max = test_calc_max(hi_0, hi_1);
-  EXPECT_LE(v, max);
-}
-
-template <class S>
-void test_sample_values(S hi_0, S hi_1) {
-  for (S i = 0; i <= 3; i++) {
-    for (S j = 0; j <= 3; j++) {
-      // Some bit combinations near the low and high ends of the range
-      test_xor_bounds(hi_0, hi_1, i, j);
-      test_xor_bounds(hi_0, hi_1, hi_0 - i, hi_1 - j);
-    }
-  }
-}
-
-template <class S>
-void test_in_ranges(S lo, S hi){
-  ASSERT_GE(lo, 0);
-  ASSERT_LE(lo, hi);
-
-  for (S hi_0 = lo; hi_0 <= hi; hi_0++) {
-    for (S hi_1 = hi_0; hi_1 <=hi; hi_1++) {
-      test_sample_values(hi_0, hi_1);
-    }
-  }
-}
-
-template <class S>
-void test_exhaustive(S limit) {
-  for (S hi_0 = 0; hi_0 <= limit; hi_0++) {
-    for (S hi_1 = hi_0; hi_1 <= limit; hi_1++) {
-      for (S val_0 = 0; val_0 <= hi_0; val_0++) {
-        for (S val_1 = val_0; val_1 <= hi_1; val_1++) {
-          test_xor_bounds(hi_0, hi_1, val_0, val_1);
-        }
-      }
-    }
-  }
-}
-
-template <class S>
-void exec_tests() {
-  S top_bit = max_power_of_2<S>();
-  S prev_bit = top_bit >> 1;
-
-  test_exhaustive<S>(15);
-
-  test_in_ranges<S>(top_bit - 1, top_bit);
-  test_in_ranges<S>(prev_bit - 1, prev_bit);
-}
-
-TEST_VM(opto, xor_max) {
-  exec_tests<jint>();
-  exec_tests<jlong>();
-}
diff --git a/test/hotspot/gtest/runtime/test_arguments.cpp b/test/hotspot/gtest/runtime/test_arguments.cpp
index 074636fea0d..17404f45be2 100644
--- a/test/hotspot/gtest/runtime/test_arguments.cpp
+++ b/test/hotspot/gtest/runtime/test_arguments.cpp
@@ -24,6 +24,7 @@
 #include "jvm.h"
 #include "runtime/arguments.hpp"
 #include "runtime/flags/jvmFlag.hpp"
+#include "runtime/os.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
diff --git a/test/hotspot/gtest/runtime/test_classPrinter.cpp b/test/hotspot/gtest/runtime/test_classPrinter.cpp
index b13713d7232..9b6d47f09bc 100644
--- a/test/hotspot/gtest/runtime/test_classPrinter.cpp
+++ b/test/hotspot/gtest/runtime/test_classPrinter.cpp
@@ -28,6 +28,7 @@
 #include "utilities/ostream.hpp"
 #include "unittest.hpp"
 
+using testing::ContainsRegex;
 using testing::HasSubstr;
 
 TEST_VM(ClassPrinter, print_classes) {
@@ -35,13 +36,31 @@ TEST_VM(ClassPrinter, print_classes) {
   ThreadInVMfromNative invm(THREAD);
   ResourceMark rm;
 
-  stringStream ss;
-  ClassPrinter::print_classes("java/lang/Object", 0x03, &ss);
-  const char* output = ss.freeze();
+  stringStream s1;
+  ClassPrinter::print_classes("java/lang/Object", 0x03, &s1);
+  const char* o1 = s1.freeze();
 
-  ASSERT_THAT(output, HasSubstr("class java/lang/Object loader data:")) << "must find java/lang/Object";
-  ASSERT_THAT(output, HasSubstr("method wait : (J)V")) << "must find java/lang/Object::wait";
-  ASSERT_THAT(output, HasSubstr("method finalize : ()V\n   0 return")) << "must find java/lang/Object::finalize and disasm";
+  ASSERT_THAT(o1, HasSubstr("class: java/lang/Object mirror:")) << "must find java/lang/Object";
+  ASSERT_THAT(o1, HasSubstr("method wait : (J)V")) << "must find java/lang/Object::wait";
+  ASSERT_THAT(o1, HasSubstr("method finalize : ()V\n   0 return")) << "must find java/lang/Object::finalize and disasm";
+
+  // "." should also work as separator in class name
+  stringStream s2;
+  ClassPrinter::print_classes("java.lang.Object", 0x03, &s2);
+  const char* o2 = s2.freeze();
+  ASSERT_THAT(o2, HasSubstr("class: java/lang/Object mirror:")) << "must find java/lang/Object";
+
+  // 0x20 is PRINT_CLASS_DETAILS
+  stringStream s3;
+  ClassPrinter::print_classes("java.lang.Integer", 0x20, &s3);
+  const char* o3 = s3.freeze();
+  ASSERT_THAT(o3, HasSubstr("class: java/lang/Integer mirror:")) << "must find java/lang/Integer";
+  ASSERT_THAT(o3, HasSubstr("InstanceKlass: java.lang.Integer {0x")) << "must print InstanceKlass";
+  ASSERT_THAT(o3, HasSubstr("Java mirror oop for java/lang/Integer:")) << "must print mirror oop";
+#if GTEST_USES_POSIX_RE
+  // Complex regex not available on Windows
+  ASSERT_THAT(o3, ContainsRegex("public static final 'MIN_VALUE' 'I'.* -2147483648 [(]0x80000000[)]")) << "must print static fields";
+#endif
 }
 
 TEST_VM(ClassPrinter, print_methods) {
@@ -52,7 +71,7 @@ TEST_VM(ClassPrinter, print_methods) {
   stringStream s1;
   ClassPrinter::print_methods("*ang/Object*", "wait", 0x1, &s1);
   const char* o1 = s1.freeze();
-  ASSERT_THAT(o1, HasSubstr("class java/lang/Object loader data:")) << "must find java/lang/Object";
+  ASSERT_THAT(o1, HasSubstr("class: java/lang/Object mirror:")) << "must find java/lang/Object";
   ASSERT_THAT(o1, HasSubstr("method wait : (J)V")) << "must find java/lang/Object::wait(long)";
   ASSERT_THAT(o1, HasSubstr("method wait : ()V")) << "must find java/lang/Object::wait()";
   ASSERT_THAT(o1, Not(HasSubstr("method finalize : ()V"))) << "must not find java/lang/Object::finalize";
@@ -60,8 +79,34 @@ TEST_VM(ClassPrinter, print_methods) {
   stringStream s2;
   ClassPrinter::print_methods("j*ang/Object*", "wait:(*J*)V", 0x1, &s2);
   const char* o2 = s2.freeze();
-  ASSERT_THAT(o2, HasSubstr("class java/lang/Object loader data:")) << "must find java/lang/Object";
+  ASSERT_THAT(o2, HasSubstr("class: java/lang/Object mirror:")) << "must find java/lang/Object";
   ASSERT_THAT(o2, HasSubstr("method wait : (J)V")) << "must find java/lang/Object::wait(long)";
   ASSERT_THAT(o2, HasSubstr("method wait : (JI)V")) << "must find java/lang/Object::wait(long,int)";
   ASSERT_THAT(o2, Not(HasSubstr("method wait : ()V"))) << "must not find java/lang/Object::wait()";
+
+  // 0x02 is PRINT_BYTECODE
+  // 0x04 is PRINT_BYTECODE_ADDRESS
+  // 0x40 is PRINT_METHOD_DETAILS
+  stringStream s3;
+  ClassPrinter::print_methods("java.lang.Object", "wait:()V", 0x46, &s3);
+  const char* o3 = s3.freeze();
+  ASSERT_THAT(o3, HasSubstr("method wait : ()V")) << "must find java/lang/Object::wait()";
+
+#ifndef PRODUCT
+  // PRINT_METHOD_DETAILS -- available only in debug builds
+  ASSERT_THAT(o3, HasSubstr("{method}")) << "must print Method metadata";
+#if GTEST_USES_POSIX_RE
+  // Complex regex not available on Windows
+  ASSERT_THAT(o3, ContainsRegex("method holder:.*'java/lang/Object'")) << "must print Method metadata details";
+  ASSERT_THAT(o3, ContainsRegex("name: *'wait'")) << "must print Method metadata details";
+#endif
+#endif
+
+#if GTEST_USES_POSIX_RE
+  // Bytecodes: we should have at least one 'return' bytecide for Object.wait()
+  // The print out should look like this:
+  // 0x000000004adf73ad    5 return
+  ASSERT_THAT(o3, ContainsRegex("0x[0-9a-f]+ +[0-9]+ +return")) << "must print return bytecode";
+#endif
+
 }
diff --git a/test/hotspot/gtest/utilities/test_concurrentHashtable.cpp b/test/hotspot/gtest/utilities/test_concurrentHashtable.cpp
index 775f0e17409..77055e92256 100644
--- a/test/hotspot/gtest/utilities/test_concurrentHashtable.cpp
+++ b/test/hotspot/gtest/utilities/test_concurrentHashtable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  */
 
 #include "gc/shared/workerThread.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/mutex.hpp"
 #include "runtime/os.hpp"
 #include "runtime/semaphore.hpp"
@@ -1169,12 +1170,12 @@ TEST_VM(ConcurrentHashTable, concurrent_mt_bulk_delete) {
 class CHTParallelScanTask: public WorkerTask {
   TestTable* _cht;
   TestTable::ScanTask* _scan_task;
-  size_t *_total_scanned;
+  Atomic<size_t>* _total_scanned;
 
 public:
   CHTParallelScanTask(TestTable* cht,
                       TestTable::ScanTask* bc,
-                      size_t *total_scanned) :
+                      Atomic<size_t>* total_scanned) :
     WorkerTask("CHT Parallel Scan"),
     _cht(cht),
     _scan_task(bc),
@@ -1184,7 +1185,7 @@ public:
   void work(uint worker_id) {
     ChtCountScan par_scan;
     _scan_task->do_safepoint_scan(par_scan);
-    AtomicAccess::add(_total_scanned, par_scan._count);
+    _total_scanned->add_then_fetch(par_scan._count);
   }
 };
 
@@ -1217,13 +1218,14 @@ public:
   {}
 
   void doit() {
-    size_t total_scanned = 0;
+    Atomic<size_t> total_scanned{0};
     TestTable::ScanTask scan_task(_cht, 64);
 
     CHTParallelScanTask task(_cht, &scan_task, &total_scanned);
     CHTWorkers::run_task(&task);
 
-     EXPECT_TRUE(total_scanned == (size_t)_num_items) << " Should scan all inserted items: " << total_scanned;
+    EXPECT_TRUE(total_scanned.load_relaxed() == (size_t)_num_items)
+        << " Should scan all inserted items: " << total_scanned.load_relaxed();
   }
 };
 
diff --git a/test/hotspot/gtest/utilities/test_globalCounter_nested.cpp b/test/hotspot/gtest/utilities/test_globalCounter_nested.cpp
index f5cd67d39f0..d7a824deed3 100644
--- a/test/hotspot/gtest/utilities/test_globalCounter_nested.cpp
+++ b/test/hotspot/gtest/utilities/test_globalCounter_nested.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "utilities/globalCounter.inline.hpp"
 #include "utilities/spinYield.hpp"
@@ -39,8 +39,8 @@ enum NestedTestState {
 };
 
 class RCUNestedThread : public JavaTestThread {
-  volatile NestedTestState _state;
-  volatile bool _proceed;
+  Atomic<NestedTestState> _state;
+  Atomic<bool> _proceed;
 
 protected:
   RCUNestedThread(Semaphore* post) :
@@ -52,21 +52,21 @@ protected:
   ~RCUNestedThread() {}
 
   void set_state(NestedTestState new_state) {
-    AtomicAccess::release_store(&_state, new_state);
+    _state.release_store(new_state);
   }
 
   void wait_with_state(NestedTestState new_state) {
     SpinYield spinner;
-    AtomicAccess::release_store(&_state, new_state);
-    while (!AtomicAccess::load_acquire(&_proceed)) {
+    _state.release_store(new_state);
+    while (!_proceed.load_acquire()) {
       spinner.wait();
     }
-    AtomicAccess::release_store(&_proceed, false);
+    _proceed.release_store(false);
   }
 
 public:
   NestedTestState state() const {
-    return AtomicAccess::load_acquire(&_state);
+    return _state.load_acquire();
   }
 
   void wait_for_state(NestedTestState goal) {
@@ -77,7 +77,7 @@ public:
   }
 
   void proceed() {
-    AtomicAccess::release_store(&_proceed, true);
+    _proceed.release_store(true);
   }
 };
 
diff --git a/test/hotspot/gtest/utilities/test_singleWriterSynchronizer.cpp b/test/hotspot/gtest/utilities/test_singleWriterSynchronizer.cpp
index 323908ebd12..744001f0867 100644
--- a/test/hotspot/gtest/utilities/test_singleWriterSynchronizer.cpp
+++ b/test/hotspot/gtest/utilities/test_singleWriterSynchronizer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  *
  */
 
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/os.hpp"
 #include "runtime/thread.hpp"
@@ -36,16 +36,16 @@
 
 class SingleWriterSynchronizerTestReader : public JavaTestThread {
   SingleWriterSynchronizer* _synchronizer;
-  volatile uintx* _synchronized_value;
-  volatile int* _continue_running;
+  Atomic<uintx>* _synchronized_value;
+  Atomic<int>* _continue_running;
 
   static const uint reader_iterations = 10;
 
 public:
   SingleWriterSynchronizerTestReader(Semaphore* post,
                                      SingleWriterSynchronizer* synchronizer,
-                                     volatile uintx* synchronized_value,
-                                     volatile int* continue_running) :
+                                     Atomic<uintx>* synchronized_value,
+                                     Atomic<int>* continue_running) :
     JavaTestThread(post),
     _synchronizer(synchronizer),
     _synchronized_value(synchronized_value),
@@ -55,14 +55,14 @@ public:
   virtual void main_run() {
     size_t iterations = 0;
     size_t values_changed = 0;
-    while (AtomicAccess::load_acquire(_continue_running) != 0) {
+    while (_continue_running->load_acquire() != 0) {
       { ThreadBlockInVM tbiv(this); } // Safepoint check outside critical section.
       ++iterations;
       SingleWriterSynchronizer::CriticalSection cs(_synchronizer);
-      uintx value = AtomicAccess::load_acquire(_synchronized_value);
+      uintx value = _synchronized_value->load_acquire();
       uintx new_value = value;
       for (uint i = 0; i < reader_iterations; ++i) {
-        new_value = AtomicAccess::load_acquire(_synchronized_value);
+        new_value = _synchronized_value->load_acquire();
         // A reader can see either the value it first read after
         // entering the critical section, or that value + 1.  No other
         // values are possible.
@@ -81,14 +81,14 @@ public:
 
 class SingleWriterSynchronizerTestWriter : public JavaTestThread {
   SingleWriterSynchronizer* _synchronizer;
-  volatile uintx* _synchronized_value;
-  volatile int* _continue_running;
+  Atomic<uintx>* _synchronized_value;
+  Atomic<int>* _continue_running;
 
 public:
   SingleWriterSynchronizerTestWriter(Semaphore* post,
                                      SingleWriterSynchronizer* synchronizer,
-                                     volatile uintx* synchronized_value,
-                                     volatile int* continue_running) :
+                                     Atomic<uintx>* synchronized_value,
+                                     Atomic<int>* continue_running) :
     JavaTestThread(post),
     _synchronizer(synchronizer),
     _synchronized_value(synchronized_value),
@@ -96,12 +96,12 @@ public:
   {}
 
   virtual void main_run() {
-    while (AtomicAccess::load_acquire(_continue_running) != 0) {
-      ++*_synchronized_value;
+    while (_continue_running->load_acquire() != 0) {
+      _synchronized_value->add_then_fetch(1u, memory_order_relaxed);
       _synchronizer->synchronize();
       { ThreadBlockInVM tbiv(this); } // Safepoint check.
     }
-    tty->print_cr("writer iterations: %zu", *_synchronized_value);
+    tty->print_cr("writer iterations: %zu", _synchronized_value->load_relaxed());
   }
 };
 
@@ -111,8 +111,8 @@ const uint milliseconds_to_run = 1000;
 TEST_VM(TestSingleWriterSynchronizer, stress) {
   Semaphore post;
   SingleWriterSynchronizer synchronizer;
-  volatile uintx synchronized_value = 0;
-  volatile int continue_running = 1;
+  Atomic<uintx> synchronized_value{0};
+  Atomic<int> continue_running{1};
 
   JavaTestThread* readers[nreaders] = {};
   for (uint i = 0; i < nreaders; ++i) {
@@ -137,7 +137,7 @@ TEST_VM(TestSingleWriterSynchronizer, stress) {
     ThreadInVMfromNative invm(cur);
     cur->sleep(milliseconds_to_run);
   }
-  continue_running = 0;
+  continue_running.store_relaxed(0);
   for (uint i = 0; i < nreaders + 1; ++i) {
     post.wait();
   }
diff --git a/test/hotspot/gtest/utilities/test_waitBarrier.cpp b/test/hotspot/gtest/utilities/test_waitBarrier.cpp
index 0b4a9bd8d2e..b2e42348a74 100644
--- a/test/hotspot/gtest/utilities/test_waitBarrier.cpp
+++ b/test/hotspot/gtest/utilities/test_waitBarrier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,23 +21,23 @@
  * questions.
  */
 
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "utilities/spinYield.hpp"
 #include "utilities/waitBarrier.hpp"
 #include "threadHelper.inline.hpp"
 
-static volatile int wait_tag = 0;
-static volatile int valid_value = 0;
+static Atomic<int> wait_tag{0};
+static Atomic<int> valid_value{0};
 
 template <typename WaitBarrierImpl>
 class WBThread : public JavaTestThread {
 public:
-  static volatile bool _exit;
+  static Atomic<bool> _exit;
   WaitBarrierType<WaitBarrierImpl>* _wait_barrier;
   Semaphore* _wrt_start;
-  volatile int _on_barrier;
+  Atomic<int> _on_barrier;
 
   WBThread(Semaphore* post, WaitBarrierType<WaitBarrierImpl>* wb, Semaphore* wrt_start)
     : JavaTestThread(post), _wait_barrier(wb), _wrt_start(wrt_start) {};
@@ -46,12 +46,12 @@ public:
     _wrt_start->signal();
     int vv, tag;
     // Similar to how a JavaThread would stop in a safepoint.
-    while (!_exit) {
+    while (!_exit.load_relaxed()) {
       // Load the published tag.
-      tag = AtomicAccess::load_acquire(&wait_tag);
+      tag = wait_tag.load_acquire();
       // Publish the tag this thread is going to wait for.
-      AtomicAccess::release_store(&_on_barrier, tag);
-      if (_on_barrier == 0) {
+      _on_barrier.release_store(tag);
+      if (_on_barrier.load_relaxed() == 0) {
         SpinPause();
         continue;
       }
@@ -59,15 +59,15 @@ public:
       // Wait until we are woken.
       _wait_barrier->wait(tag);
       // Verify that we do not see an invalid value.
-      vv = AtomicAccess::load_acquire(&valid_value);
+      vv = valid_value.load_acquire();
       ASSERT_EQ((vv & 0x1), 0);
-      AtomicAccess::release_store(&_on_barrier, 0);
+      _on_barrier.release_store(0);
     }
   }
 };
 
 template <typename WaitBarrierImpl>
-volatile bool WBThread<WaitBarrierImpl>::_exit = false;
+Atomic<bool> WBThread<WaitBarrierImpl>::_exit{false};
 
 template <typename WaitBarrierImpl>
 class WBArmerThread : public JavaTestThread {
@@ -103,35 +103,35 @@ public:
       // Arm next tag.
       wb.arm(next_tag);
       // Publish tag.
-      AtomicAccess::release_store_fence(&wait_tag, next_tag);
+      wait_tag.release_store_fence(next_tag);
 
       // Wait until threads picked up new tag.
-      while (reader1->_on_barrier != wait_tag ||
-             reader2->_on_barrier != wait_tag ||
-             reader3->_on_barrier != wait_tag ||
-             reader4->_on_barrier != wait_tag) {
+      while (reader1->_on_barrier.load_relaxed() != wait_tag.load_relaxed() ||
+             reader2->_on_barrier.load_relaxed() != wait_tag.load_relaxed() ||
+             reader3->_on_barrier.load_relaxed() != wait_tag.load_relaxed() ||
+             reader4->_on_barrier.load_relaxed() != wait_tag.load_relaxed()) {
         SpinPause();
       }
 
       // Set an invalid value.
-      AtomicAccess::release_store(&valid_value, valid_value + 1); // odd
+      valid_value.release_store(valid_value.load_relaxed() + 1); // odd
       os::naked_yield();
       // Set a valid value.
-      AtomicAccess::release_store(&valid_value, valid_value + 1); // even
+      valid_value.release_store(valid_value.load_relaxed() + 1); // even
       // Publish inactive tag.
-      AtomicAccess::release_store_fence(&wait_tag, 0); // Stores in WB must not float up.
+      wait_tag.release_store_fence(0); // Stores in WB must not float up.
       wb.disarm();
 
       // Wait until threads done valid_value verification.
-      while (reader1->_on_barrier != 0 ||
-             reader2->_on_barrier != 0 ||
-             reader3->_on_barrier != 0 ||
-             reader4->_on_barrier != 0) {
+      while (reader1->_on_barrier.load_relaxed() != 0 ||
+             reader2->_on_barrier.load_relaxed() != 0 ||
+             reader3->_on_barrier.load_relaxed() != 0 ||
+             reader4->_on_barrier.load_relaxed() != 0) {
         SpinPause();
       }
       ++next_tag;
     }
-    WBThread<WaitBarrierImpl>::_exit = true;
+    WBThread<WaitBarrierImpl>::_exit.store_relaxed(true);
     for (int i = 0; i < NUMBER_OF_READERS; i++) {
       post.wait();
     }
@@ -139,13 +139,13 @@ public:
 };
 
 TEST_VM(WaitBarrier, default_wb) {
-  WBThread<WaitBarrierDefault>::_exit = false;
+  WBThread<WaitBarrierDefault>::_exit.store_relaxed(false);
   mt_test_doer<WBArmerThread<WaitBarrierDefault> >();
 }
 
 #if defined(LINUX)
 TEST_VM(WaitBarrier, generic_wb) {
-  WBThread<GenericWaitBarrier>::_exit = false;
+  WBThread<GenericWaitBarrier>::_exit.store_relaxed(false);
   mt_test_doer<WBArmerThread<GenericWaitBarrier> >();
 }
 #endif
diff --git a/test/hotspot/gtest/x86/x86-asmtest.py b/test/hotspot/gtest/x86/x86-asmtest.py
index 714b7aaea40..6544e30579f 100644
--- a/test/hotspot/gtest/x86/x86-asmtest.py
+++ b/test/hotspot/gtest/x86/x86-asmtest.py
@@ -172,10 +172,10 @@ class NFInstruction(Instruction):
     def __init__(self, name, aname, no_flag):
         super().__init__(name, aname)
         self.no_flag = no_flag
-    
+
     def cstr(self):
         return f'__ {self._name}(' + ', '.join([op.cstr() for op in self.operands]) + (f', {str(self.no_flag).lower()}' if self.no_flag is not None else '') + ');'
-    
+
     def astr(self):
         # JDK assembler uses 'cl' for shift instructions with one operand by default
         cl_str = (', cl' if self._name in shift_rot_ops and len(self.operands) == 2 else '')
@@ -305,10 +305,10 @@ class CondRegRegRegInstruction(Instruction):
         self.cond = cond
         self.generate_operands(self.reg1, self.reg2, self.reg3)
         self.demote = True
-    
+
     def cstr(self):
         return f'__ {self._name} (' + 'Assembler::Condition::' + self.cond + ', ' + ', '.join([reg.cstr() for reg in self.operands]) + ');'
-    
+
     def astr(self):
         operands = self.operands
         if self.demote:
@@ -326,10 +326,10 @@ class CondRegRegMemInstruction(Instruction):
         self.cond = cond
         self.generate_operands(self.reg1, self.reg2, self.mem)
         self.demote = True
-    
+
     def cstr(self):
         return f'__ {self._name} (' + 'Assembler::Condition::' + self.cond + ', ' + ', '.join([reg.cstr() for reg in self.operands]) + ');'
-    
+
     def astr(self):
         operands = self.operands
         if self.demote:
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 177c14da785..4e16e328ab4 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -49,6 +49,7 @@ compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java 8190680 generic-all
 
 compiler/runtime/Test8168712.java#with-dtrace 8211769,8211771 generic-ppc64,generic-ppc64le,linux-s390x
 compiler/runtime/Test8168712.java#without-dtrace 8211769,8211771 generic-ppc64,generic-ppc64le,linux-s390x
+compiler/runtime/Test7196199.java 8365196 windows-x64
 
 compiler/c2/Test8004741.java 8235801 generic-all
 compiler/c2/irTests/TestDuplicateBackedge.java 8318904 generic-all
diff --git a/test/hotspot/jtreg/TEST.ROOT b/test/hotspot/jtreg/TEST.ROOT
index c298a74dc25..0fdbdae9bc5 100644
--- a/test/hotspot/jtreg/TEST.ROOT
+++ b/test/hotspot/jtreg/TEST.ROOT
@@ -101,6 +101,7 @@ requires.properties= \
     container.support \
     systemd.support \
     jdk.containerized \
+    jdk.explodedImage \
     jlink.runtime.linkable \
     jlink.packagedModules \
     jdk.static
diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index d4f1470aea5..32cff812975 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -132,13 +132,6 @@ tier1_loom_serviceability = \
 hotspot_loom = \
   :tier1_loom
 
-serviceability_ttf_virtual = \
-  serviceability/ \
-  -serviceability/jvmti/vthread \
-  -serviceability/jvmti/thread  \
-  -serviceability/jvmti/events  \
-  -serviceability/jvmti/negative
-
 tier1_common = \
   sources \
   sanity/BasicVMTest.java \
@@ -522,6 +515,7 @@ hotspot_aot_classlinking = \
  -runtime/cds/appcds/aotFlags \
  -runtime/cds/appcds/aotProfile \
  -runtime/cds/appcds/BadBSM.java \
+ -runtime/cds/appcds/cacheObject/ArchiveHeapTestClass.java \
  -runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java \
  -runtime/cds/appcds/cacheObject/ArchivedModuleCompareTest.java \
  -runtime/cds/appcds/CDSandJFR.java \
diff --git a/test/hotspot/jtreg/TEST.quick-groups b/test/hotspot/jtreg/TEST.quick-groups
index 32af8486b0f..b9f517c3edf 100644
--- a/test/hotspot/jtreg/TEST.quick-groups
+++ b/test/hotspot/jtreg/TEST.quick-groups
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/applications/jcstress/TestGenerator.java b/test/hotspot/jtreg/applications/jcstress/TestGenerator.java
index b6b22e2ebdb..215aaf18dd3 100644
--- a/test/hotspot/jtreg/applications/jcstress/TestGenerator.java
+++ b/test/hotspot/jtreg/applications/jcstress/TestGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/arguments/TestSpecTrapLimitExtraEntries.java b/test/hotspot/jtreg/compiler/arguments/TestSpecTrapLimitExtraEntries.java
new file mode 100644
index 00000000000..83fd16ed0d9
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/arguments/TestSpecTrapLimitExtraEntries.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8364490
+ * @summary "Hello world" sanity test for SpecTrapLimitExtraEntries
+ *
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:SpecTrapLimitExtraEntries=0 compiler.arguments.TestSpecTrapLimitExtraEntries
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:SpecTrapLimitExtraEntries=100 compiler.arguments.TestSpecTrapLimitExtraEntries
+ */
+
+package compiler.arguments;
+
+public class TestSpecTrapLimitExtraEntries {
+
+    public static void main(String[] args) {
+        System.out.println("Passed");
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c1/TestCITimeCountLinearScan.java b/test/hotspot/jtreg/compiler/c1/TestCITimeCountLinearScan.java
new file mode 100644
index 00000000000..e67a3679758
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c1/TestCITimeCountLinearScan.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8374518
+ * @summary Sanity check the flag -XX:+CITime and -XX:+CountLinearScan
+ * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+CITime -XX:+CountLinearScan ${test.main.class}
+ */
+
+package compiler.c1;
+
+public class TestCITimeCountLinearScan {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/Test7005594.java b/test/hotspot/jtreg/compiler/c2/Test7005594.java
index 005bc12142e..18df477dcab 100644
--- a/test/hotspot/jtreg/compiler/c2/Test7005594.java
+++ b/test/hotspot/jtreg/compiler/c2/Test7005594.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/c2/TestMergeStores.java b/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
index 84329c4a9c8..5e6a757dd5f 100644
--- a/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
+++ b/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
@@ -34,6 +34,7 @@ import java.util.Random;
 /*
  * @test
  * @bug 8318446 8331054 8331311 8335392 8347405
+ * @key randomness
  * @summary Test merging of consecutive stores
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /
@@ -43,6 +44,7 @@ import java.util.Random;
 /*
  * @test
  * @bug 8318446 8331054 8331311 8335392 8347405
+ * @key randomness
  * @summary Test merging of consecutive stores
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /
@@ -52,6 +54,7 @@ import java.util.Random;
 /*
  * @test
  * @bug 8318446 8331054 8331311 8335392 8348959 8351414
+ * @key randomness
  * @summary Test merging of consecutive stores
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /
diff --git a/test/hotspot/jtreg/compiler/c2/TestMergeStoresMemorySegment.java b/test/hotspot/jtreg/compiler/c2/TestMergeStoresMemorySegment.java
index a5302d1b515..a275570747b 100644
--- a/test/hotspot/jtreg/compiler/c2/TestMergeStoresMemorySegment.java
+++ b/test/hotspot/jtreg/compiler/c2/TestMergeStoresMemorySegment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@ import java.lang.foreign.*;
 /*
  * @test id=byte-array
  * @bug 8335392
+ * @key randomness
  * @summary Test MergeStores optimization for MemorySegment
  * @library /test/lib /
  * @run driver compiler.c2.TestMergeStoresMemorySegment ByteArray
@@ -42,6 +43,7 @@ import java.lang.foreign.*;
 /*
  * @test id=char-array
  * @bug 8335392
+ * @key randomness
  * @summary Test MergeStores optimization for MemorySegment
  * @library /test/lib /
  * @run driver compiler.c2.TestMergeStoresMemorySegment CharArray
@@ -50,6 +52,7 @@ import java.lang.foreign.*;
 /*
  * @test id=short-array
  * @bug 8335392
+ * @key randomness
  * @summary Test MergeStores optimization for MemorySegment
  * @library /test/lib /
  * @run driver compiler.c2.TestMergeStoresMemorySegment ShortArray
@@ -58,6 +61,7 @@ import java.lang.foreign.*;
 /*
  * @test id=int-array
  * @bug 8335392
+ * @key randomness
  * @summary Test MergeStores optimization for MemorySegment
  * @library /test/lib /
  * @run driver compiler.c2.TestMergeStoresMemorySegment IntArray
@@ -66,6 +70,7 @@ import java.lang.foreign.*;
 /*
  * @test id=long-array
  * @bug 8335392
+ * @key randomness
  * @summary Test MergeStores optimization for MemorySegment
  * @library /test/lib /
  * @run driver compiler.c2.TestMergeStoresMemorySegment LongArray
@@ -74,6 +79,7 @@ import java.lang.foreign.*;
 /*
  * @test id=float-array
  * @bug 8335392
+ * @key randomness
  * @summary Test MergeStores optimization for MemorySegment
  * @library /test/lib /
  * @run driver compiler.c2.TestMergeStoresMemorySegment FloatArray
@@ -82,6 +88,7 @@ import java.lang.foreign.*;
 /*
  * @test id=double-array
  * @bug 8335392
+ * @key randomness
  * @summary Test MergeStores optimization for MemorySegment
  * @library /test/lib /
  * @run driver compiler.c2.TestMergeStoresMemorySegment DoubleArray
@@ -90,6 +97,7 @@ import java.lang.foreign.*;
 /*
  * @test id=byte-buffer
  * @bug 8335392
+ * @key randomness
  * @summary Test MergeStores optimization for MemorySegment
  * @library /test/lib /
  * @run driver compiler.c2.TestMergeStoresMemorySegment ByteBuffer
@@ -98,6 +106,7 @@ import java.lang.foreign.*;
 /*
  * @test id=byte-buffer-direct
  * @bug 8335392
+ * @key randomness
  * @summary Test MergeStores optimization for MemorySegment
  * @library /test/lib /
  * @run driver compiler.c2.TestMergeStoresMemorySegment ByteBufferDirect
@@ -106,6 +115,7 @@ import java.lang.foreign.*;
 /*
  * @test id=native
  * @bug 8335392
+ * @key randomness
  * @summary Test MergeStores optimization for MemorySegment
  * @library /test/lib /
  * @run driver compiler.c2.TestMergeStoresMemorySegment Native
diff --git a/test/hotspot/jtreg/compiler/c2/TestMinMaxSubword.java b/test/hotspot/jtreg/compiler/c2/TestMinMaxSubword.java
index 955aa4058f0..a7e90353f90 100644
--- a/test/hotspot/jtreg/compiler/c2/TestMinMaxSubword.java
+++ b/test/hotspot/jtreg/compiler/c2/TestMinMaxSubword.java
@@ -31,6 +31,7 @@ import java.util.Random;
 /*
  * @test
  * @bug 8294816
+ * @key randomness
  * @summary Test Math.min/max vectorization miscompilation for integer subwords
  * @library /test/lib /
  * @requires vm.compiler2.enabled
diff --git a/test/hotspot/jtreg/compiler/c2/TestMismatchedAddPAfterMaxUnroll.java b/test/hotspot/jtreg/compiler/c2/TestMismatchedAddPAfterMaxUnroll.java
new file mode 100644
index 00000000000..2dcafd2cf6a
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestMismatchedAddPAfterMaxUnroll.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2025, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8351889
+ * @summary C2 crash: assertion failed: Base pointers must match (addp 344)
+ * @run main/othervm -XX:-BackgroundCompilation -XX:CompileOnly=TestMismatchedAddPAfterMaxUnroll::test1
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions -XX:-UseLoopPredicate
+ *                   -XX:+StressIGVN -XX:StressSeed=383593806 -XX:VerifyIterativeGVN=10000
+ *                   TestMismatchedAddPAfterMaxUnroll
+ * @run main/othervm -XX:-BackgroundCompilation -XX:CompileOnly=TestMismatchedAddPAfterMaxUnroll::test1
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions -XX:-UseLoopPredicate
+ *                   -XX:+StressIGVN  -XX:VerifyIterativeGVN=10000 TestMismatchedAddPAfterMaxUnroll
+ * @run main/othervm TestMismatchedAddPAfterMaxUnroll
+ */
+
+public class TestMismatchedAddPAfterMaxUnroll {
+    private static C[] arrayField = new C[4];
+
+    public static void main(String[] args) {
+        C c = new C();
+        Object lock = new Object();
+        for (int i = 0; i < 20_000; i++) {
+            arrayField[3] = null;
+            test1(3, c, arrayField, true, true, lock);
+            arrayField[3] = null;
+            test1(3, c, arrayField, true, false, lock);
+            arrayField[3] = null;
+            test1(3, c, arrayField, false, false, lock);
+            arrayField[3] = c;
+            test1(3, c, arrayField, false, false, lock);
+        }
+    }
+
+    static class C {
+
+    }
+
+    private static void test1(int j, C c, C[] otherArray, boolean flag, boolean flag2, Object lock) {
+        C[] array = arrayField;
+        int i = 0;
+        for (;;) {
+            synchronized (lock) {}
+            if (array[j] == null) {
+                break;
+            }
+            otherArray[i] = c;
+            i++;
+            if (i >= 3) {
+                return;
+            }
+        }
+        if (flag) {
+            if (flag2) {
+            }
+        }
+        array[j] = c;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndLoadKlass.java b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndLoadKlass.java
index 5514ac25eda..a8997535aae 100644
--- a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndLoadKlass.java
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndLoadKlass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNonExactAllocate.java b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNonExactAllocate.java
index 2f4485d2553..1146d189ce2 100644
--- a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNonExactAllocate.java
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNonExactAllocate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java
index 2a18520e026..e5df5499449 100644
--- a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/c2/TestReplaceNarrowPhiWithBottomPhi.java b/test/hotspot/jtreg/compiler/c2/TestReplaceNarrowPhiWithBottomPhi.java
new file mode 100644
index 00000000000..f01698c300f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestReplaceNarrowPhiWithBottomPhi.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2025 IBM Corporation. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8370200 8374195
+ * @requires (os.arch != "ppc64") & (os.arch != "ppc64le")
+ * @library /test/lib /
+ * @run driver ${test.main.class}
+ */
+
+package compiler.c2;
+
+import compiler.lib.ir_framework.*;
+import compiler.lib.ir_framework.Test;
+
+public class TestReplaceNarrowPhiWithBottomPhi {
+    private int field1;
+    private volatile int field2;
+
+    static public void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Test
+    @IR(counts = { IRNode.PHI, "2" })
+    public void test1() {
+        int j;
+        for (j = 0; j < 10; j++) {
+
+        }
+        inlined1(j);
+
+        // Initially, there are 2 memory Phis: one for bottom, one for field1. After loop opts, both
+        // Phis have the same inputs and the narrower Phi should be replaced by the bottom Phi.
+        for (int i = 1; i < 100; i *= 2) {
+            field2 = 42;
+        }
+    }
+
+    private void inlined1(int j) {
+        if (j == 42) {
+            field1 = 42;
+        }
+    }
+
+    @Run(test = "test1")
+    private void test1Runner() {
+        test1();
+        inlined1(42);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/TestVerifyIterativeGVN.java b/test/hotspot/jtreg/compiler/c2/TestVerifyIterativeGVN.java
index 83f3540226f..4b6215b25bd 100644
--- a/test/hotspot/jtreg/compiler/c2/TestVerifyIterativeGVN.java
+++ b/test/hotspot/jtreg/compiler/c2/TestVerifyIterativeGVN.java
@@ -23,11 +23,11 @@
 
 /*
  * @test
- * @bug 8238756
+ * @bug 8238756 8351889
  * @requires vm.debug == true & vm.flavor == "server"
- * @summary Run with -Xcomp to test -XX:VerifyIterativeGVN=1111 in debug builds.
+ * @summary Run with -Xcomp to test -XX:VerifyIterativeGVN=11111 in debug builds.
  *
- * @run main/othervm/timeout=300 -Xcomp -XX:VerifyIterativeGVN=1111 compiler.c2.TestVerifyIterativeGVN
+ * @run main/othervm/timeout=300 -Xcomp -XX:VerifyIterativeGVN=11111 compiler.c2.TestVerifyIterativeGVN
  */
 package compiler.c2;
 
diff --git a/test/hotspot/jtreg/compiler/c2/aarch64/TestFloat16Replicate.java b/test/hotspot/jtreg/compiler/c2/aarch64/TestFloat16Replicate.java
index ab7808a0401..6be4286d2a0 100644
--- a/test/hotspot/jtreg/compiler/c2/aarch64/TestFloat16Replicate.java
+++ b/test/hotspot/jtreg/compiler/c2/aarch64/TestFloat16Replicate.java
@@ -23,6 +23,7 @@
 /**
 * @test
 * @bug 8361582
+* @key randomness
 * @summary Ensure the correct backend replicate node is being generated for
 *          half precision float constants on >16B SVE machines
 * @modules jdk.incubator.vector
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestConditionalMove.java b/test/hotspot/jtreg/compiler/c2/cmove/TestConditionalMove.java
similarity index 95%
rename from test/hotspot/jtreg/compiler/c2/irTests/TestConditionalMove.java
rename to test/hotspot/jtreg/compiler/c2/cmove/TestConditionalMove.java
index c531f73b71d..91197322319 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestConditionalMove.java
+++ b/test/hotspot/jtreg/compiler/c2/cmove/TestConditionalMove.java
@@ -36,7 +36,7 @@ import jdk.test.lib.Utils;
  * @key randomness
  * @summary Auto-vectorization enhancement to support vector conditional move.
  * @library /test/lib /
- * @run driver compiler.c2.irTests.TestConditionalMove
+ * @run driver ${test.main.class}
  */
 
 public class TestConditionalMove {
@@ -601,7 +601,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveVFGT(float[] a, float[] b, float[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] > b[i]) ? a[i] : b[i];
@@ -619,7 +619,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveVFGTSwap(float[] a, float[] b, float[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (b[i] > a[i]) ? a[i] : b[i];
@@ -637,7 +637,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveVFLT(float[] a, float[] b, float[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] < b[i]) ? a[i] : b[i];
@@ -655,7 +655,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveVFLTSwap(float[] a, float[] b, float[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (b[i] < a[i]) ? a[i] : b[i];
@@ -673,7 +673,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveVFEQ(float[] a, float[] b, float[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] == b[i]) ? a[i] : b[i];
@@ -691,7 +691,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveVDLE(double[] a, double[] b, double[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] <= b[i]) ? a[i] : b[i];
@@ -709,7 +709,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveVDLESwap(double[] a, double[] b, double[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (b[i] <= a[i]) ? a[i] : b[i];
@@ -727,7 +727,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveVDGE(double[] a, double[] b, double[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] >= b[i]) ? a[i] : b[i];
@@ -745,7 +745,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveVDGESwap(double[] a, double[] b, double[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (b[i] >= a[i]) ? a[i] : b[i];
@@ -763,7 +763,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveVDNE(double[] a, double[] b, double[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] != b[i]) ? a[i] : b[i];
@@ -782,7 +782,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveFGTforFConst(float[] a, float[] b, float[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] > b[i]) ? 0.1f : -0.1f;
@@ -800,7 +800,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveFGEforFConst(float[] a, float[] b, float[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] >= b[i]) ? 0.1f : -0.1f;
@@ -818,7 +818,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveFLTforFConst(float[] a, float[] b, float[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] < b[i]) ? 0.1f : -0.1f;
@@ -836,7 +836,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveFLEforFConst(float[] a, float[] b, float[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] <= b[i]) ? 0.1f : -0.1f;
@@ -854,7 +854,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveFEQforFConst(float[] a, float[] b, float[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] == b[i]) ? 0.1f : -0.1f;
@@ -872,7 +872,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveFNEQforFConst(float[] a, float[] b, float[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] != b[i]) ? 0.1f : -0.1f;
@@ -896,7 +896,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveFLTforFConstH2(float[] a, float[] b, float[] c) {
         for (int i = 0; i < a.length; i+=2) {
             c[i+0] = (a[i+0] < b[i+0]) ? 0.1f : -0.1f;
@@ -925,7 +925,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveFLEforFConstH2(float[] a, float[] b, float[] c) {
         for (int i = 0; i < a.length; i+=2) {
             c[i+0] = (a[i+0] <= b[i+0]) ? 0.1f : -0.1f;
@@ -948,7 +948,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveFYYforFConstH2(float[] a, float[] b, float[] c) {
         for (int i = 0; i < a.length; i+=2) {
             c[i+0] = (a[i+0] <= b[i+0]) ? 0.1f : -0.1f;
@@ -967,7 +967,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveFXXforFConstH2(float[] a, float[] b, float[] c) {
         for (int i = 0; i < a.length; i+=2) {
             c[i+0] = (a[i+0] <  b[i+0]) ? 0.1f : -0.1f;
@@ -986,7 +986,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveDGTforDConst(double[] a, double[] b, double[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] > b[i]) ? 0.1 : -0.1;
@@ -1004,7 +1004,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveDGEforDConst(double[] a, double[] b, double[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] >= b[i]) ? 0.1 : -0.1;
@@ -1022,7 +1022,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveDLTforDConst(double[] a, double[] b, double[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] < b[i]) ? 0.1 : -0.1;
@@ -1040,7 +1040,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveDLEforDConst(double[] a, double[] b, double[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] <= b[i]) ? 0.1 : -0.1;
@@ -1058,7 +1058,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveDEQforDConst(double[] a, double[] b, double[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] == b[i]) ? 0.1 : -0.1;
@@ -1076,7 +1076,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveDNEQforDConst(double[] a, double[] b, double[] c) {
         for (int i = 0; i < a.length; i++) {
             c[i] = (a[i] != b[i]) ? 0.1 : -0.1;
@@ -1094,7 +1094,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveDLTforDConstH2(double[] a, double[] b, double[] c) {
         for (int i = 0; i < a.length; i+=2) {
             c[i+0] = (a[i+0] < b[i+0]) ? 0.1 : -0.1;
@@ -1113,7 +1113,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveDLEforDConstH2(double[] a, double[] b, double[] c) {
         for (int i = 0; i < a.length; i+=2) {
             c[i+0] = (a[i+0] <= b[i+0]) ? 0.1 : -0.1;
@@ -1132,7 +1132,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveDYYforDConstH2(double[] a, double[] b, double[] c) {
         for (int i = 0; i < a.length; i+=2) {
             c[i+0] = (a[i+0] <= b[i+0]) ? 0.1 : -0.1;
@@ -1151,7 +1151,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveDXXforDConstH2(double[] a, double[] b, double[] c) {
         for (int i = 0; i < a.length; i+=2) {
             c[i+0] = (a[i+0] <  b[i+0]) ? 0.1 : -0.1;
@@ -1351,7 +1351,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_I, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveIEQforF(int[] a, int[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -1373,7 +1373,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_I, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveINEforF(int[] a, int[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -1395,7 +1395,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_I, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveIGTforF(int[] a, int[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -1417,7 +1417,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_I, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveIGEforF(int[] a, int[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -1439,7 +1439,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_I, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveILTforF(int[] a, int[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -1461,7 +1461,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_I, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveILEforF(int[] a, int[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -1476,7 +1476,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_I, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveIEQforD(int[] a, int[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
             double cc = c[i];
@@ -1490,7 +1490,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_I, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveINEforD(int[] a, int[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
             double cc = c[i];
@@ -1504,7 +1504,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_I, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveIGTforD(int[] a, int[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
             double cc = c[i];
@@ -1518,7 +1518,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_I, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveIGEforD(int[] a, int[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
             double cc = c[i];
@@ -1532,7 +1532,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_I, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveILTforD(int[] a, int[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
             double cc = c[i];
@@ -1546,7 +1546,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_I, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveILEforD(int[] a, int[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
             double cc = c[i];
@@ -1731,7 +1731,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_L, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveLEQforF(long[] a, long[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -1745,7 +1745,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_L, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveLNEforF(long[] a, long[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -1759,7 +1759,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_L, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveLGTforF(long[] a, long[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -1773,7 +1773,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_L, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveLGEforF(long[] a, long[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -1787,7 +1787,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_L, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveLLTforF(long[] a, long[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -1801,7 +1801,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_L, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveLLEforF(long[] a, long[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -1824,7 +1824,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_L, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     // Requires avx2, else L is restricted to 16 byte, and D has 32. That leads to a vector elements mismatch of 2 to 4.
     private static void testCMoveLEQforD(long[] a, long[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
@@ -1847,7 +1847,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_L, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     // Requires avx2, else L is restricted to 16 byte, and D has 32. That leads to a vector elements mismatch of 2 to 4.
     private static void testCMoveLNEforD(long[] a, long[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
@@ -1870,7 +1870,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_L, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     // Requires avx2, else L is restricted to 16 byte, and D has 32. That leads to a vector elements mismatch of 2 to 4.
     private static void testCMoveLGTforD(long[] a, long[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
@@ -1893,7 +1893,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_L, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     // Requires avx2, else L is restricted to 16 byte, and D has 32. That leads to a vector elements mismatch of 2 to 4.
     private static void testCMoveLGEforD(long[] a, long[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
@@ -1916,7 +1916,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_L, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     // Requires avx2, else L is restricted to 16 byte, and D has 32. That leads to a vector elements mismatch of 2 to 4.
     private static void testCMoveLLTforD(long[] a, long[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
@@ -1939,7 +1939,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_L, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     // Requires avx2, else L is restricted to 16 byte, and D has 32. That leads to a vector elements mismatch of 2 to 4.
     private static void testCMoveLLEforD(long[] a, long[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
@@ -2134,7 +2134,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_U, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-            applyIfPlatform = {"riscv64", "true"})
+            applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveUIEQforF(int[] a, int[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -2156,7 +2156,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_U, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-            applyIfPlatform = {"riscv64", "true"})
+            applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveUINEforF(int[] a, int[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -2178,7 +2178,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_U, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-            applyIfPlatform = {"riscv64", "true"})
+            applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveUIGTforF(int[] a, int[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -2200,7 +2200,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_U, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-            applyIfPlatform = {"riscv64", "true"})
+            applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveUIGEforF(int[] a, int[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -2222,7 +2222,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_U, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-            applyIfPlatform = {"riscv64", "true"})
+            applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveUILTforF(int[] a, int[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -2244,7 +2244,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_U, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-            applyIfPlatform = {"riscv64", "true"})
+            applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveUILEforF(int[] a, int[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -2259,7 +2259,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_U, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveUIEQforD(int[] a, int[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
             double cc = c[i];
@@ -2273,7 +2273,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_U, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveUINEforD(int[] a, int[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
             double cc = c[i];
@@ -2287,7 +2287,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_U, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveUIGTforD(int[] a, int[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
             double cc = c[i];
@@ -2301,7 +2301,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_U, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveUIGEforD(int[] a, int[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
             double cc = c[i];
@@ -2315,7 +2315,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_U, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveUILTforD(int[] a, int[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
             double cc = c[i];
@@ -2329,7 +2329,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_U, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveUILEforD(int[] a, int[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
             double cc = c[i];
@@ -2514,7 +2514,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_UL, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveULEQforF(long[] a, long[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -2528,7 +2528,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_UL, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveULNEforF(long[] a, long[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -2542,7 +2542,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_UL, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveULGTforF(long[] a, long[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -2556,7 +2556,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_UL, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveULGEforF(long[] a, long[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -2570,7 +2570,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_UL, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveULLTforF(long[] a, long[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -2584,7 +2584,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_UL, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveULLEforF(long[] a, long[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -2607,7 +2607,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_UL, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     // Requires avx2, else L is restricted to 16 byte, and D has 32. That leads to a vector elements mismatch of 2 to 4.
     private static void testCMoveULEQforD(long[] a, long[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
@@ -2630,7 +2630,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_UL, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     // Requires avx2, else L is restricted to 16 byte, and D has 32. That leads to a vector elements mismatch of 2 to 4.
     private static void testCMoveULNEforD(long[] a, long[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
@@ -2653,7 +2653,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_UL, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     // Requires avx2, else L is restricted to 16 byte, and D has 32. That leads to a vector elements mismatch of 2 to 4.
     private static void testCMoveULGTforD(long[] a, long[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
@@ -2676,7 +2676,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_UL, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     // Requires avx2, else L is restricted to 16 byte, and D has 32. That leads to a vector elements mismatch of 2 to 4.
     private static void testCMoveULGEforD(long[] a, long[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
@@ -2699,7 +2699,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_UL, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     // Requires avx2, else L is restricted to 16 byte, and D has 32. That leads to a vector elements mismatch of 2 to 4.
     private static void testCMoveULLTforD(long[] a, long[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
@@ -2722,7 +2722,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_UL, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     // Requires avx2, else L is restricted to 16 byte, and D has 32. That leads to a vector elements mismatch of 2 to 4.
     private static void testCMoveULLEforD(long[] a, long[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
@@ -2772,7 +2772,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveFGTforF(float[] a, float[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -2786,7 +2786,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveFGTforD(float[] a, float[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
             double cc = c[i];
@@ -2828,7 +2828,7 @@ public class TestConditionalMove {
     @IR(failOn = {IRNode.STORE_VECTOR})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveDGTforF(double[] a, double[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
@@ -2849,7 +2849,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_D, ">0", IRNode.CMP_D, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveDGTforD(double[] a, double[] b, double[] c, double[] d, double[] r, double[] r2) {
         for (int i = 0; i < a.length; i++) {
             double cc = c[i];
@@ -2871,7 +2871,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveFGTforFCmpCon1(float a, float[] b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < b.length; i++) {
             float cc = c[i];
@@ -2892,7 +2892,7 @@ public class TestConditionalMove {
         applyIf = {"UseVectorCmov", "false"})
     @IR(counts = {IRNode.CMOVE_F, ">0", IRNode.CMP_F, ">0"},
         applyIf = {"UseVectorCmov", "false"},
-        applyIfPlatform = {"riscv64", "true"})
+        applyIfPlatformOr = {"riscv64", "true", "x64", "true", "aarch64", "true"})
     private static void testCMoveFGTforFCmpCon2(float[] a, float b, float[] c, float[] d, float[] r, float[] r2) {
         for (int i = 0; i < a.length; i++) {
             float cc = c[i];
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestFPComparison2.java b/test/hotspot/jtreg/compiler/c2/cmove/TestFPComparison2.java
similarity index 91%
rename from test/hotspot/jtreg/compiler/c2/irTests/TestFPComparison2.java
rename to test/hotspot/jtreg/compiler/c2/cmove/TestFPComparison2.java
index 8cf3f728666..dca1f964231 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestFPComparison2.java
+++ b/test/hotspot/jtreg/compiler/c2/cmove/TestFPComparison2.java
@@ -30,10 +30,9 @@ import java.util.List;
  * @test
  * @bug 8358892 8357551
  * @summary The test is to trigger code path of BoolTest::ge/gt in C2_MacroAssembler::enc_cmove_cmp_fp
- * @requires os.arch == "riscv64"
  * @requires vm.debug
  * @library /test/lib /
- * @run driver compiler.c2.irTests.TestFPComparison2
+ * @run driver ${test.main.class}
  */
 public class TestFPComparison2 {
     static final double[] DOUBLES = new double[] {
@@ -109,7 +108,8 @@ public class TestFPComparison2 {
 
 class Test_ge_1 {
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_float_BoolTest_ge_fixed_1_0(float x, float y) {
         // return 1
         //      when either x or y is NaN
@@ -124,7 +124,8 @@ class Test_ge_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_double_BoolTest_ge_fixed_1_0(double x, double y) {
         // return 1
         //      when either x or y is NaN
@@ -139,7 +140,8 @@ class Test_ge_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_float_BoolTest_ge_fixed_0_1(float x, float y) {
         return !(x <= y) ? 0 : 1;
     }
@@ -149,7 +151,8 @@ class Test_ge_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_double_BoolTest_ge_fixed_0_1(double x, double y) {
         return !(x <= y) ? 0 : 1;
     }
@@ -159,7 +162,8 @@ class Test_ge_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_float_BoolTest_ge_fixed_10_20(float x, float y) {
         return !(x <= y) ? 10 : 20;
     }
@@ -169,7 +173,8 @@ class Test_ge_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_double_BoolTest_ge_fixed_10_20(double x, double y) {
         return !(x <= y) ? 10 : 20;
     }
@@ -179,7 +184,8 @@ class Test_ge_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_float_BoolTest_ge_variable_results(float x, float y, int a, int b) {
         return !(x <= y) ? a : b;
     }
@@ -189,7 +195,8 @@ class Test_ge_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_double_BoolTest_ge_variable_results(double x, double y, int a, int b) {
         return !(x <= y) ? a : b;
     }
@@ -338,7 +345,8 @@ class Test_ge_1 {
 
 class Test_ge_cmove_fp_1 {
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_ge_fixed_1_0(float x, float y) {
         // return 1
         //      when either x or y is NaN
@@ -353,7 +361,8 @@ class Test_ge_cmove_fp_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_double_BoolTest_ge_fixed_1_0(double x, double y) {
         // return 1
         //      when either x or y is NaN
@@ -368,7 +377,8 @@ class Test_ge_cmove_fp_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_ge_fixed_0_1(float x, float y) {
         return !(x <= y) ? 0.0f : 1.0f;
     }
@@ -378,7 +388,8 @@ class Test_ge_cmove_fp_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_double_BoolTest_ge_fixed_0_1(double x, double y) {
         return !(x <= y) ? 0.0f : 1.0f;
     }
@@ -388,7 +399,8 @@ class Test_ge_cmove_fp_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_ge_fixed_10_20(float x, float y) {
         return !(x <= y) ? 10.0f : 20.0f;
     }
@@ -398,7 +410,8 @@ class Test_ge_cmove_fp_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_double_BoolTest_ge_fixed_10_20(double x, double y) {
         return !(x <= y) ? 10.0f : 20.0f;
     }
@@ -408,7 +421,8 @@ class Test_ge_cmove_fp_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_ge_variable_results(float x, float y, float a, float b) {
         return !(x <= y) ? a : b;
     }
@@ -418,7 +432,8 @@ class Test_ge_cmove_fp_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_double_BoolTest_ge_variable_results(double x, double y, float a, float b) {
         return !(x <= y) ? a : b;
     }
@@ -566,7 +581,8 @@ class Test_ge_cmove_fp_1 {
 
 class Test_ge_2 {
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_float_BoolTest_ge_fixed_1_0(float x, float y) {
         // return 1
         //      when either x or y is NaN
@@ -581,7 +597,8 @@ class Test_ge_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_double_BoolTest_ge_fixed_1_0(double x, double y) {
         // return 1
         //      when either x or y is NaN
@@ -596,7 +613,8 @@ class Test_ge_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_float_BoolTest_ge_fixed_0_1(float x, float y) {
         return !(x >= y) ? 0 : 1;
     }
@@ -606,7 +624,8 @@ class Test_ge_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_double_BoolTest_ge_fixed_0_1(double x, double y) {
         return !(x >= y) ? 0 : 1;
     }
@@ -616,7 +635,8 @@ class Test_ge_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_float_BoolTest_ge_fixed_10_20(float x, float y) {
         return !(x >= y) ? 10 : 20;
     }
@@ -626,7 +646,8 @@ class Test_ge_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_double_BoolTest_ge_fixed_10_20(double x, double y) {
         return !(x >= y) ? 10 : 20;
     }
@@ -636,7 +657,8 @@ class Test_ge_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_float_BoolTest_ge_variable_results(float x, float y, int a, int b) {
         return !(x >= y) ? a : b;
     }
@@ -646,7 +668,8 @@ class Test_ge_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_double_BoolTest_ge_variable_results(double x, double y, int a, int b) {
         return !(x >= y) ? a : b;
     }
@@ -794,7 +817,8 @@ class Test_ge_2 {
 
 class Test_ge_cmove_fp_2 {
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_ge_fixed_1_0(float x, float y) {
         // return 1
         //      when either x or y is NaN
@@ -809,7 +833,8 @@ class Test_ge_cmove_fp_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_double_BoolTest_ge_fixed_1_0(double x, double y) {
         // return 1
         //      when either x or y is NaN
@@ -824,7 +849,8 @@ class Test_ge_cmove_fp_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_ge_fixed_0_1(float x, float y) {
         return !(x >= y) ? 0.0f : 1.0f;
     }
@@ -834,7 +860,8 @@ class Test_ge_cmove_fp_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_double_BoolTest_ge_fixed_0_1(double x, double y) {
         return !(x >= y) ? 0.0f : 1.0f;
     }
@@ -844,7 +871,8 @@ class Test_ge_cmove_fp_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_ge_fixed_10_20(float x, float y) {
         return !(x >= y) ? 10.0f : 20.0f;
     }
@@ -854,7 +882,8 @@ class Test_ge_cmove_fp_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_double_BoolTest_ge_fixed_10_20(double x, double y) {
         return !(x >= y) ? 10.0f : 20.0f;
     }
@@ -864,7 +893,8 @@ class Test_ge_cmove_fp_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_ge_variable_results(float x, float y, float a, float b) {
         return !(x >= y) ? a : b;
     }
@@ -874,7 +904,8 @@ class Test_ge_cmove_fp_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_double_BoolTest_ge_variable_results(double x, double y, float a, float b) {
         return !(x >= y) ? a : b;
     }
@@ -1022,7 +1053,8 @@ class Test_ge_cmove_fp_2 {
 
 class Test_gt_1 {
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_float_BoolTest_gt_fixed_1_0(float x, float y) {
         // return 1
         //      when either x or y is NaN
@@ -1037,7 +1069,8 @@ class Test_gt_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_double_BoolTest_gt_fixed_1_0(double x, double y) {
         // return 1
         //      when either x or y is NaN
@@ -1052,7 +1085,8 @@ class Test_gt_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_float_BoolTest_gt_fixed_0_1(float x, float y) {
         return !(x < y) ? 0 : 1;
     }
@@ -1062,7 +1096,8 @@ class Test_gt_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_double_BoolTest_gt_fixed_0_1(double x, double y) {
         return !(x < y) ? 0 : 1;
     }
@@ -1072,7 +1107,8 @@ class Test_gt_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_float_BoolTest_gt_fixed_10_20(float x, float y) {
         return !(x < y) ? 10 : 20;
     }
@@ -1082,7 +1118,8 @@ class Test_gt_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_double_BoolTest_gt_fixed_10_20(double x, double y) {
         return !(x < y) ? 10 : 20;
     }
@@ -1092,7 +1129,8 @@ class Test_gt_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_float_BoolTest_gt_variable_results(float x, float y, int a, int b) {
         return !(x < y) ? a : b;
     }
@@ -1102,7 +1140,8 @@ class Test_gt_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_double_BoolTest_gt_variable_results(double x, double y, int a, int b) {
         return !(x < y) ? a : b;
     }
@@ -1250,7 +1289,8 @@ class Test_gt_1 {
 
 class Test_gt_cmove_fp_1 {
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_gt_fixed_1_0(float x, float y) {
         // return 1
         //      when either x or y is NaN
@@ -1265,7 +1305,8 @@ class Test_gt_cmove_fp_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_double_BoolTest_gt_fixed_1_0(double x, double y) {
         // return 1
         //      when either x or y is NaN
@@ -1280,7 +1321,8 @@ class Test_gt_cmove_fp_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_gt_fixed_0_1(float x, float y) {
         return !(x < y) ? 0.0f : 1.0f;
     }
@@ -1290,7 +1332,8 @@ class Test_gt_cmove_fp_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_double_BoolTest_gt_fixed_0_1(double x, double y) {
         return !(x < y) ? 0.0f : 1.0f;
     }
@@ -1300,7 +1343,8 @@ class Test_gt_cmove_fp_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_gt_fixed_10_20(float x, float y) {
         return !(x < y) ? 10.0f : 20.0f;
     }
@@ -1310,7 +1354,8 @@ class Test_gt_cmove_fp_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_double_BoolTest_gt_fixed_10_20(double x, double y) {
         return !(x < y) ? 10.0f : 20.0f;
     }
@@ -1320,7 +1365,8 @@ class Test_gt_cmove_fp_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_gt_variable_results(float x, float y, float a, float b) {
         return !(x < y) ? a : b;
     }
@@ -1330,7 +1376,8 @@ class Test_gt_cmove_fp_1 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_double_BoolTest_gt_variable_results(double x, double y, float a, float b) {
         return !(x < y) ? a : b;
     }
@@ -1478,7 +1525,8 @@ class Test_gt_cmove_fp_1 {
 
 class Test_gt_2 {
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_float_BoolTest_gt_fixed_1_0(float x, float y) {
         // return 1
         //      when either x or y is NaN
@@ -1493,7 +1541,8 @@ class Test_gt_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_double_BoolTest_gt_fixed_1_0(double x, double y) {
         // return 1
         //      when either x or y is NaN
@@ -1508,7 +1557,8 @@ class Test_gt_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_float_BoolTest_gt_fixed_0_1(float x, float y) {
         return !(x > y) ? 0 : 1;
     }
@@ -1518,7 +1568,8 @@ class Test_gt_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_double_BoolTest_gt_fixed_0_1(double x, double y) {
         return !(x > y) ? 0 : 1;
     }
@@ -1528,7 +1579,8 @@ class Test_gt_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_float_BoolTest_gt_fixed_10_20(float x, float y) {
         return !(x > y) ? 10 : 20;
     }
@@ -1538,7 +1590,8 @@ class Test_gt_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_double_BoolTest_gt_fixed_10_20(double x, double y) {
         return !(x > y) ? 10 : 20;
     }
@@ -1548,7 +1601,8 @@ class Test_gt_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_float_BoolTest_gt_variable_results(float x, float y, int a, int b) {
         return !(x > y) ? a : b;
     }
@@ -1558,7 +1612,8 @@ class Test_gt_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_I, "1"})
+    @IR(counts = {IRNode.CMOVE_I, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static int test_double_BoolTest_gt_variable_results(double x, double y, int a, int b) {
         return !(x > y) ? a : b;
     }
@@ -1706,7 +1761,8 @@ class Test_gt_2 {
 
 class Test_gt_cmove_fp_2 {
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_gt_fixed_1_0(float x, float y) {
         // return 1
         //      when either x or y is NaN
@@ -1721,7 +1777,8 @@ class Test_gt_cmove_fp_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_double_BoolTest_gt_fixed_1_0(double x, double y) {
         // return 1
         //      when either x or y is NaN
@@ -1736,7 +1793,8 @@ class Test_gt_cmove_fp_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_gt_fixed_0_1(float x, float y) {
         return !(x > y) ? 0.0f : 1.0f;
     }
@@ -1746,7 +1804,8 @@ class Test_gt_cmove_fp_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_double_BoolTest_gt_fixed_0_1(double x, double y) {
         return !(x > y) ? 0.0f : 1.0f;
     }
@@ -1756,7 +1815,8 @@ class Test_gt_cmove_fp_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_gt_fixed_10_20(float x, float y) {
         return !(x > y) ? 10.0f : 20.0f;
     }
@@ -1766,7 +1826,8 @@ class Test_gt_cmove_fp_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_double_BoolTest_gt_fixed_10_20(double x, double y) {
         return !(x > y) ? 10.0f : 20.0f;
     }
@@ -1776,7 +1837,8 @@ class Test_gt_cmove_fp_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_gt_variable_results(float x, float y, float a, float b) {
         return !(x > y) ? a : b;
     }
@@ -1786,7 +1848,8 @@ class Test_gt_cmove_fp_2 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_double_BoolTest_gt_variable_results(double x, double y, float a, float b) {
         return !(x > y) ? a : b;
     }
@@ -1934,7 +1997,8 @@ class Test_gt_cmove_fp_2 {
 
 class Test_cmov_fp_cmp_fp_ge_3 {
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_gt_x_lt_0(float x) {
         return x < 0 ? 0 : x;
     }
@@ -1944,7 +2008,8 @@ class Test_cmov_fp_cmp_fp_ge_3 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_gt_x_gt_0(float x) {
         return x > 0 ? 0 : x;
     }
@@ -1954,7 +2019,8 @@ class Test_cmov_fp_cmp_fp_ge_3 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_gt_neg_x_lt_0(float x) {
         return !(x < 0) ? 0 : x;
     }
@@ -1964,7 +2030,8 @@ class Test_cmov_fp_cmp_fp_ge_3 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_gt_neg_x_gt_0(float x) {
         return !(x > 0) ? 0 : x;
     }
@@ -2038,7 +2105,8 @@ class Test_cmov_fp_cmp_fp_ge_3 {
 
 class Test_cmov_fp_cmp_fp_ge_4 {
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_ge_x_le_0(float x) {
         return x <= 0 ? 0 : x;
     }
@@ -2048,7 +2116,8 @@ class Test_cmov_fp_cmp_fp_ge_4 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_ge_x_ge_0(float x) {
         return x >= 0 ? 0 : x;
     }
@@ -2058,7 +2127,8 @@ class Test_cmov_fp_cmp_fp_ge_4 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_ge_neg_x_le_0(float x) {
         return !(x <= 0) ? 0 : x;
     }
@@ -2068,7 +2138,8 @@ class Test_cmov_fp_cmp_fp_ge_4 {
     }
 
     @Test
-    @IR(counts = {IRNode.CMOVE_F, "1"})
+    @IR(counts = {IRNode.CMOVE_F, "1"},
+        applyIfPlatformOr = {"riscv64", "true", "aarch64", "true"})
     public static float test_float_BoolTest_ge_neg_x_ge_0(float x) {
         return !(x >= 0) ? 0 : x;
     }
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestScalarConditionalMoveCmpObj.java b/test/hotspot/jtreg/compiler/c2/cmove/TestScalarConditionalMoveCmpObj.java
similarity index 99%
rename from test/hotspot/jtreg/compiler/c2/irTests/TestScalarConditionalMoveCmpObj.java
rename to test/hotspot/jtreg/compiler/c2/cmove/TestScalarConditionalMoveCmpObj.java
index e332ac9e293..63d6f6fba7f 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestScalarConditionalMoveCmpObj.java
+++ b/test/hotspot/jtreg/compiler/c2/cmove/TestScalarConditionalMoveCmpObj.java
@@ -31,9 +31,8 @@ import jdk.test.lib.Utils;
 /*
  * @test
  * @summary Test conditional move + compare object.
- * @requires vm.simpleArch == "riscv64"
  * @library /test/lib /
- * @run driver compiler.c2.irTests.TestScalarConditionalMoveCmpObj
+ * @run driver ${test.main.class}
  */
 
 public class TestScalarConditionalMoveCmpObj {
diff --git a/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java b/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java
index 3df6f956b0f..336abf32480 100644
--- a/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr7200264/TestIntVect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/c2/igvn/TestMissingOptMemBarRemovePrecedentEdge.java b/test/hotspot/jtreg/compiler/c2/igvn/TestMissingOptMemBarRemovePrecedentEdge.java
new file mode 100644
index 00000000000..56a18321fc8
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/igvn/TestMissingOptMemBarRemovePrecedentEdge.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug JDK-8367627
+ * @summary When we load from a volatile field, a MemBarAcquire node gets inserted
+ *          after the load. It happens that the load gets converted to a constant
+ *          during the initial _gvn.transform(...) call. The MemBarAcquire node
+ *          ends up with a constant node as its Precedent input, and this should
+ *          trigger MemBar::Ideal if the MemBar is the only use of the constant.
+ *          This test ensures that this optimization is not missed.
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ *      -Xcomp -XX:-TieredCompilation
+ *      -XX:CompileCommand=compileonly,${test.main.class}::test*
+ *      -XX:VerifyIterativeGVN=1110
+ *      -XX:-EliminateAutoBox
+ *      ${test.main.class}
+  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ *      -Xcomp -XX:-TieredCompilation
+ *      -XX:CompileCommand=compileonly,${test.main.class}::test*
+ *      -XX:VerifyIterativeGVN=1110
+ *      -XX:-EliminateAutoBox
+ *      -XX:-DoEscapeAnalysis
+ *      ${test.main.class}
+  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ *      -Xcomp -XX:-TieredCompilation
+ *      -XX:CompileCommand=compileonly,${test.main.class}::test*
+ *      -XX:VerifyIterativeGVN=1110
+ *      -XX:-EliminateAutoBox
+ *      -XX:-DoEscapeAnalysis
+ *      -XX:+AlwaysIncrementalInline
+ *      ${test.main.class}
+ * @run main ${test.main.class}
+ *
+ */
+
+package compiler.c2.igvn;
+
+public class TestMissingOptMemBarRemovePrecedentEdge {
+    static class MyClass {
+        volatile long l;
+    }
+
+    static class MyClass2 {
+        volatile MyClass o;
+    }
+
+    static int test0() {
+        var c = new MyClass();
+        // the conversion ensures that the ConL node only has one use
+        // in the end, which triggers the optimization
+        return (int) c.l;
+    }
+
+    static int test1() {
+        var c = new MyClass2();
+        // the Load gets folded to a ConP, and gets added to the worklist
+        // because the basic type is T_OBJECT and there is specific logic
+        // in GraphKit::make_load.
+        // However this only happens if escape analysis is enabled
+        if (c.o == null) return 0;
+        else return 1;
+    }
+
+    public static void main(String[] args) {
+        new MyClass();
+        new MyClass2();
+        test0();
+        test1();
+    }
+}
\ No newline at end of file
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java
index c7a35a5a265..a6a9f545d16 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java
index 6e58d6a04fe..d1a419a9c8c 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/ModDNodeTests.java b/test/hotspot/jtreg/compiler/c2/irTests/ModDNodeTests.java
index 3c28c936d31..6b20b782923 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/ModDNodeTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/ModDNodeTests.java
@@ -30,6 +30,7 @@ import compiler.lib.ir_framework.*;
 /*
  * @test
  * @bug 8345766
+ * @key randomness
  * @summary Test that Ideal transformations of ModDNode are being performed as expected.
  * @library /test/lib /
  * @run driver compiler.c2.irTests.ModDNodeTests
@@ -62,17 +63,29 @@ public class ModDNodeTests {
         Asserts.assertEQ(unusedResultAfterLoopOpt3(1.1d, 2.2d), 0.d);
     }
 
+    // Note: we used to check for ConD nodes in the IR. But that is a bit brittle:
+    // Constant nodes can appear during IR transformations, and then lose their outputs.
+    // During IGNV, the constants stay in the graph even if they lose the inputs. But
+    // CCP cleans them out because they are not in the useful set. So for now, we do not
+    // rely on any constant counting, just on counting the operation nodes.
+
     @Test
-    @IR(failOn = {"drem"}, phase = CompilePhase.BEFORE_MATCHING)
-    @IR(counts = {IRNode.CON_D, "1"})
+    @IR(counts = {IRNode.MOD_D, "2"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {".*CallLeaf.*drem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public double constant() {
         // All constants available during parsing
         return q % 72.0d % 30.0d;
     }
 
     @Test
-    @IR(failOn = {"drem"}, phase = CompilePhase.BEFORE_MATCHING)
-    @IR(counts = {IRNode.CON_D, "1"})
+    @IR(counts = {IRNode.MOD_D, "1"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_D, "1"},
+        phase = CompilePhase.PHASEIDEALLOOP1) // Only constant fold after some loop opts
+    @IR(counts = {".*CallLeaf.*drem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public double alsoConstant() {
         // Make sure value is only available after second loop opts round
         double val = 0;
@@ -85,8 +98,12 @@ public class ModDNodeTests {
     }
 
     @Test
-    @IR(failOn = {"drem"}, phase = CompilePhase.BEFORE_MATCHING)
-    @IR(counts = {IRNode.CON_D, "1"})
+    @IR(counts = {IRNode.MOD_D, "2"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_D, "2"},
+        phase = CompilePhase.PHASEIDEALLOOP1) // Only constant fold after some loop opts
+    @IR(counts = {".*CallLeaf.*drem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public double nanLeftConstant() {
         // Make sure value is only available after second loop opts round
         double val = 134.18d;
@@ -99,8 +116,12 @@ public class ModDNodeTests {
     }
 
     @Test
-    @IR(failOn = {"drem"}, phase = CompilePhase.BEFORE_MATCHING)
-    @IR(counts = {IRNode.CON_D, "1"})
+    @IR(counts = {IRNode.MOD_D, "2"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_D, "2"},
+        phase = CompilePhase.PHASEIDEALLOOP1) // Only constant fold after some loop opts
+    @IR(counts = {".*CallLeaf.*drem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public double nanRightConstant() {
         // Make sure value is only available after second loop opts round
         double val = 134.18d;
@@ -113,29 +134,41 @@ public class ModDNodeTests {
     }
 
     @Test
-    @IR(counts = {"drem", "1"}, phase = CompilePhase.BEFORE_MATCHING)
-    @IR(counts = {IRNode.CON_D, "1"})
+    @IR(counts = {IRNode.MOD_D, "1"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {".*CallLeaf.*drem.*", "1"},
+        phase = CompilePhase.BEFORE_MATCHING) // no constant folding
     public double notConstant(double x) {
         return x % 32.0d;
     }
 
     @Test
-    @IR(counts = {"drem", "2"}, phase = CompilePhase.BEFORE_MATCHING)
-    @IR(counts = {IRNode.CON_D, "1"})
+    @IR(counts = {IRNode.MOD_D, "2"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {".*CallLeaf.*drem.*", "2"},
+        phase = CompilePhase.BEFORE_MATCHING) // no constant folding
     public double veryNotConstant(double x, double y) {
         return x % 32.0d % y;
     }
 
     @Test
-    @IR(failOn = IRNode.MOD_D, phase = CompilePhase.ITER_GVN1)
-    @IR(counts = {IRNode.MOD_D, "1"}, phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_D, "1"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_D, "0"},
+        phase = CompilePhase.ITER_GVN1) // IGVN removes unused nodes
+    @IR(counts = {".*CallLeaf.*drem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public void unusedResult(double x, double y) {
         double unused = x % y;
     }
 
     @Test
-    @IR(failOn = IRNode.MOD_D, phase = CompilePhase.ITER_GVN1)
-    @IR(counts = {IRNode.MOD_D, "1"}, phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_D, "1"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_D, "0"},
+        phase = CompilePhase.ITER_GVN1) // IGVN removes unused nodes
+    @IR(counts = {".*CallLeaf.*drem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public void repeatedlyUnused(double x, double y) {
         double unused = 1.d;
         for (int i = 0; i < 100_000; i++) {
@@ -148,8 +181,14 @@ public class ModDNodeTests {
     // and thus a different execution path. In unusedResultAfterLoopOpt1 the modulo is
     // used in the traps of the parse predicates. In unusedResultAfterLoopOpt2, it is not.
     @Test
-    @IR(counts = {IRNode.MOD_D, "1"}, phase = CompilePhase.ITER_GVN2)
-    @IR(failOn = IRNode.MOD_D, phase = CompilePhase.BEFORE_MACRO_EXPANSION)
+    @IR(counts = {IRNode.MOD_D, "1"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_D, "1"},
+        phase = CompilePhase.ITER_GVN2)
+    @IR(counts = {IRNode.MOD_D, "0"},
+        phase = CompilePhase.BEFORE_MACRO_EXPANSION)
+    @IR(counts = {".*CallLeaf.*drem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public double unusedResultAfterLoopOpt1(double x, double y) {
         double unused = x % y;
 
@@ -167,8 +206,14 @@ public class ModDNodeTests {
     }
 
     @Test
-    @IR(counts = {IRNode.MOD_D, "1"}, phase = CompilePhase.AFTER_CLOOPS)
-    @IR(failOn = IRNode.MOD_D, phase = CompilePhase.PHASEIDEALLOOP1)
+    @IR(counts = {IRNode.MOD_D, "1"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_D, "1"},
+        phase = CompilePhase.AFTER_CLOOPS)
+    @IR(counts = {IRNode.MOD_D, "0"},
+        phase = CompilePhase.PHASEIDEALLOOP1)
+    @IR(counts = {".*CallLeaf.*drem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public double unusedResultAfterLoopOpt2(double x, double y) {
         int a = 77;
         int b = 0;
@@ -186,8 +231,14 @@ public class ModDNodeTests {
     }
 
     @Test
-    @IR(counts = {IRNode.MOD_D, "2"}, phase = CompilePhase.AFTER_CLOOPS)
-    @IR(failOn = IRNode.MOD_D, phase = CompilePhase.PHASEIDEALLOOP1)
+    @IR(counts = {IRNode.MOD_D, "3"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_D, "2"},
+        phase = CompilePhase.AFTER_CLOOPS) // drop the useless one
+    @IR(counts = {IRNode.MOD_D, "0"},
+        phase = CompilePhase.PHASEIDEALLOOP1) // drop the rest
+    @IR(counts = {".*CallLeaf.*drem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public double unusedResultAfterLoopOpt3(double x, double y) {
         double unused = x % y;
 
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/ModFNodeTests.java b/test/hotspot/jtreg/compiler/c2/irTests/ModFNodeTests.java
index 1b5e14b4835..2f69578c2f0 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/ModFNodeTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/ModFNodeTests.java
@@ -30,6 +30,7 @@ import compiler.lib.ir_framework.*;
 /*
  * @test
  * @bug 8345766
+ * @key randomness
  * @summary Test that Ideal transformations of ModFNode are being performed as expected.
  * @library /test/lib /
  * @run driver compiler.c2.irTests.ModFNodeTests
@@ -62,17 +63,29 @@ public class ModFNodeTests {
         Asserts.assertEQ(unusedResultAfterLoopOpt3(1.1f, 2.2f), 0.f);
     }
 
+    // Note: we used to check for ConF nodes in the IR. But that is a bit brittle:
+    // Constant nodes can appear during IR transformations, and then lose their outputs.
+    // During IGNV, the constants stay in the graph even if they lose the inputs. But
+    // CCP cleans them out because they are not in the useful set. So for now, we do not
+    // rely on any constant counting, just on counting the operation nodes.
+
     @Test
-    @IR(failOn = {"frem"}, phase = CompilePhase.BEFORE_MATCHING)
-    @IR(counts = {IRNode.CON_F, "1"})
+    @IR(counts = {IRNode.MOD_F, "2"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {".*CallLeaf.*frem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public float constant() {
         // All constants available during parsing
         return q % 72.0f % 30.0f;
     }
 
     @Test
-    @IR(failOn = {"frem"}, phase = CompilePhase.BEFORE_MATCHING)
-    @IR(counts = {IRNode.CON_F, "1"})
+    @IR(counts = {IRNode.MOD_F, "1"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_F, "1"},
+        phase = CompilePhase.PHASEIDEALLOOP1) // Only constant fold after some loop opts
+    @IR(counts = {".*CallLeaf.*frem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public float alsoConstant() {
         // Make sure value is only available after second loop opts round
         float val = 0;
@@ -85,8 +98,12 @@ public class ModFNodeTests {
     }
 
     @Test
-    @IR(failOn = {"frem"}, phase = CompilePhase.BEFORE_MATCHING)
-    @IR(counts = {IRNode.CON_F, "1"})
+    @IR(counts = {IRNode.MOD_F, "2"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_F, "2"},
+        phase = CompilePhase.PHASEIDEALLOOP1) // Only constant fold after some loop opts
+    @IR(counts = {".*CallLeaf.*frem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public float nanLeftConstant() {
         // Make sure value is only available after second loop opts round
         float val = 134.18f;
@@ -99,8 +116,12 @@ public class ModFNodeTests {
     }
 
     @Test
-    @IR(failOn = {"frem"}, phase = CompilePhase.BEFORE_MATCHING)
-    @IR(counts = {IRNode.CON_F, "1"})
+    @IR(counts = {IRNode.MOD_F, "2"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_F, "2"},
+        phase = CompilePhase.PHASEIDEALLOOP1) // Only constant fold after some loop opts
+    @IR(counts = {".*CallLeaf.*frem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public float nanRightConstant() {
         // Make sure value is only available after second loop opts round
         float val = 134.18f;
@@ -113,29 +134,41 @@ public class ModFNodeTests {
     }
 
     @Test
-    @IR(counts = {"frem", "1"}, phase = CompilePhase.BEFORE_MATCHING)
-    @IR(counts = {IRNode.CON_F, "1"})
+    @IR(counts = {IRNode.MOD_F, "1"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {".*CallLeaf.*frem.*", "1"},
+        phase = CompilePhase.BEFORE_MATCHING) // no constant folding
     public float notConstant(float x) {
         return x % 32.0f;
     }
 
     @Test
-    @IR(counts = {"frem", "2"}, phase = CompilePhase.BEFORE_MATCHING)
-    @IR(counts = {IRNode.CON_F, "1"})
+    @IR(counts = {IRNode.MOD_F, "2"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {".*CallLeaf.*frem.*", "2"},
+        phase = CompilePhase.BEFORE_MATCHING) // no constant folding
     public float veryNotConstant(float x, float y) {
         return x % 32.0f % y;
     }
 
     @Test
-    @IR(failOn = IRNode.MOD_F, phase = CompilePhase.ITER_GVN1)
-    @IR(counts = {IRNode.MOD_F, "1"}, phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_F, "1"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_F, "0"},
+        phase = CompilePhase.ITER_GVN1) // IGVN removes unused nodes
+    @IR(counts = {".*CallLeaf.*frem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public void unusedResult(float x, float y) {
         float unused = x % y;
     }
 
     @Test
-    @IR(failOn = IRNode.MOD_F, phase = CompilePhase.ITER_GVN1)
-    @IR(counts = {IRNode.MOD_F, "1"}, phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_F, "1"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_F, "0"},
+        phase = CompilePhase.ITER_GVN1) // IGVN removes unused nodes
+    @IR(counts = {".*CallLeaf.*frem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public void repeatedlyUnused(float x, float y) {
         float unused = 1.f;
         for (int i = 0; i < 100_000; i++) {
@@ -148,8 +181,14 @@ public class ModFNodeTests {
     // and thus a different execution path. In unusedResultAfterLoopOpt1 the modulo is
     // used in the traps of the parse predicates. In unusedResultAfterLoopOpt2, it is not.
     @Test
-    @IR(counts = {IRNode.MOD_F, "1"}, phase = CompilePhase.ITER_GVN2)
-    @IR(failOn = IRNode.MOD_F, phase = CompilePhase.BEFORE_MACRO_EXPANSION)
+    @IR(counts = {IRNode.MOD_F, "1"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_F, "1"},
+        phase = CompilePhase.ITER_GVN2)
+    @IR(counts = {IRNode.MOD_F, "0"},
+        phase = CompilePhase.BEFORE_MACRO_EXPANSION)
+    @IR(counts = {".*CallLeaf.*frem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public float unusedResultAfterLoopOpt1(float x, float y) {
         float unused = x % y;
 
@@ -167,8 +206,14 @@ public class ModFNodeTests {
     }
 
     @Test
-    @IR(counts = {IRNode.MOD_F, "1"}, phase = CompilePhase.AFTER_CLOOPS)
-    @IR(failOn = IRNode.MOD_F, phase = CompilePhase.PHASEIDEALLOOP1)
+    @IR(counts = {IRNode.MOD_F, "1"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_F, "1"},
+        phase = CompilePhase.AFTER_CLOOPS)
+    @IR(counts = {IRNode.MOD_F, "0"},
+        phase = CompilePhase.PHASEIDEALLOOP1)
+    @IR(counts = {".*CallLeaf.*frem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public float unusedResultAfterLoopOpt2(float x, float y) {
         int a = 77;
         int b = 0;
@@ -186,8 +231,14 @@ public class ModFNodeTests {
     }
 
     @Test
-    @IR(counts = {IRNode.MOD_F, "2"}, phase = CompilePhase.AFTER_CLOOPS)
-    @IR(failOn = IRNode.MOD_F, phase = CompilePhase.PHASEIDEALLOOP1)
+    @IR(counts = {IRNode.MOD_F, "3"},
+        phase = CompilePhase.AFTER_PARSING)
+    @IR(counts = {IRNode.MOD_F, "2"},
+        phase = CompilePhase.AFTER_CLOOPS) // drop the useless one
+    @IR(counts = {IRNode.MOD_F, "0"},
+        phase = CompilePhase.PHASEIDEALLOOP1) // drop the rest
+    @IR(counts = {".*CallLeaf.*frem.*", "0"},
+        phase = CompilePhase.BEFORE_MATCHING)
     public float unusedResultAfterLoopOpt3(float x, float y) {
         float unused = x % y;
 
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/ModINodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/ModINodeIdealizationTests.java
index d19e2562779..1ba71584031 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/ModINodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/ModINodeIdealizationTests.java
@@ -32,6 +32,7 @@ import compiler.lib.ir_framework.*;
 /*
  * @test
  * @bug 8332268
+ * @key randomness
  * @summary Test that Ideal transformations of ModINode* are being performed as expected.
  * @library /test/lib /
  * @run driver compiler.c2.irTests.ModINodeIdealizationTests
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/ModLNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/ModLNodeIdealizationTests.java
index fc08ef60603..719cc596215 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/ModLNodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/ModLNodeIdealizationTests.java
@@ -32,6 +32,7 @@ import compiler.lib.ir_framework.*;
 /*
  * @test
  * @bug 8267265
+ * @key randomness
  * @summary Test that Ideal transformations of ModLNode* are being performed as expected.
  * @library /test/lib /
  * @run driver compiler.c2.irTests.ModLNodeIdealizationTests
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/RShiftINodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/RShiftINodeIdealizationTests.java
index bf500d42540..f1c2c16818e 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/RShiftINodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/RShiftINodeIdealizationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/RShiftLNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/RShiftLNodeIdealizationTests.java
index 02ee8063948..4bd9b410243 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/RShiftLNodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/RShiftLNodeIdealizationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestConv2BExpansion.java b/test/hotspot/jtreg/compiler/c2/irTests/TestConv2BExpansion.java
index 35d676b6ddb..17cc1a227b2 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestConv2BExpansion.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestConv2BExpansion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestFPComparison.java b/test/hotspot/jtreg/compiler/c2/irTests/TestFPComparison.java
index a06cb45d59e..f64c4980362 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestFPComparison.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestFPComparison.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java b/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
index bfcc775efeb..9bfa0de38e2 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestLongRangeChecks.java b/test/hotspot/jtreg/compiler/c2/irTests/TestLongRangeChecks.java
index de829f84775..9a06d12b15f 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestLongRangeChecks.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestLongRangeChecks.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2021, 2022, 2025 Red Hat, Inc. All rights reserved.
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestMinMaxIdentities.java b/test/hotspot/jtreg/compiler/c2/irTests/TestMinMaxIdentities.java
index e23c02c8c61..747ad14149a 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestMinMaxIdentities.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestMinMaxIdentities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestMulNodeIdealization.java b/test/hotspot/jtreg/compiler/c2/irTests/TestMulNodeIdealization.java
index ca6d5fbe118..e0307f2eb98 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestMulNodeIdealization.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestMulNodeIdealization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ import jdk.test.lib.Utils;
 /*
  * @test
  * @bug 8291336
+ * @key randomness
  * @summary Test that transformation of multiply-by-2 is appropriately turned into additions.
  * @library /test/lib /
  * @requires vm.compiler2.enabled
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestPhiDuplicatedConversion.java b/test/hotspot/jtreg/compiler/c2/irTests/TestPhiDuplicatedConversion.java
index b11bf6b7570..adb2309e65c 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestPhiDuplicatedConversion.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestPhiDuplicatedConversion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestPushAddThruCast.java b/test/hotspot/jtreg/compiler/c2/irTests/TestPushAddThruCast.java
index 7c5fa05f147..3aee78e9d6a 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestPushAddThruCast.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestPushAddThruCast.java
@@ -44,13 +44,13 @@ public class TestPushAddThruCast {
         TestFramework.run();
     }
 
-    final static int length = RANDOM.nextInt(Integer.MAX_VALUE);
-    final static long llength = RANDOM.nextInt(Integer.MAX_VALUE);
+    final static int length = RANDOM.nextInt(5, Integer.MAX_VALUE);
+    final static long llength = RANDOM.nextInt(2, Integer.MAX_VALUE);
     static int i;
     static long l;
 
     @Test
-    @IR(counts = { IRNode.CAST_II, "1" })
+    @IR(counts = { IRNode.CAST_II, "2" })
     public static int test1() {
         int j = Objects.checkIndex(i, length);
         int k = Objects.checkIndex(i + 1, length);
@@ -67,7 +67,7 @@ public class TestPushAddThruCast {
     }
 
     @Test
-    @IR(counts = { IRNode.CAST_LL, "1" })
+    @IR(counts = { IRNode.CAST_LL, "2" })
     public static long test2() {
         long j = Objects.checkIndex(l, llength);
         long k = Objects.checkIndex(l + 1, llength);
@@ -82,4 +82,25 @@ public class TestPushAddThruCast {
             throw new RuntimeException("incorrect result: " + res);
         }
     }
+
+    // Test commoning of Casts after loop opts when they are at the same control
+    @Test
+    @IR(phase = CompilePhase.ITER_GVN1, counts = { IRNode.CAST_II, "4" })
+    @IR(phase = CompilePhase.OPTIMIZE_FINISHED, counts = { IRNode.CAST_II, "2" })
+    public static int test3() {
+        int j = Objects.checkIndex(i - 3, length);
+        j += Objects.checkIndex(i, length);
+        j += Objects.checkIndex(i - 2, length);
+        j += Objects.checkIndex(i - 1, length);
+        return j;
+    }
+
+    @Run(test = "test3")
+    public static void test3_runner() {
+        i = RANDOM.nextInt(3, length - 1);
+        int res = test3();
+        if (res != i * 4 - 6) {
+            throw new RuntimeException("incorrect result: " + res + " for i = " + i);
+        }
+    }
 }
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestShiftAndMask.java b/test/hotspot/jtreg/compiler/c2/irTests/TestShiftAndMask.java
index 2cdc6414685..1413ee0cafa 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestShiftAndMask.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestShiftAndMask.java
@@ -31,6 +31,7 @@ import java.util.Objects;
 /*
  * @test
  * @bug 8277850 8278949 8285793 8346664
+ * @key randomness
  * @summary C2: optimize mask checks in counted loops
  * @library /test/lib /
  * @run driver compiler.c2.irTests.TestShiftAndMask
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMismatchedAccess.java b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMismatchedAccess.java
index 7d474f942a4..5524b5d7b6c 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMismatchedAccess.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMismatchedAccess.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2023, Red Hat, Inc. All rights reserved.
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/UDivINodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/UDivINodeIdealizationTests.java
index 7183e0b311a..dd135c93e0d 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/UDivINodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/UDivINodeIdealizationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import compiler.lib.ir_framework.*;
 /*
  * @test
  * @bug 8332268
+ * @key randomness
  * @summary Test that Ideal transformations of UDivINode* are being performed as expected.
  * @library /test/lib /
  * @run driver compiler.c2.irTests.UDivINodeIdealizationTests
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/UDivLNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/UDivLNodeIdealizationTests.java
index a5cfc2cddc5..bc80805cabd 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/UDivLNodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/UDivLNodeIdealizationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import compiler.lib.ir_framework.*;
 /*
  * @test
  * @bug 8332268
+ * @key randomness
  * @summary Test that Ideal transformations of UDivLNode* are being performed as expected.
  * @library /test/lib /
  * @run driver compiler.c2.irTests.UDivLNodeIdealizationTests
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/UModINodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/UModINodeIdealizationTests.java
index fa24033ab46..99982c70b6e 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/UModINodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/UModINodeIdealizationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import compiler.lib.ir_framework.*;
 /*
  * @test
  * @bug 8332268
+ * @key randomness
  * @summary Test that Ideal transformations of UModINode* are being performed as expected.
  * @library /test/lib /
  * @run driver compiler.c2.irTests.UModINodeIdealizationTests
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/UModLNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/UModLNodeIdealizationTests.java
index 93ae861cfaa..9bbded327e0 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/UModLNodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/UModLNodeIdealizationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import compiler.lib.ir_framework.*;
 /*
  * @test
  * @bug 8332268
+ * @key randomness
  * @summary Test that Ideal transformations of UModLNode* are being performed as expected.
  * @library /test/lib /
  * @run driver compiler.c2.irTests.UModLNodeIdealizationTests
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java b/test/hotspot/jtreg/compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java
index 8d25706f521..24065bd97b9 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/ciReplay/InliningBase.java b/test/hotspot/jtreg/compiler/ciReplay/InliningBase.java
index fbe2e89a45d..c4642dc9743 100644
--- a/test/hotspot/jtreg/compiler/ciReplay/InliningBase.java
+++ b/test/hotspot/jtreg/compiler/ciReplay/InliningBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/compilercontrol/commands/OptionTest.java b/test/hotspot/jtreg/compiler/compilercontrol/commands/OptionTest.java
index aeeceac4ee2..901fd33bf6b 100644
--- a/test/hotspot/jtreg/compiler/compilercontrol/commands/OptionTest.java
+++ b/test/hotspot/jtreg/compiler/compilercontrol/commands/OptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/hotspot/jtreg/compiler/controldependency/TestDivDependentOnMainLoopGuard.java b/test/hotspot/jtreg/compiler/controldependency/TestDivDependentOnMainLoopGuard.java
index a6b7a462743..27fdc6b9e34 100644
--- a/test/hotspot/jtreg/compiler/controldependency/TestDivDependentOnMainLoopGuard.java
+++ b/test/hotspot/jtreg/compiler/controldependency/TestDivDependentOnMainLoopGuard.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8349139
+ * @key randomness
  * @summary C2: Div looses dependency on condition that guarantees divisor not null in counted loop
  * @library /test/lib /
  * @run main/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=TestDivDependentOnMainLoopGuard::*
diff --git a/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java b/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java
index 4956b149574..59c8b2efa11 100644
--- a/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java
+++ b/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java b/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java
index ef947c4e057..50677f5197e 100644
--- a/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java
+++ b/test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/TestFindInstMemRecursion.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestFindInstMemRecursion.java
index 8fbeae46e59..5fde1c4cb03 100644
--- a/test/hotspot/jtreg/compiler/escapeAnalysis/TestFindInstMemRecursion.java
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestFindInstMemRecursion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/TestIterativeEA.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestIterativeEA.java
index a5688ef8041..bdd5c2aa481 100644
--- a/test/hotspot/jtreg/compiler/escapeAnalysis/TestIterativeEA.java
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestIterativeEA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/TestReduceAllocationAndNonReduciblePhi.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestReduceAllocationAndNonReduciblePhi.java
index 76c55a7b958..0980e16e9af 100644
--- a/test/hotspot/jtreg/compiler/escapeAnalysis/TestReduceAllocationAndNonReduciblePhi.java
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestReduceAllocationAndNonReduciblePhi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/floatingpoint/ScalarFPtoIntCastTest.java b/test/hotspot/jtreg/compiler/floatingpoint/ScalarFPtoIntCastTest.java
index e8575cfe6b6..80a9aca9ae2 100644
--- a/test/hotspot/jtreg/compiler/floatingpoint/ScalarFPtoIntCastTest.java
+++ b/test/hotspot/jtreg/compiler/floatingpoint/ScalarFPtoIntCastTest.java
@@ -90,7 +90,7 @@ public class ScalarFPtoIntCastTest {
     @IR(counts = {IRNode.X86_SCONV_F2I, "> 0"},
         applyIfPlatform = {"x64", "true"},
         applyIfCPUFeature = {"avx10_2", "false"})
-    @IR(counts = {IRNode.X86_SCONV_F2I_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_SCONV_F2I_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public void float2int() {
         for (int i = 0; i < COUNT; i++) {
@@ -106,7 +106,7 @@ public class ScalarFPtoIntCastTest {
     @IR(counts = {IRNode.X86_SCONV_F2L, "> 0"},
         applyIfPlatform = {"x64", "true"},
         applyIfCPUFeature = {"avx10_2", "false"})
-    @IR(counts = {IRNode.X86_SCONV_F2L_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_SCONV_F2L_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public void float2long() {
         for (int i = 0; i < COUNT; i++) {
@@ -122,7 +122,7 @@ public class ScalarFPtoIntCastTest {
     @IR(counts = {IRNode.X86_SCONV_F2I, "> 0"},
         applyIfPlatform = {"x64", "true"},
         applyIfCPUFeature = {"avx10_2", "false"})
-    @IR(counts = {IRNode.X86_SCONV_F2I_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_SCONV_F2I_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public void float2short() {
         for (int i = 0; i < COUNT; i++) {
@@ -138,7 +138,7 @@ public class ScalarFPtoIntCastTest {
     @IR(counts = {IRNode.X86_SCONV_F2I, "> 0"},
         applyIfPlatform = {"x64", "true"},
         applyIfCPUFeature = {"avx10_2", "false"})
-    @IR(counts = {IRNode.X86_SCONV_F2I_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_SCONV_F2I_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public void float2byte() {
         for (int i = 0; i < COUNT; i++) {
@@ -154,7 +154,7 @@ public class ScalarFPtoIntCastTest {
     @IR(counts = {IRNode.X86_SCONV_D2I, "> 0"},
         applyIfPlatform = {"x64", "true"},
         applyIfCPUFeature = {"avx10_2", "false"})
-    @IR(counts = {IRNode.X86_SCONV_D2I_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_SCONV_D2I_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public void double2int() {
         for (int i = 0; i < COUNT; i++) {
@@ -170,7 +170,7 @@ public class ScalarFPtoIntCastTest {
     @IR(counts = {IRNode.X86_SCONV_D2L, "> 0"},
         applyIfPlatform = {"x64", "true"},
         applyIfCPUFeature = {"avx10_2", "false"})
-    @IR(counts = {IRNode.X86_SCONV_D2L_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_SCONV_D2L_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public void double2long() {
         for (int i = 0; i < COUNT; i++) {
@@ -186,7 +186,7 @@ public class ScalarFPtoIntCastTest {
     @IR(counts = {IRNode.X86_SCONV_D2I, "> 0"},
         applyIfPlatform = {"x64", "true"},
         applyIfCPUFeature = {"avx10_2", "false"})
-    @IR(counts = {IRNode.X86_SCONV_D2I_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_SCONV_D2I_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public void double2short() {
         for (int i = 0; i < COUNT; i++) {
@@ -202,7 +202,7 @@ public class ScalarFPtoIntCastTest {
     @IR(counts = {IRNode.X86_SCONV_D2I, "> 0"},
         applyIfPlatform = {"x64", "true"},
         applyIfCPUFeature = {"avx10_2", "false"})
-    @IR(counts = {IRNode.X86_SCONV_D2I_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_SCONV_D2I_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public void double2byte() {
         for (int i = 0; i < COUNT; i++) {
diff --git a/test/hotspot/jtreg/compiler/gcbarriers/TestZGCBarrierElision.java b/test/hotspot/jtreg/compiler/gcbarriers/TestZGCBarrierElision.java
index 4c94cd62c42..ff20f750935 100644
--- a/test/hotspot/jtreg/compiler/gcbarriers/TestZGCBarrierElision.java
+++ b/test/hotspot/jtreg/compiler/gcbarriers/TestZGCBarrierElision.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/igvn/ClashingSpeculativeTypePhiNode.java b/test/hotspot/jtreg/compiler/igvn/ClashingSpeculativeTypePhiNode.java
new file mode 100644
index 00000000000..7d8f9e8d409
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/igvn/ClashingSpeculativeTypePhiNode.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2025, Red Hat, Inc.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8371716
+ * @summary Ranges can be proven to be disjoint but not orderable (thanks to unsigned range)
+ *          Comparing such values in such range with != should always be true.
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-TieredCompilation
+ *                   -XX:-UseOnStackReplacement
+ *                   -XX:-BackgroundCompilation
+ *                   -XX:CompileOnly=${test.main.class}::test1
+ *                   -XX:CompileCommand=quiet
+ *                   -XX:TypeProfileLevel=222
+ *                   -XX:+AlwaysIncrementalInline
+ *                   -XX:VerifyIterativeGVN=10
+ *                   -XX:CompileCommand=dontinline,${test.main.class}::notInlined1
+ *                   ${test.main.class}
+ *
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:-TieredCompilation
+ *                   -XX:-UseOnStackReplacement
+ *                   -XX:-BackgroundCompilation
+ *                   -XX:CompileOnly=${test.main.class}::test2
+ *                   -XX:CompileOnly=${test.main.class}::inlined3
+ *                   -XX:CompileCommand=quiet
+ *                   -XX:TypeProfileLevel=200
+ *                   -XX:+AlwaysIncrementalInline
+ *                   -XX:VerifyIterativeGVN=10
+ *                   -XX:CompileCommand=dontinline,${test.main.class}::notInlined1
+ *                   -XX:+StressIncrementalInlining
+ *                   ${test.main.class}
+ *
+ * @run main ${test.main.class}
+ */
+
+package compiler.igvn;
+
+public class ClashingSpeculativeTypePhiNode {
+    public static void main(String[] args) {
+        main1();
+        main2();
+    }
+
+    // 1st case
+
+    static void main1() {
+        for (int i = 0; i < 20_000; i++) {
+            test1(false);         // returns null
+            inlined1(true, true); // returns C1
+            inlined2(false);      // returns C2
+        }
+    }
+
+    private static Object test1(boolean flag1) {
+        return inlined1(flag1, false);
+        // When inlined1 is inlined
+        // return Phi(flag1, inlined2(flag2), null)
+        // inlined2 is speculatively returning C1, known from the calls `inlined1(true, true)` in main1
+        // Phi node gets speculative type C1
+        // When inline2 is inlined
+        // return Phi[C1](flag1, Phi(false, new C1(), notInlined1()), null)
+        // => Phi[C1](flag1, notInlined1(), null)
+        // notInlined1 is speculatively returning C2, known from `inline2(false)` in main1
+        // return Phi[C1](flag1, notInlined1()[C2], null)
+        // Clashing speculative type between Phi's _type (C1) and union of inputs (C2).
+    }
+
+    private static Object inlined1(boolean flag1, boolean flag2) {
+        if (flag1) {
+            return inlined2(flag2); // C1
+        }
+        return null;
+    }
+
+    private static Object inlined2(boolean flag2) {
+        if (flag2) {
+            return new C1();
+        }
+        return notInlined1(); // C2
+    }
+
+    private static Object notInlined1() {
+        return new C2();
+    }
+
+    // 2nd case
+
+    static void main2() {
+        for (int i = 0; i < 20_000; i++) {
+            inlined3(new C1());
+        }
+        for (int i = 0; i < 20_000; i++) {
+            test2(true, new C2());
+            test2(false, new C2());
+        }
+    }
+
+
+    private static Object test2(boolean flag1, Object o) {
+        o = inlined4(o);
+        if (flag1) {
+            return inlined3(o);
+        }
+        return null;
+        // We profile only parameters. Param o is speculated to be C2.
+        // return Phi(flag1, inline3(inline4(o[C2])), null)
+        // We inline inline3
+        // return Phi(flag1, inline4(o[C2])[C1], null)
+        // As input of inline3, inline4(o) is speculated to be C1. The Phi has C1 as speculative type in _type
+        // return Phi[C1](flag1, o[C2], null)
+        // Since o is speculated to be C2 as parameter of test2, we get a clash.
+    }
+
+    private static Object inlined3(Object o) {
+        return o; // C1
+    }
+
+    private static Object inlined4(Object o) {
+        return o;
+    }
+
+    static class C1 {
+
+    }
+
+    static class C2 {
+
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/igvn/ExpressionFuzzer.java b/test/hotspot/jtreg/compiler/igvn/ExpressionFuzzer.java
index 40bfb2e4319..875ef57c865 100644
--- a/test/hotspot/jtreg/compiler/igvn/ExpressionFuzzer.java
+++ b/test/hotspot/jtreg/compiler/igvn/ExpressionFuzzer.java
@@ -23,9 +23,11 @@
 
 /*
  * @test
- * @bug 8359412
+ * @bug 8359412 8370922
+ * @key randomness
  * @summary Use the template framework library to generate random expressions.
  * @modules java.base/jdk.internal.misc
+ * @modules jdk.incubator.vector
  * @library /test/lib /
  * @compile ../lib/verify/Verify.java
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:CompileTaskTimeout=10000 compiler.igvn.ExpressionFuzzer
@@ -54,6 +56,7 @@ import compiler.lib.template_framework.library.Operations;
 import compiler.lib.template_framework.library.PrimitiveType;
 import compiler.lib.template_framework.library.TestFrameworkClass;
 import static compiler.lib.template_framework.library.CodeGenerationDataNameType.PRIMITIVE_TYPES;
+import static compiler.lib.template_framework.library.CodeGenerationDataNameType.SCALAR_NUMERIC_TYPES;
 
 // We generate random Expressions from primitive type operators.
 //
@@ -83,10 +86,14 @@ public class ExpressionFuzzer {
         comp.addJavaSourceCode("compiler.igvn.templated.ExpressionFuzzerInnerTest", generate(comp));
 
         // Compile the source file.
-        comp.compile();
+        comp.compile("--add-modules=jdk.incubator.vector");
 
         // compiler.igvn.templated.InnterTest.main(new String[] {});
-        comp.invoke("compiler.igvn.templated.ExpressionFuzzerInnerTest", "main", new Object[] {new String[] {}});
+        comp.invoke("compiler.igvn.templated.ExpressionFuzzerInnerTest", "main", new Object[] {new String[] {
+            "--add-modules=jdk.incubator.vector",
+            "--add-opens", "jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED",
+            "--add-opens", "java.base/java.lang=ALL-UNNAMED"
+        }});
     }
 
     // Generate a Java source file as String
@@ -188,10 +195,10 @@ public class ExpressionFuzzer {
                 case "byte", "short", "char", "int", "long" ->
                     List.of("val", Collections.nCopies(20, integralCmpTemplate.asToken(expression.returnType)));
                 // Float/Double have no range, just return the value:
-                case "float", "double" -> "val";
+                case "float", "double", "Float16" -> "val";
                 // Check if the boolean constant folded:
                 case "boolean" -> "val, val == true, val == false";
-                default -> throw new RuntimeException("should only be primitive types");
+                default -> throw new RuntimeException("type not supported yet: " + expression.returnType.name());
             }
             , "};\n",
             """
@@ -223,7 +230,7 @@ public class ExpressionFuzzer {
                 // Booleans do have an int-range, but restricting it would just make it constant, which
                 // is not very useful: we would like to keep it variable here. We already mix in variable
                 // arguments and constants in the testTemplate.
-                case "boolean", "float", "double" -> "return v;\n";
+                case "boolean", "float", "double", "Float16" -> "return v;\n";
                 case "byte", "short", "char", "int", "long" -> List.of(
                     // Sometimes constrain the signed range
                     //   v = min(max(v, CON1), CON2)
@@ -240,7 +247,7 @@ public class ExpressionFuzzer {
                     : List.of(),
                     // FUTURE: we could also constrain the unsigned bounds.
                     "return v;\n");
-                default -> throw new RuntimeException("should only be primitive types");
+                default -> throw new RuntimeException("type not supported yet: " + type.name());
             },
             """
             }
@@ -324,6 +331,7 @@ public class ExpressionFuzzer {
 
         // Generate expressions with the primitive types.
         for (PrimitiveType type : PRIMITIVE_TYPES) {
+            // Prmitive expressions are most important, so let's create many expressions per output type.
             for (int i = 0; i < 10; i++) {
                 // The depth determines roughly how many operations are going to be used in the expression.
                 int depth = RANDOM.nextInt(1, 20);
@@ -332,6 +340,21 @@ public class ExpressionFuzzer {
             }
         }
 
+        // Generate expressions with any scalar numeric types.
+        for (CodeGenerationDataNameType type : SCALAR_NUMERIC_TYPES) {
+            // The extended set of scalar numeric expressions (incl. special types such as Float16) are relevant
+            // but don't currently warrant the same number amount of testing time, so we only create 2 cases
+            // per type. Note: this still produces a lot of expressions, given that we have a lot of output
+            // types, and even if the output type is "float", we can still use other types in the expression,
+            // such as "float -> Float16 -> float". We can consider adjusting this arbitrary count in the future.
+            for (int i = 0; i < 2; i++) {
+                // The depth determines roughly how many operations are going to be used in the expression.
+                int depth = RANDOM.nextInt(1, 20);
+                Expression expression = Expression.nestRandomly(type, Operations.SCALAR_NUMERIC_OPERATIONS, depth);
+                tests.add(testTemplate.asToken(expression));
+            }
+        }
+
         // Create the test class, which runs all tests.
         return TestFrameworkClass.render(
             // package and class name.
@@ -340,7 +363,8 @@ public class ExpressionFuzzer {
             Set.of("compiler.lib.verify.*",
                    "java.util.Random",
                    "jdk.test.lib.Utils",
-                   "compiler.lib.generators.*"),
+                   "compiler.lib.generators.*",
+                   "jdk.incubator.vector.Float16"),
             // classpath, so the Test VM has access to the compiled class files.
             comp.getEscapedClassPathOfCompiledClasses(),
             // The list of tests.
diff --git a/test/hotspot/jtreg/compiler/igvn/IntegerDivValueTests.java b/test/hotspot/jtreg/compiler/igvn/IntegerDivValueTests.java
new file mode 100644
index 00000000000..3585d1347ac
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/igvn/IntegerDivValueTests.java
@@ -0,0 +1,505 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.igvn;
+
+import compiler.lib.generators.*;
+import compiler.lib.ir_framework.*;
+import jdk.test.lib.Asserts;
+
+/*
+ * @test
+ * @bug 8364766
+ * @summary Test value method of DivINode and DivLNode
+ * @key randomness
+ * @library /test/lib /
+ * @run driver compiler.igvn.IntegerDivValueTests
+ */
+public class IntegerDivValueTests {
+    private static final RestrictableGenerator<Integer> INTS = Generators.G.ints();
+    private static final RestrictableGenerator<Long> LONGS = Generators.G.longs();
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @ForceInline
+    private int getIntConstant(int value) {
+        // Simply return the given value to avoid javac already optimizing the operation away
+        return value;
+    }
+
+    private static final int INT_CONST_1 = INTS.next();
+    private static final int INT_CONST_2 = INTS.next();
+
+    @Test
+    @IR(failOn = {IRNode.DIV, IRNode.URSHIFT, IRNode.RSHIFT, IRNode.MUL, IRNode.ADD, IRNode.SUB, IRNode.AND})
+    public int testIntConstantFolding() {
+        // All constants available during parsing
+        return INT_CONST_1 / INT_CONST_2;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.DIV, IRNode.URSHIFT, IRNode.RSHIFT, IRNode.MUL, IRNode.ADD, IRNode.SUB, IRNode.AND})
+    public int testIntConstantFoldingSpecialCase() {
+        // All constants available during parsing
+        return getIntConstant(Integer.MIN_VALUE) / getIntConstant(-1);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.DIV, IRNode.URSHIFT, IRNode.RSHIFT, IRNode.MUL, IRNode.ADD, IRNode.SUB, IRNode.AND})
+    public int testIntRange(int in) {
+        int a = (in & 7) + 16;
+        return a / 12; // [16, 23] / 12 is constant 1
+    }
+
+    @Test
+    @IR(failOn = {IRNode.DIV, IRNode.URSHIFT, IRNode.RSHIFT, IRNode.MUL, IRNode.ADD, IRNode.SUB, IRNode.AND})
+    public boolean testIntRange2(int in) {
+        int a = (in & 7) + 16;
+        return a / 4 > 3; // [16, 23] / 4 => [4, 5]
+    }
+
+    @Test
+    @IR(counts = {IRNode.DIV_I, "1"})
+    public boolean testIntRange3(int in, int in2) {
+        int a = (in & 31) + 16;
+        int b = (in2 & 3) + 5;
+        return a / b > 4; // [16, 47] / [5, 8] => [2, 9]
+    }
+
+    @Test
+    @IR(failOn = {IRNode.DIV, IRNode.URSHIFT, IRNode.RSHIFT, IRNode.MUL, IRNode.ADD, IRNode.SUB, IRNode.AND})
+    public boolean testIntRange4(int in, int in2) {
+        int a = (in & 15); // [0, 15]
+        int b = (in2 & 3) + 1; // [1, 4]
+        return a / b >= 0;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.DIV, IRNode.URSHIFT, IRNode.RSHIFT, IRNode.MUL, IRNode.ADD, IRNode.SUB, IRNode.AND})
+    public boolean testIntRange5(int in, int in2) {
+        int a = (in & 15) + 5; // [5, 20]
+        int b = (in2 & 3) + 1; // [1, 4]
+        return a / b > 0;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.DIV, IRNode.URSHIFT, IRNode.RSHIFT, IRNode.MUL, IRNode.ADD, IRNode.SUB, IRNode.AND})
+    public boolean testIntRange6(int in, int in2) {
+        int a = (in & 15) + 5; // [5, 20]
+        int b = (in2 & 7) - 1; // [-1, 5]
+        if (b == 0) return false;
+        return a / b < -20;
+    }
+
+    @Test
+    @IR(counts = {IRNode.DIV_I, "1"})
+    public boolean testIntRange7(int in, int in2) {
+        int a = (in & 15) + 5; // [5, 20]
+        int b = (in2 & 7) - 1; // [-1, 5]
+        if (b == 0) return false;
+        return a / b > 0;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.DIV, IRNode.URSHIFT, IRNode.RSHIFT, IRNode.MUL, IRNode.ADD, IRNode.SUB, IRNode.AND})
+    public int testIntRange8(int in, int in2) {
+        int a = (in & 31) + 128; // [128, 159]
+        int b = (in2 & 15) + 100; // [100, 115]
+        return a / b; // [1, 1] -> can be constant
+    }
+
+    private static final int INT_LIMIT_1 = INTS.next();
+    private static final int INT_LIMIT_2 = INTS.next();
+    private static final int INT_LIMIT_3 = INTS.next();
+    private static final int INT_LIMIT_4 = INTS.next();
+    private static final int INT_LIMIT_5 = INTS.next();
+    private static final int INT_LIMIT_6 = INTS.next();
+    private static final int INT_LIMIT_7 = INTS.next();
+    private static final int INT_LIMIT_8 = INTS.next();
+    private static final int INT_RANGE_LIMIT_X_LO;
+    private static final int INT_RANGE_LIMIT_X_HI;
+    private static final int INT_RANGE_LIMIT_Y_LO;
+    private static final int INT_RANGE_LIMIT_Y_HI;
+
+    static {
+        int limit1 = INTS.next();
+        int limit2 = INTS.next();
+        if (limit2 > limit1) {
+            INT_RANGE_LIMIT_X_LO = limit1;
+            INT_RANGE_LIMIT_X_HI = limit2;
+        } else {
+            INT_RANGE_LIMIT_X_LO = limit2;
+            INT_RANGE_LIMIT_X_HI = limit1;
+        }
+
+        int limit3 = INTS.next();
+        int limit4 = INTS.next();
+        if (limit4 > limit3) {
+            INT_RANGE_LIMIT_Y_LO = limit3;
+            INT_RANGE_LIMIT_Y_HI = limit4;
+        } else {
+            INT_RANGE_LIMIT_Y_LO = limit4;
+            INT_RANGE_LIMIT_Y_HI = limit3;
+        }
+    }
+
+    @ForceInline
+    private int clampInt(int val, int lo, int hi) {
+        return Math.min(hi, Math.max(val, lo));
+    }
+
+    @ForceInline
+    private int calculateIntSum(int z) {
+        int sum = 0;
+        if (z < INT_LIMIT_1) sum += 1;
+        if (z < INT_LIMIT_2) sum += 2;
+        if (z < INT_LIMIT_3) sum += 4;
+        if (z < INT_LIMIT_4) sum += 8;
+        if (z > INT_LIMIT_5) sum += 16;
+        if (z > INT_LIMIT_6) sum += 32;
+        if (z > INT_LIMIT_7) sum += 64;
+        if (z > INT_LIMIT_8) sum += 128;
+
+        return sum;
+    }
+
+    @Test
+    public int testIntRandomLimits(int x, int y) {
+        x = clampInt(x, INT_RANGE_LIMIT_X_LO, INT_RANGE_LIMIT_X_HI);
+        y = clampInt(y, INT_RANGE_LIMIT_Y_LO, INT_RANGE_LIMIT_Y_HI);
+        int z = x / y;
+
+        return calculateIntSum(z);
+    }
+
+    @DontCompile
+    public int testIntRandomLimitsInterpreted(int x, int y) {
+        x = clampInt(x, INT_RANGE_LIMIT_X_LO, INT_RANGE_LIMIT_X_HI);
+        y = clampInt(y, INT_RANGE_LIMIT_Y_LO, INT_RANGE_LIMIT_Y_HI);
+        int z = x / y;
+
+        return calculateIntSum(z);
+    }
+
+    @Run(test = {"testIntConstantFolding", "testIntConstantFoldingSpecialCase"})
+    public void checkIntConstants(RunInfo info) {
+        Asserts.assertEquals(INT_CONST_1 / INT_CONST_2, testIntConstantFolding());
+        Asserts.assertEquals(Integer.MIN_VALUE, testIntConstantFoldingSpecialCase());
+    }
+
+    @Run(test = {"testIntRange", "testIntRange2", "testIntRange3", "testIntRange4", "testIntRange5", "testIntRange6", "testIntRange7", "testIntRange8", "testIntRandomLimits"})
+    public void checkIntRanges(RunInfo info) {
+        for (int j = 0; j < 20; j++) {
+            int i1 = INTS.next();
+            int i2 = INTS.next();
+            checkInt(i1, i2);
+        }
+    }
+
+    @DontCompile
+    public void checkInt(int in, int in2) {
+        int a;
+        int b;
+        a = (in & 7) + 16;
+        Asserts.assertEquals(a / 12, testIntRange(in));
+
+        a = (in & 7) + 16;
+        Asserts.assertEquals(a / 4 > 3, testIntRange2(in));
+
+        a = (in & 31) + 16;
+        b = (in2 & 3) + 5;
+        Asserts.assertEquals(a / b > 4, testIntRange3(in, in2));
+
+        a = (in & 15);
+        b = (in2 & 3) + 1;
+        Asserts.assertEquals(a / b >= 0, testIntRange4(in, in2));
+
+        a = (in & 15) + 5;
+        b = (in2 & 3) + 1;
+        Asserts.assertEquals(a / b > 0, testIntRange5(in, in2));
+
+        a = (in & 15) + 5;
+        b = (in2 & 7) - 1;
+        Asserts.assertEquals(b == 0 ? false : a / b < -20, testIntRange6(in, in2));
+
+        a = (in & 15) + 5;
+        b = (in2 & 7) - 1;
+        Asserts.assertEquals(b == 0 ? false : a / b > 0, testIntRange7(in, in2));
+
+        a = (in & 31) + 128;
+        b = (in2 & 15) + 100;
+        Asserts.assertEquals(a / b, testIntRange8(in, in2));
+
+        int res;
+        try {
+            res = testIntRandomLimitsInterpreted(a, b);
+        } catch (ArithmeticException _) {
+            try {
+                testIntRandomLimits(a, b);
+                Asserts.fail("Expected ArithmeticException");
+                return; // unreachable
+            } catch (ArithmeticException _) {
+                return; // test succeeded, no result to assert
+            }
+        }
+        Asserts.assertEQ(res, testIntRandomLimits(a, b));
+    }
+
+    // Long variants
+
+    @ForceInline
+    private long getLongConstant(long value) {
+        // Simply return the given value to avoid javac already optimizing the operation away
+        return value;
+    }
+
+    private static final long LONG_CONST_1 = LONGS.next();
+    private static final long LONG_CONST_2 = LONGS.next();
+
+    @Test
+    //@IR(failOn = {IRNode.DIV, IRNode.URSHIFT, IRNode.RSHIFT, IRNode.MUL, IRNode.ADD, IRNode.SUB, IRNode.AND})
+    // This results in a series of nodes due to DivLNode::Ideal and in particular transform_long_divide, which operates on non-constant divisors.
+    // transform_long_divide splits up the division into multiple other nodes, such as MulHiLNode, which does not have a good Value() implemantion.
+    // When JDK-8366815 is fixed, these rules should be reenabled
+    // Alternatively, a better MulHiLNode::Value() implemantion should also lead to constant folding
+    public long testLongConstantFolding() {
+        // All constants available during parsing
+        return LONG_CONST_1 / LONG_CONST_2;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.DIV, IRNode.URSHIFT, IRNode.RSHIFT, IRNode.MUL, IRNode.ADD, IRNode.SUB, IRNode.AND})
+    public long testLongConstantFoldingSpecialCase() {
+        // All constants available during parsing
+        return getLongConstant(Long.MIN_VALUE) / getLongConstant(-1L);
+    }
+
+    @Test
+    //@IR(failOn = {IRNode.DIV, IRNode.URSHIFT, IRNode.RSHIFT, IRNode.MUL, IRNode.ADD, IRNode.SUB, IRNode.AND})
+    // This results in a series of nodes due to DivLNode::Ideal and in particular transform_long_divide, which operates on non-constant divisors.
+    // transform_long_divide splits up the division into multiple other nodes, such as MulHiLNode, which does not have a good Value() implemantion.
+    // When JDK-8366815 is fixed, these rules should be reenabled
+    // Alternatively, a better MulHiLNode::Value() implemantion should also lead to constant folding
+    @IR(counts = {IRNode.RSHIFT_L, "> 0", IRNode.ADD_L, "> 0", IRNode.AND_L, "> 0"}, failOn = {IRNode.DIV})
+    public long testLongRange(long in) {
+        long a = (in & 7L) + 16L;
+        return a / 12L; // [16, 23] / 12 is constant 1
+    }
+
+    @Test
+    @IR(failOn = {IRNode.DIV, IRNode.URSHIFT, IRNode.RSHIFT, IRNode.MUL, IRNode.ADD, IRNode.SUB, IRNode.AND})
+    public boolean testLongRange2(long in) {
+        long a = (in & 7L) + 16L;
+        return a / 4L > 3L; // [16, 23] / 4 => [4, 5]
+    }
+
+    @Test
+    @IR(counts = {IRNode.DIV_L, "1"})
+    public boolean testLongRange3(long in, long in2) {
+        long a = (in & 31L) + 16L;
+        long b = (in2 & 3L) + 5L;
+        return a / b > 4L; // [16, 47] / [5, 8] => [2, 9]
+    }
+
+    @Test
+    @IR(failOn = {IRNode.DIV, IRNode.URSHIFT, IRNode.RSHIFT, IRNode.MUL, IRNode.ADD, IRNode.SUB, IRNode.AND})
+
+    public boolean testLongRange4(long in, long in2) {
+        long a = (in & 15L); // [0, 15]
+        long b = (in2 & 3L) + 1L; // [1, 4]
+        return a / b >= 0L;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.DIV, IRNode.URSHIFT, IRNode.RSHIFT, IRNode.MUL, IRNode.ADD, IRNode.SUB, IRNode.AND})
+    public boolean testLongRange5(long in, long in2) {
+        long a = (in & 15L) + 5L; // [5, 20]
+        long b = (in2 & 3L) + 1L; // [1, 4]
+        return a / b > 0L;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.DIV, IRNode.URSHIFT, IRNode.RSHIFT, IRNode.MUL, IRNode.ADD, IRNode.SUB, IRNode.AND})
+    public boolean testLongRange6(long in, long in2) {
+        long a = (in & 15L) + 5L; // [5, 20]
+        long b = (in2 & 7L) - 1L; // [-1, 5]
+        if (b == 0L) return false;
+        return a / b < -20L;
+    }
+
+    @Test
+    @IR(counts = {IRNode.DIV_L, "1"})
+    public boolean testLongRange7(long in, long in2) {
+        long a = (in & 15L) + 5L; // [5, 20]
+        long b = (in2 & 7L) - 1L; // [-1, 5]
+        if (b == 0L) return false;
+        return a / b > 0L;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.DIV, IRNode.URSHIFT, IRNode.RSHIFT, IRNode.MUL, IRNode.ADD, IRNode.SUB, IRNode.AND})
+    public long testLongRange8(long in, long in2) {
+        long a = (in & 31L) + 128L; // [128, 159]
+        long b = (in2 & 15L) + 100L; // [100, 115]
+        return a / b; // [1, 1] -> can be constant
+    }
+
+
+    private static final long LONG_LIMIT_1 = LONGS.next();
+    private static final long LONG_LIMIT_2 = LONGS.next();
+    private static final long LONG_LIMIT_3 = LONGS.next();
+    private static final long LONG_LIMIT_4 = LONGS.next();
+    private static final long LONG_LIMIT_5 = LONGS.next();
+    private static final long LONG_LIMIT_6 = LONGS.next();
+    private static final long LONG_LIMIT_7 = LONGS.next();
+    private static final long LONG_LIMIT_8 = LONGS.next();
+    private static final long LONG_RANGE_LIMIT_X_LO;
+    private static final long LONG_RANGE_LIMIT_X_HI;
+    private static final long LONG_RANGE_LIMIT_Y_LO;
+    private static final long LONG_RANGE_LIMIT_Y_HI;
+
+    static {
+        long limit1 = LONGS.next();
+        long limit2 = LONGS.next();
+        if (limit2 > limit1) {
+            LONG_RANGE_LIMIT_X_LO = limit1;
+            LONG_RANGE_LIMIT_X_HI = limit2;
+        } else {
+            LONG_RANGE_LIMIT_X_LO = limit2;
+            LONG_RANGE_LIMIT_X_HI = limit1;
+        }
+
+        long limit3 = LONGS.next();
+        long limit4 = LONGS.next();
+        if (limit4 > limit3) {
+            LONG_RANGE_LIMIT_Y_LO = limit3;
+            LONG_RANGE_LIMIT_Y_HI = limit4;
+        } else {
+            LONG_RANGE_LIMIT_Y_LO = limit4;
+            LONG_RANGE_LIMIT_Y_HI = limit3;
+        }
+    }
+
+    @ForceInline
+    private long clampLong(long val, long lo, long hi) {
+        return Math.min(hi, Math.max(val, lo));
+    }
+
+    @ForceInline
+    private int calculateLongSum(long z) {
+        int sum = 0;
+        if (z < LONG_LIMIT_1) sum += 1;
+        if (z < LONG_LIMIT_2) sum += 2;
+        if (z < LONG_LIMIT_3) sum += 4;
+        if (z < LONG_LIMIT_4) sum += 8;
+        if (z > LONG_LIMIT_5) sum += 16;
+        if (z > LONG_LIMIT_6) sum += 32;
+        if (z > LONG_LIMIT_7) sum += 64;
+        if (z > LONG_LIMIT_8) sum += 128;
+
+        return sum;
+    }
+
+    @Test
+    public int testLongRandomLimits(long x, long y) {
+        x = clampLong(x, LONG_RANGE_LIMIT_X_LO, LONG_RANGE_LIMIT_X_HI);
+        y = clampLong(y, LONG_RANGE_LIMIT_Y_LO, LONG_RANGE_LIMIT_Y_HI);
+        long z = x / y;
+
+        return calculateLongSum(z);
+    }
+
+    @DontCompile
+    public int testLongRandomLimitsInterpreted(long x, long y) {
+        x = clampLong(x, LONG_RANGE_LIMIT_X_LO, LONG_RANGE_LIMIT_X_HI);
+        y = clampLong(y, LONG_RANGE_LIMIT_Y_LO, LONG_RANGE_LIMIT_Y_HI);
+        long z = x / y;
+
+        return calculateLongSum(z);
+    }
+
+    @Run(test = {"testLongConstantFolding", "testLongConstantFoldingSpecialCase"})
+    public void checkLongConstants(RunInfo infoLong) {
+        Asserts.assertEquals(LONG_CONST_1 / LONG_CONST_2, testLongConstantFolding());
+        Asserts.assertEquals(Long.MIN_VALUE, testLongConstantFoldingSpecialCase());
+    }
+
+    @Run(test = {"testLongRange", "testLongRange2", "testLongRange3", "testLongRange4", "testLongRange5", "testLongRange6", "testLongRange7", "testLongRange8", "testLongRandomLimits"})
+    public void checkLongRanges(RunInfo info) {
+        for (int j = 0; j < 20; j++) {
+            long l1 = LONGS.next();
+            long l2 = LONGS.next();
+            checkLong(l1, l2);
+        }
+    }
+
+    @DontCompile
+    public void checkLong(long in, long in2) {
+        long a;
+        long b;
+        a = (in & 7L) + 16L;
+        Asserts.assertEquals(a / 12L, testLongRange(in));
+
+        a = (in & 7L) + 16L;
+        Asserts.assertEquals(a / 4L > 3L, testLongRange2(in));
+
+        a = (in & 31L) + 16L;
+        b = (in2 & 3L) + 5L;
+        Asserts.assertEquals(a / b > 4L, testLongRange3(in, in2));
+
+        a = (in & 15L);
+        b = (in2 & 3L) + 1L;
+        Asserts.assertEquals(a / b >= 0L, testLongRange4(in, in2));
+
+        a = (in & 15L) + 5L;
+        b = (in2 & 3L) + 1L;
+        Asserts.assertEquals(a / b > 0L, testLongRange5(in, in2));
+
+        a = (in & 15L) + 5L;
+        b = (in2 & 7L) - 1L;
+        Asserts.assertEquals(b == 0 ? false : a / b < -20L, testLongRange6(in, in2));
+
+        a = (in & 15L) + 5L;
+        b = (in2 & 7L) - 1L;
+        Asserts.assertEquals(b == 0 ? false : a / b > 0L, testLongRange7(in, in2));
+
+        a = (in & 31L) + 128L;
+        b = (in2 & 15L) + 100L;
+        Asserts.assertEquals(a / b, testLongRange8(in, in2));
+
+        int res;
+        try {
+            res = testLongRandomLimitsInterpreted(a, b);
+        } catch (ArithmeticException _) {
+            try {
+                testLongRandomLimits(a, b);
+                Asserts.fail("Expected ArithmeticException");
+                return; // unreachable
+            } catch (ArithmeticException _) {
+                return; // test succeeded, no result to assert
+            }
+        }
+        Asserts.assertEQ(res, testLongRandomLimits(a, b));
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/igvn/TestMinMaxIdeal.java b/test/hotspot/jtreg/compiler/igvn/TestMinMaxIdeal.java
new file mode 100644
index 00000000000..c99d3e07b74
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/igvn/TestMinMaxIdeal.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2025 IBM Corporation. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8373396
+ * @summary Verify that min/max add ideal optimizations get applied correctly
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib /
+ * @run driver ${test.main.class}
+ */
+
+package compiler.igvn;
+
+import compiler.lib.compile_framework.CompileFramework;
+import compiler.lib.template_framework.Template;
+import compiler.lib.template_framework.TemplateToken;
+import compiler.lib.template_framework.library.CodeGenerationDataNameType;
+import compiler.lib.template_framework.library.PrimitiveType;
+import compiler.lib.template_framework.library.TestFrameworkClass;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
+
+import static compiler.lib.template_framework.Template.let;
+import static compiler.lib.template_framework.Template.scope;
+
+public class TestMinMaxIdeal {
+    public static void main(String[] args) {
+        // Create a new CompileFramework instance.
+        CompileFramework comp = new CompileFramework();
+
+        // Add a java source file.
+        comp.addJavaSourceCode("compiler.igvn.templated.MinMaxIdeal", generate(comp));
+
+        // Compile the source file.
+        comp.compile();
+
+        comp.invoke("compiler.igvn.templated.MinMaxIdeal", "main", new Object[] {new String[] {}});
+    }
+
+    private static String generate(CompileFramework comp) {
+        // Create a list to collect all tests.
+        List<TemplateToken> testTemplateTokens = Stream.of(Op.values())
+            .map(op -> new TestGenerator(op).generate())
+            .toList();
+
+        // Create the test class, which runs all testTemplateTokens.
+        return TestFrameworkClass.render(
+            // package and class name.
+            "compiler.igvn.templated", "MinMaxIdeal",
+            // List of imports.
+            Collections.emptySet(),
+            // classpath, so the Test VM has access to the compiled class files.
+            comp.getEscapedClassPathOfCompiledClasses(),
+            // The list of tests.
+            testTemplateTokens);
+    }
+
+    enum Op {
+        MIN_I("min", CodeGenerationDataNameType.ints()),
+        MAX_I("max", CodeGenerationDataNameType.ints()),
+        MIN_L("min", CodeGenerationDataNameType.longs()),
+        MAX_L("max", CodeGenerationDataNameType.longs());
+
+        final String functionName;
+        final PrimitiveType type;
+
+        Op(String functionName, PrimitiveType type) {
+            this.functionName = functionName;
+            this.type = type;
+        }
+    }
+
+    record TestGenerator(Op op) {
+        TemplateToken generate() {
+            var template = Template.make(() -> scope(
+                let("boxedTypeName", op.type.boxedTypeName()),
+                let("op", op.name()),
+                let("type", op.type.name()),
+                let("functionName", op.functionName),
+                """
+                @Test
+                @IR(counts = {IRNode.#op, "= 1"},
+                    phase = CompilePhase.BEFORE_MACRO_EXPANSION)
+                @Arguments(values = {Argument.NUMBER_42, Argument.NUMBER_42})
+                public #type test_commute_#op(#type a, #type b) {
+                    return #boxedTypeName.#functionName(a, b) + #boxedTypeName.#functionName(b, a);
+                }
+
+                @Test
+                @IR(counts = {IRNode.#op, "= 1"},
+                    phase = CompilePhase.BEFORE_MACRO_EXPANSION)
+                @Arguments(values = {Argument.NUMBER_42})
+                public #type test_flatten_#op(#type a) {
+                    return #boxedTypeName.#functionName(#boxedTypeName.#functionName(a, 1), 2);
+                }
+
+                @Test
+                @IR(counts = {IRNode.#op, "= 2"},
+                    phase = CompilePhase.BEFORE_MACRO_EXPANSION)
+                @Arguments(values = {Argument.NUMBER_42, Argument.NUMBER_42})
+                public #type test_push_constant_left_#op(#type a, #type b) {
+                    return #boxedTypeName.#functionName(#boxedTypeName.#functionName(a, 1), b) + #boxedTypeName.#functionName(b, a);
+                }
+
+                @Test
+                @IR(counts = {IRNode.#op, "= 2"},
+                    phase = CompilePhase.BEFORE_MACRO_EXPANSION)
+                @Arguments(values = {Argument.NUMBER_42, Argument.NUMBER_42})
+                public #type test_push_constant_right_#op(#type a, #type b) {
+                    return #boxedTypeName.#functionName(a, #boxedTypeName.#functionName(b, 1)) + #boxedTypeName.#functionName(b, a);
+                }
+                """
+            ));
+            return template.asToken();
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/igvn/TestNodeWithNoUseAfterPhiIdeal.java b/test/hotspot/jtreg/compiler/igvn/TestNodeWithNoUseAfterPhiIdeal.java
new file mode 100644
index 00000000000..b8e2dabc553
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/igvn/TestNodeWithNoUseAfterPhiIdeal.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2025 IBM Corporation. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8373524
+ * @summary C2: no reachable node should have no use
+ * @run main/othervm -Xbatch ${test.main.class}
+ * @run main ${test.main.class}
+ */
+
+package compiler.igvn;
+
+public class TestNodeWithNoUseAfterPhiIdeal {
+    volatile boolean _mutatorToggle;
+
+    boolean _mutatorFlip() {
+        synchronized (TestNodeWithNoUseAfterPhiIdeal.class) {
+            _mutatorToggle = new MyBoolean(!_mutatorToggle).v;
+            return _mutatorToggle;
+        }
+    }
+
+    class MyBoolean {
+        boolean v;
+        MyBoolean(boolean v) {
+            int N = 32;
+            for (int i = 0; i < N; i++) {
+                this.v = v;
+            }
+        }
+    }
+
+    int[] arr;
+    void test() {
+        int limit = 2;
+        boolean flag1 = _mutatorFlip();
+        for (; limit < 4; limit *= 2) {
+            if (flag1) {
+                break;
+            }
+        }
+        int zero = 34;
+        for (int peel = 2; peel < limit; peel++) {
+            synchronized (TestNodeWithNoUseAfterPhiIdeal.class) {
+                zero = 0;
+            }
+        }
+        if (zero == 0) {
+            arr = new int[8];
+        } else {
+            int M = 4;
+            for (int i = 0; i < M; i++) {
+                boolean flag2 = _mutatorFlip();
+                boolean flag3 = _mutatorFlip();
+                if (flag2) {
+                    break;
+                }
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        TestNodeWithNoUseAfterPhiIdeal t = new TestNodeWithNoUseAfterPhiIdeal();
+        for (int i = 0; i < 10_000; i++) {
+            t.test();
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/inlining/TestSubtypeCheckTypeInfo.java b/test/hotspot/jtreg/compiler/inlining/TestSubtypeCheckTypeInfo.java
new file mode 100644
index 00000000000..93767ca8416
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/inlining/TestSubtypeCheckTypeInfo.java
@@ -0,0 +1,479 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @summary 8372634
+ *
+ * @requires vm.flagless
+ * @library /test/lib /
+ *
+ * @run driver compiler.inlining.TestSubtypeCheckTypeInfo
+ */
+package compiler.inlining;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class TestSubtypeCheckTypeInfo {
+    static final Class<TestSubtypeCheckTypeInfo> THIS_CLASS = TestSubtypeCheckTypeInfo.class;
+    static final String TEST_CLASS_NAME = THIS_CLASS.getName();
+
+    public static void main(String[] args) throws Exception {
+        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+                "-XX:+IgnoreUnrecognizedVMOptions", "-showversion",
+                "-XX:-TieredCompilation", "-Xbatch", "-XX:CICompilerCount=1",
+                "-XX:+PrintCompilation", "-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintInlining",
+                "-XX:CompileCommand=quiet",
+                "-XX:CompileCommand=compileonly," +  TEST_CLASS_NAME + "::test*",
+                "-XX:CompileCommand=delayinline," +  TEST_CLASS_NAME + "::lateInline*",
+                TestSubtypeCheckTypeInfo.Launcher.class.getName());
+
+        OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
+
+        analyzer.shouldHaveExitValue(0);
+
+        // The test is applicable only to C2 (present in Server VM).
+        if (analyzer.getStderr().contains("Server VM")) {
+            List<String> output = analyzer.asLinesWithoutVMWarnings();
+
+            parseOutput(output);
+            System.out.println("TEST PASSED");
+        }
+    }
+
+    static class Launcher {
+        public static void main(String[] args) {
+            runTestCase(TestSubtypeCheckTypeInfo::testInstanceOf);
+            runTestCase(TestSubtypeCheckTypeInfo::testInstanceOfCondPre);
+            runTestCase(TestSubtypeCheckTypeInfo::testInstanceOfCondPost);
+
+            runTestCase(TestSubtypeCheckTypeInfo::testIsInstance);
+            runTestCase(TestSubtypeCheckTypeInfo::testIsInstanceCondPre);
+            runTestCase(TestSubtypeCheckTypeInfo::testIsInstanceCondPost);
+
+            runTestCase(TestSubtypeCheckTypeInfo::testInstanceOfLate);
+            runTestCase(TestSubtypeCheckTypeInfo::testInstanceOfLateCondPre);
+            runTestCase(TestSubtypeCheckTypeInfo::testInstanceOfLateCondPost);
+
+            runTestCase(TestSubtypeCheckTypeInfo::testIsInstanceLate);
+            runTestCase(TestSubtypeCheckTypeInfo::testIsInstanceLateCondPre);
+            runTestCase(TestSubtypeCheckTypeInfo::testIsInstanceLateCondPost);
+
+            runTestCase(TestSubtypeCheckTypeInfo::testInstanceOfCondLate);
+            runTestCase(TestSubtypeCheckTypeInfo::testInstanceOfCondLatePre);
+            runTestCase(TestSubtypeCheckTypeInfo::testInstanceOfCondLatePost);
+
+            runTestCase(TestSubtypeCheckTypeInfo::testIsInstanceCondLate);
+            runTestCase(TestSubtypeCheckTypeInfo::testIsInstanceCondLatePre);
+            runTestCase(TestSubtypeCheckTypeInfo::testIsInstanceCondLatePost);
+
+            runTestCase(TestSubtypeCheckTypeInfo::testInstanceOfNulls);
+            runTestCase(TestSubtypeCheckTypeInfo::testIsInstanceNulls);
+        }
+    }
+
+    /* =========================================================== */
+
+    @InlineSuccess
+    // @ 8   compiler.inlining.TestSubtypeCheckTypeInfo$B::m (1 bytes)   inline (hot)
+    static void testInstanceOf(A o, boolean cond) {
+        if (o instanceof B) {
+            o.m();
+        }
+    }
+
+    @InlineSuccess
+    // @ 12   compiler.inlining.TestSubtypeCheckTypeInfo$B::m (1 bytes)   inline (hot)
+    static void testInstanceOfCondPre(A o, boolean cond) {
+        if (cond && (o instanceof B)) {
+            o.m();
+        }
+    }
+
+    @InlineSuccess
+    // @ 12   compiler.inlining.TestSubtypeCheckTypeInfo$B::m (1 bytes)   inline (hot)
+    static void testInstanceOfCondPost(A o, boolean cond) {
+        if ((o instanceof B) && cond) {
+            o.m();
+        }
+    }
+
+    /* =========================================================== */
+
+    @InlineSuccess
+    // Inlining _isInstance on constant Class compiler/inlining/TestSubtypeCheckTypeInfo$B
+    // @ 3   java.lang.Class::isInstance (0 bytes)   (intrinsic)
+    // @ 10   compiler.inlining.TestSubtypeCheckTypeInfo$B::m (1 bytes)   inline (hot)
+    static void testIsInstance(A o, boolean cond) {
+        if (B.class.isInstance(o)) {
+            o.m();
+        }
+    }
+
+    @InlineSuccess
+    // Inlining _isInstance on constant Class compiler/inlining/TestSubtypeCheckTypeInfo$B
+    // @ 7   java.lang.Class::isInstance (0 bytes)   (intrinsic)
+    // @ 14   compiler.inlining.TestSubtypeCheckTypeInfo$B::m (1 bytes)   inline (hot)
+    static void testIsInstanceCondPre(A o, boolean cond) {
+        if (cond && B.class.isInstance(o)) {
+            o.m();
+        }
+    }
+
+    @InlineSuccess
+    // @ 3   java.lang.Class::isInstance (0 bytes)   (intrinsic)
+    // @ 14   compiler.inlining.TestSubtypeCheckTypeInfo$B::m (1 bytes)   inline (hot)
+    static void testIsInstanceCondPost(A o, boolean cond) {
+        if (B.class.isInstance(o) && cond) {
+            o.m();
+        }
+    }
+
+    /* =========================================================== */
+
+    @InlineSuccess
+    // @ 5   compiler.inlining.TestSubtypeCheckTypeInfo::lateInline (9 bytes)   inline (hot)   late inline succeeded
+    //   @ 5   compiler.inlining.TestSubtypeCheckTypeInfo$B::m (1 bytes)   inline (hot)
+    static void testInstanceOfLate(A o, boolean cond) {
+        // if (o instanceof B) { o.m(); }
+        lateInline(o, o instanceof B);
+    }
+
+    @InlineFailure
+    // @ 17   compiler.inlining.TestSubtypeCheckTypeInfo::lateInline (9 bytes)   inline (hot)   late inline succeeded
+    //   @ 5   compiler.inlining.TestSubtypeCheckTypeInfo$A::m (0 bytes)   failed to inline: virtual call
+    static void testInstanceOfLateCondPre(A o, boolean cond) {
+        // if (cond && o instanceof B) { o.m(); }
+        lateInline(o, cond && (o instanceof B));
+    }
+
+    @InlineFailure
+    // @ 17   compiler.inlining.TestSubtypeCheckTypeInfo::lateInline (9 bytes)   inline (hot)   late inline succeeded
+    //   @ 5   compiler.inlining.TestSubtypeCheckTypeInfo$A::m (0 bytes)   failed to inline: virtual call
+    static void testInstanceOfLateCondPost(A o, boolean cond) {
+        // if ((o instanceof B) && cond) { o.m(); }
+        lateInline(o, (o instanceof B) && cond);
+    }
+
+    /* =========================================================== */
+
+    @InlineSuccess
+    // Inlining _isInstance on constant Class compiler/inlining/TestSubtypeCheckTypeInfo$B
+    // @ 4   java.lang.Class::isInstance (0 bytes)   (intrinsic)
+    // @ 7   compiler.inlining.TestSubtypeCheckTypeInfo::lateInline (9 bytes)   inline (hot)   late inline succeeded
+    //   @ 5   compiler.inlining.TestSubtypeCheckTypeInfo$B::m (1 bytes)   inline (hot)
+    static void testIsInstanceLate(A o, boolean cond) {
+        // if (B.class.isInstance(o)) { o.m(); }
+        lateInline(o, B.class.isInstance(o));
+    }
+
+    @InlineFailure
+    // Inlining _isInstance on constant Class compiler/inlining/TestSubtypeCheckTypeInfo$B
+    // @ 8   java.lang.Class::isInstance (0 bytes)   (intrinsic)
+    // @ 19   compiler.inlining.TestSubtypeCheckTypeInfo::lateInline (9 bytes)   inline (hot)   late inline succeeded
+    //   @ 5   compiler.inlining.TestSubtypeCheckTypeInfo$A::m (0 bytes)   failed to inline: virtual call
+    static void testIsInstanceLateCondPre(A o, boolean cond) {
+        // if (cond && B.class.isInstance(o)) { o.m(); }
+        lateInline(o, cond && (B.class.isInstance(o)));
+    }
+
+    @InlineFailure
+    // Inlining _isInstance on constant Class compiler/inlining/TestSubtypeCheckTypeInfo$B
+    // @ 4   java.lang.Class::isInstance (0 bytes)   (intrinsic)
+    // @ 19   compiler.inlining.TestSubtypeCheckTypeInfo::lateInline (9 bytes)   inline (hot)   late inline succeeded
+    //   @ 5   compiler.inlining.TestSubtypeCheckTypeInfo$A::m (0 bytes)   failed to inline: virtual call
+    static void testIsInstanceLateCondPost(A o, boolean cond) {
+        // if (B.class.isInstance(o) && cond) { o.m(); }
+        lateInline(o, (B.class.isInstance(o) && cond));
+    }
+
+    /* =========================================================== */
+
+    @InlineFailure
+    // @ 2   compiler.inlining.TestSubtypeCheckTypeInfo::lateInlineInstanceOfCondPre (17 bytes)   inline (hot)   late inline succeeded
+    // @ 9   compiler.inlining.TestSubtypeCheckTypeInfo$A::m (0 bytes)   failed to inline: virtual call
+    static void testInstanceOfCondLate(A a, boolean cond) {
+        if (lateInlineInstanceOfCondPre(a, true)) {
+            a.m();
+        }
+    }
+
+    @InlineFailure
+    // @ 2   compiler.inlining.TestSubtypeCheckTypeInfo::lateInlineInstanceOfCondPre (17 bytes)   inline (hot)   late inline succeeded
+    // @ 9   compiler.inlining.TestSubtypeCheckTypeInfo$A::m (0 bytes)   failed to inline: virtual call
+    static void testInstanceOfCondLatePre(A a, boolean cond) {
+        if (lateInlineInstanceOfCondPre(a, cond)) {
+            a.m();
+        }
+    }
+
+    @InlineFailure
+    // @ 2   compiler.inlining.TestSubtypeCheckTypeInfo::lateInlineInstanceOfCondPost (17 bytes)   inline (hot)   late inline succeeded
+    // @ 9   compiler.inlining.TestSubtypeCheckTypeInfo$A::m (0 bytes)   failed to inline: virtual call
+    static void testInstanceOfCondLatePost(A a, boolean cond) {
+        if (lateInlineInstanceOfCondPost(a, cond)) {
+            a.m();
+        }
+    }
+
+    /* =========================================================== */
+
+    @InlineFailure
+    // Inlining _isInstance on constant Class compiler/inlining/TestSubtypeCheckTypeInfo$B
+    // @ 2   compiler.inlining.TestSubtypeCheckTypeInfo::lateInlineIsInstanceCondPre (19 bytes)   inline (hot)   late inline succeeded
+    //   @ 7   java.lang.Class::isInstance (0 bytes)   (intrinsic)
+    // @ 9   compiler.inlining.TestSubtypeCheckTypeInfo$A::m (0 bytes)   failed to inline: virtual call
+    static void testIsInstanceCondLate(A a, boolean cond) {
+        if (lateInlineIsInstanceCondPre(a, true)) {
+            a.m();
+        }
+    }
+
+    @InlineFailure
+    // Inlining _isInstance on constant Class compiler/inlining/TestSubtypeCheckTypeInfo$B
+    // @ 2   compiler.inlining.TestSubtypeCheckTypeInfo::lateInlineIsInstanceCondPre (19 bytes)   inline (hot)   late inline succeeded
+    //   @ 7   java.lang.Class::isInstance (0 bytes)   (intrinsic)
+    // @ 9   compiler.inlining.TestSubtypeCheckTypeInfo$A::m (0 bytes)   failed to inline: virtual call
+    static void testIsInstanceCondLatePre(A a, boolean cond) {
+        if (lateInlineIsInstanceCondPre(a, cond)) {
+            a.m();
+        }
+    }
+
+    @InlineFailure
+    // Inlining _isInstance on constant Class compiler/inlining/TestSubtypeCheckTypeInfo$B
+    // @ 2   compiler.inlining.TestSubtypeCheckTypeInfo::lateInlineIsInstanceCondPost (19 bytes)   inline (hot)   late inline succeeded
+    //   @ 3   java.lang.Class::isInstance (0 bytes)   (intrinsic)
+    // @ 9   compiler.inlining.TestSubtypeCheckTypeInfo$A::m (0 bytes)   failed to inline: virtual call
+    static void testIsInstanceCondLatePost(A a, boolean cond) {
+        if (lateInlineIsInstanceCondPost(a, cond)) {
+            a.m();
+        }
+    }
+
+    /* =========================================================== */
+
+    @InlineFailure
+    // @ 20   compiler.inlining.TestSubtypeCheckTypeInfo$A::m (0 bytes)   failed to inline: virtual call
+    static void testInstanceOfNulls(A o, boolean cond) {
+        A recv = (cond ? o : null);
+        if (recv instanceof B) {
+            o.m();
+        }
+    }
+
+    @InlineFailure
+    //Inlining _isInstance on constant Class compiler/inlining/TestSubtypeCheckTypeInfo$B
+    // @ 13   java.lang.Class::isInstance (0 bytes)   (intrinsic)
+    // @ 20   compiler.inlining.TestSubtypeCheckTypeInfo$A::m (0 bytes)   failed to inline: virtual call
+    static void testIsInstanceNulls(A o, boolean cond) {
+        A recv = (cond ? o : null);
+        if (B.class.isInstance(recv)) {
+            o.m();
+        }
+    }
+
+    /* =========================================================== */
+
+    static abstract class A {
+        public abstract void m();
+    }
+    static abstract class B extends A {
+        public void m() {}
+    }
+
+    static class C extends A {
+        public void m() {}
+    }
+
+    static void lateInline(A o, boolean cond) {
+        if (cond) {
+            o.m();
+        }
+    }
+
+    static boolean lateInlineInstanceOfCondPre(A o, boolean cond) {
+        return cond && (o instanceof B);
+    }
+
+    static boolean lateInlineInstanceOfCondPost(A o, boolean cond) {
+        return (o instanceof B) && cond;
+    }
+
+    static boolean lateInlineIsInstanceCondPre(A o, boolean cond) {
+        return cond && B.class.isInstance(o);
+    }
+    static boolean lateInlineIsInstanceCondPost(A o, boolean cond) {
+        return B.class.isInstance(o) && cond;
+    }
+
+    /* =========================================================== */
+
+    static final String INLINE_SUCCESS_MESSAGE = "B::m (1 bytes)   inline (hot)";
+    static final String INLINE_FAILURE_MESSAGE = "A::m (0 bytes)   failed to inline: virtual call";
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface InlineSuccess {
+        String[] shouldContain()    default INLINE_SUCCESS_MESSAGE;
+        String[] shouldNotContain() default INLINE_FAILURE_MESSAGE;
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface InlineFailure {
+        String[] shouldContain()    default INLINE_FAILURE_MESSAGE;
+        String[] shouldNotContain() default INLINE_SUCCESS_MESSAGE;
+    }
+
+    /* =========================================================== */
+
+    // Parse compilation log (-XX:+PrintCompilation -XX:+PrintInlining output).
+    static void parseOutput(List<String> output) {
+        Pattern compilation = Pattern.compile("^\\d+\\s+\\d+.*");
+        StringBuilder inlineTree = new StringBuilder();
+        Set<String> passedTests = new HashSet();
+        Set<String> failedTests = new HashSet();
+        for (String line : output) {
+            // Detect start of next compilation.
+            if (compilation.matcher(line).matches()) {
+                // Parse output for previous compilation.
+                validateInliningOutput(inlineTree.toString(), passedTests, failedTests);
+                inlineTree = new StringBuilder(); // reset
+            }
+            inlineTree.append(line);
+        }
+        // Process last compilation
+        validateInliningOutput(inlineTree.toString(), passedTests, failedTests);
+
+        if (!failedTests.isEmpty()) {
+            String msg = String.format("TEST FAILED: %d test cases failed", failedTests.size());
+            throw new AssertionError(msg);
+        } else if (passedTests.size() != totalTestCount()) {
+            String msg = String.format("TEST FAILED: %d out of %d test cases passed", passedTests.size(), totalTestCount());
+            throw new AssertionError(msg);
+        }
+    }
+
+    // Sample:
+    //    213   42    b        compiler.inlining.TestSubtypeCheckTypeInfo::testIsInstanceCondLatePost (13 bytes)
+    static final Pattern TEST_CASE = Pattern.compile("^\\d+\\s+\\d+\\s+b\\s+" + TEST_CLASS_NAME + "::(\\w+) .*");
+
+    static boolean validateInliningOutput(String inlineTree, Set<String> passedTests, Set<String> failedTests) {
+        Matcher m = TEST_CASE.matcher(inlineTree);
+        if (m.matches()) {
+            String testName = m.group(1);
+            System.out.print(testName);
+            try {
+                Method testMethod = TestSubtypeCheckTypeInfo.class.getDeclaredMethod(testName, A.class, boolean.class);
+                if (validate(inlineTree, testMethod.getAnnotation(InlineSuccess.class)) &&
+                    validate(inlineTree, testMethod.getAnnotation(InlineFailure.class))) {
+                    System.out.println(": SUCCESS");
+                    passedTests.add(testName);
+                    return true;
+                } else {
+                    failedTests.add(testName);
+                    return false;
+                }
+            } catch (NoSuchMethodException e) {
+                System.out.println(": FAILURE: Missing test info for " + testName + ": " + inlineTree);
+                throw new InternalError(e);
+            }
+        } else {
+            return false; // not a test method; ignored
+        }
+    }
+
+    static boolean validate(String message, InlineSuccess ann) {
+        if (ann != null) {
+            return validatePatterns(message, ann.shouldContain(), ann.shouldNotContain());
+        }
+        return true; // no patterns to validate
+    }
+
+    static boolean validate(String message, InlineFailure ann) {
+        if (ann != null) {
+            return validatePatterns(message, ann.shouldContain(), ann.shouldNotContain());
+        }
+        return true; // no patterns to validate
+    }
+
+    static boolean validatePatterns(String message, String[] shouldContain, String[] shouldNotContain) {
+        for (String pattern : shouldContain) {
+            if (!message.contains(pattern)) {
+                System.out.printf(": FAILURE: '%s' not found in '%s'\n", pattern, message);
+                return false;
+            }
+        }
+        for (String pattern : shouldNotContain) {
+            if (message.contains(pattern)) {
+                System.out.printf(": FAILURE: '%s' found in '%s'\n", pattern, message);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    static int totalTestCount() {
+        int count = 0;
+        for (Method m : THIS_CLASS.getDeclaredMethods()) {
+            if (m.isAnnotationPresent(InlineSuccess.class) || m.isAnnotationPresent(InlineFailure.class)) {
+                String testName = m.getName();
+                if (testName.startsWith("test")) {
+                    count++;
+                } else {
+                    throw new InternalError("wrong test name: " + testName);
+                }
+            }
+        }
+        return count;
+    }
+
+    /* =========================================================== */
+
+    interface TestCase {
+        void run(A o, boolean cond);
+    }
+
+    static void runTestCase(TestCase t) {
+        A[] receivers = new A[] { new B() {}, new B() {}, new B() {}, new C() {}, new C() {}};
+        for (int i = 0; i < 20_000; i++) {
+            // Pollute type profile and branch frequencies.
+            A recv = receivers[i % receivers.length];
+            boolean cond = (i % 2 == 0);
+            t.run(recv, cond);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/intrinsics/TestCompareUnsigned.java b/test/hotspot/jtreg/compiler/intrinsics/TestCompareUnsigned.java
index 6d09d7c042c..56f9ff7e032 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/TestCompareUnsigned.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/TestCompareUnsigned.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/TestVerifyIntrinsicChecks.java b/test/hotspot/jtreg/compiler/intrinsics/TestVerifyIntrinsicChecks.java
deleted file mode 100644
index c482a73affd..00000000000
--- a/test/hotspot/jtreg/compiler/intrinsics/TestVerifyIntrinsicChecks.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8361842
- * @summary Verify the effectiveness of the `VerifyIntrinsicChecks` VM flag
- *          through (bypassing `StringCoding::encodeAsciiArray`, and) feeding
- *          invalid input to an intrinsified `StringCoding::encodeAsciiArray0`
- *          (note the `0` suffix!).
- * @library /compiler/patches
- * @library /test/lib
- * @build java.base/java.lang.Helper
- * @comment `vm.debug == true` is required since `VerifyIntrinsicChecks` is a
- *          development flag
- * @requires vm.debug == true & vm.flavor == "server" & !vm.graal.enabled
- * @requires (os.arch != "riscv64" | (os.arch == "riscv64" & vm.cpu.features ~= ".*rvv.*"))
- * @run main/othervm compiler.intrinsics.TestVerifyIntrinsicChecks verify
- */
-
-package compiler.intrinsics;
-
-import java.lang.Helper;
-import java.time.Instant;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.OutputAnalyzer;
-
-public final class TestVerifyIntrinsicChecks {
-
-    public static void main(String[] args) throws Exception {
-        switch (args[0]) {
-            case "verify" -> {
-                log("Starting JVM in a separate process to verify the crash");
-                OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJava(
-                        "-Xcomp",
-                        "-XX:-TieredCompilation",
-                        "-XX:CompileCommand=inline,java.lang.StringCoding::encodeAsciiArray0",
-                        "-XX:+VerifyIntrinsicChecks",
-                        "--patch-module", "java.base=%s/java.base".formatted(System.getProperty("test.patch.path")),
-                        "compiler.intrinsics.TestVerifyIntrinsicChecks",
-                        "crash");
-                outputAnalyzer.shouldContain("unexpected null in intrinsic");
-                outputAnalyzer.shouldNotHaveExitValue(0);
-            }
-            case "crash" -> {
-                log("Triggering the crash");
-                warmUpIntrinsicMethod();
-                violateIntrinsicMethodContract();
-            }
-            default -> throw new IllegalArgumentException();
-        }
-    }
-
-    private static void warmUpIntrinsicMethod() {
-        log("Warming up the intrinsic method");
-        char[] sa = createAsciiChars(8192);
-        byte[] sp = new byte[4096];
-        for (int i = 0; i < 1_000; i++) {
-            Helper.StringCodingEncodeAsciiArray0(sa, i, sp, 0, sp.length - i);
-        }
-    }
-
-    private static char[] createAsciiChars(int length) {
-        char[] buffer = new char[length];
-        for (int i = 0; i < length; i++) {
-            buffer[i] = (char) (i % '\u0080');
-        }
-        return buffer;
-    }
-
-    private static void violateIntrinsicMethodContract() {
-        log("Violating the intrinsic method contract (sa=null)");
-        Helper.StringCodingEncodeAsciiArray0(null, 1, null, 1, 1);
-    }
-
-    private synchronized static void log(String format, Object... args) {
-        Object[] extendedArgs = new Object[2 + args.length];
-        extendedArgs[0] = Instant.now();
-        extendedArgs[1] = Thread.currentThread().getName();
-        System.arraycopy(args, 0, extendedArgs, extendedArgs.length - args.length, args.length);
-        String extendedFormat = "%%s [%%s] %s%%n".formatted(format);
-        System.out.printf(extendedFormat, extendedArgs);
-    }
-
-}
diff --git a/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestMultiplyToLen.java b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestMultiplyToLen.java
index 25f0941ec68..2a73d131f1d 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestMultiplyToLen.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestMultiplyToLen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestShift.java b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestShift.java
index 61edf1e583b..7aa553629ce 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestShift.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestShift.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestSquareToLen.java b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestSquareToLen.java
index b3d7518a204..ba2057b8cab 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestSquareToLen.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestSquareToLen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/bmi/BMITestRunner.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/BMITestRunner.java
index 9d2a731c6e5..b51ee9efe33 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/bmi/BMITestRunner.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/bmi/BMITestRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsiTestI.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsiTestI.java
index 346169f1aad..881ed37906e 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsiTestI.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsiTestI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java
index 55d0368b84b..38753762f39 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsrTestI.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsrTestI.java
index 3841a2f155c..4ea2b3ab841 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsrTestI.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BlsrTestI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/float16/TestFloat16MaxMinSpecialValues.java b/test/hotspot/jtreg/compiler/intrinsics/float16/TestFloat16MaxMinSpecialValues.java
index f83ca307d84..f85297859f3 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/float16/TestFloat16MaxMinSpecialValues.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/float16/TestFloat16MaxMinSpecialValues.java
@@ -30,6 +30,7 @@ import jdk.test.lib.*;
 /**
  * @test
  * @bug 8352585
+ * @key randomness
  * @library /test/lib /
  * @summary Add special case handling for Float16.max/min x86 backend
  * @modules jdk.incubator.vector
diff --git a/test/hotspot/jtreg/compiler/intrinsics/klass/CastNullCheckDroppingsTest.java b/test/hotspot/jtreg/compiler/intrinsics/klass/CastNullCheckDroppingsTest.java
index 2d2bf14d76f..1828e0ba837 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/klass/CastNullCheckDroppingsTest.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/klass/CastNullCheckDroppingsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -132,13 +132,13 @@ public class CastNullCheckDroppingsTest {
         t.runTest(methodClassCastNull, false, svalue);
         t.runTest(methodNullClassCast, false, svalue);
         t.runTest(methodClassCastObj,  false, svalue);
-        t.runTest(methodObjClassCast,  false,  svalue);
+        t.runTest(methodObjClassCast,  false, svalue);
         t.runTest(methodClassCastInt,  false, svalue);
-        t.runTest(methodIntClassCast,  true,  svalue);
+        t.runTest(methodIntClassCast,  false, svalue);
         t.runTest(methodClassCastint,  false, svalue);
         t.runTest(methodintClassCast,  false, svalue);
         t.runTest(methodClassCastPrim, false, svalue);
-        t.runTest(methodPrimClassCast, true,  svalue);
+        t.runTest(methodPrimClassCast, false, svalue);
         t.runTest(methodVarClassCast,  true,  objClass);
     }
 
diff --git a/test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxIntrinsics.java
index 8ced238f4d8..902208d991d 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxIntrinsics.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxIntrinsics.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, BELLSOFT. All rights reserved.
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnSupportedCPU.java
index eeff351f737..0c8f95aac6c 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnSupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnSupportedCPU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnUnsupportedCPU.java
index 0b973b61672..fc67be9cde4 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnUnsupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnUnsupportedCPU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java
index 1ce2c4b1f87..4e468ff8a4b 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java
index dd7437ee86a..e58a30cbfcd 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java
index 8c4ac6b8860..cb3e3fed2ce 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java
index f7e34e54feb..bcb2db95779 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java
index 5324cc6b210..f6be18c3849 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java
index 12085cc4915..85e3cad322c 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedCPU.java
index 8df27030446..85f6f280ccb 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedCPU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/string/TestCountPositives.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestCountPositives.java
index 1c20a49d281..76ef4766159 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/string/TestCountPositives.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/string/TestCountPositives.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
  * @build java.base/java.lang.Helper
  * @run main compiler.intrinsics.string.TestCountPositives
  */
-
 /*
  * @test
  * @bug 8281146 8318509
@@ -47,38 +46,17 @@
  * @run main/othervm/timeout=1200 -XX:UseAVX=3 compiler.intrinsics.string.TestCountPositives
  * @run main/othervm/timeout=1200 -XX:UseAVX=3 -XX:+UnlockDiagnosticVMOptions -XX:AVX3Threshold=0 compiler.intrinsics.string.TestCountPositives
  */
-
-/*
- * @test
- * @bug 8281146
- * @summary Verify `StringCoding::countPositives` intrinsic Java wrapper checks
- *          by enabling the ones in the VM intrinsic using
- *          `-XX:+VerifyIntrinsicChecks`
- * @comment This does not check out-of-range conditions. The
- *          `-XX:+VerifyIntrinsicChecks` version of this test simply ensures
- *          that the VM intrinsic will produce no spurious errors.
- * @key randomness
- * @library /compiler/patches
- * @library /test/lib
- * @comment `vm.debug == true` is required since `VerifyIntrinsicChecks` is a
- *          development flag
- * @requires vm.debug == true
- * @build java.base/java.lang.Helper
- * @run main/othervm
- *      -XX:+VerifyIntrinsicChecks
- *      compiler.intrinsics.string.TestCountPositives
+/**
+ * This test was derived from compiler.intrinsics.string.TestHasNegatives
  */
-
 package compiler.intrinsics.string;
 
 import java.lang.Helper;
 import java.util.Random;
+import java.util.stream.IntStream;
 
 import jdk.test.lib.Utils;
 
-/**
- * This test was derived from {@link TestHasNegatives}.
- */
 public class TestCountPositives {
 
     private static byte[] bytes = new byte[4096 + 32];
diff --git a/test/hotspot/jtreg/compiler/intrinsics/string/TestEncodeIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestEncodeIntrinsics.java
index bb343b246ff..38a516e7521 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/string/TestEncodeIntrinsics.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/string/TestEncodeIntrinsics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,26 +31,6 @@
  * @run main/othervm/timeout=1200 --add-opens=java.base/sun.nio.cs=ALL-UNNAMED -Xbatch -Xmx256m compiler.intrinsics.string.TestEncodeIntrinsics
  */
 
-/*
- * @test
- * @bug 6896617 8274242
- * @summary Verify `sun.nio.cs.ISO_8859_1.Encoder::encodeISOArray` intrinsic
- *          Java wrapper checks by enabling the ones in the VM intrinsic using
- *          `-XX:+VerifyIntrinsicChecks`
- * @comment This does not check out-of-range conditions. The
- *          `-XX:+VerifyIntrinsicChecks` version of this test simply ensures
- *          that the VM intrinsic will produce no spurious errors.
- * @key randomness
- * @library /test/lib
- * @comment `vm.debug == true` is required since `VerifyIntrinsicChecks` is a
- *          development flag
- * @requires vm.debug == true
- * @run main/othervm/timeout=1200
- *      -XX:+VerifyIntrinsicChecks
- *      --add-opens=java.base/sun.nio.cs=ALL-UNNAMED -Xbatch -Xmx256m
- *      compiler.intrinsics.string.TestEncodeIntrinsics
- */
-
 package compiler.intrinsics.string;
 
 import jdk.test.lib.Utils;
diff --git a/test/hotspot/jtreg/compiler/intrinsics/string/TestHasNegatives.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestHasNegatives.java
index a15f6aade2e..6edf2dc2e56 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/string/TestHasNegatives.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/string/TestHasNegatives.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
  * @build java.base/java.lang.Helper
  * @run main compiler.intrinsics.string.TestHasNegatives
  */
-
 /*
  * @test
  * @bug 8054307 8318509
@@ -47,31 +46,11 @@
  * @run main/othervm/timeout=1200 -XX:UseAVX=3 -XX:+UnlockDiagnosticVMOptions -XX:AVX3Threshold=0 compiler.intrinsics.string.TestHasNegatives
  */
 
-/*
- * @test
- * @bug 8054307
- * @summary Verify `StringCoding::hasNegatives` intrinsic Java wrapper checks
- *          by enabling the ones in the VM intrinsic using
- *          `-XX:+VerifyIntrinsicChecks`
- * @comment This does not check out-of-range conditions. The
- *          `-XX:+VerifyIntrinsicChecks` version of this test simply ensures
- *          that the VM intrinsic will produce no spurious errors.
- * @key randomness
- * @library /compiler/patches
- * @library /test/lib
- * @comment `vm.debug == true` is required since `VerifyIntrinsicChecks` is a
- *          development flag
- * @requires vm.debug == true
- * @build java.base/java.lang.Helper
- * @run main/othervm
- *      -XX:+VerifyIntrinsicChecks
- *      compiler.intrinsics.string.TestHasNegatives
- */
-
 package compiler.intrinsics.string;
 
 import java.lang.Helper;
 import java.util.Random;
+import java.util.stream.IntStream;
 
 import jdk.test.lib.Utils;
 
diff --git a/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics.java
index f82a4899d97..a81131c7bf9 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/jsr292/MHInlineTest.java b/test/hotspot/jtreg/compiler/jsr292/MHInlineTest.java
index 4638c27fe59..542a7b4019b 100644
--- a/test/hotspot/jtreg/compiler/jsr292/MHInlineTest.java
+++ b/test/hotspot/jtreg/compiler/jsr292/MHInlineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java b/test/hotspot/jtreg/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java
index 7e35d0c4e3d..a422e52986c 100644
--- a/test/hotspot/jtreg/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java
+++ b/test/hotspot/jtreg/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java b/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java
index 1d76655382d..49066d741ed 100644
--- a/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java
+++ b/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/jvmci/TestUncaughtErrorInCompileMethod.java b/test/hotspot/jtreg/compiler/jvmci/TestUncaughtErrorInCompileMethod.java
index 49eae648bfc..bfb617a0a3a 100644
--- a/test/hotspot/jtreg/compiler/jvmci/TestUncaughtErrorInCompileMethod.java
+++ b/test/hotspot/jtreg/compiler/jvmci/TestUncaughtErrorInCompileMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventListener.java b/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventListener.java
index 59066126d87..4b9007909da 100644
--- a/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventListener.java
+++ b/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventTest.java b/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventTest.java
index 0f0d34bf2d8..aab802c888c 100644
--- a/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventTest.java
+++ b/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java
index 8e9be9eda37..706aec05a29 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/lib/compile_framework/CompileFramework.java b/test/hotspot/jtreg/compiler/lib/compile_framework/CompileFramework.java
index b86d30ab528..d9a98582aec 100644
--- a/test/hotspot/jtreg/compiler/lib/compile_framework/CompileFramework.java
+++ b/test/hotspot/jtreg/compiler/lib/compile_framework/CompileFramework.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 41f185f3686..3fd8e2eceb4 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -690,16 +690,6 @@ public class IRNode {
         beforeMatchingNameRegex(CON_L, "ConL");
     }
 
-    public static final String CON_D = PREFIX + "CON_D" + POSTFIX;
-    static {
-        beforeMatchingNameRegex(CON_D, "ConD");
-    }
-
-    public static final String CON_F = PREFIX + "CON_F" + POSTFIX;
-    static {
-        beforeMatchingNameRegex(CON_F, "ConF");
-    }
-
     public static final String COUNTED_LOOP = PREFIX + "COUNTED_LOOP" + POSTFIX;
     static {
         String regex = START + "CountedLoop\\b" + MID + END;
@@ -1478,6 +1468,16 @@ public class IRNode {
         beforeMatchingNameRegex(VECTOR_MASK_LANE_IS_SET, "ExtractUB");
     }
 
+    public static final String VECTOR_MASK_GEN = PREFIX + "VECTOR_MASK_GEN" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(VECTOR_MASK_GEN, "VectorMaskGen");
+    }
+
+    public static final String VECTOR_MASK_FIRST_TRUE = PREFIX + "VECTOR_MASK_FIRST_TRUE" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(VECTOR_MASK_FIRST_TRUE, "VectorMaskFirstTrue");
+    }
+
     // Can only be used if avx512_vnni is available.
     public static final String MUL_ADD_VS2VI_VNNI = PREFIX + "MUL_ADD_VS2VI_VNNI" + POSTFIX;
     static {
@@ -2791,24 +2791,24 @@ public class IRNode {
         machOnlyNameRegex(X86_SCONV_F2L, "convF2L_reg_reg");
     }
 
-    public static final String X86_SCONV_D2I_AVX10 = PREFIX + "X86_SCONV2_D2I_AVX10" + POSTFIX;
+    public static final String X86_SCONV_D2I_AVX10_2 = PREFIX + "X86_SCONV_D2I_AVX10_2" + POSTFIX;
     static {
-        machOnlyNameRegex(X86_SCONV_D2I_AVX10, "convD2I_(reg_reg|reg_mem)_avx10");
+        machOnlyNameRegex(X86_SCONV_D2I_AVX10_2, "convD2I_(reg_reg|reg_mem)_avx10_2");
     }
 
-    public static final String X86_SCONV_D2L_AVX10 = PREFIX + "X86_SCONV_D2L_AVX10" + POSTFIX;
+    public static final String X86_SCONV_D2L_AVX10_2 = PREFIX + "X86_SCONV_D2L_AVX10_2" + POSTFIX;
     static {
-        machOnlyNameRegex(X86_SCONV_D2L_AVX10, "convD2L_(reg_reg|reg_mem)_avx10");
+        machOnlyNameRegex(X86_SCONV_D2L_AVX10_2, "convD2L_(reg_reg|reg_mem)_avx10_2");
     }
 
-    public static final String X86_SCONV_F2I_AVX10 = PREFIX + "X86_SCONV_F2I_AVX10" + POSTFIX;
+    public static final String X86_SCONV_F2I_AVX10_2 = PREFIX + "X86_SCONV_F2I_AVX10_2" + POSTFIX;
     static {
-        machOnlyNameRegex(X86_SCONV_F2I_AVX10, "convF2I_(reg_reg|reg_mem)_avx10");
+        machOnlyNameRegex(X86_SCONV_F2I_AVX10_2, "convF2I_(reg_reg|reg_mem)_avx10_2");
     }
 
-    public static final String X86_SCONV_F2L_AVX10 = PREFIX + "X86_SCONV_F2L_AVX10" + POSTFIX;
+    public static final String X86_SCONV_F2L_AVX10_2 = PREFIX + "X86_SCONV_F2L_AVX10_2" + POSTFIX;
     static {
-        machOnlyNameRegex(X86_SCONV_F2L_AVX10, "convF2L_(reg_reg|reg_mem)_avx10");
+        machOnlyNameRegex(X86_SCONV_F2L_AVX10_2, "convF2L_(reg_reg|reg_mem)_avx10_2");
     }
 
     public static final String X86_VCAST_F2X = PREFIX + "X86_VCAST_F2X" + POSTFIX;
@@ -2821,14 +2821,14 @@ public class IRNode {
         machOnlyNameRegex(X86_VCAST_D2X, "castDtoX_reg_(av|eve)x");
     }
 
-    public static final String X86_VCAST_F2X_AVX10 = PREFIX + "X86_VCAST_F2X_AVX10" + POSTFIX;
+    public static final String X86_VCAST_F2X_AVX10_2 = PREFIX + "X86_VCAST_F2X_AVX10_2" + POSTFIX;
     static {
-        machOnlyNameRegex(X86_VCAST_F2X_AVX10, "castFtoX_(reg|mem)_avx10");
+        machOnlyNameRegex(X86_VCAST_F2X_AVX10_2, "castFtoX_(reg|mem)_avx10_2");
     }
 
-    public static final String X86_VCAST_D2X_AVX10 = PREFIX + "X86_VCAST_D2X_AVX10" + POSTFIX;
+    public static final String X86_VCAST_D2X_AVX10_2 = PREFIX + "X86_VCAST_D2X_AVX10_2" + POSTFIX;
     static {
-        machOnlyNameRegex(X86_VCAST_D2X_AVX10, "castDtoX_(reg|mem)_avx10");
+        machOnlyNameRegex(X86_VCAST_D2X_AVX10_2, "castDtoX_(reg|mem)_avx10_2");
     }
 
     public static final String XOR = PREFIX + "XOR" + POSTFIX;
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/VMInfo.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/VMInfo.java
index 932bacdc795..db70e7892a2 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/VMInfo.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/VMInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFrameworkSocket.java b/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFrameworkSocket.java
index a3a5f9ece8f..1fdcb34a6b8 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFrameworkSocket.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFrameworkSocket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/library/CodeGenerationDataNameType.java b/test/hotspot/jtreg/compiler/lib/template_framework/library/CodeGenerationDataNameType.java
index 56f7afcbaeb..b461e3e857f 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/library/CodeGenerationDataNameType.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/library/CodeGenerationDataNameType.java
@@ -100,6 +100,13 @@ public interface CodeGenerationDataNameType extends DataName.Type {
      */
     static PrimitiveType booleans() { return PrimitiveType.BOOLEANS; }
 
+    /**
+     * The Float16 type.
+     *
+     * @return The Float16 type.
+     */
+    static CodeGenerationDataNameType float16() { return Float16Type.FLOAT16; }
+
     /**
      * List of all {@link PrimitiveType}s.
      */
@@ -154,4 +161,19 @@ public interface CodeGenerationDataNameType extends DataName.Type {
         floats(),
         doubles()
     );
+
+    /**
+     * List of all scalar numeric types.
+     */
+    List<CodeGenerationDataNameType> SCALAR_NUMERIC_TYPES = List.of(
+        bytes(),
+        chars(),
+        shorts(),
+        ints(),
+        longs(),
+        floats(),
+        doubles(),
+        booleans(),
+        float16()
+    );
 }
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/library/Float16Type.java b/test/hotspot/jtreg/compiler/lib/template_framework/library/Float16Type.java
new file mode 100644
index 00000000000..e591fe4e045
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/library/Float16Type.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.template_framework.library;
+
+import compiler.lib.generators.Generators;
+import compiler.lib.generators.Generator;
+
+import compiler.lib.template_framework.DataName;
+
+/**
+ * The {@link Float16Type} models Java's {@link Float16} type.
+ */
+final class Float16Type implements CodeGenerationDataNameType {
+    private static final Generator<Short> GEN_FLOAT16 = Generators.G.float16s();
+
+    // We only need one static instance of the class.
+    static final Float16Type FLOAT16 = new Float16Type();
+
+    // Private constructor so nobody can create duplicate instances.
+    private Float16Type() {}
+
+    @Override
+    public boolean isSubtypeOf(DataName.Type other) {
+        return other instanceof Float16Type;
+    }
+
+    @Override
+    public String name() {
+        return "Float16";
+    }
+
+    @Override
+    public String toString() {
+        return name();
+    }
+
+    @Override
+    public Object con() {
+        return "Float16.shortBitsToFloat16((short)" + GEN_FLOAT16.next() + ")";
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/library/Operations.java b/test/hotspot/jtreg/compiler/lib/template_framework/library/Operations.java
index 53acf943b20..cb0e94c9fe8 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/library/Operations.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/library/Operations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,12 @@
 
 package compiler.lib.template_framework.library;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static compiler.lib.template_framework.library.PrimitiveType.BYTES;
 import static compiler.lib.template_framework.library.PrimitiveType.SHORTS;
@@ -35,6 +38,7 @@ import static compiler.lib.template_framework.library.PrimitiveType.LONGS;
 import static compiler.lib.template_framework.library.PrimitiveType.FLOATS;
 import static compiler.lib.template_framework.library.PrimitiveType.DOUBLES;
 import static compiler.lib.template_framework.library.PrimitiveType.BOOLEANS;
+import static compiler.lib.template_framework.library.Float16Type.FLOAT16;
 
 /**
  * This class provides various lists of {@link Expression}s, that represent Java operators or library
@@ -45,18 +49,39 @@ public final class Operations {
     // private constructor to avoid instantiation.
     private Operations() {}
 
+    private static Expression.Info WITH_ARITHMETIC_EXCEPTION = new Expression.Info().withExceptions(Set.of("ArithmeticException"));
+    private static Expression.Info WITH_NONDETERMINISTIC_RESULT = new Expression.Info().withNondeterministicResult();
+
+
     /**
      * Provides a lits of operations on {@link PrimitiveType}s, such as arithmetic, logical,
      * and cast operations.
      */
     public static final List<Expression> PRIMITIVE_OPERATIONS = generatePrimitiveOperations();
 
+    public static final List<Expression> FLOAT16_OPERATIONS = generateFloat16Operations();
+
+    public static final List<Expression> SCALAR_NUMERIC_OPERATIONS = concat(
+            PRIMITIVE_OPERATIONS,
+            FLOAT16_OPERATIONS
+    );
+
+    @SafeVarargs
+    private static List<Expression> concat(List<Expression>... lists) {
+        return Arrays.stream(lists)
+                     .flatMap(List::stream)
+                     .collect(Collectors.toList());
+    }
+
+    private static void addComparisonOperations(List<Expression> ops, String operatorName, CodeGenerationDataNameType type) {
+        for (String mask : List.of("==", "!=", "<", ">", "<=", ">=")) {
+            ops.add(Expression.make(BOOLEANS, "(" + operatorName + "(", type, ", ", type, ")" + mask + "0)"));
+        }
+    }
+
     private static List<Expression> generatePrimitiveOperations() {
         List<Expression> ops = new ArrayList<>();
 
-        Expression.Info withArithmeticException = new Expression.Info().withExceptions(Set.of("ArithmeticException"));
-        Expression.Info withNondeterministicResult = new Expression.Info().withNondeterministicResult();
-
         // Cast between all primitive types. Except for Boolean, we cannot cast from and to.
         CodeGenerationDataNameType.INTEGRAL_AND_FLOATING_TYPES.stream().forEach(src -> {
             CodeGenerationDataNameType.INTEGRAL_AND_FLOATING_TYPES.stream().forEach(dst -> {
@@ -75,8 +100,8 @@ public final class Operations {
             ops.add(Expression.make(type, "(", type, " + ", type, ")"));
             ops.add(Expression.make(type, "(", type, " - ", type, ")"));
             ops.add(Expression.make(type, "(", type, " * ", type, ")"));
-            ops.add(Expression.make(type, "(", type, " / ", type, ")", withArithmeticException));
-            ops.add(Expression.make(type, "(", type, " % ", type, ")", withArithmeticException));
+            ops.add(Expression.make(type, "(", type, " / ", type, ")", WITH_ARITHMETIC_EXCEPTION));
+            ops.add(Expression.make(type, "(", type, " % ", type, ")", WITH_ARITHMETIC_EXCEPTION));
 
             // Bitwise Operators (non short-circuit)
             ops.add(Expression.make(type, "(~(", type, "))"));
@@ -94,6 +119,8 @@ public final class Operations {
             ops.add(Expression.make(BOOLEANS, "(", type, " < ",  type, ")"));
             ops.add(Expression.make(BOOLEANS, "(", type, " >= ", type, ")"));
             ops.add(Expression.make(BOOLEANS, "(", type, " <= ", type, ")"));
+            addComparisonOperations(ops, type.boxedTypeName() + ".compare", type);
+            addComparisonOperations(ops, type.boxedTypeName() + ".compareUnsigned", type); // ugt, uge, ule, ult
         });
 
         CodeGenerationDataNameType.FLOATING_TYPES.stream().forEach(type -> {
@@ -112,6 +139,7 @@ public final class Operations {
             ops.add(Expression.make(BOOLEANS, "(", type, " < ",  type, ")"));
             ops.add(Expression.make(BOOLEANS, "(", type, " >= ", type, ")"));
             ops.add(Expression.make(BOOLEANS, "(", type, " <= ", type, ")"));
+            addComparisonOperations(ops, type.boxedTypeName() + ".compare", type);
         });
 
         // ------------ byte -------------
@@ -152,7 +180,7 @@ public final class Operations {
         ops.add(Expression.make(INTS,  "Integer.compare(", INTS, ", ", INTS, ")"));
         ops.add(Expression.make(INTS,  "Integer.compareUnsigned(", INTS, ", ", INTS, ")"));
         ops.add(Expression.make(INTS,  "Integer.compress(", INTS, ", ", INTS, ")"));
-        ops.add(Expression.make(INTS,  "Integer.divideUnsigned(", INTS, ", ", INTS, ")", withArithmeticException));
+        ops.add(Expression.make(INTS,  "Integer.divideUnsigned(", INTS, ", ", INTS, ")", WITH_ARITHMETIC_EXCEPTION));
         ops.add(Expression.make(INTS,  "Integer.expand(", INTS, ", ", INTS, ")"));
         ops.add(Expression.make(INTS,  "Integer.highestOneBit(", INTS, ")"));
         ops.add(Expression.make(INTS,  "Integer.lowestOneBit(", INTS, ")"));
@@ -160,7 +188,7 @@ public final class Operations {
         ops.add(Expression.make(INTS,  "Integer.min(", INTS, ", ", INTS, ")"));
         ops.add(Expression.make(INTS,  "Integer.numberOfLeadingZeros(", INTS, ")"));
         ops.add(Expression.make(INTS,  "Integer.numberOfTrailingZeros(", INTS, ")"));
-        ops.add(Expression.make(INTS,  "Integer.remainderUnsigned(", INTS, ", ", INTS, ")", withArithmeticException));
+        ops.add(Expression.make(INTS,  "Integer.remainderUnsigned(", INTS, ", ", INTS, ")", WITH_ARITHMETIC_EXCEPTION));
         ops.add(Expression.make(INTS,  "Integer.reverse(", INTS, ")"));
         ops.add(Expression.make(INTS,  "Integer.reverseBytes(", INTS, ")"));
         ops.add(Expression.make(INTS,  "Integer.rotateLeft(", INTS, ", ", INTS, ")"));
@@ -178,7 +206,7 @@ public final class Operations {
         ops.add(Expression.make(INTS,  "Long.compare(", LONGS, ", ", LONGS, ")"));
         ops.add(Expression.make(INTS,  "Long.compareUnsigned(", LONGS, ", ", LONGS, ")"));
         ops.add(Expression.make(LONGS, "Long.compress(", LONGS, ", ", LONGS, ")"));
-        ops.add(Expression.make(LONGS, "Long.divideUnsigned(", LONGS, ", ", LONGS, ")", withArithmeticException));
+        ops.add(Expression.make(LONGS, "Long.divideUnsigned(", LONGS, ", ", LONGS, ")", WITH_ARITHMETIC_EXCEPTION));
         ops.add(Expression.make(LONGS, "Long.expand(", LONGS, ", ", LONGS, ")"));
         ops.add(Expression.make(LONGS, "Long.highestOneBit(", LONGS, ")"));
         ops.add(Expression.make(LONGS, "Long.lowestOneBit(", LONGS, ")"));
@@ -186,7 +214,7 @@ public final class Operations {
         ops.add(Expression.make(LONGS, "Long.min(", LONGS, ", ", LONGS, ")"));
         ops.add(Expression.make(INTS,  "Long.numberOfLeadingZeros(", LONGS, ")"));
         ops.add(Expression.make(INTS,  "Long.numberOfTrailingZeros(", LONGS, ")"));
-        ops.add(Expression.make(LONGS, "Long.remainderUnsigned(", LONGS, ", ", LONGS, ")", withArithmeticException));
+        ops.add(Expression.make(LONGS, "Long.remainderUnsigned(", LONGS, ", ", LONGS, ")", WITH_ARITHMETIC_EXCEPTION));
         ops.add(Expression.make(LONGS, "Long.reverse(", LONGS, ")"));
         ops.add(Expression.make(LONGS, "Long.reverseBytes(", LONGS, ")"));
         ops.add(Expression.make(LONGS, "Long.rotateLeft(", LONGS, ", ", INTS, ")"));
@@ -201,8 +229,8 @@ public final class Operations {
         // ------------ Float -------------
         ops.add(Expression.make(INTS, "Float.compare(", FLOATS, ", ", FLOATS, ")"));
         ops.add(Expression.make(INTS, "Float.floatToIntBits(", FLOATS, ")"));
-        ops.add(Expression.make(INTS, "Float.floatToRawIntBits(", FLOATS, ")", withNondeterministicResult));
         // Note: there are multiple NaN values with different bit representations.
+        ops.add(Expression.make(INTS, "Float.floatToRawIntBits(", FLOATS, ")", WITH_NONDETERMINISTIC_RESULT));
         ops.add(Expression.make(FLOATS, "Float.float16ToFloat(", SHORTS, ")"));
         ops.add(Expression.make(FLOATS, "Float.intBitsToFloat(", INTS, ")"));
         ops.add(Expression.make(BOOLEANS, "Float.isFinite(", FLOATS, ")"));
@@ -220,7 +248,7 @@ public final class Operations {
         ops.add(Expression.make(INTS,     "Double.compare(", DOUBLES, ", ", DOUBLES, ")"));
         ops.add(Expression.make(LONGS,    "Double.doubleToLongBits(", DOUBLES, ")"));
         // Note: there are multiple NaN values with different bit representations.
-        ops.add(Expression.make(LONGS,    "Double.doubleToRawLongBits(", DOUBLES, ")", withNondeterministicResult));
+        ops.add(Expression.make(LONGS,    "Double.doubleToRawLongBits(", DOUBLES, ")", WITH_NONDETERMINISTIC_RESULT));
         ops.add(Expression.make(DOUBLES,  "Double.longBitsToDouble(", LONGS, ")"));
         ops.add(Expression.make(BOOLEANS, "Double.isFinite(", DOUBLES, ")"));
         ops.add(Expression.make(BOOLEANS, "Double.isInfinite(", DOUBLES, ")"));
@@ -250,4 +278,47 @@ public final class Operations {
         // Make sure the list is not modifiable.
         return List.copyOf(ops);
     }
+
+    private static List<Expression> generateFloat16Operations() {
+        List<Expression> ops = new ArrayList<>();
+
+        // Casts.
+        CodeGenerationDataNameType.INTEGRAL_AND_FLOATING_TYPES.stream().forEach(type -> {
+            if (type == CHARS) { return; }
+            ops.add(Expression.make(FLOAT16, "Float16.valueOf(", type, ")"));
+            ops.add(Expression.make(type, "", FLOAT16, "." + type.name() + "Value()"));
+        });
+
+        ops.add(Expression.make(FLOAT16, "Float16.abs(", FLOAT16, ")"));
+        ops.add(Expression.make(FLOAT16, "Float16.add(", FLOAT16, ",", FLOAT16, ")"));
+        ops.add(Expression.make(INTS, "Float16.compare(", FLOAT16, ",", FLOAT16, ")"));
+        addComparisonOperations(ops, "Float16.compare", FLOAT16);
+        ops.add(Expression.make(INTS, "(", FLOAT16, ").compareTo(",  FLOAT16, ")"));
+        ops.add(Expression.make(FLOAT16, "Float16.copySign(", FLOAT16, ",", FLOAT16, ")"));
+        ops.add(Expression.make(FLOAT16, "Float16.divide(", FLOAT16, ",", FLOAT16, ")"));
+        ops.add(Expression.make(BOOLEANS, "", FLOAT16, ".equals(", FLOAT16, ")"));
+        // Note: there are multiple NaN values with different bit representations.
+        ops.add(Expression.make(SHORTS, "Float16.float16ToRawShortBits(", FLOAT16, ")", WITH_NONDETERMINISTIC_RESULT));
+        ops.add(Expression.make(SHORTS, "Float16.float16ToShortBits(", FLOAT16, ")"));
+        ops.add(Expression.make(FLOAT16, "Float16.fma(", FLOAT16, ",", FLOAT16, ", ", FLOAT16, ")"));
+        ops.add(Expression.make(INTS, "Float16.getExponent(", FLOAT16, ")"));
+        ops.add(Expression.make(BOOLEANS, "Float16.isFinite(", FLOAT16, ")"));
+        ops.add(Expression.make(BOOLEANS, "Float16.isInfinite(", FLOAT16, ")"));
+        ops.add(Expression.make(BOOLEANS, "Float16.isNaN(", FLOAT16, ")"));
+        ops.add(Expression.make(FLOAT16, "Float16.max(", FLOAT16, ",", FLOAT16, ")"));
+        ops.add(Expression.make(FLOAT16, "Float16.min(", FLOAT16, ",", FLOAT16, ")"));
+        ops.add(Expression.make(FLOAT16, "Float16.multiply(", FLOAT16, ",", FLOAT16, ")"));
+        ops.add(Expression.make(FLOAT16, "Float16.negate(", FLOAT16, ")"));
+        ops.add(Expression.make(FLOAT16, "Float16.nextDown(", FLOAT16, ")"));
+        ops.add(Expression.make(FLOAT16, "Float16.nextUp(", FLOAT16, ")"));
+        ops.add(Expression.make(FLOAT16, "Float16.scalb(", FLOAT16, ", ", INTS, ")"));
+        ops.add(Expression.make(FLOAT16, "Float16.shortBitsToFloat16(", SHORTS, ")"));
+        ops.add(Expression.make(FLOAT16, "Float16.signum(", FLOAT16, ")"));
+        ops.add(Expression.make(FLOAT16, "Float16.sqrt(", FLOAT16, ")"));
+        ops.add(Expression.make(FLOAT16, "Float16.subtract(", FLOAT16, ",", FLOAT16, ")"));
+        ops.add(Expression.make(FLOAT16, "Float16.ulp(", FLOAT16, ")"));
+
+        // Make sure the list is not modifiable.
+        return List.copyOf(ops);
+    }
 }
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/library/PrimitiveType.java b/test/hotspot/jtreg/compiler/lib/template_framework/library/PrimitiveType.java
index c0db3d51545..b789da45d44 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/library/PrimitiveType.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/library/PrimitiveType.java
@@ -93,6 +93,7 @@ public final class PrimitiveType implements CodeGenerationDataNameType {
         return name();
     }
 
+    @Override
     public Object con() {
         return switch (kind) {
             case BYTE    -> "(byte)" + GEN_BYTE.next();
diff --git a/test/hotspot/jtreg/compiler/lib/verify/Verify.java b/test/hotspot/jtreg/compiler/lib/verify/Verify.java
index 7b5e554b0e3..c79ad2c55a0 100644
--- a/test/hotspot/jtreg/compiler/lib/verify/Verify.java
+++ b/test/hotspot/jtreg/compiler/lib/verify/Verify.java
@@ -150,6 +150,8 @@ public final class Verify {
             default -> {
                 if (isVectorAPIClass(ca)) {
                     checkEQForVectorAPIClass(a, b, field, aParent, bParent);
+                } else if (isFloat16Class(ca)) {
+                    checkEQForFloat16Class(a, b, field, aParent, bParent);
                 } else {
                     checkEQArbitraryClasses(a, b);
                 }
@@ -456,6 +458,40 @@ public final class Verify {
         checkEQdispatch(va, vb, field + ".toArray", aParent, bParent);
     }
 
+    private static boolean isFloat16Class(Class<?> c) {
+        return c.getName().equals("jdk.incubator.vector.Float16");
+    }
+
+    /**
+     * We do not want to import jdk.incubator.vector.Float16 explicitly, because it would mean we would
+     * also have to add "--add-modules=jdk.incubator.vector" to the command-line of every test that uses
+     * the Verify class. So we hack this via reflection.
+     *
+     * An additional challenge is the boxing and NaNs, see also isFloatEQ.
+     */
+    private void checkEQForFloat16Class(Object a, Object b, String field, Object aParent, Object bParent) {
+        Class<?> ca = a.getClass();
+        short bitsA;
+        short bitsB;
+        try {
+            Method m = isFloatCheckWithRawBits ? ca.getMethod("float16ToRawShortBits", ca)
+                                               : ca.getMethod("float16ToShortBits", ca);
+            m.setAccessible(true);
+            bitsA = (short)m.invoke(null, a);
+            bitsB = (short)m.invoke(null, b);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            throw new RuntimeException("Could not invoke float16ToRawShortBits on " + ca.getName(), e);
+        }
+
+        if (bitsA != bitsB) {
+            System.err.println("ERROR: Equality matching failed: value mismatch. check raw: " + isFloatCheckWithRawBits);
+            System.err.println("  Values: " + a + " vs " + b);
+            System.err.println("  Bits:   " + bitsA + " vs " + bitsB);
+            print(a, b, field, aParent, bParent);
+            throw new VerifyException("Value mismatch: " + a + " vs " + b);
+        }
+    }
+
     private void checkEQArbitraryClasses(Object a, Object b) {
         Class<?> c = a.getClass();
         while (c != Object.class) {
diff --git a/test/hotspot/jtreg/compiler/loopopts/InvariantCodeMotionReassociateAddSub.java b/test/hotspot/jtreg/compiler/loopopts/InvariantCodeMotionReassociateAddSub.java
index 11f37c1f7e7..e05cef8335b 100644
--- a/test/hotspot/jtreg/compiler/loopopts/InvariantCodeMotionReassociateAddSub.java
+++ b/test/hotspot/jtreg/compiler/loopopts/InvariantCodeMotionReassociateAddSub.java
@@ -31,6 +31,7 @@ import java.util.Random;
 /*
  * @test
  * @bug 8323220
+ * @key randomness
  * @summary Test loop invariant code motion of add/sub through reassociation
  * @library /test/lib /
  * @run driver compiler.c2.loopopts.InvariantCodeMotionReassociateAddSub
diff --git a/test/hotspot/jtreg/compiler/loopopts/InvariantCodeMotionReassociateCmp.java b/test/hotspot/jtreg/compiler/loopopts/InvariantCodeMotionReassociateCmp.java
index 566e294b4bf..bf139befc98 100644
--- a/test/hotspot/jtreg/compiler/loopopts/InvariantCodeMotionReassociateCmp.java
+++ b/test/hotspot/jtreg/compiler/loopopts/InvariantCodeMotionReassociateCmp.java
@@ -31,6 +31,7 @@ import java.util.Random;
 /*
  * @test
  * @bug 8323220
+ * @key randomness
  * @summary Test loop invariant code motion for cmp nodes through reassociation
  * @library /test/lib /
  * @run driver compiler.c2.loopopts.InvariantCodeMotionReassociateCmp
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestCreateExSunkOutOfLoop.java b/test/hotspot/jtreg/compiler/loopopts/TestCreateExSunkOutOfLoop.java
new file mode 100644
index 00000000000..2e75325afea
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/TestCreateExSunkOutOfLoop.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2025 IBM Corporation. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8373508
+ * @summary C2: sinking CreateEx out of loop breaks the graph
+ * @library /test/lib
+ * @run main/othervm -Xbatch ${test.main.class}
+ * @run main ${test.main.class}
+ */
+
+package compiler.loopopts;
+
+import jdk.test.lib.Utils;
+
+public class TestCreateExSunkOutOfLoop {
+    volatile boolean _mutatorToggle;
+
+    boolean _mutatorFlip() {
+        _mutatorToggle = !_mutatorToggle;
+        return _mutatorToggle;
+    }
+
+    void test() {
+        int idx = -845;
+        for (;;) {
+            try {
+                try {
+                    for (Object temp = new byte[idx];;) {;}
+                } finally {
+                    boolean flag = _mutatorFlip();
+                    _mutatorFlip();
+                    for (;;) {
+                        if (flag) {
+                            break;
+                        }
+                    }
+                }
+            } catch (Throwable $) {;}
+        }
+    }
+
+    public static void main(String[] strArr) throws InterruptedException {
+        Thread thread = new Thread(() -> {
+            TestCreateExSunkOutOfLoop t = new TestCreateExSunkOutOfLoop();
+            t.test();
+        });
+        thread.setDaemon(true);
+        thread.start();
+        Thread.sleep(Utils.adjustTimeout(4000));
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestCreateExSunkOutOfLoop2.java b/test/hotspot/jtreg/compiler/loopopts/TestCreateExSunkOutOfLoop2.java
new file mode 100644
index 00000000000..8c3854995b5
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/TestCreateExSunkOutOfLoop2.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2025 IBM Corporation. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8373508
+ * @summary C2: sinking CreateEx out of loop breaks the graph
+ * @run main/othervm -Xbatch -XX:-TieredCompilation ${test.main.class}
+ * @run main ${test.main.class}
+ */
+
+package compiler.loopopts;
+
+public class TestCreateExSunkOutOfLoop2 {
+    boolean b;
+
+    boolean getB() {
+        return b;
+    }
+
+    void test() {
+        int x = -845;
+
+        for (int i = 5; i > 1; i -= 2) {
+            try {
+                try {
+                    for (Object temp = new byte[x]; ; ) {
+                        // infinite loop
+                    }
+                } finally {
+                    int zeroLimit = 2;
+                    for (; zeroLimit < 4; zeroLimit *= 2) { }
+
+                    int zero = 34;
+                    for (int peel = 2; peel < zeroLimit; peel++) {
+                        zero = 0;
+                    }
+
+                    if (zero == 0) {
+                        // nop
+                    }
+
+                    int flagLimit = 2;
+                    for (; flagLimit < 4; flagLimit *= 2) { }
+
+                    boolean flag = getB();
+                    for (int peel = 2; peel < flagLimit; peel++) {
+                        if (flag) {
+                            break;
+                        }
+                    }
+                }
+            } catch (Throwable t) {
+                // ignored
+            }
+        }
+    }
+
+    public static void main(String[] strArr) {
+        TestCreateExSunkOutOfLoop2 t = new TestCreateExSunkOutOfLoop2();
+        for (int i = 0; i < 10_000; ++i) {
+            t.test();
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestLoopPredicationDivZeroCheck.java b/test/hotspot/jtreg/compiler/loopopts/TestLoopPredicationDivZeroCheck.java
index 82935475aa0..18d0f066cc8 100644
--- a/test/hotspot/jtreg/compiler/loopopts/TestLoopPredicationDivZeroCheck.java
+++ b/test/hotspot/jtreg/compiler/loopopts/TestLoopPredicationDivZeroCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestMissingSkeletonPredicateForIfNode.java b/test/hotspot/jtreg/compiler/loopopts/TestMissingSkeletonPredicateForIfNode.java
index 096abe015b3..6ab18772f6a 100644
--- a/test/hotspot/jtreg/compiler/loopopts/TestMissingSkeletonPredicateForIfNode.java
+++ b/test/hotspot/jtreg/compiler/loopopts/TestMissingSkeletonPredicateForIfNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestValidTypeInOverflowProtection.java b/test/hotspot/jtreg/compiler/loopopts/TestValidTypeInOverflowProtection.java
new file mode 100644
index 00000000000..39f72b04139
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/TestValidTypeInOverflowProtection.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8373525
+ * @summary Test for the check of a valid type (long) for the input variable of overflow protection
+ * @run main/othervm -Xbatch -XX:-TieredCompilation -XX:CompileCommand=compileonly,compiler.loopopts.TestValidTypeInOverflowProtection::test
+ *                   ${test.main.class}
+ * @run main ${test.main.class}
+ */
+
+package compiler.loopopts;
+
+import java.util.Vector;
+
+class TestVector extends Vector {
+    TestVector(int initialCapacity) {
+        super(initialCapacity);
+    }
+
+    Object getElementData() {
+        return elementData;
+    }
+}
+
+public class TestValidTypeInOverflowProtection {
+    int cntr;
+    int mode;
+    int value = 533;
+    int one = 1;
+
+    public static void main(String[] args) {
+        TestValidTypeInOverflowProtection test = new TestValidTypeInOverflowProtection();
+        for (int i = 0; i < 1000; i++) {
+            test.test();
+        }
+    }
+
+    TestVector nextVector() {
+        if (cntr == one) {
+            return null;
+        }
+        TestVector vect = new TestVector(value);
+        if (mode == 2) {
+            int cap = vect.capacity();
+            for (int i = 0; i < cap; i++) {
+                vect.addElement(new Object());
+            }
+        }
+        if (++mode == 3) {
+            mode = cntr++;
+        }
+        return vect;
+    }
+
+    String test() {
+        cntr = 0;
+        TestVector vect = nextVector();
+        while (vect != null) {
+            Object backup_array = new Object[vect.size()];
+            System.arraycopy(vect.getElementData(), 0, backup_array, 0, vect.size());
+            int old_size = vect.size();
+            int old_cap = vect.capacity();
+            vect.setSize(vect.capacity() + 1);
+            for (int i = old_size; i < old_cap; i++) {
+                if (vect.elementAt(i) != null) {
+                }
+            }
+            for (int i = 0; i < new MyInteger(old_size).v; i++) {
+            }
+            vect = nextVector();
+        }
+        return null;
+    }
+
+    class MyInteger {
+        int v;
+
+        MyInteger(int v) {
+            int M452 = 4;
+            int N452 = 8;
+            for (int i452 = 0; i452 < M452; i452++) {
+                for (int j452 = 0; j452 < N452; j452++) {
+                    switch (i452) {
+                        case -2:
+                        case 0:
+                            this.v = v;
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/hotspot/jtreg/compiler/loopopts/parallel_iv/TestParallelIvInIntCountedLoop.java b/test/hotspot/jtreg/compiler/loopopts/parallel_iv/TestParallelIvInIntCountedLoop.java
index 95ba9e6e795..f8abb716e42 100644
--- a/test/hotspot/jtreg/compiler/loopopts/parallel_iv/TestParallelIvInIntCountedLoop.java
+++ b/test/hotspot/jtreg/compiler/loopopts/parallel_iv/TestParallelIvInIntCountedLoop.java
@@ -32,6 +32,7 @@ import java.util.Random;
 /**
  * @test
  * @bug 8328528
+ * @key randomness
  * @summary test the long typed parallel iv replacing transformation for int counted loop
  * @library /test/lib /
  * @requires vm.compiler2.enabled
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/MinMaxRed_Int.java b/test/hotspot/jtreg/compiler/loopopts/superword/MinMaxRed_Int.java
index 4e15c0de6e9..08f5e200aa0 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/MinMaxRed_Int.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/MinMaxRed_Int.java
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 8302673
+ * @key randomness
  * @summary [SuperWord] MaxReduction and MinReduction should vectorize for int
  * @library /test/lib /
  * @run driver compiler.loopopts.superword.MinMaxRed_Int
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/ReductionPerf.java b/test/hotspot/jtreg/compiler/loopopts/superword/ReductionPerf.java
index 56acdd349f8..10181ab3da2 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/ReductionPerf.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/ReductionPerf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8074981 8302652
+ * @key randomness
  * @summary Test SuperWord Reduction Perf.
  * @library /test/lib /
  * @run main/othervm -Xbatch
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasing.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasing.java
index 33cef6e5e6b..f5ad14871f9 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasing.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasing.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8324751
+ * @key randomness
  * @summary Test Speculative Aliasing checks in SuperWord
  * @library /test/lib /
  * @run driver compiler.loopopts.superword.TestAliasing nCOH_nAV_ySAC
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasingCheckVPointerVariablesNotAvailable.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasingCheckVPointerVariablesNotAvailable.java
new file mode 100644
index 00000000000..47540da5648
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestAliasingCheckVPointerVariablesNotAvailable.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=with-flags
+ * @bug 8373502
+ * @summary Test where a VPointer variable was pinned at the pre-loop, but not available at the
+ *          Auto_Vectorization_Check, and so it should not be used for the auto vectorization
+ *          aliasing check, to avoid a bad (circular) graph.
+ * @run main/othervm
+ *      -XX:CompileCommand=compileonly,*TestAliasingCheckVPointerVariablesNotAvailable::test
+ *      -XX:-TieredCompilation
+ *      -Xcomp
+ *      ${test.main.class}
+ */
+
+/*
+ * @test id=vanilla
+ * @bug 8373502
+ * @run main ${test.main.class}
+ */
+
+package compiler.loopopts.superword;
+
+public class TestAliasingCheckVPointerVariablesNotAvailable {
+    static int iFld;
+
+    public static void main(String[] strArr) {
+        test();
+    }
+
+    static void test() {
+        int iArr[] = new int[400];
+        boolean flag = false;
+        for (int i = 6; i < 50000; i++) { // Trigger OSR
+            try {
+                int x = 234 / iFld;
+                iFld = iArr[3];
+            } catch (ArithmeticException a_e) {
+            }
+            for (int j = i; j < 2; j++) {
+                if (flag) {
+                    iArr[j] = 117;
+                } else {
+                    iArr[1] = 34;
+                }
+                iArr[1] += i;
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVector.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVector.java
index 322c36c39e1..5a2d11ef2e1 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVector.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVector.java
@@ -36,6 +36,7 @@ import java.nio.ByteOrder;
 /*
  * @test id=NoAlignVector
  * @bug 8310190
+ * @key randomness
  * @summary Test AlignVector with various loop init, stride, scale, invar, etc.
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestCompatibleUseDefTypeSize.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestCompatibleUseDefTypeSize.java
index e6c373c4c87..0e17489e1c8 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestCompatibleUseDefTypeSize.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestCompatibleUseDefTypeSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@ import java.nio.ByteOrder;
 /*
  * @test
  * @bug 8325155
+ * @key randomness
  * @summary Test some cases that vectorize after the removal of the alignment boundaries code.
  *          Now, we instead check if use-def connections have compatible type size.
  * @library /test/lib /
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestCyclicDependency.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestCyclicDependency.java
index b7e62c394ec..58cae526479 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestCyclicDependency.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestCyclicDependency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestDependencyOffsets.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestDependencyOffsets.java
index e2aca036474..2678aab9c40 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestDependencyOffsets.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestDependencyOffsets.java
@@ -24,6 +24,7 @@
 /*
  * @test id=vanilla-A
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @library /test/lib /
  * @compile ../../lib/ir_framework/TestFramework.java
@@ -33,6 +34,7 @@
 /*
  * @test id=vanilla-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @library /test/lib /
  * @compile ../../lib/ir_framework/TestFramework.java
@@ -42,6 +44,7 @@
 /*
  * @test id=sse4-v016-A
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -54,6 +57,7 @@
 /*
  * @test id=sse4-v016-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -66,6 +70,7 @@
 /*
  * @test id=sse4-v008-A
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -78,6 +83,7 @@
 /*
  * @test id=sse4-v008-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -102,6 +108,7 @@
 /*
  * @test id=sse4-v004-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -114,6 +121,7 @@
 /*
  * @test id=avx1-v032-A
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -126,6 +134,7 @@
 /*
  * @test id=avx1-v032-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -138,6 +147,7 @@
 /*
  * @test id=avx1-v016-A
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -150,6 +160,7 @@
 /*
  * @test id=avx1-v016-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -162,6 +173,7 @@
 /*
  * @test id=avx2-v032-A
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -174,6 +186,7 @@
 /*
  * @test id=avx2-v032-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -186,6 +199,7 @@
 /*
  * @test id=avx2-v016-A
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -198,6 +212,7 @@
 /*
  * @test id=avx2-v016-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -210,6 +225,7 @@
 /*
  * @test id=avx512-v064-A
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -222,6 +238,7 @@
 /*
  * @test id=avx512-v064-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -234,6 +251,7 @@
 /*
  * @test id=avx512-v032-A
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -246,6 +264,7 @@
 /*
  * @test id=avx512-v032-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -258,6 +277,7 @@
 /*
  * @test id=avx512bw-v064-A
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -270,6 +290,7 @@
 /*
  * @test id=avx512bw-v064-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -282,6 +303,7 @@
 /*
  * @test id=avx512bw-v032-A
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -294,6 +316,7 @@
 /*
  * @test id=avx512bw-v032-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64")
@@ -306,6 +329,7 @@
 /*
  * @test id=vec-v064-A
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64")
@@ -317,6 +341,7 @@
 /*
  * @test id=vec-v064-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64")
@@ -328,6 +353,7 @@
 /*
  * @test id=vec-v032-A
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64")
@@ -339,6 +365,7 @@
 /*
  * @test id=vec-v032-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64")
@@ -350,6 +377,7 @@
 /*
  * @test id=vec-v016-A
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64")
@@ -361,6 +389,7 @@
 /*
  * @test id=vec-v016-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64")
@@ -372,6 +401,7 @@
 /*
  * @test id=vec-v008-A
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64")
@@ -383,6 +413,7 @@
 /*
  * @test id=vec-v008-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64")
@@ -394,6 +425,7 @@
 /*
  * @test id=vec-v004-A
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64")
@@ -405,6 +437,7 @@
 /*
  * @test id=vec-v004-U
  * @bug 8298935 8308606 8310308 8312570 8310190
+ * @key randomness
  * @summary Test SuperWord: vector size, offsets, dependencies, alignment.
  * @requires vm.compiler2.enabled
  * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64")
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java
index 91d1ee9666a..8677ae851cf 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java
@@ -35,6 +35,7 @@ import java.lang.foreign.*;
 /*
  * @test
  * @bug 8343685 8331659
+ * @key randomness
  * @summary Test vectorization with various invariants that are equivalent, but not trivially so,
  *          i.e. where the invariants have the same summands, but in a different order.
  * @modules java.base/jdk.internal.misc
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestGeneralizedReductions.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestGeneralizedReductions.java
index 6c2f0d825b9..982594b89c8 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestGeneralizedReductions.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestGeneralizedReductions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency.java
index d49eab4f62a..2a6e67f5536 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegment.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegment.java
index a2b5434a5a2..20ba2638fc1 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegment.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegment.java
@@ -34,6 +34,7 @@ import java.lang.foreign.*;
 /*
  * @test id=byte-array
  * @bug 8329273
+ * @key randomness
  * @summary Test vectorization of loops over MemorySegment
  * @library /test/lib /
  * @run driver compiler.loopopts.superword.TestMemorySegment ByteArray
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegmentUnalignedAddress.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegmentUnalignedAddress.java
index 969014e2293..7354ba896d0 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegmentUnalignedAddress.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegmentUnalignedAddress.java
@@ -35,6 +35,7 @@ import java.lang.foreign.*;
 /*
  * @test id=byte-buffer-direct
  * @bug 8323582
+ * @key randomness
  * @summary Test vectorization of loops over MemorySegment, with native memory where the address is not always aligned.
  * @library /test/lib /
  * @run driver compiler.loopopts.superword.TestMemorySegmentUnalignedAddress ByteBufferDirect
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java
index e178d831938..f6a49b6dada 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestReinterpretAndCast.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestReinterpretAndCast.java
index ab2801179f2..9c5140d2aaa 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestReinterpretAndCast.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestReinterpretAndCast.java
@@ -162,7 +162,7 @@ public class TestReinterpretAndCast {
                   IRNode.STORE_VECTOR,       "> 0",
                   IRNode.VECTOR_REINTERPRET, "> 0"}, // We have at least I2F
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeature = {"avx", "true"})
+        applyIfCPUFeatureAnd = {"avx", "true", "f16c", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_I,    IRNode.VECTOR_SIZE + "min(max_int, max_float, max_short)", "> 0",
                   IRNode.VECTOR_CAST_F2HF, IRNode.VECTOR_SIZE + "min(max_int, max_float, max_short)", "> 0",
                   IRNode.STORE_VECTOR,       "> 0",
@@ -208,7 +208,7 @@ public class TestReinterpretAndCast {
                   IRNode.STORE_VECTOR,       "> 0",
                   IRNode.VECTOR_REINTERPRET, "> 0"}, // We have at least F2I
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeature = {"avx", "true"})
+        applyIfCPUFeatureAnd = {"avx", "true", "f16c", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_S,    IRNode.VECTOR_SIZE + "min(max_float, max_short, max_long)", "> 0",
                   IRNode.VECTOR_CAST_HF2F, IRNode.VECTOR_SIZE + "min(max_float, max_short, max_long)", "> 0",
                   IRNode.VECTOR_CAST_I2L,  IRNode.VECTOR_SIZE + "min(max_float, max_short, max_long)", "> 0",
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestScheduleReordersScalarMemops.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestScheduleReordersScalarMemops.java
index a837136218d..f7e81bc1864 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestScheduleReordersScalarMemops.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestScheduleReordersScalarMemops.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestSplitPacks.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestSplitPacks.java
index 631b55fc65f..9a2e23e4530 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestSplitPacks.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestSplitPacks.java
@@ -35,6 +35,7 @@ import java.nio.ByteOrder;
 /*
  * @test
  * @bug 8326139 8348659
+ * @key randomness
  * @summary Test splitting packs in SuperWord
  * @library /test/lib /
  * @run driver compiler.loopopts.superword.TestSplitPacks nCOH_nAV_ySAC
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestUnorderedReductionPartialVectorization.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestUnorderedReductionPartialVectorization.java
index c862704da26..e9be6a5ab24 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestUnorderedReductionPartialVectorization.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestUnorderedReductionPartialVectorization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/loopstripmining/TestMismatchedMemoryPhis.java b/test/hotspot/jtreg/compiler/loopstripmining/TestMismatchedMemoryPhis.java
new file mode 100644
index 00000000000..06980c36537
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopstripmining/TestMismatchedMemoryPhis.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2025 IBM Corporation. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8370200
+ * @summary Crash: assert(outer->outcnt() >= phis + 2 - be_loads && outer->outcnt() <= phis + 2 + stores + 1) failed: only phis
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:StressSeed=36200582 -XX:CompileCommand=quiet
+ *                   -XX:CompileCommand=compileonly,*TestMismatchedMemoryPhis*::mainTest -XX:-TieredCompilation
+ *                   -Xcomp -XX:+StressIGVN -XX:+StressLoopPeeling -XX:PerMethodTrapLimit=0 ${test.main.class}
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:CompileCommand=quiet
+ *                   -XX:CompileCommand=compileonly,*TestMismatchedMemoryPhis*::mainTest -XX:-TieredCompilation
+ *                   -Xcomp -XX:+StressIGVN -XX:+StressLoopPeeling -XX:PerMethodTrapLimit=0 ${test.main.class}
+ * @run main ${test.main.class}
+ */
+
+package compiler.loopstripmining;
+
+public class TestMismatchedMemoryPhis {
+    long l;
+    volatile int iArrFld[];
+
+    void mainTest() {
+        int i, i1, i15 = 4, i16 = 4;
+        for (i = 1; i < 7; ++i) {
+            l = i;
+        }
+        int j = 1;
+        while (++j < 4) {
+            try {
+                i1 = i15 % i16;
+                i16 = i15;
+                i1 = 0 % iArrFld[j];
+            } catch (ArithmeticException a_e) {
+            }
+        }
+    }
+
+    static public void main(String[] args) {
+        try {
+            new TestMismatchedMemoryPhis().mainTest();
+        } catch (NullPointerException npe) {
+            // Expected
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java b/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java
index 3985ad8ea90..e6c8b68fc6f 100644
--- a/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java
+++ b/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java
@@ -39,11 +39,6 @@ public class Helper {
         return StringCoding.countPositives(ba, off, len);
     }
 
-    @jdk.internal.vm.annotation.ForceInline
-    public static int StringCodingEncodeAsciiArray0(char[] sa, int sp, byte[] da, int dp, int len) {
-        return StringCoding.encodeAsciiArray0(sa, sp, da, dp, len);
-    }
-
     @jdk.internal.vm.annotation.ForceInline
     public static byte[] compressByte(byte[] src, int srcOff, int dstSize, int dstOff, int len) {
         byte[] dst = new byte[dstSize];
diff --git a/test/hotspot/jtreg/compiler/predicates/assertion/TestTemplateWithoutOpaqueLoopNodes.java b/test/hotspot/jtreg/compiler/predicates/assertion/TestTemplateWithoutOpaqueLoopNodes.java
index 9dcc6904270..1f0448b2085 100644
--- a/test/hotspot/jtreg/compiler/predicates/assertion/TestTemplateWithoutOpaqueLoopNodes.java
+++ b/test/hotspot/jtreg/compiler/predicates/assertion/TestTemplateWithoutOpaqueLoopNodes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java b/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java
index 1ff63d63f72..895589ea03f 100644
--- a/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java
+++ b/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/rangechecks/TestArrayAccessAboveRCAfterRCCastIIEliminated.java b/test/hotspot/jtreg/compiler/rangechecks/TestArrayAccessAboveRCAfterRCCastIIEliminated.java
index 87e87842af3..b31c1425728 100644
--- a/test/hotspot/jtreg/compiler/rangechecks/TestArrayAccessAboveRCAfterRCCastIIEliminated.java
+++ b/test/hotspot/jtreg/compiler/rangechecks/TestArrayAccessAboveRCAfterRCCastIIEliminated.java
@@ -44,7 +44,6 @@ public class TestArrayAccessAboveRCAfterRCCastIIEliminated {
     private static volatile int volatileField;
 
     public static void main(String[] args) {
-        int[] array = new int[100];
         for (int i = 0; i < 20_000; i++) {
             test1(9, 10, 1, true);
             test1(9, 10, 1, false);
@@ -72,6 +71,13 @@ public class TestArrayAccessAboveRCAfterRCCastIIEliminated {
             test12(9, 10, 1, false);
             test13(9, 10, 1, true);
             test13(9, 10, 1, false);
+            test14(8, 0, 1, true);
+            test14(8, 0, 1, false);
+            inlined14(0, 0);
+            test15(8, 0, 1, true);
+            test15(8, 0, 1, false);
+            inlined15(0, 0);
+
         }
         try {
             test1(-1, 10, 1, true);
@@ -125,6 +131,14 @@ public class TestArrayAccessAboveRCAfterRCCastIIEliminated {
             test13(-1, 10, 1, true);
         } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
         }
+        try {
+            test14(Integer.MAX_VALUE, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
+        try {
+            test15(Integer.MAX_VALUE, 10, 1, true);
+        } catch (ArrayIndexOutOfBoundsException arrayIndexOutOfBoundsException) {
+        }
     }
 
     private static void test1(int i, int j, int flag, boolean flag2) {
@@ -468,6 +482,72 @@ public class TestArrayAccessAboveRCAfterRCCastIIEliminated {
         }
     }
 
+    // Range check cast type widen after loop opts causes control dependency to be lost
+    private static void test14(int i, int j, int flag, boolean flag2) {
+        int l = 0;
+        for (; l < 10; l++);
+        j = inlined14(j, l);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[10];
+            newArray[i+j] = 42; // i+j in [0, 9]
+            float[] otherArray = new float[i+j]; // i+j in [0, max]
+            if (flag == 0) {
+            }
+            intField = array[otherArray.length];
+        } else {
+            float[] newArray = new float[10];
+            newArray[i+j] = 42; // i+j in [0, 9]
+            float[] otherArray = new float[i+j]; // i+j in [0, max]
+            if (flag == 0) {
+            }
+            intField = array[otherArray.length];
+        }
+    }
+
+    private static int inlined14(int j, int l) {
+        if (l == 10) {
+            j = 1;
+        }
+        return j;
+    }
+
+    private static void test15(int i, int j, int flag, boolean flag2) {
+        i = Integer.max(i, Integer.MIN_VALUE + 1);
+        int l = 0;
+        for (; l < 10; l++);
+        j = inlined15(j, l);
+        int[] array = new int[10];
+        notInlined(array);
+        if (flag == 0) {
+        }
+        if (flag2) {
+            float[] newArray = new float[10];
+            newArray[i+j] = 42; // i+j in [0, 9]
+            float[] otherArray = new float[i+j]; // i+j in [0, max]
+            if (flag == 0) {
+            }
+            intField = array[otherArray.length];
+        } else {
+            float[] newArray = new float[10];
+            newArray[i+j] = 42; // i+j in [0, 9]
+            float[] otherArray = new float[i+j]; // i+j in [0, max]
+            if (flag == 0) {
+            }
+            intField = array[otherArray.length];
+        }
+    }
+
+    private static int inlined15(int j, int l) {
+        if (l == 10) {
+            j = Integer.max(j, Integer.MIN_VALUE + 10);
+        }
+        return j;
+    }
+
     private static void notInlined(int[] array) {
 
     }
diff --git a/test/hotspot/jtreg/compiler/splitif/TestSplitDivisionThroughPhi.java b/test/hotspot/jtreg/compiler/splitif/TestSplitDivisionThroughPhi.java
index e3ee65f454d..a58f5b82309 100644
--- a/test/hotspot/jtreg/compiler/splitif/TestSplitDivisionThroughPhi.java
+++ b/test/hotspot/jtreg/compiler/splitif/TestSplitDivisionThroughPhi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/unsafe/OpaqueAccesses.java b/test/hotspot/jtreg/compiler/unsafe/OpaqueAccesses.java
index 485aed4c032..7977125b9cf 100644
--- a/test/hotspot/jtreg/compiler/unsafe/OpaqueAccesses.java
+++ b/test/hotspot/jtreg/compiler/unsafe/OpaqueAccesses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorapi/Test8278948.java b/test/hotspot/jtreg/compiler/vectorapi/Test8278948.java
index 5218e10c4af..5170c188133 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/Test8278948.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/Test8278948.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ import jdk.test.lib.Utils;
 /*
  * @test
  * @bug 8278948
+ * @key randomness
  * @summary Intermediate integer promotion vector length encoding is calculated incorrectly on x86
  * @modules jdk.incubator.vector
  * @library /test/lib
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestVectorAddMulReduction.java b/test/hotspot/jtreg/compiler/vectorapi/TestVectorAddMulReduction.java
index 38a2753a7ed..ddf16ce185f 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/TestVectorAddMulReduction.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestVectorAddMulReduction.java
@@ -38,6 +38,7 @@ import jdk.test.lib.Utils;
 /**
  * @test
  * @bug 8320725
+ * @key randomness
  * @library /test/lib /
  * @summary Verify non-strictly ordered AddReductionVF/VD and MulReductionVF/VD
  *          nodes are generated in VectorAPI
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestVectorCompressExpandBits.java b/test/hotspot/jtreg/compiler/vectorapi/TestVectorCompressExpandBits.java
index f5174b7e6dc..8889ccd0d26 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/TestVectorCompressExpandBits.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestVectorCompressExpandBits.java
@@ -38,6 +38,7 @@ import jdk.test.lib.Utils;
 /**
  * @test
  * @bug 8301012
+ * @key randomness
  * @library /test/lib /
  * @requires os.arch == "aarch64" & vm.cpu.features ~= ".*sve2.*" & vm.cpu.features ~= ".*svebitperm.*"
  * @summary [vectorapi]: Intrinsify CompressBitsV/ExpandBitsV and add the AArch64 SVE backend implementation
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestVectorLoadStoreOptimization.java b/test/hotspot/jtreg/compiler/vectorapi/TestVectorLoadStoreOptimization.java
new file mode 100644
index 00000000000..c603f450d0c
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestVectorLoadStoreOptimization.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.vectorapi;
+
+import compiler.lib.generators.*;
+import compiler.lib.ir_framework.*;
+import jdk.incubator.vector.*;
+import jdk.test.lib.Asserts;
+
+/**
+ * @test 8371603
+ * @key randomness
+ * @library /test/lib /
+ * @summary Test the missing optimization issues for vector load/store caused by JDK-8286941
+ * @modules jdk.incubator.vector
+ *
+ * @run driver ${test.main.class}
+ */
+public class TestVectorLoadStoreOptimization {
+    private static final int LENGTH = 1024;
+    private static final Generators random = Generators.G;
+
+    private static final VectorSpecies<Integer> SPECIES = IntVector.SPECIES_PREFERRED;
+
+    private static int[] a;
+
+    static {
+        a = new int[LENGTH];
+        random.fill(random.ints(), a);
+    }
+
+    // Test that "LoadVectorNode::Ideal()" calls "LoadNode::Ideal()" as expected,
+    // which sees the previous stores that go to the same position in-dependently,
+    // and optimize out the load with matched store values.
+    @Test
+    @IR(counts = { IRNode.LOAD_VECTOR_I, "1" },
+        applyIfCPUFeatureOr = {"asimd", "true", "avx", "true", "rvv", "true"})
+    public static void testLoadVector() {
+        IntVector v1 = IntVector.fromArray(SPECIES, a, 0);
+        v1.intoArray(a, SPECIES.length());
+        v1.intoArray(a, 2 * SPECIES.length());
+        // The second load vector equals to the first one and should be optimized
+        // out by "LoadNode::Ideal()".
+        IntVector v2 = IntVector.fromArray(SPECIES, a, SPECIES.length());
+        v2.intoArray(a, 3 * SPECIES.length());
+    }
+
+    @Check(test = "testLoadVector")
+    public static void testLoadVectorVerify() {
+        for (int i = SPECIES.length(); i < 4 * SPECIES.length(); i += SPECIES.length()) {
+            for (int j = 0; j < SPECIES.length(); j++) {
+                Asserts.assertEquals(a[i + j], a[j]);
+            }
+        }
+    }
+
+    // Test that "StoreVectorNode::Ideal()" calls "StoreNode::Ideal()" as expected,
+    // which can get rid of previous stores that go to the same position.
+    @Test
+    @IR(counts = { IRNode.STORE_VECTOR, "1" },
+        applyIfCPUFeatureOr = {"asimd", "true", "avx", "true", "rvv", "true"})
+    public static void testStoreVector() {
+        IntVector v1 = IntVector.fromArray(SPECIES, a, 0 * SPECIES.length());
+        IntVector v2 = IntVector.fromArray(SPECIES, a, 1 * SPECIES.length());
+        // Useless store to same position as below, which should be optimized out by
+        // "StoreNode::Ideal()".
+        v1.intoArray(a, 3 * SPECIES.length());
+        v2.intoArray(a, 3 * SPECIES.length());
+    }
+
+    @Check(test = "testStoreVector")
+    public static void testStoreVectorVerify() {
+        for (int i = 3 * SPECIES.length(); i < 4 * SPECIES.length(); i++) {
+            Asserts.assertEquals(a[i], a[i - 2 * SPECIES.length()]);
+        }
+    }
+
+    public static void main(String[] args) {
+        TestFramework testFramework = new TestFramework();
+        testFramework.setDefaultWarmup(10000)
+                     .addFlags("--add-modules=jdk.incubator.vector")
+                     .start();
+    }
+}
\ No newline at end of file
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestVectorOperationsWithPartialSize.java b/test/hotspot/jtreg/compiler/vectorapi/TestVectorOperationsWithPartialSize.java
new file mode 100644
index 00000000000..45f7497f99c
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestVectorOperationsWithPartialSize.java
@@ -0,0 +1,401 @@
+/*
+ * Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.vectorapi;
+
+import compiler.lib.generators.*;
+import compiler.lib.ir_framework.*;
+import jdk.incubator.vector.*;
+import jdk.test.lib.Asserts;
+
+/**
+ * @test 8371603
+ * @key randomness
+ * @library /test/lib /
+ * @summary Test vector operations with vector size less than MaxVectorSize
+ * @modules jdk.incubator.vector
+ *
+ * @run driver ${test.main.class}
+ */
+
+public class TestVectorOperationsWithPartialSize {
+    private static final int SIZE = 1024;
+    private static final Generators random = Generators.G;
+
+    private static final VectorSpecies<Integer> ISPEC_128 = IntVector.SPECIES_128;
+    private static final VectorSpecies<Long> LSPEC_128 = LongVector.SPECIES_128;
+    private static final VectorSpecies<Float> FSPEC_128 = FloatVector.SPECIES_128;
+    private static final VectorSpecies<Double> DSPEC_128 = DoubleVector.SPECIES_128;
+    private static final VectorSpecies<Integer> ISPEC_256 = IntVector.SPECIES_256;
+    private static final VectorSpecies<Long> LSPEC_256 = LongVector.SPECIES_256;
+
+    private static int[] ia;
+    private static int[] ib;
+    private static long[] la;
+    private static long[] lb;
+    private static float[] fa;
+    private static float[] fb;
+    private static double[] da;
+    private static double[] db;
+    private static boolean[] m;
+    private static boolean[] mr;
+    private static int[] indices;
+
+    static {
+        ia = new int[SIZE];
+        ib = new int[SIZE];
+        la = new long[SIZE];
+        lb = new long[SIZE];
+        fa = new float[SIZE];
+        fb = new float[SIZE];
+        da = new double[SIZE];
+        db = new double[SIZE];
+        m = new boolean[SIZE];
+        mr = new boolean[SIZE];
+        indices = new int[SIZE];
+
+        random.fill(random.ints(), ia);
+        random.fill(random.longs(), la);
+        random.fill(random.floats(), fa);
+        random.fill(random.doubles(), da);
+        random.fill(random.uniformInts(0, ISPEC_128.length()), indices);
+        for (int i = 0; i < SIZE; i++) {
+            m[i] = i % 2 == 0;
+        }
+    }
+
+    // ================ Load/Store/Gather/Scatter Tests ==================
+
+    private static void verifyLoadStore(int[] expected, int[] actual, int vlen) {
+        for (int i = 0; i < vlen; i++) {
+            Asserts.assertEquals(expected[i], actual[i]);
+        }
+    }
+
+    private static void verifyLoadGatherStoreScatter(int[] expected, int[] actual, int[] indices, int vlen) {
+        for (int i = 0; i < vlen; i++) {
+            Asserts.assertEquals(expected[indices[i]], actual[indices[i]]);
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "0",
+                  IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_4, "1",
+                  IRNode.STORE_VECTOR, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">=32"})
+    public void testLoadStore_128() {
+        IntVector v = IntVector.fromArray(ISPEC_128, ia, 0);
+        v.intoArray(ib, 0);
+        verifyLoadStore(ia, ib, ISPEC_128.length());
+    }
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.LOAD_VECTOR_MASKED, "1",
+                  IRNode.STORE_VECTOR_MASKED, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">=64"})
+    public void testLoadStore_256() {
+        IntVector v = IntVector.fromArray(ISPEC_256, ia, 0);
+        v.intoArray(ib, 0);
+        verifyLoadStore(ia, ib, ISPEC_256.length());
+    }
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.LOAD_VECTOR_GATHER_MASKED, "1",
+                  IRNode.STORE_VECTOR_SCATTER_MASKED, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">=32"})
+    public void testLoadGatherStoreScatter_128() {
+        IntVector v = IntVector.fromArray(ISPEC_128, ia, 0, indices, 0);
+        v.intoArray(ib, 0, indices, 0);
+        verifyLoadGatherStoreScatter(ia, ib, indices, ISPEC_128.length());
+    }
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.LOAD_VECTOR_GATHER_MASKED, "1",
+                  IRNode.STORE_VECTOR_SCATTER_MASKED, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">=64"})
+    public void testLoadGatherStoreScatter_256() {
+        IntVector v = IntVector.fromArray(ISPEC_256, ia, 0, indices, 0);
+        v.intoArray(ib, 0, indices, 0);
+        verifyLoadGatherStoreScatter(ia, ib, indices, ISPEC_256.length());
+    }
+
+    // ===================== Reduction Tests - Add =====================
+
+    interface binOpInt {
+        int apply(int a, int b);
+    }
+
+    interface binOpLong {
+        long apply(long a, long b);
+    }
+
+    private static int reduceLanes(int init, int[] arr, int vlen, binOpInt f) {
+        int result = init;
+        for (int i = 0; i < vlen; i++) {
+            result = f.apply(arr[i], result);
+        }
+        return result;
+    }
+
+    private static long reduceLanes(long init, long[] arr, int vlen, binOpLong f) {
+        long result = init;
+        for (int i = 0; i < vlen; i++) {
+            result = f.apply(arr[i], result);
+        }
+        return result;
+    }
+
+    // Reduction add operations with integer types are implemented with NEON SIMD instructions
+    // when the vector size is less than or equal to 128-bit.
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "0",
+                  IRNode.ADD_REDUCTION_VI, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">=32"})
+    public int testAddReductionInt_128() {
+        IntVector v = IntVector.fromArray(ISPEC_128, ia, 0);
+        int result = v.reduceLanes(VectorOperators.ADD);
+        Asserts.assertEquals(reduceLanes(0, ia, ISPEC_128.length(), (a, b) -> (a + b)), result);
+        return result;
+    }
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.ADD_REDUCTION_VI, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">=64"})
+    public int testAddReductionInt_256() {
+        IntVector v = IntVector.fromArray(ISPEC_256, ia, 0);
+        int result = v.reduceLanes(VectorOperators.ADD);
+        Asserts.assertEquals(reduceLanes(0, ia, ISPEC_256.length(), (a, b) -> (a + b)), result);
+        return result;
+    }
+
+    // Reduction add operations with long types are implemented with NEON SIMD instructions
+    // when the vector size is less than or equal to 128-bit.
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "0",
+                  IRNode.ADD_REDUCTION_VL, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">=32"})
+    public long testAddReductionLong_128() {
+        LongVector v = LongVector.fromArray(LSPEC_128, la, 0);
+        long result = v.reduceLanes(VectorOperators.ADD);
+        Asserts.assertEquals(reduceLanes(0L, la, LSPEC_128.length(), (a, b) -> (a + b)), result);
+        return result;
+    }
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.ADD_REDUCTION_VL, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">=64"})
+    public long testAddReductionLong_256() {
+        LongVector v = LongVector.fromArray(LSPEC_256, la, 0);
+        long result = v.reduceLanes(VectorOperators.ADD);
+        Asserts.assertEquals(reduceLanes(0L, la, LSPEC_256.length(), (a, b) -> (a + b)), result);
+        return result;
+    }
+
+    // Because the evaluation order of floating point reduction addition in the Vector
+    // API is not guaranteed, it is difficult to choose a single tolerance that reliably
+    // validates results for randomly generated floating‑point inputs. Given that there
+    // are already extensive jtreg tests under "test/jdk/jdk/incubator/vector" that verify
+    // the API’s numerical correctness, this test is instead focused solely on checking
+    // the generated IRs, and deliberately does not assert on the computed result.
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.ADD_REDUCTION_VF, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">=32"})
+    public float testAddReductionFloat() {
+        FloatVector v = FloatVector.fromArray(FSPEC_128, fa, 0);
+        return v.reduceLanes(VectorOperators.ADD);
+    }
+
+    // Same with above test for float type, this test does not validate the numerical
+    // result and focuses solely on checking the correctness of the generated IR.
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.ADD_REDUCTION_VD, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">=32"})
+    public double testAddReductionDouble() {
+        DoubleVector v = DoubleVector.fromArray(DSPEC_128, da, 0);
+        return v.reduceLanes(VectorOperators.ADD);
+    }
+
+    // ============== Reduction Tests - Logical ==============
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.AND_REDUCTION_V, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">=32"})
+    public int testAndReduction() {
+        IntVector v = IntVector.fromArray(ISPEC_128, ia, 0);
+        int result = v.reduceLanes(VectorOperators.AND);
+        Asserts.assertEquals(reduceLanes(-1, ia, ISPEC_128.length(), (a, b) -> (a & b)), result);
+        return result;
+    }
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.OR_REDUCTION_V, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">=32"})
+    public int testOrReduction() {
+        IntVector v = IntVector.fromArray(ISPEC_128, ia, 0);
+        int result = v.reduceLanes(VectorOperators.OR);
+        Asserts.assertEquals(reduceLanes(0, ia, ISPEC_128.length(), (a, b) -> (a | b)), result);
+        return result;
+    }
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.XOR_REDUCTION_V, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">=32"})
+    public int testXorReduction() {
+        IntVector v = IntVector.fromArray(ISPEC_128, ia, 0);
+        int result = v.reduceLanes(VectorOperators.XOR);
+        Asserts.assertEquals(reduceLanes(0, ia, ISPEC_128.length(), (a, b) -> (a ^ b)), result);
+        return result;
+    }
+
+    // ===================== Reduction Tests - Min/Max =====================
+
+    // Reduction min operations with non-long types are implemented with NEON SIMD instructions
+    // when the vector size is less than or equal to 128-bit.
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "0",
+                  IRNode.MIN_REDUCTION_V, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">= 32"})
+    public int testMinReductionInt_128() {
+        IntVector v = IntVector.fromArray(ISPEC_128, ia, 0);
+        int result = v.reduceLanes(VectorOperators.MIN);
+        Asserts.assertEquals(reduceLanes(Integer.MAX_VALUE, ia, ISPEC_128.length(), (a, b) -> Math.min(a, b)), result);
+        return result;
+    }
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.MIN_REDUCTION_V, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">= 64"})
+    public int testMinReductionInt_256() {
+        IntVector v = IntVector.fromArray(ISPEC_256, ia, 0);
+        int result = v.reduceLanes(VectorOperators.MIN);
+        Asserts.assertEquals(reduceLanes(Integer.MAX_VALUE, ia, ISPEC_256.length(), (a, b) -> Math.min(a, b)), result);
+        return result;
+    }
+
+    // Reduction max operations with non-long types are implemented with NEON SIMD instructions
+    // when the vector size is less than or equal to 128-bit.
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "0",
+                  IRNode.MAX_REDUCTION_V, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">= 32"})
+    public int testMaxReductionInt_128() {
+        IntVector v = IntVector.fromArray(ISPEC_128, ia, 0);
+        int result = v.reduceLanes(VectorOperators.MAX);
+        Asserts.assertEquals(reduceLanes(Integer.MIN_VALUE, ia, ISPEC_128.length(), (a, b) -> Math.max(a, b)), result);
+        return result;
+    }
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.MAX_REDUCTION_V, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">= 64"})
+    public int testMaxReductionInt_256() {
+        IntVector v = IntVector.fromArray(ISPEC_256, ia, 0);
+        int result = v.reduceLanes(VectorOperators.MAX);
+        Asserts.assertEquals(reduceLanes(Integer.MIN_VALUE, ia, ISPEC_256.length(), (a, b) -> Math.max(a, b)), result);
+        return result;
+    }
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.MIN_REDUCTION_V, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">= 32"})
+    public static long testMinReductionLong() {
+        LongVector v = LongVector.fromArray(LSPEC_128, la, 0);
+        long result = v.reduceLanes(VectorOperators.MIN);
+        Asserts.assertEquals(reduceLanes(Long.MAX_VALUE, la, LSPEC_128.length(), (a, b) -> Math.min(a, b)), result);
+        return result;
+    }
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.MAX_REDUCTION_V, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">= 32"})
+    public static long testMaxReductionLong() {
+        LongVector v = LongVector.fromArray(LSPEC_128, la, 0);
+        long result = v.reduceLanes(VectorOperators.MAX);
+        Asserts.assertEquals(reduceLanes(Long.MIN_VALUE, la, LSPEC_128.length(), (a, b) -> Math.max(a, b)), result);
+        return result;
+    }
+
+    // ====================== VectorMask Tests ======================
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.VECTOR_LOAD_MASK, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">= 32"})
+    public static void testLoadMask() {
+        VectorMask<Integer> vm = VectorMask.fromArray(ISPEC_128, m, 0);
+        vm.not().intoArray(mr, 0);
+        // Verify that the mask is loaded correctly.
+        for (int i = 0; i < ISPEC_128.length(); i++) {
+            Asserts.assertEquals(!m[i], mr[i]);
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.VECTOR_MASK_CMP, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">= 32"})
+    public static void testVectorMaskCmp() {
+        IntVector v1 = IntVector.fromArray(ISPEC_128, ia, 0);
+        IntVector v2 = IntVector.fromArray(ISPEC_128, ib, 0);
+        VectorMask<Integer> vm = v1.compare(VectorOperators.LT, v2);
+        vm.intoArray(mr, 0);
+        // Verify that the mask is generated correctly.
+        for (int i = 0; i < ISPEC_128.length(); i++) {
+            Asserts.assertEquals(ia[i] < ib[i], mr[i]);
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_MASK_GEN, "1",
+                  IRNode.VECTOR_MASK_FIRST_TRUE, "1"},
+        applyIfCPUFeature = {"sve", "true"}, applyIf = {"MaxVectorSize", ">= 32"})
+    public static int testFirstTrue() {
+        VectorMask<Integer> vm = ISPEC_128.maskAll(false);
+        int result = vm.firstTrue();
+        // The result is the vector length if no lane is true.
+        // This is the default behavior of the firstTrue method.
+        Asserts.assertEquals(ISPEC_128.length(), result);
+        return result;
+    }
+
+    public static void main(String[] args) {
+        TestFramework testFramework = new TestFramework();
+        testFramework.setDefaultWarmup(10000)
+                     .addFlags("--add-modules=jdk.incubator.vector")
+                     .start();
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorFPtoIntCastTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorFPtoIntCastTest.java
index 1037a2989f9..888750ec226 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorFPtoIntCastTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorFPtoIntCastTest.java
@@ -90,7 +90,7 @@ public class VectorFPtoIntCastTest {
         applyIfCPUFeatureOr = {"avx512f", "true", "avx10_2", "true"})
     @IR(counts = {IRNode.X86_VCAST_F2X, "> 0"},
         applyIfCPUFeatureAnd = {"avx512f", "true", "avx10_2", "false"})
-    @IR(counts = {IRNode.X86_VCAST_F2X_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_VCAST_F2X_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public void float2int() {
         var cvec = (IntVector)fvec512.convertShape(VectorOperators.F2I, ispec512, 0);
@@ -112,7 +112,7 @@ public class VectorFPtoIntCastTest {
         applyIfCPUFeatureOr = {"avx512dq", "true", "avx10_2", "true"})
     @IR(counts = {IRNode.X86_VCAST_F2X, "> 0"},
         applyIfCPUFeatureAnd = {"avx512dq", "true", "avx10_2", "false"})
-    @IR(counts = {IRNode.X86_VCAST_F2X_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_VCAST_F2X_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public void float2long() {
         var cvec = (LongVector)fvec512.convertShape(VectorOperators.F2L, lspec512, 0);
@@ -134,7 +134,7 @@ public class VectorFPtoIntCastTest {
         applyIfCPUFeatureOr = {"avx512f", "true", "avx10_2", "true"})
     @IR(counts = {IRNode.X86_VCAST_F2X, "> 0"},
         applyIfCPUFeatureAnd = {"avx512f", "true", "avx10_2", "false"})
-    @IR(counts = {IRNode.X86_VCAST_F2X_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_VCAST_F2X_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public void float2short() {
         var cvec = (ShortVector)fvec512.convertShape(VectorOperators.F2S, sspec256, 0);
@@ -156,7 +156,7 @@ public class VectorFPtoIntCastTest {
         applyIfCPUFeatureOr = {"avx512f", "true", "avx10_2", "true"})
     @IR(counts = {IRNode.X86_VCAST_F2X, "> 0"},
         applyIfCPUFeatureAnd = {"avx512f", "true", "avx10_2", "false"})
-    @IR(counts = {IRNode.X86_VCAST_F2X_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_VCAST_F2X_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public void float2byte() {
         var cvec = (ByteVector)fvec512.convertShape(VectorOperators.F2B, bspec128, 0);
@@ -178,7 +178,7 @@ public class VectorFPtoIntCastTest {
         applyIfCPUFeatureOr = {"avx512f", "true", "avx10_2", "true"})
     @IR(counts = {IRNode.X86_VCAST_D2X, "> 0"},
         applyIfCPUFeatureAnd = {"avx512f", "true", "avx10_2", "false"})
-    @IR(counts = {IRNode.X86_VCAST_D2X_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_VCAST_D2X_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public void double2int() {
         var cvec = (IntVector)dvec512.convertShape(VectorOperators.D2I, ispec256, 0);
@@ -200,7 +200,7 @@ public class VectorFPtoIntCastTest {
         applyIfCPUFeatureOr = {"avx512dq", "true", "avx10_2", "true"})
     @IR(counts = {IRNode.X86_VCAST_D2X, "> 0"},
         applyIfCPUFeatureAnd = {"avx512dq", "true", "avx10_2", "false"})
-    @IR(counts = {IRNode.X86_VCAST_D2X_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_VCAST_D2X_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public void double2long() {
         var cvec = (LongVector)dvec512.convertShape(VectorOperators.D2L, lspec512, 0);
@@ -222,7 +222,7 @@ public class VectorFPtoIntCastTest {
         applyIfCPUFeatureOr = {"avx512f", "true", "avx10_2", "true"})
     @IR(counts = {IRNode.X86_VCAST_D2X, "> 0"},
         applyIfCPUFeatureAnd = {"avx512f", "true", "avx10_2", "false"})
-    @IR(counts = {IRNode.X86_VCAST_D2X_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_VCAST_D2X_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public void double2short() {
         var cvec = (ShortVector)dvec512.convertShape(VectorOperators.D2S, sspec128, 0);
@@ -244,7 +244,7 @@ public class VectorFPtoIntCastTest {
         applyIfCPUFeatureOr = {"avx512f", "true", "avx10_2", "true"})
     @IR(counts = {IRNode.X86_VCAST_D2X, "> 0"},
         applyIfCPUFeatureAnd = {"avx512f", "true", "avx10_2", "false"})
-    @IR(counts = {IRNode.X86_VCAST_D2X_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_VCAST_D2X_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public void double2byte() {
         var cvec = (ByteVector)dvec512.convertShape(VectorOperators.D2B, bspec64, 0);
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorMaskCastIdentityTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorMaskCastIdentityTest.java
index e66b16f053b..be9d8e6390c 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorMaskCastIdentityTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorMaskCastIdentityTest.java
@@ -24,6 +24,7 @@
 /*
 * @test
 * @bug 8356760
+* @key randomness
 * @library /test/lib /
 * @summary Optimize VectorMask.fromLong for all-true/all-false cases
 * @modules jdk.incubator.vector
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorMultiplyOpt.java b/test/hotspot/jtreg/compiler/vectorapi/VectorMultiplyOpt.java
index a48cd25e47f..a8394f41f8a 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorMultiplyOpt.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorMultiplyOpt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import java.lang.reflect.Array;
 /**
  * @test
  * @bug 8341137
+ * @key randomness
  * @summary Optimize long vector multiplication using x86 VPMUL[U]DQ instruction.
  * @modules jdk.incubator.vector
  * @library /test/lib /
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorSaturatedOperationsTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorSaturatedOperationsTest.java
index 887c41efd48..e51e6d31cb5 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorSaturatedOperationsTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorSaturatedOperationsTest.java
@@ -24,6 +24,7 @@
 /**
 * @test
 * @bug 8338021 8342677 8349522
+* @key randomness
 * @summary Add IR validation tests for newly added saturated vector add / sub operations
 * @modules jdk.incubator.vector
 * @library /test/lib /
diff --git a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorReinterpret.java b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorReinterpret.java
index 7f00fece7e6..400809383fc 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorReinterpret.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorReinterpret.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestAutoVecIntMinMax.java b/test/hotspot/jtreg/compiler/vectorization/TestAutoVecIntMinMax.java
index 6d868b48dd7..917d69876ce 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestAutoVecIntMinMax.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestAutoVecIntMinMax.java
@@ -30,6 +30,7 @@ import jdk.test.lib.Utils;
 /*
  * @test
  * @bug 8288107
+ * @key randomness
  * @summary Auto-vectorization enhancement for integer Math.max/Math.min operations
  * @library /test/lib /
  * @requires vm.compiler2.enabled
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestBufferVectorization.java b/test/hotspot/jtreg/compiler/vectorization/TestBufferVectorization.java
index fc44a476fc0..a666143950c 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestBufferVectorization.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestBufferVectorization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestEor3AArch64.java b/test/hotspot/jtreg/compiler/vectorization/TestEor3AArch64.java
index d5a3de09123..3fed3eda124 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestEor3AArch64.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestEor3AArch64.java
@@ -33,6 +33,7 @@ import jdk.test.lib.Utils;
 /*
  * @test
  * @bug 8293488
+ * @key randomness
  * @summary Test EOR3 Neon/SVE2 instruction for aarch64 SHA3 extension
  * @library /test/lib /
  * @requires os.arch == "aarch64"
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestFloatConversionsVectorNaN.java b/test/hotspot/jtreg/compiler/vectorization/TestFloatConversionsVectorNaN.java
index dad6e51f2ec..73d038dc7e1 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestFloatConversionsVectorNaN.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestFloatConversionsVectorNaN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestMacroLogicVector.java b/test/hotspot/jtreg/compiler/vectorization/TestMacroLogicVector.java
index d2486f0ed77..9ab5994f566 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestMacroLogicVector.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestMacroLogicVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 8241040
+ * @key randomness
  * @library /test/lib
  *
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestOptionVectorizeIR.java b/test/hotspot/jtreg/compiler/vectorization/TestOptionVectorizeIR.java
index adb843dcf6f..0c41cd81424 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestOptionVectorizeIR.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestOptionVectorizeIR.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestReverseBitsVector.java b/test/hotspot/jtreg/compiler/vectorization/TestReverseBitsVector.java
index c8c6586675a..a50a2732bba 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestReverseBitsVector.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestReverseBitsVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestRoundVectFloat.java b/test/hotspot/jtreg/compiler/vectorization/TestRoundVectFloat.java
index 65f12be111a..312063a5c2d 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestRoundVectFloat.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestRoundVectFloat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestRoundVectRiscv64.java b/test/hotspot/jtreg/compiler/vectorization/TestRoundVectRiscv64.java
index 252f1f1c166..620fab77ed9 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestRoundVectRiscv64.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestRoundVectRiscv64.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2024, Rivos Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java b/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java
index c30a28c46f9..7d03bb52071 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java
@@ -21,20 +21,20 @@
  * questions.
  */
 
+package compiler.vectorization;
+
+import java.util.Random;
+import jdk.test.lib.Utils;
+
 /* @test
  * @bug 8349637
+ * @key randomness
  * @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4)
  * @summary Ensure that vectorization of numberOfLeadingZeros and numberOfTrailingZeros outputs correct values
  * @library /test/lib /
  * @run main/othervm/timeout=480 compiler.vectorization.TestVectorZeroCount
  */
 
-package compiler.vectorization;
-
-import java.util.Random;
-
-import jdk.test.lib.Utils;
-
 public class TestVectorZeroCount {
     private static final int SIZE = 1024;
     private static final Random RANDOM = Utils.getRandomInstance();
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java
index bcf5196d694..1f0c8e668b7 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2025, Rivos Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java
index 4db973ff728..d3119a00c37 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java
@@ -298,7 +298,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
         counts = {IRNode.VECTOR_CAST_F2I, IRNode.VECTOR_SIZE + "min(max_float, max_int)", "> 0"})
     @IR(counts = {IRNode.X86_VCAST_F2X, "> 0"},
         applyIfCPUFeatureAnd = {"avx", "true", "avx10_2", "false"})
-    @IR(counts = {IRNode.X86_VCAST_F2X_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_VCAST_F2X_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public int[] convertFloatToInt() {
         int[] res = new int[SIZE];
@@ -313,7 +313,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
         counts = {IRNode.VECTOR_CAST_F2L, IRNode.VECTOR_SIZE + "min(max_float, max_long)", "> 0"})
     @IR(counts = {IRNode.X86_VCAST_F2X, "> 0"},
         applyIfCPUFeatureAnd = {"avx512dq", "true", "avx10_2", "false"})
-    @IR(counts = {IRNode.X86_VCAST_F2X_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_VCAST_F2X_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public long[] convertFloatToLong() {
         long[] res = new long[SIZE];
@@ -328,7 +328,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
         counts = {IRNode.VECTOR_CAST_D2I, IRNode.VECTOR_SIZE + "min(max_double, max_int)", "> 0"})
     @IR(counts = {IRNode.X86_VCAST_D2X, "> 0"},
         applyIfCPUFeatureAnd = {"avx", "true", "avx10_2", "false"})
-    @IR(counts = {IRNode.X86_VCAST_D2X_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_VCAST_D2X_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public int[] convertDoubleToInt() {
         int[] res = new int[SIZE];
@@ -343,7 +343,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
         counts = {IRNode.VECTOR_CAST_D2L, IRNode.VECTOR_SIZE + "min(max_double, max_long)", "> 0"})
     @IR(counts = {IRNode.X86_VCAST_D2X, "> 0"},
         applyIfCPUFeatureAnd = {"avx512dq", "true", "avx10_2", "false"})
-    @IR(counts = {IRNode.X86_VCAST_D2X_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_VCAST_D2X_AVX10_2, "> 0"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public long[] convertDoubleToLong() {
         long[] res = new long[SIZE];
@@ -361,7 +361,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     @IR(counts = {IRNode.X86_VCAST_F2X, "> 0"},
         applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
         applyIfCPUFeatureAnd = {"avx2", "true", "avx10_2", "false"})
-    @IR(counts = {IRNode.X86_VCAST_F2X_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_VCAST_F2X_AVX10_2, "> 0"},
         applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public short[] convertFloatToShort() {
@@ -386,7 +386,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     @IR(counts = {IRNode.X86_VCAST_F2X, "> 0"},
         applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
         applyIfCPUFeatureAnd = {"avx2", "true", "avx10_2", "false"})
-    @IR(counts = {IRNode.X86_VCAST_F2X_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_VCAST_F2X_AVX10_2, "> 0"},
         applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public char[] convertFloatToChar() {
@@ -414,7 +414,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     @IR(counts = {IRNode.X86_VCAST_D2X, "> 0"},
         applyIf = {"MaxVectorSize", ">=16"},
         applyIfCPUFeatureAnd = {"avx", "true", "avx10_2", "false"})
-    @IR(counts = {IRNode.X86_VCAST_D2X_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_VCAST_D2X_AVX10_2, "> 0"},
         applyIf = {"MaxVectorSize", ">=16"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public short[] convertDoubleToShort() {
@@ -435,7 +435,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     @IR(counts = {IRNode.X86_VCAST_D2X, "> 0"},
         applyIf = {"MaxVectorSize", ">=16"},
         applyIfCPUFeatureAnd = {"avx", "true", "avx10_2", "false"})
-    @IR(counts = {IRNode.X86_VCAST_D2X_AVX10, "> 0"},
+    @IR(counts = {IRNode.X86_VCAST_D2X_AVX10_2, "> 0"},
         applyIf = {"MaxVectorSize", ">=16"},
         applyIfCPUFeature = {"avx10_2", "true"})
     public char[] convertDoubleToChar() {
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicBooleanOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicBooleanOpTest.java
index 918752c5b89..ba82013e182 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicBooleanOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicBooleanOpTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java
index 428a7f22331..a336b32f7b9 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicDoubleOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicDoubleOpTest.java
index 9e5bf9c3753..8d5925ec8c6 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicDoubleOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicDoubleOpTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2025, Rivos Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java
index 8b85bfa6327..e096f7878ab 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java
index 23b6b116376..a6767054958 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/LoopArrayIndexComputeTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/LoopArrayIndexComputeTest.java
index 8d4822ade57..c8a3c71bdee 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/LoopArrayIndexComputeTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/LoopArrayIndexComputeTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java
index 32b660d7de7..c46b2e11612 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/LoopLiveOutNodesTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/LoopLiveOutNodesTest.java
index 1b5edede781..06a3eb33bc3 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/LoopLiveOutNodesTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/LoopLiveOutNodesTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/LoopRangeStrideTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/LoopRangeStrideTest.java
index 46e52102c31..2db565461ac 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/LoopRangeStrideTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/LoopRangeStrideTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/MultipleLoopsTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/MultipleLoopsTest.java
index d4e67e50208..4dbfba02a43 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/MultipleLoopsTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/MultipleLoopsTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/whitebox/CompilerWhiteBoxTest.java b/test/hotspot/jtreg/compiler/whitebox/CompilerWhiteBoxTest.java
index eb0f70af5c4..7e5e638944d 100644
--- a/test/hotspot/jtreg/compiler/whitebox/CompilerWhiteBoxTest.java
+++ b/test/hotspot/jtreg/compiler/whitebox/CompilerWhiteBoxTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/containers/docker/DockerBasicTest.java b/test/hotspot/jtreg/containers/docker/DockerBasicTest.java
index e564cae9d8e..403f46f6ab4 100644
--- a/test/hotspot/jtreg/containers/docker/DockerBasicTest.java
+++ b/test/hotspot/jtreg/containers/docker/DockerBasicTest.java
@@ -54,9 +54,7 @@ public class DockerBasicTest {
             testHelloDocker();
             testJavaVersionWithCgMounts();
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageNameAndTag);
-            }
+            DockerTestUtils.removeDockerImage(imageNameAndTag);
         }
     }
 
diff --git a/test/hotspot/jtreg/containers/docker/ShareTmpDir.java b/test/hotspot/jtreg/containers/docker/ShareTmpDir.java
index a84cdacefa1..b7f807d76a3 100644
--- a/test/hotspot/jtreg/containers/docker/ShareTmpDir.java
+++ b/test/hotspot/jtreg/containers/docker/ShareTmpDir.java
@@ -57,9 +57,7 @@ public class ShareTmpDir {
         try {
             test();
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
diff --git a/test/hotspot/jtreg/containers/docker/TestCPUAwareness.java b/test/hotspot/jtreg/containers/docker/TestCPUAwareness.java
index 26f160ab27d..6b0a536e4d4 100644
--- a/test/hotspot/jtreg/containers/docker/TestCPUAwareness.java
+++ b/test/hotspot/jtreg/containers/docker/TestCPUAwareness.java
@@ -85,9 +85,7 @@ public class TestCPUAwareness {
             }
 
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
diff --git a/test/hotspot/jtreg/containers/docker/TestContainerInfo.java b/test/hotspot/jtreg/containers/docker/TestContainerInfo.java
index a5579aa9528..5e7a0000cf5 100644
--- a/test/hotspot/jtreg/containers/docker/TestContainerInfo.java
+++ b/test/hotspot/jtreg/containers/docker/TestContainerInfo.java
@@ -73,23 +73,11 @@ public class TestContainerInfo {
         checkContainerInfo(out);
     }
 
-    private static void shouldMatchWithValue(OutputAnalyzer output, String match, String value) {
-        output.shouldContain(match);
-        String str = output.getOutput();
-        for (String s : str.split(System.lineSeparator())) {
-            if (s.contains(match)) {
-                if (!s.contains(value)) {
-                    throw new RuntimeException("memory_swap_current_in_bytes NOT " + value + "! Line was : " + s);
-                }
-            }
-        }
-    }
-
     private static void checkContainerInfo(OutputAnalyzer out) throws Exception {
         String str = out.getOutput();
         if (str.contains("cgroupv2")) {
-            shouldMatchWithValue(out, "memory_swap_max_limit_in_bytes", "0");
-            shouldMatchWithValue(out, "memory_swap_current_in_bytes", "0");
+            DockerTestUtils.shouldMatchWithValue(out, "memory_swap_max_limit", "0");
+            DockerTestUtils.shouldMatchWithValue(out, "memory_swap_current", "0");
         } else {
             throw new SkippedException("This test is cgroups v2 specific, skipped on cgroups v1");
         }
diff --git a/test/hotspot/jtreg/containers/docker/TestLimitsUpdating.java b/test/hotspot/jtreg/containers/docker/TestLimitsUpdating.java
index df8ba5b6161..32436cec1d7 100644
--- a/test/hotspot/jtreg/containers/docker/TestLimitsUpdating.java
+++ b/test/hotspot/jtreg/containers/docker/TestLimitsUpdating.java
@@ -63,9 +63,7 @@ public class TestLimitsUpdating {
         try {
             testLimitUpdates();
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
@@ -128,12 +126,12 @@ public class TestLimitsUpdating {
 
         // Do assertions based on the output in target container
         OutputAnalyzer targetOut = out[0];
-        targetOut.shouldContain("active_processor_count: 2"); // initial value
-        targetOut.shouldContain("active_processor_count: 3"); // updated value
-        targetOut.shouldContain("memory_limit_in_bytes: 512000 k"); // initial value
-        targetOut.shouldContain("memory_and_swap_limit_in_bytes: 512000 k"); // initial value
-        targetOut.shouldContain("memory_limit_in_bytes: 307200 k"); // updated value
-        targetOut.shouldContain("memory_and_swap_limit_in_bytes: 307200 k"); // updated value
+        DockerTestUtils.shouldMatchWithValue(targetOut, "active_processor_count", "2"); // initial value
+        DockerTestUtils.shouldMatchWithValue(targetOut, "active_processor_count", "3"); // updated value
+        DockerTestUtils.shouldMatchWithValue(targetOut, "memory_limit", "512000 kB"); // initial value
+        DockerTestUtils.shouldMatchWithValue(targetOut, "memory_and_swap_limit", "512000 kB"); // initial value
+        DockerTestUtils.shouldMatchWithValue(targetOut, "memory_limit", "307200 kB"); // updated value
+        DockerTestUtils.shouldMatchWithValue(targetOut, "memory_and_swap_limit", "307200 kB"); // updated value
     }
 
     private static List<String> getContainerUpdate(int cpuQuota, int cpuPeriod, String memory) {
diff --git a/test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java b/test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java
index 4cf895156fe..522b2904c43 100644
--- a/test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java
+++ b/test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java
@@ -102,9 +102,7 @@ public class TestMemoryAwareness {
             testMetricsSwapExceedingPhysical();
             testContainerMemExceedsPhysical();
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
@@ -169,11 +167,11 @@ public class TestMemoryAwareness {
         opts.addDockerOpts("--memory-swap=" + swapToSet);
 
         Common.run(opts)
-            .shouldMatch("memory_limit_in_bytes:.*" + expectedMem)
-            .shouldNotMatch("memory_and_swap_limit_in_bytes:.*not supported")
+            .shouldMatch("memory_limit:.*" + expectedMem)
+            .shouldNotMatch("memory_and_swap_limit:.*not supported")
             // On systems with swapaccount=0 this returns the memory limit.
             // On systems with swapaccount=1 this returns the set memory+swap value.
-            .shouldMatch("memory_and_swap_limit_in_bytes:.*(" + expectedMem + "|" + expectedSwap + ")");
+            .shouldMatch("memory_and_swap_limit:.*(" + expectedMem + "|" + expectedSwap + ")");
     }
 
     /*
diff --git a/test/hotspot/jtreg/containers/docker/TestMisc.java b/test/hotspot/jtreg/containers/docker/TestMisc.java
index fca3cef5513..794bbc7b355 100644
--- a/test/hotspot/jtreg/containers/docker/TestMisc.java
+++ b/test/hotspot/jtreg/containers/docker/TestMisc.java
@@ -127,10 +127,10 @@ public class TestMisc {
         // mapping function.
         if (numberMatch) {
           int valueExpected = isCgroupV2 ? expected : cpuShares;
-          out.shouldContain("cpu_shares: " + valueExpected);
+          DockerTestUtils.shouldMatchWithValue(out, "cpu_shares", String.valueOf(valueExpected));
         } else {
           // must not print "no shares"
-          out.shouldNotContain("cpu_shares: no shares");
+          DockerTestUtils.shouldNotMatchWithValue(out, "cpu_shares", "no shares");
         }
     }
 
@@ -141,7 +141,7 @@ public class TestMisc {
         Common.addWhiteBoxOpts(opts);
 
         OutputAnalyzer out = Common.run(opts);
-        out.shouldContain("but overridden by -XX:ActiveProcessorCount 2");
+        DockerTestUtils.shouldMatchWithValue(out, "active_processor_count", "2 (from -XX:ActiveProcessorCount)");
     }
 
     private static void checkContainerInfo(OutputAnalyzer out) throws Exception {
@@ -158,11 +158,11 @@ public class TestMisc {
             "Memory Throttle Limit",
             "Memory Usage",
             "Maximum Memory Usage",
-            "memory_max_usage_in_bytes",
+            "memory_max_usage",
             "maximum number of tasks",
             "current number of tasks",
-            "rss_usage_in_bytes",
-            "cache_usage_in_bytes"
+            "rss_usage",
+            "cache_usage"
         };
 
         for (String s : expectedToContain) {
@@ -170,13 +170,13 @@ public class TestMisc {
         }
         String str = out.getOutput();
         if (str.contains("cgroupv1")) {
-            out.shouldContain("kernel_memory_usage_in_bytes");
-            out.shouldContain("kernel_memory_max_usage_in_bytes");
-            out.shouldContain("kernel_memory_limit_in_bytes");
+            out.shouldContain("kernel_memory_usage");
+            out.shouldContain("kernel_memory_max_usage");
+            out.shouldContain("kernel_memory_limit");
         } else {
             if (str.contains("cgroupv2")) {
-                out.shouldContain("memory_swap_current_in_bytes");
-                out.shouldContain("memory_swap_max_limit_in_bytes");
+                out.shouldContain("memory_swap_current");
+                out.shouldContain("memory_swap_max_limit");
             } else {
                 throw new RuntimeException("Output has to contain information about cgroupv1 or cgroupv2");
             }
diff --git a/test/hotspot/jtreg/containers/docker/TestPids.java b/test/hotspot/jtreg/containers/docker/TestPids.java
index 0e39268184e..2bc5f8c03c2 100644
--- a/test/hotspot/jtreg/containers/docker/TestPids.java
+++ b/test/hotspot/jtreg/containers/docker/TestPids.java
@@ -63,9 +63,7 @@ public class TestPids {
         try {
             testPids();
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
diff --git a/test/hotspot/jtreg/gc/TestAlwaysPreTouchBehavior.java b/test/hotspot/jtreg/gc/TestAlwaysPreTouchBehavior.java
index 141ef7ba197..79b6d420df5 100644
--- a/test/hotspot/jtreg/gc/TestAlwaysPreTouchBehavior.java
+++ b/test/hotspot/jtreg/gc/TestAlwaysPreTouchBehavior.java
@@ -133,13 +133,8 @@ public class TestAlwaysPreTouchBehavior {
     //
 
     public static void main(String [] args) {
-        long rss = WhiteBox.getWhiteBox().rss();
-        System.out.println("RSS: " + rss);
-        long available = WhiteBox.getWhiteBox().hostAvailableMemory();
-        System.out.println("Host available memory: " + available);
-
+        int maxIter = 20;
         long heapSize = 256 * 1024 * 1024;
-
         // On Linux, a JVM that runs with 256M pre-committed heap will use about 60MB (release JVM) RSS. Barring
         // memory pressure that causes us to lose RSS, pretouching should increase RSS to >256MB. So there should be a
         // clear distinction between non-pretouched and pretouched.
@@ -150,12 +145,28 @@ public class TestAlwaysPreTouchBehavior {
         // on the side of disregarding true errors than to produce false positives (if pretouching is broken, at least
         // some of the runs of this test will run on beefy enough machines and show the test as failed).
         long requiredAvailable = 1024 * 1024 * 1024;
-        if (rss == 0) {
-            throw new SkippedException("cannot get RSS?");
-        }
-        if (available > requiredAvailable) {
-            Asserts.assertGreaterThan(rss, minRequiredRss, "RSS of this process(" + rss + "b) should be bigger " +
-                                      "than or equal to heap size(" + heapSize + "b) (available memory: " + available + "). On Linux Kernel < 4.14 RSS can be inaccurate");
+
+        // RSS values we get are sometimes somewhat delayed or inaccurate
+        for (int iter=0; iter < maxIter; iter++) {
+            long rss = WhiteBox.getWhiteBox().rss();
+            System.out.println("RSS: " + rss);
+            long available = WhiteBox.getWhiteBox().hostAvailableMemory();
+            System.out.println("Host available memory: " + available);
+
+            if (rss == 0) {
+                throw new SkippedException("cannot get RSS?");
+            }
+            if (available <= requiredAvailable) {
+                throw new SkippedException("Available memory on host " + available + " is too small, not larger than required available memory " + requiredAvailable);
+            }
+
+            if ((rss < minRequiredRss) && iter < maxIter-1) {
+                System.out.println("We got only an RSS value of " + rss + " but require " + minRequiredRss + ", let's retry!");
+            } else {
+                Asserts.assertGreaterThan(rss, minRequiredRss, "RSS of this process(" + rss + "b) should be bigger " +
+                                          "than or equal to heap size(" + heapSize + "b) (available memory: " + available + "). On Linux Kernel < 4.14 RSS can be inaccurate");
+                break;
+            }
         }
     }
 }
diff --git a/test/hotspot/jtreg/gc/TestPLABAdaptToMinTLABSize.java b/test/hotspot/jtreg/gc/TestPLABAdaptToMinTLABSize.java
index 8e201fb6e8a..f0e76f59217 100644
--- a/test/hotspot/jtreg/gc/TestPLABAdaptToMinTLABSize.java
+++ b/test/hotspot/jtreg/gc/TestPLABAdaptToMinTLABSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java b/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java
index 6323e5c50cf..52974d8c143 100644
--- a/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java b/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java
index 38eb07139bd..6ca02c2a48e 100644
--- a/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java
+++ b/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java b/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java
index 41fa1826799..014181b2fce 100644
--- a/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java
+++ b/test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java b/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java
index f65f211b812..3f4d5fbea16 100644
--- a/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestNewSizeFlags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/arguments/TestParallelGCErgo.java b/test/hotspot/jtreg/gc/arguments/TestParallelGCErgo.java
index b9e5629d875..b51394cc370 100644
--- a/test/hotspot/jtreg/gc/arguments/TestParallelGCErgo.java
+++ b/test/hotspot/jtreg/gc/arguments/TestParallelGCErgo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java b/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java
index ea2a20b3dc9..bdf8186bfaa 100644
--- a/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java
+++ b/test/hotspot/jtreg/gc/arguments/TestSurvivorRatioFlag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java
index 40f607bf8a1..c9cf7291aaa 100644
--- a/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java
+++ b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java b/test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java
index 59289f10c37..7faae885f70 100644
--- a/test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java
+++ b/test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,19 +68,21 @@ public class TestG1ClassUnloadingHWM {
   }
 
   public static void testWithoutG1ClassUnloading() throws Exception {
-    // -XX:-ClassUnloadingWithConcurrentMark is used, so we expect a full GC instead of a concurrent cycle.
+    // -XX:-ClassUnloadingWithConcurrentMark is used, so we expect a full GC due to Metadata GC Threshold
+    // instead of a concurrent cycle.
     OutputAnalyzer out = runWithoutG1ClassUnloading();
 
-    out.shouldMatch(".*Pause Full.*");
-    out.shouldNotMatch(".*Pause Young \\(Concurrent Start\\).*");
+    out.shouldMatch(".*Pause Full \\(Metadata GC Threshold\\).*");
+    out.shouldNotMatch(".*Pause Young \\(Concurrent Start\\) \\(Metadata GC Threshold\\).*");
   }
 
   public static void testWithG1ClassUnloading() throws Exception {
-    // -XX:+ClassUnloadingWithConcurrentMark is used, so we expect a concurrent cycle instead of a full GC.
+    // -XX:+ClassUnloadingWithConcurrentMark is used, so we expect a concurrent cycle due to Metadata GC Threshold
+    // instead of a full GC.
     OutputAnalyzer out = runWithG1ClassUnloading();
 
-    out.shouldMatch(".*Pause Young \\(Concurrent Start\\).*");
-    out.shouldNotMatch(".*Pause Full.*");
+    out.shouldMatch(".*Pause Young \\(Concurrent Start\\) \\(Metadata GC Threshold\\).*");
+    out.shouldNotMatch(".*Pause Full \\(Metadata GC Threshold\\).*");
   }
 
   public static void main(String args[]) throws Exception {
diff --git a/test/hotspot/jtreg/gc/g1/TestCodeCacheUnloadDuringConcCycle.java b/test/hotspot/jtreg/gc/g1/TestCodeCacheUnloadDuringConcCycle.java
index a4fadc185d2..e36ccace9dc 100644
--- a/test/hotspot/jtreg/gc/g1/TestCodeCacheUnloadDuringConcCycle.java
+++ b/test/hotspot/jtreg/gc/g1/TestCodeCacheUnloadDuringConcCycle.java
@@ -53,9 +53,9 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import jdk.test.lib.Asserts;
+import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
-import static jdk.test.lib.Asserts.*;
 import jdk.test.whitebox.WhiteBox;
 
 public class TestCodeCacheUnloadDuringConcCycle {
@@ -70,9 +70,10 @@ public class TestCodeCacheUnloadDuringConcCycle {
                                                                     "-Xbootclasspath/a:.",
                                                                     "-Xlog:gc=trace,codecache",
                                                                     "-XX:+WhiteBoxAPI",
-                                                                    "-XX:ReservedCodeCacheSize=8M",
+                                                                    "-XX:ReservedCodeCacheSize=" + (Platform.is32bit() ? "4M" : "8M"),
                                                                     "-XX:StartAggressiveSweepingAt=50",
                                                                     "-XX:CompileCommand=compileonly,gc.g1.SomeClass::*",
+                                                                    "-XX:CompileCommand=compileonly,gc.g1.Foo*::*",
                                                                     TestCodeCacheUnloadDuringConcCycleRunner.class.getName(),
                                                                     concPhase);
         return output;
diff --git a/test/hotspot/jtreg/gc/g1/TestHumongousConcurrentStartUndo.java b/test/hotspot/jtreg/gc/g1/TestHumongousConcurrentStartUndo.java
index d1116aebe57..b4302111b8c 100644
--- a/test/hotspot/jtreg/gc/g1/TestHumongousConcurrentStartUndo.java
+++ b/test/hotspot/jtreg/gc/g1/TestHumongousConcurrentStartUndo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/g1/TestMixedGCLiveThreshold.java b/test/hotspot/jtreg/gc/g1/TestMixedGCLiveThreshold.java
index 66b726223cc..bc91e403a69 100644
--- a/test/hotspot/jtreg/gc/g1/TestMixedGCLiveThreshold.java
+++ b/test/hotspot/jtreg/gc/g1/TestMixedGCLiveThreshold.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryDataRunner.java b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryDataRunner.java
index d478f811490..abaeb72feab 100644
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryDataRunner.java
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryDataRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedOldObjectsEvacuation.java b/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedOldObjectsEvacuation.java
index 5e567fb1a46..ff11f1508d9 100644
--- a/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedOldObjectsEvacuation.java
+++ b/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedOldObjectsEvacuation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/g1/plab/TestPLABEvacuationFailure.java b/test/hotspot/jtreg/gc/g1/plab/TestPLABEvacuationFailure.java
index 67a3f510c21..bc70b9c193c 100644
--- a/test/hotspot/jtreg/gc/g1/plab/TestPLABEvacuationFailure.java
+++ b/test/hotspot/jtreg/gc/g1/plab/TestPLABEvacuationFailure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/g1/plab/lib/PLABUtils.java b/test/hotspot/jtreg/gc/g1/plab/lib/PLABUtils.java
index c9d76d9da42..4c393743686 100644
--- a/test/hotspot/jtreg/gc/g1/plab/lib/PLABUtils.java
+++ b/test/hotspot/jtreg/gc/g1/plab/lib/PLABUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java b/test/hotspot/jtreg/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java
index f042ac44af4..aab28c92fdc 100644
--- a/test/hotspot/jtreg/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java
+++ b/test/hotspot/jtreg/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/parallel/TestDynShrinkHeap.java b/test/hotspot/jtreg/gc/parallel/TestDynShrinkHeap.java
index 5cb89e146b5..d47c4ffb81f 100644
--- a/test/hotspot/jtreg/gc/parallel/TestDynShrinkHeap.java
+++ b/test/hotspot/jtreg/gc/parallel/TestDynShrinkHeap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestSoftMaxHeapSizeAvailableCalc.java b/test/hotspot/jtreg/gc/shenandoah/TestSoftMaxHeapSizeAvailableCalc.java
new file mode 100644
index 00000000000..e70f2f0849f
--- /dev/null
+++ b/test/hotspot/jtreg/gc/shenandoah/TestSoftMaxHeapSizeAvailableCalc.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test id=satb-adaptive
+ * @requires vm.gc.Shenandoah
+ * @library /test/lib
+ * @bug 8372543
+ * @summary When soft max heap size < Xmx, we had a bug reported in JBS-8372543 where available size was undercalculated.
+ *          This caused excessive GC runs.
+ *
+ * @run main/othervm -XX:SoftMaxHeapSize=512m -Xmx2g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
+ *      -XX:+UseShenandoahGC -Xlog:gc=info
+ *      -XX:ShenandoahGCMode=satb
+ *      -XX:+ShenandoahDegeneratedGC
+ *      -XX:ShenandoahGCHeuristics=adaptive
+ *      TestSoftMaxHeapSizeAvailableCalc
+ */
+
+/**
+ * @test id=satb-static
+ * @requires vm.gc.Shenandoah
+ * @library /test/lib
+ *
+ * @run main/othervm -XX:SoftMaxHeapSize=512m -Xmx2g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
+ *      -XX:+UseShenandoahGC -Xlog:gc=info
+ *      -XX:ShenandoahGCMode=satb
+ *      -XX:+ShenandoahDegeneratedGC
+ *      -XX:ShenandoahGCHeuristics=static
+ *      TestSoftMaxHeapSizeAvailableCalc
+ */
+
+/**
+ * @test id=generational
+ * @requires vm.gc.Shenandoah
+ * @library /test/lib
+ *
+ * @run main/othervm -XX:SoftMaxHeapSize=512m -Xmx2g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
+ *      -XX:+UseShenandoahGC -Xlog:gc=info
+ *      -XX:ShenandoahGCMode=generational
+ *      -XX:ShenandoahGCHeuristics=adaptive
+ *      TestSoftMaxHeapSizeAvailableCalc
+ *
+ */
+import java.lang.management.ManagementFactory;
+
+import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.dcmd.PidJcmdExecutor;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+import com.sun.management.GarbageCollectorMXBean;
+
+public class TestSoftMaxHeapSizeAvailableCalc {
+    public static void main(String[] args) throws Exception {
+        Allocate.test();
+    }
+
+    // This test runs an app that has a stable heap of ~300M and allocates temporary garbage at ~100M/s
+    // Soft max: 512M, ShenandoahMinFreeThreshold: 10 (default), ShenandoahEvacReserve: 5 (default)
+    // Soft max for mutator: 512M * (100.0 - 5) / 100 = 486.4M
+    // Threshold to trigger gc: 486.4M - 512 * 10 / 100.0 = 435.2M, just above (300 + 100)M.
+    // Expect gc count to be less than 1 / sec.
+    public static class Allocate {
+        static final List<byte[]> longLived = new ArrayList<>();
+
+        public static void test() throws Exception {
+            final int expectedMaxGcCount = Integer.getInteger("expectedMaxGcCount", 30);
+            List<java.lang.management.GarbageCollectorMXBean> collectors = ManagementFactory.getGarbageCollectorMXBeans();
+            java.lang.management.GarbageCollectorMXBean cycleCollector = null;
+            for (java.lang.management.GarbageCollectorMXBean bean : collectors) {
+                if (bean.getName().contains("Cycles")) {
+                    cycleCollector = bean;
+                }
+            }
+
+            // Allocate ~300MB of long-lived objects
+            for (int i = 0; i < 300; i++) {
+                longLived.add(new byte[1_000_000]);
+            }
+
+            // allocate short-lived garbage to the heap
+            long end = System.currentTimeMillis() + 30_000; // 30 seconds
+
+            while (System.currentTimeMillis() < end) {
+                byte[] garbage = new byte[1_000_000];
+                garbage[0] = 1; // prevent optimization
+
+                Thread.sleep(10); // Pace to generate garbage at speed of ~100M/s
+            }
+
+            long gcCount = cycleCollector.getCollectionCount();
+            Asserts.assertLessThan(gcCount, (long) expectedMaxGcCount, "GC was triggered too many times. Expected to be less than: " + expectedMaxGcCount + ", triggered: " + gcCount);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/gc/shenandoah/generational/TestOldGrowthTriggers.java b/test/hotspot/jtreg/gc/shenandoah/generational/TestOldGrowthTriggers.java
index 5182d4a9ea3..a66b9161c7e 100644
--- a/test/hotspot/jtreg/gc/shenandoah/generational/TestOldGrowthTriggers.java
+++ b/test/hotspot/jtreg/gc/shenandoah/generational/TestOldGrowthTriggers.java
@@ -99,8 +99,12 @@ public class TestOldGrowthTriggers {
                 "-XX:+UnlockExperimentalVMOptions",
                 "-XX:+UseShenandoahGC",
                 "-XX:ShenandoahGCMode=generational",
+                "-XX:ShenandoahMinOldGenGrowthPercent=12.5",
+                "-XX:ShenandoahIgnoreOldGrowthBelowPercentage=10",
+                "-XX:ShenandoahMinOldGenGrowthRemainingHeapPercent=100",
                 "-XX:ShenandoahGuaranteedYoungGCInterval=0",
-                "-XX:ShenandoahGuaranteedOldGCInterval=0"
+                "-XX:ShenandoahGuaranteedOldGCInterval=0",
+                "-XX:-UseCompactObjectHeaders"
         );
 
         testOld("-Xlog:gc",
@@ -110,6 +114,9 @@ public class TestOldGrowthTriggers {
                 "-XX:+UnlockExperimentalVMOptions",
                 "-XX:+UseShenandoahGC",
                 "-XX:ShenandoahGCMode=generational",
+                "-XX:ShenandoahMinOldGenGrowthPercent=12.5",
+                "-XX:ShenandoahIgnoreOldGrowthBelowPercentage=10",
+                "-XX:ShenandoahMinOldGenGrowthRemainingHeapPercent=100",
                 "-XX:ShenandoahGuaranteedYoungGCInterval=0",
                 "-XX:ShenandoahGuaranteedOldGCInterval=0",
                 "-XX:+UseCompactObjectHeaders"
diff --git a/test/hotspot/jtreg/gc/stress/TestStressG1Uncommit.java b/test/hotspot/jtreg/gc/stress/TestStressG1Uncommit.java
index 0006ad5ad13..9d1f95aa411 100644
--- a/test/hotspot/jtreg/gc/stress/TestStressG1Uncommit.java
+++ b/test/hotspot/jtreg/gc/stress/TestStressG1Uncommit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java
index 3e9e8599adc..4f11ab361fb 100644
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java
index 21eb225534b..ee5ab654462 100644
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java
index 68d36eb9394..25650b6b9d5 100644
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java
index 310c090d017..d4a95fd9791 100644
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gtest/AsyncLogGtest.java b/test/hotspot/jtreg/gtest/AsyncLogGtest.java
index d2d393c12b7..76b04d90ac8 100644
--- a/test/hotspot/jtreg/gtest/AsyncLogGtest.java
+++ b/test/hotspot/jtreg/gtest/AsyncLogGtest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gtest/CompressedKlassGtest.java b/test/hotspot/jtreg/gtest/CompressedKlassGtest.java
index 450203357a4..ba801724558 100644
--- a/test/hotspot/jtreg/gtest/CompressedKlassGtest.java
+++ b/test/hotspot/jtreg/gtest/CompressedKlassGtest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2024, Red Hat, Inc. All rights reserved.
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gtest/MetaspaceGtests.java b/test/hotspot/jtreg/gtest/MetaspaceGtests.java
index 1379fa05a1c..38fef145125 100644
--- a/test/hotspot/jtreg/gtest/MetaspaceGtests.java
+++ b/test/hotspot/jtreg/gtest/MetaspaceGtests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/XShareAuto.java b/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/XShareAuto.java
index 25aff06d358..a0d57f01097 100644
--- a/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/XShareAuto.java
+++ b/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/XShareAuto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/ClassInitErrors/TestStackOverflowDuringInit.java b/test/hotspot/jtreg/runtime/ClassInitErrors/TestStackOverflowDuringInit.java
index 180dc539795..3fee5ab131f 100644
--- a/test/hotspot/jtreg/runtime/ClassInitErrors/TestStackOverflowDuringInit.java
+++ b/test/hotspot/jtreg/runtime/ClassInitErrors/TestStackOverflowDuringInit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,16 +29,25 @@
  *          cause, even if we can't create the ExceptionInInitializerError
  * @comment This test could easily be perturbed so don't allow flag settings.
  * @requires vm.flagless
+ * @library /test/lib
  * @comment Run with the smallest stack possible to limit the execution time.
  *          This is the smallest stack that is supported by all platforms.
- * @run main/othervm -Xss384K -Xint TestStackOverflowDuringInit
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestStackOverflowDuringInit
  */
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.whitebox.WhiteBox;
 
 public class TestStackOverflowDuringInit {
 
+    static String expected = "java.lang.NoClassDefFoundError: Could not initialize class TestStackOverflowDuringInit$LongCache";
+    static String cause = "Caused by: java.lang.StackOverflowError";
+
     // The setup for this is somewhat intricate. We need to trigger a
     // StackOverflowError during execution of the static initializer
     // for a class, but we need there to be insufficient stack left
@@ -88,34 +97,47 @@ public class TestStackOverflowDuringInit {
         }
     }
 
-    public static void main(String[] args) throws Exception {
-        String expected = "java.lang.NoClassDefFoundError: Could not initialize class TestStackOverflowDuringInit$LongCache";
-        String cause = "Caused by: java.lang.StackOverflowError";
+    static class Launcher {
+        public static void main(String[] args) throws Exception {
 
-        // Pre-load, but not initialize, LongCache, else we will
-        // hit SOE during class loading.
-        System.out.println("Pre-loading ...");
-        Class<?> c = Class.forName("TestStackOverflowDuringInit$LongCache",
-                                   false,
-                                   TestStackOverflowDuringInit.class.getClassLoader());
-        try {
-            recurse();
-        } catch (Throwable ex) {
-            //            ex.printStackTrace();
-            verify_stack(ex, expected, cause);
+            // Pre-load, but not initialize, LongCache, else we will
+            // hit SOE during class loading.
+            System.out.println("Pre-loading ...");
+            Class<?> c = Class.forName("TestStackOverflowDuringInit$LongCache",
+                                       false,
+                                       TestStackOverflowDuringInit.class.getClassLoader());
+            try {
+                recurse();
+            } catch (Throwable ex) {
+                //            ex.printStackTrace();
+                verify_stack(ex, expected, cause);
+            }
+        }
+
+        private static void verify_stack(Throwable e, String expected, String cause) throws Exception {
+            ByteArrayOutputStream byteOS = new ByteArrayOutputStream();
+            try (PrintStream printStream = new PrintStream(byteOS)) {
+                e.printStackTrace(printStream);
+            }
+            String stackTrace = byteOS.toString("ASCII");
+            System.out.println(stackTrace);
+            if (!stackTrace.contains(expected) ||
+                (cause != null && !stackTrace.contains(cause))) {
+                throw new RuntimeException(expected + " and/or " + cause + " missing from stacktrace");
+            }
         }
     }
 
-    private static void verify_stack(Throwable e, String expected, String cause) throws Exception {
-        ByteArrayOutputStream byteOS = new ByteArrayOutputStream();
-        try (PrintStream printStream = new PrintStream(byteOS)) {
-            e.printStackTrace(printStream);
-        }
-        String stackTrace = byteOS.toString("ASCII");
-        System.out.println(stackTrace);
-        if (!stackTrace.contains(expected) ||
-            (cause != null && !stackTrace.contains(cause))) {
-            throw new RuntimeException(expected + " and/or " + cause + " missing from stacktrace");
-        }
+    public static void main(String[] args) throws Exception {
+        WhiteBox wb = WhiteBox.getWhiteBox();
+        long minimumJavaStackSize = wb.getMinimumJavaStackSize();
+        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+                "-Xss" + Long.toString(minimumJavaStackSize), "-Xint",
+                Launcher.class.getName());
+
+        OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
+        analyzer.shouldHaveExitValue(0);
+        analyzer.shouldContain(expected);
+        analyzer.shouldContain(cause);
     }
 }
diff --git a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java
index 87e59d1c486..b44e8c7ce9e 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java
index d4b47422c38..0ac19c4a487 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/CommandLine/VMOptionWarning.java b/test/hotspot/jtreg/runtime/CommandLine/VMOptionWarning.java
index ccc998bb7e0..6c8522c1881 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/VMOptionWarning.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMOptionWarning.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/ShowRegistersOnAssertTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/ShowRegistersOnAssertTest.java
index b0138625450..acb70e00c79 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/ShowRegistersOnAssertTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ShowRegistersOnAssertTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018, 2022 SAP SE. All rights reserved.
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/StackWalkNativeToJava.java b/test/hotspot/jtreg/runtime/ErrorHandling/StackWalkNativeToJava.java
index 7d7deffdb6e..a964a61003a 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/StackWalkNativeToJava.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/StackWalkNativeToJava.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,11 @@ public class StackWalkNativeToJava {
         output.shouldNotContain("java.lang.RuntimeException: Reached statement after obj.wait()");
         output.shouldNotContain("[error occurred during error reporting (printing native stack");
         String[] res = output.getOutput().split("StackWalkNativeToJava\\$TestNativeToJavaNative\\.callNativeMethod\\(\\)V");
-        assertTrue(res.length - 1 == 2, res.length - 1);
+        if (res.length != 3) {
+            output.reportDiagnosticSummary();
+        }
+
+        assertTrue(res.length == 3, res.length);
         output.shouldNotHaveExitValue(0);
     }
 
@@ -104,7 +108,11 @@ public class StackWalkNativeToJava {
         output.shouldNotContain("java.lang.RuntimeException: Reached statement after synchronized");
         output.shouldNotContain("[error occurred during error reporting (printing native stack");
         String[] res = output.getOutput().split("StackWalkNativeToJava\\$TestNativeToJava\\.callVMMethod\\(\\)V");
-        assertTrue(res.length - 1 == 2, res.length - 1);
+        if (res.length != 3) {
+            output.reportDiagnosticSummary();
+        }
+
+        assertTrue(res.length == 3, res.length);
         output.shouldNotHaveExitValue(0);
     }
 
@@ -131,4 +139,4 @@ public class StackWalkNativeToJava {
             throw new RuntimeException("Count error: count was " + count);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/UncaughtNativeExceptionTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/UncaughtNativeExceptionTest.java
index d432181aacb..9090188d965 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/UncaughtNativeExceptionTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/UncaughtNativeExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/libNativeException.c b/test/hotspot/jtreg/runtime/ErrorHandling/libNativeException.c
index 20216a2e1de..12e670fd4a5 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/libNativeException.c
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/libNativeException.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/Monitor/MonitorWithDeadObjectTest.java b/test/hotspot/jtreg/runtime/Monitor/MonitorWithDeadObjectTest.java
index b1e6d0aa8c7..f4afe870f2f 100644
--- a/test/hotspot/jtreg/runtime/Monitor/MonitorWithDeadObjectTest.java
+++ b/test/hotspot/jtreg/runtime/Monitor/MonitorWithDeadObjectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java b/test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java
index 4e044311bcb..3731bd11003 100644
--- a/test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java
+++ b/test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/NMT/MallocRoundingReportTest.java b/test/hotspot/jtreg/runtime/NMT/MallocRoundingReportTest.java
index a0c14d70831..e02a55c6b09 100644
--- a/test/hotspot/jtreg/runtime/NMT/MallocRoundingReportTest.java
+++ b/test/hotspot/jtreg/runtime/NMT/MallocRoundingReportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2023, Red Hat, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/hotspot/jtreg/runtime/NMT/MallocTestType.java b/test/hotspot/jtreg/runtime/NMT/MallocTestType.java
index 1612cbd81c0..7b532990a1e 100644
--- a/test/hotspot/jtreg/runtime/NMT/MallocTestType.java
+++ b/test/hotspot/jtreg/runtime/NMT/MallocTestType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2023, Red Hat, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/hotspot/jtreg/runtime/NMT/MallocTrackingVerify.java b/test/hotspot/jtreg/runtime/NMT/MallocTrackingVerify.java
index 141ef9f2ac3..4d15ce33618 100644
--- a/test/hotspot/jtreg/runtime/NMT/MallocTrackingVerify.java
+++ b/test/hotspot/jtreg/runtime/NMT/MallocTrackingVerify.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2023, Red Hat, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/hotspot/jtreg/runtime/NMT/ThreadedMallocTestType.java b/test/hotspot/jtreg/runtime/NMT/ThreadedMallocTestType.java
index f6b0f3baf04..e0aefeb2285 100644
--- a/test/hotspot/jtreg/runtime/NMT/ThreadedMallocTestType.java
+++ b/test/hotspot/jtreg/runtime/NMT/ThreadedMallocTestType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2023, Red Hat, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/hotspot/jtreg/runtime/Safepoint/TestAbortVMOnSafepointTimeout.java b/test/hotspot/jtreg/runtime/Safepoint/TestAbortVMOnSafepointTimeout.java
index b46a5deb70d..06c10fbb7cf 100644
--- a/test/hotspot/jtreg/runtime/Safepoint/TestAbortVMOnSafepointTimeout.java
+++ b/test/hotspot/jtreg/runtime/Safepoint/TestAbortVMOnSafepointTimeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/hotspot/jtreg/runtime/StackGap/TestStackGap.java b/test/hotspot/jtreg/runtime/StackGap/TestStackGap.java
index 12d5c35b8bd..9fa4f55f7d1 100644
--- a/test/hotspot/jtreg/runtime/StackGap/TestStackGap.java
+++ b/test/hotspot/jtreg/runtime/StackGap/TestStackGap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/StackGuardPages/TestStackGuardPages.java b/test/hotspot/jtreg/runtime/StackGuardPages/TestStackGuardPages.java
index 2dfb18447f1..8699dbceb31 100644
--- a/test/hotspot/jtreg/runtime/StackGuardPages/TestStackGuardPages.java
+++ b/test/hotspot/jtreg/runtime/StackGuardPages/TestStackGuardPages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/TLS/TestTLS.java b/test/hotspot/jtreg/runtime/TLS/TestTLS.java
index 2f9a559448b..ba9517bc1e5 100644
--- a/test/hotspot/jtreg/runtime/TLS/TestTLS.java
+++ b/test/hotspot/jtreg/runtime/TLS/TestTLS.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2019, Google Inc. All rights reserved.
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/Thread/TestAlwaysPreTouchStacks.java b/test/hotspot/jtreg/runtime/Thread/TestAlwaysPreTouchStacks.java
index fe4688330e3..29be9cdb98f 100644
--- a/test/hotspot/jtreg/runtime/Thread/TestAlwaysPreTouchStacks.java
+++ b/test/hotspot/jtreg/runtime/Thread/TestAlwaysPreTouchStacks.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022 SAP SE. All rights reserved.
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/Thread/TooSmallStackSize.java b/test/hotspot/jtreg/runtime/Thread/TooSmallStackSize.java
index 6fd1da6f2ae..9dbbd22fa2e 100644
--- a/test/hotspot/jtreg/runtime/Thread/TooSmallStackSize.java
+++ b/test/hotspot/jtreg/runtime/Thread/TooSmallStackSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/PrintSharedArchiveAndExitNoHeap.java b/test/hotspot/jtreg/runtime/cds/PrintSharedArchiveAndExitNoHeap.java
new file mode 100644
index 00000000000..969218dbc16
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/PrintSharedArchiveAndExitNoHeap.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8373411
+ * @summary Testing -XX:+PrintSharedArchiveAndExit option with no shared heap
+ * @requires vm.cds
+ * @library /test/lib
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class PrintSharedArchiveAndExitNoHeap {
+    public static void main(String[] args) throws Exception {
+        // This used to crash when trying to figure out if interned string should be printed
+        OutputAnalyzer oa = ProcessTools.executeTestJava("-XX:AOTCacheOutput=./PrintSharedArchiveAndExitNoHeap.jsa", "-XX:+PrintSharedArchiveAndExit", "-version");
+        oa.shouldHaveExitValue(0);
+        // AOTCacheOutput forks a process, if that crashes then the above check is not enough
+        // and we have to check the output to figure out if it crashed.
+        oa.shouldNotContain("Internal Error");
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/ServiceLoaderTest.java b/test/hotspot/jtreg/runtime/cds/ServiceLoaderTest.java
index f0c99b24885..c77073fabb2 100644
--- a/test/hotspot/jtreg/runtime/cds/ServiceLoaderTest.java
+++ b/test/hotspot/jtreg/runtime/cds/ServiceLoaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/SharedStringsDedup.java b/test/hotspot/jtreg/runtime/cds/SharedStringsDedup.java
index da5025b07b5..01516adb648 100644
--- a/test/hotspot/jtreg/runtime/cds/SharedStringsDedup.java
+++ b/test/hotspot/jtreg/runtime/cds/SharedStringsDedup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/SharedStringsRunAuto.java b/test/hotspot/jtreg/runtime/cds/SharedStringsRunAuto.java
index 5774d71d089..c5396949bd6 100644
--- a/test/hotspot/jtreg/runtime/cds/SharedStringsRunAuto.java
+++ b/test/hotspot/jtreg/runtime/cds/SharedStringsRunAuto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/SharedSymbolTableBucketSize.java b/test/hotspot/jtreg/runtime/cds/SharedSymbolTableBucketSize.java
index 2db4ab2df23..070384a2703 100644
--- a/test/hotspot/jtreg/runtime/cds/SharedSymbolTableBucketSize.java
+++ b/test/hotspot/jtreg/runtime/cds/SharedSymbolTableBucketSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,8 @@
  *          java.management
  */
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import jdk.test.lib.cds.CDSTestUtils;
 import jdk.test.lib.process.OutputAnalyzer;
 
@@ -43,8 +45,44 @@ public class SharedSymbolTableBucketSize {
                                                + Integer.valueOf(bucket_size));
         CDSTestUtils.checkMappingFailure(output);
 
-        String regex = "Average bucket size     :     ([0-9]+\\.[0-9]+).*";
-        String s = output.firstMatch(regex, 1);
+        /* [1] There may be other table stats that precede the symbol tabble.
+               Skip all thse until we find this:
+
+           [0.677s][info][aot,hashtables] Shared symbol table stats -------- base: 0x0000000800000000
+           [0.677s][info][aot,hashtables] Number of entries       :     46244
+           [0.677s][info][aot,hashtables] Total bytes used        :    393792
+           [0.677s][info][aot,hashtables] Average bytes per entry :     8.516
+           [0.677s][info][aot,hashtables] Average bucket size     :     7.734
+           [0.677s][info][aot,hashtables] Variance of bucket size :     7.513
+           [0.677s][info][aot,hashtables] Std. dev. of bucket size:     2.741
+           [0.677s][info][aot,hashtables] Maximum bucket size     :        20
+           [0.677s][info][aot,hashtables] Empty buckets           :         2
+           [0.677s][info][aot,hashtables] Value_Only buckets      :        24
+           [0.677s][info][aot,hashtables] Other buckets           :      5953
+           ....
+        */
+        Pattern pattern0 = Pattern.compile("Shared symbol table stats.*", Pattern.DOTALL);
+        Matcher matcher0 = pattern0.matcher(output.getStdout());
+        String stat = null;
+        if (matcher0.find()) {
+            stat = matcher0.group(0);
+        }
+        if (stat == null) {
+            throw new Exception("FAILED: pattern \"" + pattern0 + "\" not found");
+        }
+
+        /* (2) The first "Average bucket size" line in the remaining output is for the
+               shared symbol table */
+        Pattern pattern = Pattern.compile("Average bucket size *: *([0-9]+\\.[0-9]+).*", Pattern.MULTILINE);
+        Matcher matcher = pattern.matcher(stat);
+        String s = null;
+        if (matcher.find()) {
+            s = matcher.group(1);
+        }
+        if (s == null) {
+            throw new Exception("FAILED: pattern \"" + pattern + "\" not found");
+        }
+
         Float f = Float.parseFloat(s);
         int size = Math.round(f);
         if (size != bucket_size) {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/CreateAOTCacheVerifyError.java b/test/hotspot/jtreg/runtime/cds/appcds/CreateAOTCacheVerifyError.java
index c478fad7cc2..eec686297ae 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/CreateAOTCacheVerifyError.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/CreateAOTCacheVerifyError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/LambdaWithUseImplMethodHandle.java b/test/hotspot/jtreg/runtime/cds/appcds/LambdaWithUseImplMethodHandle.java
index 6b7a4f68bbf..5870b4cc36c 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/LambdaWithUseImplMethodHandle.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/LambdaWithUseImplMethodHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/LotsOfJRTClasses.java b/test/hotspot/jtreg/runtime/cds/appcds/LotsOfJRTClasses.java
index 9c7a06ed8bc..4478d258e66 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/LotsOfJRTClasses.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/LotsOfJRTClasses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/SignedJar.java b/test/hotspot/jtreg/runtime/cds/appcds/SignedJar.java
index 9e6cb58bb7f..a20a432457a 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/SignedJar.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/SignedJar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java b/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java
index 83840422b58..7c0b5896a98 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java
index 3ff5da98b42..e0001e021ad 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java
@@ -221,6 +221,8 @@ public class VerifierTest implements Opcodes {
                 runtime_arg1 = runtime_arg2 = runtime_arg3 = runtime_setting;
             }
             TestCommon.run("-cp", jar,
+                           "-Xms256m",
+                           "-Xmx256m",
                            "-Xlog:cds",
                            runtime_arg1, runtime_arg2, runtime_arg3,
                            "VerifierTest0")
@@ -302,6 +304,8 @@ public class VerifierTest implements Opcodes {
                 runtime_arg1 = runtime_arg2 = runtime_arg3 = runtime_setting;
             }
             TestCommon.run("-cp", jar,
+                           "-Xms256m",
+                           "-Xmx256m",
                            "-Xlog:cds",
                            runtime_arg1, runtime_arg2, runtime_arg3,
                            "Hi")
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTLoggingTag.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTLoggingTag.java
index 896df7ca496..4cc6ef81c45 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTLoggingTag.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTLoggingTag.java
@@ -83,17 +83,6 @@ public class AOTLoggingTag {
         out.shouldContain("[aot] Opened AOT cache hello.aot");
         out.shouldHaveExitValue(0);
 
-        //----------------------------------------------------------------------
-        printTestCase("All old -Xlog:cds+heap logs have been changed to -Xlog:aot+heap should alias to -Xlog:cds+heap");
-        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
-            "-XX:AOTCache=" + aotCacheFile,
-            "-Xlog:aot+heap",
-            "-cp", appJar, helloClass);
-        out = CDSTestUtils.executeAndLog(pb, "prod");
-        out.shouldNotContain("No tag set matches selection: aot+heap");
-        out.shouldContain("[aot,heap] resolve subgraph java.lang.Integer$IntegerCache");
-        out.shouldHaveExitValue(0);
-
         //----------------------------------------------------------------------
         printTestCase("Production Run: errors should be printed with [aot] decoration");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/HeapObjectIdentity.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/HeapObjectIdentity.java
new file mode 100644
index 00000000000..cdd0921627a
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/HeapObjectIdentity.java
@@ -0,0 +1,261 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test AOT cache should preserve heap object identity when required by JLS. For example, Enums and Integers.
+ * @requires vm.cds
+ * @requires vm.cds.supports.aot.class.linking
+ * @requires vm.debug
+ * @library /test/lib
+ * @build HeapObjectIdentity
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar dummy.jar
+ *                 Dummy
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar boot.jar
+ *                 HeapObjectIdentityApp
+ *                 MyAOTInitedClass
+ *                 MyAOTInitedClass$MyEnum
+ *                 MyAOTInitedClass$Wrapper
+ * @run driver HeapObjectIdentity AOT --two-step-training
+ */
+
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.helpers.ClassFileInstaller;
+
+public class HeapObjectIdentity {
+    static final String appJar = ClassFileInstaller.getJarPath("dummy.jar");
+    static final String bootJar = ClassFileInstaller.getJarPath("boot.jar");
+    static final String mainClass = "HeapObjectIdentityApp"; // Loaded from boot.jar
+
+    public static void main(String[] args) throws Exception {
+        Tester t = new Tester();
+        t.run(args);
+
+        // Integer$IntegerCache should preserve the object identity of cached Integer objects,
+        // even when the cache size is different between assembly and production.
+        t.productionRun(new String[] {
+                "-XX:AutoBoxCacheMax=2048"
+                });
+    }
+
+    static class Tester extends CDSAppTester {
+        public Tester() {
+            super(mainClass);
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return appJar;
+        }
+
+        @Override
+        public String[] vmArgs(RunMode runMode) {
+            String bootcp = "-Xbootclasspath/a:" + bootJar;
+            if (runMode == RunMode.ASSEMBLY) {
+                return new String[] {
+                    "-Xlog:aot+class=debug",
+                    "-XX:AOTInitTestClass=MyAOTInitedClass",
+                    bootcp
+                };
+            } else {
+                return new String[] {bootcp};
+            }
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {
+                mainClass,
+                runMode.toString(),
+            };
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
+            if (runMode == RunMode.ASSEMBLY) {
+                out.shouldContain("MyAOTInitedClass aot-linked inited");
+            }
+        }
+    }
+}
+
+class HeapObjectIdentityApp {
+    public static void main(String... args) {
+        MyAOTInitedClass.test();
+    }
+}
+
+// This class is loaded by the boot loader, as -XX:AOTInitTestClass is not too friendly
+// with classes by other loaders.
+class MyAOTInitedClass {
+    static Object[] archivedObjects;
+    static {
+        if (archivedObjects == null) {
+            archivedObjects = new Object[14];
+            archivedObjects[0] = Wrapper.BOOLEAN;
+            archivedObjects[1] = Wrapper.INT.zero();
+            archivedObjects[2] = Wrapper.DOUBLE.zero();
+            archivedObjects[3] = MyEnum.DUMMY1;
+
+            archivedObjects[4] = Boolean.class;
+            archivedObjects[5] = Byte.class;
+            archivedObjects[6] = Character.class;
+            archivedObjects[7] = Short.class;
+            archivedObjects[8] = Integer.class;
+            archivedObjects[9] = Long.class;
+            archivedObjects[10] = Float.class;
+            archivedObjects[11] = Double.class;
+            archivedObjects[12] = Void.class;
+
+            archivedObjects[13] = Integer.valueOf(1);
+        } else {
+            System.out.println("Initialized from CDS");
+        }
+    }
+
+    public static void test() {
+        if (archivedObjects[0] != Wrapper.BOOLEAN) {
+            throw new RuntimeException("Huh 0");
+        }
+
+        if (archivedObjects[1] != Wrapper.INT.zero()) {
+            throw new RuntimeException("Huh 1");
+        }
+
+        if (archivedObjects[2] != Wrapper.DOUBLE.zero()) {
+            throw new RuntimeException("Huh 2");
+        }
+
+        if (archivedObjects[3] != MyEnum.DUMMY1) {
+            throw new RuntimeException("Huh 3");
+        }
+
+        if (MyEnum.BOOLEAN != true) {
+            throw new RuntimeException("Huh 10.1");
+        }
+        if (MyEnum.BYTE != -128) {
+            throw new RuntimeException("Huh 10.2");
+        }
+        if (MyEnum.CHAR != 'c') {
+            throw new RuntimeException("Huh 10.3");
+        }
+        if (MyEnum.SHORT != -12345) {
+            throw new RuntimeException("Huh 10.4");
+        }
+        if (MyEnum.INT != -123456) {
+            throw new RuntimeException("Huh 10.5");
+        }
+        if (MyEnum.LONG != 0x1234567890L) {
+            throw new RuntimeException("Huh 10.6");
+        }
+        if (MyEnum.LONG2 != -0x1234567890L) {
+            throw new RuntimeException("Huh 10.7");
+        }
+        if (MyEnum.FLOAT != 567891.0f) {
+            throw new RuntimeException("Huh 10.8");
+        }
+        if (MyEnum.DOUBLE != 12345678905678.890) {
+            throw new RuntimeException("Huh 10.9");
+        }
+
+        checkClass(4, Boolean.class);
+        checkClass(5, Byte.class);
+        checkClass(6, Character.class);
+        checkClass(7, Short.class);
+        checkClass(8, Integer.class);
+        checkClass(9, Long.class);
+        checkClass(10, Float.class);
+        checkClass(11, Double.class);
+        checkClass(12, Void.class);
+
+        if (archivedObjects[13] != Integer.valueOf(1)) {
+            throw new RuntimeException("Integer cache identity test failed");
+        }
+
+        System.out.println("Success!");
+    }
+
+    static void checkClass(int index, Class c) {
+        if (archivedObjects[index] != c) {
+            throw new RuntimeException("archivedObjects[" + index + "] should be " + c);
+        }
+    }
+
+    // Simplified version of sun.invoke.util.Wrapper
+    public enum Wrapper {
+        //        wrapperType      simple     primitiveType  simple     char  emptyArray
+        BOOLEAN(  Boolean.class,   "Boolean", boolean.class, "boolean", 'Z', new boolean[0]),
+        INT    (  Integer.class,   "Integer",     int.class,     "int", 'I', new     int[0]),
+        DOUBLE (   Double.class,    "Double",  double.class,  "double", 'D', new  double[0])
+        ;
+
+        public static final int COUNT = 10;
+        private static final Object DOUBLE_ZERO = (Double)(double)0;
+
+        private final Class<?> wrapperType;
+        private final Class<?> primitiveType;
+        private final char     basicTypeChar;
+        private final String   basicTypeString;
+        private final Object   emptyArray;
+
+        Wrapper(Class<?> wtype,
+                String wtypeName,
+                Class<?> ptype,
+                String ptypeName,
+                char tchar,
+                Object emptyArray) {
+            this.wrapperType = wtype;
+            this.primitiveType = ptype;
+            this.basicTypeChar = tchar;
+            this.basicTypeString = String.valueOf(this.basicTypeChar);
+            this.emptyArray = emptyArray;
+        }
+
+        public Object zero() {
+            return switch (this) {
+                case BOOLEAN -> Boolean.FALSE;
+                case INT -> (Integer)0;
+                case DOUBLE -> DOUBLE_ZERO;
+                default -> null;
+            };
+        }
+    }
+
+    enum MyEnum {
+        DUMMY1,
+        DUMMY2;
+
+        static final boolean BOOLEAN = true;
+        static final byte    BYTE    = -128;
+        static final short   SHORT   = -12345;
+        static final char    CHAR    = 'c';
+        static final int     INT     = -123456;
+        static final long    LONG    =  0x1234567890L;
+        static final long    LONG2   = -0x1234567890L;
+        static final float   FLOAT   = 567891.0f;
+        static final double  DOUBLE  = 12345678905678.890;
+    }
+}
+
+class Dummy {}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/HotSpotAOTCacheMXBeanTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/HotSpotAOTCacheMXBeanTest.java
new file mode 100644
index 00000000000..fba3589f5ce
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/HotSpotAOTCacheMXBeanTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2025, Microsoft, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+
+/*
+ * @test
+ * @summary Sanity test for HotSpotAOTCache MXBean
+ * @requires vm.cds.write.archived.java.heap
+ * @library /test/jdk/lib/testlibrary /test/lib
+ * @build HotSpotAOTCacheMXBeanTest
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar HotSpotAOTCacheMXBeanApp
+ * @run driver HotSpotAOTCacheMXBeanTest
+ */
+
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import javax.management.MBeanServer;
+import jdk.management.HotSpotAOTCacheMXBean;
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class HotSpotAOTCacheMXBeanTest {
+    static final String appJar = ClassFileInstaller.getJarPath("app.jar");
+    static final String mainClass = "HotSpotAOTCacheMXBeanApp";
+    public static void main(String[] args) throws Exception {
+        Tester tester = new Tester();
+        tester.runAOTWorkflow();
+    }
+
+    static class Tester extends CDSAppTester {
+        public Tester() {
+            super(mainClass);
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return appJar;
+        }
+
+        @Override
+        public String[] vmArgs(RunMode runMode) {
+            return new String[] {
+               "-Xlog:cds+class=trace",
+                "--add-modules=jdk.management"
+            };
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {
+                mainClass, runMode.name()
+            };
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) {
+            var name = runMode.name();
+            if (runMode.isApplicationExecuted()) {
+                if(runMode == RunMode.TRAINING) {
+                    out.shouldContain("Hello Leyden " + name);
+                    out.shouldContain("Successfully stopped recording");
+                } else if (runMode == RunMode.ASSEMBLY) {
+                    out.shouldNotContain("Hello Leyden ");
+                } else if (runMode == RunMode.PRODUCTION) {
+                    out.shouldContain("Hello Leyden " + name);
+                    out.shouldContain("Failed to stop recording");
+                }
+                out.shouldNotContain("HotSpotAOTCacheMXBean is not available");
+                out.shouldNotContain("IOException occurred!");
+            }
+        }
+    }
+}
+
+class HotSpotAOTCacheMXBeanApp {
+    public static void main(String[] args) {
+        System.out.println("Hello Leyden " + args[0]);
+        try {
+            MBeanServer server = ManagementFactory.getPlatformMBeanServer();
+            HotSpotAOTCacheMXBean aotBean = ManagementFactory.newPlatformMXBeanProxy(server,
+                    "jdk.management:type=HotSpotAOTCache",
+                    HotSpotAOTCacheMXBean.class);
+            if (aotBean == null) {
+                System.out.println("HotSpotAOTCacheMXBean is not available");
+                return;
+            }
+            if (aotBean.endRecording()) {
+                System.out.println("Successfully stopped recording");
+            } else {
+                System.out.println("Failed to stop recording");
+            }
+        } catch (IOException e) {
+            System.out.println("IOException occurred!");
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchiveHeapTestClass.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchiveHeapTestClass.java
index fed56937f2f..3b1ccff1bfa 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchiveHeapTestClass.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchiveHeapTestClass.java
@@ -36,7 +36,7 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar boot.jar
  *             CDSTestClassA CDSTestClassA$XX CDSTestClassA$YY
  *             CDSTestClassB CDSTestClassC CDSTestClassD
- *             CDSTestClassE CDSTestClassF CDSTestClassG CDSTestClassG$MyEnum CDSTestClassG$Wrapper
+ *             CDSTestClassE CDSTestClassF
  *             pkg.ClassInPackage
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar Hello
  * @run driver ArchiveHeapTestClass
@@ -58,7 +58,6 @@ public class ArchiveHeapTestClass {
     static final String CDSTestClassD_name = CDSTestClassD.class.getName();
     static final String CDSTestClassE_name = CDSTestClassE.class.getName();
     static final String CDSTestClassF_name = CDSTestClassF.class.getName();
-    static final String CDSTestClassG_name = CDSTestClassG.class.getName();
     static final String ClassInPackage_name = pkg.ClassInPackage.class.getName().replace('.', '/');
     static final String ARCHIVE_TEST_FIELD_NAME = "archivedObjects";
 
@@ -162,15 +161,6 @@ public class ArchiveHeapTestClass {
             output = dumpBootAndHello(CDSTestClassF_name);
             mustFail(output, "Class java.util.logging.Level not allowed in archive heap");
         }
-
-        testCase("Complex enums");
-        output = dumpBootAndHello(CDSTestClassG_name, "-XX:+AOTClassLinking", "-Xlog:cds+class=debug");
-        mustSucceed(output);
-
-        TestCommon.run("-Xbootclasspath/a:" + bootJar, "-cp", appJar, "-Xlog:aot+heap,cds+init",
-                       CDSTestClassG_name)
-            .assertNormalExit("init subgraph " + CDSTestClassG_name,
-                              "Initialized from CDS");
     }
 }
 
@@ -287,147 +277,3 @@ class CDSTestClassF {
         archivedObjects[0] = java.util.logging.Level.OFF;
     }
 }
-
-class CDSTestClassG {
-    static Object[] archivedObjects;
-    static {
-        if (archivedObjects == null) {
-            archivedObjects = new Object[13];
-            archivedObjects[0] = Wrapper.BOOLEAN;
-            archivedObjects[1] = Wrapper.INT.zero();
-            archivedObjects[2] = Wrapper.DOUBLE.zero();
-            archivedObjects[3] = MyEnum.DUMMY1;
-
-            archivedObjects[4] = Boolean.class;
-            archivedObjects[5] = Byte.class;
-            archivedObjects[6] = Character.class;
-            archivedObjects[7] = Short.class;
-            archivedObjects[8] = Integer.class;
-            archivedObjects[9] = Long.class;
-            archivedObjects[10] = Float.class;
-            archivedObjects[11] = Double.class;
-            archivedObjects[12] = Void.class;
-        } else {
-            System.out.println("Initialized from CDS");
-        }
-    }
-
-    public static void main(String args[]) {
-        if (archivedObjects[0] != Wrapper.BOOLEAN) {
-            throw new RuntimeException("Huh 0");
-        }
-
-        if (archivedObjects[1] != Wrapper.INT.zero()) {
-            throw new RuntimeException("Huh 1");
-        }
-
-        if (archivedObjects[2] != Wrapper.DOUBLE.zero()) {
-            throw new RuntimeException("Huh 2");
-        }
-
-        if (archivedObjects[3] != MyEnum.DUMMY1) {
-            throw new RuntimeException("Huh 3");
-        }
-
-        if (MyEnum.BOOLEAN != true) {
-            throw new RuntimeException("Huh 10.1");
-        }
-        if (MyEnum.BYTE != -128) {
-            throw new RuntimeException("Huh 10.2");
-        }
-        if (MyEnum.CHAR != 'c') {
-            throw new RuntimeException("Huh 10.3");
-        }
-        if (MyEnum.SHORT != -12345) {
-            throw new RuntimeException("Huh 10.4");
-        }
-        if (MyEnum.INT != -123456) {
-            throw new RuntimeException("Huh 10.5");
-        }
-        if (MyEnum.LONG != 0x1234567890L) {
-            throw new RuntimeException("Huh 10.6");
-        }
-        if (MyEnum.LONG2 != -0x1234567890L) {
-            throw new RuntimeException("Huh 10.7");
-        }
-        if (MyEnum.FLOAT != 567891.0f) {
-            throw new RuntimeException("Huh 10.8");
-        }
-        if (MyEnum.DOUBLE != 12345678905678.890) {
-            throw new RuntimeException("Huh 10.9");
-        }
-
-        checkClass(4, Boolean.class);
-        checkClass(5, Byte.class);
-        checkClass(6, Character.class);
-        checkClass(7, Short.class);
-        checkClass(8, Integer.class);
-        checkClass(9, Long.class);
-        checkClass(10, Float.class);
-        checkClass(11, Double.class);
-        checkClass(12, Void.class);
-
-        System.out.println("Success!");
-    }
-
-    static void checkClass(int index, Class c) {
-        if (archivedObjects[index] != c) {
-            throw new RuntimeException("archivedObjects[" + index + "] should be " + c);
-        }
-    }
-
-    // Simplified version of sun.invoke.util.Wrapper
-    public enum Wrapper {
-        //        wrapperType      simple     primitiveType  simple     char  emptyArray
-        BOOLEAN(  Boolean.class,   "Boolean", boolean.class, "boolean", 'Z', new boolean[0]),
-        INT    (  Integer.class,   "Integer",     int.class,     "int", 'I', new     int[0]),
-        DOUBLE (   Double.class,    "Double",  double.class,  "double", 'D', new  double[0])
-        ;
-
-        public static final int COUNT = 10;
-        private static final Object DOUBLE_ZERO = (Double)(double)0;
-
-        private final Class<?> wrapperType;
-        private final Class<?> primitiveType;
-        private final char     basicTypeChar;
-        private final String   basicTypeString;
-        private final Object   emptyArray;
-
-        Wrapper(Class<?> wtype,
-                String wtypeName,
-                Class<?> ptype,
-                String ptypeName,
-                char tchar,
-                Object emptyArray) {
-            this.wrapperType = wtype;
-            this.primitiveType = ptype;
-            this.basicTypeChar = tchar;
-            this.basicTypeString = String.valueOf(this.basicTypeChar);
-            this.emptyArray = emptyArray;
-        }
-
-        public Object zero() {
-            return switch (this) {
-                case BOOLEAN -> Boolean.FALSE;
-                case INT -> (Integer)0;
-                case DOUBLE -> DOUBLE_ZERO;
-                default -> null;
-            };
-        }
-    }
-
-    enum MyEnum {
-        DUMMY1,
-        DUMMY2;
-
-        static final boolean BOOLEAN = true;
-        static final byte    BYTE    = -128;
-        static final short   SHORT   = -12345;
-        static final char    CHAR    = 'c';
-        static final int     INT     = -123456;
-        static final long    LONG    =  0x1234567890L;
-        static final long    LONG2   = -0x1234567890L;
-        static final float   FLOAT   = 567891.0f;
-        static final double  DOUBLE  = 12345678905678.890;
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java
index 8b18876aeb4..f69f2be4864 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java
index b09c2c944fb..df6367fc676 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/PrintSharedArchiveAndExit.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/PrintSharedArchiveAndExit.java
index bc208fd3df9..52ce47ad0ac 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/PrintSharedArchiveAndExit.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/PrintSharedArchiveAndExit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/NestHostOldInf.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/NestHostOldInf.java
index 99ab68bda49..77ba63bce83 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/NestHostOldInf.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/NestHostOldInf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/PrintSharedArchiveAndExit.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/PrintSharedArchiveAndExit.java
index 13fa84ac205..b86a7c7933c 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/PrintSharedArchiveAndExit.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/PrintSharedArchiveAndExit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestFileSafety.java b/test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestFileSafety.java
index 74f98d5b777..722d86fcd1b 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestFileSafety.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestFileSafety.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.foos/module-info.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.foos/module-info.java
index 70565d9d4ee..5778143db71 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.foos/module-info.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/src/com.foos/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java
index cc470eb68d0..56a16005df2 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsHumongous.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java
index 2b2e1194c63..e15cfafa3cb 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/test-classes/BadLookupSwitch.jcod b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/BadLookupSwitch.jcod
index 4912479a8aa..718914b2b34 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/test-classes/BadLookupSwitch.jcod
+++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/BadLookupSwitch.jcod
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClasses.java b/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClasses.java
index 5e561ed8b31..408ab0582b1 100644
--- a/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClasses.java
+++ b/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClasses.java
@@ -98,8 +98,7 @@ public class ReplaceCriticalClasses {
             // Replace classes that are loaded after JVMTI_PHASE_PRIMORDIAL. It's OK to replace
             // such
             // classes even when CDS is enabled. Nothing bad should happen.
-            "-notshared java/util/Locale",
-            "-notshared sun/util/locale/BaseLocale",
+            "-notshared java/util/Calendar",
         };
         return tests;
     }
@@ -149,8 +148,8 @@ public class ReplaceCriticalClasses {
         Class.forName(klassName.replace("/", ".")); // make sure it's a valid class
         final String subgraphInit = "initialize_from_archived_subgraph " + subgraphKlass;
 
-        // We will pass an option like "-agentlib:SimpleClassFileLoadHook=java/util/Locale,XXX,XXX".
-        // The SimpleClassFileLoadHook agent would attempt to hook the java/util/Locale class
+        // We will pass an option like "-agentlib:SimpleClassFileLoadHook=java/util/Calendar,XXX,XXX".
+        // The SimpleClassFileLoadHook agent would attempt to hook the java/util/Calendar class
         // but leave the class file bytes unchanged (it replaces all bytes "XXX" with "XXX", i.e.,
         // a no-op). JVMTI doesn't check the class file bytes returned by the agent, so as long
         // as the agent returns a buffer, it will not load the class from CDS, and will instead
@@ -158,7 +157,7 @@ public class ReplaceCriticalClasses {
         //
         // Note that for safety we don't change the contents of the class file bytes. If in the
         // future JVMTI starts checking the contents of the class file bytes, this test would need
-        // to be updated. (You'd see the test case with java/util/Locale staring to fail).
+        // to be updated. (You'd see the test case with java/util/Calendar staring to fail).
         String agent = "-agentlib:SimpleClassFileLoadHook=" + early + klassName + ",XXX,XXX";
 
         CDSOptions opts = (new CDSOptions())
diff --git a/test/hotspot/jtreg/runtime/getSysPackage/GetSysPkgTest.java b/test/hotspot/jtreg/runtime/getSysPackage/GetSysPkgTest.java
index 0cd3e371d8b..f0d29e83e01 100644
--- a/test/hotspot/jtreg/runtime/getSysPackage/GetSysPkgTest.java
+++ b/test/hotspot/jtreg/runtime/getSysPackage/GetSysPkgTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @modules java.base/jdk.internal.loader
  *          java.logging
  * @requires vm.flagless
+ * @requires !jdk.explodedImage
  * @library /test/lib
  * @run driver GetSysPkgTest
  */
diff --git a/test/hotspot/jtreg/runtime/jni/atExit/libatExit.c b/test/hotspot/jtreg/runtime/jni/atExit/libatExit.c
index 5a9dca819fb..38b19e5ec08 100644
--- a/test/hotspot/jtreg/runtime/jni/atExit/libatExit.c
+++ b/test/hotspot/jtreg/runtime/jni/atExit/libatExit.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/jni/checked/TestLargeUTF8Length.java b/test/hotspot/jtreg/runtime/jni/checked/TestLargeUTF8Length.java
index 27ec125317b..d9f0c53e33c 100644
--- a/test/hotspot/jtreg/runtime/jni/checked/TestLargeUTF8Length.java
+++ b/test/hotspot/jtreg/runtime/jni/checked/TestLargeUTF8Length.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/jni/daemonDestroy/TestDaemonDestroy.java b/test/hotspot/jtreg/runtime/jni/daemonDestroy/TestDaemonDestroy.java
index f74b7ed7ad9..f7e345a94f0 100644
--- a/test/hotspot/jtreg/runtime/jni/daemonDestroy/TestDaemonDestroy.java
+++ b/test/hotspot/jtreg/runtime/jni/daemonDestroy/TestDaemonDestroy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/jni/getCreatedJavaVMs/TestGetCreatedJavaVMs.java b/test/hotspot/jtreg/runtime/jni/getCreatedJavaVMs/TestGetCreatedJavaVMs.java
index c80fdea70fa..9f71b244c95 100644
--- a/test/hotspot/jtreg/runtime/jni/getCreatedJavaVMs/TestGetCreatedJavaVMs.java
+++ b/test/hotspot/jtreg/runtime/jni/getCreatedJavaVMs/TestGetCreatedJavaVMs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/modules/ModulesSymLink.java b/test/hotspot/jtreg/runtime/modules/ModulesSymLink.java
index 18d618cf8bc..d552a6158f3 100644
--- a/test/hotspot/jtreg/runtime/modules/ModulesSymLink.java
+++ b/test/hotspot/jtreg/runtime/modules/ModulesSymLink.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019, Google Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -27,6 +28,7 @@
  * @bug 8220095
  * @requires os.family == "linux" | os.family == "mac"
  * @requires vm.flagless
+ * @requires !jdk.explodedImage
  * @requires !jdk.static
  * @library /test/lib
  * @modules java.management
diff --git a/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTraceCL.java b/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTraceCL.java
index dd8b33402ac..4750e95c828 100644
--- a/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTraceCL.java
+++ b/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTraceCL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Make sure -Xlog:class+load=info works properly with "modules" jimage,
             --patch-module, and with -Xbootclasspath/a
  * @requires vm.flagless
+ * @requires !jdk.explodedImage
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @compile PatchModuleMain.java
diff --git a/test/hotspot/jtreg/runtime/verifier/TestANewArray.java b/test/hotspot/jtreg/runtime/verifier/TestANewArray.java
index e1b0dcf764c..f7b133868d4 100644
--- a/test/hotspot/jtreg/runtime/verifier/TestANewArray.java
+++ b/test/hotspot/jtreg/runtime/verifier/TestANewArray.java
@@ -69,7 +69,7 @@ public class TestANewArray {
         byte[] classFile_254 = dumpClassFile(cfv, test_Dimension_254, array_Dimension_254);
         writeClassFileFromByteArray(classFile_254);
         System.err.println("Running with cfv: " + cfv + ", test_Dimension_254");
-        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder("-verify", "-cp", ".",  classCName);
+        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder("-Xverify:all", "-cp", ".",  classCName);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldNotContain("java.lang.VerifyError");
         output.shouldHaveExitValue(0);
@@ -78,7 +78,7 @@ public class TestANewArray {
         byte[] classFile_255 = dumpClassFile(cfv, test_Dimension_255, array_Dimension_255);
         writeClassFileFromByteArray(classFile_255);
         System.err.println("Running with cfv: " + cfv + ", test_Dimension_255");
-        pb = ProcessTools.createTestJavaProcessBuilder("-verify", "-cp", ".",  classCName);
+        pb = ProcessTools.createTestJavaProcessBuilder("-Xverify:all", "-cp", ".",  classCName);
         output = new OutputAnalyzer(pb.start());
         // If anewarray has an operand with 255 array dimensions then VerifyError should
         // be thrown because the resulting array would have 256 dimensions.
@@ -95,7 +95,7 @@ public class TestANewArray {
         byte[] classFile_264 = dumpClassFile(cfv, test_Dimension_264, array_Dimension_264);
         writeClassFileFromByteArray(classFile_264);
         System.err.println("Running with cfv: " + cfv + ", test_Dimension_264");
-        pb = ProcessTools.createTestJavaProcessBuilder("-verify", "-cp", ".",  classCName);
+        pb = ProcessTools.createTestJavaProcessBuilder("-Xverify:all", "-cp", ".",  classCName);
         output = new OutputAnalyzer(pb.start());
         output.shouldContain("java.lang.ClassFormatError");
         output.shouldHaveExitValue(1);
diff --git a/test/hotspot/jtreg/runtime/verifier/TraceClassRes.java b/test/hotspot/jtreg/runtime/verifier/TraceClassRes.java
index ddb5e68e1d3..82431032acf 100644
--- a/test/hotspot/jtreg/runtime/verifier/TraceClassRes.java
+++ b/test/hotspot/jtreg/runtime/verifier/TraceClassRes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@ public class TraceClassRes {
   public static void main(String[] args) throws Exception {
 
     ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
-        "-Xlog:class+resolve=debug", "-verify", "-Xshare:off", "-version");
+        "-Xlog:class+resolve=debug", "-Xverify:all", "-Xshare:off", "-version");
 
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
     output.shouldContain("[class,resolve] java.lang.ClassLoader java.lang.Throwable ClassLoader.java (verification)");
diff --git a/test/hotspot/jtreg/runtime/verifier/stackMapTableTests/StackMapTableTest.java b/test/hotspot/jtreg/runtime/verifier/stackMapTableTests/StackMapTableTest.java
index f7f2ca1e881..08ddad6464f 100644
--- a/test/hotspot/jtreg/runtime/verifier/stackMapTableTests/StackMapTableTest.java
+++ b/test/hotspot/jtreg/runtime/verifier/stackMapTableTests/StackMapTableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @summary Test that the JVM does not assert when printing a stack map table
  *          containing a stack map with a bad verification type.
  * @compile badStackMapTable.jcod
- * @run main/othervm -verify StackMapTableTest
+ * @run main/othervm -Xverify:all StackMapTableTest
  */
 
 public class StackMapTableTest {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitor.java b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitor.java
index 4ea84def6d9..33216d64be2 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitor.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2021, Google and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/breakpoint01.java b/test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/breakpoint01.java
index 82d4dccd5f7..946d46f7deb 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/breakpoint01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/breakpoint01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ import java.io.*;
  *     SetBreakpoint().
  * COMMENTS
  *
+ * @requires test.thread.factory == null
  * @library /test/lib
  *
  * @comment make sure breakpoint01 is compiled with full debug info
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/classload01.java b/test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/classload01.java
index f163777d1f8..8d8c6a3a1f6 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/classload01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/classload01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,7 @@ import java.io.*;
  * COMMENTS
  *     Fixed the 5031200 bug.
  *
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @compile classload01.java
  * @run main/othervm/native -agentlib:classload01 classload01
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/classprep01.java b/test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/classprep01.java
index eafe06587e2..eda93ded012 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/classprep01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/classprep01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@
  *     Fixed according to the bug 4651181.
  *     Ported from JVMDI.
  *
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @compile classprep01.java
  * @run main/othervm/native -agentlib:classprep01 classprep01
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/mentry02.java b/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/mentry02.java
index bcfb682e749..3df2e28299f 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/mentry02.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/mentry02.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@
  *     The test reproduced the bug on winNT 1.0fcs-E build.
  *     Ported from JVMDI test /nsk/regression/b4248826.
  *
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @compile mentry02.java
  * @run main/othervm/native -agentlib:mentry02 mentry02
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/monitorwaited01.java b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/monitorwaited01.java
index db246c17d8f..b56a0f2b781 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/monitorwaited01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/monitorwaited01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,7 @@ import jdk.test.lib.jvmti.DebugeeClass;
  *       and save JNIEnv pointer now passed as argument.
  *
  * @requires vm.continuations
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @compile monitorwaited01.java
  * @run main/othervm/native -agentlib:monitorwaited01 monitorwaited01 platform
diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/thrinfo02/thrinfo02.java b/test/hotspot/jtreg/serviceability/jvmti/negative/thrinfo02/thrinfo02.java
index 55f60355cfe..fdcbe879d37 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/negative/thrinfo02/thrinfo02.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/negative/thrinfo02/thrinfo02.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@
  * COMMENTS
  *     Ported from JVMDI.
  *
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @run main/othervm/native -agentlib:thrinfo02 thrinfo02
  */
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/thrinfo01.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/thrinfo01.java
index 1b9dd583f6a..385a838f726 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/thrinfo01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/thrinfo01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,7 @@
  *     Fixed according to the 4480280 bug.
  *     Ported from JVMDI.
  *
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @compile thrinfo01.java
  * @run main/othervm/native -agentlib:thrinfo01 thrinfo01
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/BoundVThreadTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/BoundVThreadTest.java
index e1ce4e3d902..1ba3a114317 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/BoundVThreadTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/BoundVThreadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @requires test.thread.factory == null
  * @summary Verifies correct JVMTI behavior for BoundVirtualThreads.
  * @run main/othervm/native -agentlib:BoundVThreadTest -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations BoundVThreadTest
  */
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/ContinuationTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/ContinuationTest.java
index bd7626e7a7e..939eb450d5c 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/ContinuationTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/ContinuationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @summary Verifies JVMTI support for Continuations
  * @requires vm.continuations
+ * @requires test.thread.factory == null
  * @compile ContinuationTest.java
  * @modules java.base/jdk.internal.vm
  * @run main/othervm/native -agentlib:ContinuationTest ContinuationTest
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/FollowReferences/VThreadStackRefTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/FollowReferences/VThreadStackRefTest.java
index 7b8b8e47519..880df734383 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/FollowReferences/VThreadStackRefTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/FollowReferences/VThreadStackRefTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test id=default
  * @requires vm.jvmti
  * @requires vm.continuations
+ * @requires test.thread.factory == null
  * @run main/othervm/native
  *      -Djdk.virtualThreadScheduler.maxPoolSize=1
  *      -agentlib:VThreadStackRefTest
@@ -34,6 +35,7 @@
 /**
  * @test id=no-vmcontinuations
  * @requires vm.jvmti
+ * @requires test.thread.factory == null
  * @run main/othervm/native
  *      -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations
  *      -agentlib:VThreadStackRefTest
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/SelfSuspendDisablerTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/SelfSuspendDisablerTest.java
index 0c447610013..b596a5c7ee2 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/SelfSuspendDisablerTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/SelfSuspendDisablerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test id=default
  * @summary Test verifies that selfsuspend doesn' block unmount by VTMTDisabler
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @compile SelfSuspendDisablerTest.java
  * @run main/othervm/native -agentlib:SelfSuspendDisablerTest SelfSuspendDisablerTest
@@ -32,6 +33,7 @@
 /*
  * @test id=no-vmcontinuations
  * @requires vm.continuations
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @compile SelfSuspendDisablerTest.java
  * @run main/othervm/native -agentlib:SelfSuspendDisablerTest -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations SelfSuspendDisablerTest
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java
index 39f9a1ab2ae..4610516121e 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @summary Test SuspendThread/ResumeThread, SuspendThreadList/ResumeThreadList
  *          for virtual threads.
  * @requires vm.debug != true
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @compile SuspendResume1.java
  * @run driver jdk.test.lib.FileInstaller . .
@@ -38,6 +39,7 @@
 /*
  * @test id=debug
  * @requires vm.debug == true
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @compile SuspendResume1.java
  * @run driver jdk.test.lib.FileInstaller . .
@@ -51,6 +53,7 @@
  /*
  * @test id=no-vmcontinuations
  * @requires vm.continuations
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @compile SuspendResume1.java
  * @run driver jdk.test.lib.FileInstaller . .
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java
index 80dd42c480a..d38391b91dd 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test id=default
  * @summary Test SuspendAllVirtualThreads/ResumeAllVirtualThreads
  * @requires vm.debug != true
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @compile SuspendResume2.java
  * @run driver jdk.test.lib.FileInstaller . .
@@ -37,6 +38,7 @@
 /*
  * @test id=debug
  * @requires vm.debug == true
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @compile SuspendResume2.java
  * @run driver jdk.test.lib.FileInstaller . .
@@ -50,6 +52,7 @@
 /*
  * @test id=no-vmcontinuations
  * @requires vm.continuations
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @compile SuspendResume2.java
  * @run driver jdk.test.lib.FileInstaller . .
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/SuspendResumeAll.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/SuspendResumeAll.java
index 35ea1611453..54fb4f6605f 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/SuspendResumeAll.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/SuspendResumeAll.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test id=default
  * @summary Test SuspendAllVirtualThreads/ResumeAllVirtualThreads
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @compile SuspendResumeAll.java
  * @run driver jdk.test.lib.FileInstaller . .
@@ -36,6 +37,7 @@
 /*
  * @test id=no-vmcontinuations
  * @requires vm.continuations
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @compile SuspendResumeAll.java
  * @run driver jdk.test.lib.FileInstaller . .
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadListStackTracesTest/ThreadListStackTracesTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadListStackTracesTest/ThreadListStackTracesTest.java
index 98695390ef7..079f65620d8 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadListStackTracesTest/ThreadListStackTracesTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadListStackTracesTest/ThreadListStackTracesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,13 @@ abstract class TestTask implements Runnable {
         }
     }
 
+    public void ensureReadyAndWaiting(Thread vt, Thread.State expState, ReentrantLock rlock) {
+        // wait while the thread is not ready or thread state is unexpected
+        while (!threadReady || (vt.getState() != expState) || !rlock.hasQueuedThreads()) {
+            sleep(1);
+        }
+    }
+
     public void ensureReady(Thread vt, Thread.State expState) {
         // wait while the thread is not ready or thread state is unexpected
         while (!threadReady || (vt.getState() != expState)) {
@@ -97,7 +104,7 @@ public class ThreadListStackTracesTest {
         String name = "ReentrantLockTestTask";
         TestTask task = new ReentrantLockTestTask();
         Thread vt = Thread.ofVirtual().name(name).start(task);
-        task.ensureReady(vt, expState);
+        task.ensureReadyAndWaiting(vt, expState, reentrantLock);
         checkStates(vt, expState);
     }
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTLSTest/VThreadTLSTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTLSTest/VThreadTLSTest.java
index 34d480991bb..6bde3846bfc 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTLSTest/VThreadTLSTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTLSTest/VThreadTLSTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @summary Verifies JVMTI GetLocalStorage/SetLocalStorage
  * @requires vm.continuations
  * @requires vm.jvmti
+ * @requires test.thread.factory == null
  * @run main/othervm/native -agentlib:VThreadTLSTest VThreadTLSTest
  */
 
@@ -35,6 +36,7 @@
  * @summary Verifies JVMTI GetLocalStorage/SetLocalStorage
  * @requires vm.continuations
  * @requires vm.jvmti
+ * @requires test.thread.factory == null
  * @run main/othervm/native -Djdk.attach.allowAttachSelf=true -XX:+EnableDynamicAgentLoading VThreadTLSTest attach
  */
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/VThreadTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/VThreadTest.java
index 6b65f0d7574..7330f4c061d 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/VThreadTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/VThreadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @summary Verifies JVMTI support for VThreads.
  * @requires vm.continuations
+ * @requires test.thread.factory == null
  * @compile VThreadTest.java
  * @run main/othervm/native -agentlib:VThreadTest VThreadTest
  */
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/VThreadUnsupportedTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/VThreadUnsupportedTest.java
index 5eb23df9dc4..48840b1f837 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/VThreadUnsupportedTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/VThreadUnsupportedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @summary Verifies that specific JVMTI functions return UNSUPPORTED_OPERATION
  *          or OPAQUE_FRAME if called with virtual threads.
  * @requires vm.continuations
+ * @requires test.thread.factory == null
  * @compile VThreadUnsupportedTest.java
  * @run main/othervm/native -agentlib:VThreadUnsupportedTest VThreadUnsupportedTest
  */
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/WaitNotifySuspendedVThreadTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/WaitNotifySuspendedVThreadTest.java
index 5af72902280..fe169e1fb92 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/WaitNotifySuspendedVThreadTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/WaitNotifySuspendedVThreadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * suspended virtual thread.
  *
  * @requires vm.continuations
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @compile WaitNotifySuspendedVThreadTest.java
  * @run main/othervm/native
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbAttach.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbAttach.java
index a6a56a0c266..57cd535a430 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbAttach.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbAttach.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbAttachDifferentJVMs.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbAttachDifferentJVMs.java
index d897c2f7188..09f90355e67 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbAttachDifferentJVMs.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbAttachDifferentJVMs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbClasses.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbClasses.java
index 8f94ddb56d4..3193f03bbc7 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbClasses.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbClasses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpclass.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpclass.java
index 47a5357bab4..e45318e201d 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpclass.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpclass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbField.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbField.java
index e0e249b7d7f..7dc676f1f3a 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbField.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbFlags.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbFlags.java
index ff3d326dca0..a19f3e1ca16 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbFlags.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbFlags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbHistory.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbHistory.java
index 00e703d00d4..e8416cbadd8 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbHistory.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbHistory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java
index 2ece0942a56..e7531226d2d 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbJdis.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbJdis.java
index 6cfeacd9139..756e45f68aa 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbJdis.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbJdis.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbJhisto.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbJhisto.java
index da192b39c1e..ef30a97a026 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbJhisto.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbJhisto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbJstack.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbJstack.java
index d3fec454e40..411664f195d 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbJstack.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbJstack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAll.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAll.java
index 2c74eab945e..ac5ddf774e1 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAll.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAll.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAs.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAs.java
index 4c1ff20952a..03ce8cd3048 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAs.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java
index cd5b1206ce9..15d88400917 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbScanOops.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbScanOops.java
index ef75b08c995..3b2aefec664 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbScanOops.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbScanOops.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbSource.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbSource.java
index 732fb7bf174..c66e44aa213 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbSource.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java
index c4031c31aa6..fe26427d6ce 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbTestAllocationMerge.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbTestAllocationMerge.java
index ca52fcd156a..d076e648d90 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbTestAllocationMerge.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbTestAllocationMerge.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbThread.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbThread.java
index 460af71bd0d..f72b51585f5 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbThread.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbVmStructsDump.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbVmStructsDump.java
index 1fee2b8762b..21db0e867a4 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbVmStructsDump.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbVmStructsDump.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbWhere.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbWhere.java
index fb12fe896a1..4536d568212 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbWhere.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbWhere.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/DeadlockDetectionTest.java b/test/hotspot/jtreg/serviceability/sa/DeadlockDetectionTest.java
index c21cd840f2a..cf9c4dfc5a1 100644
--- a/test/hotspot/jtreg/serviceability/sa/DeadlockDetectionTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/DeadlockDetectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestClassDump.java b/test/hotspot/jtreg/serviceability/sa/TestClassDump.java
index 793c4e1d2d7..c163d45e0ba 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestClassDump.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestClassDump.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java b/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java
index acca1827b3c..a0a1051beca 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestCpoolForInvokeDynamic.java b/test/hotspot/jtreg/serviceability/sa/TestCpoolForInvokeDynamic.java
index bb66b388924..b1f2148954c 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestCpoolForInvokeDynamic.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestCpoolForInvokeDynamic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestDebugInfoDecode.java b/test/hotspot/jtreg/serviceability/sa/TestDebugInfoDecode.java
index 108eb440d36..eb59f6f9487 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestDebugInfoDecode.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestDebugInfoDecode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestDefaultMethods.java b/test/hotspot/jtreg/serviceability/sa/TestDefaultMethods.java
index 173ade9c38f..3bbb6fcdf35 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestDefaultMethods.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestDefaultMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java b/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java
index 1a719192fe9..32cc80aeb69 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForInvokeDynamic.java b/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForInvokeDynamic.java
index bd6f7b55166..418dc5ec5a0 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForInvokeDynamic.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForInvokeDynamic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSize.java b/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSize.java
index 5486dd0a203..3dbfbecda73 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSize.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSizeForInterface.java b/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSizeForInterface.java
index 95d98e3cb83..a462ee30fb2 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSizeForInterface.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSizeForInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestIntConstant.java b/test/hotspot/jtreg/serviceability/sa/TestIntConstant.java
index 16b41913e39..2b41394b7a5 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestIntConstant.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestIntConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixed.java b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixed.java
index 739a0a358aa..b02d3f3aef3 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixed.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackPrintVMLocks.java b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackPrintVMLocks.java
index b7f3a78ef02..b7b3c956441 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackPrintVMLocks.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackPrintVMLocks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackUpcall.java b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackUpcall.java
index 046842aca46..1873672d2ce 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackUpcall.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackUpcall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java b/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java
index 9e266e67119..77258bd45b7 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJmapCoreMetaspace.java b/test/hotspot/jtreg/serviceability/sa/TestJmapCoreMetaspace.java
index 6fc04c8de74..ec3c66476a6 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJmapCoreMetaspace.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJmapCoreMetaspace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestObjectMonitorIterate.java b/test/hotspot/jtreg/serviceability/sa/TestObjectMonitorIterate.java
index d4852750fd8..86a00285ee4 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestObjectMonitorIterate.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestObjectMonitorIterate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, NTT DATA.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/hotspot/jtreg/serviceability/sa/TestPrintMdo.java b/test/hotspot/jtreg/serviceability/sa/TestPrintMdo.java
index 9055884bec0..7292d797740 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestPrintMdo.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestPrintMdo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestSysProps.java b/test/hotspot/jtreg/serviceability/sa/TestSysProps.java
index 3d613c6d8ee..a591d009ecf 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestSysProps.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestSysProps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/TestType.java b/test/hotspot/jtreg/serviceability/sa/TestType.java
index d0eb1ab4337..c3326032b90 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestType.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/UniqueVtableTest.java b/test/hotspot/jtreg/serviceability/sa/UniqueVtableTest.java
index d7d5ce6402e..774fcee50ed 100644
--- a/test/hotspot/jtreg/serviceability/sa/UniqueVtableTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/UniqueVtableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java b/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
index 640c755880e..a41ab71f4fa 100644
--- a/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/sadebugd/ClhsdbAttachToDebugServer.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/ClhsdbAttachToDebugServer.java
index 269d19c1e01..57962e72c5c 100644
--- a/test/hotspot/jtreg/serviceability/sa/sadebugd/ClhsdbAttachToDebugServer.java
+++ b/test/hotspot/jtreg/serviceability/sa/sadebugd/ClhsdbAttachToDebugServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021 NTT DATA.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/hotspot/jtreg/serviceability/sa/sadebugd/ClhsdbTestConnectArgument.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/ClhsdbTestConnectArgument.java
index 2fea5e46e47..109afa21841 100644
--- a/test/hotspot/jtreg/serviceability/sa/sadebugd/ClhsdbTestConnectArgument.java
+++ b/test/hotspot/jtreg/serviceability/sa/sadebugd/ClhsdbTestConnectArgument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021 NTT DATA.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/hotspot/jtreg/serviceability/sa/sadebugd/DebugdConnectTest.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/DebugdConnectTest.java
index a467824e31a..285f57f8115 100644
--- a/test/hotspot/jtreg/serviceability/sa/sadebugd/DebugdConnectTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/sadebugd/DebugdConnectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/serviceability/sa/sadebugd/DisableRegistryTest.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/DisableRegistryTest.java
index af2b6e9b23c..ae0774988a8 100644
--- a/test/hotspot/jtreg/serviceability/sa/sadebugd/DisableRegistryTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/sadebugd/DisableRegistryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021 NTT DATA.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/hotspot/jtreg/sources/TestIncludesAreSorted.java b/test/hotspot/jtreg/sources/TestIncludesAreSorted.java
index e0e77992ace..f8694da6c5a 100644
--- a/test/hotspot/jtreg/sources/TestIncludesAreSorted.java
+++ b/test/hotspot/jtreg/sources/TestIncludesAreSorted.java
@@ -24,6 +24,8 @@
 /*
  * @test
  * @bug 8343802
+ * @comment Only need to run this once, in tier1.
+ * @requires vm.flagless & vm.debug
  * @summary Tests that HotSpot C++ files have sorted includes
  * @build SortIncludes
  * @run main TestIncludesAreSorted
diff --git a/test/hotspot/jtreg/sources/TestNoNULL.java b/test/hotspot/jtreg/sources/TestNoNULL.java
index 9c993572aea..b914ea6c799 100644
--- a/test/hotspot/jtreg/sources/TestNoNULL.java
+++ b/test/hotspot/jtreg/sources/TestNoNULL.java
@@ -24,6 +24,8 @@
 /*
  * @test
  * @bug 8343802
+ * @comment Only need to run this once, in tier1.
+ * @requires vm.flagless & vm.debug
  * @summary Test prevent NULL backsliding in hotspot code and tests
  * @run main TestNoNULL
  */
diff --git a/test/hotspot/jtreg/testlibrary/ctw/Makefile b/test/hotspot/jtreg/testlibrary/ctw/Makefile
index ea133f97621..728b63c0e73 100644
--- a/test/hotspot/jtreg/testlibrary/ctw/Makefile
+++ b/test/hotspot/jtreg/testlibrary/ctw/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java
index 0ff9cae8169..f2b274281ff 100644
--- a/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java
+++ b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/PathHandler.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/PathHandler.java
index a31098a055c..9c6e769cfc2 100644
--- a/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/PathHandler.java
+++ b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/PathHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java
index 592dcff23c9..67c17e153f8 100644
--- a/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java
+++ b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java
index a33aacd924e..200866375af 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRFindFromAbove.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRFindFromAbove.java
new file mode 100644
index 00000000000..23e46428460
--- /dev/null
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRFindFromAbove.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package ir_framework.tests;
+
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8373355
+ * @summary Test that IR matching happens on the whole graph, not just nodes
+ *          that can be found by traversing up from the Root.
+ * @library /test/lib /
+ * @run main ${test.main.class}
+ */
+
+public class TestIRFindFromAbove {
+    public static boolean flag = false;
+    public static int fld = 0;
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Test
+    @Warmup(0)
+    // Simulate Xcomp with no warmup: ensure the flag branch is not an unstable if
+    // but that we compile the infinite loop.
+    @IR(counts = {IRNode.LOAD_I, "1", IRNode.STORE_I, "1", ".*NeverBranch.*", "0"},
+        phase = CompilePhase.ITER_GVN1)
+    @IR(counts = {IRNode.LOAD_I, "1", IRNode.STORE_I, "1", ".*NeverBranch.*", "1"},
+        phase = CompilePhase.PHASEIDEALLOOP1)
+    public static void test() {
+        if (flag) {
+            // This loop has no exit. So it is at first not connected down to Root.
+            while (true) {
+                // During PHASEIDEALLOOP1, we insert a NeverBranch here, with a fake
+                // exit, that connects the loop down to Root.
+                fld++; // LoadI and StoreI
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/flag/TestCompilePhaseCollector.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/flag/TestCompilePhaseCollector.java
index acb900fbdc0..0098929eed7 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/flag/TestCompilePhaseCollector.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/flag/TestCompilePhaseCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestExpressions.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestExpressions.java
index 6a0a2d3786a..4bec633553b 100644
--- a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestExpressions.java
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestExpressions.java
@@ -23,12 +23,13 @@
 
 /*
  * @test
- * @bug 8359412
+ * @bug 8359412 8370922
  * @summary Demonstrate the use of Expressions from the Template Library.
  * @modules java.base/jdk.internal.misc
+ * @modules jdk.incubator.vector
  * @library /test/lib /
  * @compile ../../../compiler/lib/verify/Verify.java
- * @run main template_framework.examples.TestExpressions
+ * @run main ${test.main.class}
  */
 
 package template_framework.examples;
@@ -55,10 +56,14 @@ public class TestExpressions {
         comp.addJavaSourceCode("p.xyz.InnerTest", generate(comp));
 
         // Compile the source file.
-        comp.compile();
+        comp.compile("--add-modules=jdk.incubator.vector");
 
         // p.xyz.InnterTest.main(new String[] {});
-        comp.invoke("p.xyz.InnerTest", "main", new Object[] {new String[] {}});
+        comp.invoke("p.xyz.InnerTest", "main", new Object[] {new String[] {
+            "--add-modules=jdk.incubator.vector",
+            "--add-opens", "jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED",
+            "--add-opens", "java.base/java.lang=ALL-UNNAMED"
+        }});
     }
 
     // Generate a Java source file as String
@@ -121,7 +126,7 @@ public class TestExpressions {
             );
         });
 
-        for (Expression operation : Operations.PRIMITIVE_OPERATIONS) {
+        for (Expression operation : Operations.SCALAR_NUMERIC_OPERATIONS) {
             tests.add(withConstantsTemplate.asToken(operation));
         }
 
@@ -130,7 +135,7 @@ public class TestExpressions {
             // package and class name.
             "p.xyz", "InnerTest",
             // Set of imports.
-            Set.of("compiler.lib.verify.*"),
+            Set.of("compiler.lib.verify.*", "jdk.incubator.vector.Float16"),
             // classpath, so the Test VM has access to the compiled class files.
             comp.getEscapedClassPathOfCompiledClasses(),
             // The list of tests.
diff --git a/test/hotspot/jtreg/testlibrary_tests/verify/tests/TestVerify.java b/test/hotspot/jtreg/testlibrary_tests/verify/tests/TestVerify.java
index 34cff79dd6e..a198a7ed543 100644
--- a/test/hotspot/jtreg/testlibrary_tests/verify/tests/TestVerify.java
+++ b/test/hotspot/jtreg/testlibrary_tests/verify/tests/TestVerify.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,10 @@
 
 /*
  * @test
- * @summary Test functionality of IntGenerator implementations.
+ * @summary Test basic functionality of Verify implementations.
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /
- * @run driver verify.tests.TestVerify
+ * @run driver ${test.main.class}
  */
 
 package verify.tests;
diff --git a/test/hotspot/jtreg/testlibrary_tests/verify/tests/TestVerifyFloat16.java b/test/hotspot/jtreg/testlibrary_tests/verify/tests/TestVerifyFloat16.java
new file mode 100644
index 00000000000..8d1d763a250
--- /dev/null
+++ b/test/hotspot/jtreg/testlibrary_tests/verify/tests/TestVerifyFloat16.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @key randomness
+ * @summary Test functionality of Verify implementations for Float16.
+ * @modules jdk.incubator.vector
+ * @library /test/lib /
+ * @run driver ${test.main.class}
+ */
+
+package verify.tests;
+
+import java.lang.foreign.*;
+import java.util.Random;
+import jdk.test.lib.Utils;
+
+import jdk.incubator.vector.Float16;
+
+import compiler.lib.verify.*;
+
+public class TestVerifyFloat16 {
+    private static final Random RANDOM = Utils.getRandomInstance();
+
+    public static void main(String[] args) {
+        testArrayFloat16();
+        testRawFloat16();
+        testFloat16Random();
+    }
+
+    public static void testArrayFloat16() {
+        Float16[] a = new Float16[1000];
+        Float16[] b = new Float16[1001];
+        Float16[] c = new Float16[1000];
+
+        Verify.checkEQ(a, a);
+        Verify.checkEQ(b, b);
+        Verify.checkEQ(a, c);
+        Verify.checkEQ(c, a);
+
+        // Size mismatch
+        checkNE(a, b);
+
+        c[RANDOM.nextInt(c.length)] = Float16.valueOf(1f);
+
+        // Value mismatch
+        checkNE(a, c);
+    }
+
+    public static void testRawFloat16() {
+        Float16 nan1 = Float16.shortBitsToFloat16((short)0xFFFF);
+        Float16 nan2 = Float16.shortBitsToFloat16((short)0x7FFF);
+        if (!Float16.isNaN(nan1)) { throw new RuntimeException("must be NaN"); }
+        if (!Float16.isNaN(nan2)) { throw new RuntimeException("must be NaN"); }
+        if (Float16.float16ToRawShortBits(nan1) != (short)0xFFFF) { throw new RuntimeException("wrong bits"); }
+        if (Float16.float16ToRawShortBits(nan2) != (short)0x7FFF) { throw new RuntimeException("wrong bits"); }
+
+        Float16[] arr1 = new Float16[]{nan1};
+        Float16[] arr2 = new Float16[]{nan2};
+
+        Verify.checkEQ(nan1, Float16.NaN);
+        Verify.checkEQ(nan1, nan1);
+        Verify.checkEQWithRawBits(nan1, nan1);
+        Verify.checkEQ(nan1, nan2);
+
+        Verify.checkEQ(arr1, arr1);
+        Verify.checkEQWithRawBits(arr1, arr1);
+        Verify.checkEQ(arr1, arr2);
+
+        checkNEWithRawBits(nan1, nan2);
+
+        checkNEWithRawBits(arr1, arr2);
+    }
+
+    public static void testFloat16Random() {
+        // Testing all 2^16 * 2^16 = 2^32 would take a bit long, so we randomly sample instead.
+        for (int i = 0; i < 10_000; i++) {
+            short bitsA = (short)RANDOM.nextInt();
+            short bitsB = (short)RANDOM.nextInt();
+            Float16 a = Float16.shortBitsToFloat16(bitsA);
+            Float16 b = Float16.shortBitsToFloat16(bitsB);
+            if (bitsA == bitsB) {
+                Verify.checkEQWithRawBits(a, b);
+            } else {
+                checkNEWithRawBits(a, b);
+            }
+            if (a.equals(b)) {
+                Verify.checkEQ(a, b);
+            } else {
+                checkNE(a, b);
+            }
+        }
+    }
+
+    public static void checkNE(Object a, Object b) {
+         try {
+            Verify.checkEQ(a, b);
+            throw new RuntimeException("Should have thrown: " + a + " vs " + b);
+        } catch (VerifyException e) {}
+    }
+
+    public static void checkNEWithRawBits(Object a, Object b) {
+         try {
+            Verify.checkEQWithRawBits(a, b);
+            throw new RuntimeException("Should have thrown: " + a + " vs " + b);
+        } catch (VerifyException e) {}
+    }
+}
diff --git a/test/hotspot/jtreg/vmTestbase/gc/vector/LinearListLow/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/vector/LinearListLow/TestDescription.java
index 8ae86af035d..ef34b30d55f 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/vector/LinearListLow/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/vector/LinearListLow/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/vmTestbase/jit/removal_candidates.txt b/test/hotspot/jtreg/vmTestbase/jit/removal_candidates.txt
index f1df1ecee05..3bb93267d84 100644
--- a/test/hotspot/jtreg/vmTestbase/jit/removal_candidates.txt
+++ b/test/hotspot/jtreg/vmTestbase/jit/removal_candidates.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
 This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java
index eee6a8442b6..eab4dd6798b 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach010/attach010Agent00.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach010/attach010Agent00.java
index 877c1e3862e..c762893a333 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach010/attach010Agent00.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach010/attach010Agent00.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp
index df67828d28b..885757a817e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp
index 2c6a186656e..4f919f58188 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters001/CollectionCounters001.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters001/CollectionCounters001.java
index f256a5649e5..7c089abb6ec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters001/CollectionCounters001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters001/CollectionCounters001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,13 @@
  * @summary converted from VM Testbase nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters001.
  * VM Testbase keywords: [monitoring]
  *
+ * @requires vm.opt.DisableExplicitGC != "true"
  * @library /vmTestbase
  *          /test/lib
- * @run main/othervm
+ * @run main/othervm -XX:-UseGCOverheadLimit
  *      nsk.monitoring.GarbageCollectorMXBean.CollectionCounters.CollectionCounters001.CollectionCounters001
  *      -testMode=directly
+ *      -iterations=5
  */
 
 package nsk.monitoring.GarbageCollectorMXBean.CollectionCounters.CollectionCounters001;
@@ -60,6 +62,7 @@ import nsk.share.runner.RunParamsAware;
  * time. It may be false with -XX:+DisableExplicitGC.
  */
 public class CollectionCounters001 extends MonitoringTestBase implements RunParamsAware, Initializable {
+
         private List<GarbageCollectorMXBean> gcBeans;
         private MemoryMXBean memory;
         Stresser stresser;
@@ -76,48 +79,42 @@ public class CollectionCounters001 extends MonitoringTestBase implements RunPara
 
         private void runOne(ExecutionController stresser) {
                 updateCounters();
-                validate();
+                validate(false /* don't check gc count increases */);
                 Algorithms.eatMemory(stresser);
-                        if(stresser.continueExecution()) {
-                    updateCounters();
-                    validateNonTrivial();
-                    System.gc();
-                    updateCounters();
-                    validateNonTrivial();
-                    memory.gc();
-                    updateCounters();
-                    validateNonTrivial();
-                        }
+                updateCounters();
+                validate(true);
+                System.gc();
+                updateCounters();
+                validate(true);
+                memory.gc();
+                updateCounters();
+                validate(true);
         }
 
         public void run() {
                 stresser = new Stresser(runParams.getStressOptions());
                 stresser.start(runParams.getIterations());
-                while (stresser.iteration()) {
+                do {
+                    System.out.println("=========== stresser iter: " + (stresser.getIteration()) + " ===========");
                     runOne(stresser);
-                }
+                } while (stresser.iteration());
         }
 
-        private void validate() {
+
+        private void validate(boolean gcCountMustIncrease) {
                 if (collectionCount < 0)
-                        throw new TestFailure("collectionCount negative: " + collectionCount);
+                    throw new TestFailure("collectionCount negative: " + collectionCount);
                 if (collectionTime < 0)
-                        throw new TestFailure("collectionTime negative: " + collectionTime);
-                if (collectionCount < collectionCountOld)
+                    throw new TestFailure("collectionTime negative: " + collectionTime);
+                if (collectionTime < collectionTimeOld)
+                    throw new TestFailure("collectionTime decreased: " + collectionTime + " -> " + collectionTimeOld);
+                if (!gcCountMustIncrease) {
+                    if (collectionCount < collectionCountOld)
                         throw new TestFailure("collectionCount decreased: " + collectionCount + " -> " + collectionCountOld);
-                if (collectionTime < collectionTimeOld)
-                        throw new TestFailure("collectionTime decreased: " + collectionTime + " -> " + collectionTimeOld);
-        }
-
-        private void validateNonTrivial() {
-                if (collectionCount < 0)
-                        throw new TestFailure("collectionCount negative: " + collectionCount);
-                if (collectionTime < 0)
-                        throw new TestFailure("collectionTime negative: " + collectionTime);
-                if (collectionCount <= collectionCountOld)
+                } else {
+                    if (collectionCount <= collectionCountOld)
                         throw new TestFailure("collectionCount not increased: " + collectionCount + " -> " + collectionCountOld);
-                if (collectionTime < collectionTimeOld)
-                        throw new TestFailure("collection time became smaller: " + collectionTime + " -> " + collectionTimeOld);
+                }
         }
 
         private void updateCounters() {
@@ -126,8 +123,8 @@ public class CollectionCounters001 extends MonitoringTestBase implements RunPara
                 collectionCount = 0;
                 collectionTime = 0;
                 for (GarbageCollectorMXBean gcBean : gcBeans) {
-                        collectionCount += gcBean.getCollectionCount();
-                        collectionTime += gcBean.getCollectionTime();
+                    collectionCount += gcBean.getCollectionCount();
+                    collectionTime += gcBean.getCollectionTime();
                 }
         }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters002/TestDescription.java
index 9bfbf141d31..51abb4e7a0b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters002/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,13 @@
  * @summary converted from VM Testbase nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters002.
  * VM Testbase keywords: [monitoring]
  *
+ * @requires vm.opt.DisableExplicitGC != "true"
  * @library /vmTestbase
  *          /test/lib
- * @run main/othervm
+ * @run main/othervm -XX:-UseGCOverheadLimit
  *      nsk.monitoring.GarbageCollectorMXBean.CollectionCounters.CollectionCounters001.CollectionCounters001
  *      -testMode=server
  *      -MBeanServer=default
+ *      -iterations=5
  */
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters003/TestDescription.java
index 3524cfd66db..20e266f50f1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters003/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,13 @@
  * @summary converted from VM Testbase nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters003.
  * VM Testbase keywords: [monitoring]
  *
+ * @requires vm.opt.DisableExplicitGC != "true"
  * @library /vmTestbase
  *          /test/lib
- * @run main/othervm
+ * @run main/othervm -XX:-UseGCOverheadLimit
  *      nsk.monitoring.GarbageCollectorMXBean.CollectionCounters.CollectionCounters001.CollectionCounters001
  *      -testMode=server
  *      -MBeanServer=custom
+ *      -iterations=5
  */
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters004/TestDescription.java
index b215e633464..db5a04cede8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters004/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,13 @@
  * @summary converted from VM Testbase nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters004.
  * VM Testbase keywords: [monitoring]
  *
+ * @requires vm.opt.DisableExplicitGC != "true"
  * @library /vmTestbase
  *          /test/lib
- * @run main/othervm
+ * @run main/othervm -XX:-UseGCOverheadLimit
  *      nsk.monitoring.GarbageCollectorMXBean.CollectionCounters.CollectionCounters001.CollectionCounters001
  *      -testMode=proxy
  *      -MBeanServer=default
+ *      -iterations=5
  */
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters005/TestDescription.java
index 63cccf1c268..68c50f026b7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters005/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,13 @@
  * @summary converted from VM Testbase nsk/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters005.
  * VM Testbase keywords: [monitoring]
  *
+ * @requires vm.opt.DisableExplicitGC != "true"
  * @library /vmTestbase
  *          /test/lib
- * @run main/othervm
+ * @run main/othervm -XX:-UseGCOverheadLimit
  *      nsk.monitoring.GarbageCollectorMXBean.CollectionCounters.CollectionCounters001.CollectionCounters001
  *      -testMode=proxy
  *      -MBeanServer=custom
+ *      -iterations=5
  */
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded001.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded001.java
index 5fbb4d2444e..2e9310749d3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/server/ServerMemoryMXBean.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/server/ServerMemoryMXBean.java
index 31050b6b8bb..46a7873999c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/server/ServerMemoryMXBean.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/server/ServerMemoryMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/GC.java b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/GC.java
index 15bbc9eb964..92e9194360f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/GC.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/GC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/TestDebuggerType1.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/TestDebuggerType1.java
index 78cfb9e8bba..8c9f9165fb7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/TestDebuggerType1.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/TestDebuggerType1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp
index b47be9bb74a..1d80748e7e0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/runner/RunParams.java b/test/hotspot/jtreg/vmTestbase/nsk/share/runner/RunParams.java
index e627816a6fc..7e4a4f90f79 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/runner/RunParams.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/runner/RunParams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -221,8 +221,13 @@ public class RunParams {
                                 numberOfThreads = Integer.parseInt(args[++i]);
                         else if (args[i].equals("-it"))
                                 interruptThreads = true;
-                        else if (args[i].equals("-iterations"))
+                        else if (args[i].equals("-iterations")) {
+                                // e.g. "-iterations 3"
                                 iterations = Integer.parseInt(args[++i]);
+                        } else if (args[i].startsWith("-iterations=")) {
+                                // e.g. "-iterations=3"
+                                iterations = Integer.parseInt(args[i].substring(12));
+                        }
                 }
                 // Allow to force using vthreads using wrapper property
                 if ("Virtual".equals(System.getProperty("test.thread.factory"))) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/runner/ThreadsRunner.java b/test/hotspot/jtreg/vmTestbase/nsk/share/runner/ThreadsRunner.java
index 39e7e2c2237..98481fdf87e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/runner/ThreadsRunner.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/runner/ThreadsRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/test/Stresser.java b/test/hotspot/jtreg/vmTestbase/nsk/share/test/Stresser.java
index c2851267911..81f1eef18cf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/test/Stresser.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/test/Stresser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress007.cpp
index 8b3a0d41b1d..9af6c68148d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress007.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/JniArmHFTestGenerator.java.txt b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/JniArmHFTestGenerator.java.txt
index 91d5129f1eb..3b2ddaf4356 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/JniArmHFTestGenerator.java.txt
+++ b/test/hotspot/jtreg/vmTestbase/vm/jit/LongTransitions/JniArmHFTestGenerator.java.txt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/ValidationTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/ValidationTest.java
index 198196a6d13..16e6c9e9046 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/ValidationTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/ValidationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/ProblemList-AotJdk.txt b/test/jdk/ProblemList-AotJdk.txt
index b0737126534..20960652dcf 100644
--- a/test/jdk/ProblemList-AotJdk.txt
+++ b/test/jdk/ProblemList-AotJdk.txt
@@ -39,6 +39,8 @@ java/lang/module/ModuleDescriptorHashCodeTest.java              0000000 generic-
 # parameters will always cause the class java/lang/invoke/MethodHandleStatics to be initialized
 java/lang/invoke/DumpMethodHandleInternals.java                 0000000 generic-all
 
-# The test uses "--add-modules jdk.internal.le" during production.
-# So the test is incompatible with AOT_JDK testing because because all runs must have consistent module options on the command line.
-java/lang/IO/IO.java                                           0000000 generic-all
+# This test checks for a warning message that's already printed by
+# sun.util.locale.BaseLocale.<clinit> during the training run. Because BaseLocale is aot-initialized,
+# this message will not be printed in the production run.
+java/util/Locale/UseOldISOCodesTest.java                       0000000 generic-all
+
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 0076b1cf891..addcc8830af 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -150,8 +150,8 @@ java/awt/EventQueue/PushPopDeadlock/PushPopDeadlock.java 8024034 generic-all
 java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java 7080150 macosx-all
 java/awt/event/InputEvent/EventWhenTest/EventWhenTest.java 8168646 generic-all
 java/awt/List/KeyEventsTest/KeyEventsTest.java 8201307 linux-all
+java/awt/List/NoEvents/ProgrammaticChange.java 8201307 linux-all
 java/awt/Paint/ListRepaint.java 8201307 linux-all
-java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java 8049405 macosx-all
 java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java 8370584 windows-x64
 java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java 8048171 generic-all
 java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java 8159451 linux-all,windows-all,macosx-all
@@ -160,33 +160,7 @@ java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java 6986109 windows-al
 java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java 8049405 generic-all
 java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java 8049405 macosx-all
 java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java 8049405 macosx-all
-java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JListOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java 8158801,8357360 windows-all,linux-all
-java/awt/Mixing/AWT_Mixing/JTableOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java 8158801 windows-all
-java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java 8158801 windows-all
+java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java 8357360 windows-all,linux-all
 java/awt/Mixing/NonOpaqueInternalFrame.java 7124549 macosx-all
 java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java 6829264 generic-all
 java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java 8080982 generic-all
@@ -640,19 +614,9 @@ sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java            8316183 linux-pp
 ############################################################################
 
 # jdk_sound
-javax/sound/sampled/DirectAudio/bug6372428.java                      8055097 generic-all
-javax/sound/sampled/Clip/bug5070081.java                             8055097 generic-all
-javax/sound/sampled/DataLine/LongFramePosition.java                  8055097 generic-all
 
 javax/sound/sampled/Clip/Drain/ClipDrain.java          7062792 generic-all
 
-javax/sound/sampled/Mixers/DisabledAssertionCrash.java 7067310 generic-all
-
-javax/sound/midi/Sequencer/Recording.java 8167580,8265485 linux-all,macosx-aarch64
-javax/sound/midi/Sequencer/Looping.java 8136897 generic-all
-javax/sound/sampled/Clip/ClipIsRunningAfterStop.java 8307574 linux-x64
-javax/sound/sampled/Clip/ClipFlushCrash.java 8308395 linux-x64
-
 ############################################################################
 
 # jdk_imageio
@@ -781,7 +745,6 @@ java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_1.java 7131438,802
 java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_2.java 7131438,8022539 generic-all
 java/awt/Modal/WsDisabledStyle/CloseBlocker/CloseBlocker.java 7187741 linux-all,macosx-all
 java/awt/xembed/server/TestXEmbedServerJava.java 8001150,8004031 generic-all
-java/awt/Modal/PrintDialogsTest/PrintDialogsTest.java 8068378 generic-all
 java/awt/image/VolatileImage/VolatileImageConfigurationTest.java 8171069 macosx-all,linux-all
 java/awt/Modal/InvisibleParentTest/InvisibleParentTest.java 8172245 linux-all
 java/awt/Frame/FrameStateTest/FrameStateTest.java 8203920 macosx-all,linux-all
@@ -817,4 +780,3 @@ java/awt/Cursor/CursorDragTest/ListDragCursor.java 7177297 macosx-all
 # jdk_since_checks
 
 tools/sincechecker/modules/jdk.management.jfr/JdkManagementJfrCheckSince.java 8354921 generic-all
-tools/sincechecker/modules/java.base/JavaBaseCheckSince.java 8372801 generic-all
diff --git a/test/jdk/com/sun/jdi/AfterThreadDeathTest.java b/test/jdk/com/sun/jdi/AfterThreadDeathTest.java
index 27904021442..25987de864c 100644
--- a/test/jdk/com/sun/jdi/AfterThreadDeathTest.java
+++ b/test/jdk/com/sun/jdi/AfterThreadDeathTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,6 +93,7 @@ public class AfterThreadDeathTest extends TestScaffold {
                 println("Ok; got expected IllegalThreadStateException");
                 return;
             } catch (Exception ee) {
+                ee.printStackTrace(System.err);
                 failure("FAILED: Did not get expected"
                       + " IllegalThreadStateException"
                       + " on a StepRequest.enable().  \n"
@@ -133,6 +134,13 @@ public class AfterThreadDeathTest extends TestScaffold {
         mainThread = bpe.thread();
         erm = vm().eventRequestManager();
 
+        /*
+         * The "main" thread will be referenced during the ThreadDeathEvent, which
+         * uses SUSPEND_NONE, so the thread might get gc'd and cause an unexpected
+         * ObjectCollectedException. Disable it from collection to prevent problems.
+         */
+        mainThread.disableCollection();
+
         /*
          * Set event requests
          */
diff --git a/test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java b/test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java
index 294e0f5f1a8..b47433ca16f 100644
--- a/test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java
+++ b/test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java
@@ -35,6 +35,8 @@ import org.testng.annotations.Test;
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.directory.InitialDirContext;
+
+import java.net.SocketTimeoutException;
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
@@ -82,14 +84,10 @@ public class LdapPoolTimeoutTest {
         env.put(Context.PROVIDER_URL, "ldap://example.com:1234");
 
         try {
-            futures.add(executorService.submit(() -> { attemptConnect(env); return null; }));
-            futures.add(executorService.submit(() -> { attemptConnect(env); return null; }));
-            futures.add(executorService.submit(() -> { attemptConnect(env); return null; }));
-            futures.add(executorService.submit(() -> { attemptConnect(env); return null; }));
-            futures.add(executorService.submit(() -> { attemptConnect(env); return null; }));
-            futures.add(executorService.submit(() -> { attemptConnect(env); return null; }));
-            futures.add(executorService.submit(() -> { attemptConnect(env); return null; }));
-            futures.add(executorService.submit(() -> { attemptConnect(env); return null; }));
+            // launch a few concurrent connection attempts
+            for (int i = 0; i < 8; i++) {
+                futures.add(executorService.submit(() -> { attemptConnect(env); return null; }));
+            }
         } finally {
             executorService.shutdown();
         }
@@ -109,38 +107,55 @@ public class LdapPoolTimeoutTest {
 
     private static void attemptConnect(Hashtable<Object, Object> env) throws Exception {
         try {
-            LdapTimeoutTest.assertCompletion(CONNECT_MILLIS - 1000,
-                   2 * CONNECT_MILLIS + TOLERANCE,
-                   () -> new InitialDirContext(env));
-        } catch (RuntimeException e) {
-            final String msg = e.getCause() == null ? e.getMessage() : e.getCause().getMessage();
-            // assertCompletion may wrap a CommunicationException in an RTE
-            if (msg != null &&
-                    (msg.contains("Network is unreachable")
-                            || msg.contains("No route to host")
-                            || msg.contains("Connection timed out"))) {
-                // got the expected exception
-                System.out.println("Received expected RuntimeException message: " + msg);
-            } else {
-                // propagate the unexpected exception
-                throw e;
-            }
-        } catch (NamingException ex) {
-            final String msg = ex.getCause() == null ? ex.getMessage() : ex.getCause().getMessage();
-            if (msg != null &&
-                    (msg.contains("Network is unreachable")
-                        || msg.contains("Timed out waiting for lock")
-                        || msg.contains("Connect timed out")
-                        || msg.contains("Timeout exceeded while waiting for a connection"))) {
-                // got the expected exception
-                System.out.println("Received expected NamingException message: " + msg);
-            } else {
-                // propagate the unexpected exception
-                throw ex;
-            }
+            final InitialDirContext unexpectedCtx =
+                    LdapTimeoutTest.assertCompletion(CONNECT_MILLIS - 1000,
+                            2 * CONNECT_MILLIS + TOLERANCE,
+                            () -> new InitialDirContext(env));
+            throw new RuntimeException("InitialDirContext construction was expected to fail," +
+                    " but returned " + unexpectedCtx);
         } catch (Throwable t) {
-            throw new RuntimeException(t);
+            final NamingException namingEx = findNamingException(t);
+            if (namingEx != null) {
+                // found the NamingException, verify it's the right reason
+                if (namingEx.getCause() instanceof SocketTimeoutException ste) {
+                    // got the expected exception
+                    System.out.println("Received expected SocketTimeoutException: " + ste);
+                    return;
+                }
+                // rely on the exception message to verify the expected exception
+                final String msg = namingEx.getCause() == null
+                        ? namingEx.getMessage()
+                        : namingEx.getCause().getMessage();
+                if (msg != null &&
+                        (msg.contains("Network is unreachable")
+                                || msg.contains("No route to host")
+                                || msg.contains("Timed out waiting for lock")
+                                || msg.contains("Connect timed out")
+                                || msg.contains("Timeout exceeded while waiting for a connection"))) {
+                    // got the expected exception
+                    System.out.println("Received expected NamingException with message: " + msg);
+                    return;
+                }
+            }
+            // unexpected exception, propagate it
+            if (t instanceof Exception e) {
+                throw e;
+            } else {
+                throw new Exception(t);
+            }
         }
     }
 
+    // Find and return the NamingException from the given Throwable. Returns null if none found.
+    private static NamingException findNamingException(final Throwable t) {
+        Throwable cause = t;
+        while (cause != null) {
+            if (cause instanceof NamingException ne) {
+                return ne;
+            }
+            cause = cause.getCause();
+        }
+        return null;
+    }
+
 }
diff --git a/test/jdk/com/sun/net/httpserver/BasicAuthenticatorRealm.java b/test/jdk/com/sun/net/httpserver/BasicAuthenticatorRealm.java
index 06248e950a5..85e4f93b5c9 100644
--- a/test/jdk/com/sun/net/httpserver/BasicAuthenticatorRealm.java
+++ b/test/jdk/com/sun/net/httpserver/BasicAuthenticatorRealm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  *           with HttpURLConnection and HttpClient
  * @modules jdk.httpserver
  * @library /test/lib
- * @run testng/othervm BasicAuthenticatorRealm
+ * @run junit/othervm BasicAuthenticatorRealm
  */
 
 import com.sun.net.httpserver.BasicAuthenticator;
@@ -47,12 +47,20 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse.BodyHandlers;
 
 import jdk.test.lib.net.URIBuilder;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
 
+import org.junit.jupiter.api.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
+/**
+ * The second test @Order(2) must run after the first test because it
+ * sets a VM wide authenticator and the first test depends on no authenticator
+ * being set.
+ */
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class BasicAuthenticatorRealm {
 
     static final String REALM = "U\u00ffU@realm";  // non-ASCII char
@@ -61,7 +69,8 @@ public class BasicAuthenticatorRealm {
     static final InetAddress LOOPBACK_ADDR = InetAddress.getLoopbackAddress();
 
     @Test
-    public static void testURLConnection() throws Exception {
+    @Order(1)
+    public void testURLConnection() throws Exception {
         var server = HttpServer.create(new InetSocketAddress(LOOPBACK_ADDR, 0), 0);
         var handler = HttpHandlers.of(200, Headers.of(), "");
         var context = server.createContext("/test", handler);
@@ -73,15 +82,16 @@ public class BasicAuthenticatorRealm {
             server.start();
             var url = uri(server).toURL();
             var connection = (HttpURLConnection)url.openConnection(Proxy.NO_PROXY);
-            assertEquals(connection.getResponseCode(), 401);
-            assertEquals(connection.getHeaderField("WWW-Authenticate"), EXPECTED_AUTH_HEADER_VALUE);
+            assertEquals(401, connection.getResponseCode());
+            assertEquals(EXPECTED_AUTH_HEADER_VALUE, connection.getHeaderField("WWW-Authenticate"));
         } finally {
             server.stop(0);
         }
     }
 
     @Test
-    public static void testURLConnectionAuthenticated() throws Exception {
+    @Order(2)
+    public void testURLConnectionAuthenticated() throws Exception {
         var server = HttpServer.create(new InetSocketAddress(LOOPBACK_ADDR, 0), 0);
         var handler = HttpHandlers.of(200, Headers.of(), "foo");
         var context = server.createContext("/test", handler);
@@ -94,15 +104,16 @@ public class BasicAuthenticatorRealm {
             server.start();
             var url = uri(server).toURL();
             var connection = (HttpURLConnection)url.openConnection(Proxy.NO_PROXY);
-            assertEquals(connection.getResponseCode(), 200);
-            assertEquals(connection.getInputStream().readAllBytes(), "foo".getBytes(UTF_8));
+            assertEquals(200, connection.getResponseCode());
+            Assertions.assertArrayEquals("foo".getBytes(UTF_8), connection.getInputStream().readAllBytes());
         } finally {
             server.stop(0);
         }
     }
 
     @Test
-    public static void testHttpClient() throws Exception {
+    @Order(3)
+    public void testHttpClient() throws Exception {
         var server = HttpServer.create(new InetSocketAddress(LOOPBACK_ADDR, 0), 0);
         var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
         var request = HttpRequest.newBuilder(uri(server)).build();
@@ -115,15 +126,16 @@ public class BasicAuthenticatorRealm {
         try {
             server.start();
             var response = client.send(request, BodyHandlers.ofString(UTF_8));
-            assertEquals(response.statusCode(), 401);
-            assertEquals(response.headers().firstValue("WWW-Authenticate").orElseThrow(), EXPECTED_AUTH_HEADER_VALUE);
+            assertEquals(401, response.statusCode());
+            assertEquals(EXPECTED_AUTH_HEADER_VALUE, response.headers().firstValue("WWW-Authenticate").orElseThrow());
         } finally {
             server.stop(0);
         }
     }
 
     @Test
-    public static void testHttpClientAuthenticated() throws Exception {
+    @Order(4)
+    public void testHttpClientAuthenticated() throws Exception {
         var server = HttpServer.create(new InetSocketAddress(LOOPBACK_ADDR, 0), 0);
         var request = HttpRequest.newBuilder(uri(server)).build();
         var handler = HttpHandlers.of(200, Headers.of(), "foo");
@@ -139,8 +151,8 @@ public class BasicAuthenticatorRealm {
         try {
             server.start();
             var response = client.send(request, BodyHandlers.ofString(UTF_8));
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), "foo");
+            assertEquals(200, response.statusCode());
+            assertEquals("foo", response.body());
         } finally {
             server.stop(0);
         }
diff --git a/test/jdk/com/sun/net/httpserver/ClearTextServerSSL.java b/test/jdk/com/sun/net/httpserver/ClearTextServerSSL.java
new file mode 100644
index 00000000000..75e4f3fcf45
--- /dev/null
+++ b/test/jdk/com/sun/net/httpserver/ClearTextServerSSL.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8373677
+ * @summary Tests for verifying that a non-SSL server can detect
+ *          when a client attempts to use SSL.
+ * @library /test/lib
+ * @run junit/othervm ${test.main.class}
+ */
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import jdk.test.lib.net.SimpleSSLContext;
+import jdk.test.lib.net.URIBuilder;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.net.ssl.SSLException;
+
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class ClearTextServerSSL {
+
+    static final InetAddress LOOPBACK_ADDR = InetAddress.getLoopbackAddress();
+    static final boolean ENABLE_LOGGING = true;
+    static final Logger logger = Logger.getLogger("com.sun.net.httpserver");
+
+    static final String CTXT_PATH = "/ClearTextServerSSL";
+
+    @BeforeAll
+    public static void setup() {
+        if (ENABLE_LOGGING) {
+            ConsoleHandler ch = new ConsoleHandler();
+            logger.setLevel(Level.ALL);
+            ch.setLevel(Level.ALL);
+            logger.addHandler(ch);
+        }
+    }
+
+    @Test
+    public void test() throws Exception {
+        var sslContext = new SimpleSSLContext().get();
+        var handler = new TestHandler();
+        var server = HttpServer.create(new InetSocketAddress(LOOPBACK_ADDR, 0), 0);
+        server.createContext(path(""), handler);
+        server.start();
+        try (var client = HttpClient.newBuilder()
+                    .sslContext(sslContext)
+                    .proxy(NO_PROXY)
+                    .build()) {
+            var request = HttpRequest.newBuilder()
+                    .uri(uri("http", server, path("/clear")))
+                    .build();
+            var response = client.send(request, HttpResponse.BodyHandlers.ofString());
+            assertEquals(200, response.statusCode());
+            var sslRequest = HttpRequest.newBuilder()
+                    .uri(uri("https", server, path("/ssl")))
+                    .build();
+            Assertions.assertThrows(SSLException.class, () -> {
+                client.send(sslRequest, HttpResponse.BodyHandlers.ofString());
+            });
+            try (var socket = new Socket()) {
+                socket.connect(server.getAddress());
+                byte[] badRequest = {
+                        22, 'B', 'A', 'D', ' ',
+                        '/', ' ' ,
+                        'H', 'T', 'T', 'P', '/', '1', '.', '1' };
+                socket.getOutputStream().write(badRequest);
+                socket.getOutputStream().flush();
+                var reader = new InputStreamReader(socket.getInputStream());
+                var line = reader.readAllLines();
+                Assertions.assertEquals("HTTP/1.1 400 Bad Request", line.get(0));
+                System.out.println("Got expected response:");
+                line.stream().map(l -> "\t" + l).forEach(System.out::println);
+            }
+
+        } finally {
+            server.stop(0);
+        }
+    }
+
+    // --- infra ---
+
+    static String path(String path) {
+        assert CTXT_PATH.startsWith("/");
+        assert !CTXT_PATH.endsWith("/");
+        if (path.startsWith("/")) {
+            return CTXT_PATH + path;
+        } else {
+            return CTXT_PATH + "/" + path;
+        }
+    }
+
+    static URI uri(String scheme, HttpServer server, String path) throws URISyntaxException {
+        return URIBuilder.newBuilder()
+                .scheme(scheme)
+                .loopback()
+                .port(server.getAddress().getPort())
+                .path(path)
+                .build();
+    }
+
+    /**
+     * A test handler that reads any request bytes and sends
+     * an empty 200 response
+     */
+    static class TestHandler implements HttpHandler {
+        @java.lang.Override
+        public void handle(HttpExchange exchange) throws IOException {
+            try (var reqBody = exchange.getRequestBody()) {
+                reqBody.readAllBytes();
+                exchange.sendResponseHeaders(200, RSPBODY_EMPTY);
+            } catch (Throwable t) {
+                t.printStackTrace();
+                exchange.sendResponseHeaders(500, RSPBODY_EMPTY);
+            }
+        }
+    }
+}
diff --git a/test/jdk/com/sun/net/httpserver/CreateHttpServerTest.java b/test/jdk/com/sun/net/httpserver/CreateHttpServerTest.java
index 370bd75cf34..1fbe4e6f3d1 100644
--- a/test/jdk/com/sun/net/httpserver/CreateHttpServerTest.java
+++ b/test/jdk/com/sun/net/httpserver/CreateHttpServerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,17 @@
  * @test
  * @bug 8251496
  * @summary summary
- * @run testng/othervm CreateHttpServerTest
+ * @run junit/othervm CreateHttpServerTest
  */
 
 import com.sun.net.httpserver.HttpServer;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 public class CreateHttpServerTest {
     @Test
diff --git a/test/jdk/com/sun/net/httpserver/DateFormatterTest.java b/test/jdk/com/sun/net/httpserver/DateFormatterTest.java
index bda3421660c..efcc96d45b0 100644
--- a/test/jdk/com/sun/net/httpserver/DateFormatterTest.java
+++ b/test/jdk/com/sun/net/httpserver/DateFormatterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,12 +39,13 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import jdk.test.lib.net.URIBuilder;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 import static java.net.http.HttpResponse.BodyHandlers.ofString;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
  * @test
@@ -53,19 +54,19 @@ import static org.testng.Assert.fail;
  * @modules java.net.http
  * @library /test/lib
  * @build DateFormatterTest
- * @run testng/othervm DateFormatterTest
+ * @run junit/othervm DateFormatterTest
  */
 public class DateFormatterTest {
 
-    private HttpServer server;
+    private static HttpServer server;
 
     static URI httpURI;
     static final Integer ITERATIONS = 10;
     static String format;
     static Pattern pattern;
 
-    @BeforeTest
-    public void setUp() throws IOException, URISyntaxException {
+    @BeforeAll
+    public static void setUp() throws IOException, URISyntaxException {
         String days = "(Mon|Tue|Wed|Thu|Fri|Sat|Sun)(,)";
         String dayNo = "(\\s\\d\\d\\s)";
         String month = "(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)";
@@ -85,8 +86,8 @@ public class DateFormatterTest {
         server.start();
     }
 
-    @AfterTest
-    public void cleanUp() {
+    @AfterAll
+    public static void cleanUp() {
         server.stop(0);
     }
 
diff --git a/test/jdk/com/sun/net/httpserver/FilterTest.java b/test/jdk/com/sun/net/httpserver/FilterTest.java
index 45c7ef21e8d..a5c90d2026e 100644
--- a/test/jdk/com/sun/net/httpserver/FilterTest.java
+++ b/test/jdk/com/sun/net/httpserver/FilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8267262
  * @summary Tests for Filter static factory methods
- * @run testng/othervm FilterTest
+ * @run junit/othervm FilterTest
  */
 
 import java.io.IOException;
@@ -49,11 +49,13 @@ import com.sun.net.httpserver.Filter;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeTest;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
-import static org.testng.Assert.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class FilterTest {
 
@@ -64,8 +66,8 @@ public class FilterTest {
     static final boolean ENABLE_LOGGING = true;
     static final Logger logger = Logger.getLogger("com.sun.net.httpserver");
 
-    @BeforeTest
-    public void setup() {
+    @BeforeAll
+    public static void setup() {
         if (ENABLE_LOGGING) {
             ConsoleHandler ch = new ConsoleHandler();
             logger.setLevel(Level.ALL);
@@ -76,14 +78,14 @@ public class FilterTest {
 
     @Test
     public void testNull() {
-        expectThrows(NPE, () -> Filter.beforeHandler(null, e -> e.getResponseHeaders().set("X-Foo", "Bar")));
-        expectThrows(NPE, () -> Filter.beforeHandler("Some description", null));
+        assertThrows(NPE, () -> Filter.beforeHandler(null, e -> e.getResponseHeaders().set("X-Foo", "Bar")));
+        assertThrows(NPE, () -> Filter.beforeHandler("Some description", null));
 
-        expectThrows(NPE, () -> Filter.afterHandler("Some description", null));
-        expectThrows(NPE, () -> Filter.afterHandler(null, HttpExchange::getResponseCode));
+        assertThrows(NPE, () -> Filter.afterHandler("Some description", null));
+        assertThrows(NPE, () -> Filter.afterHandler(null, HttpExchange::getResponseCode));
 
-        expectThrows(NPE, () -> Filter.adaptRequest("Some description", null));
-        expectThrows(NPE, () -> Filter.adaptRequest(null, r -> r.with("Foo", List.of("Bar"))));
+        assertThrows(NPE, () -> Filter.adaptRequest("Some description", null));
+        assertThrows(NPE, () -> Filter.adaptRequest(null, r -> r.with("Foo", List.of("Bar"))));
     }
 
     @Test
@@ -91,16 +93,15 @@ public class FilterTest {
         var desc = "Some description";
 
         var beforeFilter = Filter.beforeHandler(desc, HttpExchange::getRequestBody);
-        assertEquals(desc, beforeFilter.description());
+        assertEquals(beforeFilter.description(), desc);
 
         var afterFilter = Filter.afterHandler(desc, HttpExchange::getResponseCode);
-        assertEquals(desc, afterFilter.description());
+        assertEquals(afterFilter.description(), desc);
 
         var adaptFilter = Filter.adaptRequest(desc, r -> r.with("Foo", List.of("Bar")));
-        assertEquals(desc, adaptFilter.description());
+        assertEquals(adaptFilter.description(), desc);
     }
 
-    @DataProvider
     public static Object[][] throwingFilters() {
         return new Object[][] {
             {Filter.beforeHandler("before RE", e -> { throw new RuntimeException(); }), IOE},
@@ -111,7 +112,8 @@ public class FilterTest {
         };
     }
 
-    @Test(dataProvider = "throwingFilters")
+    @ParameterizedTest
+    @MethodSource("throwingFilters")
     public void testException(Filter filter, Class<Exception> exception)
             throws Exception
     {
@@ -123,11 +125,11 @@ public class FilterTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             if (exception != null) {
-                expectThrows(exception, () -> client.send(request, HttpResponse.BodyHandlers.ofString()));
+                assertThrows(exception, () -> client.send(request, HttpResponse.BodyHandlers.ofString()));
             } else {
                 var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-                assertEquals(response.statusCode(), 200);
-                assertEquals(response.body(), "hello world");
+                assertEquals(200, response.statusCode());
+                assertEquals("hello world", response.body());
             }
         } finally {
             server.stop(0);
@@ -146,9 +148,9 @@ public class FilterTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().map().size(), 3);
-            assertEquals(response.headers().firstValue("x-foo").orElseThrow(), "bar");
+            assertEquals(200, response.statusCode());
+            assertEquals(3, response.headers().map().size());
+            assertEquals("bar", response.headers().firstValue("x-foo").orElseThrow());
         } finally {
             server.stop(0);
         }
@@ -170,9 +172,9 @@ public class FilterTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().map().size(), 3);
-            assertEquals(response.headers().firstValue("x-foo").orElseThrow(), "barbar");
+            assertEquals(200, response.statusCode());
+            assertEquals(3, response.headers().map().size());
+            assertEquals("barbar", response.headers().firstValue("x-foo").orElseThrow());
         } finally {
             server.stop(0);
         }
@@ -202,9 +204,9 @@ public class FilterTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().map().size(), 3);
-            assertEquals(response.headers().firstValue("x-foo").orElseThrow(), "bar");
+            assertEquals(200, response.statusCode());
+            assertEquals(3, response.headers().map().size());
+            assertEquals("bar", response.headers().firstValue("x-foo").orElseThrow());
         } finally {
             server.stop(0);
         }
@@ -223,8 +225,8 @@ public class FilterTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.statusCode(), (int)respCode.get());
+            assertEquals(200, response.statusCode());
+            assertEquals((int)respCode.get(), response.statusCode());
         } finally {
             server.stop(0);
         }
@@ -248,8 +250,8 @@ public class FilterTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(attr.get(), value);
+            assertEquals(200, response.statusCode());
+            assertEquals(value, attr.get());
         } finally {
             server.stop(0);
         }
@@ -280,8 +282,8 @@ public class FilterTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.statusCode(), (int)respCode.get());
+            assertEquals(200, response.statusCode());
+            assertEquals((int)respCode.get(), response.statusCode());
         } finally {
             server.stop(0);
         }
@@ -304,10 +306,10 @@ public class FilterTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().map().size(), 3);
-            assertEquals(response.headers().firstValue("x-foo").orElseThrow(), "bar");
-            assertEquals(response.statusCode(), (int)respCode.get());
+            assertEquals(200, response.statusCode());
+            assertEquals(3, response.headers().map().size());
+            assertEquals("bar", response.headers().firstValue("x-foo").orElseThrow());
+            assertEquals((int)respCode.get(), response.statusCode());
         } finally {
             server.stop(0);
         }
@@ -326,8 +328,8 @@ public class FilterTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "foo/bar")).build();
             var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(inspectedURI.get(), URI.create("/foo/bar"));
+            assertEquals(200, response.statusCode());
+            assertEquals(URI.create("/foo/bar"), inspectedURI.get());
         } finally {
             server.stop(0);
         }
@@ -348,9 +350,9 @@ public class FilterTest {
         });
         var adaptFilter = Filter.adaptRequest("Add x-foo request header", r -> {
             // Confirm request state is unchanged
-            assertEquals(r.getRequestHeaders(), originalExchange.getRequestHeaders());
-            assertEquals(r.getRequestURI(), originalExchange.getRequestURI());
-            assertEquals(r.getRequestMethod(), originalExchange.getRequestMethod());
+            assertEquals(originalExchange.getRequestHeaders(), r.getRequestHeaders());
+            assertEquals(originalExchange.getRequestURI(), r.getRequestURI());
+            assertEquals(originalExchange.getRequestMethod(), r.getRequestMethod());
             return r.with("x-foo", List.of("bar"));
         });
         var server = HttpServer.create(new InetSocketAddress(LOOPBACK_ADDR,0), 10);
@@ -362,8 +364,8 @@ public class FilterTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), "bar");
+            assertEquals(200, response.statusCode());
+            assertEquals("bar", response.body());
         } finally {
             server.stop(0);
         }
@@ -398,22 +400,22 @@ public class FilterTest {
     static class CompareStateAndEchoHandler implements HttpHandler {
         @Override
         public void handle(HttpExchange exchange) throws IOException {
-            assertEquals(exchange.getLocalAddress(), originalExchange.getLocalAddress());
-            assertEquals(exchange.getRemoteAddress(), originalExchange.getRemoteAddress());
-            assertEquals(exchange.getProtocol(), originalExchange.getProtocol());
-            assertEquals(exchange.getPrincipal(), originalExchange.getPrincipal());
-            assertEquals(exchange.getHttpContext(), originalExchange.getHttpContext());
-            assertEquals(exchange.getRequestMethod(), originalExchange.getRequestMethod());
-            assertEquals(exchange.getRequestURI(), originalExchange.getRequestURI());
-            assertEquals(exchange.getRequestBody(), originalExchange.getRequestBody());
-            assertEquals(exchange.getResponseHeaders(), originalExchange.getResponseHeaders());
-            assertEquals(exchange.getResponseCode(), originalExchange.getResponseCode());
-            assertEquals(exchange.getResponseBody(), originalExchange.getResponseBody());
-            assertEquals(exchange.getAttribute("foo"), originalExchange.getAttribute("foo"));
+            assertEquals(originalExchange.getLocalAddress(), exchange.getLocalAddress());
+            assertEquals(originalExchange.getRemoteAddress(), exchange.getRemoteAddress());
+            assertEquals(originalExchange.getProtocol(), exchange.getProtocol());
+            assertEquals(originalExchange.getPrincipal(), exchange.getPrincipal());
+            assertEquals(originalExchange.getHttpContext(), exchange.getHttpContext());
+            assertEquals(originalExchange.getRequestMethod(), exchange.getRequestMethod());
+            assertEquals(originalExchange.getRequestURI(), exchange.getRequestURI());
+            assertEquals(originalExchange.getRequestBody(), exchange.getRequestBody());
+            assertEquals(originalExchange.getResponseHeaders(), exchange.getResponseHeaders());
+            assertEquals(originalExchange.getResponseCode(), exchange.getResponseCode());
+            assertEquals(originalExchange.getResponseBody(), exchange.getResponseBody());
+            assertEquals(originalExchange.getAttribute("foo"), exchange.getAttribute("foo"));
             assertFalse(exchange.getRequestHeaders().equals(originalExchange.getRequestHeaders()));
 
             exchange.setAttribute("foo", "barbar");
-            assertEquals(exchange.getAttribute("foo"), originalExchange.getAttribute("foo"));
+            assertEquals(originalExchange.getAttribute("foo"), exchange.getAttribute("foo"));
 
             try (InputStream is = exchange.getRequestBody();
                  OutputStream os = exchange.getResponseBody()) {
diff --git a/test/jdk/com/sun/net/httpserver/HeadersTest.java b/test/jdk/com/sun/net/httpserver/HeadersTest.java
index c37aba0424f..2c9ff93e179 100644
--- a/test/jdk/com/sun/net/httpserver/HeadersTest.java
+++ b/test/jdk/com/sun/net/httpserver/HeadersTest.java
@@ -29,7 +29,7 @@
  *          jdk.httpserver/sun.net.httpserver:+open
  * @library /test/lib
  * @build jdk.test.lib.net.URIBuilder
- * @run testng/othervm HeadersTest
+ * @run junit/othervm HeadersTest
  */
 
 import java.io.IOException;
@@ -57,18 +57,20 @@ import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 import jdk.test.lib.net.URIBuilder;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import sun.net.httpserver.UnmodifiableHeaders;
 
 import static java.net.http.HttpClient.Builder.NO_PROXY;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotSame;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertThrows;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class HeadersTest {
 
@@ -77,13 +79,13 @@ public class HeadersTest {
     static final Class<NullPointerException> NPE = NullPointerException.class;
 
     @Test
-    public static void testDefaultConstructor() {
+    public void testDefaultConstructor() {
         var headers = new Headers();
         assertTrue(headers.isEmpty());
     }
 
     @Test
-    public static void testNull() {
+    public void testNull() {
         final Headers h = new Headers();
         h.put("Foo", List.of("Bar"));
 
@@ -157,8 +159,7 @@ public class HeadersTest {
         assertThrows(NPE, () -> h.set("Foo", null));
     }
 
-    @DataProvider
-    public Object[][] responseHeaders() {
+    public static Object[][] responseHeaders() {
         final var listWithNull = new LinkedList<String>();
         listWithNull.add(null);
         return new Object[][] {
@@ -172,7 +173,8 @@ public class HeadersTest {
      * Confirms HttpExchange::sendResponseHeaders throws NPE if response headers
      * contain a null key or value.
      */
-    @Test(dataProvider = "responseHeaders")
+    @ParameterizedTest
+    @MethodSource("responseHeaders")
     public void testNullResponseHeaders(String headerKey, List<String> headerVal)
             throws Exception {
         var handler = new Handler(headerKey, headerVal);
@@ -183,7 +185,7 @@ public class HeadersTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             assertThrows(IOE, () -> client.send(request, HttpResponse.BodyHandlers.ofString()));
-            assertEquals(throwable.get().getClass(), NPE);
+            assertEquals(NPE, throwable.get().getClass());
             assertTrue(Arrays.stream(throwable.get().getStackTrace())
                     .anyMatch(e -> e.getClassName().equals("sun.net.httpserver.HttpExchangeImpl")
                             || e.getMethodName().equals("sendResponseHeaders")));
@@ -240,7 +242,6 @@ public class HeadersTest {
         }
     }
 
-    @DataProvider
     public static Object[][] headerPairs() {
         final var h1 = new Headers();
         final var h2 = new Headers();
@@ -259,16 +260,16 @@ public class HeadersTest {
                 .toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "headerPairs")
-    public static void testEqualsAndHashCode(Headers h1, Headers h2) {
-        // avoid testng's asserts(Map, Map) as they don't call Headers::equals
+    @ParameterizedTest
+    @MethodSource("headerPairs")
+    public void testEqualsAndHashCode(Headers h1, Headers h2) {
         assertTrue(h1.equals(h2), "Headers differ");
-        assertEquals(h1.hashCode(), h2.hashCode(), "hashCode differ for "
+        assertEquals(h2.hashCode(), h1.hashCode(), "hashCode differ for "
                 + List.of(h1, h2));
     }
 
     @Test
-    public static void testEqualsMap() {
+    public void testEqualsMap() {
         final var h = new Headers();
         final var m = new HashMap<String, List<String>>();
         assertTrue(h.equals(m));
@@ -277,14 +278,14 @@ public class HeadersTest {
     }
 
     @Test
-    public static void testToString() {
+    public void testToString() {
         final var h = new Headers();
         h.put("Accept-Encoding", List.of("gzip, deflate"));
         assertTrue(h.toString().equals("Headers { {Accept-encoding=[gzip, deflate]} }"));
     }
 
     @Test
-    public static void testPutAll() {
+    public void testPutAll() {
         final var h0 = new Headers();
         final var map = new HashMap<String, List<String>>();
         map.put("a", null);
@@ -311,7 +312,7 @@ public class HeadersTest {
     }
 
     @Test
-    public static void testReplaceAll() {
+    public void testReplaceAll() {
         final var h1 = new Headers();
         h1.put("a", List.of("1"));
         h1.put("b", List.of("2"));
@@ -331,7 +332,7 @@ public class HeadersTest {
     }
 
     @Test
-    public static void test1ArgConstructorNull() {
+    public void test1ArgConstructorNull() {
         assertThrows(NPE, () -> new Headers(null));
         {
             final var m = new HashMap<String, List<String>>();
@@ -353,35 +354,35 @@ public class HeadersTest {
     }
 
     @Test
-    public static void test1ArgConstructor() {
+    public void test1ArgConstructor() {
         {
             var h = new Headers(new Headers());
             assertTrue(h.isEmpty());
         }
         {
             var h = new Headers(Map.of("Foo", List.of("Bar")));
-            assertEquals(h.get("Foo"), List.of("Bar"));
-            assertEquals(h.size(), 1);
+            assertEquals(List.of("Bar"), h.get("Foo"));
+            assertEquals(1, h.size());
         }
         {
             var h1 = new Headers(new UnmodifiableHeaders(new Headers()));
             assertTrue(h1.isEmpty());
             h1.put("Foo", List.of("Bar"));  // modifiable
-            assertEquals(h1.get("Foo"), List.of("Bar"));
-            assertEquals(h1.size(), 1);
+            assertEquals(List.of("Bar"), h1.get("Foo"));
+            assertEquals(1, h1.size());
 
             var h2 = new Headers(h1);
-            assertEquals(h2.get("Foo"), List.of("Bar"));
-            assertEquals(h2.size(), 1);
+            assertEquals(List.of("Bar"), h2.get("Foo"));
+            assertEquals(1, h2.size());
 
-            assertEquals(h1, h2);
+            assertEquals(h2, h1);
             h1.set("Foo", "Barbar");
-            assertNotEquals(h1, h2);
+            assertNotEquals(h2, h1);
         }
     }
 
     @Test
-    public static void testMutableHeaders() {
+    public void testMutableHeaders() {
         {
             var h = new Headers();
             h.add("Foo", "Bar");
@@ -400,7 +401,7 @@ public class HeadersTest {
     }
 
     @Test
-    public static void testOfNull() {
+    public void testOfNull() {
         assertThrows(NPE, () -> Headers.of((String[])null));
         assertThrows(NPE, () -> Headers.of(null, "Bar"));
         assertThrows(NPE, () -> Headers.of("Foo", null));
@@ -426,41 +427,40 @@ public class HeadersTest {
     }
 
     @Test
-    public static void testOf() {
+    public void testOf() {
         final var h = Headers.of("a", "1", "b", "2");
-        assertEquals(h.size(), 2);
+        assertEquals(2, h.size());
         List.of("a", "b").forEach(n -> assertTrue(h.containsKey(n)));
         List.of("1", "2").forEach(v -> assertTrue(h.containsValue(List.of(v))));
     }
 
     @Test
-    public static void testOfEmpty() {
+    public void testOfEmpty() {
         for (var h : List.of(Headers.of(), Headers.of(new String[] { }))) {
-            assertEquals(h.size(), 0);
+            assertEquals(0, h.size());
             assertTrue(h.isEmpty());
         }
     }
 
     @Test
-    public static void testOfNumberOfElements() {
+    public void testOfNumberOfElements() {
         assertThrows(IAE, () -> Headers.of("a"));
         assertThrows(IAE, () -> Headers.of("a", "1", "b"));
     }
 
     @Test
-    public static void testOfMultipleValues() {
+    public void testOfMultipleValues() {
         final var h = Headers.of("a", "1", "b", "1", "b", "2", "b", "3");
-        assertEquals(h.size(), 2);
+        assertEquals(2, h.size());
         List.of("a", "b").forEach(n -> assertTrue(h.containsKey(n)));
         List.of(List.of("1"), List.of("1", "2", "3")).forEach(v -> assertTrue(h.containsValue(v)));
     }
 
     @Test
-    public static void testNormalizeOnNull() {
+    public void testNormalizeOnNull() {
         assertThrows(NullPointerException.class, () -> normalize(null));
     }
 
-    @DataProvider
     public static Object[][] illegalKeys() {
         var illegalChars = List.of('\r', '\n');
         var illegalStrings = Stream
@@ -478,12 +478,12 @@ public class HeadersTest {
                 .toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "illegalKeys")
-    public static void testNormalizeOnIllegalKeys(String illegalKey) {
+    @ParameterizedTest
+    @MethodSource("illegalKeys")
+    public void testNormalizeOnIllegalKeys(String illegalKey) {
         assertThrows(IllegalArgumentException.class, () -> normalize(illegalKey));
     }
 
-    @DataProvider
     public static Object[][] normalizedKeys() {
         return new Object[][]{
                 // Empty string
@@ -501,13 +501,13 @@ public class HeadersTest {
         };
     }
 
-    @Test(dataProvider = "normalizedKeys")
-    public static void testNormalizeOnNormalizedKeys(String normalizedKey) {
+    @ParameterizedTest
+    @MethodSource("normalizedKeys")
+    public void testNormalizeOnNormalizedKeys(String normalizedKey) {
         // Verify that the fast-path is taken
         assertSame(normalize(normalizedKey), normalizedKey);
     }
 
-    @DataProvider
     public static Object[][] notNormalizedKeys() {
         return new Object[][]{
                 {"a"},
@@ -517,14 +517,15 @@ public class HeadersTest {
         };
     }
 
-    @Test(dataProvider = "notNormalizedKeys")
-    public static void testNormalizeOnNotNormalizedKeys(String notNormalizedKey) {
+    @ParameterizedTest
+    @MethodSource("notNormalizedKeys")
+    public void testNormalizeOnNotNormalizedKeys(String notNormalizedKey) {
         var normalizedKey = normalize(notNormalizedKey);
         // Verify that the fast-path is *not* taken
         assertNotSame(normalizedKey, notNormalizedKey);
         // Verify the result
         var expectedNormalizedKey = normalizedKey.substring(0, 1).toUpperCase() + normalizedKey.substring(1);
-        assertEquals(normalizedKey, expectedNormalizedKey);
+        assertEquals(expectedNormalizedKey, normalizedKey);
     }
 
     private static String normalize(String key) {
diff --git a/test/jdk/com/sun/net/httpserver/HttpContextTest.java b/test/jdk/com/sun/net/httpserver/HttpContextTest.java
index aa50f1d9757..82098e4e993 100644
--- a/test/jdk/com/sun/net/httpserver/HttpContextTest.java
+++ b/test/jdk/com/sun/net/httpserver/HttpContextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 8269692
  * @summary HttpContext::createContext should throw IllegalArgumentException
  *          if context already exists
- * @run testng/othervm HttpContextTest
+ * @run junit/othervm HttpContextTest
  */
 
 import java.io.IOException;
@@ -34,22 +34,23 @@ import com.sun.net.httpserver.HttpContext;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertThrows;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
 
 public class HttpContextTest {
 
     static final Class<IllegalArgumentException> IAE = IllegalArgumentException.class;
 
     @Test
-    public static void test() throws IOException {
+    public void test() throws IOException {
         final var server = HttpServer.create(null, 0);
         final var path = "/foo/";
 
         assertThrows(IAE, () -> server.removeContext(path));
         HttpContext context = server.createContext(path);
-        assertEquals(context.getPath(), path);
+        assertEquals(path, context.getPath());
         assertThrows(IAE, () -> server.createContext(path));
         assertThrows(IAE, () -> server.createContext(path, new Handler()));
 
@@ -60,7 +61,7 @@ public class HttpContextTest {
         assertThrows(IAE, () -> server.removeContext(path));
 
         context = server.createContext(path, new Handler());
-        assertEquals(context.getPath(), path);
+        assertEquals(path, context.getPath());
         assertThrows(IAE, () -> server.createContext(path));
         assertThrows(IAE, () -> server.createContext(path, new Handler()));
         server.removeContext(path);
@@ -72,7 +73,7 @@ public class HttpContextTest {
      * shares the prefix of an existing context.
      */
     @Test
-    public static void testSubcontext() throws IOException {
+    public void testSubcontext() throws IOException {
         final var server = HttpServer.create(null, 0);
         server.createContext("/foo/bar/");
         server.createContext("/foo/");
diff --git a/test/jdk/com/sun/net/httpserver/HttpPrincipalTest.java b/test/jdk/com/sun/net/httpserver/HttpPrincipalTest.java
index 30cf0c4490c..513a79feb60 100644
--- a/test/jdk/com/sun/net/httpserver/HttpPrincipalTest.java
+++ b/test/jdk/com/sun/net/httpserver/HttpPrincipalTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
  * @test
  * @bug 8251496
  * @summary Tests for methods in HttpPrincipal
- * @run testng/othervm HttpPrincipalTest
+ * @run junit/othervm HttpPrincipalTest
  */
 
 import com.sun.net.httpserver.HttpPrincipal;
-import org.testng.annotations.Test;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 public class HttpPrincipalTest {
 
@@ -39,10 +39,10 @@ public class HttpPrincipalTest {
     public void testGetters() {
         var principal = new HttpPrincipal("test", "123");
 
-        assertEquals(principal.getUsername(), "test");
-        assertEquals(principal.getRealm(), "123");
-        assertEquals(principal.getName(), "123:test");
-        assertEquals(principal.toString(), principal.getName());
-        assertEquals(("test"+"123").hashCode(), principal.hashCode());
+        assertEquals("test", principal.getUsername());
+        assertEquals("123", principal.getRealm());
+        assertEquals("123:test", principal.getName());
+        assertEquals(principal.getName(), principal.toString());
+        assertEquals(principal.hashCode(), ("test"+"123").hashCode());
     }
 }
diff --git a/test/jdk/com/sun/net/httpserver/HttpServerProviderTest.java b/test/jdk/com/sun/net/httpserver/HttpServerProviderTest.java
index 2912cdd40e1..db528c19488 100644
--- a/test/jdk/com/sun/net/httpserver/HttpServerProviderTest.java
+++ b/test/jdk/com/sun/net/httpserver/HttpServerProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,19 +25,19 @@
  * @test
  * @bug 8270286
  * @summary Test for HttpServerProvider::loadProviderFromProperty
- * @run testng/othervm
+ * @run junit/othervm
  *      -Dcom.sun.net.httpserver.HttpServerProvider=HttpServerProviderTest$ProviderP
  *      HttpServerProviderTest
- * @run testng/othervm
+ * @run junit/othervm
  *      -Dcom.sun.net.httpserver.HttpServerProvider=HttpServerProviderTest$ProviderPNPC
  *      HttpServerProviderTest
- * @run testng/othervm
+ * @run junit/othervm
  *      -Dcom.sun.net.httpserver.HttpServerProvider=HttpServerProviderTest$ProviderNP
  *      HttpServerProviderTest
- * @run testng/othervm
+ * @run junit/othervm
  *      -Dcom.sun.net.httpserver.HttpServerProvider=HttpServerProviderTest$ProviderT
  *      HttpServerProviderTest
- * @run testng/othervm
+ * @run junit/othervm
  *      -Dcom.sun.net.httpserver.HttpServerProvider=DoesNotExist
  *      HttpServerProviderTest
  */
@@ -48,10 +48,11 @@ import java.util.ServiceConfigurationError;
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsServer;
 import com.sun.net.httpserver.spi.HttpServerProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.expectThrows;
+
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import org.junit.jupiter.api.Test;
 
 public class HttpServerProviderTest {
     public final static String PROPERTY_KEY = "com.sun.net.httpserver.HttpServerProvider";
@@ -70,7 +71,7 @@ public class HttpServerProviderTest {
 
     private void testPublic() throws Exception {
         var n = ProviderP.class.getName();
-        assertEquals(System.getProperty(PROPERTY_KEY), n);
+        assertEquals(n, System.getProperty(PROPERTY_KEY));
 
         var p = HttpServerProvider.provider();
         assertNull(p.createHttpServer(null, 0));
@@ -79,39 +80,39 @@ public class HttpServerProviderTest {
 
     private void testPublicNonPublicConstructor() {
         var n = ProviderPNPC.class.getName();
-        assertEquals(System.getProperty(PROPERTY_KEY), n);
+        assertEquals(n, System.getProperty(PROPERTY_KEY));
 
-        var e = expectThrows(ServiceConfigurationError.class, HttpServerProvider::provider);
-        assertEquals(e.getClass(), ServiceConfigurationError.class);
-        assertEquals(e.getCause().getClass(), IllegalAccessException.class);
+        var e = Assertions.assertThrows(ServiceConfigurationError.class, HttpServerProvider::provider);
+        assertEquals(ServiceConfigurationError.class, e.getClass());
+        assertEquals(IllegalAccessException.class, e.getCause().getClass());
     }
 
     private void testNonPublic() {
         var n = ProviderNP.class.getName();
-        assertEquals(System.getProperty(PROPERTY_KEY), n);
+        assertEquals(n, System.getProperty(PROPERTY_KEY));
 
-        var e = expectThrows(ServiceConfigurationError.class, HttpServerProvider::provider);
-        assertEquals(e.getClass(), ServiceConfigurationError.class);
-        assertEquals(e.getCause().getClass(), IllegalAccessException.class);
+        var e = Assertions.assertThrows(ServiceConfigurationError.class, HttpServerProvider::provider);
+        assertEquals(ServiceConfigurationError.class, e.getClass());
+        assertEquals(IllegalAccessException.class, e.getCause().getClass());
     }
 
     private void testThrowingConstructor() {
         var cn = ProviderT.class.getName();
-        assertEquals(System.getProperty(PROPERTY_KEY), cn);
+        assertEquals(cn, System.getProperty(PROPERTY_KEY));
 
-        var e = expectThrows(ServiceConfigurationError.class, HttpServerProvider::provider);
-        assertEquals(e.getClass(), ServiceConfigurationError.class);
-        assertEquals(e.getCause().getClass(), InvocationTargetException.class);
-        assertEquals(e.getCause().getCause().getMessage(), "throwing constructor");
+        var e = Assertions.assertThrows(ServiceConfigurationError.class, HttpServerProvider::provider);
+        assertEquals(ServiceConfigurationError.class, e.getClass());
+        assertEquals(InvocationTargetException.class, e.getCause().getClass());
+        assertEquals("throwing constructor", e.getCause().getCause().getMessage());
     }
 
     private void testBadData() {
         var cn = "DoesNotExist";
-        assertEquals(System.getProperty(PROPERTY_KEY), cn);
+        assertEquals(cn, System.getProperty(PROPERTY_KEY));
 
-        var e = expectThrows(ServiceConfigurationError.class, HttpServerProvider::provider);
-        assertEquals(e.getClass(), ServiceConfigurationError.class);
-        assertEquals(e.getCause().getClass(), ClassNotFoundException.class);
+        var e = Assertions.assertThrows(ServiceConfigurationError.class, HttpServerProvider::provider);
+        assertEquals(ServiceConfigurationError.class, e.getClass());
+        assertEquals(ClassNotFoundException.class, e.getCause().getClass());
     }
 
     /**
diff --git a/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java b/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java
index 37ec2701e07..5514b5da689 100644
--- a/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java
+++ b/test/jdk/com/sun/net/httpserver/HttpsParametersClientAuthTest.java
@@ -84,6 +84,7 @@ public class HttpsParametersClientAuthTest {
         return t;
     };
 
+    private static final SSLContext serverSSLCtx = SimpleSSLContext.findSSLContext();
     /**
      * verifies default values of {@link HttpsParameters#setNeedClientAuth(boolean)}
      * and {@link HttpsParameters#setWantClientAuth(boolean)} methods
@@ -168,8 +169,6 @@ public class HttpsParametersClientAuthTest {
     public void testServerNeedClientAuth(final boolean presentClientCerts) throws Exception {
         // SSLContext which contains both the key and the trust material and will be used
         // by the server
-        final SSLContext serverSSLCtx = new SimpleSSLContext().get();
-        assertNotNull(serverSSLCtx, "could not create SSLContext");
         final HttpsConfigurator configurator = new HttpsConfigurator(serverSSLCtx) {
             @Override
             public void configure(final HttpsParameters params) {
@@ -276,8 +275,6 @@ public class HttpsParametersClientAuthTest {
     public void testServerWantClientAuth(final boolean presentClientCerts) throws Exception {
         // SSLContext which contains both the key and the trust material and will be used
         // by the server
-        final SSLContext serverSSLCtx = new SimpleSSLContext().get();
-        assertNotNull(serverSSLCtx, "could not create SSLContext");
         final HttpsConfigurator configurator = new HttpsConfigurator(serverSSLCtx) {
             @Override
             public void configure(final HttpsParameters params) {
diff --git a/test/jdk/com/sun/net/httpserver/InputNotRead.java b/test/jdk/com/sun/net/httpserver/InputNotRead.java
index 3d5bfad83c3..ff877dcaa7a 100644
--- a/test/jdk/com/sun/net/httpserver/InputNotRead.java
+++ b/test/jdk/com/sun/net/httpserver/InputNotRead.java
@@ -28,8 +28,8 @@
  *          read the request body and sends back a reply with no content, or when
  *          the client closes its outputstream while the server tries to drains
  *          its content.
- * @run testng/othervm InputNotRead
- * @run testng/othervm -Djava.net.preferIPv6Addresses=true InputNotRead
+ * @run junit/othervm InputNotRead
+ * @run junit/othervm -Djava.net.preferIPv6Addresses=true InputNotRead
  */
 
 import java.io.BufferedReader;
@@ -51,11 +51,12 @@ import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 
-import org.testng.annotations.Test;
 
 import static java.nio.charset.StandardCharsets.*;
 import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
 
+import org.junit.jupiter.api.Test;
+
 public class InputNotRead {
 
     private static final int msgCode = 200;
diff --git a/test/jdk/com/sun/net/httpserver/SANTest.java b/test/jdk/com/sun/net/httpserver/SANTest.java
index d35a590931d..99612376589 100644
--- a/test/jdk/com/sun/net/httpserver/SANTest.java
+++ b/test/jdk/com/sun/net/httpserver/SANTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@ import jdk.httpclient.test.lib.http2.Http2TestServer;
  */
 public class SANTest implements HttpServerAdapters {
 
-    static SSLContext ctx;
+    private static final SSLContext ctx = SimpleSSLContext.findSSLContext();
 
     static HttpServer getHttpsServer(InetSocketAddress addr, Executor exec, SSLContext ctx) throws Exception {
         HttpsServer server = HttpsServer.create(addr, 0);
@@ -122,7 +122,6 @@ public class SANTest implements HttpServerAdapters {
         ExecutorService executor=null;
         try {
             System.out.print ("SANTest: ");
-            ctx = new SimpleSSLContext().get();
             executor = Executors.newCachedThreadPool();
 
             InetAddress l1 = InetAddress.getByName("::1");
diff --git a/test/jdk/com/sun/net/httpserver/SelCacheTest.java b/test/jdk/com/sun/net/httpserver/SelCacheTest.java
index 1399b65532b..8410aa0578a 100644
--- a/test/jdk/com/sun/net/httpserver/SelCacheTest.java
+++ b/test/jdk/com/sun/net/httpserver/SelCacheTest.java
@@ -59,7 +59,7 @@ public class SelCacheTest extends Test {
     private static final String TEMP_FILE_PREFIX =
             HttpServer.class.getPackageName() + '-' + SelCacheTest.class.getSimpleName() + '-';
 
-    static SSLContext ctx;
+    private static final SSLContext ctx = SimpleSSLContext.findSSLContext();
 
     public static void main(String[] args) throws Exception {
         HttpServer s1 = null;
@@ -84,7 +84,6 @@ public class SelCacheTest extends Test {
             executor = Executors.newCachedThreadPool();
             s1.setExecutor(executor);
             s2.setExecutor(executor);
-            ctx = new SimpleSSLContext().get();
             s2.setHttpsConfigurator(new HttpsConfigurator(ctx));
             s1.start();
             s2.start();
diff --git a/test/jdk/com/sun/net/httpserver/Test1.java b/test/jdk/com/sun/net/httpserver/Test1.java
index 32bab4d9178..858c0a20f55 100644
--- a/test/jdk/com/sun/net/httpserver/Test1.java
+++ b/test/jdk/com/sun/net/httpserver/Test1.java
@@ -69,7 +69,7 @@ public class Test1 extends Test {
     private static final String TEMP_FILE_PREFIX =
             HttpServer.class.getPackageName() + '-' + Test1.class.getSimpleName() + '-';
 
-    static SSLContext ctx;
+    private static final SSLContext ctx = SimpleSSLContext.findSSLContext();
 
     public static void main (String[] args) throws Exception {
         HttpServer s1 = null;
@@ -94,7 +94,6 @@ public class Test1 extends Test {
             executor = Executors.newCachedThreadPool();
             s1.setExecutor (executor);
             s2.setExecutor (executor);
-            ctx = new SimpleSSLContext().get();
             s2.setHttpsConfigurator(new HttpsConfigurator (ctx));
             s1.start();
             s2.start();
diff --git a/test/jdk/com/sun/net/httpserver/Test12.java b/test/jdk/com/sun/net/httpserver/Test12.java
index 2a0ee1fc0a4..ac11e92d44e 100644
--- a/test/jdk/com/sun/net/httpserver/Test12.java
+++ b/test/jdk/com/sun/net/httpserver/Test12.java
@@ -56,7 +56,7 @@ public class Test12 extends Test {
     private static final String TEMP_FILE_PREFIX =
             HttpServer.class.getPackageName() + '-' + Test12.class.getSimpleName() + '-';
 
-    static SSLContext ctx;
+    private static final SSLContext ctx = SimpleSSLContext.findSSLContext();
 
     public static void main (String[] args) throws Exception {
         HttpServer s1 = null;
@@ -77,7 +77,6 @@ public class Test12 extends Test {
             HttpContext c2 = s2.createContext ("/", h);
             s1.setExecutor (executor);
             s2.setExecutor (executor);
-            ctx = new SimpleSSLContext().get();
             s2.setHttpsConfigurator(new HttpsConfigurator (ctx));
             s1.start();
             s2.start();
diff --git a/test/jdk/com/sun/net/httpserver/Test13.java b/test/jdk/com/sun/net/httpserver/Test13.java
index ead3ff95acd..0401dbce5a8 100644
--- a/test/jdk/com/sun/net/httpserver/Test13.java
+++ b/test/jdk/com/sun/net/httpserver/Test13.java
@@ -59,7 +59,7 @@ public class Test13 extends Test {
     private static final String TEMP_FILE_PREFIX =
             HttpServer.class.getPackageName() + '-' + Test13.class.getSimpleName() + '-';
 
-    static SSLContext ctx;
+    private static final SSLContext ctx = SimpleSSLContext.findSSLContext();
 
     final static int NUM = 32; // was 32
 
@@ -87,7 +87,6 @@ public class Test13 extends Test {
             executor = Executors.newCachedThreadPool();
             s1.setExecutor (executor);
             s2.setExecutor (executor);
-            ctx = new SimpleSSLContext().get();
             s2.setHttpsConfigurator(new HttpsConfigurator (ctx));
             s1.start();
             s2.start();
diff --git a/test/jdk/com/sun/net/httpserver/Test6a.java b/test/jdk/com/sun/net/httpserver/Test6a.java
index 676edeb7b60..56614078cfe 100644
--- a/test/jdk/com/sun/net/httpserver/Test6a.java
+++ b/test/jdk/com/sun/net/httpserver/Test6a.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 6270015
  * @library /test/lib
@@ -55,7 +55,7 @@ public class Test6a extends Test {
         HttpsServer server = HttpsServer.create (addr, 0);
         HttpContext ctx = server.createContext ("/test", handler);
         ExecutorService executor = Executors.newCachedThreadPool();
-        SSLContext ssl = new SimpleSSLContext().get();
+        SSLContext ssl = SimpleSSLContext.findSSLContext();
         server.setExecutor (executor);
         server.setHttpsConfigurator(new HttpsConfigurator (ssl));
         server.start ();
diff --git a/test/jdk/com/sun/net/httpserver/Test7a.java b/test/jdk/com/sun/net/httpserver/Test7a.java
index 90c0615972e..8bda4ae8348 100644
--- a/test/jdk/com/sun/net/httpserver/Test7a.java
+++ b/test/jdk/com/sun/net/httpserver/Test7a.java
@@ -59,7 +59,7 @@ public class Test7a extends Test {
         HttpsServer server = HttpsServer.create (addr, 0);
         HttpContext ctx = server.createContext ("/test", handler);
         ExecutorService executor = Executors.newCachedThreadPool();
-        SSLContext ssl = new SimpleSSLContext().get();
+        SSLContext ssl = SimpleSSLContext.findSSLContext();
         server.setHttpsConfigurator(new HttpsConfigurator (ssl));
         server.setExecutor (executor);
         server.start ();
diff --git a/test/jdk/com/sun/net/httpserver/Test8a.java b/test/jdk/com/sun/net/httpserver/Test8a.java
index 6c642f7c22a..67f9c93172a 100644
--- a/test/jdk/com/sun/net/httpserver/Test8a.java
+++ b/test/jdk/com/sun/net/httpserver/Test8a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ public class Test8a extends Test {
             server = HttpsServer.create (addr, 0);
             HttpContext ctx = server.createContext ("/test", handler);
             executor = Executors.newCachedThreadPool();
-            SSLContext ssl = new SimpleSSLContext().get();
+            SSLContext ssl = SimpleSSLContext.findSSLContext();
             server.setHttpsConfigurator(new HttpsConfigurator (ssl));
             server.setExecutor (executor);
             server.start ();
diff --git a/test/jdk/com/sun/net/httpserver/Test9.java b/test/jdk/com/sun/net/httpserver/Test9.java
index 6051de96596..8281089c232 100644
--- a/test/jdk/com/sun/net/httpserver/Test9.java
+++ b/test/jdk/com/sun/net/httpserver/Test9.java
@@ -58,7 +58,7 @@ public class Test9 extends Test {
     private static final String TEMP_FILE_PREFIX =
             HttpServer.class.getPackageName() + '-' + Test9.class.getSimpleName() + '-';
 
-    static SSLContext ctx;
+    private static final SSLContext ctx = SimpleSSLContext.findSSLContext();
     static volatile boolean error = false;
 
     public static void main (String[] args) throws Exception {
@@ -83,7 +83,6 @@ public class Test9 extends Test {
             executor = Executors.newCachedThreadPool();
             s1.setExecutor (executor);
             s2.setExecutor (executor);
-            ctx = new SimpleSSLContext().get();
             s2.setHttpsConfigurator(new HttpsConfigurator (ctx));
             s1.start();
             s2.start();
diff --git a/test/jdk/com/sun/net/httpserver/Test9a.java b/test/jdk/com/sun/net/httpserver/Test9a.java
index 85acfd26518..56fbf9953a3 100644
--- a/test/jdk/com/sun/net/httpserver/Test9a.java
+++ b/test/jdk/com/sun/net/httpserver/Test9a.java
@@ -56,8 +56,8 @@ public class Test9a extends Test {
     private static final String TEMP_FILE_PREFIX =
             HttpServer.class.getPackageName() + '-' + Test9a.class.getSimpleName() + '-';
 
-    static SSLContext serverCtx;
-    static volatile SSLContext clientCtx = null;
+    private static final SSLContext serverCtx = SimpleSSLContext.findSSLContext();
+    private static final SSLContext clientCtx = SimpleSSLContext.findSSLContext();
     static volatile boolean error = false;
 
     public static void main (String[] args) throws Exception {
@@ -76,8 +76,6 @@ public class Test9a extends Test {
             HttpContext c1 = server.createContext ("/", h);
             executor = Executors.newCachedThreadPool();
             server.setExecutor (executor);
-            serverCtx = new SimpleSSLContext().get();
-            clientCtx = new SimpleSSLContext().get();
             server.setHttpsConfigurator(new HttpsConfigurator (serverCtx));
             server.start();
 
diff --git a/test/jdk/com/sun/net/httpserver/UnmodifiableHeadersTest.java b/test/jdk/com/sun/net/httpserver/UnmodifiableHeadersTest.java
index 84fd5aceaa7..196cf36f010 100644
--- a/test/jdk/com/sun/net/httpserver/UnmodifiableHeadersTest.java
+++ b/test/jdk/com/sun/net/httpserver/UnmodifiableHeadersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 8251496 8333590
  * @summary Test that UnmodifiableHeaders is in fact immutable
  * @modules jdk.httpserver/sun.net.httpserver:+open
- * @run testng/othervm UnmodifiableHeadersTest
+ * @run junit/othervm UnmodifiableHeadersTest
  */
 
 import java.io.InputStream;
@@ -36,73 +36,75 @@ import java.net.URI;
 import java.util.AbstractMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpContext;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpPrincipal;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import sun.net.httpserver.UnmodifiableHeaders;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertThrows;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class UnmodifiableHeadersTest {
 
     @Test
-    public static void testEquality() {
+    public void testEquality() {
         var headers = new Headers();
         var unmodifiableHeaders1 = new UnmodifiableHeaders(headers);
-        assertEquals(unmodifiableHeaders1, headers);
-        assertEquals(unmodifiableHeaders1.hashCode(), headers.hashCode());
-        assertEquals(unmodifiableHeaders1.get("Foo"), headers.get("Foo"));
+        assertEquals(headers, unmodifiableHeaders1);
+        assertEquals(headers.hashCode(), unmodifiableHeaders1.hashCode());
+        assertEquals(headers.get("Foo"), unmodifiableHeaders1.get("Foo"));
 
         headers.add("Foo", "Bar");
         var unmodifiableHeaders2 = new UnmodifiableHeaders(headers);
-        assertEquals(unmodifiableHeaders2, headers);
-        assertEquals(unmodifiableHeaders2.hashCode(), headers.hashCode());
-        assertEquals(unmodifiableHeaders2.get("Foo"), headers.get("Foo"));
+        assertEquals(headers, unmodifiableHeaders2);
+        assertEquals(headers.hashCode(), unmodifiableHeaders2.hashCode());
+        assertEquals(headers.get("Foo"), unmodifiableHeaders2.get("Foo"));
     }
 
-    @DataProvider
-    public Object[][] headers() {
+    public static Stream<Headers> headers() {
         var headers = new Headers();
         headers.add("Foo", "Bar");
         var exchange = new TestHttpExchange(headers);
 
-        return new Object[][] {
-                { exchange.getRequestHeaders() },
-                { Headers.of("Foo", "Bar") },
-                { Headers.of(Map.of("Foo", List.of("Bar"))) },
-        };
+        return Stream.of(exchange.getRequestHeaders(),
+                Headers.of("Foo", "Bar"),
+                Headers.of(Map.of("Foo", List.of("Bar"))));
     }
 
-    @Test(dataProvider = "headers")
-    public static void testUnmodifiableHeaders(Headers headers) {
+    @ParameterizedTest
+    @MethodSource("headers")
+    public void testUnmodifiableHeaders(Headers headers) {
         assertUnsupportedOperation(headers);
         assertUnmodifiableCollection(headers);
         assertUnmodifiableList(headers);
     }
 
-    @DataProvider
-    public Object[][] toStringHeaders() {
+    public static Stream<Headers> toStringHeaders() {
         final Headers headers = new Headers();
         headers.add("hello", "World");
-        return new Object[][] {
-                { headers },
-                { Headers.of("abc", "XYZ") },
-                { Headers.of(Map.of("foo", List.of("Bar"))) },
-                { Headers.of(Map.of("Hello", List.of())) },
-                { Headers.of(Map.of("one", List.of("two", "THREE"))) },
-        };
+        return Stream.of(
+                headers,
+                Headers.of("abc", "XYZ"),
+                Headers.of(Map.of("foo", List.of("Bar"))),
+                Headers.of(Map.of("Hello", List.of())),
+                Headers.of(Map.of("one", List.of("two", "THREE")))
+        );
     }
 
     /*
      * Verify that the String returned by Headers.toString() contains the expected
      * key/value(s)
      */
-    @Test(dataProvider = "toStringHeaders")
+    @ParameterizedTest
+    @MethodSource("toStringHeaders")
     public void testToString(final Headers headers) {
         final Headers copy = Headers.of(headers);
         assertNotNull(copy, "Headers.of() returned null");
diff --git a/test/jdk/com/sun/net/httpserver/bugs/BasicAuthenticatorExceptionCheck.java b/test/jdk/com/sun/net/httpserver/bugs/BasicAuthenticatorExceptionCheck.java
index a07386be746..b4a4dfda041 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/BasicAuthenticatorExceptionCheck.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/BasicAuthenticatorExceptionCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,18 +27,20 @@
  * @library /test/lib
  * @summary Ensure that correct exceptions are being thrown in
  *          BasicAuthenticator constructor
- * @run testng BasicAuthenticatorExceptionCheck
+ * @run junit BasicAuthenticatorExceptionCheck
  */
 
 
 import java.nio.charset.Charset;
 import com.sun.net.httpserver.BasicAuthenticator;
-import org.testng.annotations.Test;
 
-import static org.testng.Assert.expectThrows;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 
 public class BasicAuthenticatorExceptionCheck {
     static final Class<NullPointerException> NPE = NullPointerException.class;
@@ -62,42 +64,42 @@ public class BasicAuthenticatorExceptionCheck {
     @Test
     public void testAuthenticationException() {
 
-        Throwable ex = expectThrows(NPE, () ->
+        Throwable ex = Assertions.assertThrows(NPE, () ->
                 createBasicAuthenticator("/test", null));
         System.out.println("Valid realm and Null charset provided - " +
                 "NullPointerException thrown as expected: " + ex);
 
-        ex = expectThrows(NPE, () ->
+        ex = Assertions.assertThrows(NPE, () ->
                 createBasicAuthenticator(null, UTF_8));
         System.out.println("Null realm and valid charset provided - " +
                 "NullPointerException thrown as expected: " + ex);
 
-        ex = expectThrows(IAE, () ->
+        ex = Assertions.assertThrows(IAE, () ->
                 createBasicAuthenticator("", UTF_8));
-        assertEquals(ex.getMessage(), "realm must not be empty");
+        assertEquals("realm must not be empty", ex.getMessage());
         System.out.println("Empty string for realm and valid charset provided - " +
                 "IllegalArgumentException thrown as expected: " + ex);
 
-        ex = expectThrows(NPE, () ->
+        ex = Assertions.assertThrows(NPE, () ->
                 createBasicAuthenticator(null));
         System.out.println("Null realm provided - " +
                 "NullPointerException thrown as expected: " + ex);
 
-        ex = expectThrows(IAE, () ->
+        ex = Assertions.assertThrows(IAE, () ->
                 createBasicAuthenticator(""));
-        assertEquals(ex.getMessage(), "realm must not be empty");
+        assertEquals("realm must not be empty", ex.getMessage());
         System.out.println("Empty string for realm provided - " +
                 "IllegalArgumentException thrown as expected: " + ex);
 
-        ex = expectThrows(IAE, () ->
+        ex = Assertions.assertThrows(IAE, () ->
                 createBasicAuthenticator("\"/test\""));
-        assertEquals(ex.getMessage(), "realm invalid: \"/test\"");
+        assertEquals("realm invalid: \"/test\"", ex.getMessage());
         System.out.println("Invalid string for realm provided - " +
                 "IllegalArgumentException thrown as expected: " + ex);
 
-        ex = expectThrows(IAE, () ->
+        ex = Assertions.assertThrows(IAE, () ->
                 createBasicAuthenticator("\""));
-        assertEquals(ex.getMessage(), "realm invalid: \"");
+        assertEquals("realm invalid: \"", ex.getMessage());
         System.out.println("Invalid string for realm provided - " +
                 "IllegalArgumentException thrown as expected: " + ex);
 
diff --git a/test/jdk/com/sun/net/httpserver/bugs/HandlerConnectionClose.java b/test/jdk/com/sun/net/httpserver/bugs/HandlerConnectionClose.java
index 89839e462c5..372e941904e 100644
--- a/test/jdk/com/sun/net/httpserver/bugs/HandlerConnectionClose.java
+++ b/test/jdk/com/sun/net/httpserver/bugs/HandlerConnectionClose.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@ public class HandlerConnectionClose
 {
     static final int ONEK = 1024;
     static final long POST_SIZE = ONEK * 1L;
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     Logger logger;
 
     void test(String[] args) throws Exception {
@@ -77,7 +77,6 @@ public class HandlerConnectionClose
         } finally {
             httpServer.stop(0);
         }
-        sslContext = new SimpleSSLContext().get();
         HttpServer httpsServer = startHttpServer("https");
         try {
             testHttpURLConnection(httpsServer, "https","/close/legacy/https/chunked");
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/CommandLineNegativeTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/CommandLineNegativeTest.java
index a82b0bf5a6f..818469d00fc 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/CommandLineNegativeTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/CommandLineNegativeTest.java
@@ -26,7 +26,7 @@
  * @summary Negative tests for java -m jdk.httpserver command
  * @library /test/lib
  * @modules jdk.httpserver
- * @run testng/othervm CommandLineNegativeTest
+ * @run junit/othervm CommandLineNegativeTest
  */
 
 import java.io.IOException;
@@ -37,13 +37,14 @@ import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.util.FileUtils;
-import org.testng.SkipException;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
-import static org.testng.Assert.assertFalse;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class CommandLineNegativeTest {
 
@@ -55,8 +56,8 @@ public class CommandLineNegativeTest {
     static final Path TEST_FILE = TEST_DIR.resolve("file.txt");
     static final String LOOPBACK_ADDR = InetAddress.getLoopbackAddress().getHostAddress();
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         if (Files.exists(TEST_DIR)) {
             FileUtils.deleteFileTreeWithRetry(TEST_DIR);
         }
@@ -64,15 +65,15 @@ public class CommandLineNegativeTest {
         Files.createFile(TEST_FILE);
     }
 
-    @DataProvider
-    public Object[][] unknownOption() {
+    public static Object[][] unknownOption() {
         return new Object[][] {
                 {"--unknownOption"},
                 {"null"}
         };
     }
 
-    @Test(dataProvider = "unknownOption")
+    @ParameterizedTest
+    @MethodSource("unknownOption")
     public void testBadOption(String opt) throws Throwable {
         out.println("\n--- testUnknownOption, opt=\"%s\" ".formatted(opt));
         simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", opt)
@@ -80,8 +81,7 @@ public class CommandLineNegativeTest {
                 .shouldContain("Error: unknown option: " + opt);
     }
 
-    @DataProvider
-    public Object[][] tooManyOptionArgs() {
+    public static Object[][] tooManyOptionArgs() {
         return new Object[][] {
                 {"-b", "localhost"},
                 {"-d", "/some/path"},
@@ -95,7 +95,8 @@ public class CommandLineNegativeTest {
         };
     }
 
-    @Test(dataProvider = "tooManyOptionArgs")
+    @ParameterizedTest
+    @MethodSource("tooManyOptionArgs")
     public void testTooManyOptionArgs(String opt, String arg) throws Throwable {
         out.println("\n--- testTooManyOptionArgs, opt=\"%s\" ".formatted(opt));
         simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", opt, arg, arg)
@@ -103,8 +104,7 @@ public class CommandLineNegativeTest {
                 .shouldContain("Error: unknown option: " + arg);
     }
 
-    @DataProvider
-    public Object[][] noArg() {
+    public static Object[][] noArg() {
         return new Object[][] {
                 {"-b", """
                     -b, --bind-address    - Address to bind to. Default: %s (loopback).
@@ -122,7 +122,8 @@ public class CommandLineNegativeTest {
         };
     }
 
-    @Test(dataProvider = "noArg")
+    @ParameterizedTest
+    @MethodSource("noArg")
     public void testNoArg(String opt, String msg) throws Throwable {
         out.println("\n--- testNoArg, opt=\"%s\" ".formatted(opt));
         simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", opt)
@@ -131,8 +132,7 @@ public class CommandLineNegativeTest {
                 .shouldContain(msg);
     }
 
-    @DataProvider
-    public Object[][] invalidValue() {
+    public static Object[][] invalidValue() {
         return new Object[][] {
                 {"-b", "[127.0.0.1]"},
                 {"-b", "badhost"},
@@ -146,7 +146,8 @@ public class CommandLineNegativeTest {
         };
     }
 
-    @Test(dataProvider = "invalidValue")
+    @ParameterizedTest
+    @MethodSource("invalidValue")
     public void testInvalidValue(String opt, String val) throws Throwable {
         out.println("\n--- testInvalidValue, opt=\"%s\" ".formatted(opt));
         simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", opt, val)
@@ -154,10 +155,10 @@ public class CommandLineNegativeTest {
                 .shouldContain("Error: invalid value given for " + opt + ": " + val);
     }
 
-    @DataProvider
-    public Object[][] portOptions() { return new Object[][] {{"-p"}, {"--port"}}; }
+    public static Object[][] portOptions() { return new Object[][] {{"-p"}, {"--port"}}; }
 
-    @Test(dataProvider = "portOptions")
+    @ParameterizedTest
+    @MethodSource("portOptions")
     public void testPortOutOfRange(String opt) throws Throwable {
         out.println("\n--- testPortOutOfRange, opt=\"%s\" ".formatted(opt));
         simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", opt, "65536")  // range 0 to 65535
@@ -165,10 +166,10 @@ public class CommandLineNegativeTest {
                 .shouldContain("Error: server config failed: " + "port out of range:65536");
     }
 
-    @DataProvider
-    public Object[][] directoryOptions() { return new Object[][] {{"-d"}, {"--directory"}}; }
+    public static Object[][] directoryOptions() { return new Object[][] {{"-d"}, {"--directory"}}; }
 
-    @Test(dataProvider = "directoryOptions")
+    @ParameterizedTest
+    @MethodSource("directoryOptions")
     public void testRootNotADirectory(String opt) throws Throwable {
         out.println("\n--- testRootNotADirectory, opt=\"%s\" ".formatted(opt));
         var file = TEST_FILE.toString();
@@ -178,7 +179,8 @@ public class CommandLineNegativeTest {
                 .shouldContain("Error: server config failed: " + "Path is not a directory: " + file);
     }
 
-    @Test(dataProvider = "directoryOptions")
+    @ParameterizedTest
+    @MethodSource("directoryOptions")
     public void testRootDoesNotExist(String opt) throws Throwable {
         out.println("\n--- testRootDoesNotExist, opt=\"%s\" ".formatted(opt));
         Path root = TEST_DIR.resolve("not/existent/dir");
@@ -188,14 +190,12 @@ public class CommandLineNegativeTest {
                 .shouldContain("Error: server config failed: " + "Path does not exist: " + root.toString());
     }
 
-    @Test(dataProvider = "directoryOptions")
+    @ParameterizedTest
+    @MethodSource("directoryOptions")
     public void testRootNotReadable(String opt) throws Throwable {
         out.println("\n--- testRootNotReadable, opt=\"%s\" ".formatted(opt));
-        if (Platform.isWindows()) {
-            // Not applicable to Windows. Reason: cannot revoke an owner's read
-            // access to a directory that was created by that owner
-            throw new SkipException("cannot run on Windows");
-        }
+        Assumptions.assumeFalse(Platform.isWindows(), "cannot run on Windows"); // Not applicable to Windows. Reason: cannot revoke an owner's read
+        // access to a directory that was created by that owner
         Path root = Files.createDirectories(TEST_DIR.resolve("not/readable/dir"));
         try {
             root.toFile().setReadable(false, false);
@@ -208,8 +208,8 @@ public class CommandLineNegativeTest {
         }
     }
 
-    @AfterTest
-    public void teardown() throws IOException {
+    @AfterAll
+    public static void teardown() throws IOException {
         if (Files.exists(TEST_DIR)) {
             FileUtils.deleteFileTreeWithRetry(TEST_DIR);
         }
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/CommandLinePortNotSpecifiedTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/CommandLinePortNotSpecifiedTest.java
index 61a872a8655..c665f37abe7 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/CommandLinePortNotSpecifiedTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/CommandLinePortNotSpecifiedTest.java
@@ -27,7 +27,7 @@
  * @summary Tests the java -m jdk.httpserver command with port not specified
  * @modules jdk.httpserver
  * @library /test/lib
- * @run testng/othervm/manual CommandLinePortNotSpecifiedTest
+ * @run junit/othervm/manual CommandLinePortNotSpecifiedTest
  */
 
 import java.io.IOException;
@@ -39,11 +39,12 @@ import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.util.FileUtils;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
 public class CommandLinePortNotSpecifiedTest {
 
     static final Path JAVA_HOME = Path.of(System.getProperty("java.home"));
@@ -55,8 +56,8 @@ public class CommandLinePortNotSpecifiedTest {
     static final String TEST_DIR_STR = TEST_DIR.toString();
     static final String LOOPBACK_ADDR = InetAddress.getLoopbackAddress().getHostAddress();
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         if (Files.exists(TEST_DIR)) {
             FileUtils.deleteFileTreeWithRetry(TEST_DIR);
         }
@@ -92,8 +93,8 @@ public class CommandLinePortNotSpecifiedTest {
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
-    @AfterTest
-    public void teardown() throws IOException {
+    @AfterAll
+    public static void teardown() throws IOException {
         if (Files.exists(TEST_DIR)) {
             FileUtils.deleteFileTreeWithRetry(TEST_DIR);
         }
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/CommandLinePositiveTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/CommandLinePositiveTest.java
index 16d0ff67ee9..3c3ac0c215d 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/CommandLinePositiveTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/CommandLinePositiveTest.java
@@ -27,7 +27,7 @@
  * @library /test/lib
  * @build jdk.test.lib.net.IPSupport
  * @modules jdk.httpserver
- * @run testng/othervm CommandLinePositiveTest
+ * @run junit/othervm CommandLinePositiveTest
  */
 
 import java.io.IOException;
@@ -41,12 +41,13 @@ import jdk.test.lib.net.IPSupport;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.util.FileUtils;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 public class CommandLinePositiveTest {
 
     static final String JAVA_VERSION = System.getProperty("java.version");
@@ -84,8 +85,8 @@ public class CommandLinePositiveTest {
 
     static final String LOOPBACK_ADDR = InetAddress.getLoopbackAddress().getHostAddress();
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         if (Files.exists(ROOT_DIR)) {
             FileUtils.deleteFileTreeWithRetry(ROOT_DIR);
         }
@@ -105,16 +106,17 @@ public class CommandLinePositiveTest {
         }
     }
 
-    @DataProvider
-    public Object[][] directoryOptions() { return new Object[][] {{"-d"}, {"--directory"}}; }
+    public static Object[][] directoryOptions() { return new Object[][] {{"-d"}, {"--directory"}}; }
 
-    @Test(dataProvider = "directoryOptions")
+    @ParameterizedTest
+    @MethodSource("directoryOptions")
     public void testAbsDirectory(String opt) throws Throwable {
         out.printf("\n--- testAbsDirectory, opt=\"%s\"%n", opt);
         testDirectory(opt, ROOT_DIR_STR);
     }
 
-    @Test(dataProvider = "directoryOptions")
+    @ParameterizedTest
+    @MethodSource("directoryOptions")
     public void testRelDirectory(String opt) throws Throwable {
         out.printf("\n--- testRelDirectory, opt=\"%s\"%n", opt);
         Path rootRelDir = CWD.relativize(ROOT_DIR);
@@ -129,10 +131,10 @@ public class CommandLinePositiveTest {
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
-    @DataProvider
-    public Object[][] portOptions() { return new Object[][] {{"-p"}, {"--port"}}; }
+    public static Object[][] portOptions() { return new Object[][] {{"-p"}, {"--port"}}; }
 
-    @Test(dataProvider = "portOptions")
+    @ParameterizedTest
+    @MethodSource("portOptions")
     public void testPort(String opt) throws Throwable {
         out.println("\n--- testPort, opt=\"%s\" ".formatted(opt));
         simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", opt, "0")
@@ -142,8 +144,7 @@ public class CommandLinePositiveTest {
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
-    @DataProvider
-    public Object[][] helpOptions() { return new Object[][] {{"-h"}, {"-?"}, {"--help"}}; }
+    public static Object[][] helpOptions() { return new Object[][] {{"-h"}, {"-?"}, {"--help"}}; }
 
     static final String USAGE_TEXT = """
             Usage: java -m jdk.httpserver [-b bind address] [-p port] [-d directory]
@@ -161,7 +162,8 @@ public class CommandLinePositiveTest {
             -version, --version   - Prints version information and exits.
             To stop the server, press Ctrl + C.""".formatted(LOOPBACK_ADDR);
 
-    @Test(dataProvider = "helpOptions")
+    @ParameterizedTest
+    @MethodSource("helpOptions")
     public void testHelp(String opt) throws Throwable {
         out.println("\n--- testHelp, opt=\"%s\" ".formatted(opt));
         simpleserver(WaitForLine.HELP_STARTUP_LINE,
@@ -172,10 +174,10 @@ public class CommandLinePositiveTest {
                 .shouldContain(OPTIONS_TEXT);
     }
 
-    @DataProvider
-    public Object[][] versionOptions() { return new Object[][] {{"-version"}, {"--version"}}; }
+    public static Object[][] versionOptions() { return new Object[][] {{"-version"}, {"--version"}}; }
 
-    @Test(dataProvider = "versionOptions")
+    @ParameterizedTest
+    @MethodSource("versionOptions")
     public void testVersion(String opt) throws Throwable {
         out.println("\n--- testVersion, opt=\"%s\" ".formatted(opt));
         simpleserver(WaitForLine.VERSION_STARTUP_LINE,
@@ -184,10 +186,10 @@ public class CommandLinePositiveTest {
                 .shouldHaveExitValue(0);
     }
 
-    @DataProvider
-    public Object[][] bindOptions() { return new Object[][] {{"-b"}, {"--bind-address"}}; }
+    public static Object[][] bindOptions() { return new Object[][] {{"-b"}, {"--bind-address"}}; }
 
-    @Test(dataProvider = "bindOptions")
+    @ParameterizedTest
+    @MethodSource("bindOptions")
     public void testBindAllInterfaces(String opt) throws Throwable {
         out.println("\n--- testBindAllInterfaces, opt=\"%s\" ".formatted(opt));
         simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", "-p", "0", opt, "0.0.0.0")
@@ -202,7 +204,8 @@ public class CommandLinePositiveTest {
         }
     }
 
-    @Test(dataProvider = "bindOptions")
+    @ParameterizedTest
+    @MethodSource("bindOptions")
     public void testLastOneWinsBindAddress(String opt) throws Throwable {
         out.println("\n--- testLastOneWinsBindAddress, opt=\"%s\" ".formatted(opt));
         simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", "-p", "0", opt, "123.4.5.6", opt, LOOPBACK_ADDR)
@@ -212,7 +215,8 @@ public class CommandLinePositiveTest {
 
     }
 
-    @Test(dataProvider = "directoryOptions")
+    @ParameterizedTest
+    @MethodSource("directoryOptions")
     public void testLastOneWinsDirectory(String opt) throws Throwable {
         out.println("\n--- testLastOneWinsDirectory, opt=\"%s\" ".formatted(opt));
         simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", "-p", "0", opt, ROOT_DIR_STR, opt, ROOT_DIR_STR)
@@ -222,10 +226,10 @@ public class CommandLinePositiveTest {
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
-    @DataProvider
-    public Object[][] outputOptions() { return new Object[][] {{"-o"}, {"--output"}}; }
+    public static Object[][] outputOptions() { return new Object[][] {{"-o"}, {"--output"}}; }
 
-    @Test(dataProvider = "outputOptions")
+    @ParameterizedTest
+    @MethodSource("outputOptions")
     public void testLastOneWinsOutput(String opt) throws Throwable {
         out.println("\n--- testLastOneWinsOutput, opt=\"%s\" ".formatted(opt));
         simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", "-p", "0", opt, "none", opt, "verbose")
@@ -235,7 +239,8 @@ public class CommandLinePositiveTest {
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
-    @Test(dataProvider = "portOptions")
+    @ParameterizedTest
+    @MethodSource("portOptions")
     public void testLastOneWinsPort(String opt) throws Throwable {
         out.println("\n--- testLastOneWinsPort, opt=\"%s\" ".formatted(opt));
         simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", opt, "-999", opt, "0")
@@ -245,8 +250,8 @@ public class CommandLinePositiveTest {
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
-    @AfterTest
-    public void teardown() throws IOException {
+    @AfterAll
+    public static void teardown() throws IOException {
         if (Files.exists(ROOT_DIR)) {
             FileUtils.deleteFileTreeWithRetry(ROOT_DIR);
         }
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/CustomFileSystemTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/CustomFileSystemTest.java
index 0a46ac1ea8a..c0858475ea4 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/CustomFileSystemTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/CustomFileSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *          file system
  * @library /test/lib
  * @build jdk.test.lib.Platform jdk.test.lib.net.URIBuilder
- * @run testng/othervm CustomFileSystemTest
+ * @run junit/othervm CustomFileSystemTest
  */
 
 import java.io.IOException;
@@ -71,16 +71,18 @@ import com.sun.net.httpserver.SimpleFileServer;
 import com.sun.net.httpserver.SimpleFileServer.OutputLevel;
 import jdk.test.lib.Platform;
 import jdk.test.lib.net.URIBuilder;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import org.testng.SkipException;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.StandardOpenOption.CREATE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class CustomFileSystemTest {
     static final InetSocketAddress LOOPBACK_ADDR = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
@@ -88,8 +90,8 @@ public class CustomFileSystemTest {
     static final boolean ENABLE_LOGGING = true;
     static final Logger LOGGER = Logger.getLogger("com.sun.net.httpserver");
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         if (ENABLE_LOGGING) {
             ConsoleHandler ch = new ConsoleHandler();
             LOGGER.setLevel(Level.ALL);
@@ -111,11 +113,11 @@ public class CustomFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "aFile.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), "some text");
-            assertEquals(response.headers().firstValue("content-type").get(), "text/plain");
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
+            assertEquals(200, response.statusCode());
+            assertEquals("some text", response.body());
+            assertEquals("text/plain", response.headers().firstValue("content-type").get());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(lastModified, response.headers().firstValue("last-modified").get());
         } finally {
             server.stop(0);
         }
@@ -140,11 +142,11 @@ public class CustomFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().firstValue("content-type").get(), "text/html; charset=UTF-8");
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(200, response.statusCode());
+            assertEquals("text/html; charset=UTF-8", response.headers().firstValue("content-type").get());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(lastModified, response.headers().firstValue("last-modified").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
         }
@@ -164,11 +166,11 @@ public class CustomFileSystemTest {
             var request = HttpRequest.newBuilder(uri(server, "aFile.txt"))
                     .method("HEAD", HttpRequest.BodyPublishers.noBody()).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().firstValue("content-type").get(), "text/plain");
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
-            assertEquals(response.body(), "");
+            assertEquals(200, response.statusCode());
+            assertEquals("text/plain", response.headers().firstValue("content-type").get());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(lastModified, response.headers().firstValue("last-modified").get());
+            assertEquals("", response.body());
         } finally {
             server.stop(0);
         }
@@ -194,18 +196,17 @@ public class CustomFileSystemTest {
             var request = HttpRequest.newBuilder(uri(server, ""))
                     .method("HEAD", HttpRequest.BodyPublishers.noBody()).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().firstValue("content-type").get(), "text/html; charset=UTF-8");
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
-            assertEquals(response.body(), "");
+            assertEquals(200, response.statusCode());
+            assertEquals("text/html; charset=UTF-8", response.headers().firstValue("content-type").get());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(lastModified, response.headers().firstValue("last-modified").get());
+            assertEquals("", response.body());
         } finally {
             server.stop(0);
         }
     }
 
-    @DataProvider
-    public Object[][] indexFiles() {
+    public static Object[][] indexFiles() {
         var fileContent = openHTML + """
                 <h1>This is an index file</h1>
                 """ + closeHTML;
@@ -221,7 +222,8 @@ public class CustomFileSystemTest {
         };
     }
 
-    @Test(dataProvider = "indexFiles")
+    @ParameterizedTest
+    @MethodSource("indexFiles")
     public void testDirectoryWithIndexGET(String id,
                                           String filename,
                                           String contentType,
@@ -241,11 +243,11 @@ public class CustomFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().firstValue("content-type").get(), contentType);
-            assertEquals(response.headers().firstValue("content-length").get(), contentLength);
-            assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(200, response.statusCode());
+            assertEquals(contentType, response.headers().firstValue("content-type").get());
+            assertEquals(contentLength, response.headers().firstValue("content-length").get());
+            assertEquals(lastModified, response.headers().firstValue("last-modified").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
             if (serveIndexFile) {
@@ -256,9 +258,7 @@ public class CustomFileSystemTest {
 
     @Test
     public void testNotReadableFileGET() throws Exception {
-        if (Platform.isWindows()) {
-            throw new SkipException("Not applicable on Windows");
-        }
+        Assumptions.assumeFalse(Platform.isWindows(), "Not applicable on Windows");
         var expectedBody = openHTML + """
             <h1>File not found</h1>
             <p>&#x2F;aFile.txt</p>
@@ -276,9 +276,9 @@ public class CustomFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "aFile.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
             file.toFile().setReadable(true, false);
@@ -287,9 +287,7 @@ public class CustomFileSystemTest {
 
     @Test
     public void testNotReadableSegmentGET() throws Exception {
-        if (Platform.isWindows()) {
-            throw new SkipException("Not applicable on Windows");
-        }
+        Assumptions.assumeFalse(Platform.isWindows(), "Not applicable on Windows");
         var expectedBody = openHTML + """
             <h1>File not found</h1>
             <p>&#x2F;dir&#x2F;aFile.txt</p>
@@ -309,9 +307,9 @@ public class CustomFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "dir/aFile.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
             dir.toFile().setReadable(true, false);
@@ -333,9 +331,9 @@ public class CustomFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "aFile?#.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
         }
@@ -356,9 +354,9 @@ public class CustomFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "doesNotExist.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
         }
@@ -380,9 +378,9 @@ public class CustomFileSystemTest {
             var request = HttpRequest.newBuilder(uri(server, "doesNotExist.txt"))
                     .method("HEAD", HttpRequest.BodyPublishers.noBody()).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), "");
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals("", response.body());
         } finally {
             server.stop(0);
         }
@@ -406,9 +404,9 @@ public class CustomFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "symlink")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
         }
@@ -433,21 +431,21 @@ public class CustomFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "symlink/aFile.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
         }
     }
 
-    private void createSymLink(Path symlink, Path target) {
+    private static void createSymLink(Path symlink, Path target) {
         try {
             Files.createSymbolicLink(symlink, target);
         } catch (UnsupportedOperationException uoe) {
-            throw new SkipException("sym link creation not supported", uoe);
+            Assumptions.abort("sym link creation not supported");
         } catch (IOException ioe) {
-            throw new SkipException("probably insufficient privileges to create sym links (Windows)", ioe);
+            Assumptions.abort("probably insufficient privileges to create sym links (Windows)");
         }
     }
 
@@ -470,9 +468,9 @@ public class CustomFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, fileName)).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
         }
@@ -494,15 +492,15 @@ public class CustomFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, ".hiddenDirectory/aFile.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
         }
     }
 
-    private Path createHiddenFile(Path root) throws IOException {
+    private static Path createHiddenFile(Path root) throws IOException {
         Path file;
         if (Platform.isWindows()) {
             file = Files.createFile(root.resolve("aFile.txt"));
@@ -514,7 +512,7 @@ public class CustomFileSystemTest {
         return file;
     }
 
-    private Path createFileInHiddenDirectory(Path root) throws IOException {
+    private static Path createFileInHiddenDirectory(Path root) throws IOException {
         Path dir;
         Path file;
         if (Platform.isWindows()) {
@@ -549,17 +547,17 @@ public class CustomFileSystemTest {
                 var uri = uri(server, "aDirectory");
                 var request = HttpRequest.newBuilder(uri).build();
                 var response = client.send(request, BodyHandlers.ofString());
-                assertEquals(response.statusCode(), 301);
-                assertEquals(response.headers().firstValue("content-length").get(), "0");
-                assertEquals(response.headers().firstValue("location").get(), "/aDirectory/");
+                assertEquals(301, response.statusCode());
+                assertEquals("0", response.headers().firstValue("content-length").get());
+                assertEquals("/aDirectory/", response.headers().firstValue("location").get());
 
                 // tests that query component is preserved during redirect
                 var uri2 = uri(server, "aDirectory", "query");
                 var req2 = HttpRequest.newBuilder(uri2).build();
                 var res2 = client.send(req2, BodyHandlers.ofString());
-                assertEquals(res2.statusCode(), 301);
-                assertEquals(res2.headers().firstValue("content-length").get(), "0");
-                assertEquals(res2.headers().firstValue("location").get(), "/aDirectory/?query");
+                assertEquals(301, res2.statusCode());
+                assertEquals("0", res2.headers().firstValue("content-length").get());
+                assertEquals("/aDirectory/?query", res2.headers().firstValue("location").get());
             }
 
             {   // tests that redirect to returned relative URI works
@@ -568,10 +566,10 @@ public class CustomFileSystemTest {
                 var uri = uri(server, "aDirectory");
                 var request = HttpRequest.newBuilder(uri).build();
                 var response = client.send(request, BodyHandlers.ofString());
-                assertEquals(response.statusCode(), 200);
-                assertEquals(response.body(), expectedBody);
-                assertEquals(response.headers().firstValue("content-type").get(), "text/html; charset=UTF-8");
-                assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
+                assertEquals(200, response.statusCode());
+                assertEquals(expectedBody, response.body());
+                assertEquals("text/html; charset=UTF-8", response.headers().firstValue("content-type").get());
+                assertEquals(expectedLength, response.headers().firstValue("content-length").get());
             }
         } finally {
             server.stop(0);
@@ -588,7 +586,7 @@ public class CustomFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "beginDelim%3C%3EEndDelim")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
+            assertEquals(404, response.statusCode());
             assertTrue(response.body().contains("beginDelim%3C%3EEndDelim"));
             assertTrue(response.body().contains("File not found"));
         } finally {
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/FileServerHandlerTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/FileServerHandlerTest.java
index a5179b03f16..85bad215375 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/FileServerHandlerTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/FileServerHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests for FileServerHandler
- * @run testng FileServerHandlerTest
+ * @run junit FileServerHandlerTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -44,42 +44,44 @@ import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpPrincipal;
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.SimpleFileServer;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class FileServerHandlerTest {
 
     static final Path CWD = Path.of(".").toAbsolutePath();
     static final Class<RuntimeException> RE = RuntimeException.class;
 
-    @DataProvider
-    public Object[][] notAllowedMethods() {
+    public static Object[][] notAllowedMethods() {
         var l = List.of("POST", "PUT", "DELETE", "TRACE", "OPTIONS");
         return l.stream().map(s -> new Object[] { s }).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "notAllowedMethods")
+    @ParameterizedTest
+    @MethodSource("notAllowedMethods")
     public void testNotAllowedRequestMethod(String requestMethod) throws Exception {
         var handler = SimpleFileServer.createFileHandler(CWD);
         var exchange = new MethodHttpExchange(requestMethod);
         handler.handle(exchange);
-        assertEquals(exchange.rCode, 405);
-        assertEquals(exchange.getResponseHeaders().getFirst("allow"), "HEAD, GET");
+        assertEquals(405, exchange.rCode);
+        assertEquals("HEAD, GET", exchange.getResponseHeaders().getFirst("allow"));
     }
 
-    @DataProvider
-    public Object[][] notImplementedMethods() {
+    public static Object[][] notImplementedMethods() {
         var l = List.of("GARBAGE", "RUBBISH", "TRASH", "FOO", "BAR");
         return l.stream().map(s -> new Object[] { s }).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "notImplementedMethods")
+    @ParameterizedTest
+    @MethodSource("notImplementedMethods")
     public void testNotImplementedRequestMethod(String requestMethod) throws Exception {
         var handler = SimpleFileServer.createFileHandler(CWD);
         var exchange = new MethodHttpExchange(requestMethod);
         handler.handle(exchange);
-        assertEquals(exchange.rCode, 501);
+        assertEquals(501, exchange.rCode);
     }
 
     // 301 and 404 response codes tested in SimpleFileServerTest
@@ -93,8 +95,8 @@ public class FileServerHandlerTest {
                     throw new RuntimeException("getRequestBody");
                 }
             };
-            var t = expectThrows(RE, () -> h.handle(exchange));
-            assertEquals(t.getMessage(), "getRequestBody");
+            var t = assertThrows(RE, () -> h.handle(exchange));
+            assertEquals("getRequestBody", t.getMessage());
         }
         {
             var exchange = new ThrowingHttpExchange("GET") {
@@ -102,8 +104,8 @@ public class FileServerHandlerTest {
                     throw new RuntimeException("getResponseHeaders");
                 }
             };
-            var t = expectThrows(RE, () -> h.handle(exchange));
-            assertEquals(t.getMessage(), "getResponseHeaders");
+            var t = assertThrows(RE, () -> h.handle(exchange));
+            assertEquals("getResponseHeaders", t.getMessage());
         }
         {
             var exchange = new ThrowingHttpExchange("GET") {
@@ -111,8 +113,8 @@ public class FileServerHandlerTest {
                     throw new RuntimeException("sendResponseHeaders");
                 }
             };
-            var t = expectThrows(RE, () -> h.handle(exchange));
-            assertEquals(t.getMessage(), "sendResponseHeaders");
+            var t = assertThrows(RE, () -> h.handle(exchange));
+            assertEquals("sendResponseHeaders", t.getMessage());
         }
         {
             var exchange = new ThrowingHttpExchange("GET") {
@@ -120,8 +122,8 @@ public class FileServerHandlerTest {
                     throw new RuntimeException("getResponseBody");
                 }
             };
-            var t = expectThrows(RE, () -> h.handle(exchange));
-            assertEquals(t.getMessage(), "getResponseBody");
+            var t = assertThrows(RE, () -> h.handle(exchange));
+            assertEquals("getResponseBody", t.getMessage());
         }
         {
             var exchange = new ThrowingHttpExchange("GET") {
@@ -129,8 +131,8 @@ public class FileServerHandlerTest {
                     throw new RuntimeException("close");
                 }
             };
-            var t = expectThrows(RE, () -> h.handle(exchange));
-            assertEquals(t.getMessage(), "close");
+            var t = assertThrows(RE, () -> h.handle(exchange));
+            assertEquals("close", t.getMessage());
         }
     }
 
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/HttpHandlersTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/HttpHandlersTest.java
index 85d271e44fa..46c7085ae14 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/HttpHandlersTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/HttpHandlersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @summary Tests for HttpHandlers
  * @library /test/lib
  * @build jdk.test.lib.net.URIBuilder
- * @run testng/othervm HttpHandlersTest
+ * @run junit/othervm HttpHandlersTest
  */
 
 import java.io.IOException;
@@ -44,12 +44,14 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import jdk.test.lib.net.URIBuilder;
 import com.sun.net.httpserver.*;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class HttpHandlersTest {
 
@@ -61,8 +63,8 @@ public class HttpHandlersTest {
     static final boolean ENABLE_LOGGING = true;
     static final Logger LOGGER = Logger.getLogger("com.sun.net.httpserver");
 
-    @BeforeTest
-    public void setup() {
+    @BeforeAll
+    public static void setup() {
         if (ENABLE_LOGGING) {
             ConsoleHandler ch = new ConsoleHandler();
             LOGGER.setLevel(Level.ALL);
@@ -103,11 +105,11 @@ public class HttpHandlersTest {
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, BodyHandlers.ofString());
             assertTrue(response.headers().map().containsKey("date"));
-            assertEquals(response.headers().firstValue("foo").get(), "bar");
-            assertEquals(response.headers().firstValue("content-length").get(), "0");
-            assertEquals(response.headers().map().size(), 3);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), "");
+            assertEquals("bar", response.headers().firstValue("foo").get());
+            assertEquals("0", response.headers().firstValue("content-length").get());
+            assertEquals(3, response.headers().map().size());
+            assertEquals(200, response.statusCode());
+            assertEquals("", response.body());
         } finally {
             server.stop(0);
         }
@@ -125,11 +127,11 @@ public class HttpHandlersTest {
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, BodyHandlers.ofString());
             assertTrue(response.headers().map().containsKey("date"));
-            assertEquals(response.headers().firstValue("foo").get(), "bar");
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.headers().map().size(), 3);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), "hello world");
+            assertEquals("bar", response.headers().firstValue("foo").get());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(3, response.headers().map().size());
+            assertEquals(200, response.statusCode());
+            assertEquals("hello world", response.body());
         } finally {
             server.stop(0);
         }
@@ -148,9 +150,9 @@ public class HttpHandlersTest {
                     .method("HEAD", BodyPublishers.noBody()).build();
             var response = client.send(request, BodyHandlers.ofString());
             assertTrue(response.headers().map().containsKey("date"));
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.headers().map().size(), 2);
-            assertEquals(response.statusCode(), 200);
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(2, response.headers().map().size());
+            assertEquals(200, response.statusCode());
         } finally {
             server.stop(0);
         }
@@ -168,22 +170,22 @@ public class HttpHandlersTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertNotEquals(response.headers().firstValue("date").get(), "12345");
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.headers().map().size(), 2);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), "hello world");
+            assertNotEquals("12345", response.headers().firstValue("date").get());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(2, response.headers().map().size());
+            assertEquals(200, response.statusCode());
+            assertEquals("hello world", response.body());
         } finally {
             server.stop(0);
         }
     }
 
-    @DataProvider
-    public Object[][] responseBodies() {
+    public static Object[][] responseBodies() {
         return new Object[][] { {"hello world"}, {""} };
     }
 
-    @Test(dataProvider = "responseBodies")
+    @ParameterizedTest
+    @MethodSource("responseBodies")
     public void testOfThrowingExchange(String body) {
         var h = HttpHandlers.of(200, Headers.of(), body);
         {
@@ -192,8 +194,8 @@ public class HttpHandlersTest {
                     throw new RuntimeException("getRequestBody");
                 }
             };
-            var t = expectThrows(RE, () -> h.handle(exchange));
-            assertEquals(t.getMessage(), "getRequestBody");
+            var t = assertThrows(RE, () -> h.handle(exchange));
+            assertEquals("getRequestBody", t.getMessage());
         }
         {
             var exchange = new ThrowingHttpExchange() {
@@ -201,8 +203,8 @@ public class HttpHandlersTest {
                     throw new RuntimeException("getResponseHeaders");
                 }
             };
-            var t = expectThrows(RE, () -> h.handle(exchange));
-            assertEquals(t.getMessage(), "getResponseHeaders");
+            var t = assertThrows(RE, () -> h.handle(exchange));
+            assertEquals("getResponseHeaders", t.getMessage());
         }
         {
             var exchange = new ThrowingHttpExchange() {
@@ -210,8 +212,8 @@ public class HttpHandlersTest {
                     throw new RuntimeException("sendResponseHeaders");
                 }
             };
-            var t = expectThrows(RE, () -> h.handle(exchange));
-            assertEquals(t.getMessage(), "sendResponseHeaders");
+            var t = assertThrows(RE, () -> h.handle(exchange));
+            assertEquals("sendResponseHeaders", t.getMessage());
         }
         {
             var exchange = new ThrowingHttpExchange() {
@@ -220,8 +222,8 @@ public class HttpHandlersTest {
                 }
             };
             if (!body.isEmpty()) {  // getResponseBody not called if no responseBody
-                var t = expectThrows(RE, () -> h.handle(exchange));
-                assertEquals(t.getMessage(), "getResponseBody");
+                var t = assertThrows(RE, () -> h.handle(exchange));
+                assertEquals("getResponseBody", t.getMessage());
             }
         }
         {
@@ -230,8 +232,8 @@ public class HttpHandlersTest {
                     throw new RuntimeException("close");
                 }
             };
-            var t = expectThrows(RE, () -> h.handle(exchange));
-            assertEquals(t.getMessage(), "close");
+            var t = assertThrows(RE, () -> h.handle(exchange));
+            assertEquals("close", t.getMessage());
         }
     }
 
@@ -247,8 +249,8 @@ public class HttpHandlersTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), "TestHandler-1");
+            assertEquals(200, response.statusCode());
+            assertEquals("TestHandler-1", response.body());
         } finally {
             server.stop(0);
         }
@@ -266,8 +268,8 @@ public class HttpHandlersTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), "TestHandler-2");
+            assertEquals(200, response.statusCode());
+            assertEquals("TestHandler-2", response.body());
         } finally {
             server.stop(0);
         }
@@ -287,8 +289,8 @@ public class HttpHandlersTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), "TestHandler-2");
+            assertEquals(200, response.statusCode());
+            assertEquals("TestHandler-2", response.body());
         } finally {
             server.stop(0);
         }
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/HttpsServerAlertTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/HttpsServerAlertTest.java
index 2ba54d61ada..ba6812ffaa5 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/HttpsServerAlertTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/HttpsServerAlertTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,15 +27,13 @@
  * @summary Test if HttpsServer sends the TLS alerts produced
  * @library /test/lib
  * @build jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm HttpsServerAlertTest
+ * @run junit/othervm HttpsServerAlertTest
  */
 
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsParameters;
 import com.sun.net.httpserver.HttpsServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLHandshakeException;
@@ -50,7 +48,9 @@ import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class HttpsServerAlertTest {
 
@@ -59,18 +59,20 @@ public class HttpsServerAlertTest {
     static final boolean ENABLE_LOGGING = true;
     static final Logger LOGGER = Logger.getLogger("com.sun.net.httpserver");
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
-    @BeforeTest
-    public void setup() throws IOException {
+    static {
+        SSLContext.setDefault(sslContext);
+    }
+
+    @BeforeAll
+    public static void setup() throws IOException {
         if (ENABLE_LOGGING) {
             ConsoleHandler ch = new ConsoleHandler();
             LOGGER.setLevel(Level.ALL);
             ch.setLevel(Level.ALL);
             LOGGER.addHandler(ch);
         }
-        sslContext = new SimpleSSLContext().get();
-        SSLContext.setDefault(sslContext);
     }
 
     @Test
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/HttpsServerTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/HttpsServerTest.java
index 2227c4cd437..794067592df 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/HttpsServerTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/HttpsServerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @summary Test for HttpsServer::create
  * @library /test/lib
  * @build jdk.test.lib.Platform jdk.test.lib.net.URIBuilder
- * @run testng/othervm HttpsServerTest
+ * @run junit/othervm HttpsServerTest
  */
 
 import java.io.IOException;
@@ -40,7 +40,6 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -52,12 +51,13 @@ import com.sun.net.httpserver.HttpsServer;
 import javax.net.ssl.SSLContext;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.net.URIBuilder;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertThrows;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class HttpsServerTest {
 
@@ -67,18 +67,20 @@ public class HttpsServerTest {
     static final boolean ENABLE_LOGGING = true;
     static final Logger LOGGER = Logger.getLogger("com.sun.net.httpserver");
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
-    @BeforeTest
-    public void setup() throws IOException {
+    static {
+        SSLContext.setDefault(sslContext);
+    }
+
+    @BeforeAll
+    public static void setup() throws IOException {
         if (ENABLE_LOGGING) {
             ConsoleHandler ch = new ConsoleHandler();
             LOGGER.setLevel(Level.ALL);
             ch.setLevel(Level.ALL);
             LOGGER.addHandler(ch);
         }
-        sslContext = new SimpleSSLContext().get();
-        SSLContext.setDefault(sslContext);
     }
 
     @Test
@@ -96,12 +98,12 @@ public class HttpsServerTest {
         final var s1 = HttpsServer.create(null, 0);
         assertNull(s1.getAddress());
         s1.bind((LOOPBACK_ADDR), 0);
-        assertEquals(s1.getAddress().getAddress(), LOOPBACK_ADDR.getAddress());
+        assertEquals(LOOPBACK_ADDR.getAddress(), s1.getAddress().getAddress());
 
         final var s2 = HttpsServer.create(null, 0, "/foo/", new Handler());
         assertNull(s2.getAddress());
         s2.bind(LOOPBACK_ADDR, 0);
-        assertEquals(s2.getAddress().getAddress(), LOOPBACK_ADDR.getAddress());
+        assertEquals(LOOPBACK_ADDR.getAddress(), s2.getAddress().getAddress());
         s2.removeContext("/foo/");  // throws if context doesn't exist
     }
 
@@ -118,11 +120,10 @@ public class HttpsServerTest {
                     .build();
             var request = HttpRequest.newBuilder(uri(server, "/test")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), "hello world");
-            assertEquals(response.headers().firstValue("content-length").get(),
-                    Integer.toString("hello world".length()));
-            assertEquals(response.statusCode(), filter.responseCode.get().intValue());
+            assertEquals(200, response.statusCode());
+            assertEquals("hello world", response.body());
+            assertEquals(                    Integer.toString("hello world".length()), response.headers().firstValue("content-length").get());
+            assertEquals(filter.responseCode.get().intValue(), response.statusCode());
         } finally {
             server.stop(0);
         }
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/IdempotencyAndCommutativityTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/IdempotencyAndCommutativityTest.java
index d98944077dc..2fde02efe70 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/IdempotencyAndCommutativityTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/IdempotencyAndCommutativityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,14 +37,15 @@ import java.util.logging.Logger;
 import jdk.test.lib.net.URIBuilder;
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.SimpleFileServer;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.nio.file.StandardOpenOption.CREATE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -52,7 +53,7 @@ import static org.testng.Assert.assertTrue;
  *          set of binary request sequences
  * @library /test/lib
  * @build jdk.test.lib.net.URIBuilder
- * @run testng/othervm IdempotencyAndCommutativityTest
+ * @run junit/othervm IdempotencyAndCommutativityTest
  */
 public class IdempotencyAndCommutativityTest {
 
@@ -69,8 +70,8 @@ public class IdempotencyAndCommutativityTest {
     static final boolean ENABLE_LOGGING = true;
     static final Logger LOGGER = Logger.getLogger("com.sun.net.httpserver");
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         if (ENABLE_LOGGING) {
             ConsoleHandler ch = new ConsoleHandler();
             LOGGER.setLevel(Level.ALL);
@@ -89,8 +90,7 @@ public class IdempotencyAndCommutativityTest {
     record ExchangeValues(String method, String resource, int respCode, String contentType) {}
 
     // Creates an exhaustive set of binary exchange sequences
-    @DataProvider
-    public Object[][] allBinarySequences() {
+    public static Object[][] allBinarySequences() {
         final List<ExchangeValues> sequences =  List.of(
                 new ExchangeValues("GET",     FILE_NAME,         200, "text/plain"),
                 new ExchangeValues("GET",     DIR_NAME,          200, "text/html; charset=UTF-8"),
@@ -108,7 +108,8 @@ public class IdempotencyAndCommutativityTest {
                         .toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "allBinarySequences")
+    @ParameterizedTest
+    @MethodSource("allBinarySequences")
     public void testBinarySequences(ExchangeValues e1, ExchangeValues e2) throws Exception {
         System.out.println("---");
         System.out.println(e1);
@@ -122,15 +123,15 @@ public class IdempotencyAndCommutativityTest {
                                             .method(e.method(), HttpRequest.BodyPublishers.noBody())
                                             .build();
         var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-        assertEquals(response.statusCode(), e.respCode());
+        assertEquals(e.respCode(), response.statusCode());
         if (e.contentType != null) {
-            assertEquals(response.headers().firstValue("content-type").get(), e.contentType());
+            assertEquals(e.contentType(), response.headers().firstValue("content-type").get());
         } else {
             assertTrue(response.headers().firstValue("content-type").isEmpty());
         }
     }
 
-    @AfterTest
+    @AfterAll
     public static void teardown() {
         server.stop(0);
     }
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/MapToPathTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/MapToPathTest.java
index aa8f37acc1b..38f0b610741 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/MapToPathTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/MapToPathTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *          system path
  * @library /test/lib
  * @build jdk.test.lib.Platform jdk.test.lib.net.URIBuilder
- * @run testng/othervm MapToPathTest
+ * @run junit/othervm MapToPathTest
  */
 
 import java.io.IOException;
@@ -55,13 +55,14 @@ import com.sun.net.httpserver.SimpleFileServer;
 import com.sun.net.httpserver.SimpleFileServer.OutputLevel;
 import jdk.test.lib.net.URIBuilder;
 import jdk.test.lib.util.FileUtils;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.nio.file.StandardOpenOption.CREATE;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class MapToPathTest {
 
@@ -74,8 +75,8 @@ public class MapToPathTest {
     static final boolean ENABLE_LOGGING = true;
     static final Logger LOGGER = Logger.getLogger("com.sun.net.httpserver");
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         if (ENABLE_LOGGING) {
             ConsoleHandler ch = new ConsoleHandler();
             LOGGER.setLevel(Level.ALL);
@@ -88,7 +89,7 @@ public class MapToPathTest {
         createDirectories(TEST_DIR);
     }
 
-    private void createDirectories(Path testDir) throws IOException {
+    private static void createDirectories(Path testDir) throws IOException {
         //      Create directory tree:
         //
         //      |-- TEST_DIR
@@ -124,40 +125,40 @@ public class MapToPathTest {
             try {
                 var req1 = HttpRequest.newBuilder(uri(server, "/")).build();
                 var res1 = client.send(req1, BodyHandlers.ofString());
-                assertEquals(res1.statusCode(), 200);
-                assertEquals(res1.headers().firstValue("content-type").get(), "text/html; charset=UTF-8");
-                assertEquals(res1.headers().firstValue("content-length").get(), Long.toString(257L));
-                assertEquals(res1.headers().firstValue("last-modified").get(), getLastModified(TEST_DIR));
+                assertEquals(200, res1.statusCode());
+                assertEquals("text/html; charset=UTF-8", res1.headers().firstValue("content-type").get());
+                assertEquals(Long.toString(257L), res1.headers().firstValue("content-length").get());
+                assertEquals(getLastModified(TEST_DIR), res1.headers().firstValue("last-modified").get());
 
                 var req2 = HttpRequest.newBuilder(uri(server, "/../")).build();
                 var res2 = client.send(req2, BodyHandlers.ofString());
-                assertEquals(res2.statusCode(), 404);  // cannot escape root
+                assertEquals(404, res2.statusCode());  // cannot escape root
 
                 var req3 = HttpRequest.newBuilder(uri(server, "/foo/bar/baz/c://")).build();
                 var res3 = client.send(req3, BodyHandlers.ofString());
-                assertEquals(res3.statusCode(), 404);  // not found
+                assertEquals(404, res3.statusCode());  // not found
 
                 var req4 = HttpRequest.newBuilder(uri(server, "/foo/bar/baz/c:.//")).build();
                 var res4 = client.send(req4, BodyHandlers.ofString());
-                assertEquals(res4.statusCode(), 404);  // not found
+                assertEquals(404, res4.statusCode());  // not found
 
                 var req5 = HttpRequest.newBuilder(uri(server, "/foo/bar/baz/c:..//")).build();
                 var res5 = client.send(req5, BodyHandlers.ofString());
-                assertEquals(res5.statusCode(), 404);  // not found
+                assertEquals(404, res5.statusCode());  // not found
 
                 var req6 = HttpRequest.newBuilder(uri(server, "/foo/file:" + TEST_DIR.getParent())).build();
                 var res6 = client.send(req6, BodyHandlers.ofString());
-                assertEquals(res6.statusCode(), 404);  // not found
+                assertEquals(404, res6.statusCode());  // not found
 
                 var req7 = HttpRequest.newBuilder(uri(server, "/foo/bar/\\..\\../")).build();
                 var res7 = client.send(req7, BodyHandlers.ofString());
-                assertEquals(res7.statusCode(), 404);  // not found
+                assertEquals(404, res7.statusCode());  // not found
 
                 var req8 = HttpRequest.newBuilder(uri(server, "/foo")).build();
                 var res8 = client.send(req8, BodyHandlers.ofString());
-                assertEquals(res8.statusCode(), 301);  // redirect
-                assertEquals(res8.headers().firstValue("content-length").get(), "0");
-                assertEquals(res8.headers().firstValue("location").get(), "/foo/");
+                assertEquals(301, res8.statusCode());  // redirect
+                assertEquals("0", res8.headers().firstValue("content-length").get());
+                assertEquals("/foo/", res8.headers().firstValue("location").get());
             } finally {
                 server.stop(0);
             }
@@ -169,15 +170,15 @@ public class MapToPathTest {
             try {
                 var req1 = HttpRequest.newBuilder(uri(server, "/browse/file.txt")).build();
                 var res1 = client.send(req1, BodyHandlers.ofString());
-                assertEquals(res1.statusCode(), 200);
-                assertEquals(res1.body(), "testdir");
-                assertEquals(res1.headers().firstValue("content-type").get(), "text/plain");
-                assertEquals(res1.headers().firstValue("content-length").get(), Long.toString(7L));
-                assertEquals(res1.headers().firstValue("last-modified").get(), getLastModified(TEST_DIR.resolve("file.txt")));
+                assertEquals(200, res1.statusCode());
+                assertEquals("testdir", res1.body());
+                assertEquals("text/plain", res1.headers().firstValue("content-type").get());
+                assertEquals(Long.toString(7L), res1.headers().firstValue("content-length").get());
+                assertEquals(getLastModified(TEST_DIR.resolve("file.txt")), res1.headers().firstValue("last-modified").get());
 
                 var req2 = HttpRequest.newBuilder(uri(server, "/store/file.txt")).build();
                 var res2 = client.send(req2, BodyHandlers.ofString());
-                assertEquals(res2.statusCode(), 404);  // no context found
+                assertEquals(404, res2.statusCode());  // no context found
             } finally {
                 server.stop(0);
             }
@@ -190,29 +191,29 @@ public class MapToPathTest {
             try {
                 var req1 = HttpRequest.newBuilder(uri(server, "/foo/file.txt")).build();
                 var res1 = client.send(req1, BodyHandlers.ofString());
-                assertEquals(res1.statusCode(), 200);
-                assertEquals(res1.body(), "foo");
-                assertEquals(res1.headers().firstValue("content-type").get(), "text/plain");
-                assertEquals(res1.headers().firstValue("content-length").get(), Long.toString(3L));
-                assertEquals(res1.headers().firstValue("last-modified").get(), getLastModified(TEST_DIR.resolve("foo").resolve("file.txt")));
+                assertEquals(200, res1.statusCode());
+                assertEquals("foo", res1.body());
+                assertEquals("text/plain", res1.headers().firstValue("content-type").get());
+                assertEquals(Long.toString(3L), res1.headers().firstValue("content-length").get());
+                assertEquals(getLastModified(TEST_DIR.resolve("foo").resolve("file.txt")), res1.headers().firstValue("last-modified").get());
 
                 var req2 = HttpRequest.newBuilder(uri(server, "/foobar/file.txt")).build();
                 var res2 = client.send(req2, BodyHandlers.ofString());
-                assertEquals(res2.statusCode(), 404);  // no context found
+                assertEquals(404, res2.statusCode());  // no context found
 
                 var req3 = HttpRequest.newBuilder(uri(server, "/foo/../foobar/file.txt")).build();
                 var res3 = client.send(req3, BodyHandlers.ofString());
-                assertEquals(res3.statusCode(), 404);  // cannot escape context
+                assertEquals(404, res3.statusCode());  // cannot escape context
 
                 var req4 = HttpRequest.newBuilder(uri(server, "/foo/../..")).build();
                 var res4 = client.send(req4, BodyHandlers.ofString());
-                assertEquals(res4.statusCode(), 404);  // cannot escape root
+                assertEquals(404, res4.statusCode());  // cannot escape root
 
                 var req5 = HttpRequest.newBuilder(uri(server, "/foo/bar")).build();
                 var res5 = client.send(req5, BodyHandlers.ofString());
-                assertEquals(res5.statusCode(), 301);  // redirect
-                assertEquals(res5.headers().firstValue("content-length").get(), "0");
-                assertEquals(res5.headers().firstValue("location").get(), "/foo/bar/");
+                assertEquals(301, res5.statusCode());  // redirect
+                assertEquals("0", res5.headers().firstValue("content-length").get());
+                assertEquals("/foo/bar/", res5.headers().firstValue("location").get());
             } finally {
                 server.stop(0);
             }
@@ -225,35 +226,35 @@ public class MapToPathTest {
             try {
                 var req1 = HttpRequest.newBuilder(uri(server, "/foo/file.txt")).build();
                 var res1 = client.send(req1, BodyHandlers.ofString());
-                assertEquals(res1.statusCode(), 200);
-                assertEquals(res1.body(), "foo");
-                assertEquals(res1.headers().firstValue("content-type").get(), "text/plain");
-                assertEquals(res1.headers().firstValue("content-length").get(), Long.toString(3L));
-                assertEquals(res1.headers().firstValue("last-modified").get(), getLastModified(TEST_DIR.resolve("foo").resolve("file.txt")));
+                assertEquals(200, res1.statusCode());
+                assertEquals("foo", res1.body());
+                assertEquals("text/plain", res1.headers().firstValue("content-type").get());
+                assertEquals(Long.toString(3L), res1.headers().firstValue("content-length").get());
+                assertEquals(getLastModified(TEST_DIR.resolve("foo").resolve("file.txt")), res1.headers().firstValue("last-modified").get());
 
                 var req2 = HttpRequest.newBuilder(uri(server, "/foobar/")).build();
                 var res2 = client.send(req2, BodyHandlers.ofString());
-                assertEquals(res2.statusCode(), 404);  // handler prevents mapping to /foo/bar
+                assertEquals(404, res2.statusCode());  // handler prevents mapping to /foo/bar
 
                 var req3 = HttpRequest.newBuilder(uri(server, "/foobar/file.txt")).build();
                 var res3 = client.send(req3, BodyHandlers.ofString());
-                assertEquals(res3.statusCode(), 404);  // handler prevents mapping to /foo/bar/file.txt
+                assertEquals(404, res3.statusCode());  // handler prevents mapping to /foo/bar/file.txt
 
                 var req4 = HttpRequest.newBuilder(uri(server, "/file.txt")).build();
                 var res4 = client.send(req4, BodyHandlers.ofString());
-                assertEquals(res4.statusCode(), 404);
+                assertEquals(404, res4.statusCode());
 
                 var req5 = HttpRequest.newBuilder(uri(server, "/foo/bar")).build();
                 var res5 = client.send(req5, BodyHandlers.ofString());
-                assertEquals(res5.statusCode(), 301);  // redirect
-                assertEquals(res5.headers().firstValue("content-length").get(), "0");
-                assertEquals(res5.headers().firstValue("location").get(), "/foo/bar/");
+                assertEquals(301, res5.statusCode());  // redirect
+                assertEquals("0", res5.headers().firstValue("content-length").get());
+                assertEquals("/foo/bar/", res5.headers().firstValue("location").get());
 
                 var req6 = HttpRequest.newBuilder(uri(server, "/foo")).build();
                 var res6 = client.send(req6, BodyHandlers.ofString());
-                assertEquals(res6.statusCode(), 301);  // redirect
-                assertEquals(res6.headers().firstValue("content-length").get(), "0");
-                assertEquals(res6.headers().firstValue("location").get(), "/foo/");
+                assertEquals(301, res6.statusCode());  // redirect
+                assertEquals("0", res6.headers().firstValue("content-length").get());
+                assertEquals("/foo/", res6.headers().firstValue("location").get());
             } finally {
                 server.stop(0);
             }
@@ -276,7 +277,7 @@ public class MapToPathTest {
             try {
                 var req1 = HttpRequest.newBuilder(uri(server, "/foo/bar/c:/baz/")).build();
                 var res1 = client.send(req1, BodyHandlers.ofString());
-                assertEquals(res1.statusCode(), 404);  // not found
+                assertEquals(404, res1.statusCode());  // not found
             } finally {
                 server.stop(0);
             }
@@ -303,32 +304,32 @@ public class MapToPathTest {
                 out.println("uri.Path=" + uriPath);
                 var req1 = HttpRequest.newBuilder(uri(server, uriPath)).build();
                 var res1 = client.send(req1, BodyHandlers.ofString());
-                assertEquals(res1.statusCode(), 200);
-                assertEquals(res1.body(), "root response body");
+                assertEquals(200, res1.statusCode());
+                assertEquals("root response body", res1.body());
             }
             {
                 var req1 = HttpRequest.newBuilder(uri(server, "/foo/file.txt")).build();
                 var res1 = client.send(req1, BodyHandlers.ofString());
-                assertEquals(res1.statusCode(), 200);
-                assertEquals(res1.body(), "foo");
+                assertEquals(200, res1.statusCode());
+                assertEquals("foo", res1.body());
 
                 var req2 = HttpRequest.newBuilder(uri(server, "/foo/bar/baz/file.txt")).build();
                 var res2 = client.send(req2, BodyHandlers.ofString());
-                assertEquals(res2.statusCode(), 200);
-                assertEquals(res2.body(), "foo/bar/baz");
+                assertEquals(200, res2.statusCode());
+                assertEquals("foo/bar/baz", res2.body());
             }
             {
                 var req1 = HttpRequest.newBuilder(uri(server, "/foobar/file.txt")).build();
                 var res1 = client.send(req1, BodyHandlers.ofString());
-                assertEquals(res1.statusCode(), 200);
-                assertEquals(res1.body(), "foobar");
+                assertEquals(200, res1.statusCode());
+                assertEquals("foobar", res1.body());
             }
             for (String uriPath : List.of("/bar/", "/bar/t", "/bar/t/z", "/bar/index.html") ) {
                 out.println("uri.Path=" + uriPath);
                 var req1 = HttpRequest.newBuilder(uri(server, uriPath)).build();
                 var res1 = client.send(req1, BodyHandlers.ofString());
-                assertEquals(res1.statusCode(), 200);
-                assertEquals(res1.body(), "bar response body");
+                assertEquals(200, res1.statusCode());
+                assertEquals("bar response body", res1.body());
             }
         } finally {
             server.stop(0);
@@ -347,18 +348,18 @@ public class MapToPathTest {
                 out.println("uri.Query=" + query);
                 var req = HttpRequest.newBuilder(uri(server, "", query)).build();
                 var res = client.send(req, BodyHandlers.ofString());
-                assertEquals(res.statusCode(), 200);
-                assertEquals(res.headers().firstValue("content-type").get(), "text/html; charset=UTF-8");
-                assertEquals(res.headers().firstValue("content-length").get(), Long.toString(257L));
-                assertEquals(res.headers().firstValue("last-modified").get(), getLastModified(TEST_DIR));
+                assertEquals(200, res.statusCode());
+                assertEquals("text/html; charset=UTF-8", res.headers().firstValue("content-type").get());
+                assertEquals(Long.toString(257L), res.headers().firstValue("content-length").get());
+                assertEquals(getLastModified(TEST_DIR), res.headers().firstValue("last-modified").get());
             }
         } finally {
             server.stop(0);
         }
     }
 
-    @AfterTest
-    public void teardown() throws IOException {
+    @AfterAll
+    public static void teardown() throws IOException {
         if (Files.exists(TEST_DIR)) {
             FileUtils.deleteFileTreeWithRetry(TEST_DIR);
         }
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/OutputFilterTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/OutputFilterTest.java
index b7583ea901b..bed4b8e2f3d 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/OutputFilterTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/OutputFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @modules java.base/sun.net.www:+open
  * @library /test/lib
  * @build jdk.test.lib.net.URIBuilder
- * @run testng/othervm -Djdk.httpclient.redirects.retrylimit=1 OutputFilterTest
+ * @run junit/othervm -Djdk.httpclient.redirects.retrylimit=1 OutputFilterTest
  */
 
 import java.io.ByteArrayOutputStream;
@@ -53,15 +53,17 @@ import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.SimpleFileServer;
 import com.sun.net.httpserver.SimpleFileServer.OutputLevel;
 import jdk.test.lib.net.URIBuilder;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.nio.charset.StandardCharsets.*;
 import static com.sun.net.httpserver.SimpleFileServer.OutputLevel.*;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertThrows;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class OutputFilterTest {
     static final Class<NullPointerException> NPE = NullPointerException.class;
@@ -74,8 +76,8 @@ public class OutputFilterTest {
     static final boolean ENABLE_LOGGING = true;
     static final Logger logger = Logger.getLogger("com.sun.net.httpserver");
 
-    @BeforeTest
-    public void setup() {
+    @BeforeAll
+    public static void setup() {
         if (ENABLE_LOGGING) {
             ConsoleHandler ch = new ConsoleHandler();
             logger.setLevel(Level.ALL);
@@ -94,10 +96,10 @@ public class OutputFilterTest {
     @Test
     public void testDescription() {
         var filter = SimpleFileServer.createOutputFilter(OUT, VERBOSE);
-        assertEquals(filter.description(), "HttpExchange OutputFilter (outputLevel: VERBOSE)");
+        assertEquals("HttpExchange OutputFilter (outputLevel: VERBOSE)", filter.description());
 
         filter = SimpleFileServer.createOutputFilter(OUT, INFO);
-        assertEquals(filter.description(), "HttpExchange OutputFilter (outputLevel: INFO)");
+        assertEquals("HttpExchange OutputFilter (outputLevel: INFO)", filter.description());
     }
 
     @Test
@@ -120,9 +122,9 @@ public class OutputFilterTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().map().size(), 3);
-            assertEquals(response.body(), "hello world");
+            assertEquals(200, response.statusCode());
+            assertEquals(3, response.headers().map().size());
+            assertEquals("hello world", response.body());
         } finally {
             server.stop(0);
             baos.flush();
@@ -172,9 +174,9 @@ public class OutputFilterTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().map().size(), 2);
-            assertEquals(response.body(), "hello world");
+            assertEquals(200, response.statusCode());
+            assertEquals(2, response.headers().map().size());
+            assertEquals("hello world", response.body());
         } finally {
             server.stop(0);
             baos.flush();
@@ -207,8 +209,7 @@ public class OutputFilterTest {
         }
     }
 
-    @DataProvider
-    public Object[][] throwingHandler() {
+    public static Object[][] throwingHandler() {
         return new Object[][] {
                 {VERBOSE, "Error: server exchange handling failed: IOE ThrowingHandler" + System.lineSeparator()},
                 {INFO, "Error: server exchange handling failed: IOE ThrowingHandler" + System.lineSeparator()},
@@ -223,7 +224,8 @@ public class OutputFilterTest {
      * prevent retries on the client side, which would result in more than one
      * error message.
      */
-    @Test(dataProvider = "throwingHandler")
+    @ParameterizedTest
+    @MethodSource("throwingHandler")
     public void testExchangeThrowingHandler(OutputLevel level,
                                             String expectedOutput) throws Exception {
         var baos = new ByteArrayOutputStream();
@@ -243,7 +245,7 @@ public class OutputFilterTest {
         } finally {
             server.stop(0);
             baos.flush();
-            assertEquals(baos.toString(UTF_8), expectedOutput);
+            assertEquals(expectedOutput, baos.toString(UTF_8));
         }
     }
 
@@ -264,8 +266,8 @@ public class OutputFilterTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "aFile\u0000.txt")).build();
             var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().map().size(), 3);
+            assertEquals(404, response.statusCode());
+            assertEquals(3, response.headers().map().size());
         } finally {
             server.stop(0);
             baos.flush();
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/RequestTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/RequestTest.java
index cb740f4dd2a..5e29d7a3ddf 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/RequestTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/RequestTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests for Request
- * @run testng RequestTest
+ * @run junit RequestTest
  */
 
 import java.io.InputStream;
@@ -35,9 +35,10 @@ import java.util.AbstractMap;
 import java.util.List;
 import java.util.Map;
 import com.sun.net.httpserver.*;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertThrows;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
 
 public class RequestTest {
 
@@ -46,8 +47,8 @@ public class RequestTest {
         var headers = new Headers();
         Request request = new TestHttpExchange(headers);
         request = request.with("Foo", List.of("Bar"));
-        assertEquals(request.getRequestHeaders().size(), 1);
-        assertEquals(request.getRequestHeaders().get("Foo"), List.of("Bar"));
+        assertEquals(1, request.getRequestHeaders().size());
+        assertEquals(List.of("Bar"), request.getRequestHeaders().get("Foo"));
         assertReadOnly(request.getRequestHeaders());
     }
 
@@ -57,9 +58,9 @@ public class RequestTest {
         headers.add("Foo", "Bar");
         Request request = new TestHttpExchange(headers);
         request = request.with("X-Foo", List.of("Bar"));
-        assertEquals(request.getRequestHeaders().size(), 2);
-        assertEquals(request.getRequestHeaders().get("Foo"), List.of("Bar"));
-        assertEquals(request.getRequestHeaders().get("X-Foo"), List.of("Bar"));
+        assertEquals(2, request.getRequestHeaders().size());
+        assertEquals(List.of("Bar"), request.getRequestHeaders().get("Foo"));
+        assertEquals(List.of("Bar"), request.getRequestHeaders().get("X-Foo"));
         assertReadOnly(request.getRequestHeaders());
     }
 
@@ -70,8 +71,8 @@ public class RequestTest {
         headers.add(headerName, "Bar");
         Request request = new TestHttpExchange(headers);
         request = request.with(headerName, List.of("blahblahblah"));
-        assertEquals(request.getRequestHeaders().size(), 1);
-        assertEquals(request.getRequestHeaders().get(headerName), List.of("Bar"));
+        assertEquals(1, request.getRequestHeaders().size());
+        assertEquals(List.of("Bar"), request.getRequestHeaders().get(headerName));
         assertReadOnly(request.getRequestHeaders());
     }
 
@@ -83,11 +84,11 @@ public class RequestTest {
         request = request.with("Larry", List.of("a"))
                          .with("Curly", List.of("b"))
                          .with("Moe",   List.of("c"));
-        assertEquals(request.getRequestHeaders().size(), 4);
-        assertEquals(request.getRequestHeaders().getFirst("Foo"), "Bar");
-        assertEquals(request.getRequestHeaders().getFirst("Larry"), "a");
-        assertEquals(request.getRequestHeaders().getFirst("Curly"), "b");
-        assertEquals(request.getRequestHeaders().getFirst("Moe"  ), "c");
+        assertEquals(4, request.getRequestHeaders().size());
+        assertEquals("Bar", request.getRequestHeaders().getFirst("Foo"));
+        assertEquals("a", request.getRequestHeaders().getFirst("Larry"));
+        assertEquals("b", request.getRequestHeaders().getFirst("Curly"));
+        assertEquals("c", request.getRequestHeaders().getFirst("Moe"  ));
         assertReadOnly(request.getRequestHeaders());
     }
 
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/ServerMimeTypesResolutionTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/ServerMimeTypesResolutionTest.java
index baa7d17b505..dff0eb8c1d1 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/ServerMimeTypesResolutionTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/ServerMimeTypesResolutionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,14 +39,14 @@ import java.util.stream.Collectors;
 import jdk.test.lib.net.URIBuilder;
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.SimpleFileServer;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import sun.net.www.MimeTable;
 
 import static java.net.http.HttpClient.Builder.NO_PROXY;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
@@ -54,7 +54,7 @@ import static org.testng.Assert.assertTrue;
  * @modules java.base/sun.net.www:+open
  * @library /test/lib
  * @build jdk.test.lib.net.URIBuilder
- * @run testng/othervm ServerMimeTypesResolutionTest
+ * @run junit/othervm ServerMimeTypesResolutionTest
  */
 public class ServerMimeTypesResolutionTest {
 
@@ -70,8 +70,8 @@ public class ServerMimeTypesResolutionTest {
     static final boolean ENABLE_LOGGING = true;
     static final Logger LOGGER = Logger.getLogger("com.sun.net.httpserver");
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         if (ENABLE_LOGGING) {
             ConsoleHandler ch = new ConsoleHandler();
             LOGGER.setLevel(Level.ALL);
@@ -139,7 +139,7 @@ public class ServerMimeTypesResolutionTest {
     }
 
     @Test
-    public static void testMimeTypeHeaders() throws Exception {
+    public void testMimeTypeHeaders() throws Exception {
         final var server = SimpleFileServer.createFileServer(LOOPBACK_ADDR, root, SimpleFileServer.OutputLevel.VERBOSE);
         server.start();
         try {
@@ -163,8 +163,8 @@ public class ServerMimeTypesResolutionTest {
         final var uri = uri(server, toFileName(extension));
         final var request = HttpRequest.newBuilder(uri).build();
         final var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.headers().firstValue("content-type").get(),expectedMimeType);
+        assertEquals(200, response.statusCode());
+        assertEquals(expectedMimeType, response.headers().firstValue("content-type").get());
     }
 
     static URI uri(HttpServer server, String path) {
@@ -176,7 +176,6 @@ public class ServerMimeTypesResolutionTest {
                 .buildUnchecked();
     }
 
-    @DataProvider
     public static Object[][] commonExtensions() {
         Set<String> extensions = Set.of(".aac", ".abw", ".arc", ".avi", ".azw", ".bin", ".bmp", ".bz",
                 ".bz2", ".csh", ".css", ".csv", ".doc", ".docx",".eot", ".epub", ".gz", ".gif", ".htm", ".html", ".ico",
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/SimpleFileServerTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/SimpleFileServerTest.java
index 167fcd3b5d3..104b4ea0cbe 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/SimpleFileServerTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/SimpleFileServerTest.java
@@ -26,7 +26,7 @@
  * @summary Tests for SimpleFileServer
  * @library /test/lib
  * @build jdk.test.lib.Platform jdk.test.lib.net.URIBuilder
- * @run testng/othervm SimpleFileServerTest
+ * @run junit/othervm SimpleFileServerTest
  */
 
 import java.io.IOException;
@@ -52,15 +52,17 @@ import com.sun.net.httpserver.SimpleFileServer.OutputLevel;
 import jdk.test.lib.Platform;
 import jdk.test.lib.net.URIBuilder;
 import jdk.test.lib.util.FileUtils;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import org.testng.SkipException;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.StandardOpenOption.CREATE;
-import static org.testng.Assert.*;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class SimpleFileServerTest {
 
@@ -78,8 +80,8 @@ public class SimpleFileServerTest {
 
     static final String EXPECTED_LAST_MODIFIED_OF_FAVICON = "Mon, 23 May 1995 11:11:11 GMT";
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         if (ENABLE_LOGGING) {
             ConsoleHandler ch = new ConsoleHandler();
             LOGGER.setLevel(Level.ALL);
@@ -105,11 +107,11 @@ public class SimpleFileServerTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "aFile.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), "some text");
-            assertEquals(response.headers().firstValue("content-type").get(), "text/plain");
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
+            assertEquals(200, response.statusCode());
+            assertEquals("some text", response.body());
+            assertEquals("text/plain", response.headers().firstValue("content-type").get());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(lastModified, response.headers().firstValue("last-modified").get());
         } finally {
             server.stop(0);
         }
@@ -134,11 +136,11 @@ public class SimpleFileServerTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().firstValue("content-type").get(), "text/html; charset=UTF-8");
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(200, response.statusCode());
+            assertEquals("text/html; charset=UTF-8", response.headers().firstValue("content-type").get());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(lastModified, response.headers().firstValue("last-modified").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
         }
@@ -155,9 +157,9 @@ public class SimpleFileServerTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "favicon.ico")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().firstValue("content-type").get(), "image/x-icon");
-            assertEquals(response.headers().firstValue("last-modified").get(), EXPECTED_LAST_MODIFIED_OF_FAVICON);
+            assertEquals(200, response.statusCode());
+            assertEquals("image/x-icon", response.headers().firstValue("content-type").get());
+            assertEquals(EXPECTED_LAST_MODIFIED_OF_FAVICON, response.headers().firstValue("last-modified").get());
 
             // expect custom (and broken) icon
             var file = Files.writeString(root.resolve("favicon.ico"), "broken icon", CREATE);
@@ -165,19 +167,19 @@ public class SimpleFileServerTest {
                 var lastModified = getLastModified(file);
                 var expectedLength = Long.toString(Files.size(file));
                 response = client.send(request, BodyHandlers.ofString());
-                assertEquals(response.statusCode(), 200);
-                assertEquals(response.headers().firstValue("content-type").get(), "application/octet-stream");
-                assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-                assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
+                assertEquals(200, response.statusCode());
+                assertEquals("application/octet-stream", response.headers().firstValue("content-type").get());
+                assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+                assertEquals(lastModified, response.headers().firstValue("last-modified").get());
             } finally {
                 Files.delete(file);
             }
 
             // expect built-in icon
             response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().firstValue("content-type").get(), "image/x-icon");
-            assertEquals(response.headers().firstValue("last-modified").get(), EXPECTED_LAST_MODIFIED_OF_FAVICON);
+            assertEquals(200, response.statusCode());
+            assertEquals("image/x-icon", response.headers().firstValue("content-type").get());
+            assertEquals(EXPECTED_LAST_MODIFIED_OF_FAVICON, response.headers().firstValue("last-modified").get());
         } finally {
             server.stop(0);
         }
@@ -194,10 +196,10 @@ public class SimpleFileServerTest {
             var request = HttpRequest.newBuilder(uri(server, "favicon.ico"))
                     .method("HEAD", BodyPublishers.noBody()).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().firstValue("content-type").get(), "image/x-icon");
-            assertEquals(response.headers().firstValue("last-modified").get(), EXPECTED_LAST_MODIFIED_OF_FAVICON);
-            assertEquals(response.body(), "");
+            assertEquals(200, response.statusCode());
+            assertEquals("image/x-icon", response.headers().firstValue("content-type").get());
+            assertEquals(EXPECTED_LAST_MODIFIED_OF_FAVICON, response.headers().firstValue("last-modified").get());
+            assertEquals("", response.body());
         } finally {
             server.stop(0);
         }
@@ -217,11 +219,11 @@ public class SimpleFileServerTest {
             var request = HttpRequest.newBuilder(uri(server, "aFile.txt"))
                     .method("HEAD", BodyPublishers.noBody()).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().firstValue("content-type").get(), "text/plain");
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
-            assertEquals(response.body(), "");
+            assertEquals(200, response.statusCode());
+            assertEquals("text/plain", response.headers().firstValue("content-type").get());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(lastModified, response.headers().firstValue("last-modified").get());
+            assertEquals("", response.body());
         } finally {
             server.stop(0);
         }
@@ -247,18 +249,17 @@ public class SimpleFileServerTest {
             var request = HttpRequest.newBuilder(uri(server, ""))
                     .method("HEAD", BodyPublishers.noBody()).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().firstValue("content-type").get(), "text/html; charset=UTF-8");
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
-            assertEquals(response.body(), "");
+            assertEquals(200, response.statusCode());
+            assertEquals("text/html; charset=UTF-8", response.headers().firstValue("content-type").get());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(lastModified, response.headers().firstValue("last-modified").get());
+            assertEquals("", response.body());
         } finally {
             server.stop(0);
         }
     }
 
-    @DataProvider
-    public Object[][] indexFiles() {
+    public static Object[][] indexFiles() {
         var fileContent = openHTML + """
                 <h1>This is an index file</h1>
                 """ + closeHTML;
@@ -274,7 +275,8 @@ public class SimpleFileServerTest {
         };
     }
 
-    @Test(dataProvider = "indexFiles")
+    @ParameterizedTest
+    @MethodSource("indexFiles")
     public void testDirectoryWithIndexGET(String id,
                                           String filename,
                                           String contentType,
@@ -294,11 +296,11 @@ public class SimpleFileServerTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().firstValue("content-type").get(), contentType);
-            assertEquals(response.headers().firstValue("content-length").get(), contentLength);
-            assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(200, response.statusCode());
+            assertEquals(contentType, response.headers().firstValue("content-type").get());
+            assertEquals(contentLength, response.headers().firstValue("content-length").get());
+            assertEquals(lastModified, response.headers().firstValue("last-modified").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
             if (serveIndexFile) {
@@ -309,9 +311,7 @@ public class SimpleFileServerTest {
 
     @Test
     public void testNotReadableFileGET() throws Exception {
-        if (Platform.isWindows()) {
-            throw new SkipException("Not applicable on Windows");
-        }
+        Assumptions.assumeFalse(Platform.isWindows(), "Not applicable on Windows");
         var expectedBody = openHTML + """
             <h1>File not found</h1>
             <p>&#x2F;aFile.txt</p>
@@ -329,9 +329,9 @@ public class SimpleFileServerTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "aFile.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
             file.toFile().setReadable(true, false);
@@ -340,9 +340,7 @@ public class SimpleFileServerTest {
 
     @Test
     public void testNotReadableSegmentGET() throws Exception {
-        if (Platform.isWindows()) {
-            throw new SkipException("Not applicable on Windows");
-        }
+        Assumptions.assumeFalse(Platform.isWindows(), "Not applicable on Windows");
         var expectedBody = openHTML + """
             <h1>File not found</h1>
             <p>&#x2F;dir&#x2F;aFile.txt</p>
@@ -362,9 +360,9 @@ public class SimpleFileServerTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "dir/aFile.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
             dir.toFile().setReadable(true, false);
@@ -386,9 +384,9 @@ public class SimpleFileServerTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "aFile?#.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
         }
@@ -409,9 +407,9 @@ public class SimpleFileServerTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "doesNotExist.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
         }
@@ -433,9 +431,9 @@ public class SimpleFileServerTest {
             var request = HttpRequest.newBuilder(uri(server, "doesNotExist.txt"))
                     .method("HEAD", BodyPublishers.noBody()).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), "");
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals("", response.body());
         } finally {
             server.stop(0);
         }
@@ -459,9 +457,9 @@ public class SimpleFileServerTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "symlink")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
         }
@@ -486,21 +484,21 @@ public class SimpleFileServerTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "symlink/aFile.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
         }
     }
 
-    private void createSymLink(Path symlink, Path target) {
+    private static void createSymLink(Path symlink, Path target) {
         try {
             Files.createSymbolicLink(symlink, target);
         } catch (UnsupportedOperationException uoe) {
-            throw new SkipException("sym link creation not supported", uoe);
+            Assumptions.abort("sym link creation not supported");
         } catch (IOException ioe) {
-            throw new SkipException("probably insufficient privileges to create sym links (Windows)", ioe);
+            Assumptions.abort("probably insufficient privileges to create sym links (Windows)");
         }
     }
 
@@ -523,9 +521,9 @@ public class SimpleFileServerTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, fileName)).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
         }
@@ -547,15 +545,15 @@ public class SimpleFileServerTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, ".hiddenDirectory/aFile.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
         }
     }
 
-    private Path createHiddenFile(Path root) throws IOException {
+    private static Path createHiddenFile(Path root) throws IOException {
         Path file;
         if (Platform.isWindows()) {
             file = Files.createFile(root.resolve("aFile.txt"));
@@ -567,7 +565,7 @@ public class SimpleFileServerTest {
         return file;
     }
 
-    private Path createFileInHiddenDirectory(Path root) throws IOException {
+    private static Path createFileInHiddenDirectory(Path root) throws IOException {
         Path dir;
         Path file;
         if (Platform.isWindows()) {
@@ -602,17 +600,17 @@ public class SimpleFileServerTest {
                 var uri = uri(server, "aDirectory");
                 var request = HttpRequest.newBuilder(uri).build();
                 var response = client.send(request, BodyHandlers.ofString());
-                assertEquals(response.statusCode(), 301);
-                assertEquals(response.headers().firstValue("content-length").get(), "0");
-                assertEquals(response.headers().firstValue("location").get(), "/aDirectory/");
+                assertEquals(301, response.statusCode());
+                assertEquals("0", response.headers().firstValue("content-length").get());
+                assertEquals("/aDirectory/", response.headers().firstValue("location").get());
 
                 // tests that query component is preserved during redirect
                 var uri2 = uri(server, "aDirectory", "query");
                 var req2 = HttpRequest.newBuilder(uri2).build();
                 var res2 = client.send(req2, BodyHandlers.ofString());
-                assertEquals(res2.statusCode(), 301);
-                assertEquals(res2.headers().firstValue("content-length").get(), "0");
-                assertEquals(res2.headers().firstValue("location").get(), "/aDirectory/?query");
+                assertEquals(301, res2.statusCode());
+                assertEquals("0", res2.headers().firstValue("content-length").get());
+                assertEquals("/aDirectory/?query", res2.headers().firstValue("location").get());
             }
 
             {   // tests that redirect to returned relative URI works
@@ -621,10 +619,10 @@ public class SimpleFileServerTest {
                 var uri = uri(server, "aDirectory");
                 var request = HttpRequest.newBuilder(uri).build();
                 var response = client.send(request, BodyHandlers.ofString());
-                assertEquals(response.statusCode(), 200);
-                assertEquals(response.body(), expectedBody);
-                assertEquals(response.headers().firstValue("content-type").get(), "text/html; charset=UTF-8");
-                assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
+                assertEquals(200, response.statusCode());
+                assertEquals(expectedBody, response.body());
+                assertEquals("text/html; charset=UTF-8", response.headers().firstValue("content-type").get());
+                assertEquals(expectedLength, response.headers().firstValue("content-length").get());
             }
         } finally {
             server.stop(0);
@@ -673,28 +671,26 @@ public class SimpleFileServerTest {
         {   // not a directory
             Path p = Files.createFile(TEST_DIR.resolve("aFile"));
             assert !Files.isDirectory(p);
-            var iae = expectThrows(IAE, () -> SimpleFileServer.createFileServer(addr, p, OutputLevel.INFO));
+            var iae = assertThrows(IAE, () -> SimpleFileServer.createFileServer(addr, p, OutputLevel.INFO));
             assertTrue(iae.getMessage().contains("not a directory"));
         }
         {   // does not exist
             Path p = TEST_DIR.resolve("doesNotExist");
             assert !Files.exists(p);
-            var iae = expectThrows(IAE, () -> SimpleFileServer.createFileServer(addr, p, OutputLevel.INFO));
+            var iae = assertThrows(IAE, () -> SimpleFileServer.createFileServer(addr, p, OutputLevel.INFO));
             assertTrue(iae.getMessage().contains("does not exist"));
         }
     }
 
     @Test
     public void testNonReadablePath() throws Exception {
-        if (Platform.isWindows()) {
-            throw new SkipException("Not applicable on Windows");
-        }
+        Assumptions.assumeFalse(Platform.isWindows(), "Not applicable on Windows");
         var addr = LOOPBACK_ADDR;
         Path p = Files.createDirectory(TEST_DIR.resolve("aDir"));
         p.toFile().setReadable(false, false);
         assert !Files.isReadable(p);
         try {
-            var iae = expectThrows(IAE, () -> SimpleFileServer.createFileServer(addr, p, OutputLevel.INFO));
+            var iae = assertThrows(IAE, () -> SimpleFileServer.createFileServer(addr, p, OutputLevel.INFO));
             assertTrue(iae.getMessage().contains("not readable"));
         } finally {
             p.toFile().setReadable(true, false);
@@ -718,7 +714,7 @@ public class SimpleFileServerTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "beginDelim%3C%3EEndDelim")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
+            assertEquals(404, response.statusCode());
             assertTrue(response.body().contains("beginDelim%3C%3EEndDelim"));
             assertTrue(response.body().contains("File not found"));
         } finally {
@@ -726,8 +722,8 @@ public class SimpleFileServerTest {
         }
     }
 
-    @AfterTest
-    public void teardown() throws IOException {
+    @AfterAll
+    public static void teardown() throws IOException {
         if (Files.exists(TEST_DIR)) {
             FileUtils.deleteFileTreeWithRetry(TEST_DIR);
         }
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/StressDirListings.java b/test/jdk/com/sun/net/httpserver/simpleserver/StressDirListings.java
index 18a1f060c48..23442ab6b20 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/StressDirListings.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/StressDirListings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @summary Test to stress directory listings
  * @library /test/lib
- * @run testng/othervm/timeout=180 StressDirListings
+ * @run junit/othervm/timeout=180 StressDirListings
  */
 
 import java.io.IOException;
@@ -43,12 +43,13 @@ import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.SimpleFileServer;
 import com.sun.net.httpserver.SimpleFileServer.OutputLevel;
 import jdk.test.lib.net.URIBuilder;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class StressDirListings {
 
@@ -66,10 +67,10 @@ public class StressDirListings {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    HttpServer simpleFileServer;
+    static HttpServer simpleFileServer;
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         out.println(now() + " creating server");
         if (ENABLE_LOGGING) {
             ConsoleHandler ch = new ConsoleHandler();
@@ -82,8 +83,8 @@ public class StressDirListings {
         out.println(now() + " server started");
     }
 
-    @AfterTest
-    public void teardown() {
+    @AfterAll
+    public static void teardown() {
         out.println(now() + " stopping server");
         simpleFileServer.stop(0);
         out.println(now() + " server stopped");
@@ -105,7 +106,7 @@ public class StressDirListings {
         var request = HttpRequest.newBuilder(uri(simpleFileServer)).build();
         for (int i=0; i<TIMES; i++) {
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
+            assertEquals(200, response.statusCode());
             if (i % 100 == 0) {
                 out.print(" " + i + " ");
             }
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/ZipFileSystemTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/ZipFileSystemTest.java
index a3e1e40ae8a..600651f12a4 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/ZipFileSystemTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/ZipFileSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @summary Tests for SimpleFileServer with a root that is of a zip file system
  * @library /test/lib
  * @build jdk.test.lib.Platform jdk.test.lib.net.URIBuilder
- * @run testng/othervm ZipFileSystemTest
+ * @run junit/othervm ZipFileSystemTest
  */
 
 import java.io.IOException;
@@ -51,15 +51,17 @@ import com.sun.net.httpserver.SimpleFileServer;
 import com.sun.net.httpserver.SimpleFileServer.OutputLevel;
 import jdk.test.lib.net.URIBuilder;
 import jdk.test.lib.util.FileUtils;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.StandardOpenOption.CREATE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ZipFileSystemTest {
 
@@ -71,8 +73,8 @@ public class ZipFileSystemTest {
     static final boolean ENABLE_LOGGING = true;
     static final Logger LOGGER = Logger.getLogger("com.sun.net.httpserver");
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         if (ENABLE_LOGGING) {
             ConsoleHandler ch = new ConsoleHandler();
             LOGGER.setLevel(Level.ALL);
@@ -98,11 +100,11 @@ public class ZipFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "aFile.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), "some text");
-            assertEquals(response.headers().firstValue("content-type").get(), "text/plain");
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
+            assertEquals(200, response.statusCode());
+            assertEquals("some text", response.body());
+            assertEquals("text/plain", response.headers().firstValue("content-type").get());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(lastModified, response.headers().firstValue("last-modified").get());
         } finally {
             server.stop(0);
             root.getFileSystem().close();
@@ -127,11 +129,11 @@ public class ZipFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().firstValue("content-type").get(), "text/html; charset=UTF-8");
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(200, response.statusCode());
+            assertEquals("text/html; charset=UTF-8", response.headers().firstValue("content-type").get());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(lastModified, response.headers().firstValue("last-modified").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
             root.getFileSystem().close();
@@ -153,11 +155,11 @@ public class ZipFileSystemTest {
             var request = HttpRequest.newBuilder(uri(server, "aFile.txt"))
                     .method("HEAD", BodyPublishers.noBody()).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().firstValue("content-type").get(), "text/plain");
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
-            assertEquals(response.body(), "");
+            assertEquals(200, response.statusCode());
+            assertEquals("text/plain", response.headers().firstValue("content-type").get());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(lastModified, response.headers().firstValue("last-modified").get());
+            assertEquals("", response.body());
         } finally {
             server.stop(0);
             root.getFileSystem().close();
@@ -183,11 +185,11 @@ public class ZipFileSystemTest {
             var request = HttpRequest.newBuilder(uri(server, ""))
                     .method("HEAD", BodyPublishers.noBody()).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().firstValue("content-type").get(), "text/html; charset=UTF-8");
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
-            assertEquals(response.body(), "");
+            assertEquals(200, response.statusCode());
+            assertEquals("text/html; charset=UTF-8", response.headers().firstValue("content-type").get());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(lastModified, response.headers().firstValue("last-modified").get());
+            assertEquals("", response.body());
         } finally {
             server.stop(0);
             root.getFileSystem().close();
@@ -195,8 +197,7 @@ public class ZipFileSystemTest {
         }
     }
 
-    @DataProvider
-    public Object[][] indexFiles() {
+    public static Object[][] indexFiles() {
         var fileContent = openHTML + """
                 <h1>This is an index file</h1>
                 """ + closeHTML;
@@ -212,7 +213,8 @@ public class ZipFileSystemTest {
         };
     }
 
-    @Test(dataProvider = "indexFiles")
+    @ParameterizedTest
+    @MethodSource("indexFiles")
     public void testDirectoryWithIndexGET(String id,
                                           String filename,
                                           String contentType,
@@ -232,11 +234,11 @@ public class ZipFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.headers().firstValue("content-type").get(), contentType);
-            assertEquals(response.headers().firstValue("content-length").get(), contentLength);
-            assertEquals(response.headers().firstValue("last-modified").get(), lastModified);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(200, response.statusCode());
+            assertEquals(contentType, response.headers().firstValue("content-type").get());
+            assertEquals(contentLength, response.headers().firstValue("content-length").get());
+            assertEquals(lastModified, response.headers().firstValue("last-modified").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
             if (serveIndexFile) {
@@ -265,9 +267,9 @@ public class ZipFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "aFile?#.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
             root.getFileSystem().close();
@@ -290,9 +292,9 @@ public class ZipFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "doesNotExist.txt")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), expectedBody);
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals(expectedBody, response.body());
         } finally {
             server.stop(0);
             root.getFileSystem().close();
@@ -317,9 +319,9 @@ public class ZipFileSystemTest {
             var request = HttpRequest.newBuilder(uri(server, "doesNotExist.txt"))
                     .method("HEAD", BodyPublishers.noBody()).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
-            assertEquals(response.headers().firstValue("content-length").get(), expectedLength);
-            assertEquals(response.body(), "");
+            assertEquals(404, response.statusCode());
+            assertEquals(expectedLength, response.headers().firstValue("content-length").get());
+            assertEquals("", response.body());
         } finally {
             server.stop(0);
             root.getFileSystem().close();
@@ -339,9 +341,9 @@ public class ZipFileSystemTest {
             var uri = uri(server, "aDirectory");
             var request = HttpRequest.newBuilder(uri).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 301);
-            assertEquals(response.headers().firstValue("content-length").get(), "0");
-            assertEquals(response.headers().firstValue("location").get(), "/aDirectory/");
+            assertEquals(301, response.statusCode());
+            assertEquals("0", response.headers().firstValue("content-length").get());
+            assertEquals("/aDirectory/", response.headers().firstValue("location").get());
         } finally {
             server.stop(0);
             root.getFileSystem().close();
@@ -366,7 +368,7 @@ public class ZipFileSystemTest {
             var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
             var request = HttpRequest.newBuilder(uri(server, "beginDelim%3C%3EEndDelim")).build();
             var response = client.send(request, BodyHandlers.ofString());
-            assertEquals(response.statusCode(), 404);
+            assertEquals(404, response.statusCode());
             assertTrue(response.body().contains("beginDelim%3C%3EEndDelim"));
             assertTrue(response.body().contains("File not found"));
         } finally {
@@ -376,8 +378,8 @@ public class ZipFileSystemTest {
         }
     }
 
-    @AfterTest
-    public void teardown() throws IOException {
+    @AfterAll
+    public static void teardown() throws IOException {
         if (Files.exists(TEST_DIR)) {
             FileUtils.deleteFileTreeWithRetry(TEST_DIR);
         }
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLineNegativeTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLineNegativeTest.java
index da01b1542d8..22812ae0117 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLineNegativeTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLineNegativeTest.java
@@ -26,7 +26,7 @@
  * @summary Negative tests for the jwebserver command-line tool
  * @library /test/lib
  * @modules jdk.httpserver
- * @run testng/othervm CommandLineNegativeTest
+ * @run junit/othervm CommandLineNegativeTest
  */
 
 import java.io.IOException;
@@ -37,13 +37,14 @@ import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.util.FileUtils;
-import org.testng.SkipException;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
-import static org.testng.Assert.assertFalse;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class CommandLineNegativeTest {
 
@@ -55,8 +56,8 @@ public class CommandLineNegativeTest {
     static final Path TEST_FILE = TEST_DIR.resolve("file.txt");
     static final String LOOPBACK_ADDR = InetAddress.getLoopbackAddress().getHostAddress();
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         if (Files.exists(TEST_DIR)) {
             FileUtils.deleteFileTreeWithRetry(TEST_DIR);
         }
@@ -64,15 +65,15 @@ public class CommandLineNegativeTest {
         Files.createFile(TEST_FILE);
     }
 
-    @DataProvider
-    public Object[][] unknownOption() {
+    public static Object[][] unknownOption() {
         return new Object[][] {
                 {"--unknownOption"},
                 {"null"}
         };
     }
 
-    @Test(dataProvider = "unknownOption")
+    @ParameterizedTest
+    @MethodSource("unknownOption")
     public void testBadOption(String opt) throws Throwable {
         out.println("\n--- testUnknownOption, opt=\"%s\" ".formatted(opt));
         simpleserver(JWEBSERVER, LOCALE_OPT, opt)
@@ -80,8 +81,7 @@ public class CommandLineNegativeTest {
                 .shouldContain("Error: unknown option: " + opt);
     }
 
-    @DataProvider
-    public Object[][] tooManyOptionArgs() {
+    public static Object[][] tooManyOptionArgs() {
         return new Object[][] {
                 {"-b", "localhost"},
                 {"-d", "/some/path"},
@@ -95,7 +95,8 @@ public class CommandLineNegativeTest {
         };
     }
 
-    @Test(dataProvider = "tooManyOptionArgs")
+    @ParameterizedTest
+    @MethodSource("tooManyOptionArgs")
     public void testTooManyOptionArgs(String opt, String arg) throws Throwable {
         out.println("\n--- testTooManyOptionArgs, opt=\"%s\" ".formatted(opt));
         simpleserver(JWEBSERVER, LOCALE_OPT, opt, arg, arg)
@@ -103,8 +104,7 @@ public class CommandLineNegativeTest {
                 .shouldContain("Error: unknown option: " + arg);
     }
 
-    @DataProvider
-    public Object[][] noArg() {
+    public static Object[][] noArg() {
         return new Object[][] {
                 {"-b", """
                     -b, --bind-address    - Address to bind to. Default: %s (loopback).
@@ -122,7 +122,8 @@ public class CommandLineNegativeTest {
         };
     }
 
-    @Test(dataProvider = "noArg")
+    @ParameterizedTest
+    @MethodSource("noArg")
     public void testNoArg(String opt, String msg) throws Throwable {
         out.println("\n--- testNoArg, opt=\"%s\" ".formatted(opt));
         simpleserver(JWEBSERVER, LOCALE_OPT, opt)
@@ -131,8 +132,7 @@ public class CommandLineNegativeTest {
                 .shouldContain(msg);
     }
 
-    @DataProvider
-    public Object[][] invalidValue() {
+    public static Object[][] invalidValue() {
         return new Object[][] {
                 {"-b", "[127.0.0.1]"},
                 {"-b", "badhost"},
@@ -146,7 +146,8 @@ public class CommandLineNegativeTest {
         };
     }
 
-    @Test(dataProvider = "invalidValue")
+    @ParameterizedTest
+    @MethodSource("invalidValue")
     public void testInvalidValue(String opt, String val) throws Throwable {
         out.println("\n--- testInvalidValue, opt=\"%s\" ".formatted(opt));
         simpleserver(JWEBSERVER, LOCALE_OPT, opt, val)
@@ -154,10 +155,10 @@ public class CommandLineNegativeTest {
                 .shouldContain("Error: invalid value given for " + opt + ": " + val);
     }
 
-    @DataProvider
-    public Object[][] portOptions() { return new Object[][] {{"-p"}, {"--port"}}; }
+    public static Object[][] portOptions() { return new Object[][] {{"-p"}, {"--port"}}; }
 
-    @Test(dataProvider = "portOptions")
+    @ParameterizedTest
+    @MethodSource("portOptions")
     public void testPortOutOfRange(String opt) throws Throwable {
         out.println("\n--- testPortOutOfRange, opt=\"%s\" ".formatted(opt));
         simpleserver(JWEBSERVER, LOCALE_OPT, opt, "65536")  // range 0 to 65535
@@ -165,10 +166,10 @@ public class CommandLineNegativeTest {
                 .shouldContain("Error: server config failed: " + "port out of range:65536");
     }
 
-    @DataProvider
-    public Object[][] directoryOptions() { return new Object[][] {{"-d"}, {"--directory"}}; }
+    public static Object[][] directoryOptions() { return new Object[][] {{"-d"}, {"--directory"}}; }
 
-    @Test(dataProvider = "directoryOptions")
+    @ParameterizedTest
+    @MethodSource("directoryOptions")
     public void testRootNotADirectory(String opt) throws Throwable {
         out.println("\n--- testRootNotADirectory, opt=\"%s\" ".formatted(opt));
         var file = TEST_FILE.toString();
@@ -178,7 +179,8 @@ public class CommandLineNegativeTest {
                 .shouldContain("Error: server config failed: " + "Path is not a directory: " + file);
     }
 
-    @Test(dataProvider = "directoryOptions")
+    @ParameterizedTest
+    @MethodSource("directoryOptions")
     public void testRootDoesNotExist(String opt) throws Throwable {
         out.println("\n--- testRootDoesNotExist, opt=\"%s\" ".formatted(opt));
         Path root = TEST_DIR.resolve("not/existent/dir");
@@ -188,14 +190,12 @@ public class CommandLineNegativeTest {
                 .shouldContain("Error: server config failed: " + "Path does not exist: " + root.toString());
     }
 
-    @Test(dataProvider = "directoryOptions")
+    @ParameterizedTest
+    @MethodSource("directoryOptions")
     public void testRootNotReadable(String opt) throws Throwable {
         out.println("\n--- testRootNotReadable, opt=\"%s\" ".formatted(opt));
-        if (Platform.isWindows()) {
-            // Not applicable to Windows. Reason: cannot revoke an owner's read
-            // access to a directory that was created by that owner
-            throw new SkipException("cannot run on Windows");
-        }
+        Assumptions.assumeFalse(Platform.isWindows(), "cannot run on Windows"); // Not applicable to Windows. Reason: cannot revoke an owner's read
+        // access to a directory that was created by that owner
         Path root = Files.createDirectories(TEST_DIR.resolve("not/readable/dir"));
         try {
             root.toFile().setReadable(false, false);
@@ -208,8 +208,8 @@ public class CommandLineNegativeTest {
         }
     }
 
-    @AfterTest
-    public void teardown() throws IOException {
+    @AfterAll
+    public static void teardown() throws IOException {
         if (Files.exists(TEST_DIR)) {
             FileUtils.deleteFileTreeWithRetry(TEST_DIR);
         }
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePortNotSpecifiedTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePortNotSpecifiedTest.java
index cd2ccbeded4..f6250d63908 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePortNotSpecifiedTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePortNotSpecifiedTest.java
@@ -27,7 +27,7 @@
  * @summary Tests the jwebserver tool with port not specified
  * @modules jdk.httpserver
  * @library /test/lib
- * @run testng/othervm/manual CommandLinePortNotSpecifiedTest
+ * @run junit/othervm/manual CommandLinePortNotSpecifiedTest
  */
 
 import java.io.IOException;
@@ -39,11 +39,12 @@ import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.util.FileUtils;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
 public class CommandLinePortNotSpecifiedTest {
 
     static final Path JAVA_HOME = Path.of(System.getProperty("java.home"));
@@ -55,8 +56,8 @@ public class CommandLinePortNotSpecifiedTest {
     static final String TEST_DIR_STR = TEST_DIR.toString();
     static final String LOOPBACK_ADDR = InetAddress.getLoopbackAddress().getHostAddress();
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         if (Files.exists(TEST_DIR)) {
             FileUtils.deleteFileTreeWithRetry(TEST_DIR);
         }
@@ -92,8 +93,8 @@ public class CommandLinePortNotSpecifiedTest {
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
-    @AfterTest
-    public void teardown() throws IOException {
+    @AfterAll
+    public static void teardown() throws IOException {
         if (Files.exists(TEST_DIR)) {
             FileUtils.deleteFileTreeWithRetry(TEST_DIR);
         }
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePositiveTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePositiveTest.java
index c0b0b4bc768..8110f5d9b10 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePositiveTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePositiveTest.java
@@ -27,7 +27,7 @@
  * @library /test/lib
  * @build jdk.test.lib.net.IPSupport
  * @modules jdk.httpserver
- * @run testng/othervm CommandLinePositiveTest
+ * @run junit/othervm CommandLinePositiveTest
  */
 
 import java.io.IOException;
@@ -41,12 +41,13 @@ import jdk.test.lib.net.IPSupport;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.util.FileUtils;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 public class CommandLinePositiveTest {
 
     static final String JAVA_VERSION = System.getProperty("java.version");
@@ -84,8 +85,8 @@ public class CommandLinePositiveTest {
 
     static final String LOOPBACK_ADDR = InetAddress.getLoopbackAddress().getHostAddress();
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         if (Files.exists(ROOT_DIR)) {
             FileUtils.deleteFileTreeWithRetry(ROOT_DIR);
         }
@@ -105,16 +106,17 @@ public class CommandLinePositiveTest {
         }
     }
 
-    @DataProvider
-    public Object[][] directoryOptions() { return new Object[][] {{"-d"}, {"--directory"}}; }
+    public static Object[][] directoryOptions() { return new Object[][] {{"-d"}, {"--directory"}}; }
 
-    @Test(dataProvider = "directoryOptions")
+    @ParameterizedTest
+    @MethodSource("directoryOptions")
     public void testAbsDirectory(String opt) throws Throwable {
         out.printf("\n--- testAbsDirectory, opt=\"%s\"%n", opt);
         testDirectory(opt, ROOT_DIR_STR);
     }
 
-    @Test(dataProvider = "directoryOptions")
+    @ParameterizedTest
+    @MethodSource("directoryOptions")
     public void testRelDirectory(String opt) throws Throwable {
         out.printf("\n--- testRelDirectory, opt=\"%s\"%n", opt);
         Path rootRelDir = CWD.relativize(ROOT_DIR);
@@ -129,10 +131,10 @@ public class CommandLinePositiveTest {
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
-    @DataProvider
-    public Object[][] portOptions() { return new Object[][] {{"-p"}, {"--port"}}; }
+    public static Object[][] portOptions() { return new Object[][] {{"-p"}, {"--port"}}; }
 
-    @Test(dataProvider = "portOptions")
+    @ParameterizedTest
+    @MethodSource("portOptions")
     public void testPort(String opt) throws Throwable {
         out.println("\n--- testPort, opt=\"%s\" ".formatted(opt));
         simpleserver(JWEBSERVER, LOCALE_OPT, opt, "0")
@@ -142,8 +144,7 @@ public class CommandLinePositiveTest {
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
-    @DataProvider
-    public Object[][] helpOptions() { return new Object[][] {{"-h"}, {"-?"}, {"--help"}}; }
+    public static Object[][] helpOptions() { return new Object[][] {{"-h"}, {"-?"}, {"--help"}}; }
 
     static final String USAGE_TEXT = """
             Usage: jwebserver [-b bind address] [-p port] [-d directory]
@@ -161,7 +162,8 @@ public class CommandLinePositiveTest {
             -version, --version   - Prints version information and exits.
             To stop the server, press Ctrl + C.""".formatted(LOOPBACK_ADDR);
 
-    @Test(dataProvider = "helpOptions")
+    @ParameterizedTest
+    @MethodSource("helpOptions")
     public void testHelp(String opt) throws Throwable {
         out.println("\n--- testHelp, opt=\"%s\" ".formatted(opt));
         simpleserver(WaitForLine.HELP_STARTUP_LINE,
@@ -172,10 +174,10 @@ public class CommandLinePositiveTest {
                 .shouldContain(OPTIONS_TEXT);
     }
 
-    @DataProvider
-    public Object[][] versionOptions() { return new Object[][] {{"-version"}, {"--version"}}; }
+    public static Object[][] versionOptions() { return new Object[][] {{"-version"}, {"--version"}}; }
 
-    @Test(dataProvider = "versionOptions")
+    @ParameterizedTest
+    @MethodSource("versionOptions")
     public void testVersion(String opt) throws Throwable {
         out.println("\n--- testVersion, opt=\"%s\" ".formatted(opt));
         simpleserver(WaitForLine.VERSION_STARTUP_LINE,
@@ -184,10 +186,10 @@ public class CommandLinePositiveTest {
                 .shouldHaveExitValue(0);
     }
 
-    @DataProvider
-    public Object[][] bindOptions() { return new Object[][] {{"-b"}, {"--bind-address"}}; }
+    public static Object[][] bindOptions() { return new Object[][] {{"-b"}, {"--bind-address"}}; }
 
-    @Test(dataProvider = "bindOptions")
+    @ParameterizedTest
+    @MethodSource("bindOptions")
     public void testBindAllInterfaces(String opt) throws Throwable {
         out.println("\n--- testBindAllInterfaces, opt=\"%s\" ".formatted(opt));
         simpleserver(JWEBSERVER, LOCALE_OPT, "-p", "0", opt, "0.0.0.0")
@@ -202,7 +204,8 @@ public class CommandLinePositiveTest {
         }
     }
 
-    @Test(dataProvider = "bindOptions")
+    @ParameterizedTest
+    @MethodSource("bindOptions")
     public void testLastOneWinsBindAddress(String opt) throws Throwable {
         out.println("\n--- testLastOneWinsBindAddress, opt=\"%s\" ".formatted(opt));
         simpleserver(JWEBSERVER, LOCALE_OPT, "-p", "0", opt, "123.4.5.6", opt, LOOPBACK_ADDR)
@@ -212,7 +215,8 @@ public class CommandLinePositiveTest {
 
     }
 
-    @Test(dataProvider = "directoryOptions")
+    @ParameterizedTest
+    @MethodSource("directoryOptions")
     public void testLastOneWinsDirectory(String opt) throws Throwable {
         out.println("\n--- testLastOneWinsDirectory, opt=\"%s\" ".formatted(opt));
         simpleserver(JWEBSERVER, LOCALE_OPT, "-p", "0", opt, CWD_STR, opt, CWD_STR)
@@ -222,10 +226,10 @@ public class CommandLinePositiveTest {
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
-    @DataProvider
-    public Object[][] outputOptions() { return new Object[][] {{"-o"}, {"--output"}}; }
+    public static Object[][] outputOptions() { return new Object[][] {{"-o"}, {"--output"}}; }
 
-    @Test(dataProvider = "outputOptions")
+    @ParameterizedTest
+    @MethodSource("outputOptions")
     public void testLastOneWinsOutput(String opt) throws Throwable {
         out.println("\n--- testLastOneWinsOutput, opt=\"%s\" ".formatted(opt));
         simpleserver(JWEBSERVER, LOCALE_OPT, "-p", "0", opt, "none", opt, "verbose")
@@ -235,7 +239,8 @@ public class CommandLinePositiveTest {
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
-    @Test(dataProvider = "portOptions")
+    @ParameterizedTest
+    @MethodSource("portOptions")
     public void testLastOneWinsPort(String opt) throws Throwable {
         out.println("\n--- testLastOneWinsPort, opt=\"%s\" ".formatted(opt));
         simpleserver(JWEBSERVER, LOCALE_OPT, opt, "-999", opt, "0")
@@ -245,8 +250,8 @@ public class CommandLinePositiveTest {
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
-    @AfterTest
-    public void teardown() throws IOException {
+    @AfterAll
+    public static void teardown() throws IOException {
         if (Files.exists(ROOT_DIR)) {
             FileUtils.deleteFileTreeWithRetry(ROOT_DIR);
         }
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/MaxRequestTimeTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/MaxRequestTimeTest.java
index c972f87dc18..c19ca632bf3 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/MaxRequestTimeTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/MaxRequestTimeTest.java
@@ -27,7 +27,7 @@
  * @summary Tests the jwebserver's maximum request time
  * @modules jdk.httpserver
  * @library /test/lib
- * @run testng/othervm MaxRequestTimeTest
+ * @run junit/othervm MaxRequestTimeTest
  */
 
 import java.io.IOException;
@@ -47,12 +47,13 @@ import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.util.FileUtils;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
-import static org.testng.Assert.*;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
  * This test confirms that the jwebserver does not wait indefinitely for
@@ -78,18 +79,14 @@ public class MaxRequestTimeTest {
     static final String LOOPBACK_ADDR = InetAddress.getLoopbackAddress().getHostAddress();
     static final AtomicInteger PORT = new AtomicInteger();
 
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         if (Files.exists(TEST_DIR)) {
             FileUtils.deleteFileTreeWithRetry(TEST_DIR);
         }
         Files.createDirectories(TEST_DIR);
-
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
     }
 
     @Test
@@ -122,17 +119,17 @@ public class MaxRequestTimeTest {
                 </html>
                 """;
 
-    void sendHTTPRequest() throws IOException, InterruptedException {
+    static void sendHTTPRequest() throws IOException, InterruptedException {
         out.println("\n--- sendHTTPRequest");
         var client = HttpClient.newBuilder()
                 .proxy(NO_PROXY)
                 .build();
         var request = HttpRequest.newBuilder(URI.create("http://localhost:" + PORT.get() + "/")).build();
         var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-        assertEquals(response.body(), expectedBody);
+        assertEquals(expectedBody, response.body());
     }
 
-    void sendHTTPSRequest() throws IOException, InterruptedException {
+    static void sendHTTPSRequest() throws IOException, InterruptedException {
         out.println("\n--- sendHTTPSRequest");
         var client = HttpClient.newBuilder()
                 .sslContext(sslContext)
@@ -147,8 +144,8 @@ public class MaxRequestTimeTest {
         }
     }
 
-    @AfterTest
-    public void teardown() throws IOException {
+    @AfterAll
+    public static void teardown() throws IOException {
         if (Files.exists(TEST_DIR)) {
             FileUtils.deleteFileTreeWithRetry(TEST_DIR);
         }
diff --git a/test/jdk/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java b/test/jdk/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java
index 5bff03d5b34..075fae4da51 100644
--- a/test/jdk/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java
+++ b/test/jdk/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.java b/test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.java
index b7a5cdea072..220ddbd930c 100644
--- a/test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.java
+++ b/test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -95,6 +95,8 @@ class TestFrame extends Frame implements ItemListener {
                               pt.y + choice.getHeight()*3/4);
             // testing that ItemEvent doesn't generated on a simple
             // mouse click when the dropdown appears under mouse : 6425067
+            robot.waitForIdle();
+            robot.delay(250);
             stateChanged = false;
             openChoice();
             closeChoice();
diff --git a/test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java b/test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java
index 93bf59d2757..1201e5c835c 100644
--- a/test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java
+++ b/test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/Focus/ChoiceFocus/ChoiceFocus.java b/test/jdk/java/awt/Focus/ChoiceFocus/ChoiceFocus.java
index 2456379f0f9..80be9321b6d 100644
--- a/test/jdk/java/awt/Focus/ChoiceFocus/ChoiceFocus.java
+++ b/test/jdk/java/awt/Focus/ChoiceFocus/ChoiceFocus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java b/test/jdk/java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java
index 5d1012bd22b..13b8a1de511 100644
--- a/test/jdk/java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java
+++ b/test/jdk/java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@ public class ClearLwQueueBreakTest {
     JTextField tf1 = new JTextField("     ");
     JTextField tf2 = new JTextField("     ");
     JTextField tf3 = new JTextField("     ");
-    AtomicBoolean typed = new AtomicBoolean(false);
+    final AtomicBoolean typed = new AtomicBoolean(false);
     FocusListener listener1;
     FocusListener listener2;
 
@@ -114,6 +114,7 @@ public class ClearLwQueueBreakTest {
         f1.setLocationRelativeTo(null);
         f1.setVisible(true);
         Util.waitForIdle(robot);
+        robot.delay(1000);
 
         /*
          * Break the sequence of LW requests in the middle.
diff --git a/test/jdk/java/awt/FontMetrics/ExtremeFontSizeTest.java b/test/jdk/java/awt/FontMetrics/ExtremeFontSizeTest.java
index f596f710831..239771c317a 100644
--- a/test/jdk/java/awt/FontMetrics/ExtremeFontSizeTest.java
+++ b/test/jdk/java/awt/FontMetrics/ExtremeFontSizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/Frame/FrameSetMinimumSizeTest.java b/test/jdk/java/awt/Frame/FrameSetMinimumSizeTest.java
index 929a36e773e..ff95fd51401 100644
--- a/test/jdk/java/awt/Frame/FrameSetMinimumSizeTest.java
+++ b/test/jdk/java/awt/Frame/FrameSetMinimumSizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.Frame;
+import java.awt.Robot;
 
 /*
  * @test
@@ -35,57 +36,65 @@ import java.awt.Frame;
 
 public class FrameSetMinimumSizeTest {
     private static Frame f;
-    private static volatile boolean passed;
-
+    private static Robot robot;
     public static void main(String[] args) throws Exception {
-        EventQueue.invokeAndWait(() -> {
-            try {
-                createAndShowUI();
+        robot = new Robot();
+        try {
+            EventQueue.invokeAndWait(FrameSetMinimumSizeTest::createAndShowUI);
+            robot.waitForIdle();
+            robot.delay(500);
 
-                f.setSize(200, 200);
-                passed = verifyFrameSize(new Dimension(300, 300));
-                isFrameSizeOk(passed);
+            test(
+                new Dimension(200, 200),
+                new Dimension(300, 300)
+            );
 
-                f.setSize(200, 400);
-                passed = verifyFrameSize(new Dimension(300, 400));
-                isFrameSizeOk(passed);
+            test(
+                new Dimension(200, 400),
+                new Dimension(300, 400)
+            );
 
-                f.setSize(400, 200);
-                passed = verifyFrameSize(new Dimension(400, 300));
-                isFrameSizeOk(passed);
+            test(
+                new Dimension(400, 200),
+                new Dimension(400, 300)
+            );
 
-                f.setMinimumSize(null);
-
-                f.setSize(200, 200);
-                passed = verifyFrameSize(new Dimension(200, 200));
-                isFrameSizeOk(passed);
-            } finally {
+            EventQueue.invokeAndWait(() -> f.setMinimumSize(null));
+            test(
+                new Dimension(200, 200),
+                new Dimension(200, 200)
+            );
+        } finally {
+            EventQueue.invokeAndWait(() -> {
                 if (f != null) {
                     f.dispose();
                 }
-            }
-        });
+            });
+        }
+    }
+
+    private static void test(Dimension size, Dimension expected) throws Exception {
+        robot.waitForIdle();
+        robot.delay(250);
+        EventQueue.invokeAndWait(() -> f.setSize(size));
+        robot.waitForIdle();
+        EventQueue.invokeAndWait(() -> verifyFrameSize(expected));
     }
 
     private static void createAndShowUI() {
         f = new Frame("Minimum Size Test");
         f.setSize(300, 300);
         f.setMinimumSize(new Dimension(300, 300));
+        f.setLocationRelativeTo(null);
         f.setVisible(true);
     }
 
-    private static boolean verifyFrameSize(Dimension expected) {
-
+    private static void verifyFrameSize(Dimension expected) {
         if (f.getSize().width != expected.width || f.getSize().height != expected.height) {
-            return false;
-        }
-        return true;
-    }
-
-    private static void isFrameSizeOk(boolean passed) {
-        if (!passed) {
-            throw new RuntimeException("Frame's setMinimumSize not honoured for the" +
-                    " frame size: " + f.getSize());
+            String message =
+                    "Frame's setMinimumSize not honoured for the frame size: %s. Expected %s"
+                            .formatted(f.getSize(), expected);
+            throw new RuntimeException(message);
         }
     }
 }
diff --git a/test/jdk/java/awt/Frame/FrameVisualTest.java b/test/jdk/java/awt/Frame/FrameVisualTest.java
index 767eb0a1896..39853822c44 100644
--- a/test/jdk/java/awt/Frame/FrameVisualTest.java
+++ b/test/jdk/java/awt/Frame/FrameVisualTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,62 +46,71 @@ import javax.imageio.ImageIO;
 public class FrameVisualTest {
     private static GraphicsConfiguration[] gcs;
     private static volatile Frame[] frames;
-    private static volatile int index;
 
-    private static Frame f;
     private static Robot robot;
+    private static volatile int frameNum;
     private static volatile Point p;
     private static volatile Dimension d;
     private static final int TOLERANCE = 5;
+    private static final int MAX_FRAME_COUNT = 30;
 
     public static void main(String[] args) throws Exception {
-        gcs = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getConfigurations();
+        gcs = GraphicsEnvironment.getLocalGraphicsEnvironment()
+                .getDefaultScreenDevice().getConfigurations();
         robot = new Robot();
         robot.setAutoDelay(100);
-        try {
-            EventQueue.invokeAndWait(() -> {
-                createAndShowUI();
-            });
-            robot.delay(1000);
-            System.out.println("frames.length: "+frames.length);
-            for (index = 0; index < frames.length; index++) {
+
+        // Limit the number of frames tested if needed
+        if (gcs.length > MAX_FRAME_COUNT) {
+            frames = new Frame[MAX_FRAME_COUNT];
+        } else {
+            frames = new Frame[gcs.length];
+        }
+        System.out.println(gcs.length + " gcs found. Testing "
+                + frames.length + " frame(s).");
+
+        for (frameNum = 0; frameNum < frames.length; frameNum++) {
+            try {
                 EventQueue.invokeAndWait(() -> {
-                    p = frames[index].getLocation();
-                    d = frames[index].getSize();
+                    frames[frameNum] = new Frame("Frame w/ gc "
+                            + frameNum, gcs[frameNum]);
+                    frames[frameNum].setSize(100, 100);
+                    frames[frameNum].setUndecorated(true);
+                    frames[frameNum].setBackground(Color.WHITE);
+                    frames[frameNum].setVisible(true);
+                    System.out.println("Frame " + frameNum + " created");
                 });
+
+                robot.delay(1000);
+
+                EventQueue.invokeAndWait(() -> {
+                    p = frames[frameNum].getLocation();
+                    d = frames[frameNum].getSize();
+                });
+
                 Rectangle rect = new Rectangle(p, d);
                 BufferedImage img = robot.createScreenCapture(rect);
                 if (chkImgBackgroundColor(img)) {
                     try {
-                        ImageIO.write(img, "png", new File("Frame_" + index + ".png"));
+                        ImageIO.write(img, "png",
+                                new File("Frame_"
+                                        + frameNum + ".png"));
                     } catch (IOException ignored) {}
-                    throw new RuntimeException("Frame visual test failed with non-white background color");
+                    throw new RuntimeException("Frame visual test " +
+                            "failed with non-white background color");
                 }
-            }
-        } finally {
-            for (index = 0; index < frames.length; index++) {
+            } finally {
                 EventQueue.invokeAndWait(() -> {
-                    if (frames[index] != null) {
-                        frames[index].dispose();
+                    if (frames[frameNum] != null) {
+                        frames[frameNum].dispose();
+                        System.out.println("Frame " + frameNum + " disposed");
                     }
                 });
             }
         }
     }
 
-    private static void createAndShowUI() {
-        frames = new Frame[gcs.length];
-        for (int i = 0; i < frames.length; i++) {
-            frames[i] = new Frame("Frame w/ gc " + i, gcs[i]);
-            frames[i].setSize(100, 100);
-            frames[i].setUndecorated(true);
-            frames[i].setBackground(Color.WHITE);
-            frames[i].setVisible(true);
-        }
-    }
-
     private static boolean chkImgBackgroundColor(BufferedImage img) {
-
         // scan for mid-line and if it is non-white color then return true.
         for (int x = 1; x < img.getWidth() - 1; ++x) {
             Color c = new Color(img.getRGB(x, img.getHeight() / 2));
diff --git a/test/jdk/java/awt/Frame/GetGraphicsStressTest/GetGraphicsStressTest.java b/test/jdk/java/awt/Frame/GetGraphicsStressTest/GetGraphicsStressTest.java
index 52961d2827f..98f2a157f76 100644
--- a/test/jdk/java/awt/Frame/GetGraphicsStressTest/GetGraphicsStressTest.java
+++ b/test/jdk/java/awt/Frame/GetGraphicsStressTest/GetGraphicsStressTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java b/test/jdk/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java
index fe3bf95f25a..6a7381845af 100644
--- a/test/jdk/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java
+++ b/test/jdk/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java b/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java
index 7f9a07878f1..52b7eeccd12 100644
--- a/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java
+++ b/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,9 +31,16 @@
   @run        main ButtonActionKeyTest
 */
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import java.awt.FlowLayout;
+import java.awt.Robot;
+import javax.swing.AbstractAction;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JTextField;
+import javax.swing.KeyStroke;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 import java.util.concurrent.atomic.AtomicBoolean;
 import test.java.awt.regtesthelpers.Util;
 
@@ -42,7 +49,7 @@ public class ButtonActionKeyTest {
     JFrame frame = new JFrame("Frame");
     JButton button = new JButton("button");
     JTextField text = new JTextField("text");
-    AtomicBoolean gotEvent = new AtomicBoolean(false);
+    final AtomicBoolean gotEvent = new AtomicBoolean(false);
 
     public static void main(String[] args) {
         ButtonActionKeyTest app = new ButtonActionKeyTest();
@@ -82,9 +89,11 @@ public class ButtonActionKeyTest {
         frame.setLocationRelativeTo(null);
         frame.setVisible(true);
         Util.waitForIdle(robot);
+        robot.delay(1000);
 
         Util.clickOnComp(button, robot);
         Util.waitForIdle(robot);
+        robot.delay(500);
 
         if (!button.isFocusOwner()) {
             throw new Error("Test error: a button didn't gain focus.");
diff --git a/test/jdk/java/awt/LightweightComponent/LightWeightTabFocus/LightWeightTabFocus.java b/test/jdk/java/awt/LightweightComponent/LightWeightTabFocus/LightWeightTabFocus.java
index 05889580fd4..2d0b742c319 100644
--- a/test/jdk/java/awt/LightweightComponent/LightWeightTabFocus/LightWeightTabFocus.java
+++ b/test/jdk/java/awt/LightweightComponent/LightWeightTabFocus/LightWeightTabFocus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -97,6 +97,7 @@ public class LightWeightTabFocus {
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
             EventQueue.invokeAndWait(() -> {
                 if (f != null) {
                     f.dispose();
diff --git a/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java b/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java
index 69bd1dd6c83..49e4f1c91ab 100644
--- a/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java
+++ b/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java b/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java
index 1b1d4e4b5c4..26b80c16c1b 100644
--- a/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java
+++ b/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/List/NoEvents/MixProgrammaticUserChange.java b/test/jdk/java/awt/List/NoEvents/MixProgrammaticUserChange.java
new file mode 100644
index 00000000000..fa5c02b1964
--- /dev/null
+++ b/test/jdk/java/awt/List/NoEvents/MixProgrammaticUserChange.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Frame;
+import java.awt.List;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.ItemEvent;
+import java.awt.event.KeyEvent;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import jdk.test.lib.Platform;
+
+/**
+ * @test
+ * @bug 8373967
+ * @key headful
+ * @summary Checks that programmatic changes to a List do not fire events,
+ *          only user interactions do
+ * @library /test/lib
+ * @build jdk.test.lib.Platform
+ * @run main/othervm MixProgrammaticUserChange
+ */
+public final class MixProgrammaticUserChange {
+
+    private static Robot robot;
+    private static final BlockingQueue<ItemEvent> events =
+            new ArrayBlockingQueue<>(10);
+
+    public static void main(String[] args) throws Exception {
+        Frame frame = new Frame();
+        try {
+            robot = new Robot();
+            robot.setAutoWaitForIdle(true);
+            robot.setAutoDelay(100);
+
+            List list = new List(1, true);
+            list.add("Item");
+            list.addItemListener(e -> {
+                if (e.getID() == ItemEvent.ITEM_STATE_CHANGED) {
+                    events.offer(e);
+                }
+            });
+
+            frame.add(list);
+            frame.setUndecorated(true);
+            frame.pack();
+            frame.setLocationRelativeTo(null);
+            frame.setVisible(true);
+            robot.waitForIdle(100);
+
+            Point loc = list.getLocationOnScreen();
+            loc.translate(list.getWidth() / 2, list.getHeight() / 2);
+
+            test(() -> click(loc), ItemEvent.SELECTED);
+            test(() -> list.deselect(0), -1);
+            test(() -> click(loc), ItemEvent.SELECTED);
+            test(() -> click(loc), ItemEvent.DESELECTED);
+            test(() -> list.select(0), -1);
+            test(() -> click(loc), ItemEvent.DESELECTED);
+        } finally {
+            frame.dispose();
+        }
+        if (!events.isEmpty()) {
+            throw new RuntimeException("Unexpected events: " + events);
+        }
+    }
+
+    private static void test(Runnable action, int state) throws Exception {
+        action.run();
+        // Large delay, we are waiting for unexpected events
+        ItemEvent e = events.poll(1, TimeUnit.SECONDS);
+        if (e == null && state == -1) {
+            return; // no events as expected
+        } else if (e != null && e.getStateChange() == state) {
+            return; // expected event received
+        }
+        String text = (state == -1) ? "null" : state == ItemEvent.SELECTED
+                                             ? "SELECTED" : "DESELECTED";
+        throw new RuntimeException("Expected: %s, got: %s".formatted(text, e));
+    }
+
+    private static void click(Point p) {
+        robot.mouseMove(p.x, p.y);
+        int keyCode = Platform.isOSX() ? KeyEvent.VK_META : KeyEvent.VK_CONTROL;
+        robot.keyPress(keyCode);
+        try {
+            robot.click();
+        } finally {
+            robot.keyRelease(keyCode);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/List/NoEvents/ProgrammaticChange.java b/test/jdk/java/awt/List/NoEvents/ProgrammaticChange.java
new file mode 100644
index 00000000000..07b4bd2ac70
--- /dev/null
+++ b/test/jdk/java/awt/List/NoEvents/ProgrammaticChange.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Frame;
+import java.awt.List;
+import java.awt.Robot;
+import java.util.Arrays;
+import java.util.function.Supplier;
+
+/**
+ * @test
+ * @bug 8371657
+ * @key headful
+ * @summary Checks that programmatic changes to a List do not fire events
+ */
+public final class ProgrammaticChange {
+
+    private static Robot robot;
+    private static volatile boolean itemEvent;
+    private static volatile boolean actionEvent;
+
+    public static void main(String[] args) throws Exception {
+        robot = new Robot();
+        robot.mouseMove(0, 0); // Just in case, the mouse may affect selection
+
+        var creators = Arrays.<Supplier<List>>asList(
+                List::new, () -> createList(false), () -> createList(true)
+        );
+        for (Supplier<List> creator : creators) {
+            test(creator, true);  // Test displayable list
+            test(creator, false); // Test non-displayable list
+        }
+    }
+
+    private static void test(Supplier<List> creator, boolean displayable) {
+        List list = creator.get();
+        list.addItemListener(event -> {
+            System.err.println("event = " + event);
+            itemEvent = true;
+        });
+        list.addActionListener(event -> {
+            System.err.println("event = " + event);
+            actionEvent = true;
+        });
+
+        Frame frame = null;
+        try {
+            if (displayable) {
+                frame = new Frame();
+                frame.setSize(300, 200);
+                frame.setLocationRelativeTo(null);
+                frame.add(list);
+                frame.setVisible(true);
+            }
+            tryTriggerEvents(list);
+        } finally {
+            if (frame != null) {
+                frame.dispose();
+            }
+        }
+    }
+
+    private static void tryTriggerEvents(List list) {
+        // Only "select" and "deselect" should not fire events per the spec,
+        // but we also check other methods to prevent accidental changes
+        selectAll(list);
+        verify();
+        deselectAll(list);
+        verify();
+
+        // "add" may change the current selection
+        selectAll(list);
+        list.add("newItemStart", 0);
+        list.add("newItemMid", 1);
+        list.add("newItemEnd");
+        verify();
+
+        // "remove" may change the current selection
+        selectAll(list);
+        list.remove(0);
+        verify();
+
+        // "makeVisible" may change the current selection
+        for (int i = 0; i < 100; i++){
+            list.add("newItem_" + i, 0);
+        }
+        selectAll(list);
+        list.makeVisible(1);
+        list.makeVisible(99);
+        verify();
+
+        // "setMultipleMode" may change the current selection
+        selectAll(list);
+        list.setMultipleMode(!list.isMultipleMode());
+        selectAll(list);
+        list.setMultipleSelections(!list.allowsMultipleSelections());
+        verify();
+
+        // "removeAll" may change the current selection
+        selectAll(list);
+        list.removeAll();
+        verify();
+
+        // No extra logic; just calling methods to touch all code paths
+        list.add("newItem1");
+        list.getSelectedIndex();
+        list.getSelectedIndexes();
+        list.getSelectedItem();
+        list.getSelectedItems();
+        list.getSelectedObjects();
+        list.getVisibleIndex();
+        list.isIndexSelected(0);
+        list.isSelected(0);
+
+        list.add("newItem2");
+        list.delItems(0, 0);
+        list.addItem("newItem4");
+        list.delItem(0);
+        list.addItem("newItem6", 0);
+        list.replaceItem("newItem7", 0);
+        list.remove("newItem7");
+        list.add("newItem8");
+        list.clear();
+        verify();
+    }
+
+    private static void selectAll(List list) {
+        for (int index = 0; index < list.getItemCount(); index++) {
+            list.select(index);
+        }
+    }
+
+    private static void deselectAll(List list) {
+        for (int index = 0; index < list.countItems(); index++) {
+            list.deselect(index);
+        }
+    }
+
+    private static List createList(boolean multipleMode) {
+        List list = new List(4, multipleMode);
+        for (String item : new String[]{"item1", "item2", "item3"}) {
+            list.add(item);
+        }
+        return list;
+    }
+
+    private static void verify() {
+        robot.waitForIdle();
+        robot.delay(700); // Large delay, we are waiting for unexpected events
+        if (actionEvent || itemEvent) {
+            System.err.println("itemEvent: " + itemEvent);
+            System.err.println("actionEvent: " + actionEvent);
+            throw new RuntimeException("Unexpected event");
+        }
+    }
+}
diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java b/test/jdk/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java
index f67e71b1b19..f5dd838eff2 100644
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@ import java.awt.Container;
 import java.awt.Point;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.event.InputEvent;
 import java.lang.reflect.InvocationTargetException;
+
 import javax.swing.JFrame;
 import javax.swing.SpringLayout;
 import javax.swing.SwingUtilities;
-import test.java.awt.regtesthelpers.Util;
 
 /**
  * Base class for testing overlapping of Swing and AWT component put into GlassPane.
@@ -46,7 +45,6 @@ public abstract class GlassPaneOverlappingTestBase extends SimpleOverlappingTest
      */
     protected boolean testResize = true;
     private JFrame f = null;
-    private volatile Point ancestorLoc;
 
     /**
      * Setups GlassPane with lightweight component returned by {@link SimpleOverlappingTestBase#getSwingComponent() }
@@ -83,6 +81,7 @@ public abstract class GlassPaneOverlappingTestBase extends SimpleOverlappingTest
         testedComponent.setBounds(0, 0, testedComponent.getPreferredSize().width, testedComponent.getPreferredSize().height);
         glassPane.add(testedComponent);
 
+        f.setLocationRelativeTo(null);
         f.setVisible(true);
     }
 
@@ -94,6 +93,11 @@ public abstract class GlassPaneOverlappingTestBase extends SimpleOverlappingTest
         super(defaultClickValidation);
     }
 
+    @Override
+    protected final boolean isMultiFramesTest() {
+        return false;
+    }
+
     /**
      * Run test by {@link OverlappingTestBase#clickAndBlink(java.awt.Robot, java.awt.Point) } validation for current lightweight component.
      * <p>Also resize component and repeat validation in the resized area.
@@ -106,40 +110,33 @@ public abstract class GlassPaneOverlappingTestBase extends SimpleOverlappingTest
         if (!super.performTest()) {
             return false;
         }
-        if (testResize) {
-            wasLWClicked = false;
-            try {
-                SwingUtilities.invokeAndWait(new Runnable() {
 
-                    public void run() {
-                        testedComponent.setBounds(0, 0, testedComponent.getPreferredSize().width, testedComponent.getPreferredSize().height + 20);
-                        ancestorLoc = f.getLocationOnScreen();
-                    }
-                });
-            } catch (InterruptedException ex) {
-                fail(ex.getMessage());
-            } catch (InvocationTargetException ex) {
-                fail(ex.getMessage());
-            }
-            Point lLoc = testedComponent.getLocationOnScreen();
-            lLoc.translate(1, testedComponent.getPreferredSize().height + 1);
-
-            /* this is a workaround for certain jtreg(?) focus issue:
-               tests fail starting after failing mixing tests but always pass alone.
-             */
-            Util.waitForIdle(robot);
-            ancestorLoc.translate(isOel7orLater() ? 5 : f.getWidth() / 2 - 15, 2);
-            robot.mouseMove(ancestorLoc.x, ancestorLoc.y);
-            Util.waitForIdle(robot);
-            robot.mousePress(InputEvent.BUTTON1_MASK);
-            robot.delay(50);
-            robot.mouseRelease(InputEvent.BUTTON1_MASK);
-            Util.waitForIdle(robot);
-
-            clickAndBlink(robot, lLoc);
-            return wasLWClicked;
-        } else {
+        if (!testResize) {
             return true;
         }
+
+        wasLWClicked = false;
+        try {
+            SwingUtilities.invokeAndWait(new Runnable() {
+
+                public void run() {
+                    testedComponent.setBounds(0, 0,
+                            testedComponent.getPreferredSize().width,
+                            testedComponent.getPreferredSize().height + 20);
+                }
+            });
+        } catch (InterruptedException | InvocationTargetException ex) {
+            fail(ex.getMessage());
+        }
+        Point lLoc = testedComponent.getLocationOnScreen();
+        lLoc.translate(1, testedComponent.getPreferredSize().height + 1);
+        clickAndBlink(robot, lLoc);
+
+        return wasLWClicked;
+    }
+
+    @Override
+    protected void cleanup() {
+        f.dispose();
     }
 }
diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java
index cc02e9afbeb..d71fa7b3522 100644
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,7 +64,6 @@ public class JComboBoxOverlapping extends OverlappingTestBase {
         frame = new JFrame("Mixing : Dropdown Overlapping test");
         frame.getContentPane().setLayout(new BoxLayout(frame.getContentPane(), BoxLayout.Y_AXIS));
         frame.setSize(200, 200);
-        frame.setVisible(true);
 
         cb = new JComboBox(petStrings);
         cb.setPreferredSize(new Dimension(frame.getContentPane().getWidth(), 20));
@@ -79,6 +78,7 @@ public class JComboBoxOverlapping extends OverlappingTestBase {
 
         frame.add(cb);
         propagateAWTControls(frame);
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
     }
 
diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java
index 443ff70727d..6f27aba85da 100644
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@ import test.java.awt.regtesthelpers.Util;
 
 /**
  * AWT/Swing overlapping test for {@link javax.swing.JInternalFrame } component during move.
- * <p>See <a href="http://monaco.sfbay.sun.com/detail.jsf?cr=6985399">CR6768230</a> for details and base class for test info.
  */
 /*
  * @test
@@ -117,6 +116,7 @@ public class JInternalFrameMoveOverlapping extends OverlappingTestBase {
         JFrame frame = new JFrame("Test Window");
         frame.setSize(300, 300);
         frame.setContentPane(desktopPane);
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
 
         locTopFrame = topFrame.getLocationOnScreen();
diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java
index 4cb9425abe7..8d619e34c35 100644
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,6 +75,7 @@ public class JInternalFrameOverlapping extends OverlappingTestBase {
         JFrame frame = new JFrame("Test Window");
         frame.setSize(300, 300);
         frame.setContentPane(desktopPane);
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
         JInternalFrame bottomFrame = new JInternalFrame("bottom frame", false, false, false, false);
         bottomFrame.setSize(220, 220);
diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java
index 792831c2d8d..f3a213e5144 100644
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  */
 
 
-import java.awt.Color;
 import java.awt.GridLayout;
 import java.awt.Point;
 import java.awt.Robot;
@@ -30,12 +29,14 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+
 import javax.swing.JFrame;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 import javax.swing.JSeparator;
 import javax.swing.SwingUtilities;
+
 import test.java.awt.regtesthelpers.Util;
 
 /**
@@ -72,7 +73,6 @@ public class JMenuBarOverlapping extends OverlappingTestBase {
         frame = new JFrame("Mixing : Dropdown Overlapping test");
         frame.setLayout(new GridLayout(0,1));
         frame.setSize(200, 200);
-        frame.setVisible(true);
 
         menuBar = new JMenuBar();
         JMenu menu = new JMenu("Test Menu");
@@ -104,6 +104,7 @@ public class JMenuBarOverlapping extends OverlappingTestBase {
         frame.setJMenuBar(menuBar);
 
         propagateAWTControls(frame);
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
     }
 
diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java
index d4b50287dc6..e80475088ac 100644
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,17 +22,18 @@
  */
 
 
-import java.awt.Color;
 import java.awt.Point;
 import java.awt.Robot;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.lang.reflect.InvocationTargetException;
+
 import javax.swing.JFrame;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.SpringLayout;
 import javax.swing.SwingUtilities;
+
 import test.java.awt.regtesthelpers.Util;
 
 /**
@@ -82,6 +83,7 @@ public class JPopupMenuOverlapping extends OverlappingTestBase {
             item.addActionListener(menuListener);
         }
         propagateAWTControls(frame);
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
         loc = frame.getContentPane().getLocationOnScreen();
     }
diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java
index f22eacba82d..91538b75c13 100644
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -95,6 +95,7 @@ public class JScrollPaneOverlapping extends OverlappingTestBase {
         });
 
         f.getContentPane().add(scrollPane);
+        f.setLocationRelativeTo(null);
         f.setVisible(true);
         propagateAWTControls(p);
 //        JButton b = new JButton("Space extender");
diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java
index 7e1cb9434e4..5875a04b62b 100644
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -89,6 +89,7 @@ public class JSplitPaneOverlapping extends OverlappingTestBase {
 
         frame.getContentPane().add(splitPane);
         frame.pack();
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
     }
 
diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java b/test/jdk/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java
index 545566970f8..8c19a80bd43 100644
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,11 @@ import java.awt.Dimension;
 import java.awt.Point;
 import java.awt.Robot;
 import java.awt.event.InputEvent;
+
 import javax.swing.JFrame;
 import javax.swing.SpringLayout;
 import javax.swing.SwingUtilities;
+
 import test.java.awt.regtesthelpers.Util;
 
 /**
@@ -65,6 +67,7 @@ public class MixingFrameResizing extends OverlappingTestBase {
         frame = new JFrame("Mixing : Frame Resizing test");
         frame.setLayout(new SpringLayout());
         frame.setSize(50, 50);
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
         propagateAWTControls(frame);
         Util.waitTillShown(frame);
diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java b/test/jdk/java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java
index 39a59dc2a5c..1bb9b442dd8 100644
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,23 @@
  */
 
 
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Color;
+import java.awt.Panel;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.Toolkit;
 import java.awt.event.InputEvent;
-import javax.swing.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+
 import test.java.awt.regtesthelpers.Util;
 
 /**
@@ -130,6 +143,7 @@ public class MixingPanelsResizing {
                 frame.add(jPanel, BorderLayout.NORTH);
 
                 frame.pack();
+                frame.setLocationRelativeTo(null);
                 frame.setVisible(true);
             }
         });
@@ -298,6 +312,7 @@ public class MixingPanelsResizing {
         failureMessage = whyFailed;
         mainThread.interrupt();
     }//fail()
+
+    static class TestPassedException extends RuntimeException {
+    }
 }// class JButtonInGlassPane
-class TestPassedException extends RuntimeException {
-}
diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java b/test/jdk/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java
index 4975cc165c2..03abb58f673 100644
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,13 +56,13 @@ public class OpaqueOverlapping extends OverlappingTestBase {
 
     {
         useClickValidation = false;
-        failMessage = "Opacity test mismatchs";
+        failMessage = "Opacity test mismatches";
 
         // CR 6994264 (Choice autohides dropdown on Solaris 10)
         skipClassNames = new String[] { "Choice" };
     }
     private String testSeq;
-    private final static String checkSeq = "010000101";
+    private static final String checkSeq = "010000101";
     private Point heavyLoc;
     private JButton light;
     private Frame frame = null;
@@ -89,6 +89,7 @@ public class OpaqueOverlapping extends OverlappingTestBase {
         panel.add(light);
         frame.add(panel);
         frame.setBounds(50, 50, 400, 400);
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
 
         currentAwtControl.addMouseListener(new MouseAdapter() {
diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java b/test/jdk/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java
index 794578a5907..3d4adecbd17 100644
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@ import java.awt.Robot;
 import java.awt.Scrollbar;
 import java.awt.TextField;
 import java.awt.Toolkit;
+import java.awt.Window;
 import java.awt.event.InputEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -171,6 +172,7 @@ public abstract class OverlappingTestBase {
                     frame.getContentPane().setBackground(AWT_BACKGROUND_COLOR);
                     frame.setSize(size, size);
                     frame.setUndecorated(true);
+                    frame.setLocationRelativeTo(null);
                     frame.setVisible(true);
                     frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
                     p[0] = frame.getLocation();
@@ -259,6 +261,9 @@ public abstract class OverlappingTestBase {
                 embedder.setBackground(Color.RED);
                 embedder.setPreferredSize(new Dimension(150, 150));
                 container.add(embedder);
+                if (container instanceof Window) {
+                    ((Window) container).setLocationRelativeTo(null);
+                }
                 container.setVisible(true); // create peer
 
                 long frameWindow = 0;
@@ -301,6 +306,7 @@ public abstract class OverlappingTestBase {
                 EmbeddedFrame eframe = (EmbeddedFrame) eframeCtor.newInstance(frameWindow);
                 setupControl(eframe);
                 eframe.setSize(new Dimension(150, 150));
+                eframe.setLocationRelativeTo(null);
                 eframe.setVisible(true);
 //                System.err.println(eframe.getSize());
             } catch (Exception ex) {
@@ -682,6 +688,7 @@ public abstract class OverlappingTestBase {
         failureMessage = whyFailed;
         mainThread.interrupt();
     }//fail()
+
+    static class TestPassedException extends RuntimeException {
+    }
 }// class LWComboBox
-class TestPassedException extends RuntimeException {
-}
diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java b/test/jdk/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java
index 928a5c437cb..0dd42a36cd0 100644
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,10 +21,21 @@
  * questions.
  */
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.regex.*;
-import javax.swing.*;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.SpringLayout;
+
 import test.java.awt.regtesthelpers.Util;
 
 /**
@@ -55,6 +66,10 @@ public abstract class SimpleOverlappingTestBase extends OverlappingTestBase {
         this.useDefaultClickValidation = defaultClickValidation;
     }
 
+    protected boolean isMultiFramesTest(){
+        return true;
+    }
+
     public SimpleOverlappingTestBase() {
         this(true);
     }
@@ -114,6 +129,7 @@ public abstract class SimpleOverlappingTestBase extends OverlappingTestBase {
 
         propagateAWTControls(f);
 
+        f.setLocationRelativeTo(null);
         f.setVisible(true);
     }
 
@@ -140,21 +156,29 @@ public abstract class SimpleOverlappingTestBase extends OverlappingTestBase {
         /* this is a workaround for certain jtreg(?) focus issue:
            tests fail starting after failing mixing tests but always pass alone.
          */
-        JFrame ancestor = (JFrame)(testedComponent.getTopLevelAncestor());
-        if( ancestor != null ) {
-            Point ancestorLoc = ancestor.getLocationOnScreen();
-            ancestorLoc.translate(isOel7orLater() ? 5 :
-                                             ancestor.getWidth() / 2 - 15, 2);
-            robot.mouseMove(ancestorLoc.x, ancestorLoc.y);
-            Util.waitForIdle(robot);
-            robot.mousePress(InputEvent.BUTTON1_MASK);
-            robot.delay(50);
-            robot.mouseRelease(InputEvent.BUTTON1_MASK);
-            Util.waitForIdle(robot);
+        JFrame ancestor = (JFrame) (testedComponent.getTopLevelAncestor());
+        if (ancestor != null) {
+            final CountDownLatch latch = new CountDownLatch(1);
+            ancestor.addFocusListener(new FocusAdapter() {
+                @Override public void focusGained(FocusEvent e) {
+                    latch.countDown();
+                }
+            });
+            ancestor.requestFocus();
+            try {
+                if (!latch.await(1L, TimeUnit.SECONDS)) {
+                    throw new RuntimeException(
+                            "Ancestor frame didn't receive focus");
+                }
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
         }
 
         clickAndBlink(robot, lLoc);
-        Util.waitForIdle(robot);
+        if (ancestor != null && isMultiFramesTest()) {
+            ancestor.dispose();
+        }
 
         return wasLWClicked;
     }
@@ -172,5 +196,4 @@ public abstract class SimpleOverlappingTestBase extends OverlappingTestBase {
         }
         return false;
     }
-
 }
diff --git a/test/jdk/java/awt/Modal/PrintDialogsTest/PrintDialogsTest.java b/test/jdk/java/awt/Modal/PrintDialogsTest/PrintDialogsTest.java
index e2b2d8cac78..0b2d430a150 100644
--- a/test/jdk/java/awt/Modal/PrintDialogsTest/PrintDialogsTest.java
+++ b/test/jdk/java/awt/Modal/PrintDialogsTest/PrintDialogsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,40 +49,35 @@ import java.awt.event.ActionListener;
 
 public class PrintDialogsTest extends Panel implements ActionListener {
 
-    static final String INSTRUCTIONS = """
-        This test is free format, which means there is no enforced or guided sequence.
-
-        Please select each of
-        (a) The dialog parent type.
-        (b) The dialog modality type
-        (c) The print dialog type (Print dialog or Page Setup dialog)
-
-        Once the choices have been made click the "Start test" button.
-
-        Three windows will appear
-        (1) A Frame or a Dialog - in the case you selected "Dialog" as the parent type
-        (2) a Window (ie an undecorated top-level)
-        (3) A dialog with two buttons "Open" and "Finish"
-
-        Now check as follows whether modal blocking works as expected.
-        Windows (1) and (2) contain a button which you should be able to press
-        ONLY if you selected "Non-modal", or "Modeless" for modality type.
-        In other cases window (3) will block input to (1) and (2)
-
-        Then push the "Open" button on the Dialog to show the printing dialog and check
-        if it blocks the rest of the application - ie all of windows (1), (2) and (3)
-        should ALWAYS be blocked when the print dialog is showing.
-        Now cancel the printing dialog and check the correctness of modal blocking
-        behavior for the Dialog again.
-        To close all the 3 test windows please push the "Finish" button.
-
-        Repeat all the above for different combinations, which should include
-        using all of the Dialog parent choices and all of the Dialog Modality types.
-
-        If any behave incorrectly, note the combination of choices and press Fail.
-
-        If all behave correctly, press Pass.
-    """;
+    static final String INSTRUCTIONS =
+        "1. On the Test UI Select:\n" +
+        "\tThe dialog parent type. (e.g. Frame, Dialog, Hidden, Null)\n" +
+        "\tThe dialog modality type. (e.g. Modal, Non-Modal, Toolkit modal).\n" +
+        "\tThe print dialog type. (Print dialog or Page Setup dialog).\n\n" +
+        "2. Next, click on 'Start test' - Three windows will appear:\n" +
+        "\tWindow (1) -a Frame or Dialog (depending on selected parent type).\n" +
+        "\tWindow (2) -an undecorated top-level Window.\n" +
+        "\tWindow (3) -a Dialog containing two buttons: 'Open' and 'Finish'.\n" +
+        "\tWindows (1) & (2) have a Dummy button.\n\n" +
+        "3. Press the button on Window (1) & Window (2) \n" +
+        "Verification step:\n" +
+        "\tIf Modality is 'Non-modal' or 'Modeless', Button is pressed \n" +
+        "\tIf Modality is 'Document' & parent is not Frame/Dialog, Button is pressed \n" +
+        "\tIn all other cases, button is not pressed & Window (3) should \n" +
+        "\tblock input to Windows (1) & (2).\n\n" +
+        "4. Next, press the 'Open' button in Window (3) to open print dialog.\n\n" +
+        "5. Press the button on Window (1) & Window (2)\n" +
+        "Verification step:\n" +
+        "\tThe print dialog should block all three windows (1, 2, and 3).\n\n" +
+        "6. Cancel the print dialog, Check again if Window (3) " +
+        "blocks Windows (1) and (2) correctly.\n" +
+        "Verification step:\n" +
+        "\tConditions as seen in Verification step 3 " +
+        "should be seen, as before.\n" +
+        "To close all test windows, press 'Finish'.\n\n" +
+        "7. Repeat the steps for different combinations of Dialog Parent, Dialog Modality Type, Print Dialg Type.\n" +
+        "Try every dialog parent type and every dialog modality type.\n\n" +
+        "If any of the Verification step fails, note the combination and press 'Fail'.\n";
 
     public static void main(String[] args) throws Exception {
 
diff --git a/test/jdk/java/awt/Modal/PrintDialogsTest/Test.java b/test/jdk/java/awt/Modal/PrintDialogsTest/Test.java
index 3c8faceb3a9..1afe44935d2 100644
--- a/test/jdk/java/awt/Modal/PrintDialogsTest/Test.java
+++ b/test/jdk/java/awt/Modal/PrintDialogsTest/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -191,6 +191,7 @@ public class Test {
                 break;
             case DIALOG:
                 dialog = new CustomDialog(parent);
+                break;
             case FRAME:
                 dialog = new CustomDialog(frame);
                 break;
diff --git a/test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java
index 4faea19db2f..928bfd027ea 100644
--- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java
+++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,12 +34,27 @@
  * @build Flag
  * @build TestDialog
  * @build TestFrame
+ * @build jdk.test.lib.Platform
  * @run main DialogToFrontModeless1Test
  */
 
+import jdk.test.lib.Platform;
+import jtreg.SkippedException;
+
 public class DialogToFrontModeless1Test {
 
     public static void main(String[] args) throws Exception {
+        if (Platform.isOnWayland()) {
+            // Some tested systems are still use XTEST(X11 protocol)
+            // for key and mouse press emulation, but this will not work
+            // outside of X11.
+            // An emulated input event will reach X11 clients, but not the
+            // Wayland compositor, which is responsible for window restacking.
+            //
+            // This skip can be removed later once all systems switch to
+            // the default remote desktop XDG portal.
+             throw new SkippedException("SKIPPED: robot functionality is limited on the current platform.");
+        }
         (new DialogToFrontModelessTest()).doTest();
     }
 }
diff --git a/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java
index fb3ea40a531..3c41ea3ed82 100644
--- a/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java
+++ b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
index 663942b7630..828a46072aa 100644
--- a/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
+++ b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java b/test/jdk/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java
index bc392ab9efe..8ed878f201e 100644
--- a/test/jdk/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java
+++ b/test/jdk/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java b/test/jdk/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java
index 646bc6aa6b9..a9abe0ee23e 100644
--- a/test/jdk/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java
+++ b/test/jdk/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/TextArea/TextScrollTest.java b/test/jdk/java/awt/TextArea/TextScrollTest.java
index fbd5c022580..a3e5266c62e 100644
--- a/test/jdk/java/awt/TextArea/TextScrollTest.java
+++ b/test/jdk/java/awt/TextArea/TextScrollTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java
index aa785f54733..c28a8388337 100644
--- a/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java
+++ b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java b/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java
index 3502cd4f9c5..37ce16a4a63 100644
--- a/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java
+++ b/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java b/test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java
index b106deac73c..84e0a2e68cb 100644
--- a/test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java
+++ b/test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java b/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java
index 102ff501040..bcdbe6d3258 100644
--- a/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java
+++ b/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java b/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java
index 6de649f846f..2f51948c4ee 100644
--- a/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java
+++ b/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java b/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java
index d9b6bd5e87c..fafeb45332d 100644
--- a/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java
+++ b/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/event/KeyEvent/KeyTyped/EscapeKeyTyped.java b/test/jdk/java/awt/event/KeyEvent/KeyTyped/EscapeKeyTyped.java
index 51fb3fedaba..34c9dda5e5d 100644
--- a/test/jdk/java/awt/event/KeyEvent/KeyTyped/EscapeKeyTyped.java
+++ b/test/jdk/java/awt/event/KeyEvent/KeyTyped/EscapeKeyTyped.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java b/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java
index 41dc4709fc2..bfd436e062a 100644
--- a/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java
+++ b/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java
index 6022ed32094..39b0f08ebd5 100644
--- a/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java
+++ b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java
index e1f2991a2fb..d10dd6eab79 100644
--- a/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java
+++ b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/event/helpers/lwcomponents/LWButton.java b/test/jdk/java/awt/event/helpers/lwcomponents/LWButton.java
index e45d3d5f430..8d132825de0 100644
--- a/test/jdk/java/awt/event/helpers/lwcomponents/LWButton.java
+++ b/test/jdk/java/awt/event/helpers/lwcomponents/LWButton.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/font/GlyphVector/GetGlyphCharIndexTest.java b/test/jdk/java/awt/font/GlyphVector/GetGlyphCharIndexTest.java
index 939643c7a45..e2b092c7392 100644
--- a/test/jdk/java/awt/font/GlyphVector/GetGlyphCharIndexTest.java
+++ b/test/jdk/java/awt/font/GlyphVector/GetGlyphCharIndexTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/font/GlyphVector/GlyphMetricsTest.java b/test/jdk/java/awt/font/GlyphVector/GlyphMetricsTest.java
new file mode 100644
index 00000000000..415b840671c
--- /dev/null
+++ b/test/jdk/java/awt/font/GlyphVector/GlyphMetricsTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8167268
+ * @summary Checks behavior of GlyphVector.getGlyphMetrics(int).
+ */
+
+import java.awt.Font;
+import java.awt.Rectangle;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphMetrics;
+import java.awt.font.GlyphVector;
+import java.awt.font.TextLayout;
+import java.awt.geom.Rectangle2D;
+
+public class GlyphMetricsTest {
+
+    public static void main(String[] args) {
+
+        String text = "The quick brown \r\n fox JUMPS over \t the lazy dog.";
+        Font font = new Font(Font.DIALOG, Font.PLAIN, 60);
+        FontRenderContext frc = new FontRenderContext(null, true, true);
+        GlyphVector gv = font.createGlyphVector(frc, text);
+
+        for (int i = 0; i < gv.getNumGlyphs(); i++) {
+
+            GlyphMetrics gm = gv.getGlyphMetrics(i);
+            Rectangle2D bounds = gm.getBounds2D();
+            assertEqual(gm.getAdvance(), gm.getAdvanceX(), 0, "advance x", i);
+            assertEqual(0, gm.getAdvanceY(), 0, "advance y", i);
+
+            // assumes one glyph per char in the test text
+            String character = text.substring(i, i + 1);
+            TextLayout layout = new TextLayout(character, font, frc);
+            Rectangle pixelBounds = layout.getPixelBounds(frc, 0, 0);
+            assertEqual(pixelBounds.getWidth(), bounds.getWidth(), 2, "width", i);
+            assertEqual(pixelBounds.getHeight(), bounds.getHeight(), 2, "height", i);
+            assertEqual(pixelBounds.getX(), bounds.getX(), 2, "x", i);
+            assertEqual(pixelBounds.getY(), bounds.getY(), 2, "y", i);
+        }
+    }
+
+    private static void assertEqual(double d1, double d2, double variance,
+                                    String scenario, int index) {
+        if (Math.abs(d1 - d2) > variance) {
+            String msg = String.format("%s for index %d: %f != %f", scenario, index, d1, d2);
+            throw new RuntimeException(msg);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/font/TextLayout/TestGetPixelBoundsWithColors.java b/test/jdk/java/awt/font/TextLayout/TestGetPixelBoundsWithColors.java
new file mode 100644
index 00000000000..2a2140c2ebf
--- /dev/null
+++ b/test/jdk/java/awt/font/TextLayout/TestGetPixelBoundsWithColors.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6562639
+ * @summary Verify correct getPixelBounds() behavior regardless of text color.
+ */
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Rectangle;
+import java.awt.font.FontRenderContext;
+import java.awt.font.TextAttribute;
+import java.awt.font.TextLayout;
+import java.awt.geom.Rectangle2D;
+import java.util.HashMap;
+import java.util.Map;
+
+public class TestGetPixelBoundsWithColors {
+
+    private static final Color TRANSPARENT_BLACK = new Color(0, 0, 0, 0);
+    private static final Color TRANSPARENT_WHITE = new Color(255, 255, 255, 0);
+
+    public static void main(String[] args) throws Exception {
+
+        Color[] colors = new Color[] {
+            Color.WHITE, Color.BLACK, Color.YELLOW, Color.RED, Color.GREEN,
+            Color.GRAY, Color.LIGHT_GRAY, Color.DARK_GRAY, Color.PINK,
+            Color.CYAN, Color.MAGENTA, Color.BLUE, null
+        };
+
+        for (Color color : colors) {
+            test(color);
+        }
+
+        testTransparent(TRANSPARENT_BLACK);
+        testTransparent(TRANSPARENT_WHITE);
+    }
+
+    private static void test(Color c) {
+        Map< TextAttribute, Object > underline = new HashMap<>();
+        underline.put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON);
+        Font font1 = new Font(Font.DIALOG, Font.PLAIN, 60).deriveFont(underline);
+        Map< TextAttribute, Object > foreground = new HashMap<>();
+        foreground.put(TextAttribute.FOREGROUND, c);
+        Font font2 = font1.deriveFont(foreground);
+        FontRenderContext frc = new FontRenderContext(null, true, true);
+        TextLayout layout1 = new TextLayout("TEST", font1, frc);
+        TextLayout layout2 = new TextLayout("TEST", font2, frc);
+        Rectangle r1 = layout1.getPixelBounds(frc, 0, 0);
+        Rectangle r2 = layout2.getPixelBounds(frc, 0, 0);
+        if (!r1.equals(r2)) {
+            throw new RuntimeException("For color " + c + ", " + r1 + " != " + r2);
+        }
+        Rectangle2D bounds = layout1.getBounds();
+        if (Math.abs(bounds.getX() - r1.x) > 3 ||
+            Math.abs(bounds.getY() - r1.y) > 3 ||
+            Math.abs(bounds.getWidth() - r1.width) > 6 ||
+            Math.abs(bounds.getHeight() - r1.height) > 6) {
+            throw new RuntimeException("For color " + c + ", pixel bounds " +
+                r1 + " not similar to " + bounds);
+        }
+    }
+
+    private static void testTransparent(Color c) {
+        Font font1 = new Font(Font.DIALOG, Font.PLAIN, 60);
+        Map< TextAttribute, Object > attributes = new HashMap<>();
+        attributes.put(TextAttribute.FOREGROUND, c);
+        Font font2 = font1.deriveFont(attributes);
+        FontRenderContext frc = new FontRenderContext(null, true, true);
+        TextLayout layout = new TextLayout("TEST", font2, frc);
+        Rectangle r = layout.getPixelBounds(frc, 0, 0);
+        if (!r.isEmpty()) {
+            throw new RuntimeException("Expected empty pixel bounds for " + c + " but got " + r);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java b/test/jdk/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java
index 7942402af4f..8d2fe217326 100644
--- a/test/jdk/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java
+++ b/test/jdk/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/im/8041990/bug8041990.java b/test/jdk/java/awt/im/8041990/bug8041990.java
index d4bf847592d..c5ddbac42ba 100644
--- a/test/jdk/java/awt/im/8041990/bug8041990.java
+++ b/test/jdk/java/awt/im/8041990/bug8041990.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/im/PinyinIMCapsTest.java b/test/jdk/java/awt/im/PinyinIMCapsTest.java
index 707f56c6651..d8451b33cbd 100644
--- a/test/jdk/java/awt/im/PinyinIMCapsTest.java
+++ b/test/jdk/java/awt/im/PinyinIMCapsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/im/PinyinIMCommaTest.java b/test/jdk/java/awt/im/PinyinIMCommaTest.java
index 4fccd47ea7c..a29dbee910d 100644
--- a/test/jdk/java/awt/im/PinyinIMCommaTest.java
+++ b/test/jdk/java/awt/im/PinyinIMCommaTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/im/PinyinIMFullstopTest.java b/test/jdk/java/awt/im/PinyinIMFullstopTest.java
index 2c8da202544..0371384cf9b 100644
--- a/test/jdk/java/awt/im/PinyinIMFullstopTest.java
+++ b/test/jdk/java/awt/im/PinyinIMFullstopTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/image/AffineTransformOp/AffineTxOpSizeTest.java b/test/jdk/java/awt/image/AffineTransformOp/AffineTxOpSizeTest.java
index 86f0c1030d6..bc08116f0de 100644
--- a/test/jdk/java/awt/image/AffineTransformOp/AffineTxOpSizeTest.java
+++ b/test/jdk/java/awt/image/AffineTransformOp/AffineTxOpSizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/image/DrawImage/TiledImage.java b/test/jdk/java/awt/image/DrawImage/TiledImage.java
index bd64edc37fd..e64267998da 100644
--- a/test/jdk/java/awt/image/DrawImage/TiledImage.java
+++ b/test/jdk/java/awt/image/DrawImage/TiledImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/print/Dialog/DialogOrient.java b/test/jdk/java/awt/print/Dialog/DialogOrient.java
index b89f3950e99..99bc9b84d94 100644
--- a/test/jdk/java/awt/print/Dialog/DialogOrient.java
+++ b/test/jdk/java/awt/print/Dialog/DialogOrient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/print/PrinterJob/PageDialogTest.java b/test/jdk/java/awt/print/PrinterJob/PageDialogTest.java
index ed02c64b48e..9c71df3afe3 100644
--- a/test/jdk/java/awt/print/PrinterJob/PageDialogTest.java
+++ b/test/jdk/java/awt/print/PrinterJob/PageDialogTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/print/PrinterJob/PrintDialog.java b/test/jdk/java/awt/print/PrinterJob/PrintDialog.java
index 395312aaa45..c9bed3aab4d 100644
--- a/test/jdk/java/awt/print/PrinterJob/PrintDialog.java
+++ b/test/jdk/java/awt/print/PrinterJob/PrintDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/print/PrinterJob/PrintDialogCancel.java b/test/jdk/java/awt/print/PrinterJob/PrintDialogCancel.java
index 9a1884a5f54..96a13787468 100644
--- a/test/jdk/java/awt/print/PrinterJob/PrintDialogCancel.java
+++ b/test/jdk/java/awt/print/PrinterJob/PrintDialogCancel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/print/PrinterJob/PrintTextTest.java b/test/jdk/java/awt/print/PrinterJob/PrintTextTest.java
index 06e71c4067f..defca807fc0 100644
--- a/test/jdk/java/awt/print/PrinterJob/PrintTextTest.java
+++ b/test/jdk/java/awt/print/PrinterJob/PrintTextTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 6425068 7156751 7157659 8029204 8132890 8148334 8344637
+ * @bug 6425068 7156751 7157659 8029204 8132890 8148334 8344637 8368702
  * @key printer
  * @summary Confirm that text prints where we expect to the length we expect.
  * @library /java/awt/regtesthelpers
diff --git a/test/jdk/java/awt/print/PrinterJob/ThinLines.java b/test/jdk/java/awt/print/PrinterJob/ThinLines.java
index 95cbfed8796..9ad47f08bc4 100644
--- a/test/jdk/java/awt/print/PrinterJob/ThinLines.java
+++ b/test/jdk/java/awt/print/PrinterJob/ThinLines.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java b/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java
index 33fe9fc86d3..7aaedb6e5a1 100644
--- a/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java
+++ b/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/regtesthelpers/AbstractTest.java b/test/jdk/java/awt/regtesthelpers/AbstractTest.java
index fbf66e45e3b..8c66f1ccf3c 100644
--- a/test/jdk/java/awt/regtesthelpers/AbstractTest.java
+++ b/test/jdk/java/awt/regtesthelpers/AbstractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/regtesthelpers/Util.java b/test/jdk/java/awt/regtesthelpers/Util.java
index 45d9c89ee46..fd0e708a3ac 100644
--- a/test/jdk/java/awt/regtesthelpers/Util.java
+++ b/test/jdk/java/awt/regtesthelpers/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java b/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java
index 3b173009d23..bca89f019d4 100644
--- a/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java
+++ b/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/beans/Introspector/4520754/Test4520754.java b/test/jdk/java/beans/Introspector/4520754/Test4520754.java
index 3ad890c57db..fd2417767c4 100644
--- a/test/jdk/java/beans/Introspector/4520754/Test4520754.java
+++ b/test/jdk/java/beans/Introspector/4520754/Test4520754.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/beans/Performance/TestIntrospector.java b/test/jdk/java/beans/Performance/TestIntrospector.java
index 749a6de5b4c..6e10af45c0b 100644
--- a/test/jdk/java/beans/Performance/TestIntrospector.java
+++ b/test/jdk/java/beans/Performance/TestIntrospector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/beans/PropertyChangeSupport/Test4682386.java b/test/jdk/java/beans/PropertyChangeSupport/Test4682386.java
index 72a7c0b5084..19666cebf61 100644
--- a/test/jdk/java/beans/PropertyChangeSupport/Test4682386.java
+++ b/test/jdk/java/beans/PropertyChangeSupport/Test4682386.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/foreign/TestMemoryAlignment.java b/test/jdk/java/foreign/TestMemoryAlignment.java
index a73635c8f08..10916b731d5 100644
--- a/test/jdk/java/foreign/TestMemoryAlignment.java
+++ b/test/jdk/java/foreign/TestMemoryAlignment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/foreign/TestUpcallStructScope.java b/test/jdk/java/foreign/TestUpcallStructScope.java
index d9729cb8f3b..b71156d9e52 100644
--- a/test/jdk/java/foreign/TestUpcallStructScope.java
+++ b/test/jdk/java/foreign/TestUpcallStructScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  *  This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/foreign/libTest4BAlignedDouble.c b/test/jdk/java/foreign/libTest4BAlignedDouble.c
index c79280ed421..89d6216564d 100644
--- a/test/jdk/java/foreign/libTest4BAlignedDouble.c
+++ b/test/jdk/java/foreign/libTest4BAlignedDouble.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/jdk/java/foreign/libTestUpcallStructScope.c b/test/jdk/java/foreign/libTestUpcallStructScope.c
index e18543d5b1a..4dba9664ae3 100644
--- a/test/jdk/java/foreign/libTestUpcallStructScope.c
+++ b/test/jdk/java/foreign/libTestUpcallStructScope.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/foreign/sharedclosejvmti/TestSharedCloseJvmti.java b/test/jdk/java/foreign/sharedclosejvmti/TestSharedCloseJvmti.java
index b2bfdd18b50..9fba092744e 100644
--- a/test/jdk/java/foreign/sharedclosejvmti/TestSharedCloseJvmti.java
+++ b/test/jdk/java/foreign/sharedclosejvmti/TestSharedCloseJvmti.java
@@ -81,7 +81,9 @@ public class TestSharedCloseJvmti {
                 // run in separate thread so that waiting on
                 // latch doesn't block main thread
                 Thread.ofPlatform().name("Trigger").start(() -> {
-                    SINK = segment.get(ValueLayout.JAVA_INT, 0);
+                    SINK = segment.get(ValueLayout.JAVA_INT, 0); // should throw
+                    System.err.println("No exception thrown during outer memory access");
+                    System.exit(1);
                 });
                 // wait until trigger thread is in JVMTI event callback
                 MAIN_LATCH.await();
@@ -107,7 +109,9 @@ public class TestSharedCloseJvmti {
             } else {
                 reentrant = true;
                 try (Arena arena = Arena.ofConfined()) {
-                    SINK = arena.allocate(4).get(ValueLayout.JAVA_INT, 0);
+                    SINK = arena.allocate(4).get(ValueLayout.JAVA_INT, 0); // should throw
+                    System.err.println("No exception thrown during reentrant memory access");
+                    System.exit(1);
                 }
                 reentrant = false;
             }
diff --git a/test/jdk/java/foreign/sharedclosejvmti/libSharedCloseAgent.cpp b/test/jdk/java/foreign/sharedclosejvmti/libSharedCloseAgent.cpp
index a82818e0280..c5626ee78fa 100644
--- a/test/jdk/java/foreign/sharedclosejvmti/libSharedCloseAgent.cpp
+++ b/test/jdk/java/foreign/sharedclosejvmti/libSharedCloseAgent.cpp
@@ -23,10 +23,12 @@
 
 #include <jvmti.h>
 
-#include <string.h>
+#include <cstring>
+#include <cstdlib>
 
 static jclass MAIN_CLS;
 static jmethodID TARGET_ID;
+static jclass EXCEPTION_CLS;
 
 static const char* TARGET_CLASS_NAME = "TestSharedCloseJvmti$EventDuringScopedAccessRunner";
 static const char* TARGET_METHOD_NAME = "target";
@@ -35,6 +37,8 @@ static const char* TARGET_METHOD_SIG = "()V";
 static const char* INTERCEPT_CLASS_NAME = "Ljdk/internal/foreign/MemorySessionImpl;";
 static const char* INTERCEPT_METHOD_NAME = "checkValidStateRaw";
 
+static const char* EXCEPTION_CLASS_NAME = "Ljdk/internal/misc/ScopedMemoryAccess$ScopedAccessError;";
+
 void start(jvmtiEnv*, JNIEnv* jni_env, jthread) {
 
   jclass cls = jni_env->FindClass(TARGET_CLASS_NAME);
@@ -50,6 +54,14 @@ void start(jvmtiEnv*, JNIEnv* jni_env, jthread) {
     jni_env->ExceptionDescribe();
     return;
   }
+
+  jclass ex_cls = jni_env->FindClass(EXCEPTION_CLASS_NAME);
+  if (ex_cls == nullptr) {
+    jni_env->ExceptionDescribe();
+    return;
+  }
+
+  EXCEPTION_CLS = (jclass) jni_env->NewGlobalRef(ex_cls);
 }
 
 void method_exit(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, jmethodID method,
@@ -60,38 +72,44 @@ void method_exit(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, jmethodID
     return;
   }
 
-  if (strcmp(method_name, INTERCEPT_METHOD_NAME) != 0) {
-    jvmti_env->Deallocate((unsigned char*) method_name);
+  bool is_intercept_method = strcmp(method_name, INTERCEPT_METHOD_NAME) == 0;
+  jvmti_env->Deallocate((unsigned char*) method_name);
+  if (!is_intercept_method) {
     return;
   }
 
   jclass cls;
   err = jvmti_env->GetMethodDeclaringClass(method, &cls);
   if (err != JVMTI_ERROR_NONE) {
-    jvmti_env->Deallocate((unsigned char*) method_name);
     return;
   }
 
   char* class_sig = nullptr;
   err = jvmti_env->GetClassSignature(cls, &class_sig, nullptr);
   if (err != JVMTI_ERROR_NONE) {
-    jvmti_env->Deallocate((unsigned char*) method_name);
     return;
   }
 
-  if (strcmp(class_sig, INTERCEPT_CLASS_NAME) != 0) {
-    jvmti_env->Deallocate((unsigned char*) method_name);
-    jvmti_env->Deallocate((unsigned char*) class_sig);
+  bool is_intercept_class = strcmp(class_sig, INTERCEPT_CLASS_NAME) == 0;
+  jvmti_env->Deallocate((unsigned char*) class_sig);
+  if (!is_intercept_class) {
     return;
   }
 
   jni_env->CallStaticVoidMethod(MAIN_CLS, TARGET_ID);
-  if (jni_env->ExceptionOccurred()) {
+  jthrowable ex = jni_env->ExceptionOccurred();
+  if (ex != nullptr) {
+    // we can not return with a pending exception from this JMVTI callback,
+    // and there is no way to propagate it to the caller so that the memory
+    // access will be interrupted.
+    // We log the exception for testing purposes end then terminate the process.
     jni_env->ExceptionDescribe();
+    if (jni_env->IsInstanceOf(ex, EXCEPTION_CLS)) {
+      exit(0); // success
+    }
+    // else, another exception was thrown. Let the java logic handle the lack of
+    // ScopedAccessError
   }
-
-  jvmti_env->Deallocate((unsigned char*) method_name);
-  jvmti_env->Deallocate((unsigned char*) class_sig);
 }
 
 JNIEXPORT jint JNICALL
@@ -102,7 +120,8 @@ Agent_OnLoad(JavaVM *vm, char *options, void *reserved) {
     return jni_err;
   }
 
-  jvmtiCapabilities capabilities{};
+  jvmtiCapabilities capabilities;
+  memset(&capabilities, 0, sizeof(jvmtiCapabilities));
   capabilities.can_generate_method_exit_events = 1;
 
   jvmtiError err = env->AddCapabilities(&capabilities);
diff --git a/test/jdk/java/io/File/libGetXSpace.c b/test/jdk/java/io/File/libGetXSpace.c
index c45aea14691..59805e0adcb 100644
--- a/test/jdk/java/io/File/libGetXSpace.c
+++ b/test/jdk/java/io/File/libGetXSpace.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/io/Serializable/records/AbsentStreamValuesTest.java b/test/jdk/java/io/Serializable/records/AbsentStreamValuesTest.java
index 0f72b9f8f67..02cb35601a9 100644
--- a/test/jdk/java/io/Serializable/records/AbsentStreamValuesTest.java
+++ b/test/jdk/java/io/Serializable/records/AbsentStreamValuesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8246774
  * @summary Checks that the appropriate default value is given to the canonical ctr
- * @run testng AbsentStreamValuesTest
+ * @run junit AbsentStreamValuesTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -34,16 +34,20 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.io.ObjectStreamConstants.*;
 import static java.lang.System.out;
-import static org.testng.Assert.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Basic test to check that default primitive / reference values are presented
  * to the record's canonical constructor, for fields not in the stream.
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class AbsentStreamValuesTest {
 
     record R01(boolean  x) implements Serializable { }
@@ -61,7 +65,6 @@ public class AbsentStreamValuesTest {
     record R13(R12      x) implements Serializable { }
     record R14(R13[]    x) implements Serializable { }
 
-    @DataProvider(name = "recordTypeAndExpectedValue")
     public Object[][] recordTypeAndExpectedValue() {
         return new Object[][] {
                 new Object[] { R01.class, false    },
@@ -81,7 +84,8 @@ public class AbsentStreamValuesTest {
         };
     }
 
-    @Test(dataProvider = "recordTypeAndExpectedValue")
+    @ParameterizedTest
+    @MethodSource("recordTypeAndExpectedValue")
     public void testWithDifferentTypes(Class<?> clazz, Object expectedXValue)
         throws Exception
     {
@@ -92,7 +96,7 @@ public class AbsentStreamValuesTest {
         Object obj = deserialize(bytes);
         out.println("deserialized: " + obj);
         Object actualXValue = clazz.getDeclaredMethod("x").invoke(obj);
-        assertEquals(actualXValue, expectedXValue);
+        assertEquals(expectedXValue, actualXValue);
     }
 
     // --- all together
@@ -107,18 +111,18 @@ public class AbsentStreamValuesTest {
 
         R15 obj = (R15)deserialize(bytes);
         out.println("deserialized: " + obj);
-        assertEquals(obj.a, false);
-        assertEquals(obj.b, 0);
-        assertEquals(obj.c, 0);
-        assertEquals(obj.d, '\u0000');
-        assertEquals(obj.e, 0);
-        assertEquals(obj.f, 0l);
-        assertEquals(obj.g, 0f);
-        assertEquals(obj.h, 0d);
-        assertEquals(obj.i, null);
-        assertEquals(obj.j, null);
-        assertEquals(obj.k, null);
-        assertEquals(obj.l, null);
+        assertEquals(false, obj.a);
+        assertEquals(0, obj.b);
+        assertEquals(0, obj.c);
+        assertEquals('\u0000', obj.d);
+        assertEquals(0, obj.e);
+        assertEquals(0l, obj.f);
+        assertEquals(0f, obj.g);
+        assertEquals(0d, obj.h);
+        assertEquals(null, obj.i);
+        assertEquals(null, obj.j);
+        assertEquals(null, obj.k);
+        assertEquals(null, obj.l);
     }
 
     // --- generic type
@@ -132,8 +136,8 @@ public class AbsentStreamValuesTest {
 
         R16 obj = (R16)deserialize(bytes);
         out.println("deserialized: " + obj);
-        assertEquals(obj.t, null);
-        assertEquals(obj.u, null);
+        assertEquals(null, obj.t);
+        assertEquals(null, obj.u);
     }
 
     // --- infra
diff --git a/test/jdk/java/io/Serializable/records/BadCanonicalCtrTest.java b/test/jdk/java/io/Serializable/records/BadCanonicalCtrTest.java
index 44959eaea87..528a006fc87 100644
--- a/test/jdk/java/io/Serializable/records/BadCanonicalCtrTest.java
+++ b/test/jdk/java/io/Serializable/records/BadCanonicalCtrTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @summary InvalidClassException is thrown when the canonical constructor
  *          cannot be found during deserialization.
  * @library /test/lib
- * @run testng BadCanonicalCtrTest
+ * @run junit BadCanonicalCtrTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -44,22 +44,25 @@ import java.lang.constant.MethodTypeDesc;
 
 import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.ByteCodeLoader;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.lang.classfile.ClassFile.ACC_PUBLIC;
 import static java.lang.constant.ConstantDescs.CD_Object;
 import static java.lang.constant.ConstantDescs.CD_void;
 import static java.lang.constant.ConstantDescs.INIT_NAME;
 import static java.lang.constant.ConstantDescs.MTD_void;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.expectThrows;
+
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Checks that an InvalidClassException is thrown when the canonical
  * constructor cannot be found during deserialization.
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class BadCanonicalCtrTest {
 
     // ClassLoader for creating instances of the records to test with.
@@ -76,7 +79,7 @@ public class BadCanonicalCtrTest {
      * the initial bytecode for the record classes using javac, then removes or
      * modifies the generated canonical constructor.
      */
-    @BeforeTest
+    @BeforeAll
     public void setup() {
         {
             byte[] byteCode = InMemoryJavaCompiler.compile("R1",
@@ -133,7 +136,6 @@ public class BadCanonicalCtrTest {
         return c.getConstructor(long.class).newInstance(l);
     }
 
-    @DataProvider(name = "recordInstances")
     public Object[][] recordInstances() throws Exception {
         return new Object[][] {
                 new Object[] { newR1()        },
@@ -148,13 +150,14 @@ public class BadCanonicalCtrTest {
      * Tests that InvalidClassException is thrown when no constructor is
      * present.
      */
-    @Test(dataProvider = "recordInstances")
+    @ParameterizedTest
+    @MethodSource("recordInstances")
     public void missingConstructorTest(Object objToSerialize) throws Exception {
         out.println("\n---");
         out.println("serializing : " + objToSerialize);
         byte[] bytes = serialize(objToSerialize);
         out.println("deserializing");
-        InvalidClassException ice = expectThrows(ICE, () -> deserialize(bytes, missingCtrClassLoader));
+        InvalidClassException ice = Assertions.assertThrows(ICE, () -> deserialize(bytes, missingCtrClassLoader));
         out.println("caught expected ICE: " + ice);
         assertTrue(ice.getMessage().contains("record canonical constructor not found"));
     }
@@ -164,13 +167,14 @@ public class BadCanonicalCtrTest {
      * constructor is not present. ( a non-canonical constructor is
      * present ).
      */
-    @Test(dataProvider = "recordInstances")
+    @ParameterizedTest
+    @MethodSource("recordInstances")
     public void nonCanonicalConstructorTest(Object objToSerialize) throws Exception {
         out.println("\n---");
         out.println("serializing : " + objToSerialize);
         byte[] bytes = serialize(objToSerialize);
         out.println("deserializing");
-        InvalidClassException ice = expectThrows(ICE, () -> deserialize(bytes, nonCanonicalCtrClassLoader));
+        InvalidClassException ice = Assertions.assertThrows(ICE, () -> deserialize(bytes, nonCanonicalCtrClassLoader));
         out.println("caught expected ICE: " + ice);
         assertTrue(ice.getMessage().contains("record canonical constructor not found"));
     }
diff --git a/test/jdk/java/io/Serializable/records/BadValues.java b/test/jdk/java/io/Serializable/records/BadValues.java
index 4e3dbaa200f..9d5e0c7be82 100644
--- a/test/jdk/java/io/Serializable/records/BadValues.java
+++ b/test/jdk/java/io/Serializable/records/BadValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Basic test for ClassNotFoundException
- * @run testng BadValues
+ * @run junit BadValues
  */
 
 import java.io.ByteArrayInputStream;
@@ -32,10 +32,11 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
-import org.testng.annotations.Test;
 import static java.io.ObjectStreamConstants.*;
 import static java.lang.System.out;
-import static org.testng.Assert.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * Not directly related to records but provokes surrounding code, and ensures
@@ -73,7 +74,7 @@ public class BadValues {
     public void testNotFoundSer() throws Exception {
         out.println("\n---");
         byte[] bytes = byteStreamFor("XxYyZz", 0L, (byte)SC_SERIALIZABLE);
-        Throwable t = expectThrows(CNFE, () -> deserialize(bytes));
+        Throwable t = assertThrows(CNFE, () -> deserialize(bytes));
         out.println("caught expected CNFE: " + t);
     }
 
@@ -81,7 +82,7 @@ public class BadValues {
     public void testNotFoundSerWr() throws Exception {
         out.println("\n---");
         byte[] bytes = byteStreamFor("XxYyZz", 0L, (byte)(SC_SERIALIZABLE | SC_WRITE_METHOD));
-        Throwable t = expectThrows(CNFE, () -> deserialize(bytes));
+        Throwable t = assertThrows(CNFE, () -> deserialize(bytes));
         out.println("caught expected CNFE: " + t);
     }
 
@@ -89,7 +90,7 @@ public class BadValues {
     public void testNotFoundExt() throws Exception {
         out.println("\n---");
         byte[] bytes = byteStreamFor("AaBbCc", 0L, (byte)SC_EXTERNALIZABLE);
-        Throwable t = expectThrows(CNFE, () -> deserialize(bytes));
+        Throwable t = assertThrows(CNFE, () -> deserialize(bytes));
         out.println("caught expected CNFE: " + t);
     }
 
@@ -97,7 +98,7 @@ public class BadValues {
     public void testNotFoundExtWr() throws Exception {
         out.println("\n---");
         byte[] bytes = byteStreamFor("AaBbCc", 0L, (byte)(SC_SERIALIZABLE | SC_WRITE_METHOD));
-        Throwable t = expectThrows(CNFE, () -> deserialize(bytes));
+        Throwable t = assertThrows(CNFE, () -> deserialize(bytes));
         out.println("caught expected CNFE: " + t);
     }
 
diff --git a/test/jdk/java/io/Serializable/records/BasicRecordSer.java b/test/jdk/java/io/Serializable/records/BasicRecordSer.java
index 94a79e85b38..b05d6bd9550 100644
--- a/test/jdk/java/io/Serializable/records/BasicRecordSer.java
+++ b/test/jdk/java/io/Serializable/records/BasicRecordSer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8246774
  * @summary Basic test that serializes and deserializes a number of records
- * @run testng BasicRecordSer
+ * @run junit BasicRecordSer
  */
 
 import java.io.ByteArrayInputStream;
@@ -39,19 +39,24 @@ import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.math.BigInteger;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.String.format;
 import static java.lang.System.out;
 import static java.net.InetAddress.getLoopbackAddress;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.expectThrows;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Basic test that serializes and deserializes a number of simple records.
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class BasicRecordSer {
 
     // a mix of a few record and non-record classes
@@ -101,7 +106,6 @@ public class BasicRecordSer {
 
     record Wubble (Wobble wobble, Wibble wibble, String s) implements ThrowingExternalizable { }
 
-    @DataProvider(name = "serializable")
     public Object[][] serializable() {
         Foo foo = new Foo(23);
         return new Object[][] {
@@ -121,14 +125,20 @@ public class BasicRecordSer {
     }
 
     /** Tests serializing and deserializing a number of records. */
-    @Test(dataProvider = "serializable")
+    @ParameterizedTest
+    @MethodSource("serializable")
     public void testSerializable(Object objToSerialize) throws Exception {
         out.println("\n---");
         out.println("serializing : " + objToSerialize);
         var objDeserialized = serializeDeserialize(objToSerialize);
         out.println("deserialized: " + objDeserialized);
-        assertEquals(objToSerialize, objDeserialized);
-        assertEquals(objDeserialized, objToSerialize);
+        if (objToSerialize.getClass().isArray()) {
+            assertArrayEquals((Object[]) objDeserialized, (Object[]) objToSerialize);
+            assertArrayEquals((Object[]) objToSerialize, (Object[]) objDeserialized);
+        } else {
+            assertEquals(objDeserialized, objToSerialize);
+            assertEquals(objToSerialize, objDeserialized);
+        }
     }
 
     /** Tests serializing and deserializing of local records. */
@@ -154,8 +164,8 @@ public class BasicRecordSer {
         out.println("serializing : " + objToSerialize);
         Foo[] objDeserialized = (Foo[])serializeDeserialize(objToSerialize);
         out.println("deserialized: " + objDeserialized);
-        assertEquals(objToSerialize, objDeserialized);
-        assertEquals(objDeserialized, objToSerialize);
+        Assertions.assertArrayEquals(objDeserialized, objToSerialize);
+        Assertions.assertArrayEquals(objToSerialize, objDeserialized);
 
         for (Foo f : objDeserialized)
             assertTrue(objDeserialized[0] == f);
@@ -171,8 +181,8 @@ public class BasicRecordSer {
         out.println("serializing : " + objToSerialize);
         Wobble[] objDeserialized = (Wobble[])serializeDeserialize(objToSerialize);
         out.println("deserialized: " + objDeserialized);
-        assertEquals(objToSerialize, objDeserialized);
-        assertEquals(objDeserialized, objToSerialize);
+        Assertions.assertArrayEquals(objDeserialized, objToSerialize);
+        Assertions.assertArrayEquals(objToSerialize, objDeserialized);
 
         for (Wobble w : objDeserialized) {
             assertTrue(objDeserialized[0] == w);
@@ -192,7 +202,6 @@ public class BasicRecordSer {
         final NotSer notSer = new NotSer(7);
     }
 
-    @DataProvider(name = "notSerializable")
     public Object[][] notSerializable() {
         return new Object[][] {
             new Object[] { new NotSerEmpty()                       },
@@ -209,11 +218,12 @@ public class BasicRecordSer {
     static final Class<NotSerializableException> NSE = NotSerializableException.class;
 
     /** Tests that non-Serializable record objects throw NotSerializableException. */
-    @Test(dataProvider = "notSerializable")
+    @ParameterizedTest
+    @MethodSource("notSerializable")
     public void testNotSerializable(Object objToSerialize) throws Exception {
         out.println("\n---");
         out.println("serializing : " + objToSerialize);
-        NotSerializableException expected = expectThrows(NSE, () -> serialize(objToSerialize));
+        NotSerializableException expected = Assertions.assertThrows(NSE, () -> serialize(objToSerialize));
         out.println("caught expected NSE:" + expected);
 
     }
@@ -235,9 +245,9 @@ public class BasicRecordSer {
         out.println("serializing : " + objToSerialize);
         var objDeserialized = serializeDeserialize(objToSerialize);
         out.println("deserialized: " + objDeserialized);
-        assertEquals(objToSerialize, objDeserialized);
         assertEquals(objDeserialized, objToSerialize);
-        assertEquals(e_ctrInvocationCount, 1);
+        assertEquals(objToSerialize, objDeserialized);
+        assertEquals(1, e_ctrInvocationCount);
     }
 
     // ---
@@ -258,9 +268,9 @@ public class BasicRecordSer {
         var objToSerialize = new G();
         g_ctrInvocationCount = 0;  // reset
         out.println("serializing : " + objToSerialize);
-        NotSerializableException expected = expectThrows(NSE, () -> serialize(objToSerialize));
+        NotSerializableException expected = Assertions.assertThrows(NSE, () -> serialize(objToSerialize));
         out.println("caught expected NSE:" + expected);
-        assertEquals(g_ctrInvocationCount, 0);
+        assertEquals(0, g_ctrInvocationCount);
     }
 
     // --- infra
diff --git a/test/jdk/java/io/Serializable/records/ConstructorAccessTest.java b/test/jdk/java/io/Serializable/records/ConstructorAccessTest.java
index 5057fcc7cbb..c84c7c9519e 100644
--- a/test/jdk/java/io/Serializable/records/ConstructorAccessTest.java
+++ b/test/jdk/java/io/Serializable/records/ConstructorAccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 8246774
  * @summary Ensures that the serialization implementation can *always* access
  *          the record constructor
- * @run testng ConstructorAccessTest
+ * @run junit ConstructorAccessTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -38,16 +38,19 @@ import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
 import java.io.Externalizable;
 import java.io.Serializable;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*implicit*/ record Aux1 (int x) implements Serializable { }
 
 /*implicit*/ record Aux2 (int x) implements Serializable { }
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class ConstructorAccessTest {
 
     public record A (int x) implements Serializable { }
@@ -75,7 +78,6 @@ public class ConstructorAccessTest {
 
     private record H (double d) implements ThrowingExternalizable { }
 
-    @DataProvider(name = "recordInstances")
     public Object[][] recordInstances() {
         return new Object[][] {
             new Object[] { new A(34)        },
@@ -91,7 +93,8 @@ public class ConstructorAccessTest {
         };
     }
 
-    @Test(dataProvider = "recordInstances")
+    @ParameterizedTest
+    @MethodSource("recordInstances")
     public void roundTrip(Object objToSerialize) throws Exception {
         out.println("\n---");
         out.println("serializing : " + objToSerialize);
diff --git a/test/jdk/java/io/Serializable/records/CycleTest.java b/test/jdk/java/io/Serializable/records/CycleTest.java
index 53d1247e808..7b323a78af8 100644
--- a/test/jdk/java/io/Serializable/records/CycleTest.java
+++ b/test/jdk/java/io/Serializable/records/CycleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8246774
  * @summary Ensures basic behavior of cycles from record components
- * @run testng CycleTest
+ * @run junit CycleTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -34,10 +34,11 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 public class CycleTest {
 
@@ -61,10 +62,10 @@ public class CycleTest {
         out.println("serializing : " + r);
         R deserializedObj = serializeDeserialize(r);
         out.println("deserialized: " + deserializedObj);
-        assertEquals(deserializedObj.x(), 1);           // sanity
-        assertEquals(deserializedObj.y(), 2);           // sanity
+        assertEquals(1, deserializedObj.x());           // sanity
+        assertEquals(2, deserializedObj.y());           // sanity
         assertTrue(deserializedObj.c() instanceof C);   // sanity
-        assertEquals(deserializedObj.c().obj, null);    // cycle, expect null
+        assertEquals(null, deserializedObj.c().obj);    // cycle, expect null
     }
 
     /**
@@ -84,8 +85,8 @@ public class CycleTest {
         out.println("deserialized: " + deserializedObj);
         assertTrue(deserializedObj instanceof C);         // sanity
         assertTrue(deserializedObj.obj != null);          // expect non-null, r
-        assertEquals(((R)deserializedObj.obj).x(), 3);    // sanity
-        assertEquals(((R)deserializedObj.obj).y(), 4);    // sanity
+        assertEquals(3, ((R)deserializedObj.obj).x());    // sanity
+        assertEquals(4, ((R)deserializedObj.obj).y());    // sanity
     }
 
     record R2 (int x, int y, C c1, C c2) implements Serializable { }
@@ -105,8 +106,8 @@ public class CycleTest {
         out.println("serializing : " + r);
         R2 deserializedObj = serializeDeserialize(r);
         out.println("deserialized: " + deserializedObj);
-        assertEquals(deserializedObj.x(), 5);         // sanity
-        assertEquals(deserializedObj.y(), 6);         // sanity
+        assertEquals(5, deserializedObj.x());         // sanity
+        assertEquals(6, deserializedObj.y());         // sanity
 
         c1 = deserializedObj.c1();
         c2 = deserializedObj.c2();
@@ -132,11 +133,11 @@ public class CycleTest {
         R3 deserializedObj = serializeDeserialize(r3);
         out.println("deserialized: " + deserializedObj);
         assertTrue(deserializedObj.r() != null);
-        assertEquals(deserializedObj.l(), 9);              // sanity
-        assertEquals(deserializedObj.r().x(), 7);          // sanity
-        assertEquals(deserializedObj.r().y(), 8);          // sanity
+        assertEquals(9, deserializedObj.l());              // sanity
+        assertEquals(7, deserializedObj.r().x());          // sanity
+        assertEquals(8, deserializedObj.r().y());          // sanity
         assertTrue(deserializedObj.r().c() instanceof C);  // sanity
-        assertEquals(deserializedObj.r().c().obj, null);   // cycle, expect null
+        assertEquals(null, deserializedObj.r().c().obj);   // cycle, expect null
     }
 
     // --- infra
diff --git a/test/jdk/java/io/Serializable/records/DifferentStreamFieldsTest.java b/test/jdk/java/io/Serializable/records/DifferentStreamFieldsTest.java
index 02175c53bb8..2960cc4f723 100644
--- a/test/jdk/java/io/Serializable/records/DifferentStreamFieldsTest.java
+++ b/test/jdk/java/io/Serializable/records/DifferentStreamFieldsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 8246774
  * @summary Checks that the appropriate value is given to the canonical ctr
  * @library /test/lib
- * @run testng DifferentStreamFieldsTest
+ * @run junit DifferentStreamFieldsTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -38,14 +38,19 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import jdk.test.lib.serial.SerialObjectBuilder;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Checks that the appropriate value is given to the canonical ctr.
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class DifferentStreamFieldsTest {
 
     record R01(boolean x) implements Serializable {}
@@ -76,7 +81,6 @@ public class DifferentStreamFieldsTest {
 
     record R14(R13[]x) implements Serializable {}
 
-    @DataProvider(name = "recordTypeAndExpectedValue")
     public Object[][] recordTypeAndExpectedValue() {
         return new Object[][]{
             new Object[]{R01.class, false},
@@ -96,7 +100,8 @@ public class DifferentStreamFieldsTest {
         };
     }
 
-    @Test(dataProvider = "recordTypeAndExpectedValue")
+    @ParameterizedTest
+    @MethodSource("recordTypeAndExpectedValue")
     public void testWithDifferentTypes(Class<?> clazz, Object expectedXValue)
     throws Exception {
         out.println("\n---");
@@ -108,7 +113,7 @@ public class DifferentStreamFieldsTest {
         Object obj = deserialize(bytes);
         out.println("deserialized: " + obj);
         Object actualXValue = clazz.getDeclaredMethod("x").invoke(obj);
-        assertEquals(actualXValue, expectedXValue);
+        assertEquals(expectedXValue, actualXValue);
 
         bytes = SerialObjectBuilder
             .newBuilder(clazz.getName())
@@ -118,7 +123,7 @@ public class DifferentStreamFieldsTest {
         obj = deserialize(bytes);
         out.println("deserialized: " + obj);
         actualXValue = clazz.getDeclaredMethod("x").invoke(obj);
-        assertEquals(actualXValue, expectedXValue);
+        assertEquals(expectedXValue, actualXValue);
     }
 
     // --- all together
@@ -137,18 +142,18 @@ public class DifferentStreamFieldsTest {
 
         R15 obj = deserialize(bytes);
         out.println("deserialized: " + obj);
-        assertEquals(obj.a, false);
-        assertEquals(obj.b, 0);
-        assertEquals(obj.c, 0);
-        assertEquals(obj.d, '\u0000');
-        assertEquals(obj.e, 0);
-        assertEquals(obj.f, 0l);
-        assertEquals(obj.g, 0f);
-        assertEquals(obj.h, 0d);
-        assertEquals(obj.i, null);
-        assertEquals(obj.j, null);
-        assertEquals(obj.k, null);
-        assertEquals(obj.l, null);
+        assertEquals(false, obj.a);
+        assertEquals(0, obj.b);
+        assertEquals(0, obj.c);
+        assertEquals('\u0000', obj.d);
+        assertEquals(0, obj.e);
+        assertEquals(0l, obj.f);
+        assertEquals(0f, obj.g);
+        assertEquals(0d, obj.h);
+        assertEquals(null, obj.i);
+        assertEquals(null, obj.j);
+        assertEquals(null, obj.k);
+        assertEquals(null, obj.l);
     }
 
     @Test
@@ -166,9 +171,9 @@ public class DifferentStreamFieldsTest {
                 .build();
 
             var deser1 = deserialize(OOSBytes);
-            assertEquals(deser1, r);
+            assertEquals(r, deser1);
             var deser2 = deserialize(builderBytes);
-            assertEquals(deser2, deser1);
+            assertEquals(deser1, deser2);
         }
         {
             record R(int x, int y) implements Serializable {}
@@ -176,7 +181,7 @@ public class DifferentStreamFieldsTest {
             var r = new R(7, 8);
             byte[] OOSBytes = serialize(r);
             var deser1 = deserialize(OOSBytes);
-            assertEquals(deser1, r);
+            assertEquals(r, deser1);
 
             byte[] builderBytes = SerialObjectBuilder
                 .newBuilder(R.class.getName())
@@ -185,7 +190,7 @@ public class DifferentStreamFieldsTest {
                 .build();
 
             var deser2 = deserialize(builderBytes);
-            assertEquals(deser2, deser1);
+            assertEquals(deser1, deser2);
 
             builderBytes = SerialObjectBuilder
                 .newBuilder(R.class.getName())
@@ -193,7 +198,7 @@ public class DifferentStreamFieldsTest {
                 .addPrimitiveField("x", int.class, 7)
                 .build();
             deser2 = deserialize(builderBytes);
-            assertEquals(deser2, deser1);
+            assertEquals(deser1, deser2);
 
             builderBytes = SerialObjectBuilder
                 .newBuilder(R.class.getName())
@@ -203,12 +208,12 @@ public class DifferentStreamFieldsTest {
                 .addPrimitiveField("z", int.class, 9) // additional fields
                 .build();
             deser2 = deserialize(builderBytes);
-            assertEquals(deser2, deser1);
+            assertEquals(deser1, deser2);
 
             r = new R(0, 0);
             OOSBytes = serialize(r);
             deser1 = deserialize(OOSBytes);
-            assertEquals(deser1, r);
+            assertEquals(r, deser1);
 
             builderBytes = SerialObjectBuilder
                 .newBuilder(R.class.getName())
@@ -216,13 +221,13 @@ public class DifferentStreamFieldsTest {
                 .addPrimitiveField("x", int.class, 0)
                 .build();
             deser2 = deserialize(builderBytes);
-            assertEquals(deser2, deser1);
+            assertEquals(deser1, deser2);
 
             builderBytes = SerialObjectBuilder
                 .newBuilder(R.class.getName())  // no field values
                 .build();
             deser2 = deserialize(builderBytes);
-            assertEquals(deser2, deser1);
+            assertEquals(deser1, deser2);
         }
     }
 
@@ -234,7 +239,7 @@ public class DifferentStreamFieldsTest {
 
         var r = new Str("Hello", "World!");
         var deser1 = deserialize(serialize(r));
-        assertEquals(deser1, r);
+        assertEquals(r, deser1);
 
         byte[] builderBytes = SerialObjectBuilder
             .newBuilder(Str.class.getName())
@@ -243,7 +248,7 @@ public class DifferentStreamFieldsTest {
             .build();
 
         var deser2 = deserialize(builderBytes);
-        assertEquals(deser2, deser1);
+        assertEquals(deser1, deser2);
 
         builderBytes = SerialObjectBuilder
             .newBuilder(Str.class.getName())
@@ -254,7 +259,7 @@ public class DifferentStreamFieldsTest {
             .build();
 
         var deser3 = deserialize(builderBytes);
-        assertEquals(deser3, deser1);
+        assertEquals(deser1, deser3);
     }
 
     @Test
@@ -264,8 +269,8 @@ public class DifferentStreamFieldsTest {
             record IntArray(int[]ints, long[]longs) implements Serializable {}
             IntArray r = new IntArray(new int[]{5, 4, 3, 2, 1}, new long[]{9L});
             IntArray deser1 = deserialize(serialize(r));
-            assertEquals(deser1.ints(), r.ints());
-            assertEquals(deser1.longs(), r.longs());
+            Assertions.assertArrayEquals(r.ints(), deser1.ints());
+            Assertions.assertArrayEquals(r.longs(), deser1.longs());
 
             byte[] builderBytes = SerialObjectBuilder
                 .newBuilder(IntArray.class.getName())
@@ -274,14 +279,14 @@ public class DifferentStreamFieldsTest {
                 .build();
 
             IntArray deser2 = deserialize(builderBytes);
-            assertEquals(deser2.ints(), deser1.ints());
-            assertEquals(deser2.longs(), deser1.longs());
+            Assertions.assertArrayEquals(deser1.ints(), deser2.ints());
+            Assertions.assertArrayEquals(deser1.longs(), deser2.longs());
         }
         {
             record StrArray(String[]stringArray) implements Serializable {}
             StrArray r = new StrArray(new String[]{"foo", "bar"});
             StrArray deser1 = deserialize(serialize(r));
-            assertEquals(deser1.stringArray(), r.stringArray());
+            Assertions.assertArrayEquals(r.stringArray(), deser1.stringArray());
 
             byte[] builderBytes = SerialObjectBuilder
                 .newBuilder(StrArray.class.getName())
@@ -289,7 +294,7 @@ public class DifferentStreamFieldsTest {
                 .build();
 
             StrArray deser2 = deserialize(builderBytes);
-            assertEquals(deser2.stringArray(), deser1.stringArray());
+            Assertions.assertArrayEquals(deser1.stringArray(), deser2.stringArray());
         }
     }
 
@@ -302,7 +307,7 @@ public class DifferentStreamFieldsTest {
 
             var r = new NumberHolder(123);
             var deser1 = deserialize(serialize(r));
-            assertEquals(deser1, r);
+            assertEquals(r, deser1);
 
             byte[] builderBytes = SerialObjectBuilder
                 .newBuilder(NumberHolder.class.getName())
@@ -310,7 +315,7 @@ public class DifferentStreamFieldsTest {
                 .build();
 
             var deser2 = deserialize(builderBytes);
-            assertEquals(deser2, deser1);
+            assertEquals(deser1, deser2);
         }
 
         {
@@ -318,7 +323,7 @@ public class DifferentStreamFieldsTest {
 
             var r = new IntegerHolder(123);
             var deser1 = deserialize(serialize(r));
-            assertEquals(deser1, r);
+            assertEquals(r, deser1);
 
             byte[] builderBytes = SerialObjectBuilder
                 .newBuilder(IntegerHolder.class.getName())
@@ -326,7 +331,7 @@ public class DifferentStreamFieldsTest {
                 .build();
 
             var deser2 = deserialize(builderBytes);
-            assertEquals(deser2, deser1);
+            assertEquals(deser1, deser2);
         }
     }
 
@@ -338,7 +343,7 @@ public class DifferentStreamFieldsTest {
 
         var r = new StringHolder("123");
         var deser1 = deserialize(serialize(r));
-        assertEquals(deser1, r);
+        assertEquals(r, deser1);
 
         byte[] builderBytes = SerialObjectBuilder
             .newBuilder(StringHolder.class.getName())
@@ -362,7 +367,7 @@ public class DifferentStreamFieldsTest {
 
         var r = new IntHolder(123);
         var deser1 = deserialize(serialize(r));
-        assertEquals(deser1, r);
+        assertEquals(r, deser1);
 
         byte[] builderBytes = SerialObjectBuilder
             .newBuilder(IntHolder.class.getName())
diff --git a/test/jdk/java/io/Serializable/records/ProhibitedMethods.java b/test/jdk/java/io/Serializable/records/ProhibitedMethods.java
index d744e9ddbad..815fbacc0f7 100644
--- a/test/jdk/java/io/Serializable/records/ProhibitedMethods.java
+++ b/test/jdk/java/io/Serializable/records/ProhibitedMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 8246774
  * @summary Basic tests for prohibited magic serialization methods
  * @library /test/lib
- * @run testng ProhibitedMethods
+ * @run junit ProhibitedMethods
  */
 
 import java.io.ByteArrayInputStream;
@@ -49,24 +49,28 @@ import java.math.BigDecimal;
 
 import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.ByteCodeLoader;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.lang.classfile.ClassFile.ACC_PRIVATE;
+import static java.lang.constant.ConstantDescs.CD_Object;
 import static java.lang.constant.ConstantDescs.CD_String;
 import static java.lang.constant.ConstantDescs.CD_void;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.expectThrows;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Checks that the various prohibited Serialization magic methods, and
  * Externalizable methods, are not invoked ( effectively ignored ) for
  * record objects.
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class ProhibitedMethods {
 
     public interface ThrowingExternalizable extends Externalizable {
@@ -100,7 +104,7 @@ public class ProhibitedMethods {
      *           fail("readObjectNoData should not be invoked");          }
      *   }
      */
-    @BeforeTest
+    @BeforeAll
     public void setup() {
         {
             byte[] byteCode = InMemoryJavaCompiler.compile("Foo",
@@ -165,7 +169,6 @@ public class ProhibitedMethods {
         }
     }
 
-    @DataProvider(name = "recordInstances")
     public Object[][] recordInstances() {
         return new Object[][] {
             new Object[] { newFoo()                                           },
@@ -177,7 +180,8 @@ public class ProhibitedMethods {
         };
     }
 
-    @Test(dataProvider = "recordInstances")
+    @ParameterizedTest
+    @MethodSource("recordInstances")
     public void roundTrip(Object objToSerialize) throws Exception {
         out.println("\n---");
         out.println("serializing : " + objToSerialize);
@@ -245,8 +249,8 @@ public class ProhibitedMethods {
         return cf.transformClass(cf.parse(classBytes), ClassTransform.endHandler(clb -> {
             clb.withMethodBody(name, desc, ACC_PRIVATE, cob -> {
                 cob.loadConstant(name + " should not be invoked");
-                cob.invokestatic(Assert.class.describeConstable().orElseThrow(), "fail",
-                        MethodTypeDesc.of(CD_void, CD_String));
+                cob.invokestatic(Assertions.class.describeConstable().orElseThrow(), "fail",
+                        MethodTypeDesc.of(CD_Object, CD_String));
                 cob.return_();
             });
         }));
@@ -266,37 +270,37 @@ public class ProhibitedMethods {
                 Method m = obj.getClass().getDeclaredMethod("writeObject", ObjectOutputStream.class);
                 assertTrue((m.getModifiers() & Modifier.PRIVATE) != 0);
                 m.setAccessible(true);
-                ReflectiveOperationException t = expectThrows(ROE, () ->
+                ReflectiveOperationException t = Assertions.assertThrows(ROE, () ->
                         m.invoke(obj, new ObjectOutputStream(OutputStream.nullOutputStream())));
                 Throwable assertionError = t.getCause();
                 out.println("caught expected AssertionError: " + assertionError);
                 assertTrue(assertionError instanceof AssertionError,
                            "Expected AssertionError, got:" + assertionError);
-                assertEquals(assertionError.getMessage(), "writeObject should not be invoked");
+                assertEquals("writeObject should not be invoked", assertionError.getMessage());
             }
             {   // readObject
                 Method m = obj.getClass().getDeclaredMethod("readObject", ObjectInputStream.class);
                 assertTrue((m.getModifiers() & Modifier.PRIVATE) != 0);
                 m.setAccessible(true);
-                ReflectiveOperationException t = expectThrows(ROE, () ->
+                ReflectiveOperationException t = Assertions.assertThrows(ROE, () ->
                         m.invoke(obj, new ObjectInputStream() {
                         }));
                 Throwable assertionError = t.getCause();
                 out.println("caught expected AssertionError: " + assertionError);
                 assertTrue(assertionError instanceof AssertionError,
                            "Expected AssertionError, got:" + assertionError);
-                assertEquals(assertionError.getMessage(), "readObject should not be invoked");
+                assertEquals("readObject should not be invoked", assertionError.getMessage());
             }
             {   // readObjectNoData
                 Method m = obj.getClass().getDeclaredMethod("readObjectNoData");
                 assertTrue((m.getModifiers() & Modifier.PRIVATE) != 0);
                 m.setAccessible(true);
-                ReflectiveOperationException t = expectThrows(ROE, () -> m.invoke(obj));
+                ReflectiveOperationException t = Assertions.assertThrows(ROE, () -> m.invoke(obj));
                 Throwable assertionError = t.getCause();
                 out.println("caught expected AssertionError: " + assertionError);
                 assertTrue(assertionError instanceof AssertionError,
                            "Expected AssertionError, got:" + assertionError);
-                assertEquals(assertionError.getMessage(), "readObjectNoData should not be invoked");
+                assertEquals("readObjectNoData should not be invoked", assertionError.getMessage());
             }
         }
     }
diff --git a/test/jdk/java/io/Serializable/records/ReadResolveTest.java b/test/jdk/java/io/Serializable/records/ReadResolveTest.java
index 04de34781f9..2eb77bbf663 100644
--- a/test/jdk/java/io/Serializable/records/ReadResolveTest.java
+++ b/test/jdk/java/io/Serializable/records/ReadResolveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8246774
  * @summary Basic tests for readResolve
- * @run testng ReadResolveTest
+ * @run junit ReadResolveTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -35,15 +35,19 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serial;
 import java.io.Serializable;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.String.format;
 import static java.lang.System.out;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Tests records being used as a serial proxy.
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class ReadResolveTest {
 
     static class C1 implements Serializable {
@@ -94,7 +98,6 @@ public class ReadResolveTest {
         }
     }
 
-    @DataProvider(name = "objectsToSerialize")
     public Object[][] objectsToSerialize() {
         return new Object[][] {
                 new Object[] { new C1(3,4)        },
@@ -103,13 +106,14 @@ public class ReadResolveTest {
         };
     }
 
-    @Test(dataProvider = "objectsToSerialize")
+    @ParameterizedTest
+    @MethodSource("objectsToSerialize")
     public void testSerialize(Object objectToSerialize) throws Exception {
         out.println("\n---");
         out.println("serializing : " + objectToSerialize);
         Object deserializedObj = serializeDeserialize(objectToSerialize);
         out.println("deserialized: " + deserializedObj);
-        assertEquals(deserializedObj, objectToSerialize);
+        assertEquals(objectToSerialize, deserializedObj);
     }
 
     // -- null replacement
@@ -128,7 +132,7 @@ public class ReadResolveTest {
         out.println("serializing : " + objectToSerialize);
         Object deserializedObj = serializeDeserialize(objectToSerialize);
         out.println("deserialized: " + deserializedObj);
-        assertEquals(deserializedObj, null);
+        assertEquals(null, deserializedObj);
     }
 
     // --- infra
diff --git a/test/jdk/java/io/Serializable/records/RecordClassTest.java b/test/jdk/java/io/Serializable/records/RecordClassTest.java
index 401512056e6..ba920ce92e5 100644
--- a/test/jdk/java/io/Serializable/records/RecordClassTest.java
+++ b/test/jdk/java/io/Serializable/records/RecordClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8246774
  * @summary Basic tests for serializing and deserializing record classes
- * @run testng RecordClassTest
+ * @run junit RecordClassTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -38,15 +38,18 @@ import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamClass;
 import java.io.Serializable;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Serializes and deserializes record classes. Ensures that the SUID is 0.
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class RecordClassTest {
 
     record Foo () implements Serializable { }
@@ -74,7 +77,6 @@ public class RecordClassTest {
 
     record Wubble (Wobble wobble, Wibble wibble, String s) implements ThrowingExternalizable { }
 
-    @DataProvider(name = "recordClasses")
     public Object[][] recordClasses() {
         return new Object[][] {
             new Object[] { Foo.class    , 0L         },
@@ -87,7 +89,8 @@ public class RecordClassTest {
     }
 
     /** Tests that the serialized and deserialized instances are equal. */
-    @Test(dataProvider = "recordClasses")
+    @ParameterizedTest
+    @MethodSource("recordClasses")
     public void testClassSerialization(Class<?> recordClass, long unused)
         throws Exception
     {
@@ -95,21 +98,22 @@ public class RecordClassTest {
         out.println("serializing : " + recordClass);
         var deserializedClass = serializeDeserialize(recordClass);
         out.println("deserialized: " + deserializedClass);
-        assertEquals(recordClass, deserializedClass);
         assertEquals(deserializedClass, recordClass);
+        assertEquals(recordClass, deserializedClass);
     }
 
     /** Tests that the SUID is always 0 unless explicitly declared. */
-    @Test(dataProvider = "recordClasses")
+    @ParameterizedTest
+    @MethodSource("recordClasses")
     public void testSerialVersionUID(Class<?> recordClass, long expectedUID) {
         out.println("\n---");
         ObjectStreamClass osc = ObjectStreamClass.lookup(recordClass);
         out.println("ObjectStreamClass::lookup  : " + osc);
-        assertEquals(osc.getSerialVersionUID(), expectedUID);
+        assertEquals(expectedUID, osc.getSerialVersionUID());
 
         osc = ObjectStreamClass.lookupAny(recordClass);
         out.println("ObjectStreamClass::lookupAny: " + osc);
-        assertEquals(osc.getSerialVersionUID(), expectedUID);
+        assertEquals(expectedUID, osc.getSerialVersionUID());
     }
 
     // --- not Serializable
@@ -120,7 +124,6 @@ public class RecordClassTest {
 
     record NotSerializable3<T>(T t) { }
 
-    @DataProvider(name = "notSerRecordClasses")
     public Object[][] notSerRecordClasses() {
         return new Object[][] {
             new Object[] { NotSerializable1.class },
@@ -130,16 +133,17 @@ public class RecordClassTest {
     }
 
     /** Tests that the generated SUID is always 0 for all non-Serializable record classes. */
-    @Test(dataProvider = "notSerRecordClasses")
+    @ParameterizedTest
+    @MethodSource("notSerRecordClasses")
     public void testSerialVersionUIDNonSer(Class<?> recordClass) {
         out.println("\n---");
         ObjectStreamClass osc = ObjectStreamClass.lookup(recordClass);
         out.println("ObjectStreamClass::lookup  : " + osc);
-        assertEquals(osc, null);
+        assertEquals(null, osc);
 
         osc = ObjectStreamClass.lookupAny(recordClass);
         out.println("ObjectStreamClass::lookupAny: " + osc);
-        assertEquals(osc.getSerialVersionUID(), 0L);
+        assertEquals(0L, osc.getSerialVersionUID());
     }
 
     // --- infra
diff --git a/test/jdk/java/io/Serializable/records/SerialPersistentFieldsTest.java b/test/jdk/java/io/Serializable/records/SerialPersistentFieldsTest.java
index 16266806850..471e94b6ed7 100644
--- a/test/jdk/java/io/Serializable/records/SerialPersistentFieldsTest.java
+++ b/test/jdk/java/io/Serializable/records/SerialPersistentFieldsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 8246774
  * @summary Basic tests for prohibited magic serialPersistentFields
  * @library /test/lib
- * @run testng SerialPersistentFieldsTest
+ * @run junit SerialPersistentFieldsTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -52,9 +52,6 @@ import java.math.BigDecimal;
 
 import jdk.test.lib.ByteCodeLoader;
 import jdk.test.lib.compiler.InMemoryJavaCompiler;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.lang.classfile.ClassFile.ACC_FINAL;
 import static java.lang.classfile.ClassFile.ACC_PRIVATE;
@@ -65,12 +62,18 @@ import static java.lang.constant.ConstantDescs.CD_void;
 import static java.lang.constant.ConstantDescs.CLASS_INIT_NAME;
 import static java.lang.constant.ConstantDescs.INIT_NAME;
 import static java.lang.constant.ConstantDescs.MTD_void;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Checks that the serialPersistentFields declaration is effectively ignored.
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SerialPersistentFieldsTest {
 
     ClassLoader serializableRecordLoader;
@@ -88,7 +91,7 @@ public class SerialPersistentFieldsTest {
      *       };
      *   }
      */
-    @BeforeTest
+    @BeforeAll
     public void setup() {
         {  // R1
             byte[] byteCode = InMemoryJavaCompiler.compile("R1",
@@ -174,7 +177,6 @@ public class SerialPersistentFieldsTest {
         return newRecord("R5", new Class[]{int.class}, new Object[]{x});
     }
 
-    @DataProvider(name = "recordInstances")
     public Object[][] recordInstances() {
         return new Object[][] {
             new Object[] { newR1()                                },
@@ -185,14 +187,15 @@ public class SerialPersistentFieldsTest {
         };
     }
 
-    @Test(dataProvider = "recordInstances")
+    @ParameterizedTest
+    @MethodSource("recordInstances")
     public void roundTrip(Object objToSerialize) throws Exception {
         out.println("\n---");
         out.println("serializing : " + objToSerialize);
         var objDeserialized = serializeDeserialize(objToSerialize);
         out.println("deserialized: " + objDeserialized);
-        assertEquals(objToSerialize, objDeserialized);
         assertEquals(objDeserialized, objToSerialize);
+        assertEquals(objToSerialize, objDeserialized);
     }
 
     <T> byte[] serialize(T obj) throws IOException {
@@ -290,7 +293,8 @@ public class SerialPersistentFieldsTest {
     // -- infra sanity --
 
     /** Checks to ensure correct operation of the test's generation logic. */
-    @Test(dataProvider = "recordInstances")
+    @ParameterizedTest
+    @MethodSource("recordInstances")
     public void wellFormedGeneratedClasses(Object obj) throws Exception {
         out.println("\n---");
         out.println(obj);
diff --git a/test/jdk/java/io/Serializable/records/SerialVersionUIDTest.java b/test/jdk/java/io/Serializable/records/SerialVersionUIDTest.java
index abc0c63b0f2..2c133392dcb 100644
--- a/test/jdk/java/io/Serializable/records/SerialVersionUIDTest.java
+++ b/test/jdk/java/io/Serializable/records/SerialVersionUIDTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8246774
  * @summary Basic tests for SUID in the serial stream
- * @run testng SerialVersionUIDTest
+ * @run junit SerialVersionUIDTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -39,13 +39,16 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.LongStream;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.io.ObjectStreamConstants.*;
 import static java.lang.System.out;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SerialVersionUIDTest {
 
     record R1 () implements Serializable {
@@ -64,7 +67,6 @@ public class SerialVersionUIDTest {
         private static final long serialVersionUID = 5678L;
     }
 
-    @DataProvider(name = "recordObjects")
     public Object[][] recordObjects() {
         return new Object[][] {
             new Object[] { new R1(),        1L    },
@@ -78,7 +80,8 @@ public class SerialVersionUIDTest {
     /**
      * Tests that a declared SUID for a record class is inserted into the stream.
      */
-    @Test(dataProvider = "recordObjects")
+    @ParameterizedTest
+    @MethodSource("recordObjects")
     public void testSerialize(Object objectToSerialize, long expectedUID)
         throws Exception
     {
@@ -90,17 +93,16 @@ public class SerialVersionUIDTest {
         DataInputStream dis = new DataInputStream(bais);
 
         // sanity
-        assertEquals(dis.readShort(), STREAM_MAGIC);
-        assertEquals(dis.readShort(), STREAM_VERSION);
-        assertEquals(dis.readByte(), TC_OBJECT);
-        assertEquals(dis.readByte(), TC_CLASSDESC);
-        assertEquals(dis.readUTF(), objectToSerialize.getClass().getName());
+        assertEquals(STREAM_MAGIC, dis.readShort());
+        assertEquals(STREAM_VERSION, dis.readShort());
+        assertEquals(TC_OBJECT, dis.readByte());
+        assertEquals(TC_CLASSDESC, dis.readByte());
+        assertEquals(objectToSerialize.getClass().getName(), dis.readUTF());
 
         // verify that the UID is as expected
-        assertEquals(dis.readLong(), expectedUID);
+        assertEquals(expectedUID, dis.readLong());
     }
 
-    @DataProvider(name = "recordClasses")
     public Object[][] recordClasses() {
         List<Object[]> list = new ArrayList<>();
         List<Class<?>> recordClasses = List.of(R1.class, R2.class, R3.class, R4.class, R5.class);
@@ -115,14 +117,15 @@ public class SerialVersionUIDTest {
      * Tests that matching of the serialVersionUID values ( stream value
      * and runtime class value ) is waived for record classes.
      */
-    @Test(dataProvider = "recordClasses")
+    @ParameterizedTest
+    @MethodSource("recordClasses")
     public void testSerializeFromClass(Class<? extends Record> cl, long suid)
         throws Exception
     {
         out.println("\n---");
         byte[] bytes = byteStreamFor(cl.getName(), suid);
         Object obj = deserialize(bytes);
-        assertEquals(obj.getClass(), cl);
+        assertEquals(cl, obj.getClass());
         assertTrue(obj.getClass().isRecord());
     }
 
diff --git a/test/jdk/java/io/Serializable/records/StreamRefTest.java b/test/jdk/java/io/Serializable/records/StreamRefTest.java
index b0c72ec8a96..d0d3e353bdb 100644
--- a/test/jdk/java/io/Serializable/records/StreamRefTest.java
+++ b/test/jdk/java/io/Serializable/records/StreamRefTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8246774
  * @summary Tests for stream references
- * @run testng StreamRefTest
+ * @run junit StreamRefTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -36,11 +36,12 @@ import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.expectThrows;
+
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for stream references.
@@ -123,14 +124,14 @@ public class StreamRefTest {
         updateIntValue(3, -3, bytes, 40);
         var byteStream = new ObjectInputStream(new ByteArrayInputStream(bytes));
 
-        InvalidObjectException ioe = expectThrows(IOE, () -> deserializeOne(byteStream));
+        InvalidObjectException ioe = Assertions.assertThrows(IOE, () -> deserializeOne(byteStream));
         out.println("caught expected IOE: " + ioe);
         Throwable t = ioe.getCause();
         assertTrue(t instanceof IllegalArgumentException, "Expected IAE, got:" + t);
         out.println("expected cause IAE: " + t);
 
         B b1 = (B)deserializeOne(byteStream);
-        assertEquals(b1.a, null);
+        assertEquals(null, b1.a);
     }
 
     @Test
@@ -144,14 +145,14 @@ public class StreamRefTest {
         updateIntValue(3, -3, bytes, 96);
         var byteStream = new ObjectInputStream(new ByteArrayInputStream(bytes));
 
-        InvalidObjectException ioe = expectThrows(IOE, () -> deserializeOne(byteStream));
+        InvalidObjectException ioe = Assertions.assertThrows(IOE, () -> deserializeOne(byteStream));
         out.println("caught expected IOE: " + ioe);
         Throwable t = ioe.getCause();
         assertTrue(t instanceof IllegalArgumentException, "Expected IAE, got:" + t);
         out.println("expected cause IAE: " + t);
 
         A a1 = (A)deserializeOne(byteStream);
-        assertEquals(a1, null);
+        assertEquals(null, a1);
     }
 
     // ---
@@ -211,7 +212,7 @@ public class StreamRefTest {
         throws IOException {
         ByteArrayInputStream bais = new ByteArrayInputStream(bytes, offset, 4);
         DataInputStream dis = new DataInputStream(bais);
-        assertEquals(dis.readInt(), expectedValue);
+        assertEquals(expectedValue, dis.readInt());
     }
 
     static void updateIntValue(int expectedValue, int newValue, byte[] bytes, int offset)
diff --git a/test/jdk/java/io/Serializable/records/ThrowingConstructorTest.java b/test/jdk/java/io/Serializable/records/ThrowingConstructorTest.java
index 8e43a11a832..ee05930f29e 100644
--- a/test/jdk/java/io/Serializable/records/ThrowingConstructorTest.java
+++ b/test/jdk/java/io/Serializable/records/ThrowingConstructorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8246774
  * @summary Tests constructor invocation exceptions are handled appropriately
- * @run testng ThrowingConstructorTest
+ * @run junit ThrowingConstructorTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -35,17 +35,20 @@ import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.expectThrows;
+
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * If the constructor invocation throws an exception, an
  * `InvalidObjectException` is thrown with that exception as its cause.
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class ThrowingConstructorTest {
 
     /** "big switch" that can be used to allow/disallow record construction
@@ -84,7 +87,6 @@ public class ThrowingConstructorTest {
 
     static final Class<InvalidObjectException> IOE = InvalidObjectException.class;
 
-    @DataProvider(name = "exceptionInstances")
     public Object[][] exceptionInstances() {
         Object[][] objs =  new Object[][] {
             new Object[] { new R1(),            NullPointerException.class,     "thrown from R1" },
@@ -98,7 +100,8 @@ public class ThrowingConstructorTest {
         return  objs;
     }
 
-    @Test(dataProvider = "exceptionInstances")
+    @ParameterizedTest
+    @MethodSource("exceptionInstances")
     public void testExceptions(Object objectToSerialize,
                                Class<? extends Throwable> expectedExType,
                                String expectedExMessage)
@@ -107,13 +110,13 @@ public class ThrowingConstructorTest {
         out.println("\n---");
         out.println("serializing: " + objectToSerialize);
         byte[] bytes = serialize(objectToSerialize);
-        InvalidObjectException ioe = expectThrows(IOE, () -> deserialize(bytes));
+        InvalidObjectException ioe = Assertions.assertThrows(IOE, () -> deserialize(bytes));
         out.println("caught expected IOE: " + ioe);
         Throwable t = ioe.getCause();
         assertTrue(t.getClass().equals(expectedExType),
                    "Expected:" + expectedExType + ", got:" + t);
         out.println("expected cause " + expectedExType +" : " + t);
-        assertEquals(t.getMessage(), expectedExMessage);
+        assertEquals(expectedExMessage, t.getMessage());
     }
 
     //  -- errors ( pass through unwrapped )
@@ -143,7 +146,6 @@ public class ThrowingConstructorTest {
         }
     }
 
-    @DataProvider(name = "errorInstances")
     public Object[][] errorInstances() {
         Object[][] objs =  new Object[][] {
             new Object[] { new R4(),              OutOfMemoryError.class,   "thrown from R4" },
@@ -157,7 +159,8 @@ public class ThrowingConstructorTest {
         return objs;
     }
 
-    @Test(dataProvider = "errorInstances")
+    @ParameterizedTest
+    @MethodSource("errorInstances")
     public void testErrors(Object objectToSerialize,
                            Class<? extends Throwable> expectedExType,
                            String expectedExMessage)
@@ -166,11 +169,11 @@ public class ThrowingConstructorTest {
         out.println("\n---");
         out.println("serializing: " + objectToSerialize);
         byte[] bytes = serialize(objectToSerialize);
-        Throwable t = expectThrows(expectedExType, () -> deserialize(bytes));
+        Throwable t = Assertions.assertThrows(expectedExType, () -> deserialize(bytes));
         assertTrue(t.getClass().equals(expectedExType),
                    "Expected:" + expectedExType + ", got:" + t);
         out.println("caught expected " + expectedExType +" : " + t);
-        assertEquals(t.getMessage(), expectedExMessage);
+        assertEquals(expectedExMessage, t.getMessage());
     }
 
     // --- infra
diff --git a/test/jdk/java/io/Serializable/records/UnsharedTest.java b/test/jdk/java/io/Serializable/records/UnsharedTest.java
index c96010c83ab..114e2dc6e10 100644
--- a/test/jdk/java/io/Serializable/records/UnsharedTest.java
+++ b/test/jdk/java/io/Serializable/records/UnsharedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8238763 8246774
  * @summary ObjectInputStream readUnshared method handling of Records
- * @run testng UnsharedTest
+ * @run junit UnsharedTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -35,10 +35,11 @@ import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.expectThrows;
+import org.junit.jupiter.api.Assertions;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests OOS::writeUnshared and OIS::readUnshared to verify that records
@@ -56,16 +57,16 @@ public class UnsharedTest {
         {  // shared - sanity to ensure the second foo is a ref
             var byteStream = serialize(foo, foo);
             var foo1 = (Foo) deserializeOne(byteStream);
-            assertEquals(foo1.x, foo.x);
+            assertEquals(foo.x, foo1.x);
             var foo2 = (Foo) deserializeOne(byteStream);
-            assertEquals(foo2.x, foo.x);
+            assertEquals(foo.x, foo2.x);
             assertTrue(foo2 == foo1);
         }
         {  // unshared
             var byteStream = serialize(foo, foo);
             var foo1 = (Foo) deserializeOneUnshared(byteStream);
-            assertEquals(foo1.x, foo.x);
-            var expected = expectThrows(IOE, () -> deserializeOne(byteStream));
+            assertEquals(foo.x, foo1.x);
+            var expected = Assertions.assertThrows(IOE, () -> deserializeOne(byteStream));
             assertTrue(expected.getMessage().contains("cannot read back reference to unshared object"));
         }
     }
@@ -76,17 +77,17 @@ public class UnsharedTest {
         {  // shared - sanity to ensure the second foo is NOT a ref
             var byteStream = serializeUnshared(foo, foo);
             var foo1 = (Foo) deserializeOne(byteStream);
-            assertEquals(foo1.x, foo.x);
+            assertEquals(foo.x, foo1.x);
             var foo2 = (Foo) deserializeOne(byteStream);
-            assertEquals(foo2.x, foo.x);
+            assertEquals(foo.x, foo2.x);
             assertTrue(foo2 != foo1);
         }
         {  // unshared
             var byteStream = serializeUnshared(foo, foo);
             var foo1 = (Foo) deserializeOneUnshared(byteStream);
-            assertEquals(foo1.x, foo.x);
+            assertEquals(foo.x, foo1.x);
             var foo2 = (Foo) deserializeOneUnshared(byteStream);
-            assertEquals(foo2.x, foo.x);
+            assertEquals(foo.x, foo2.x);
             assertTrue(foo2 != foo1);
         }
     }
diff --git a/test/jdk/java/io/Serializable/records/WriteReplaceTest.java b/test/jdk/java/io/Serializable/records/WriteReplaceTest.java
index c64d6355dd2..2e253c166a0 100644
--- a/test/jdk/java/io/Serializable/records/WriteReplaceTest.java
+++ b/test/jdk/java/io/Serializable/records/WriteReplaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8246774
  * @summary Basic tests for writeReplace
- * @run testng WriteReplaceTest
+ * @run junit WriteReplaceTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -34,11 +34,15 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
-import static org.testng.Assert.assertEquals;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class WriteReplaceTest {
 
     record R1 () implements Serializable {
@@ -71,7 +75,6 @@ public class WriteReplaceTest {
         }
     }
 
-    @DataProvider(name = "recordObjects")
     public Object[][] recordObjects() {
         return new Object[][] {
             new Object[] { new R1(),                       R1.class             },
@@ -81,7 +84,8 @@ public class WriteReplaceTest {
         };
     }
 
-    @Test(dataProvider = "recordObjects")
+    @ParameterizedTest
+    @MethodSource("recordObjects")
     public void testSerialize(Object objectToSerialize, Class<?> expectedType)
         throws Exception
     {
@@ -90,9 +94,9 @@ public class WriteReplaceTest {
         Object deserializedObj = serializeDeserialize(objectToSerialize);
         out.println("deserialized: " + deserializedObj);
         if (objectToSerialize.getClass().equals(expectedType))
-            assertEquals(deserializedObj, objectToSerialize);
+            assertEquals(objectToSerialize, deserializedObj);
         else
-            assertEquals(deserializedObj.getClass(), expectedType);
+            assertEquals(expectedType, deserializedObj.getClass());
     }
 
     // -- null replacement
@@ -108,7 +112,7 @@ public class WriteReplaceTest {
         out.println("serializing : " + objectToSerialize);
         Object deserializedObj = serializeDeserialize(objectToSerialize);
         out.println("deserialized: " + deserializedObj);
-        assertEquals(deserializedObj, null);
+        assertEquals(null, deserializedObj);
     }
 
     // --- infra
diff --git a/test/jdk/java/io/Serializable/records/migration/AbstractTest.java b/test/jdk/java/io/Serializable/records/migration/AbstractTest.java
index e0bbc574500..488f4a33acd 100644
--- a/test/jdk/java/io/Serializable/records/migration/AbstractTest.java
+++ b/test/jdk/java/io/Serializable/records/migration/AbstractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,8 +34,9 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.file.Path;
 import jdk.test.lib.compiler.CompilerUtils;
-import org.testng.annotations.BeforeTest;
-import static org.testng.Assert.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
 
 /**
  * An abstract superclass for tests that require to serialize and deserialize
@@ -54,7 +55,7 @@ public class AbstractTest {
     static final Path RECORD_SRC_DIR = Path.of(TEST_SRC, "record");
     static final Path RECORD_DEST_DIR = Path.of("record");
 
-    @BeforeTest
+    @BeforeAll
     public void setup() throws IOException {
         assertTrue(CompilerUtils.compile(PLAIN_SRC_DIR, PLAIN_DEST_DIR,
                    "--class-path", TEST_CLASSES_DIR.toString()));
diff --git a/test/jdk/java/io/Serializable/records/migration/AssignableFromTest.java b/test/jdk/java/io/Serializable/records/migration/AssignableFromTest.java
index 6097e2477df..117a8474c67 100644
--- a/test/jdk/java/io/Serializable/records/migration/AssignableFromTest.java
+++ b/test/jdk/java/io/Serializable/records/migration/AssignableFromTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,24 +29,26 @@
  * @modules jdk.compiler
  * @compile AssignableFrom.java Point.java
  *          DefaultValues.java SuperStreamFields.java
- * @run testng AssignableFromTest
+ * @run junit AssignableFromTest
  */
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Basic test to check that stream field values that are not the exact
  * declared param/field type, but assignable to a declared supertype,
  * are bound/assigned correctly.
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class AssignableFromTest extends AbstractTest {
 
-    @DataProvider(name = "plainInstances")
     public Object[][] plainInstances() {
         return new Object[][] {
             new Object[] { newPlainAssignableFrom(Byte.valueOf((byte)11))   },
@@ -59,7 +61,8 @@ public class AssignableFromTest extends AbstractTest {
     }
 
     /** Serialize non-record (plain) instances, deserialize as a record. */
-    @Test(dataProvider = "plainInstances")
+    @ParameterizedTest
+    @MethodSource("plainInstances")
     public void testPlainToRecord(AssignableFrom objToSerialize) throws Exception {
         assert !objToSerialize.getClass().isRecord();
         out.println("serialize   : " + objToSerialize);
@@ -68,13 +71,12 @@ public class AssignableFromTest extends AbstractTest {
         assert objDeserialized.getClass().isRecord();
         out.println("deserialized: " + objDeserialized);
 
-        assertEquals(objToSerialize.number(), objDeserialized.number());
         assertEquals(objDeserialized.number(), objToSerialize.number());
+        assertEquals(objToSerialize.number(), objDeserialized.number());
         assertEquals(objDeserialized.number().getClass(), objDeserialized.number().getClass());
 
     }
 
-    @DataProvider(name = "recordInstances")
     public Object[][] recordInstances() {
         return new Object[][] {
             new Object[] { newRecordAssignableFrom(Byte.valueOf((byte)21))   },
@@ -87,7 +89,8 @@ public class AssignableFromTest extends AbstractTest {
     }
 
     /** Serialize record instances, deserialize as non-record (plain). */
-    @Test(dataProvider = "recordInstances")
+    @ParameterizedTest
+    @MethodSource("recordInstances")
     public void testRecordToPlain(AssignableFrom objToSerialize) throws Exception {
         assert objToSerialize.getClass().isRecord();
         out.println("serialize   : " + objToSerialize);
@@ -96,8 +99,8 @@ public class AssignableFromTest extends AbstractTest {
         assert !objDeserialized.getClass().isRecord();
         out.println("deserialized: " + objDeserialized);
 
-        assertEquals(objToSerialize.number(), objDeserialized.number());
         assertEquals(objDeserialized.number(), objToSerialize.number());
+        assertEquals(objToSerialize.number(), objDeserialized.number());
         assertEquals(objDeserialized.number().getClass(), objDeserialized.number().getClass());
     }
 
diff --git a/test/jdk/java/io/Serializable/records/migration/DefaultValuesTest.java b/test/jdk/java/io/Serializable/records/migration/DefaultValuesTest.java
index 4af684156c6..357c9400777 100644
--- a/test/jdk/java/io/Serializable/records/migration/DefaultValuesTest.java
+++ b/test/jdk/java/io/Serializable/records/migration/DefaultValuesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,21 +28,24 @@
  * @library /test/lib
  * @modules jdk.compiler
  * @compile AssignableFrom.java Point.java DefaultValues.java SuperStreamFields.java
- * @run testng DefaultValuesTest
+ * @run junit DefaultValuesTest
  */
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
-import org.testng.annotations.Test;
 import static java.io.ObjectStreamConstants.*;
 import static java.lang.System.out;
-import static org.testng.Assert.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 /**
  * Basic test to check that default primitive / reference values are
  * presented to the record's canonical constructor, for fields not in
  * the stream.
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class DefaultValuesTest extends AbstractTest {
 
     /**
@@ -77,13 +80,13 @@ public class DefaultValuesTest extends AbstractTest {
 
         Point point = deserializeAsPlain(bytes);
         out.println("deserialized: " + point);
-        assertEquals(point.x(), 0);
-        assertEquals(point.y(), 0);
+        assertEquals(0, point.x());
+        assertEquals(0, point.y());
 
         point = deserializeAsRecord(bytes);
         out.println("deserialized: " + point);
-        assertEquals(point.x(), 0);
-        assertEquals(point.y(), 0);
+        assertEquals(0, point.x());
+        assertEquals(0, point.y());
     }
 
     // ---
@@ -115,8 +118,8 @@ public class DefaultValuesTest extends AbstractTest {
         DefaultValues o1 = deserializeAsRecord(bytes);
         out.println("deserialized: " + o1);
 
-        assertEquals(o1.point().x(), point.x());   // sanity
-        assertEquals(o1.point().y(), point.y());   // sanity
+        assertEquals(point.x(), o1.point().x());   // sanity
+        assertEquals(point.y(), o1.point().y());   // sanity
         assertTrue(o1.bool() == Defaults.bool);
         assertTrue(o1.by() == Defaults.by);
         assertTrue(o1.ch() == Defaults.ch);
diff --git a/test/jdk/java/io/Serializable/records/migration/SuperStreamFieldsTest.java b/test/jdk/java/io/Serializable/records/migration/SuperStreamFieldsTest.java
index 6090d71003e..35e75341dbf 100644
--- a/test/jdk/java/io/Serializable/records/migration/SuperStreamFieldsTest.java
+++ b/test/jdk/java/io/Serializable/records/migration/SuperStreamFieldsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,20 +28,23 @@
  * @library /test/lib
  * @modules jdk.compiler
  * @compile AssignableFrom.java Point.java DefaultValues.java SuperStreamFields.java
- * @run testng SuperStreamFieldsTest
+ * @run junit SuperStreamFieldsTest
  */
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  *  Tests that superclass fields in the stream are discarded.
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SuperStreamFieldsTest extends AbstractTest {
 
-    @DataProvider(name = "plainInstances")
     public Object[][] plainInstances() {
         return new Object[][] {
             new Object[] { newPlainSuperStreamFields("cat", new int[] { 1 },    1)   },
@@ -51,7 +54,8 @@ public class SuperStreamFieldsTest extends AbstractTest {
     }
 
     /** Serializes non-record (plain) instance, deserializes as a record. */
-    @Test(dataProvider = "plainInstances")
+    @ParameterizedTest
+    @MethodSource("plainInstances")
     public void testPlainToRecord(SuperStreamFields objToSerialize) throws Exception {
         assert !objToSerialize.getClass().isRecord();
         out.println("serialize   : " + objToSerialize);
@@ -60,12 +64,11 @@ public class SuperStreamFieldsTest extends AbstractTest {
         assert objDeserialized.getClass().isRecord();
         out.println("deserialized: " + objDeserialized);
 
-        assertEquals(objToSerialize.str(), objDeserialized.str());
-        assertEquals(objToSerialize.x(),   objDeserialized.x());
-        assertEquals(objToSerialize.y(),   objDeserialized.y());
+        assertEquals(objDeserialized.str(), objToSerialize.str());
+        Assertions.assertArrayEquals(objDeserialized.x(), objToSerialize.x());
+        assertEquals(objDeserialized.y(), objToSerialize.y());
     }
 
-    @DataProvider(name = "recordInstances")
     public Object[][] recordInstances() {
         return new Object[][] {
             new Object[] { newRecordSuperStreamFields("goat",   new int[] { 56 },     66)   },
@@ -75,7 +78,8 @@ public class SuperStreamFieldsTest extends AbstractTest {
     }
 
     /** Serializes record instance, deserializes as non-record (plain). */
-    @Test(dataProvider = "recordInstances")
+    @ParameterizedTest
+    @MethodSource("recordInstances")
     public void testRecordToPlain(SuperStreamFields objToSerialize) throws Exception {
         assert objToSerialize.getClass().isRecord();
         out.println("serialize   : " + objToSerialize);
@@ -84,9 +88,9 @@ public class SuperStreamFieldsTest extends AbstractTest {
         assert !objDeserialized.getClass().isRecord();
         out.println("deserialized: " + objDeserialized);
 
-        assertEquals(objToSerialize.str(), objDeserialized.str());
-        assertEquals(objToSerialize.x(),   objDeserialized.x());
-        assertEquals(objToSerialize.y(),   objDeserialized.y());
+        assertEquals(objDeserialized.str(), objToSerialize.str());
+        Assertions.assertArrayEquals(objDeserialized.x(), objToSerialize.x());
+        assertEquals(objDeserialized.y(), objToSerialize.y());
 
     }
 
diff --git a/test/jdk/java/io/pathNames/win32/DriveOnly.java b/test/jdk/java/io/pathNames/win32/DriveOnly.java
index 96aba22a408..8c5d2dc0fe8 100644
--- a/test/jdk/java/io/pathNames/win32/DriveOnly.java
+++ b/test/jdk/java/io/pathNames/win32/DriveOnly.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClass.java b/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClass.java
index f458a0a6b00..c6900d18a19 100644
--- a/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClass.java
+++ b/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClassTest.java b/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClassTest.java
index 156d42dd6f8..c99d68d21b5 100644
--- a/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClassTest.java
+++ b/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/lang/Class/getEnclosingClass/common/TestMe.java b/test/jdk/java/lang/Class/getEnclosingClass/common/TestMe.java
index 220542239a0..79d13cd5ad4 100644
--- a/test/jdk/java/lang/Class/getEnclosingClass/common/TestMe.java
+++ b/test/jdk/java/lang/Class/getEnclosingClass/common/TestMe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/lang/IO/IO.java b/test/jdk/java/lang/IO/IO.java
index 2b13657b58e..cff64146cd6 100644
--- a/test/jdk/java/lang/IO/IO.java
+++ b/test/jdk/java/lang/IO/IO.java
@@ -149,7 +149,7 @@ public class IO {
                     }
                     """);
         }
-        var pb = ProcessTools.createTestJavaProcessBuilder(file.toString());
+        var pb = ProcessTools.createTestJavaProcessBuilder("-Xlog:aot=off", "-Xlog:cds=off", file.toString());
         OutputAnalyzer output = ProcessTools.executeProcess(pb);
         assertEquals(0, output.getExitValue());
         assertTrue(output.getStderr().isEmpty());
diff --git a/test/jdk/java/lang/ProcessBuilder/FDLeakTest/exeFDLeakTester.c b/test/jdk/java/lang/ProcessBuilder/FDLeakTest/exeFDLeakTester.c
index b47228ee5de..3a86c8677d6 100644
--- a/test/jdk/java/lang/ProcessBuilder/FDLeakTest/exeFDLeakTester.c
+++ b/test/jdk/java/lang/ProcessBuilder/FDLeakTest/exeFDLeakTester.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/lang/RuntimeTests/exec/SleepyCat.java b/test/jdk/java/lang/RuntimeTests/exec/SleepyCat.java
index 7e6e9837c40..9ab4ba33f45 100644
--- a/test/jdk/java/lang/RuntimeTests/exec/SleepyCat.java
+++ b/test/jdk/java/lang/RuntimeTests/exec/SleepyCat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,26 +66,19 @@ public class SleepyCat {
      * @param pids the processes to dump status for
      */
     static void dumpState(Process... pids) {
-        if (!System.getProperty("os.name").contains("SunOS")) {
-            return;
-        }
         try {
             String[] psArgs = {"ps", "-elf"};
-            Process ps = new ProcessBuilder(psArgs).inheritIO().start();
-            ps.waitFor();
-            String[] sfiles = {"pfiles", "self"};
-            Process fds = new ProcessBuilder(sfiles).inheritIO().start();
-            fds.waitFor();
+            try (Process ps = new ProcessBuilder(psArgs).inheritIO().start()) {
+                ps.waitFor();
+            }
 
             for (Process p : pids) {
                 if (p == null)
                     continue;
-                String[] pfiles = {"pfiles", Long.toString(p.pid())};
-                fds = new ProcessBuilder(pfiles).inheritIO().start();
-                fds.waitFor();
-                String[] pstack = {"pstack", Long.toString(p.pid())};
-                fds = new ProcessBuilder(pstack).inheritIO().start();
-                fds.waitFor();
+                String[] pfiles = {"lsof", "-p", Long.toString(p.pid())};
+                try (Process fds = new ProcessBuilder(pfiles).inheritIO().start()) {
+                    fds.waitFor();
+                }
             }
         } catch (IOException | InterruptedException i) {
             i.printStackTrace();
diff --git a/test/jdk/java/lang/RuntimeTests/exec/TEST.properties b/test/jdk/java/lang/RuntimeTests/exec/TEST.properties
new file mode 100644
index 00000000000..c7e8a6850ca
--- /dev/null
+++ b/test/jdk/java/lang/RuntimeTests/exec/TEST.properties
@@ -0,0 +1 @@
+maxOutputSize=6000000
diff --git a/test/jdk/java/lang/ScopedValue/ManyBindings.java b/test/jdk/java/lang/ScopedValue/ManyBindings.java
index 5f9b5e6e176..be10d599ebd 100644
--- a/test/jdk/java/lang/ScopedValue/ManyBindings.java
+++ b/test/jdk/java/lang/ScopedValue/ManyBindings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/lang/ScopedValue/ScopedValueAPI.java b/test/jdk/java/lang/ScopedValue/ScopedValueAPI.java
index 5652de7e10e..b15137c02a8 100644
--- a/test/jdk/java/lang/ScopedValue/ScopedValueAPI.java
+++ b/test/jdk/java/lang/ScopedValue/ScopedValueAPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/lang/StringBuffer/ECoreIndexOf.java b/test/jdk/java/lang/StringBuffer/ECoreIndexOf.java
index ccaee0f77ea..85930539059 100644
--- a/test/jdk/java/lang/StringBuffer/ECoreIndexOf.java
+++ b/test/jdk/java/lang/StringBuffer/ECoreIndexOf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/lang/System/PropertyTest.java b/test/jdk/java/lang/System/PropertyTest.java
index 09b0835fb6e..dc263778959 100644
--- a/test/jdk/java/lang/System/PropertyTest.java
+++ b/test/jdk/java/lang/System/PropertyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/lang/System/i18nEnvArg.java b/test/jdk/java/lang/System/i18nEnvArg.java
index b6c62c15e1f..fdeb1a18762 100644
--- a/test/jdk/java/lang/System/i18nEnvArg.java
+++ b/test/jdk/java/lang/System/i18nEnvArg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/lang/Thread/virtual/YieldQueuing.java b/test/jdk/java/lang/Thread/virtual/YieldQueuing.java
index 7bd2320e2ab..bbecd711737 100644
--- a/test/jdk/java/lang/Thread/virtual/YieldQueuing.java
+++ b/test/jdk/java/lang/Thread/virtual/YieldQueuing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/lang/invoke/TestVHInvokerCaching.java b/test/jdk/java/lang/invoke/TestVHInvokerCaching.java
index ccd97f82e9b..0a1ae5914ca 100644
--- a/test/jdk/java/lang/invoke/TestVHInvokerCaching.java
+++ b/test/jdk/java/lang/invoke/TestVHInvokerCaching.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static java.lang.invoke.MethodHandles.lookup;
-import static org.testng.Assert.assertSame;
+import static org.testng.Assert.*;
 
 public class TestVHInvokerCaching {
 
@@ -74,7 +74,7 @@ public class TestVHInvokerCaching {
 
         MethodHandles.Lookup lookup = lookup();
 
-        for (Field field : Holder.class.getFields()) {
+        for (Field field : Holder.class.getDeclaredFields()) {
             String fieldName = field.getName();
             Class<?> fieldType = field.getType();
 
@@ -82,6 +82,8 @@ public class TestVHInvokerCaching {
             testHandles.add(lookup.findVarHandle(Holder.class, fieldName, fieldType));
         }
 
+        assertFalse(testHandles.isEmpty());
+
         return testHandles.stream().map(vh -> new Object[]{ vh }).toArray(Object[][]::new);
     }
 }
diff --git a/test/jdk/java/lang/module/ClassFileVersionsTest.java b/test/jdk/java/lang/module/ClassFileVersionsTest.java
index 308df36b81d..26a0b7e2fe3 100644
--- a/test/jdk/java/lang/module/ClassFileVersionsTest.java
+++ b/test/jdk/java/lang/module/ClassFileVersionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/lang/module/ModuleDescriptorTest.java b/test/jdk/java/lang/module/ModuleDescriptorTest.java
index fd7d32cc978..872dd9aa58a 100644
--- a/test/jdk/java/lang/module/ModuleDescriptorTest.java
+++ b/test/jdk/java/lang/module/ModuleDescriptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/lang/reflect/exeCallerAccessTest/CallerAccessTest.java b/test/jdk/java/lang/reflect/exeCallerAccessTest/CallerAccessTest.java
index bcd77af9ead..bf949fd2d15 100644
--- a/test/jdk/java/lang/reflect/exeCallerAccessTest/CallerAccessTest.java
+++ b/test/jdk/java/lang/reflect/exeCallerAccessTest/CallerAccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/math/BigDecimal/Constructor.java b/test/jdk/java/math/BigDecimal/Constructor.java
index b7371074225..975d96772a6 100644
--- a/test/jdk/java/math/BigDecimal/Constructor.java
+++ b/test/jdk/java/math/BigDecimal/Constructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,45 +26,57 @@
  * @bug 4259453 8200698
  * @summary Test constructors of BigDecimal
  * @library ..
- * @run testng Constructor
+ * @run junit Constructor
  */
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 import java.math.BigDecimal;
-import org.testng.annotations.Test;
 
 public class Constructor {
-    @Test(expectedExceptions=NumberFormatException.class)
+    @Test
     public void stringConstructor() {
-        BigDecimal bd = new BigDecimal("1.2e");
+        Assertions.assertThrows(NumberFormatException.class, () -> {
+            BigDecimal bd = new BigDecimal("1.2e");
+        });
     }
 
-    @Test(expectedExceptions=NumberFormatException.class)
+    @Test
     public void charArrayConstructorNegativeOffset() {
-        BigDecimal bd = new BigDecimal(new char[5], -1, 4, null);
+        Assertions.assertThrows(NumberFormatException.class, () -> {
+            BigDecimal bd = new BigDecimal(new char[5], -1, 4, null);
+        });
     }
 
-    @Test(expectedExceptions=NumberFormatException.class)
+    @Test
     public void charArrayConstructorNegativeLength() {
-        BigDecimal bd = new BigDecimal(new char[5], 0, -1, null);
+        Assertions.assertThrows(NumberFormatException.class, () -> {
+            BigDecimal bd = new BigDecimal(new char[5], 0, -1, null);
+        });
     }
 
-    @Test(expectedExceptions=NumberFormatException.class)
+    @Test
     public void charArrayConstructorIntegerOverflow() {
-        try {
-            BigDecimal bd = new BigDecimal(new char[5], Integer.MAX_VALUE - 5,
-                6, null);
-        } catch (NumberFormatException nfe) {
-            if (nfe.getCause() instanceof IndexOutOfBoundsException) {
-                throw new RuntimeException
-                    ("NumberFormatException should not have a cause");
-            } else {
-                throw nfe;
+        Assertions.assertThrows(NumberFormatException.class, () -> {
+            try {
+                BigDecimal bd = new BigDecimal(new char[5], Integer.MAX_VALUE - 5,
+                        6, null);
+            } catch (NumberFormatException nfe) {
+                if (nfe.getCause() instanceof IndexOutOfBoundsException) {
+                    throw new RuntimeException
+                            ("NumberFormatException should not have a cause");
+                } else {
+                    throw nfe;
+                }
             }
-        }
+        });
     }
 
-    @Test(expectedExceptions=NumberFormatException.class)
+    @Test
     public void charArrayConstructorIndexOutOfBounds() {
-        BigDecimal bd = new BigDecimal(new char[5], 1, 5, null);
+        Assertions.assertThrows(NumberFormatException.class, () -> {
+            BigDecimal bd = new BigDecimal(new char[5], 1, 5, null);
+        });
     }
 }
diff --git a/test/jdk/java/math/BigInteger/LargeValueExceptions.java b/test/jdk/java/math/BigInteger/LargeValueExceptions.java
index 4c85281a5c0..9670691e51c 100644
--- a/test/jdk/java/math/BigInteger/LargeValueExceptions.java
+++ b/test/jdk/java/math/BigInteger/LargeValueExceptions.java
@@ -26,13 +26,16 @@
  * @bug 8200698
  * @summary Tests that exceptions are thrown for ops which would overflow
  * @requires (sun.arch.data.model == "64" & os.maxMemory >= 4g)
- * @run testng/othervm/timeout=480 -Xmx4g LargeValueExceptions
+ * @run junit/othervm/timeout=480 -Xmx4g LargeValueExceptions
  */
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
 import java.math.BigInteger;
+
 import static java.math.BigInteger.ONE;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.Test;
 
 //
 // The intent of this test is to probe the boundaries between overflow and
@@ -64,47 +67,48 @@ public class LargeValueExceptions {
     // Half BigInteger.MAX_MAG_LENGTH
     private static final int MAX_INTS_HALF = MAX_INTS / 2;
 
-    // Print the run time of each sub-test in milliseconds
-    @AfterMethod
-    public void getRunTime(ITestResult tr) {
-        long time = tr.getEndMillis() - tr.getStartMillis();
-        System.out.printf("Run time: %d ms%n", time);
-    }
-
     // --- squaring ---
 
     // Largest no overflow determined by examining data lengths alone.
-    @Test(enabled=false)
+    @Test
+    @Disabled
     public void squareNoOverflow() {
         BigInteger x = ONE.shiftLeft(16*MAX_INTS - 1).subtract(ONE);
         BigInteger y = x.multiply(x);
     }
 
     // Smallest no overflow determined by extra calculations.
-    @Test(enabled=false)
+    @Test
+    @Disabled
     public void squareIndefiniteOverflowSuccess() {
         BigInteger x = ONE.shiftLeft(16*MAX_INTS - 1);
         BigInteger y = x.multiply(x);
     }
 
     // Largest overflow detected by extra calculations.
-    @Test(expectedExceptions=ArithmeticException.class,enabled=false)
+    @Test
+    @Disabled
     public void squareIndefiniteOverflowFailure() {
-        BigInteger x = ONE.shiftLeft(16*MAX_INTS).subtract(ONE);
-        BigInteger y = x.multiply(x);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            BigInteger x = ONE.shiftLeft(16*MAX_INTS).subtract(ONE);
+            BigInteger y = x.multiply(x);
+        });
     }
 
     // Smallest overflow detected by examining data lengths alone.
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void squareDefiniteOverflow() {
-        BigInteger x = ONE.shiftLeft(16*MAX_INTS);
-        BigInteger y = x.multiply(x);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            BigInteger x = ONE.shiftLeft(16*MAX_INTS);
+            BigInteger y = x.multiply(x);
+        });
     }
 
     // --- multiplication ---
 
     // Largest no overflow determined by examining data lengths alone.
-    @Test(enabled=false)
+    @Test
+    @Disabled
     public void multiplyNoOverflow() {
         final int halfMaxBits = MAX_INTS_HALF << 5;
 
@@ -114,7 +118,8 @@ public class LargeValueExceptions {
     }
 
     // Smallest no overflow determined by extra calculations.
-    @Test(enabled=false)
+    @Test
+    @Disabled
     public void multiplyIndefiniteOverflowSuccess() {
         BigInteger x = ONE.shiftLeft((int)(MAX_BITS/2) - 1);
         long m = MAX_BITS - x.bitLength();
@@ -130,68 +135,83 @@ public class LargeValueExceptions {
     }
 
     // Largest overflow detected by extra calculations.
-    @Test(expectedExceptions=ArithmeticException.class,enabled=false)
+    @Test
+    @Disabled
     public void multiplyIndefiniteOverflowFailure() {
-        BigInteger x = ONE.shiftLeft((int)(MAX_BITS/2)).subtract(ONE);
-        long m = MAX_BITS - x.bitLength();
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            BigInteger x = ONE.shiftLeft((int)(MAX_BITS/2)).subtract(ONE);
+            long m = MAX_BITS - x.bitLength();
 
-        BigInteger y = ONE.shiftLeft((int)(MAX_BITS/2)).subtract(ONE);
-        long n = MAX_BITS - y.bitLength();
+            BigInteger y = ONE.shiftLeft((int)(MAX_BITS/2)).subtract(ONE);
+            long n = MAX_BITS - y.bitLength();
 
-        if (m + n != MAX_BITS) {
-            throw new RuntimeException("Unexpected leading zero sum");
-        }
+            if (m + n != MAX_BITS) {
+                throw new RuntimeException("Unexpected leading zero sum");
+            }
 
-        BigInteger z = x.multiply(y);
+            BigInteger z = x.multiply(y);
+        });
     }
 
     // Smallest overflow detected by examining data lengths alone.
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void multiplyDefiniteOverflow() {
-        // multiply by 4 as MAX_INTS_HALF refers to ints
-        byte[] xmag = new byte[4*MAX_INTS_HALF];
-        xmag[0] = (byte)0xff;
-        BigInteger x = new BigInteger(1, xmag);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            // multiply by 4 as MAX_INTS_HALF refers to ints
+            byte[] xmag = new byte[4*MAX_INTS_HALF];
+            xmag[0] = (byte)0xff;
+            BigInteger x = new BigInteger(1, xmag);
 
-        byte[] ymag = new byte[4*MAX_INTS_HALF + 1];
-        ymag[0] = (byte)0xff;
-        BigInteger y = new BigInteger(1, ymag);
+            byte[] ymag = new byte[4*MAX_INTS_HALF + 1];
+            ymag[0] = (byte)0xff;
+            BigInteger y = new BigInteger(1, ymag);
 
-        BigInteger z = x.multiply(y);
+            BigInteger z = x.multiply(y);
+        });
     }
 
     // --- exponentiation ---
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void powOverflow() {
-        BigInteger.TEN.pow(Integer.MAX_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            BigInteger.TEN.pow(Integer.MAX_VALUE);
+        });
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void powOverflow1() {
-        int shift = 20;
-        int exponent = 1 << shift;
-        BigInteger x = ONE.shiftLeft((int)(MAX_BITS / exponent));
-        BigInteger y = x.pow(exponent);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            int shift = 20;
+            int exponent = 1 << shift;
+            BigInteger x = ONE.shiftLeft((int)(MAX_BITS / exponent));
+            BigInteger y = x.pow(exponent);
+        });
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void powOverflow2() {
-        int shift = 20;
-        int exponent = 1 << shift;
-        BigInteger x = ONE.shiftLeft((int)(MAX_BITS / exponent)).add(ONE);
-        BigInteger y = x.pow(exponent);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            int shift = 20;
+            int exponent = 1 << shift;
+            BigInteger x = ONE.shiftLeft((int)(MAX_BITS / exponent)).add(ONE);
+            BigInteger y = x.pow(exponent);
+        });
     }
 
-    @Test(expectedExceptions=ArithmeticException.class,enabled=false)
+    @Test
+    @Disabled
     public void powOverflow3() {
-        int shift = 20;
-        int exponent = 1 << shift;
-        BigInteger x = ONE.shiftLeft((int)(MAX_BITS / exponent)).subtract(ONE);
-        BigInteger y = x.pow(exponent);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            int shift = 20;
+            int exponent = 1 << shift;
+            BigInteger x = ONE.shiftLeft((int)(MAX_BITS / exponent)).subtract(ONE);
+            BigInteger y = x.pow(exponent);
+        });
     }
 
-    @Test(enabled=false)
+    @Test
+    @Disabled
     public void powOverflow4() {
         int shift = 20;
         int exponent = 1 << shift;
diff --git a/test/jdk/java/net/HttpURLConnection/HttpURLConnectionExpectContinueTest.java b/test/jdk/java/net/HttpURLConnection/HttpURLConnectionExpectContinueTest.java
index e701e234d83..a2d4bad995e 100644
--- a/test/jdk/java/net/HttpURLConnection/HttpURLConnectionExpectContinueTest.java
+++ b/test/jdk/java/net/HttpURLConnection/HttpURLConnectionExpectContinueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/net/URL/OpenStream.java b/test/jdk/java/net/URL/OpenStream.java
index 82fd5106056..10737d544d0 100644
--- a/test/jdk/java/net/URL/OpenStream.java
+++ b/test/jdk/java/net/URL/OpenStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/net/httpclient/ALPNProxyFailureTest.java b/test/jdk/java/net/httpclient/ALPNProxyFailureTest.java
index ca2e95b70fe..4dedfed97b1 100644
--- a/test/jdk/java/net/httpclient/ALPNProxyFailureTest.java
+++ b/test/jdk/java/net/httpclient/ALPNProxyFailureTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,14 +44,9 @@ import java.net.http.HttpClient;
 
 public class ALPNProxyFailureTest extends ALPNFailureTest {
 
-    static final SSLContext context;
+    private static final SSLContext context = SimpleSSLContext.findSSLContext();
     static {
-        try {
-            context = new SimpleSSLContext().get();
-            SSLContext.setDefault(context);
-        } catch (Exception x) {
-            throw new ExceptionInInitializerError(x);
-        }
+        SSLContext.setDefault(context);
     }
 
     public static void main(String[] args) throws Exception{
diff --git a/test/jdk/java/net/httpclient/AbstractNoBody.java b/test/jdk/java/net/httpclient/AbstractNoBody.java
index 9cc26704bb5..d0908a6e4cd 100644
--- a/test/jdk/java/net/httpclient/AbstractNoBody.java
+++ b/test/jdk/java/net/httpclient/AbstractNoBody.java
@@ -53,7 +53,7 @@ import static org.testng.Assert.assertEquals;
 
 public abstract class AbstractNoBody implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
     HttpTestServer httpsTestServer;       // HTTPS/1.1
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -186,9 +186,6 @@ public abstract class AbstractNoBody implements HttpServerAdapters {
     public void setup() throws Exception {
         printStamp(START, "setup");
         HttpServerAdapters.enableServerLogging();
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
 
         // HTTP/1.1
         HttpTestHandler h1_fixedLengthNoBodyHandler = new FixedLengthNoBodyHandler();
diff --git a/test/jdk/java/net/httpclient/AbstractThrowingPublishers.java b/test/jdk/java/net/httpclient/AbstractThrowingPublishers.java
index 9a9c2b44cd7..992b215ade0 100644
--- a/test/jdk/java/net/httpclient/AbstractThrowingPublishers.java
+++ b/test/jdk/java/net/httpclient/AbstractThrowingPublishers.java
@@ -23,14 +23,6 @@
 
 import jdk.httpclient.test.lib.http3.Http3TestServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.ITestContext;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -48,7 +40,6 @@ import java.net.http.HttpResponse.BodyHandler;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
@@ -61,6 +52,7 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Flow;
 import java.util.concurrent.SubmissionPublisher;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiPredicate;
@@ -78,28 +70,35 @@ import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
 
 public abstract class AbstractThrowingPublishers implements HttpServerAdapters {
 
-    SSLContext sslContext;
-    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String httpURI_fixed;
-    String httpURI_chunk;
-    String httpsURI_fixed;
-    String httpsURI_chunk;
-    String http2URI_fixed;
-    String http2URI_chunk;
-    String https2URI_fixed;
-    String https2URI_chunk;
-    String http3URI_fixed;
-    String http3URI_chunk;
-    String http3URI_head;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
+    static HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    static String httpURI_fixed;
+    static String httpURI_chunk;
+    static String httpsURI_fixed;
+    static String httpsURI_chunk;
+    static String http2URI_fixed;
+    static String http2URI_chunk;
+    static String https2URI_fixed;
+    static String https2URI_chunk;
+    static String http3URI_fixed;
+    static String http3URI_chunk;
+    static String http3URI_head;
 
     static final int ITERATION_COUNT = 1;
     // a shared executor helps reduce the amount of threads created by the test
@@ -117,8 +116,34 @@ public abstract class AbstractThrowingPublishers implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
-    private volatile HttpClient sharedClient;
+    final static class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+            }
+        }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
+        }
+    }
+
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static volatile HttpClient sharedClient;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -144,21 +169,10 @@ public abstract class AbstractThrowingPublishers implements HttpServerAdapters {
         }
     }
 
-    protected boolean stopAfterFirstFailure() {
+    protected static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    final AtomicReference<SkipException> skiptests = new AtomicReference<>();
-    void checkSkip() {
-        var skip = skiptests.get();
-        if (skip != null) throw skip;
-    }
-    static String name(ITestResult result) {
-        var params = result.getParameters();
-        return result.getName()
-                + (params == null ? "()" : Arrays.toString(result.getParameters()));
-    }
-
     static Version version(String uri) {
         if (uri.contains("/http1/") || uri.contains("/https1/"))
             return HTTP_1_1;
@@ -169,7 +183,7 @@ public abstract class AbstractThrowingPublishers implements HttpServerAdapters {
         return null;
     }
 
-    HttpRequest.Builder newRequestBuilder(String uri) {
+    static HttpRequest.Builder newRequestBuilder(String uri) {
         var builder = HttpRequest.newBuilder(URI.create(uri));
         if (version(uri) == HTTP_3) {
             builder.version(HTTP_3);
@@ -178,7 +192,7 @@ public abstract class AbstractThrowingPublishers implements HttpServerAdapters {
         return builder;
     }
 
-    HttpResponse<String> headRequest(HttpClient client)
+    static HttpResponse<String> headRequest(HttpClient client)
             throws IOException, InterruptedException
     {
         System.out.println("\n" + now() + "--- Sending HEAD request ----\n");
@@ -187,26 +201,16 @@ public abstract class AbstractThrowingPublishers implements HttpServerAdapters {
         var request = newRequestBuilder(http3URI_head)
                 .HEAD().version(HTTP_2).build();
         var response = client.send(request, BodyHandlers.ofString());
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.version(), HTTP_2);
+        assertEquals(200, response.statusCode());
+        assertEquals(HTTP_2, response.version());
         System.out.println("\n" + now() + "--- HEAD request succeeded ----\n");
         System.err.println("\n" + now() + "--- HEAD request succeeded ----\n");
         return response;
     }
 
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            if (skiptests.get() == null) {
-                SkipException skip = new SkipException("some tests failed");
-                skip.setStackTrace(new StackTraceElement[0]);
-                skiptests.compareAndSet(null, skip);
-            }
-        }
-    }
 
-    @AfterClass
-    static final void printFailedTests(ITestContext context) {
+    @AfterAll
+    static final void printFailedTests() {
         out.println("\n=========================");
         try {
             // Exceptions should already have been added to FAILURES
@@ -230,7 +234,7 @@ public abstract class AbstractThrowingPublishers implements HttpServerAdapters {
         }
     }
 
-    private String[] uris() {
+    private static String[] uris() {
         return new String[] {
                 http3URI_fixed,
                 http3URI_chunk,
@@ -245,8 +249,7 @@ public abstract class AbstractThrowingPublishers implements HttpServerAdapters {
         };
     }
 
-    @DataProvider(name = "sanity")
-    public Object[][] sanity() {
+    public static Object[][] sanity() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2][];
         //Object[][] result = new Object[uris.length][];
@@ -277,7 +280,7 @@ public abstract class AbstractThrowingPublishers implements HttpServerAdapters {
         }
     }
 
-    private Object[][] variants(List<Thrower> throwers, Set<Where> whereValues) {
+    private static Object[][] variants(List<Thrower> throwers, Set<Where> whereValues) {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2 * throwers.size()][];
         //Object[][] result = new Object[(uris.length/2) * 2 * 2][];
@@ -296,93 +299,65 @@ public abstract class AbstractThrowingPublishers implements HttpServerAdapters {
         return result;
     }
 
-    @DataProvider(name = "subscribeProvider")
-    public Object[][] subscribeProvider(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] subscribeProvider() {
         return  variants(List.of(
                 new UncheckedCustomExceptionThrower(),
                 new UncheckedIOExceptionThrower()),
                 EnumSet.of(Where.BEFORE_SUBSCRIBE, Where.AFTER_SUBSCRIBE));
     }
 
-    @DataProvider(name = "requestProvider")
-    public Object[][] requestProvider(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] requestProvider() {
         return  variants(List.of(
                 new UncheckedCustomExceptionThrower(),
                 new UncheckedIOExceptionThrower()),
                 EnumSet.of(Where.BEFORE_REQUEST, Where.AFTER_REQUEST));
     }
 
-    @DataProvider(name = "nextRequestProvider")
-    public Object[][] nextRequestProvider(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] nextRequestProvider() {
         return  variants(List.of(
                 new UncheckedCustomExceptionThrower(),
                 new UncheckedIOExceptionThrower()),
                 EnumSet.of(Where.BEFORE_NEXT_REQUEST, Where.AFTER_NEXT_REQUEST));
     }
 
-    @DataProvider(name = "beforeCancelProviderIO")
-    public Object[][] beforeCancelProviderIO(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] beforeCancelProviderIO() {
         return  variants(List.of(
                 new UncheckedIOExceptionThrower()),
                 EnumSet.of(Where.BEFORE_CANCEL));
     }
 
-    @DataProvider(name = "afterCancelProviderIO")
-    public Object[][] afterCancelProviderIO(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] afterCancelProviderIO() {
         return  variants(List.of(
                 new UncheckedIOExceptionThrower()),
                 EnumSet.of(Where.AFTER_CANCEL));
     }
 
-    @DataProvider(name = "beforeCancelProviderCustom")
-    public Object[][] beforeCancelProviderCustom(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] beforeCancelProviderCustom() {
         return  variants(List.of(
                 new UncheckedCustomExceptionThrower()),
                 EnumSet.of(Where.BEFORE_CANCEL));
     }
 
-    @DataProvider(name = "afterCancelProviderCustom")
-    public Object[][] afterCancelProvider(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] afterCancelProviderCustom() {
         return  variants(List.of(
                 new UncheckedCustomExceptionThrower()),
                 EnumSet.of(Where.AFTER_CANCEL));
     }
 
-    private HttpClient makeNewClient() {
+    private static HttpClient makeNewClient() {
         clientCount.incrementAndGet();
-        return TRACKER.track(newClientBuilderForH3()
+        return TRACKER.track(HttpServerAdapters.createClientBuilderForH3()
                 .proxy(HttpClient.Builder.NO_PROXY)
                 .executor(executor)
                 .sslContext(sslContext)
                 .build());
     }
 
-    HttpClient newHttpClient(boolean share) {
+    static HttpClient newHttpClient(boolean share) {
         if (!share) return makeNewClient();
         HttpClient shared = sharedClient;
         if (shared != null) return shared;
-        synchronized (this) {
+        synchronized (AbstractThrowingPublishers.class) {
             shared = sharedClient;
             if (shared == null) {
                 shared = sharedClient = makeNewClient();
@@ -430,7 +405,7 @@ public abstract class AbstractThrowingPublishers implements HttpServerAdapters {
             CompletableFuture<HttpResponse<String>> response = client.sendAsync(req, handler);
 
             String body = response.join().body();
-            assertEquals(body, Stream.of(BODY.split("\\|")).collect(Collectors.joining()));
+            assertEquals(Stream.of(BODY.split("\\|")).collect(Collectors.joining()), body);
             if (!sameClient) {
                 // Wait for the client to be garbage collected.
                 // we use the ReferenceTracker API rather than HttpClient::close here,
@@ -474,7 +449,6 @@ public abstract class AbstractThrowingPublishers implements HttpServerAdapters {
                                     boolean async, Set<Where> whereValues)
             throws Exception
     {
-        checkSkip();
         out.printf("%n%s%s%n", now(), name);
         try {
             testThrowing(uri, sameClient, publishers, finisher, thrower, async, whereValues);
@@ -778,15 +752,11 @@ public abstract class AbstractThrowingPublishers implements HttpServerAdapters {
     }
 
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         System.out.println(now() + "setup");
         System.err.println(now() + "setup");
 
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         // HTTP/1.1
         HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
         HttpTestHandler h1_chunkHandler = new HTTP_ChunkedHandler();
@@ -861,8 +831,8 @@ public abstract class AbstractThrowingPublishers implements HttpServerAdapters {
         System.err.println(now() + "setup done");
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         System.out.println(now() + "teardown");
         System.err.println(now() + "teardown");
 
diff --git a/test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java b/test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java
index a7aea89c379..ddd9c52fc58 100644
--- a/test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java
+++ b/test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java
@@ -35,18 +35,10 @@
  *        ReferenceTracker AbstractThrowingPushPromises
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  *        <concrete-class-name>
- * @run testng/othervm -Djdk.internal.httpclient.debug=true <concrete-class-name>
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true <concrete-class-name>
  */
 
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.ITestContext;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
 
 import javax.net.ssl.SSLContext;
 import java.io.BufferedReader;
@@ -100,21 +92,31 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public abstract class AbstractThrowingPushPromises implements HttpServerAdapters {
 
-    SSLContext sslContext;
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String http2URI_fixed;
-    String http2URI_chunk;
-    String https2URI_fixed;
-    String https2URI_chunk;
-    String http3URI_fixed;
-    String http3URI_chunk;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
+    static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    static String http2URI_fixed;
+    static String http2URI_chunk;
+    static String https2URI_fixed;
+    static String https2URI_chunk;
+    static String http3URI_fixed;
+    static String http3URI_chunk;
 
     static final int ITERATION_COUNT = 1;
     // a shared executor helps reduce the amount of threads created by the test
@@ -132,8 +134,34 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
-    private volatile HttpClient sharedClient;
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+            }
+        }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
+        }
+    }
+
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static volatile HttpClient sharedClient;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -159,34 +187,13 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
         }
     }
 
-    protected boolean stopAfterFirstFailure() {
+    protected static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    final AtomicReference<SkipException> skiptests = new AtomicReference<>();
-    void checkSkip() {
-        var skip = skiptests.get();
-        if (skip != null) throw skip;
-    }
-    static String name(ITestResult result) {
-        var params = result.getParameters();
-        return result.getName()
-                + (params == null ? "()" : Arrays.toString(result.getParameters()));
-    }
 
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            if (skiptests.get() == null) {
-                SkipException skip = new SkipException("some tests failed");
-                skip.setStackTrace(new StackTraceElement[0]);
-                skiptests.compareAndSet(null, skip);
-            }
-        }
-    }
-
-    @AfterClass
-    static final void printFailedTests(ITestContext context) {
+    @AfterAll
+    static final void printFailedTests() {
         out.println("\n=========================");
         try {
             // Exceptions should already have been added to FAILURES
@@ -211,7 +218,7 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
         }
     }
 
-    private String[] uris() {
+    private static String[] uris() {
         return new String[] {
                 http3URI_fixed,
                 http3URI_chunk,
@@ -222,8 +229,7 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
         };
     }
 
-    @DataProvider(name = "sanity")
-    public Object[][] sanity() {
+    public static Object[][] sanity() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2][];
 
@@ -252,7 +258,7 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
         }
     }
 
-    private Object[][] variants(List<Thrower> throwers) {
+    private static Object[][] variants(List<Thrower> throwers) {
         String[] uris = uris();
         // reduce traces by always using the same client if
         // stopAfterFirstFailure is requested.
@@ -272,27 +278,19 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
         return result;
     }
 
-    @DataProvider(name = "ioVariants")
-    public Object[][] ioVariants(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] ioVariants() {
         return variants(List.of(
                 new UncheckedIOExceptionThrower()));
     }
 
-    @DataProvider(name = "customVariants")
-    public Object[][] customVariants(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] customVariants() {
         return variants(List.of(
                 new UncheckedCustomExceptionThrower()));
     }
 
-    private HttpClient makeNewClient() {
+    private static HttpClient makeNewClient() {
         clientCount.incrementAndGet();
-        return TRACKER.track(newClientBuilderForH3()
+        return TRACKER.track(HttpServerAdapters.createClientBuilderForH3()
                 .version(HTTP_3)
                 .proxy(HttpClient.Builder.NO_PROXY)
                 .executor(executor)
@@ -300,11 +298,11 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
                 .build());
     }
 
-    HttpClient newHttpClient(boolean share) {
+    static HttpClient newHttpClient(boolean share) {
         if (!share) return makeNewClient();
         HttpClient shared = sharedClient;
         if (shared != null) return shared;
-        synchronized (this) {
+        synchronized (AbstractThrowingPushPromises.class) {
             shared = sharedClient;
             if (shared == null) {
                 shared = sharedClient = makeNewClient();
@@ -313,15 +311,15 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
         }
     }
 
-    Http3DiscoveryMode config(String uri) {
+    static Http3DiscoveryMode config(String uri) {
         return uri.contains("/http3/") ? HTTP_3_URI_ONLY : null;
     }
 
-    Version version(String uri) {
+    static Version version(String uri) {
         return uri.contains("/http3/") ? HTTP_3 : HTTP_2;
     }
 
-    HttpRequest request(String uri) {
+    static HttpRequest request(String uri) {
         var builder = HttpRequest.newBuilder(URI.create(uri))
                 .version(version(uri));
         var config = config(uri);
@@ -358,15 +356,15 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
             HttpResponse<Stream<String>> response =
                     client.sendAsync(req, BodyHandlers.ofLines(), pushHandler).get();
             String body = response.body().collect(Collectors.joining("|"));
-            assertEquals(URI.create(body).getPath(), URI.create(uri).getPath());
+            assertEquals(URI.create(uri).getPath(), URI.create(body).getPath());
             for (HttpRequest promised : pushPromises.keySet()) {
                 out.printf("%s Received promise: %s%n\tresponse: %s%n",
                         now(), promised, pushPromises.get(promised).get());
                 String promisedBody = pushPromises.get(promised).get().body()
                         .collect(Collectors.joining("|"));
-                assertEquals(promisedBody, promised.uri().toASCIIString());
+                assertEquals(promised.uri().toASCIIString(), promisedBody);
             }
-            assertEquals(pushPromises.size(), 3);
+            assertEquals(3, pushPromises.size());
             if (!sameClient) {
                 // Wait for the client to be garbage collected.
                 // we use the ReferenceTracker API rather than HttpClient::close here,
@@ -429,7 +427,6 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
                                     Finisher finisher, Thrower thrower)
             throws Exception
     {
-        checkSkip();
         out.printf("%n%s%s%n", now(), name);
         try {
             testThrowing(uri, sameClient, handlers, finisher, thrower);
@@ -603,9 +600,9 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
             default:
                 expectedCount = 3;
         }
-        assertEquals(promises.size(), expectedCount,
+        assertEquals(expectedCount, promises.size(),
                 "bad promise count for " + reqURI + " with " + w);
-        assertEquals(result, List.of(reqURI.toASCIIString()));
+        assertEquals(List.of(reqURI.toASCIIString()), result);
         return result;
     }
 
@@ -758,12 +755,8 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
     }
 
 
-    @BeforeTest
-    public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
+    @BeforeAll
+    public static void setup() throws Exception {
         // HTTP/2
         HttpTestHandler fixedLengthHandler = new HTTP_FixedLengthHandler();
         HttpTestHandler chunkedHandler = new HTTP_ChunkedHandler();
@@ -792,8 +785,8 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         String sharedClientName =
                 sharedClient == null ? null : sharedClient.toString();
         sharedClient = null;
diff --git a/test/jdk/java/net/httpclient/AbstractThrowingSubscribers.java b/test/jdk/java/net/httpclient/AbstractThrowingSubscribers.java
index 0dc808b8bb2..33063775243 100644
--- a/test/jdk/java/net/httpclient/AbstractThrowingSubscribers.java
+++ b/test/jdk/java/net/httpclient/AbstractThrowingSubscribers.java
@@ -23,14 +23,6 @@
 
 import jdk.httpclient.test.lib.http3.Http3TestServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.ITestContext;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
 
 import javax.net.ssl.SSLContext;
 import java.io.BufferedReader;
@@ -49,7 +41,6 @@ import java.net.http.HttpResponse.BodyHandlers;
 import java.net.http.HttpResponse.BodySubscriber;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -76,28 +67,37 @@ import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
 
 public abstract class AbstractThrowingSubscribers implements HttpServerAdapters {
 
-    SSLContext sslContext;
-    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String httpURI_fixed;
-    String httpURI_chunk;
-    String httpsURI_fixed;
-    String httpsURI_chunk;
-    String http2URI_fixed;
-    String http2URI_chunk;
-    String https2URI_fixed;
-    String https2URI_chunk;
-    String http3URI_fixed;
-    String http3URI_chunk;
-    String http3URI_head;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
+    static HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    static String httpURI_fixed;
+    static String httpURI_chunk;
+    static String httpsURI_fixed;
+    static String httpsURI_chunk;
+    static String http2URI_fixed;
+    static String http2URI_chunk;
+    static String https2URI_fixed;
+    static String https2URI_chunk;
+    static String http3URI_fixed;
+    static String http3URI_chunk;
+    static String http3URI_head;
 
     static final int ITERATION_COUNT = 1;
     static final int REPEAT_RESPONSE = 3;
@@ -116,8 +116,34 @@ public abstract class AbstractThrowingSubscribers implements HttpServerAdapters
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
-    private volatile HttpClient sharedClient;
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+            }
+        }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
+        }
+    }
+
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static volatile HttpClient sharedClient;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -143,21 +169,10 @@ public abstract class AbstractThrowingSubscribers implements HttpServerAdapters
         }
     }
 
-    protected boolean stopAfterFirstFailure() {
+    protected static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    final AtomicReference<SkipException> skiptests = new AtomicReference<>();
-    void checkSkip() {
-        var skip = skiptests.get();
-        if (skip != null) throw skip;
-    }
-    static String name(ITestResult result) {
-        var params = result.getParameters();
-        return result.getName()
-                + (params == null ? "()" : Arrays.toString(result.getParameters()));
-    }
-
     static Version version(String uri) {
         if (uri.contains("/http1/") || uri.contains("/https1/"))
             return HTTP_1_1;
@@ -168,7 +183,7 @@ public abstract class AbstractThrowingSubscribers implements HttpServerAdapters
         return null;
     }
 
-    HttpRequest.Builder newRequestBuilder(String uri) {
+    static HttpRequest.Builder newRequestBuilder(String uri) {
         var builder = HttpRequest.newBuilder(URI.create(uri));
         if (version(uri) == HTTP_3) {
             builder.version(HTTP_3);
@@ -177,7 +192,7 @@ public abstract class AbstractThrowingSubscribers implements HttpServerAdapters
         return builder;
     }
 
-    HttpResponse<String> headRequest(HttpClient client)
+    static HttpResponse<String> headRequest(HttpClient client)
             throws IOException, InterruptedException
     {
         System.out.println("\n" + now() + "--- Sending HEAD request ----\n");
@@ -186,26 +201,15 @@ public abstract class AbstractThrowingSubscribers implements HttpServerAdapters
         var request = newRequestBuilder(http3URI_head)
                 .HEAD().version(HTTP_2).build();
         var response = client.send(request, BodyHandlers.ofString());
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.version(), HTTP_2);
+        assertEquals(200, response.statusCode());
+        assertEquals(HTTP_2, response.version());
         System.out.println("\n" + now() + "--- HEAD request succeeded ----\n");
         System.err.println("\n" + now() + "--- HEAD request succeeded ----\n");
         return response;
     }
 
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            if (skiptests.get() == null) {
-                SkipException skip = new SkipException("some tests failed");
-                skip.setStackTrace(new StackTraceElement[0]);
-                skiptests.compareAndSet(null, skip);
-            }
-        }
-    }
-
-    @AfterClass
-    static final void printFailedTests(ITestContext context) {
+    @AfterAll
+    static final void printFailedTests() {
         out.println("\n=========================");
         try {
             // Exceptions should already have been added to FAILURES
@@ -230,7 +234,7 @@ public abstract class AbstractThrowingSubscribers implements HttpServerAdapters
         }
     }
 
-    private String[] uris() {
+    private static String[] uris() {
         return new String[] {
                 http3URI_fixed,
                 http3URI_chunk,
@@ -245,10 +249,9 @@ public abstract class AbstractThrowingSubscribers implements HttpServerAdapters
         };
     }
 
-    static AtomicLong URICOUNT = new AtomicLong();
+    static final AtomicLong URICOUNT = new AtomicLong();
 
-    @DataProvider(name = "sanity")
-    public Object[][] sanity() {
+    public static Object[][] sanity() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2][];
         int i = 0;
@@ -261,11 +264,7 @@ public abstract class AbstractThrowingSubscribers implements HttpServerAdapters
         return result;
     }
 
-    @DataProvider(name = "variants")
-    public Object[][] variants(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] variants() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2 * 2][];
         int i = 0;
@@ -282,9 +281,9 @@ public abstract class AbstractThrowingSubscribers implements HttpServerAdapters
         return result;
     }
 
-    private HttpClient makeNewClient() {
+    private static HttpClient makeNewClient() {
         clientCount.incrementAndGet();
-        HttpClient client =  newClientBuilderForH3()
+        HttpClient client =  HttpServerAdapters.createClientBuilderForH3()
                 .proxy(HttpClient.Builder.NO_PROXY)
                 .executor(executor)
                 .sslContext(sslContext)
@@ -292,11 +291,11 @@ public abstract class AbstractThrowingSubscribers implements HttpServerAdapters
         return TRACKER.track(client);
     }
 
-    HttpClient newHttpClient(boolean share) {
+    static HttpClient newHttpClient(boolean share) {
         if (!share) return makeNewClient();
         HttpClient shared = sharedClient;
         if (shared != null) return shared;
-        synchronized (this) {
+        synchronized (AbstractThrowingSubscribers.class) {
             shared = sharedClient;
             if (shared == null) {
                 shared = sharedClient = makeNewClient();
@@ -357,7 +356,7 @@ public abstract class AbstractThrowingSubscribers implements HttpServerAdapters
             HttpResponse<String> response = client.send(req, handler);
             String body = response.body();
             Stream.of(body.split("\n")).forEach(u ->
-                assertEquals(URI.create(u).getPath(), URI.create(uri2).getPath()));
+                assertEquals(URI.create(uri2).getPath(), URI.create(u).getPath()));
             if (!sameClient) {
                 // Wait for the client to be garbage collected.
                 // we use the ReferenceTracker API rather than HttpClient::close here,
@@ -469,7 +468,6 @@ public abstract class AbstractThrowingSubscribers implements HttpServerAdapters
                                     boolean async, EnumSet<Where> excludes)
             throws Exception
     {
-        checkSkip();
         out.printf("%n%s%s%n", now(), name);
         try {
             testThrowing(uri, sameClient, handlers, finisher, thrower, async, excludes);
@@ -551,7 +549,6 @@ public abstract class AbstractThrowingSubscribers implements HttpServerAdapters
                 if (error != null) throw error;
                 System.out.println(now() + "operation finished normally: " + tracker.getName());
                 System.err.println(now() + "operation finished normally: " + tracker.getName());
-
             }
         }
     }
@@ -819,15 +816,11 @@ public abstract class AbstractThrowingSubscribers implements HttpServerAdapters
     }
 
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         System.out.println(now() + "setup");
         System.err.println(now() + "setup");
 
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         System.out.println(now() + "HTTP/1.1 server created");
 
         // HTTP/1.1
@@ -902,8 +895,8 @@ public abstract class AbstractThrowingSubscribers implements HttpServerAdapters
         System.err.println(now() + "setup done");
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         System.out.println(now() + "teardown");
         System.err.println(now() + "teardown");
 
diff --git a/test/jdk/java/net/httpclient/AggregateRequestBodyTest.java b/test/jdk/java/net/httpclient/AggregateRequestBodyTest.java
index 8ec3b256e62..608b6489181 100644
--- a/test/jdk/java/net/httpclient/AggregateRequestBodyTest.java
+++ b/test/jdk/java/net/httpclient/AggregateRequestBodyTest.java
@@ -93,7 +93,7 @@ import static org.testng.Assert.expectThrows;
 
 public class AggregateRequestBodyTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer http1TestServer;   // HTTP/1.1 ( http )
     HttpTestServer https1TestServer;  // HTTPS/1.1 ( https  )
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -855,10 +855,6 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         HttpTestHandler handler = new HttpTestEchoHandler();
         http1TestServer = HttpTestServer.create(HTTP_1_1);
         http1TestServer.addHandler(handler, "/http1/echo/");
diff --git a/test/jdk/java/net/httpclient/AltServiceUsageTest.java b/test/jdk/java/net/httpclient/AltServiceUsageTest.java
index 673357a59aa..41f3aef9bd1 100644
--- a/test/jdk/java/net/httpclient/AltServiceUsageTest.java
+++ b/test/jdk/java/net/httpclient/AltServiceUsageTest.java
@@ -59,7 +59,7 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
  */
 public class AltServiceUsageTest implements HttpServerAdapters {
 
-    private SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private HttpTestServer originServer;
     private HttpTestServer altServer;
 
@@ -67,11 +67,6 @@ public class AltServiceUsageTest implements HttpServerAdapters {
 
     @BeforeClass
     public void beforeClass() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
-
         // attempt to create an HTTP/3 server, an HTTP/2 server, and a
         // DatagramChannel bound to the same port as the HTTP/2 server
         int count = 0;
diff --git a/test/jdk/java/net/httpclient/AsFileDownloadTest.java b/test/jdk/java/net/httpclient/AsFileDownloadTest.java
index 42567602dff..88bf95dab02 100644
--- a/test/jdk/java/net/httpclient/AsFileDownloadTest.java
+++ b/test/jdk/java/net/httpclient/AsFileDownloadTest.java
@@ -90,7 +90,7 @@ import static org.testng.Assert.fail;
  */
 public class AsFileDownloadTest {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
     HttpsServer httpsTestServer;       // HTTPS/1.1
     Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -351,10 +351,6 @@ public class AsFileDownloadTest {
         //ch.setLevel(Level.ALL);
         //logger.addHandler(ch);
 
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         httpTestServer = HttpServer.create(sa, 0);
         httpTestServer.createContext("/http1/afdt", new Http1FileDispoHandler());
diff --git a/test/jdk/java/net/httpclient/AsyncExecutorShutdown.java b/test/jdk/java/net/httpclient/AsyncExecutorShutdown.java
index 5338d64892b..14ed4f63124 100644
--- a/test/jdk/java/net/httpclient/AsyncExecutorShutdown.java
+++ b/test/jdk/java/net/httpclient/AsyncExecutorShutdown.java
@@ -93,7 +93,7 @@ public class AsyncExecutorShutdown implements HttpServerAdapters {
     static final Random RANDOM = RandomFactory.getRandom();
 
     ExecutorService readerService;
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;        // HTTP/1.1    [ 6 servers ]
     HttpTestServer httpsTestServer;       // HTTPS/1.1
     HttpTestServer http2TestServer;       // HTTP/2 ( h2c   )
@@ -412,9 +412,6 @@ public class AsyncExecutorShutdown implements HttpServerAdapters {
     @BeforeTest
     public void setup() throws Exception {
         out.println("\n**** Setup ****\n");
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
         readerService = Executors.newCachedThreadPool();
 
         httpTestServer = HttpTestServer.create(HTTP_1_1);
diff --git a/test/jdk/java/net/httpclient/AsyncShutdownNow.java b/test/jdk/java/net/httpclient/AsyncShutdownNow.java
index 2617b60ee1c..56b0378cf66 100644
--- a/test/jdk/java/net/httpclient/AsyncShutdownNow.java
+++ b/test/jdk/java/net/httpclient/AsyncShutdownNow.java
@@ -97,7 +97,7 @@ public class AsyncShutdownNow implements HttpServerAdapters {
     static final Random RANDOM = RandomFactory.getRandom();
 
     ExecutorService readerService;
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
     HttpTestServer httpsTestServer;       // HTTPS/1.1
     HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
@@ -406,9 +406,6 @@ public class AsyncShutdownNow implements HttpServerAdapters {
     @BeforeTest
     public void setup() throws Exception {
         out.println("\n**** Setup ****\n");
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
         readerService = Executors.newCachedThreadPool();
 
         httpTestServer = HttpTestServer.create(HTTP_1_1);
diff --git a/test/jdk/java/net/httpclient/AuthFilterCacheTest.java b/test/jdk/java/net/httpclient/AuthFilterCacheTest.java
index 32026db57fb..6d64caa1950 100644
--- a/test/jdk/java/net/httpclient/AuthFilterCacheTest.java
+++ b/test/jdk/java/net/httpclient/AuthFilterCacheTest.java
@@ -75,15 +75,10 @@ public class AuthFilterCacheTest implements HttpServerAdapters {
     static final int REQUEST_COUNT = 5;
     static final int URI_COUNT = 8;
     static final CyclicBarrier barrier = new CyclicBarrier(REQUEST_COUNT * URI_COUNT);
-    static final SSLContext context;
+    private static final SSLContext context = jdk.test.lib.net.SimpleSSLContext.findSSLContext();
 
     static {
-        try {
-            context = new jdk.test.lib.net.SimpleSSLContext().get();
-            SSLContext.setDefault(context);
-        } catch (Exception x) {
-            throw new ExceptionInInitializerError(x);
-        }
+        SSLContext.setDefault(context);
     }
 
     HttpTestServer http1Server;
diff --git a/test/jdk/java/net/httpclient/BasicAuthTest.java b/test/jdk/java/net/httpclient/BasicAuthTest.java
index 35d5a7803d6..fc1f1d4e5aa 100644
--- a/test/jdk/java/net/httpclient/BasicAuthTest.java
+++ b/test/jdk/java/net/httpclient/BasicAuthTest.java
@@ -71,7 +71,7 @@ public class BasicAuthTest implements HttpServerAdapters {
         ExecutorService e = Executors.newCachedThreadPool();
         Handler h = new Handler();
         SSLContext sslContext = secure || version == Version.HTTP_3
-                ? new SimpleSSLContext().get() : null;
+                ? SimpleSSLContext.findSSLContext() : null;
         HttpTestServer server = HttpTestServer.create(version, sslContext, e);
         HttpTestContext serverContext = server.addHandler(h,"/test/");
         ServerAuth sa = new ServerAuth("foo realm");
diff --git a/test/jdk/java/net/httpclient/BasicHTTP2Test.java b/test/jdk/java/net/httpclient/BasicHTTP2Test.java
index 8233da37c42..586673d62ab 100644
--- a/test/jdk/java/net/httpclient/BasicHTTP2Test.java
+++ b/test/jdk/java/net/httpclient/BasicHTTP2Test.java
@@ -71,7 +71,7 @@ import static org.testng.Assert.assertTrue;
 
 public class BasicHTTP2Test implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
     String https2URI;
     DatagramSocket udp;
@@ -239,10 +239,6 @@ public class BasicHTTP2Test implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         // HTTP/2
         HttpTestHandler handler = new Handler();
         HttpTestHandler h3Handler = new Handler();
diff --git a/test/jdk/java/net/httpclient/BasicHTTP3Test.java b/test/jdk/java/net/httpclient/BasicHTTP3Test.java
index 32dd1dea832..4508b32e544 100644
--- a/test/jdk/java/net/httpclient/BasicHTTP3Test.java
+++ b/test/jdk/java/net/httpclient/BasicHTTP3Test.java
@@ -78,7 +78,7 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
  */
 public class BasicHTTP3Test implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
     String https2URI;
     HttpTestServer h3TestServer;  // HTTP/2 ( h2 + h3)
@@ -343,10 +343,6 @@ public class BasicHTTP3Test implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         https2TestServer = HttpTestServer.create(HTTP_2, sslContext);
         https2TestServer.addHandler(new Handler(), "/https2/test/");
         https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/test/x";
diff --git a/test/jdk/java/net/httpclient/BasicRedirectTest.java b/test/jdk/java/net/httpclient/BasicRedirectTest.java
index a19b1444ac6..d79c39fe47a 100644
--- a/test/jdk/java/net/httpclient/BasicRedirectTest.java
+++ b/test/jdk/java/net/httpclient/BasicRedirectTest.java
@@ -68,7 +68,7 @@ import static org.testng.Assert.assertTrue;
 
 public class BasicRedirectTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
     HttpTestServer httpsTestServer;       // HTTPS/1.1
     HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
@@ -270,10 +270,6 @@ public class BasicRedirectTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new BasicHttpRedirectHandler(), "/http1/same/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/same/redirect";
diff --git a/test/jdk/java/net/httpclient/BufferSize1Test.java b/test/jdk/java/net/httpclient/BufferSize1Test.java
index 842dc06a630..e4f2b998cc7 100644
--- a/test/jdk/java/net/httpclient/BufferSize1Test.java
+++ b/test/jdk/java/net/httpclient/BufferSize1Test.java
@@ -79,7 +79,7 @@ class BufferSize1Test implements HttpServerAdapters {
     void test(Version version, boolean secure) throws Exception {
 
         // Create the server
-        var sslContext = secure || HTTP_3.equals(version) ? new SimpleSSLContext().get() : null;
+        var sslContext = secure || HTTP_3.equals(version) ? SimpleSSLContext.findSSLContext() : null;
         try (var server = switch (version) {
             case HTTP_1_1, HTTP_2 -> HttpTestServer.create(version, sslContext);
             case HTTP_3 -> HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
diff --git a/test/jdk/java/net/httpclient/CancelRequestTest.java b/test/jdk/java/net/httpclient/CancelRequestTest.java
index 23e4a042179..86e06bb78f7 100644
--- a/test/jdk/java/net/httpclient/CancelRequestTest.java
+++ b/test/jdk/java/net/httpclient/CancelRequestTest.java
@@ -93,7 +93,7 @@ public class CancelRequestTest implements HttpServerAdapters {
 
     private static final Random random = RandomFactory.getRandom();
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
     HttpTestServer httpsTestServer;   // HTTPS/1.1
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -642,10 +642,6 @@ public class CancelRequestTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         // HTTP/1.1
         HttpTestHandler h1_chunkHandler = new HTTPSlowHandler();
         httpTestServer = HttpTestServer.create(HTTP_1_1);
diff --git a/test/jdk/java/net/httpclient/CancelStreamedBodyTest.java b/test/jdk/java/net/httpclient/CancelStreamedBodyTest.java
index e304168ba33..0035a3f4302 100644
--- a/test/jdk/java/net/httpclient/CancelStreamedBodyTest.java
+++ b/test/jdk/java/net/httpclient/CancelStreamedBodyTest.java
@@ -78,7 +78,7 @@ import static org.testng.Assert.assertTrue;
 
 public class CancelStreamedBodyTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
     HttpTestServer httpsTestServer;   // HTTPS/1.1
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -352,10 +352,6 @@ public class CancelStreamedBodyTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         // HTTP/1.1
         HttpTestHandler h1_chunkHandler = new HTTPSlowHandler();
         httpTestServer = HttpTestServer.create(HTTP_1_1);
diff --git a/test/jdk/java/net/httpclient/CancelledPartialResponseTest.java b/test/jdk/java/net/httpclient/CancelledPartialResponseTest.java
index 41493bbdaff..bb190cfc348 100644
--- a/test/jdk/java/net/httpclient/CancelledPartialResponseTest.java
+++ b/test/jdk/java/net/httpclient/CancelledPartialResponseTest.java
@@ -85,7 +85,7 @@ public class CancelledPartialResponseTest {
     URI warmup, h2PartialResponseResetNoError, h2PartialResponseResetError, h2FullResponseResetNoError, h2FullResponseResetError;
     URI h3PartialResponseStopSending, h3FullResponseStopSending;
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
     static PrintStream err = new PrintStream(System.err);
     static PrintStream out = System.out;
@@ -163,10 +163,6 @@ public class CancelledPartialResponseTest {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         http2TestServer = new Http2TestServer(false, 0);
         http3TestServer = HttpTestServer.create(Http3DiscoveryMode.HTTP_3_URI_ONLY, sslContext);
 
diff --git a/test/jdk/java/net/httpclient/CancelledResponse.java b/test/jdk/java/net/httpclient/CancelledResponse.java
index 1f28ce87221..5449a68418a 100644
--- a/test/jdk/java/net/httpclient/CancelledResponse.java
+++ b/test/jdk/java/net/httpclient/CancelledResponse.java
@@ -93,11 +93,10 @@ public class CancelledResponse {
 
     static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
     final ServerSocketFactory factory;
-    final SSLContext context;
+    private static final SSLContext context = SimpleSSLContext.findSSLContext();
     final boolean useSSL;
     CancelledResponse(boolean useSSL) throws IOException {
         this.useSSL = useSSL;
-        context = new SimpleSSLContext().get();
         SSLContext.setDefault(context);
         factory = useSSL ? SSLServerSocketFactory.getDefault()
                          : ServerSocketFactory.getDefault();
diff --git a/test/jdk/java/net/httpclient/CancelledResponse2.java b/test/jdk/java/net/httpclient/CancelledResponse2.java
index dfcdb03f06e..48223e84135 100644
--- a/test/jdk/java/net/httpclient/CancelledResponse2.java
+++ b/test/jdk/java/net/httpclient/CancelledResponse2.java
@@ -81,7 +81,7 @@ public class CancelledResponse2 implements HttpServerAdapters {
     URI h3TestServerURI;
     HttpTestServer h2h3TestServer;
     HttpTestServer h3TestServer;
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
     @DataProvider(name = "versions")
     public Object[][] positive() {
@@ -152,8 +152,6 @@ public class CancelledResponse2 implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws IOException {
-        sslContext = new SimpleSSLContext().get();
-
         h2TestServer = HttpTestServer.create(HTTP_2, sslContext);
         h2TestServer.addHandler(new CancelledResponseHandler(), "/h2");
         h2TestServerURI = URI.create("https://" + h2TestServer.serverAuthority() + "/h2");
diff --git a/test/jdk/java/net/httpclient/ConcurrentResponses.java b/test/jdk/java/net/httpclient/ConcurrentResponses.java
index 1cabe461e80..c44452bf4d2 100644
--- a/test/jdk/java/net/httpclient/ConcurrentResponses.java
+++ b/test/jdk/java/net/httpclient/ConcurrentResponses.java
@@ -89,7 +89,7 @@ import static org.testng.Assert.fail;
 
 public class ConcurrentResponses {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
     HttpsServer httpsTestServer;       // HTTPS/1.1
     Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -303,10 +303,6 @@ public class ConcurrentResponses {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         httpTestServer = HttpServer.create(sa, 0);
         httpTestServer.createContext("/http1/fixed", new Http1FixedHandler());
diff --git a/test/jdk/java/net/httpclient/ContentLengthHeaderTest.java b/test/jdk/java/net/httpclient/ContentLengthHeaderTest.java
index d7c77d0690a..75c7c984a6b 100644
--- a/test/jdk/java/net/httpclient/ContentLengthHeaderTest.java
+++ b/test/jdk/java/net/httpclient/ContentLengthHeaderTest.java
@@ -77,7 +77,7 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
     static HttpTestServer testContentLengthServerH2;
     static HttpTestServer testContentLengthServerH3;
     static PrintStream testLog = System.err;
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
     HttpClient hc;
     URI testContentLengthURIH1;
@@ -86,7 +86,6 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws IOException, URISyntaxException, InterruptedException {
-        sslContext = new SimpleSSLContext().get();
         testContentLengthServerH1 = HttpTestServer.create(HTTP_1_1);
         testContentLengthServerH2 = HttpTestServer.create(HTTP_2, sslContext);
         testContentLengthServerH3 = HttpTestServer.create(HTTP_3, sslContext);
diff --git a/test/jdk/java/net/httpclient/CookieHeaderTest.java b/test/jdk/java/net/httpclient/CookieHeaderTest.java
index 455b1048b06..cd47262825c 100644
--- a/test/jdk/java/net/httpclient/CookieHeaderTest.java
+++ b/test/jdk/java/net/httpclient/CookieHeaderTest.java
@@ -83,7 +83,7 @@ import static org.testng.Assert.assertTrue;
 
 public class CookieHeaderTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;        // HTTP/1.1    [ 6 servers ]
     HttpTestServer httpsTestServer;       // HTTPS/1.1
     HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
@@ -194,10 +194,6 @@ public class CookieHeaderTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new CookieValidationHandler(), "/http1/cookie/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/cookie/retry";
diff --git a/test/jdk/java/net/httpclient/CustomRequestPublisher.java b/test/jdk/java/net/httpclient/CustomRequestPublisher.java
index c8d33030a06..f26def9a44c 100644
--- a/test/jdk/java/net/httpclient/CustomRequestPublisher.java
+++ b/test/jdk/java/net/httpclient/CustomRequestPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,7 +69,7 @@ import static org.testng.Assert.fail;
 
 public class CustomRequestPublisher implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;    // HTTP/1.1        [ 4 servers ]
     HttpTestServer httpsTestServer;   // HTTPS/1.1
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -339,10 +339,6 @@ public class CustomRequestPublisher implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new HttpTestEchoHandler(), "/http1/echo");
diff --git a/test/jdk/java/net/httpclient/CustomResponseSubscriber.java b/test/jdk/java/net/httpclient/CustomResponseSubscriber.java
index e8b5073d9a2..c581491a214 100644
--- a/test/jdk/java/net/httpclient/CustomResponseSubscriber.java
+++ b/test/jdk/java/net/httpclient/CustomResponseSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,7 @@ import static org.testng.Assert.assertTrue;
 
 public class CustomResponseSubscriber {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
     HttpsServer httpsTestServer;       // HTTPS/1.1
     Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -187,10 +187,6 @@ public class CustomResponseSubscriber {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         // HTTP/1.1
         HttpHandler h1_fixedLengthHandler = new HTTP1_FixedLengthHandler();
         HttpHandler h1_chunkHandler = new HTTP1_ChunkedHandler();
diff --git a/test/jdk/java/net/httpclient/DependentActionsTest.java b/test/jdk/java/net/httpclient/DependentActionsTest.java
index 7d903157de8..9a77d377497 100644
--- a/test/jdk/java/net/httpclient/DependentActionsTest.java
+++ b/test/jdk/java/net/httpclient/DependentActionsTest.java
@@ -94,7 +94,7 @@ import static org.testng.Assert.assertTrue;
 
 public class DependentActionsTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
     HttpTestServer httpsTestServer;   // HTTPS/1.1
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -643,10 +643,6 @@ public class DependentActionsTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         // HTTP/1.1
         HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
         HttpTestHandler h1_chunkHandler = new HTTP_ChunkedHandler();
diff --git a/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java b/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java
index 12903294315..f1b07f7abce 100644
--- a/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java
+++ b/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java
@@ -98,7 +98,7 @@ import static org.testng.Assert.assertTrue;
 
 public class DependentPromiseActionsTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
     HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
     HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
@@ -701,10 +701,6 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         // HTTP/2
         HttpTestHandler fixedLengthHandler = new HTTP_FixedLengthHandler();
         HttpTestHandler chunkedHandler = new HTTP_ChunkedHandler();
diff --git a/test/jdk/java/net/httpclient/DigestEchoClient.java b/test/jdk/java/net/httpclient/DigestEchoClient.java
index 10add19cb94..6df4ccac9fb 100644
--- a/test/jdk/java/net/httpclient/DigestEchoClient.java
+++ b/test/jdk/java/net/httpclient/DigestEchoClient.java
@@ -165,14 +165,9 @@ public class DigestEchoClient {
 
     static final AtomicInteger NC = new AtomicInteger();
     static final Random random = new Random();
-    static final SSLContext context;
+    private static final SSLContext context = SimpleSSLContext.findSSLContext();
     static {
-        try {
-            context = new SimpleSSLContext().get();
-            SSLContext.setDefault(context);
-        } catch (Exception x) {
-            throw new ExceptionInInitializerError(x);
-        }
+        SSLContext.setDefault(context);
     }
     static final List<Boolean> BOOLEANS = List.of(true, false);
 
diff --git a/test/jdk/java/net/httpclient/DurationOverflowTest.java b/test/jdk/java/net/httpclient/DurationOverflowTest.java
index bc836a7c5dd..1beb31f74e5 100644
--- a/test/jdk/java/net/httpclient/DurationOverflowTest.java
+++ b/test/jdk/java/net/httpclient/DurationOverflowTest.java
@@ -102,15 +102,7 @@ public class DurationOverflowTest {
 
     private static final Logger LOGGER = Utils.getDebugLogger(CLASS_NAME::toString, Utils.DEBUG);
 
-    private static final SSLContext SSL_CONTEXT = createSslContext();
-
-    private static SSLContext createSslContext() {
-        try {
-            return new SimpleSSLContext().get();
-        } catch (IOException exception) {
-            throw new UncheckedIOException(exception);
-        }
-    }
+    private static final SSLContext SSL_CONTEXT = SimpleSSLContext.findSSLContext();
 
     private static final List<Infra> INFRAS = loadInfras();
 
diff --git a/test/jdk/java/net/httpclient/EmptyAuthenticate.java b/test/jdk/java/net/httpclient/EmptyAuthenticate.java
index e445a974ad0..81bbbf3ca5b 100644
--- a/test/jdk/java/net/httpclient/EmptyAuthenticate.java
+++ b/test/jdk/java/net/httpclient/EmptyAuthenticate.java
@@ -56,18 +56,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class EmptyAuthenticate {
 
-    private static final SSLContext SSL_CONTEXT = createSslContext();
+    private static final SSLContext SSL_CONTEXT = SimpleSSLContext.findSSLContext();
 
     private static final String WWW_AUTH_HEADER_NAME = "WWW-Authenticate";
 
-    private static SSLContext createSslContext() {
-        try {
-            return new SimpleSSLContext().get();
-        } catch (IOException exception) {
-            throw new RuntimeException(exception);
-        }
-    }
-
     @ParameterizedTest
     @MethodSource("args")
     void test(Version version, boolean secure) throws Exception {
diff --git a/test/jdk/java/net/httpclient/EncodedCharsInURI.java b/test/jdk/java/net/httpclient/EncodedCharsInURI.java
index 91bace42699..eab9a29b172 100644
--- a/test/jdk/java/net/httpclient/EncodedCharsInURI.java
+++ b/test/jdk/java/net/httpclient/EncodedCharsInURI.java
@@ -88,7 +88,7 @@ import static org.testng.Assert.assertTrue;
 
 public class EncodedCharsInURI implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
     HttpTestServer httpsTestServer;   // HTTPS/1.1
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -311,10 +311,6 @@ public class EncodedCharsInURI implements HttpServerAdapters {
     public void setup() throws Exception {
         out.println(now() + "begin setup");
 
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         // HTTP/1.1
         HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
         HttpTestHandler h1_chunkHandler = new HTTP_ChunkedHandler();
diff --git a/test/jdk/java/net/httpclient/EscapedOctetsInURI.java b/test/jdk/java/net/httpclient/EscapedOctetsInURI.java
index d9d8ba1ddd7..abb0d7d8541 100644
--- a/test/jdk/java/net/httpclient/EscapedOctetsInURI.java
+++ b/test/jdk/java/net/httpclient/EscapedOctetsInURI.java
@@ -69,7 +69,7 @@ import static org.testng.Assert.assertEquals;
 
 public class EscapedOctetsInURI implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;    // HTTP/1.1    [ 5 servers ]
     HttpTestServer httpsTestServer;   // HTTPS/1.1
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -267,10 +267,6 @@ public class EscapedOctetsInURI implements HttpServerAdapters {
     public void setup() throws Exception {
         out.println(now() + "begin setup");
 
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new HttpASCIIUriStringHandler(), "/http1/get");
diff --git a/test/jdk/java/net/httpclient/ExecutorShutdown.java b/test/jdk/java/net/httpclient/ExecutorShutdown.java
index 7d4cbec6d92..a7cfd56b282 100644
--- a/test/jdk/java/net/httpclient/ExecutorShutdown.java
+++ b/test/jdk/java/net/httpclient/ExecutorShutdown.java
@@ -88,7 +88,7 @@ public class ExecutorShutdown implements HttpServerAdapters {
     }
     static final Random RANDOM = RandomFactory.getRandom();
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;        // HTTP/1.1    [ 6 servers ]
     HttpTestServer httpsTestServer;       // HTTPS/1.1
     HttpTestServer http2TestServer;       // HTTP/2 ( h2c   )
@@ -311,10 +311,6 @@ public class ExecutorShutdown implements HttpServerAdapters {
     @BeforeTest
     public void setup() throws Exception {
         out.println("\n**** Setup ****\n");
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new ServerRequestHandler(), "/http1/exec/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/exec/retry";
diff --git a/test/jdk/java/net/httpclient/ExpectContinue.java b/test/jdk/java/net/httpclient/ExpectContinue.java
index 43c65781413..a2d928e6f41 100644
--- a/test/jdk/java/net/httpclient/ExpectContinue.java
+++ b/test/jdk/java/net/httpclient/ExpectContinue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,7 @@ import static org.testng.Assert.assertEquals;
 
 public class ExpectContinue {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpServer httpTestServer;         // HTTP/1.1    [ 2 servers ]
     HttpsServer httpsTestServer;       // HTTPS/1.1
     String httpURI;
@@ -139,10 +139,6 @@ public class ExpectContinue {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         httpTestServer = HttpServer.create(sa, 0);
         httpTestServer.createContext("/http1/ec", new Http1ExpectContinueHandler());
diff --git a/test/jdk/java/net/httpclient/FileChannelPublisherTest.java b/test/jdk/java/net/httpclient/FileChannelPublisherTest.java
index 4bc3c3ae315..c9c78791da3 100644
--- a/test/jdk/java/net/httpclient/FileChannelPublisherTest.java
+++ b/test/jdk/java/net/httpclient/FileChannelPublisherTest.java
@@ -90,7 +90,7 @@ class FileChannelPublisherTest {
 
     private static final int DEFAULT_BUFFER_SIZE = Utils.getBuffer().capacity();
 
-    private static final SSLContext SSL_CONTEXT = createSslContext();
+    private static final SSLContext SSL_CONTEXT = SimpleSSLContext.findSSLContext();
 
     private static final HttpClient CLIENT = HttpClient.newBuilder().sslContext(SSL_CONTEXT).proxy(NO_PROXY).build();
 
@@ -102,14 +102,6 @@ class FileChannelPublisherTest {
             HTTP2 = ServerRequestPair.of(Version.HTTP_2, false),
             HTTPS2 = ServerRequestPair.of(Version.HTTP_2, true);
 
-    private static SSLContext createSslContext() {
-        try {
-            return new SimpleSSLContext().get();
-        } catch (IOException exception) {
-            throw new UncheckedIOException(exception);
-        }
-    }
-
     private record ServerRequestPair(
             String serverName,
             HttpTestServer server,
diff --git a/test/jdk/java/net/httpclient/FilePublisherTest.java b/test/jdk/java/net/httpclient/FilePublisherTest.java
index 5ab9e6f8e7a..9501e8054cc 100644
--- a/test/jdk/java/net/httpclient/FilePublisherTest.java
+++ b/test/jdk/java/net/httpclient/FilePublisherTest.java
@@ -61,7 +61,7 @@ import static java.net.http.HttpClient.Version.HTTP_2;
 import static org.testng.Assert.assertEquals;
 
 public class FilePublisherTest implements HttpServerAdapters {
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpServerAdapters.HttpTestServer httpTestServer;    // HTTP/1.1      [ 4 servers ]
     HttpServerAdapters.HttpTestServer httpsTestServer;   // HTTPS/1.1
     HttpServerAdapters.HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -183,10 +183,6 @@ public class FilePublisherTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         defaultFsPath = defaultFsFile();
         zipFs = newZipFs();
         zipFsPath = zipFsFile(zipFs);
diff --git a/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java b/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java
index de511d6bd75..ef9dc7b3077 100644
--- a/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java
+++ b/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java
@@ -67,7 +67,7 @@ import static org.testng.Assert.fail;
 
 public class FlowAdapterPublisherTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;     // HTTP/1.1    [ 5 servers ]
     HttpTestServer httpsTestServer;    // HTTPS/1.1
     HttpTestServer http2TestServer;    // HTTP/2 ( h2c )
@@ -358,10 +358,6 @@ public class FlowAdapterPublisherTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         httpTestServer = HttpTestServer.create(Version.HTTP_1_1);
         httpTestServer.addHandler(new HttpEchoHandler(), "/http1/echo");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/echo";
diff --git a/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java b/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java
index 5de943278eb..0e175cf0f52 100644
--- a/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java
+++ b/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java
@@ -77,7 +77,7 @@ import static org.testng.Assert.assertTrue;
 
 public class FlowAdapterSubscriberTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;     // HTTP/1.1    [ 5 servers ]
     HttpTestServer httpsTestServer;    // HTTPS/1.1
     HttpTestServer http2TestServer;    // HTTP/2 ( h2c )
@@ -633,10 +633,6 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         httpTestServer = HttpTestServer.create(Version.HTTP_1_1);
         httpTestServer.addHandler(new HttpEchoHandler(), "/http1/echo");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/echo";
diff --git a/test/jdk/java/net/httpclient/ForbiddenHeadTest.java b/test/jdk/java/net/httpclient/ForbiddenHeadTest.java
index 2a50d03b365..57fd627b2b0 100644
--- a/test/jdk/java/net/httpclient/ForbiddenHeadTest.java
+++ b/test/jdk/java/net/httpclient/ForbiddenHeadTest.java
@@ -82,11 +82,10 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
 
 public class ForbiddenHeadTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;        // HTTP/1.1
     HttpTestServer httpsTestServer;       // HTTPS/1.1
     HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
@@ -336,10 +335,6 @@ public class ForbiddenHeadTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new UnauthorizedHandler(), "/http1/");
         httpTestServer.addHandler(new UnauthorizedHandler(), "/http2/proxy/");
diff --git a/test/jdk/java/net/httpclient/GZIPInputStreamTest.java b/test/jdk/java/net/httpclient/GZIPInputStreamTest.java
index a8ce8fb2de5..948ecd4d7cc 100644
--- a/test/jdk/java/net/httpclient/GZIPInputStreamTest.java
+++ b/test/jdk/java/net/httpclient/GZIPInputStreamTest.java
@@ -72,7 +72,7 @@ import static org.testng.Assert.assertEquals;
 
 public class GZIPInputStreamTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
     HttpTestServer httpsTestServer;   // HTTPS/1.1
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -489,10 +489,6 @@ public class GZIPInputStreamTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         HttpTestHandler plainHandler = new LoremIpsumPlainHandler();
         HttpTestHandler gzipHandler  = new LoremIpsumGZIPHandler();
 
diff --git a/test/jdk/java/net/httpclient/HeadTest.java b/test/jdk/java/net/httpclient/HeadTest.java
index e14339a1121..3e05442faf5 100644
--- a/test/jdk/java/net/httpclient/HeadTest.java
+++ b/test/jdk/java/net/httpclient/HeadTest.java
@@ -59,7 +59,7 @@ import static org.testng.Assert.assertEquals;
 
 public class HeadTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;        // HTTP/1.1
     HttpTestServer httpsTestServer;       // HTTPS/1.1
     HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
@@ -147,10 +147,6 @@ public class HeadTest implements HttpServerAdapters {
     // TODO: See if test performs better with Vthreads, see H3SimplePost and H3SimpleGet
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new HeadHandler(), "/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/";
diff --git a/test/jdk/java/net/httpclient/HeadersLowerCaseTest.java b/test/jdk/java/net/httpclient/HeadersLowerCaseTest.java
index 26c791eaca8..b1e4e569010 100644
--- a/test/jdk/java/net/httpclient/HeadersLowerCaseTest.java
+++ b/test/jdk/java/net/httpclient/HeadersLowerCaseTest.java
@@ -72,14 +72,10 @@ public class HeadersLowerCaseTest implements HttpServerAdapters {
     private HttpTestServer h3server;
     private String h2ReqURIBase;
     private String h3ReqURIBase;
-    private SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
     @BeforeAll
     public void beforeAll() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         h2server = HttpTestServer.create(HTTP_2, sslContext);
         h2server.start();
         h2ReqURIBase = "https://" + h2server.serverAuthority();
diff --git a/test/jdk/java/net/httpclient/HttpClientAuthRetryLimitTest.java b/test/jdk/java/net/httpclient/HttpClientAuthRetryLimitTest.java
index 818fd8c7a01..4cfee56e855 100644
--- a/test/jdk/java/net/httpclient/HttpClientAuthRetryLimitTest.java
+++ b/test/jdk/java/net/httpclient/HttpClientAuthRetryLimitTest.java
@@ -56,15 +56,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class HttpClientAuthRetryLimitTest implements HttpServerAdapters {
 
-    private static final SSLContext SSL_CONTEXT = createSslContext();
-
-    private static SSLContext createSslContext() {
-        try {
-            return new SimpleSSLContext().get();
-        } catch (IOException exception) {
-            throw new RuntimeException(exception);
-        }
-    }
+    private static final SSLContext SSL_CONTEXT = SimpleSSLContext.findSSLContext();
 
     // This is the system default value for jdk.httpclient.auth.retrylimit
     private static final int DEFAULT_RETRY_LIMIT = 3;
diff --git a/test/jdk/java/net/httpclient/HttpClientBuilderTest.java b/test/jdk/java/net/httpclient/HttpClientBuilderTest.java
index 596320d49e6..9f7d2ade62f 100644
--- a/test/jdk/java/net/httpclient/HttpClientBuilderTest.java
+++ b/test/jdk/java/net/httpclient/HttpClientBuilderTest.java
@@ -318,18 +318,18 @@ public class HttpClientBuilderTest {
     @Test
     public void testSSLContext() throws Exception {
         HttpClient.Builder builder = HttpClient.newBuilder();
-        SSLContext a = (new SimpleSSLContext()).get();
+        SSLContext a = SimpleSSLContext.findSSLContext();
         builder.sslContext(a);
         try (var closer = closeable(builder)) {
             assertTrue(closer.build().sslContext() == a);
         }
-        SSLContext b = (new SimpleSSLContext()).get();
+        SSLContext b = SimpleSSLContext.findSSLContext();
         builder.sslContext(b);
         try (var closer = closeable(builder)) {
             assertTrue(closer.build().sslContext() == b);
         }
         assertThrows(NPE, () -> builder.sslContext(null));
-        SSLContext c = (new SimpleSSLContext()).get();
+        SSLContext c = SimpleSSLContext.findSSLContext();
         builder.sslContext(c);
         try (var closer = closeable(builder)) {
             assertTrue(closer.build().sslContext() == c);
diff --git a/test/jdk/java/net/httpclient/HttpClientClose.java b/test/jdk/java/net/httpclient/HttpClientClose.java
index f761396487c..e71faa8fe4e 100644
--- a/test/jdk/java/net/httpclient/HttpClientClose.java
+++ b/test/jdk/java/net/httpclient/HttpClientClose.java
@@ -97,7 +97,7 @@ public class HttpClientClose implements HttpServerAdapters {
     static final Random RANDOM = RandomFactory.getRandom();
 
     ExecutorService readerService;
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
     HttpTestServer httpsTestServer;       // HTTPS/1.1
     HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
@@ -343,9 +343,6 @@ public class HttpClientClose implements HttpServerAdapters {
     @BeforeTest
     public void setup() throws Exception {
         out.println("\n**** Setup ****\n");
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
         readerService = Executors.newCachedThreadPool();
 
         httpTestServer = HttpTestServer.create(HTTP_1_1);
diff --git a/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java b/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
index e9d5fe6bffe..10cca697231 100644
--- a/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
+++ b/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
@@ -69,7 +69,7 @@ import static java.net.http.HttpClient.Version.HTTP_2;
  */
 public class HttpClientLocalAddrTest implements HttpServerAdapters {
 
-    private static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private static HttpServerAdapters.HttpTestServer http1_1_Server;
     private static URI httpURI;
     private static HttpServerAdapters.HttpTestServer https_1_1_Server;
@@ -83,9 +83,6 @@ public class HttpClientLocalAddrTest implements HttpServerAdapters {
     // start various HTTP/HTTPS servers that will be invoked against in the tests
     @BeforeClass
     public static void beforeClass() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        Assert.assertNotNull(sslContext, "Unexpected null sslContext");
-
         HttpServerAdapters.HttpTestHandler handler = (exchange) -> {
             // the handler receives a request and sends back a 200 response with the
             // response body containing the raw IP address (in byte[] form) of the client from whom
diff --git a/test/jdk/java/net/httpclient/HttpClientSNITest.java b/test/jdk/java/net/httpclient/HttpClientSNITest.java
index 095508fd849..1f7377f745d 100644
--- a/test/jdk/java/net/httpclient/HttpClientSNITest.java
+++ b/test/jdk/java/net/httpclient/HttpClientSNITest.java
@@ -95,8 +95,7 @@ public class HttpClientSNITest {
     @ParameterizedTest
     @ValueSource(booleans = {false, true})
     void testRequestToIPLiteralHost(final boolean sniConfiguredOnClient) throws Exception {
-        final SSLContext sslContext = new SimpleSSLContext().get();
-        assertNotNull(sslContext, "could not create a SSLContext");
+        final SSLContext sslContext = SimpleSSLContext.findSSLContext();
         final String expectedSNI = "non-dns-resolvable.foo.bar.localhost";
         final ServerNameMatcher matcher = new ServerNameMatcher(expectedSNI);
         final HttpTestServer server = createServer(matcher, sslContext);
@@ -149,8 +148,7 @@ public class HttpClientSNITest {
     @ParameterizedTest
     @ValueSource(booleans = {false, true})
     void testRequestResolvedHostName(final boolean sniConfiguredOnClient) throws Exception {
-        final SSLContext sslContext = new SimpleSSLContext().get();
-        assertNotNull(sslContext, "could not create a SSLContext");
+        final SSLContext sslContext = SimpleSSLContext.findSSLContext();
         final String resolvedHostName = InetAddress.getLoopbackAddress().getHostName();
         final String expectedSNI = resolvedHostName;
         final ServerNameMatcher matcher = new ServerNameMatcher(expectedSNI);
diff --git a/test/jdk/java/net/httpclient/HttpClientShutdown.java b/test/jdk/java/net/httpclient/HttpClientShutdown.java
index 192abcba39d..4a5583782cb 100644
--- a/test/jdk/java/net/httpclient/HttpClientShutdown.java
+++ b/test/jdk/java/net/httpclient/HttpClientShutdown.java
@@ -101,7 +101,7 @@ public class HttpClientShutdown implements HttpServerAdapters {
     static final Random RANDOM = RandomFactory.getRandom();
 
     ExecutorService readerService;
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
     HttpTestServer httpsTestServer;       // HTTPS/1.1
     HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
@@ -464,9 +464,6 @@ public class HttpClientShutdown implements HttpServerAdapters {
     @BeforeTest
     public void setup() throws Exception {
         out.println("\n**** Setup ****\n");
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
         readerService = Executors.newCachedThreadPool();
 
         httpTestServer = HttpTestServer.create(HTTP_1_1);
diff --git a/test/jdk/java/net/httpclient/HttpGetInCancelledFuture.java b/test/jdk/java/net/httpclient/HttpGetInCancelledFuture.java
index 4ddc0bdfdc2..80e49f20705 100644
--- a/test/jdk/java/net/httpclient/HttpGetInCancelledFuture.java
+++ b/test/jdk/java/net/httpclient/HttpGetInCancelledFuture.java
@@ -98,11 +98,7 @@ public class HttpGetInCancelledFuture {
                 ? HttpServerAdapters.createClientBuilderForH3()
                 : HttpClient.newBuilder();
         if (uri.getScheme().equalsIgnoreCase("https")) {
-            try {
-                builder.sslContext(new SimpleSSLContext().get());
-            } catch (IOException io) {
-                throw new UncheckedIOException(io);
-            }
+            builder.sslContext(SimpleSSLContext.findSSLContext());
         }
         return builder.connectTimeout(Duration.ofSeconds(1))
                 .executor(executor)
diff --git a/test/jdk/java/net/httpclient/HttpRedirectTest.java b/test/jdk/java/net/httpclient/HttpRedirectTest.java
index 358b908a03c..e03a12a049c 100644
--- a/test/jdk/java/net/httpclient/HttpRedirectTest.java
+++ b/test/jdk/java/net/httpclient/HttpRedirectTest.java
@@ -80,14 +80,9 @@ import jdk.httpclient.test.lib.common.HttpServerAdapters;
 public class HttpRedirectTest implements HttpServerAdapters {
     static final String GET_RESPONSE_BODY = "Lorem ipsum dolor sit amet";
     static final String REQUEST_BODY = "Here it goes";
-    static final SSLContext context;
+    private static final SSLContext context = SimpleSSLContext.findSSLContext();
     static {
-        try {
-            context = new SimpleSSLContext().get();
-            SSLContext.setDefault(context);
-        } catch (Exception x) {
-            throw new ExceptionInInitializerError(x);
-        }
+        SSLContext.setDefault(context);
     }
 
     final AtomicLong requestCounter = new AtomicLong();
diff --git a/test/jdk/java/net/httpclient/HttpResponseConnectionLabelTest.java b/test/jdk/java/net/httpclient/HttpResponseConnectionLabelTest.java
index d1dc8b0a5f5..29c4bcc8072 100644
--- a/test/jdk/java/net/httpclient/HttpResponseConnectionLabelTest.java
+++ b/test/jdk/java/net/httpclient/HttpResponseConnectionLabelTest.java
@@ -87,7 +87,7 @@ class HttpResponseConnectionLabelTest {
 
     private static final String SERVER_ID_HEADER_NAME = "X-Server-Id";
 
-    private static final SSLContext SSL_CONTEXT = createSslContext();
+    private static final SSLContext SSL_CONTEXT = SimpleSSLContext.findSSLContext();
 
     // For each test instance, start with a fresh client having no connections in the pool
     private final HttpClient client = HttpServerAdapters
@@ -120,14 +120,6 @@ class HttpResponseConnectionLabelTest {
 
     private static final ServerRequestPair SEC_HTTP3 = ServerRequestPair.of(Version.HTTP_3, true);
 
-    private static SSLContext createSslContext() {
-        try {
-            return new SimpleSSLContext().get();
-        } catch (IOException exception) {
-            throw new UncheckedIOException(exception);
-        }
-    }
-
     private record ServerRequestPair(
             HttpTestServer server,
             ExecutorService executor,
diff --git a/test/jdk/java/net/httpclient/HttpResponseLimitingTest.java b/test/jdk/java/net/httpclient/HttpResponseLimitingTest.java
index e0bda0b0071..450fce35f54 100644
--- a/test/jdk/java/net/httpclient/HttpResponseLimitingTest.java
+++ b/test/jdk/java/net/httpclient/HttpResponseLimitingTest.java
@@ -107,15 +107,7 @@ class HttpResponseLimitingTest {
 
     private record ServerClientPair(HttpTestServer server, HttpClient client, HttpRequest request, boolean secure) {
 
-        private static final SSLContext SSL_CONTEXT = createSslContext();
-
-        private static SSLContext createSslContext() {
-            try {
-                return new SimpleSSLContext().get();
-            } catch (IOException exception) {
-                throw new UncheckedIOException(exception);
-            }
-        }
+        private static final SSLContext SSL_CONTEXT = SimpleSSLContext.findSSLContext();
 
         private ServerClientPair {
             try {
diff --git a/test/jdk/java/net/httpclient/HttpSlowServerTest.java b/test/jdk/java/net/httpclient/HttpSlowServerTest.java
index ca841cd8ae9..f62f6fa4978 100644
--- a/test/jdk/java/net/httpclient/HttpSlowServerTest.java
+++ b/test/jdk/java/net/httpclient/HttpSlowServerTest.java
@@ -85,14 +85,9 @@ public class HttpSlowServerTest implements HttpServerAdapters {
             "Excepteur sint occaecat cupidatat non proident."
     );
 
-    static final SSLContext context;
+    private static final SSLContext context = SimpleSSLContext.findSSLContext();
     static {
-        try {
-            context = new SimpleSSLContext().get();
-            SSLContext.setDefault(context);
-        } catch (Exception x) {
-            throw new ExceptionInInitializerError(x);
-        }
+        SSLContext.setDefault(context);
     }
 
     final AtomicLong requestCounter = new AtomicLong();
diff --git a/test/jdk/java/net/httpclient/HttpVersionsTest.java b/test/jdk/java/net/httpclient/HttpVersionsTest.java
index 00b0db1af4e..a55c2727a00 100644
--- a/test/jdk/java/net/httpclient/HttpVersionsTest.java
+++ b/test/jdk/java/net/httpclient/HttpVersionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ import static org.testng.Assert.assertTrue;
 
 public class HttpVersionsTest {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     Http2TestServer http2TestServer;
     Http2TestServer https2TestServer;
     String http2URI;
@@ -205,10 +205,6 @@ public class HttpVersionsTest {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         http2TestServer =  new Http2TestServer("localhost", false, 0, executor, 50, null, null, true);
         http2TestServer.addHandler(new Http2VerEchoHandler(), "/http2/vts");
         http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/vts";
diff --git a/test/jdk/java/net/httpclient/HttpsTunnelAuthTest.java b/test/jdk/java/net/httpclient/HttpsTunnelAuthTest.java
index c6b2c323693..c83abd9cf62 100644
--- a/test/jdk/java/net/httpclient/HttpsTunnelAuthTest.java
+++ b/test/jdk/java/net/httpclient/HttpsTunnelAuthTest.java
@@ -74,14 +74,9 @@ public class HttpsTunnelAuthTest implements HttpServerAdapters, AutoCloseable {
         "Excepteur sint occaecat cupidatat non proident."
     };
 
-    static final SSLContext context;
+    private static final SSLContext context = SimpleSSLContext.findSSLContext();
     static {
-        try {
-            context = new SimpleSSLContext().get();
-            SSLContext.setDefault(context);
-        } catch (Exception x) {
-            throw new ExceptionInInitializerError(x);
-        }
+        SSLContext.setDefault(context);
     }
 
     final String realm = "earth";
diff --git a/test/jdk/java/net/httpclient/HttpsTunnelTest.java b/test/jdk/java/net/httpclient/HttpsTunnelTest.java
index 86666539942..bb0afacaacb 100644
--- a/test/jdk/java/net/httpclient/HttpsTunnelTest.java
+++ b/test/jdk/java/net/httpclient/HttpsTunnelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,14 +82,9 @@ public class HttpsTunnelTest implements HttpServerAdapters {
         "Excepteur sint occaecat cupidatat non proident."
     };
 
-    static final SSLContext context;
+    private static final SSLContext context = SimpleSSLContext.findSSLContext();
     static {
-        try {
-            context = new SimpleSSLContext().get();
-            SSLContext.setDefault(context);
-        } catch (Exception x) {
-            throw new ExceptionInInitializerError(x);
-        }
+        SSLContext.setDefault(context);
     }
 
     HttpsTunnelTest() {
diff --git a/test/jdk/java/net/httpclient/ISO_8859_1_Test.java b/test/jdk/java/net/httpclient/ISO_8859_1_Test.java
index a5465ad5103..d629a6f3105 100644
--- a/test/jdk/java/net/httpclient/ISO_8859_1_Test.java
+++ b/test/jdk/java/net/httpclient/ISO_8859_1_Test.java
@@ -88,7 +88,7 @@ import static org.testng.Assert.assertTrue;
 
 public class ISO_8859_1_Test implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     DummyServer http1DummyServer;
     HttpTestServer http1TestServer;   // HTTP/1.1 ( http )
     HttpTestServer https1TestServer;  // HTTPS/1.1 ( https  )
@@ -412,10 +412,6 @@ public class ISO_8859_1_Test implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         HttpServerAdapters.HttpTestHandler handler = new ISO88591Handler();
         InetSocketAddress loopback = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
 
diff --git a/test/jdk/java/net/httpclient/IdleConnectionTimeoutTest.java b/test/jdk/java/net/httpclient/IdleConnectionTimeoutTest.java
index 07bb0be455c..78984964895 100644
--- a/test/jdk/java/net/httpclient/IdleConnectionTimeoutTest.java
+++ b/test/jdk/java/net/httpclient/IdleConnectionTimeoutTest.java
@@ -94,7 +94,7 @@ import static org.testng.Assert.assertEquals;
 public class IdleConnectionTimeoutTest {
 
     URI timeoutUriH2, noTimeoutUriH2, timeoutUriH3, noTimeoutUriH3, getH3;
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     static volatile QuicServerConnection latestServerConn;
     final String KEEP_ALIVE_PROPERTY = "jdk.httpclient.keepalive.timeout";
     final String IDLE_CONN_PROPERTY_H2 = "jdk.httpclient.keepalive.timeout.h2";
@@ -112,7 +112,6 @@ public class IdleConnectionTimeoutTest {
         http2TestServer.addHandler(new ServerNoTimeoutHandlerH2(), NO_TIMEOUT_PATH);
         http2TestServer.setExchangeSupplier(TestExchange::new);
 
-        sslContext = new SimpleSSLContext().get();
         http3TestServer = new Http3TestServer(sslContext) {
             @Override
             public boolean acceptIncoming(SocketAddress source, QuicServerConnection quicConn) {
diff --git a/test/jdk/java/net/httpclient/ImmutableFlowItems.java b/test/jdk/java/net/httpclient/ImmutableFlowItems.java
index 186d3bbd9f8..3ee4eb28768 100644
--- a/test/jdk/java/net/httpclient/ImmutableFlowItems.java
+++ b/test/jdk/java/net/httpclient/ImmutableFlowItems.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ import static org.testng.Assert.*;
 
 public class ImmutableFlowItems {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
     HttpsServer httpsTestServer;       // HTTPS/1.1
     Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -175,10 +175,6 @@ public class ImmutableFlowItems {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         // HTTP/1.1
         HttpHandler h1_fixedLengthHandler = new HTTP1_FixedLengthHandler();
         HttpHandler h1_chunkHandler = new HTTP1_ChunkedHandler();
diff --git a/test/jdk/java/net/httpclient/ImmutableSSLSessionTest.java b/test/jdk/java/net/httpclient/ImmutableSSLSessionTest.java
index 179900479bc..9b5c7961c2f 100644
--- a/test/jdk/java/net/httpclient/ImmutableSSLSessionTest.java
+++ b/test/jdk/java/net/httpclient/ImmutableSSLSessionTest.java
@@ -90,15 +90,11 @@ public class ImmutableSSLSessionTest implements HttpServerAdapters {
     private String h1ReqURIBase;
     private String h2ReqURIBase;
     private String h3ReqURIBase;
-    private static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private final AtomicInteger counter = new AtomicInteger();
 
     @BeforeAll
     public void beforeAll() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         h1server = HttpTestServer.create(HTTP_1_1, sslContext);
         h1server.start();
         h1ReqURIBase = "https://" + h1server.serverAuthority() + "/h1ImmutableSSLSessionTest/";
diff --git a/test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java b/test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java
index d1e3cc026d3..10df564bd41 100644
--- a/test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java
+++ b/test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java
@@ -100,7 +100,7 @@ import static org.testng.Assert.assertEquals;
 
 public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
     HttpTestServer httpsTestServer;   // HTTPS/1.1
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -565,10 +565,6 @@ public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         // HTTP/1.1
         HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
         HttpTestHandler h1_chunkHandler = new HTTP_VariableLengthHandler();
diff --git a/test/jdk/java/net/httpclient/InvalidSSLContextTest.java b/test/jdk/java/net/httpclient/InvalidSSLContextTest.java
index ca2ebbfb038..be4d3297dd7 100644
--- a/test/jdk/java/net/httpclient/InvalidSSLContextTest.java
+++ b/test/jdk/java/net/httpclient/InvalidSSLContextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,7 @@ import static java.net.http.HttpClient.Version.HTTP_2;
 
 public class InvalidSSLContextTest {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     volatile SSLServerSocket sslServerSocket;
     volatile String uri;
 
@@ -147,10 +147,6 @@ public class InvalidSSLContextTest {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         // server-side uses a different context to that of the client-side
         sslServerSocket = (SSLServerSocket)sslContext
                 .getServerSocketFactory()
diff --git a/test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java b/test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java
index 327dc57d6df..c16c9f1747c 100644
--- a/test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java
+++ b/test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java
@@ -78,7 +78,7 @@ import static org.testng.Assert.assertEquals;
 
 public class InvalidSubscriptionRequest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
     HttpTestServer httpsTestServer;   // HTTPS/1.1
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -461,10 +461,6 @@ public class InvalidSubscriptionRequest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         // HTTP/1.1
         HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
         HttpTestHandler h1_chunkHandler = new HTTP_VariableLengthHandler();
diff --git a/test/jdk/java/net/httpclient/LargeResponseTest.java b/test/jdk/java/net/httpclient/LargeResponseTest.java
index 02cf5ddcc8d..727cc1768df 100644
--- a/test/jdk/java/net/httpclient/LargeResponseTest.java
+++ b/test/jdk/java/net/httpclient/LargeResponseTest.java
@@ -82,14 +82,9 @@ public class LargeResponseTest implements HttpServerAdapters {
         }
     }
 
-    static final SSLContext context;
+    private static final SSLContext context = SimpleSSLContext.findSSLContext();
     static {
-        try {
-            context = new SimpleSSLContext().get();
-            SSLContext.setDefault(context);
-        } catch (Exception x) {
-            throw new ExceptionInInitializerError(x);
-        }
+        SSLContext.setDefault(context);
     }
 
     final AtomicLong requestCounter = new AtomicLong();
diff --git a/test/jdk/java/net/httpclient/LightWeightHttpServer.java b/test/jdk/java/net/httpclient/LightWeightHttpServer.java
index c226b845527..496aa2c5778 100644
--- a/test/jdk/java/net/httpclient/LightWeightHttpServer.java
+++ b/test/jdk/java/net/httpclient/LightWeightHttpServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,7 @@ import jdk.test.lib.net.SimpleSSLContext;
 
 public class LightWeightHttpServer {
 
-    static SSLContext ctx;
+    static final SSLContext ctx = SimpleSSLContext.findSSLContext();
     static HttpServer httpServer;
     static HttpsServer httpsServer;
     static ExecutorService executor;
@@ -111,7 +111,6 @@ public class LightWeightHttpServer {
         executor = Executors.newCachedThreadPool();
         httpServer.setExecutor(executor);
         httpsServer.setExecutor(executor);
-        ctx = new SimpleSSLContext().get();
         httpsServer.setHttpsConfigurator(new TestServerConfigurator(addr.getAddress(), ctx));
         httpServer.start();
         httpsServer.start();
diff --git a/test/jdk/java/net/httpclient/LineBodyHandlerTest.java b/test/jdk/java/net/httpclient/LineBodyHandlerTest.java
index 62afcab9ee2..45df8d13f7e 100644
--- a/test/jdk/java/net/httpclient/LineBodyHandlerTest.java
+++ b/test/jdk/java/net/httpclient/LineBodyHandlerTest.java
@@ -86,7 +86,7 @@ import static org.testng.Assert.assertTrue;
 
 public class LineBodyHandlerTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;    // HTTP/1.1    [ 5 servers ]
     HttpTestServer httpsTestServer;   // HTTPS/1.1
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -677,10 +677,6 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         httpTestServer = HttpTestServer.create(HTTP_1_1, null,
                 executorFor("HTTP/1.1 Server Thread"));
         httpTestServer.addHandler(new HttpTestEchoHandler(), "/http1/echo");
diff --git a/test/jdk/java/net/httpclient/ManyRequests.java b/test/jdk/java/net/httpclient/ManyRequests.java
index 190205a9ef5..ee79ac80b68 100644
--- a/test/jdk/java/net/httpclient/ManyRequests.java
+++ b/test/jdk/java/net/httpclient/ManyRequests.java
@@ -104,7 +104,7 @@ public class ManyRequests {
                          + " requests; delay=" + INSERT_DELAY
                          + ", chunks=" + CHUNK_SIZE
                          + ", XFixed=" + XFIXED);
-        SSLContext ctx = new SimpleSSLContext().get();
+        SSLContext ctx = SimpleSSLContext.findSSLContext();
 
         InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         HttpsServer server = HttpsServer.create(addr, 0);
diff --git a/test/jdk/java/net/httpclient/ManyRequestsLegacy.java b/test/jdk/java/net/httpclient/ManyRequestsLegacy.java
index 1d8091d3085..2e58ee50bff 100644
--- a/test/jdk/java/net/httpclient/ManyRequestsLegacy.java
+++ b/test/jdk/java/net/httpclient/ManyRequestsLegacy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -105,7 +105,7 @@ public class ManyRequestsLegacy {
                          + " requests; delay=" + INSERT_DELAY
                          + ", chunks=" + CHUNK_SIZE
                          + ", XFixed=" + XFIXED);
-        SSLContext ctx = new SimpleSSLContext().get();
+        SSLContext ctx = SimpleSSLContext.findSSLContext();
         SSLContext.setDefault(ctx);
         HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
                 public boolean verify(String hostname, SSLSession session) {
diff --git a/test/jdk/java/net/httpclient/MappingResponseSubscriber.java b/test/jdk/java/net/httpclient/MappingResponseSubscriber.java
index 5e5497cf0e5..445b4a59e24 100644
--- a/test/jdk/java/net/httpclient/MappingResponseSubscriber.java
+++ b/test/jdk/java/net/httpclient/MappingResponseSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,7 +75,7 @@ import static org.testng.Assert.assertTrue;
 
 public class MappingResponseSubscriber {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
     HttpsServer httpsTestServer;       // HTTPS/1.1
     Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -215,10 +215,6 @@ public class MappingResponseSubscriber {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         // HTTP/1.1
         HttpHandler h1_fixedLengthHandler = new HTTP1_FixedLengthHandler();
         HttpHandler h1_chunkHandler = new HTTP1_ChunkedHandler();
diff --git a/test/jdk/java/net/httpclient/MaxStreams.java b/test/jdk/java/net/httpclient/MaxStreams.java
index 25ec39ac472..b25f931be9d 100644
--- a/test/jdk/java/net/httpclient/MaxStreams.java
+++ b/test/jdk/java/net/httpclient/MaxStreams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,7 @@ public class MaxStreams {
     Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
     Http2TestServer https2TestServer;   // HTTP/2 ( h2 )
     final Http2FixedHandler handler = new Http2FixedHandler();
-    SSLContext ctx;
+    private static final SSLContext ctx = SimpleSSLContext.findSSLContext();
     String http2FixedURI;
     String https2FixedURI;
     ExecutorService exec;
@@ -163,7 +163,6 @@ public class MaxStreams {
 
     @BeforeTest
     public void setup() throws Exception {
-        ctx = (new SimpleSSLContext()).get();
         exec = Executors.newCachedThreadPool();
 
         InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
diff --git a/test/jdk/java/net/httpclient/NonAsciiCharsInURI.java b/test/jdk/java/net/httpclient/NonAsciiCharsInURI.java
index ba93645aef4..0a0da6366ad 100644
--- a/test/jdk/java/net/httpclient/NonAsciiCharsInURI.java
+++ b/test/jdk/java/net/httpclient/NonAsciiCharsInURI.java
@@ -67,7 +67,7 @@ import static org.testng.Assert.assertEquals;
 
 public class NonAsciiCharsInURI implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;         // HTTP/1.1    [ 5 servers ]
     HttpTestServer httpsTestServer;        // HTTPS/1.1
     HttpTestServer http2TestServer;        // HTTP/2 ( h2c )
@@ -280,10 +280,6 @@ public class NonAsciiCharsInURI implements HttpServerAdapters {
     public void setup() throws Exception {
         out.println(now() + "begin setup");
 
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         HttpTestHandler handler = new HttpUriStringHandler();
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(handler, "/http1/get");
diff --git a/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileDownloadTest.java b/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileDownloadTest.java
index b5ea5da13e4..eb397d37b7a 100644
--- a/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileDownloadTest.java
+++ b/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileDownloadTest.java
@@ -80,7 +80,7 @@ public class BodyHandlerOfFileDownloadTest implements HttpServerAdapters {
     static final String MSG = "msg";
     static final String contentDispositionValue = "attachment; filename=example.html";
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;    // HTTP/1.1      [ 5 servers ]
     HttpTestServer httpsTestServer;   // HTTPS/1.1
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -208,10 +208,6 @@ public class BodyHandlerOfFileDownloadTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         defaultFsPath = defaultFsDir();
         zipFs = newZipFs();
         zipFsPath = zipFsDir(zipFs);
diff --git a/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileTest.java b/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileTest.java
index 42d5c2596c7..13871933eac 100644
--- a/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileTest.java
+++ b/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileTest.java
@@ -71,7 +71,7 @@ import static org.testng.Assert.assertEquals;
 public class BodyHandlerOfFileTest implements HttpServerAdapters {
     static final String MSG = "msg";
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;    // HTTP/1.1      [ 5 servers ]
     HttpTestServer httpsTestServer;   // HTTPS/1.1
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -216,10 +216,6 @@ public class BodyHandlerOfFileTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         defaultFsPath = defaultFsFile();
         zipFs = newZipFs();
         zipFsPath = zipFsFile(zipFs);
diff --git a/test/jdk/java/net/httpclient/PathSubscriber/BodySubscriberOfFileTest.java b/test/jdk/java/net/httpclient/PathSubscriber/BodySubscriberOfFileTest.java
index 2a7ba90c7b2..d7c9a3af4f1 100644
--- a/test/jdk/java/net/httpclient/PathSubscriber/BodySubscriberOfFileTest.java
+++ b/test/jdk/java/net/httpclient/PathSubscriber/BodySubscriberOfFileTest.java
@@ -75,7 +75,7 @@ import static org.testng.Assert.assertEquals;
 public class BodySubscriberOfFileTest implements HttpServerAdapters {
     static final String MSG = "msg";
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;    // HTTP/1.1      [ 5 servers ]
     HttpTestServer httpsTestServer;   // HTTPS/1.1
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -246,10 +246,6 @@ public class BodySubscriberOfFileTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         defaultFsPath = defaultFsFile();
         zipFs = newZipFs();
         zipFsPath = zipFsFile(zipFs);
diff --git a/test/jdk/java/net/httpclient/PlainConnectionLockTest.java b/test/jdk/java/net/httpclient/PlainConnectionLockTest.java
index 3205f87111a..745f5951dd9 100644
--- a/test/jdk/java/net/httpclient/PlainConnectionLockTest.java
+++ b/test/jdk/java/net/httpclient/PlainConnectionLockTest.java
@@ -101,7 +101,7 @@ import static java.net.http.HttpClient.Version.HTTP_1_1;
 // -Djava.security.debug=all
 class PlainConnectionLockTest implements HttpServerAdapters {
 
-    private SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private HttpTestServer http1Server;
     private HttpTestServer https1Server;
     private String http1URI;
@@ -133,10 +133,6 @@ class PlainConnectionLockTest implements HttpServerAdapters {
         requestSemaphore = new Semaphore(0);
         responseSemaphore = new Semaphore(0);
         successfulCompletion = false;
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         serverExecutor = Executors.newThreadPerTaskExecutor(
                 Thread.ofVirtual().name("Http1Server", 0).factory());
 
diff --git a/test/jdk/java/net/httpclient/ProxySelectorTest.java b/test/jdk/java/net/httpclient/ProxySelectorTest.java
index a5407801bcd..bf63e5a77b5 100644
--- a/test/jdk/java/net/httpclient/ProxySelectorTest.java
+++ b/test/jdk/java/net/httpclient/ProxySelectorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,7 @@ import static org.testng.Assert.assertEquals;
 
 public class ProxySelectorTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;            // HTTP/1.1
     HttpTestServer proxyHttpTestServer;       // HTTP/1.1
     HttpTestServer authProxyHttpTestServer;   // HTTP/1.1
@@ -320,10 +320,6 @@ public class ProxySelectorTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new PlainServerHandler("plain-server"), "/http1/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1";
diff --git a/test/jdk/java/net/httpclient/ProxyTest.java b/test/jdk/java/net/httpclient/ProxyTest.java
index 45c21e7ef4a..d8abea188bd 100644
--- a/test/jdk/java/net/httpclient/ProxyTest.java
+++ b/test/jdk/java/net/httpclient/ProxyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -80,16 +80,12 @@ import static java.net.Proxy.NO_PROXY;
 public class ProxyTest {
 
     static {
-        try {
-            HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
-                    public boolean verify(String hostname, SSLSession session) {
-                        return true;
-                    }
-                });
-            SSLContext.setDefault(new SimpleSSLContext().get());
-        } catch (IOException ex) {
-            throw new ExceptionInInitializerError(ex);
-        }
+        HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
+            public boolean verify(String hostname, SSLSession session) {
+                return true;
+            }
+        });
+        SSLContext.setDefault(SimpleSSLContext.findSSLContext());
     }
 
     static final String RESPONSE = "<html><body><p>Hello World!</body></html>";
diff --git a/test/jdk/java/net/httpclient/RedirectMethodChange.java b/test/jdk/java/net/httpclient/RedirectMethodChange.java
index f713c0dc5d1..b0b130921f5 100644
--- a/test/jdk/java/net/httpclient/RedirectMethodChange.java
+++ b/test/jdk/java/net/httpclient/RedirectMethodChange.java
@@ -55,7 +55,7 @@ import static org.testng.Assert.assertEquals;
 
 public class RedirectMethodChange implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpClient client;
 
     HttpTestServer httpTestServer;        // HTTP/1.1    [ 5 servers ]
@@ -203,10 +203,6 @@ public class RedirectMethodChange implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         client = newClientBuilderForH3()
                 .followRedirects(HttpClient.Redirect.NORMAL)
                 .sslContext(sslContext)
diff --git a/test/jdk/java/net/httpclient/RedirectTimeoutTest.java b/test/jdk/java/net/httpclient/RedirectTimeoutTest.java
index 3e921879fe3..e51f394f845 100644
--- a/test/jdk/java/net/httpclient/RedirectTimeoutTest.java
+++ b/test/jdk/java/net/httpclient/RedirectTimeoutTest.java
@@ -66,7 +66,7 @@ import static jdk.test.lib.Utils.adjustTimeout;
 
 public class RedirectTimeoutTest implements HttpServerAdapters {
 
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     static HttpTestServer h1TestServer, h2TestServer, h3TestServer;
     static URI h1Uri, h1RedirectUri, h2Uri, h2RedirectUri,
             h3Uri, h3RedirectUri, h2WarmupUri, h3WarmupUri, testRedirectURI;
@@ -77,10 +77,6 @@ public class RedirectTimeoutTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws IOException {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         h1TestServer = HttpTestServer.create(HTTP_1_1);
         h2TestServer = HttpTestServer.create(HTTP_2);
         h3TestServer = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
diff --git a/test/jdk/java/net/httpclient/RedirectWithCookie.java b/test/jdk/java/net/httpclient/RedirectWithCookie.java
index afc8618835b..b4a4df38721 100644
--- a/test/jdk/java/net/httpclient/RedirectWithCookie.java
+++ b/test/jdk/java/net/httpclient/RedirectWithCookie.java
@@ -61,7 +61,7 @@ import static org.testng.Assert.assertTrue;
 
 public class RedirectWithCookie implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
     HttpTestServer httpsTestServer;       // HTTPS/1.1
     HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
@@ -160,10 +160,6 @@ public class RedirectWithCookie implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new CookieRedirectHandler(), "/http1/cookie/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/cookie/redirect";
diff --git a/test/jdk/java/net/httpclient/Response1xxTest.java b/test/jdk/java/net/httpclient/Response1xxTest.java
index d0148f0d684..5cff7a69259 100644
--- a/test/jdk/java/net/httpclient/Response1xxTest.java
+++ b/test/jdk/java/net/httpclient/Response1xxTest.java
@@ -76,7 +76,7 @@ public class Response1xxTest implements HttpServerAdapters {
     private String http2RequestURIBase;
 
 
-    private SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private HttpTestServer https2Server;  // h2
     private String https2RequestURIBase;
 
@@ -107,10 +107,6 @@ public class Response1xxTest implements HttpServerAdapters {
         http2Server.start();
         System.out.println("Started HTTP2 server at " + http2Server.getAddress());
 
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         https2Server = HttpTestServer.create(HTTP_2, sslContext);
         https2Server.addHandler(new Http2Handler(), "/http2/101");
         https2RequestURIBase = URIBuilder.newBuilder().scheme("https").loopback()
diff --git a/test/jdk/java/net/httpclient/Response204V2Test.java b/test/jdk/java/net/httpclient/Response204V2Test.java
index 9f867d0fb17..c9dbd8eccf9 100644
--- a/test/jdk/java/net/httpclient/Response204V2Test.java
+++ b/test/jdk/java/net/httpclient/Response204V2Test.java
@@ -76,7 +76,7 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
 
 public class Response204V2Test implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
     HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
     HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
@@ -284,10 +284,6 @@ public class Response204V2Test implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         // HTTP/2
         HttpTestHandler handler204 = new Handler204();
 
diff --git a/test/jdk/java/net/httpclient/ResponseBodyBeforeError.java b/test/jdk/java/net/httpclient/ResponseBodyBeforeError.java
index 04ce3d531af..123e47e2ac9 100644
--- a/test/jdk/java/net/httpclient/ResponseBodyBeforeError.java
+++ b/test/jdk/java/net/httpclient/ResponseBodyBeforeError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,7 +82,7 @@ public class ResponseBodyBeforeError {
     String httpURIFixLen;
     String httpsURIFixLen;
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
     static final String EXPECTED_RESPONSE_BODY =
             "<html><body><h1>Heading</h1><p>Some Text</p></body></html>";
@@ -538,9 +538,6 @@ public class ResponseBodyBeforeError {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
         SSLContext.setDefault(sslContext);
 
         variableLengthServer = new PlainVariableLengthServer();
diff --git a/test/jdk/java/net/httpclient/ResponsePublisher.java b/test/jdk/java/net/httpclient/ResponsePublisher.java
index 5d90e20c626..ce86a0a3cf5 100644
--- a/test/jdk/java/net/httpclient/ResponsePublisher.java
+++ b/test/jdk/java/net/httpclient/ResponsePublisher.java
@@ -79,7 +79,7 @@ import static org.testng.Assert.assertTrue;
 
 public class ResponsePublisher implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;    // HTTP/1.1    [ 5 servers ]
     HttpTestServer httpsTestServer;   // HTTPS/1.1
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
@@ -456,10 +456,6 @@ public class ResponsePublisher implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         // HTTP/1.1
         HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
         HttpTestHandler h1_chunkHandler = new HTTP_VariableLengthHandler();
diff --git a/test/jdk/java/net/httpclient/RetryWithCookie.java b/test/jdk/java/net/httpclient/RetryWithCookie.java
index dc046031bd3..782d8a0b956 100644
--- a/test/jdk/java/net/httpclient/RetryWithCookie.java
+++ b/test/jdk/java/net/httpclient/RetryWithCookie.java
@@ -72,7 +72,7 @@ import static org.testng.Assert.assertTrue;
 
 public class RetryWithCookie implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;        // HTTP/1.1    [ 5 servers ]
     HttpTestServer httpsTestServer;       // HTTPS/1.1
     HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
@@ -158,10 +158,6 @@ public class RetryWithCookie implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new CookieRetryHandler(), "/http1/cookie/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/cookie/retry";
diff --git a/test/jdk/java/net/httpclient/ServerCloseTest.java b/test/jdk/java/net/httpclient/ServerCloseTest.java
index 10fb8ca94d1..65eb6cfc589 100644
--- a/test/jdk/java/net/httpclient/ServerCloseTest.java
+++ b/test/jdk/java/net/httpclient/ServerCloseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,7 +77,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class ServerCloseTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     DummyServer    httpDummyServer;    // HTTP/1.1    [ 2 servers ]
     DummyServer    httpsDummyServer;   // HTTPS/1.1
     String httpDummy;
@@ -226,10 +226,6 @@ public class ServerCloseTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
 
         // DummyServer
diff --git a/test/jdk/java/net/httpclient/ShortResponseBody.java b/test/jdk/java/net/httpclient/ShortResponseBody.java
index 88d1cde6761..b4fd83585ee 100644
--- a/test/jdk/java/net/httpclient/ShortResponseBody.java
+++ b/test/jdk/java/net/httpclient/ShortResponseBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,7 +82,7 @@ public abstract class ShortResponseBody {
     String httpsURIVarLen;
     String httpURIFixLen;
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     SSLParameters sslParameters;
     HttpClient client;
     int numberOfRequests;
@@ -657,9 +657,6 @@ public abstract class ShortResponseBody {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
         SSLContext.setDefault(sslContext);
 
         sslParameters = new SSLParameters();
diff --git a/test/jdk/java/net/httpclient/ShutdownNow.java b/test/jdk/java/net/httpclient/ShutdownNow.java
index a5850b4af61..4f9eabbeb4d 100644
--- a/test/jdk/java/net/httpclient/ShutdownNow.java
+++ b/test/jdk/java/net/httpclient/ShutdownNow.java
@@ -91,7 +91,7 @@ public class ShutdownNow implements HttpServerAdapters {
     }
     static final Random RANDOM = RandomFactory.getRandom();
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
     HttpTestServer httpsTestServer;       // HTTPS/1.1
     HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
@@ -321,10 +321,6 @@ public class ShutdownNow implements HttpServerAdapters {
     @BeforeTest
     public void setup() throws Exception {
         out.println("\n**** Setup ****\n");
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new ServerRequestHandler(), "/http1/exec/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/exec/retry";
diff --git a/test/jdk/java/net/httpclient/SmokeTest.java b/test/jdk/java/net/httpclient/SmokeTest.java
index a10afef562f..42c082a5e0f 100644
--- a/test/jdk/java/net/httpclient/SmokeTest.java
+++ b/test/jdk/java/net/httpclient/SmokeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -121,7 +121,7 @@ import java.util.logging.Logger;
  * in docs directory.
  */
 public class SmokeTest {
-    static SSLContext ctx;
+    private static final SSLContext ctx = SimpleSSLContext.findSSLContext();
     static SSLParameters sslparams;
     static HttpServer s1 ;
     static HttpsServer s2;
@@ -808,7 +808,6 @@ public class SmokeTest {
         executor = Executors.newCachedThreadPool();
         s1.setExecutor(executor);
         s2.setExecutor(executor);
-        ctx = new SimpleSSLContext().get();
         sslparams = ctx.getDefaultSSLParameters();
         //sslparams.setProtocols(new String[]{"TLSv1.2"});
         s2.setHttpsConfigurator(new Configurator(addr.getAddress(), ctx));
diff --git a/test/jdk/java/net/httpclient/SpecialHeadersTest.java b/test/jdk/java/net/httpclient/SpecialHeadersTest.java
index 9ad3114da2a..d33135dd4ce 100644
--- a/test/jdk/java/net/httpclient/SpecialHeadersTest.java
+++ b/test/jdk/java/net/httpclient/SpecialHeadersTest.java
@@ -100,7 +100,7 @@ import static org.testng.Assert.assertTrue;
 
 public class SpecialHeadersTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
     HttpTestServer httpsTestServer;        // HTTPS/1.1
     HttpTestServer http2TestServer;        // HTTP/2 ( h2c )
@@ -555,9 +555,6 @@ public class SpecialHeadersTest implements HttpServerAdapters {
     @BeforeTest
     public void setup() throws Exception {
         out.println("--- Starting setup " + now());
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
 
         HttpTestHandler handler = new HttpUriStringHandler();
         httpTestServer = HttpTestServer.create(HTTP_1_1);
diff --git a/test/jdk/java/net/httpclient/SplitResponse.java b/test/jdk/java/net/httpclient/SplitResponse.java
index 9213901df4b..abc972fd591 100644
--- a/test/jdk/java/net/httpclient/SplitResponse.java
+++ b/test/jdk/java/net/httpclient/SplitResponse.java
@@ -94,11 +94,10 @@ public class SplitResponse {
     };
 
     final ServerSocketFactory factory;
-    final SSLContext context;
+    private static final SSLContext context = SimpleSSLContext.findSSLContext();
     final boolean useSSL;
-    SplitResponse(boolean useSSL) throws IOException {
+    SplitResponse(boolean useSSL) {
         this.useSSL = useSSL;
-        context = new SimpleSSLContext().get();
         SSLContext.setDefault(context);
         factory = useSSL ? SSLServerSocketFactory.getDefault()
                          : ServerSocketFactory.getDefault();
diff --git a/test/jdk/java/net/httpclient/StreamingBody.java b/test/jdk/java/net/httpclient/StreamingBody.java
index bff6a2b39c4..c2ad19cf7b7 100644
--- a/test/jdk/java/net/httpclient/StreamingBody.java
+++ b/test/jdk/java/net/httpclient/StreamingBody.java
@@ -59,7 +59,7 @@ import static org.testng.Assert.assertEquals;
 
 public class StreamingBody implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
     HttpTestServer httpsTestServer;       // HTTPS/1.1
     HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
@@ -126,10 +126,6 @@ public class StreamingBody implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new MessageHandler(), "/http1/streamingbody/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/streamingbody/w";
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishersCustomAfterCancel.java b/test/jdk/java/net/httpclient/ThrowingPublishersCustomAfterCancel.java
index 796c0b8df02..2c1aa2fd9b4 100644
--- a/test/jdk/java/net/httpclient/ThrowingPublishersCustomAfterCancel.java
+++ b/test/jdk/java/net/httpclient/ThrowingPublishersCustomAfterCancel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,20 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker AbstractThrowingPublishers ThrowingPublishersCustomAfterCancel
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.enableAllMethodRetry=true
  *                     ThrowingPublishersCustomAfterCancel
  */
 
-import org.testng.annotations.Test;
 
 import java.util.Set;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingPublishersCustomAfterCancel extends AbstractThrowingPublishers {
 
-    @Test(dataProvider = "afterCancelProviderCustom")
+    @ParameterizedTest
+    @MethodSource("afterCancelProviderCustom")
     public void testThrowingAsString(String uri, boolean sameClient,
                                             Thrower thrower, Set<Where> whereValues)
             throws Exception
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishersCustomBeforeCancel.java b/test/jdk/java/net/httpclient/ThrowingPublishersCustomBeforeCancel.java
index 06343d222b8..ba734185464 100644
--- a/test/jdk/java/net/httpclient/ThrowingPublishersCustomBeforeCancel.java
+++ b/test/jdk/java/net/httpclient/ThrowingPublishersCustomBeforeCancel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,20 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker AbstractThrowingPublishers ThrowingPublishersCustomBeforeCancel
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.enableAllMethodRetry=true
  *                     ThrowingPublishersCustomBeforeCancel
  */
 
-import org.testng.annotations.Test;
 
 import java.util.Set;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingPublishersCustomBeforeCancel extends AbstractThrowingPublishers {
 
-    @Test(dataProvider = "beforeCancelProviderCustom")
+    @ParameterizedTest
+    @MethodSource("beforeCancelProviderCustom")
     public void testThrowingAsString(String uri, boolean sameClient,
                                             Thrower thrower, Set<Where> whereValues)
             throws Exception
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishersIOAfterCancel.java b/test/jdk/java/net/httpclient/ThrowingPublishersIOAfterCancel.java
index 7ed649b2546..a5e819942b4 100644
--- a/test/jdk/java/net/httpclient/ThrowingPublishersIOAfterCancel.java
+++ b/test/jdk/java/net/httpclient/ThrowingPublishersIOAfterCancel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,20 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker AbstractThrowingPublishers ThrowingPublishersIOAfterCancel
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.enableAllMethodRetry=true
  *                     ThrowingPublishersIOAfterCancel
  */
 
-import org.testng.annotations.Test;
 
 import java.util.Set;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingPublishersIOAfterCancel extends AbstractThrowingPublishers {
 
-    @Test(dataProvider = "afterCancelProviderIO")
+    @ParameterizedTest
+    @MethodSource("afterCancelProviderIO")
     public void testThrowingAsString(String uri, boolean sameClient,
                                             Thrower thrower, Set<Where> whereValues)
             throws Exception
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishersIOBeforeCancel.java b/test/jdk/java/net/httpclient/ThrowingPublishersIOBeforeCancel.java
index 3be2eb061cc..e68f83052bd 100644
--- a/test/jdk/java/net/httpclient/ThrowingPublishersIOBeforeCancel.java
+++ b/test/jdk/java/net/httpclient/ThrowingPublishersIOBeforeCancel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,20 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker AbstractThrowingPublishers ThrowingPublishersIOBeforeCancel
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.enableAllMethodRetry=true
  *                     ThrowingPublishersIOBeforeCancel
  */
 
-import org.testng.annotations.Test;
 
 import java.util.Set;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingPublishersIOBeforeCancel extends AbstractThrowingPublishers {
 
-    @Test(dataProvider = "beforeCancelProviderIO")
+    @ParameterizedTest
+    @MethodSource("beforeCancelProviderIO")
     public void testThrowingAsString(String uri, boolean sameClient,
                                             Thrower thrower, Set<Where> whereValues)
             throws Exception
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishersInNextRequest.java b/test/jdk/java/net/httpclient/ThrowingPublishersInNextRequest.java
index eb07b359fc9..62d06fd6019 100644
--- a/test/jdk/java/net/httpclient/ThrowingPublishersInNextRequest.java
+++ b/test/jdk/java/net/httpclient/ThrowingPublishersInNextRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,20 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker AbstractThrowingPublishers ThrowingPublishersInNextRequest
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.enableAllMethodRetry=true
  *                     ThrowingPublishersInNextRequest
  */
 
-import org.testng.annotations.Test;
 
 import java.util.Set;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingPublishersInNextRequest extends AbstractThrowingPublishers {
 
-    @Test(dataProvider = "nextRequestProvider")
+    @ParameterizedTest
+    @MethodSource("nextRequestProvider")
     public void testThrowingAsString(String uri, boolean sameClient,
                                             Thrower thrower, Set<Where> whereValues)
             throws Exception
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishersInRequest.java b/test/jdk/java/net/httpclient/ThrowingPublishersInRequest.java
index ef05e4e0da6..f863f3598ed 100644
--- a/test/jdk/java/net/httpclient/ThrowingPublishersInRequest.java
+++ b/test/jdk/java/net/httpclient/ThrowingPublishersInRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,20 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker AbstractThrowingPublishers ThrowingPublishersInRequest
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.enableAllMethodRetry=true
  *                     ThrowingPublishersInRequest
  */
 
-import org.testng.annotations.Test;
 
 import java.util.Set;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingPublishersInRequest extends AbstractThrowingPublishers {
 
-    @Test(dataProvider = "requestProvider")
+    @ParameterizedTest
+    @MethodSource("requestProvider")
     public void testThrowingAsString(String uri, boolean sameClient,
                                             Thrower thrower, Set<Where> whereValues)
             throws Exception
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishersInSubscribe.java b/test/jdk/java/net/httpclient/ThrowingPublishersInSubscribe.java
index f14c5167024..ce1ad89dc05 100644
--- a/test/jdk/java/net/httpclient/ThrowingPublishersInSubscribe.java
+++ b/test/jdk/java/net/httpclient/ThrowingPublishersInSubscribe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,20 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker AbstractThrowingPublishers ThrowingPublishersInSubscribe
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.enableAllMethodRetry=true
  *                     ThrowingPublishersInSubscribe
  */
 
-import org.testng.annotations.Test;
 
 import java.util.Set;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingPublishersInSubscribe extends AbstractThrowingPublishers {
 
-    @Test(dataProvider = "subscribeProvider")
+    @ParameterizedTest
+    @MethodSource("subscribeProvider")
     public void testThrowingAsString(String uri, boolean sameClient,
                                             Thrower thrower, Set<Where> whereValues)
             throws Exception
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishersSanity.java b/test/jdk/java/net/httpclient/ThrowingPublishersSanity.java
index 30549083310..eee2f9ab7fb 100644
--- a/test/jdk/java/net/httpclient/ThrowingPublishersSanity.java
+++ b/test/jdk/java/net/httpclient/ThrowingPublishersSanity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,16 +29,18 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker AbstractThrowingPublishers ThrowingPublishersSanity
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.enableAllMethodRetry=true
  *                     ThrowingPublishersSanity
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingPublishersSanity extends AbstractThrowingPublishers {
 
-    @Test(dataProvider = "sanity")
+    @ParameterizedTest
+    @MethodSource("sanity")
     public void testSanity(String uri, boolean sameClient)
             throws Exception {
         super.testSanityImpl(uri,sameClient);
diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamCustom.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamCustom.java
index 0b66a8e913e..797507ac7ad 100644
--- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamCustom.java
+++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamCustom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,14 +30,16 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *       ReferenceTracker AbstractThrowingPushPromises ThrowingPushPromisesAsInputStreamCustom
  *       jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingPushPromisesAsInputStreamCustom
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true ThrowingPushPromisesAsInputStreamCustom
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingPushPromisesAsInputStreamCustom extends AbstractThrowingPushPromises {
 
-    @Test(dataProvider = "customVariants")
+    @ParameterizedTest
+    @MethodSource("customVariants")
     public void testThrowingAsInputStream(String uri, boolean sameClient, Thrower thrower)
             throws Exception {
         super.testThrowingAsInputStreamImpl(uri, sameClient, thrower);
diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamIO.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamIO.java
index 89cf1162bc3..309f60c0f22 100644
--- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamIO.java
+++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamIO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,14 +30,16 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker AbstractThrowingPushPromises ThrowingPushPromisesAsInputStreamIO
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingPushPromisesAsInputStreamIO
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true ThrowingPushPromisesAsInputStreamIO
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingPushPromisesAsInputStreamIO extends AbstractThrowingPushPromises {
 
-    @Test(dataProvider = "ioVariants")
+    @ParameterizedTest
+    @MethodSource("ioVariants")
     public void testThrowingAsInputStream(String uri, boolean sameClient, Thrower thrower)
             throws Exception {
         super.testThrowingAsInputStreamImpl(uri, sameClient, thrower);
diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesCustom.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesCustom.java
index d1fb7d34258..77c87151e19 100644
--- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesCustom.java
+++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesCustom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,14 +30,16 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker AbstractThrowingPushPromises ThrowingPushPromisesAsLinesCustom
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingPushPromisesAsLinesCustom
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true ThrowingPushPromisesAsLinesCustom
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingPushPromisesAsLinesCustom extends AbstractThrowingPushPromises {
 
-    @Test(dataProvider = "customVariants")
+    @ParameterizedTest
+    @MethodSource("customVariants")
     public void testThrowingAsLines(String uri, boolean sameClient, Thrower thrower)
             throws Exception {
         super.testThrowingAsLinesImpl(uri, sameClient, thrower);
diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesIO.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesIO.java
index 88afaf3dbd5..69deeec533a 100644
--- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesIO.java
+++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesIO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,14 +30,16 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker AbstractThrowingPushPromises ThrowingPushPromisesAsLinesIO
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingPushPromisesAsLinesIO
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true ThrowingPushPromisesAsLinesIO
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingPushPromisesAsLinesIO extends AbstractThrowingPushPromises {
 
-    @Test(dataProvider = "ioVariants")
+    @ParameterizedTest
+    @MethodSource("ioVariants")
     public void testThrowingAsLines(String uri, boolean sameClient, Thrower thrower)
             throws Exception {
         super.testThrowingAsLinesImpl(uri, sameClient, thrower);
diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringCustom.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringCustom.java
index c40af0ab0b0..de38cf4f782 100644
--- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringCustom.java
+++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringCustom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,14 +30,16 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker AbstractThrowingPushPromises ThrowingPushPromisesAsStringCustom
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingPushPromisesAsStringCustom
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true ThrowingPushPromisesAsStringCustom
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingPushPromisesAsStringCustom extends AbstractThrowingPushPromises {
 
-    @Test(dataProvider = "customVariants")
+    @ParameterizedTest
+    @MethodSource("customVariants")
     public void testThrowingAsString(String uri, boolean sameClient, Thrower thrower)
             throws Exception {
         super.testThrowingAsStringImpl(uri, sameClient, thrower);
diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringIO.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringIO.java
index 6485e82af8f..ec4d682d73f 100644
--- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringIO.java
+++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringIO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,14 +30,16 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker AbstractThrowingPushPromises ThrowingPushPromisesAsStringIO
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingPushPromisesAsStringIO
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true ThrowingPushPromisesAsStringIO
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingPushPromisesAsStringIO extends AbstractThrowingPushPromises {
 
-    @Test(dataProvider = "ioVariants")
+    @ParameterizedTest
+    @MethodSource("ioVariants")
     public void testThrowingAsString(String uri, boolean sameClient, Thrower thrower)
             throws Exception {
         super.testThrowingAsStringImpl(uri, sameClient, thrower);
diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesSanity.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesSanity.java
index 7fdb6dcb19d..92f2ab3726d 100644
--- a/test/jdk/java/net/httpclient/ThrowingPushPromisesSanity.java
+++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesSanity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,14 +30,16 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker AbstractThrowingPushPromises ThrowingPushPromisesSanity
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingPushPromisesSanity
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true ThrowingPushPromisesSanity
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingPushPromisesSanity extends AbstractThrowingPushPromises {
 
-    @Test(dataProvider = "sanity")
+    @ParameterizedTest
+    @MethodSource("sanity")
     public void testSanity(String uri, boolean sameClient)
             throws Exception {
         super.testSanityImpl(uri, sameClient);
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribersAsInputStream.java b/test/jdk/java/net/httpclient/ThrowingSubscribersAsInputStream.java
index 35ac1fd3f9c..a4c0fc72004 100644
--- a/test/jdk/java/net/httpclient/ThrowingSubscribersAsInputStream.java
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribersAsInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,14 +29,16 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker ThrowingSubscribersAsInputStream AbstractThrowingSubscribers
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersAsInputStream
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersAsInputStream
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingSubscribersAsInputStream extends AbstractThrowingSubscribers {
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testThrowingAsInputStream(String uri, boolean sameClient, Thrower thrower)
             throws Exception {
         super.testThrowingAsInputStreamImpl(uri, sameClient, thrower);
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribersAsInputStreamAsync.java b/test/jdk/java/net/httpclient/ThrowingSubscribersAsInputStreamAsync.java
index db25ebaca3e..aec4641917c 100644
--- a/test/jdk/java/net/httpclient/ThrowingSubscribersAsInputStreamAsync.java
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribersAsInputStreamAsync.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,14 +29,16 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker ThrowingSubscribersAsInputStreamAsync AbstractThrowingSubscribers
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersAsInputStreamAsync
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersAsInputStreamAsync
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingSubscribersAsInputStreamAsync extends AbstractThrowingSubscribers {
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testThrowingAsInputStreamAsync(String uri, boolean sameClient, Thrower thrower)
             throws Exception {
         super.testThrowingAsInputStreamAsyncImpl(uri, sameClient, thrower);
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribersAsLimiting.java b/test/jdk/java/net/httpclient/ThrowingSubscribersAsLimiting.java
index 11ced214ece..603a8558856 100644
--- a/test/jdk/java/net/httpclient/ThrowingSubscribersAsLimiting.java
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribersAsLimiting.java
@@ -35,18 +35,20 @@
  *        ReferenceTracker
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersAsLimiting
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersAsLimiting
  */
 
-import org.testng.annotations.Test;
 
 import java.net.http.HttpResponse;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingSubscribersAsLimiting extends AbstractThrowingSubscribers {
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void test(String uri, boolean sameClient, Thrower thrower) throws Exception {
         test(uri, sameClient, thrower, false);
     }
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribersAsLimitingAsync.java b/test/jdk/java/net/httpclient/ThrowingSubscribersAsLimitingAsync.java
index 00e00c12db5..e45c6d6487e 100644
--- a/test/jdk/java/net/httpclient/ThrowingSubscribersAsLimitingAsync.java
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribersAsLimitingAsync.java
@@ -35,15 +35,17 @@
  *        ReferenceTracker
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersAsLimitingAsync
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersAsLimitingAsync
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingSubscribersAsLimitingAsync extends ThrowingSubscribersAsLimiting {
 
     @Override
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void test(String uri, boolean sameClient, Thrower thrower) throws Exception {
         test(uri, sameClient, thrower, true);
     }
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribersAsLines.java b/test/jdk/java/net/httpclient/ThrowingSubscribersAsLines.java
index f303ef12b54..ba594166b72 100644
--- a/test/jdk/java/net/httpclient/ThrowingSubscribersAsLines.java
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribersAsLines.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,14 +29,16 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker ThrowingSubscribersAsLines AbstractThrowingSubscribers
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersAsLines
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersAsLines
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingSubscribersAsLines extends AbstractThrowingSubscribers {
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testThrowingAsLines(String uri, boolean sameClient, Thrower thrower)
             throws Exception {
         super.testThrowingAsLinesImpl(uri, sameClient, thrower);
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribersAsLinesAsync.java b/test/jdk/java/net/httpclient/ThrowingSubscribersAsLinesAsync.java
index 2e1fc942a73..a76ff882463 100644
--- a/test/jdk/java/net/httpclient/ThrowingSubscribersAsLinesAsync.java
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribersAsLinesAsync.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,14 +29,16 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker ThrowingSubscribersAsLinesAsync AbstractThrowingSubscribers
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersAsLinesAsync
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersAsLinesAsync
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingSubscribersAsLinesAsync extends AbstractThrowingSubscribers {
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testThrowingAsLinesAsync(String uri, boolean sameClient, Thrower thrower)
             throws Exception {
         super.testThrowingAsLinesAsyncImpl(uri, sameClient, thrower);
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribersAsString.java b/test/jdk/java/net/httpclient/ThrowingSubscribersAsString.java
index 56e444f09c2..ba550675096 100644
--- a/test/jdk/java/net/httpclient/ThrowingSubscribersAsString.java
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribersAsString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,14 +29,16 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker ThrowingSubscribersAsString AbstractThrowingSubscribers
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersAsString
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersAsString
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingSubscribersAsString extends AbstractThrowingSubscribers {
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testThrowingAsString(String uri, boolean sameClient, Thrower thrower)
             throws Exception {
         super.testThrowingAsStringImpl(uri, sameClient, thrower);
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribersAsStringAsync.java b/test/jdk/java/net/httpclient/ThrowingSubscribersAsStringAsync.java
index 563fe39bd69..304d98e6939 100644
--- a/test/jdk/java/net/httpclient/ThrowingSubscribersAsStringAsync.java
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribersAsStringAsync.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,14 +29,16 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker ThrowingSubscribersAsStringAsync AbstractThrowingSubscribers
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersAsStringAsync
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersAsStringAsync
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingSubscribersAsStringAsync extends AbstractThrowingSubscribers {
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testThrowingAsStringAsync(String uri, boolean sameClient, Thrower thrower)
             throws Exception {
         super.testThrowingAsStringAsyncImpl(uri, sameClient, thrower);
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribersSanity.java b/test/jdk/java/net/httpclient/ThrowingSubscribersSanity.java
index c480d55e147..296e9151c9e 100644
--- a/test/jdk/java/net/httpclient/ThrowingSubscribersSanity.java
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribersSanity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,14 +29,16 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker ThrowingSubscribersSanity AbstractThrowingSubscribers
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersSanity
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribersSanity
  */
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ThrowingSubscribersSanity extends AbstractThrowingSubscribers {
 
-    @Test(dataProvider = "sanity")
+    @ParameterizedTest
+    @MethodSource("sanity")
     public void testSanity(String uri, boolean sameClient)
             throws Exception {
         super.testSanityImpl(uri, sameClient);
diff --git a/test/jdk/java/net/httpclient/TimeoutBasic.java b/test/jdk/java/net/httpclient/TimeoutBasic.java
index 6ecd2564f54..cae1cda7ade 100644
--- a/test/jdk/java/net/httpclient/TimeoutBasic.java
+++ b/test/jdk/java/net/httpclient/TimeoutBasic.java
@@ -83,11 +83,7 @@ public class TimeoutBasic {
     static final List<String> SCHEMES = List.of("https", "http");
 
     static {
-        try {
-            SSLContext.setDefault(new SimpleSSLContext().get());
-        } catch (IOException x) {
-            throw new ExceptionInInitializerError(x);
-        }
+        SSLContext.setDefault(SimpleSSLContext.findSSLContext());
     }
 
     public static void main(String[] args) throws Exception {
diff --git a/test/jdk/java/net/httpclient/TimeoutResponseTestSupport.java b/test/jdk/java/net/httpclient/TimeoutResponseTestSupport.java
index 4da63a2dff9..67b993eef0b 100644
--- a/test/jdk/java/net/httpclient/TimeoutResponseTestSupport.java
+++ b/test/jdk/java/net/httpclient/TimeoutResponseTestSupport.java
@@ -72,7 +72,7 @@ public class TimeoutResponseTestSupport {
 
     private static final Logger LOGGER = Utils.getDebugLogger(CLASS_NAME::toString, Utils.DEBUG);
 
-    private static final SSLContext SSL_CONTEXT = createSslContext();
+    private static final SSLContext SSL_CONTEXT = SimpleSSLContext.findSSLContext();
 
     protected static final Duration REQUEST_TIMEOUT =
             Duration.ofMillis(Long.parseLong(System.getProperty("test.requestTimeoutMillis")));
@@ -126,14 +126,6 @@ public class TimeoutResponseTestSupport {
             HTTPS2 = ServerRequestPair.of(Version.HTTP_2, true),
             HTTP3 = ServerRequestPair.of(Version.HTTP_3, true);
 
-    private static SSLContext createSslContext() {
-        try {
-            return new SimpleSSLContext().get();
-        } catch (IOException exception) {
-            throw new UncheckedIOException(exception);
-        }
-    }
-
     protected record ServerRequestPair(HttpTestServer server, HttpRequest request, boolean secure) {
 
         private static final ExecutorService EXECUTOR = Executors.newVirtualThreadPerTaskExecutor();
diff --git a/test/jdk/java/net/httpclient/TlsContextTest.java b/test/jdk/java/net/httpclient/TlsContextTest.java
index 86b067f66f8..8a5cc99aad3 100644
--- a/test/jdk/java/net/httpclient/TlsContextTest.java
+++ b/test/jdk/java/net/httpclient/TlsContextTest.java
@@ -75,7 +75,7 @@ public class TlsContextTest implements HttpServerAdapters {
         // Re-enable TLSv1 and TLSv1.1 since test depends on them
         SecurityUtils.removeFromDisabledTlsAlgs("TLSv1", "TLSv1.1");
 
-        server = SimpleSSLContext.getContext("TLS");
+        server = SimpleSSLContext.findSSLContext("TLS");
         final ExecutorService executor = Executors.newCachedThreadPool();
         https2Server = HttpTestServer.of(
                 new Http2TestServer("localhost", true, 0, executor, 50, null, server, true)
@@ -89,13 +89,13 @@ public class TlsContextTest implements HttpServerAdapters {
     @DataProvider(name = "scenarios")
     public Object[][] scenarios() throws Exception {
         return new Object[][]{
-                { SimpleSSLContext.getContext("TLS"),     HTTP_2,   "TLSv1.3" },
-                { SimpleSSLContext.getContext("TLSv1.2"), HTTP_2,   "TLSv1.2" },
-                { SimpleSSLContext.getContext("TLSv1.1"), HTTP_1_1, "TLSv1.1" },
-                { SimpleSSLContext.getContext("TLSv1.1"), HTTP_2,   "TLSv1.1" },
-                { SimpleSSLContext.getContext("TLSv1.3"), HTTP_3,   "TLSv1.3" },
-                { SimpleSSLContext.getContext("TLSv1.2"), HTTP_3,   "TLSv1.2" },
-                { SimpleSSLContext.getContext("TLSv1.1"), HTTP_3,   "TLSv1.1" },
+                { SimpleSSLContext.findSSLContext("TLS"),     HTTP_2,   "TLSv1.3" },
+                { SimpleSSLContext.findSSLContext("TLSv1.2"), HTTP_2,   "TLSv1.2" },
+                { SimpleSSLContext.findSSLContext("TLSv1.1"), HTTP_1_1, "TLSv1.1" },
+                { SimpleSSLContext.findSSLContext("TLSv1.1"), HTTP_2,   "TLSv1.1" },
+                { SimpleSSLContext.findSSLContext("TLSv1.3"), HTTP_3,   "TLSv1.3" },
+                { SimpleSSLContext.findSSLContext("TLSv1.2"), HTTP_3,   "TLSv1.2" },
+                { SimpleSSLContext.findSSLContext("TLSv1.1"), HTTP_3,   "TLSv1.1" },
         };
     }
 
diff --git a/test/jdk/java/net/httpclient/UnauthorizedTest.java b/test/jdk/java/net/httpclient/UnauthorizedTest.java
index 0c8c2b1d2cd..628130f9ffc 100644
--- a/test/jdk/java/net/httpclient/UnauthorizedTest.java
+++ b/test/jdk/java/net/httpclient/UnauthorizedTest.java
@@ -70,7 +70,7 @@ import static org.testng.Assert.assertTrue;
 
 public class UnauthorizedTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;        // HTTP/1.1
     HttpTestServer httpsTestServer;       // HTTPS/1.1
     HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
@@ -207,10 +207,6 @@ public class UnauthorizedTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new UnauthorizedHandler(), "/http1/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1";
diff --git a/test/jdk/java/net/httpclient/UnknownBodyLengthTest.java b/test/jdk/java/net/httpclient/UnknownBodyLengthTest.java
index cb3d083669b..6c7fabb7f00 100644
--- a/test/jdk/java/net/httpclient/UnknownBodyLengthTest.java
+++ b/test/jdk/java/net/httpclient/UnknownBodyLengthTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@ import jdk.test.lib.net.SimpleSSLContext;
 public class UnknownBodyLengthTest {
     static final byte[] BUF = new byte[32 * 10234 + 2];
 
-    volatile SSLContext ctx;
+    private static final SSLContext ctx = SimpleSSLContext.findSSLContext();
     volatile ServerSocketFactory factory;
     volatile String clientURL;
     volatile int port;
@@ -67,7 +67,6 @@ public class UnknownBodyLengthTest {
     final List<Socket> acceptedList = new CopyOnWriteArrayList<>();
 
     UnknownBodyLengthTest(boolean useSSL) throws Exception {
-        ctx = new SimpleSSLContext().get();
         SSLContext.setDefault(ctx);
         factory = useSSL ? SSLServerSocketFactory.getDefault()
                          : ServerSocketFactory.getDefault();
diff --git a/test/jdk/java/net/httpclient/UserAuthWithAuthenticator.java b/test/jdk/java/net/httpclient/UserAuthWithAuthenticator.java
index ee28980c035..90df367a619 100644
--- a/test/jdk/java/net/httpclient/UserAuthWithAuthenticator.java
+++ b/test/jdk/java/net/httpclient/UserAuthWithAuthenticator.java
@@ -88,7 +88,7 @@ class UserAuthWithAuthenticator {
     }
 
     private static void h2Test(final boolean useHeader, boolean rightPassword) throws Exception {
-        SSLContext sslContext = new SimpleSSLContext().get();
+        SSLContext sslContext = SimpleSSLContext.findSSLContext();
         try (ExecutorService executor = Executors.newCachedThreadPool();
              HttpTestServer server = HttpTestServer.of(new Http2TestServer(
                      InetAddress.getLoopbackAddress(),
@@ -117,7 +117,7 @@ class UserAuthWithAuthenticator {
     }
 
     private static void h3Test(final boolean useHeader, boolean rightPassword) throws Exception {
-        SSLContext sslContext = new SimpleSSLContext().get();
+        SSLContext sslContext = SimpleSSLContext.findSSLContext();
         try (ExecutorService executor = Executors.newCachedThreadPool();
              HttpTestServer server = HttpTestServer.create(Http3DiscoveryMode.HTTP_3_URI_ONLY, sslContext, executor);
              HttpClient client = HttpServerAdapters.createClientBuilderForH3()
diff --git a/test/jdk/java/net/httpclient/UserCookieTest.java b/test/jdk/java/net/httpclient/UserCookieTest.java
index 50a13e48322..3d202914050 100644
--- a/test/jdk/java/net/httpclient/UserCookieTest.java
+++ b/test/jdk/java/net/httpclient/UserCookieTest.java
@@ -84,7 +84,7 @@ import static org.testng.Assert.assertEquals;
 
 public class UserCookieTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer httpTestServer;        // HTTP/1.1    [ 7 servers ]
     HttpTestServer httpsTestServer;       // HTTPS/1.1
     HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
@@ -202,10 +202,6 @@ public class UserCookieTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new CookieValidationHandler(), "/http1/cookie/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/cookie/retry";
diff --git a/test/jdk/java/net/httpclient/altsvc/altsvc-dns-hosts.txt b/test/jdk/java/net/httpclient/altsvc/altsvc-dns-hosts.txt
index 67445f3b278..e91402dc6d9 100644
--- a/test/jdk/java/net/httpclient/altsvc/altsvc-dns-hosts.txt
+++ b/test/jdk/java/net/httpclient/altsvc/altsvc-dns-hosts.txt
@@ -1,4 +1,4 @@
-## Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+## Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
 ## DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ##
 ## This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/net/httpclient/http2/BadHeadersTest.java b/test/jdk/java/net/httpclient/http2/BadHeadersTest.java
index 4ee95678acb..3bb80031178 100644
--- a/test/jdk/java/net/httpclient/http2/BadHeadersTest.java
+++ b/test/jdk/java/net/httpclient/http2/BadHeadersTest.java
@@ -87,7 +87,7 @@ public class BadHeadersTest {
         of(entry("hello", "world!"), entry(":status", "200"))                      // Pseudo header is not the first one
     );
 
-    private static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private static Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
     private static Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
     private static String http2URI;
@@ -242,10 +242,6 @@ public class BadHeadersTest {
 
     @BeforeAll
     static void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         http2TestServer = new Http2TestServer("localhost", false, 0);
         http2TestServer.addHandler(new Http2EchoHandler(), "/http2/echo");
         int port = http2TestServer.getAddress().getPort();
diff --git a/test/jdk/java/net/httpclient/http2/BasicTest.java b/test/jdk/java/net/httpclient/http2/BasicTest.java
index 0c64be84926..58ab191fc6f 100644
--- a/test/jdk/java/net/httpclient/http2/BasicTest.java
+++ b/test/jdk/java/net/httpclient/http2/BasicTest.java
@@ -70,14 +70,12 @@ public class BasicTest {
     static HttpClient client = null;
     static ExecutorService clientExec;
     static ExecutorService serverExec;
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
     static String pingURIString, httpURIString, httpsURIString;
 
     static void initialize() throws Exception {
         try {
-            SimpleSSLContext sslct = new SimpleSSLContext();
-            sslContext = sslct.get();
             client = getClient();
             httpServer = new Http2TestServer(false, 0, serverExec, sslContext);
             httpServer.addHandler(new Http2EchoHandler(), "/");
diff --git a/test/jdk/java/net/httpclient/http2/ConnectionFlowControlTest.java b/test/jdk/java/net/httpclient/http2/ConnectionFlowControlTest.java
index 767d31f13e5..1b9396effbb 100644
--- a/test/jdk/java/net/httpclient/http2/ConnectionFlowControlTest.java
+++ b/test/jdk/java/net/httpclient/http2/ConnectionFlowControlTest.java
@@ -74,7 +74,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class ConnectionFlowControlTest {
 
-    private static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
     private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
     private static String http2URI;
@@ -240,10 +240,6 @@ public class ConnectionFlowControlTest {
 
     @BeforeAll
     static void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         var http2TestServerLocal = new Http2TestServer("localhost", false, 0);
         http2TestServerLocal.addHandler(new Http2TestHandler(), "/http2/");
         http2TestServer = HttpTestServer.of(http2TestServerLocal);
diff --git a/test/jdk/java/net/httpclient/http2/ConnectionReuseTest.java b/test/jdk/java/net/httpclient/http2/ConnectionReuseTest.java
index 24e7dded842..360eabaee2b 100644
--- a/test/jdk/java/net/httpclient/http2/ConnectionReuseTest.java
+++ b/test/jdk/java/net/httpclient/http2/ConnectionReuseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
  */
 public class ConnectionReuseTest {
 
-    private static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private static HttpTestServer http2_Server; // h2 server over HTTP
     private static HttpTestServer https2_Server; // h2 server over HTTPS
 
@@ -80,8 +80,6 @@ public class ConnectionReuseTest {
             // if IPv6 isn't supported on this host
             Assumptions.assumeTrue(IPSupport.hasIPv6(), "Skipping tests - IPv6 is not supported");
         }
-        sslContext = new SimpleSSLContext().get();
-        assertNotNull(sslContext, "Unexpected null sslContext");
 
         http2_Server = HttpTestServer.create(HTTP_2);
         http2_Server.addHandler(new Handler(), "/");
diff --git a/test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java b/test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java
index f8788da67a4..c72beb04d56 100644
--- a/test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java
+++ b/test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java
@@ -70,7 +70,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ContinuationFrameTest {
 
-    private static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private static Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
     private static Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
     private static String http2URI;
@@ -210,10 +210,6 @@ public class ContinuationFrameTest {
 
     @BeforeAll
     static void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         http2TestServer = new Http2TestServer("localhost", false, 0);
         http2TestServer.addHandler(new Http2EchoHandler(), "/http2/echo");
         http2TestServer.addHandler(new Http2NoBodyHandler(), "/http2/nobody");
diff --git a/test/jdk/java/net/httpclient/http2/ErrorTest.java b/test/jdk/java/net/httpclient/http2/ErrorTest.java
index e8613b9efa8..6ecc27441e1 100644
--- a/test/jdk/java/net/httpclient/http2/ErrorTest.java
+++ b/test/jdk/java/net/httpclient/http2/ErrorTest.java
@@ -82,7 +82,7 @@ public class ErrorTest {
     //@Test(timeOut=5000)
     @Test
     public void test() throws Exception {
-        SSLContext sslContext = (new SimpleSSLContext()).get();
+        SSLContext sslContext = SimpleSSLContext.findSSLContext();
         ExecutorService exec = Executors.newCachedThreadPool();
         HttpClient client = HttpClient.newBuilder()
                                       .executor(exec)
@@ -93,7 +93,7 @@ public class ErrorTest {
 
         Http2TestServer httpsServer = null;
         try {
-            SSLContext serverContext = (new SimpleSSLContext()).get();
+            SSLContext serverContext = SimpleSSLContext.findSSLContext();
             SSLParameters p = serverContext.getSupportedSSLParameters();
             p.setApplicationProtocols(new String[]{"h2"});
             httpsServer = new Http2TestServer(true,
diff --git a/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java b/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java
index 68cfe826a0e..0f807c33dff 100644
--- a/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java
+++ b/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java
@@ -62,14 +62,12 @@ public class FixedThreadPoolTest {
     static Http2TestServer httpServer, httpsServer;
     static HttpClient client = null;
     static ExecutorService exec;
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
     static String httpURIString, httpsURIString;
 
     static void initialize() throws Exception {
         try {
-            SimpleSSLContext sslct = new SimpleSSLContext();
-            sslContext = sslct.get();
             client = getClient();
             httpServer = new Http2TestServer(false, 0, exec, sslContext);
             httpServer.addHandler(new Http2EchoHandler(), "/");
diff --git a/test/jdk/java/net/httpclient/http2/H2GoAwayTest.java b/test/jdk/java/net/httpclient/http2/H2GoAwayTest.java
index c5db99ce164..08c32171d16 100644
--- a/test/jdk/java/net/httpclient/http2/H2GoAwayTest.java
+++ b/test/jdk/java/net/httpclient/http2/H2GoAwayTest.java
@@ -69,12 +69,10 @@ public class H2GoAwayTest {
     private static final String REQ_PATH = "/test";
     private static HttpTestServer server;
     private static String REQ_URI_BASE;
-    private static SSLContext sslCtx;
+    private static final SSLContext sslCtx = SimpleSSLContext.findSSLContext();
 
     @BeforeAll
     static void beforeAll() throws Exception {
-        sslCtx = new SimpleSSLContext().get();
-        assertNotNull(sslCtx, "SSLContext couldn't be created");
         server = HttpTestServer.create(HTTP_2, sslCtx);
         server.addHandler(new Handler(), REQ_PATH);
         server.start();
diff --git a/test/jdk/java/net/httpclient/http2/H2SelectorVTTest.java b/test/jdk/java/net/httpclient/http2/H2SelectorVTTest.java
index b980df99138..85d4012494a 100644
--- a/test/jdk/java/net/httpclient/http2/H2SelectorVTTest.java
+++ b/test/jdk/java/net/httpclient/http2/H2SelectorVTTest.java
@@ -110,7 +110,7 @@ import static java.net.http.HttpClient.Version.HTTP_2;
 // -Djava.security.debug=all
 class H2SelectorVTTest implements HttpServerAdapters {
 
-    private static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private static HttpTestServer h2Server;
     private static String requestURI;
 
@@ -135,10 +135,6 @@ class H2SelectorVTTest implements HttpServerAdapters {
 
     @BeforeAll
     static void beforeClass() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         // create a h2 server
         h2Server = HttpTestServer.create(HTTP_2, sslContext);
         h2Server.addHandler((exchange) -> exchange.sendResponseHeaders(200, 0), "/hello");
diff --git a/test/jdk/java/net/httpclient/http2/HpackBinaryTestDriver.java b/test/jdk/java/net/httpclient/http2/HpackBinaryTestDriver.java
index 4c63e863fee..ed68695ec77 100644
--- a/test/jdk/java/net/httpclient/http2/HpackBinaryTestDriver.java
+++ b/test/jdk/java/net/httpclient/http2/HpackBinaryTestDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,6 @@
  * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
- * @run testng/othervm/timeout=240 java.net.http/jdk.internal.net.http.hpack.BinaryPrimitivesTest
+ * @run junit/othervm/timeout=240 java.net.http/jdk.internal.net.http.hpack.BinaryPrimitivesTest
  */
 public class HpackBinaryTestDriver { }
diff --git a/test/jdk/java/net/httpclient/http2/HpackCircularBufferDriver.java b/test/jdk/java/net/httpclient/http2/HpackCircularBufferDriver.java
index 64ba1a3d22e..81ee9edc135 100644
--- a/test/jdk/java/net/httpclient/http2/HpackCircularBufferDriver.java
+++ b/test/jdk/java/net/httpclient/http2/HpackCircularBufferDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,6 @@
  * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
- * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.CircularBufferTest
+ * @run junit/othervm java.net.http/jdk.internal.net.http.hpack.CircularBufferTest
  */
 public class HpackCircularBufferDriver { }
diff --git a/test/jdk/java/net/httpclient/http2/HpackDecoderDriver.java b/test/jdk/java/net/httpclient/http2/HpackDecoderDriver.java
index 15bd92a1398..ca04e9895ab 100644
--- a/test/jdk/java/net/httpclient/http2/HpackDecoderDriver.java
+++ b/test/jdk/java/net/httpclient/http2/HpackDecoderDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,6 @@
  * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
- * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.DecoderTest
+ * @run junit/othervm java.net.http/jdk.internal.net.http.hpack.DecoderTest
  */
 public class HpackDecoderDriver { }
diff --git a/test/jdk/java/net/httpclient/http2/HpackEncoderDriver.java b/test/jdk/java/net/httpclient/http2/HpackEncoderDriver.java
index 12475ccbca9..b052e20f085 100644
--- a/test/jdk/java/net/httpclient/http2/HpackEncoderDriver.java
+++ b/test/jdk/java/net/httpclient/http2/HpackEncoderDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,6 @@
  * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
- * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.EncoderTest
+ * @run junit/othervm java.net.http/jdk.internal.net.http.hpack.EncoderTest
  */
 public class HpackEncoderDriver { }
diff --git a/test/jdk/java/net/httpclient/http2/HpackHeaderTableDriver.java b/test/jdk/java/net/httpclient/http2/HpackHeaderTableDriver.java
index ceb31da4f36..5cb1aa2bacc 100644
--- a/test/jdk/java/net/httpclient/http2/HpackHeaderTableDriver.java
+++ b/test/jdk/java/net/httpclient/http2/HpackHeaderTableDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,6 @@
  * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
- * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.HeaderTableTest
+ * @run junit/othervm java.net.http/jdk.internal.net.http.hpack.HeaderTableTest
  */
 public class HpackHeaderTableDriver { }
diff --git a/test/jdk/java/net/httpclient/http2/HpackHuffmanDriver.java b/test/jdk/java/net/httpclient/http2/HpackHuffmanDriver.java
index 650ed706c51..b4c6cff7a2f 100644
--- a/test/jdk/java/net/httpclient/http2/HpackHuffmanDriver.java
+++ b/test/jdk/java/net/httpclient/http2/HpackHuffmanDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,6 @@
  * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
- * @run testng/othervm/timeout=300 java.net.http/jdk.internal.net.http.hpack.HuffmanTest
+ * @run junit/othervm/timeout=300 java.net.http/jdk.internal.net.http.hpack.HuffmanTest
  */
 public class HpackHuffmanDriver { }
diff --git a/test/jdk/java/net/httpclient/http2/HpackTestHelper.java b/test/jdk/java/net/httpclient/http2/HpackTestHelper.java
index 3faa669c57b..09de50eeef9 100644
--- a/test/jdk/java/net/httpclient/http2/HpackTestHelper.java
+++ b/test/jdk/java/net/httpclient/http2/HpackTestHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,6 @@
  * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
- * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.TestHelper
+ * @run junit/othervm java.net.http/jdk.internal.net.http.hpack.TestHelper
  */
 public class HpackTestHelperDriver { }
diff --git a/test/jdk/java/net/httpclient/http2/NoBodyTest.java b/test/jdk/java/net/httpclient/http2/NoBodyTest.java
index 4dcd99e2c87..3d30c54654a 100644
--- a/test/jdk/java/net/httpclient/http2/NoBodyTest.java
+++ b/test/jdk/java/net/httpclient/http2/NoBodyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,15 +57,13 @@ public class NoBodyTest {
     static HttpClient client = null;
     static ExecutorService clientExec;
     static ExecutorService serverExec;
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     static String TEST_STRING = "The quick brown fox jumps over the lazy dog ";
 
     static String httpURIString, httpsURIString;
 
     static void initialize() throws Exception {
         try {
-            SimpleSSLContext sslct = new SimpleSSLContext();
-            sslContext = sslct.get();
             client = getClient();
             httpServer = new Http2TestServer(false, 0, serverExec, sslContext);
             httpServer.addHandler(new Handler(), "/");
diff --git a/test/jdk/java/net/httpclient/http2/ProxyTest2.java b/test/jdk/java/net/httpclient/http2/ProxyTest2.java
index 2fdb1b360e1..762a70b95fd 100644
--- a/test/jdk/java/net/httpclient/http2/ProxyTest2.java
+++ b/test/jdk/java/net/httpclient/http2/ProxyTest2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,11 +64,7 @@ import java.util.concurrent.*;
 public class ProxyTest2 {
 
     static {
-        try {
-            SSLContext.setDefault(new SimpleSSLContext().get());
-        } catch (IOException ex) {
-            throw new ExceptionInInitializerError(ex);
-        }
+        SSLContext.setDefault(SimpleSSLContext.findSSLContext());
     }
 
     static final String RESPONSE = "<html><body><p>Hello World!</body></html>";
diff --git a/test/jdk/java/net/httpclient/http2/SimpleGet.java b/test/jdk/java/net/httpclient/http2/SimpleGet.java
index 8a65292a65d..692a6583b63 100644
--- a/test/jdk/java/net/httpclient/http2/SimpleGet.java
+++ b/test/jdk/java/net/httpclient/http2/SimpleGet.java
@@ -70,14 +70,12 @@ import static java.net.http.HttpClient.Version.HTTP_2;
 public class SimpleGet implements HttpServerAdapters {
     static HttpTestServer httpsServer;
     static HttpClient client = null;
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     static String httpsURIString;
     static ExecutorService serverExec = Executors.newVirtualThreadPerTaskExecutor();
 
     static void initialize() throws Exception {
         try {
-            SimpleSSLContext sslct = new SimpleSSLContext();
-            sslContext = sslct.get();
             client = getClient();
 
             httpsServer = HttpTestServer.create(HTTP_2, sslContext, serverExec);
@@ -94,9 +92,6 @@ public class SimpleGet implements HttpServerAdapters {
     }
 
     private static void warmup() throws Exception {
-        SimpleSSLContext sslct = new SimpleSSLContext();
-        var sslContext = sslct.get();
-
         // warmup server
         try (var client2 = createClient(sslContext)) {
             HttpRequest request = HttpRequest.newBuilder(URI.create(httpsURIString))
diff --git a/test/jdk/java/net/httpclient/http2/StreamFlowControlTest.java b/test/jdk/java/net/httpclient/http2/StreamFlowControlTest.java
index 3e4ee4864f5..3edf0b71305 100644
--- a/test/jdk/java/net/httpclient/http2/StreamFlowControlTest.java
+++ b/test/jdk/java/net/httpclient/http2/StreamFlowControlTest.java
@@ -76,12 +76,15 @@ import static org.testng.Assert.fail;
 
 public class StreamFlowControlTest {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
     HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
     String http2URI;
     String https2URI;
     final AtomicInteger reqid = new AtomicInteger();
+    final static int WINDOW =
+            Integer.getInteger("jdk.httpclient.windowsize", 2 * 16 * 1024);
+
 
 
     @DataProvider(name = "variants")
@@ -147,7 +150,11 @@ public class StreamFlowControlTest {
                     // the window is exceeded...
                     long wait = uri.startsWith("https://") ? 800 : 500;
                     try (InputStream is = response.body()) {
-                        sleep(wait);
+                        byte[] discard = new byte[WINDOW/4];
+                        for (int j=0; j<2; j++) {
+                            sleep(wait);
+                            if (is.read(discard) < 0) break;
+                        }
                         is.readAllBytes();
                     }
                     // we could fail here if we haven't waited long enough
@@ -205,7 +212,11 @@ public class StreamFlowControlTest {
                     sent.join();
                     long wait = uri.startsWith("https://") ? 800 : 350;
                     try (InputStream is = response.body()) {
-                        sleep(wait);
+                        byte[] discard = new byte[WINDOW/4];
+                        for (int j=0; j<2; j++) {
+                            sleep(wait);
+                            if (is.read(discard) < 0) break;
+                        }
                         is.readAllBytes();
                     }
                     // we could fail here if we haven't waited long enough
@@ -255,10 +266,6 @@ public class StreamFlowControlTest {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         var http2TestServer = new Http2TestServer("localhost", false, 0);
         http2TestServer.addHandler(new Http2TestHandler(), "/http2/");
         this.http2TestServer = HttpTestServer.of(http2TestServer);
@@ -316,17 +323,16 @@ public class StreamFlowControlTest {
                     bytes = "no request body!"
                             .repeat(100).getBytes(StandardCharsets.UTF_8);
                 }
-                int window = Integer.getInteger("jdk.httpclient.windowsize", 2 * 16 * 1024);
                 final int maxChunkSize;
                 if (t instanceof FCHttp2TestExchange fct) {
-                    maxChunkSize = Math.min(window, fct.conn.getMaxFrameSize());
+                    maxChunkSize = Math.min(WINDOW, fct.conn.getMaxFrameSize());
                 } else {
-                    maxChunkSize = Math.min(window, SettingsFrame.MAX_FRAME_SIZE);
+                    maxChunkSize = Math.min(WINDOW, SettingsFrame.MAX_FRAME_SIZE);
                 }
                 byte[] resp = bytes.length <= maxChunkSize
                         ? bytes
                         : Arrays.copyOfRange(bytes, 0, maxChunkSize);
-                int max = (window / resp.length) + 2;
+                int max = (WINDOW / resp.length) + 2;
                 // send in chunks
                 t.sendResponseHeaders(200, 0);
                 for (int i = 0; i <= max; i++) {
diff --git a/test/jdk/java/net/httpclient/http2/UserInfoTest.java b/test/jdk/java/net/httpclient/http2/UserInfoTest.java
index 69cded67297..3cea2d92570 100644
--- a/test/jdk/java/net/httpclient/http2/UserInfoTest.java
+++ b/test/jdk/java/net/httpclient/http2/UserInfoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,11 +60,10 @@ public class UserInfoTest {
     static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
     Http2TestServer server;
     int port;
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
     @BeforeAll
     void before() throws Exception {
-        sslContext = new SimpleSSLContext().get();
         server = createServer(sslContext);
         port = server.getAddress().getPort();
         server.start();
diff --git a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/BinaryPrimitivesTest.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/BinaryPrimitivesTest.java
index d3cf1a59483..66c74565e92 100644
--- a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/BinaryPrimitivesTest.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/BinaryPrimitivesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  */
 package jdk.internal.net.http.hpack;
 
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -33,10 +32,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import static jdk.internal.net.http.hpack.BuffersTestingKit.*;
 import static jdk.internal.net.http.hpack.TestHelper.newRandom;
+import org.junit.jupiter.api.Test;
 
 //
 // Some of the tests below overlap in what they test. This allows to diagnose
@@ -96,7 +96,7 @@ public final class BinaryPrimitivesTest {
                 totalCases++;
                 maxFilling = Math.max(maxFilling, buf.remaining());
                 r.reset().configure(N).read(buf);
-                assertEquals(r.get(), expected);
+                assertEquals(expected, r.get());
                 buf.clear();
             }
         }
@@ -127,7 +127,7 @@ public final class BinaryPrimitivesTest {
                                 throw new UncheckedIOException(e);
                             }
                         }
-                        assertEquals(r.get(), expected);
+                        assertEquals(expected, r.get());
                         r.reset();
                     });
             bb.clear();
@@ -167,7 +167,7 @@ public final class BinaryPrimitivesTest {
                             throw new UncheckedIOException(e);
                         }
                         // TODO: check payload here
-                        assertEquals(r.get(), expected);
+                        assertEquals(expected, r.get());
                         w.reset();
                         r.reset();
                         bb.clear();
@@ -209,7 +209,7 @@ public final class BinaryPrimitivesTest {
                 bytes.flip();
                 reader.read(bytes, chars);
                 chars.flip();
-                assertEquals(chars.toString(), expected);
+                assertEquals(expected, chars.toString());
                 reader.reset();
                 writer.reset();
             }
@@ -257,7 +257,7 @@ public final class BinaryPrimitivesTest {
                     throw new UncheckedIOException(e);
                 }
                 chars.flip();
-                assertEquals(chars.toString(), expected);
+                assertEquals(expected, chars.toString());
                 reader.reset();
                 writer.reset();
                 chars.clear();
@@ -301,7 +301,7 @@ public final class BinaryPrimitivesTest {
                     buf.position(p0);
                 }
                 chars.flip();
-                assertEquals(chars.toString(), expected);
+                assertEquals(expected, chars.toString());
                 reader.reset();
                 chars.clear();
             });
@@ -356,7 +356,7 @@ public final class BinaryPrimitivesTest {
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
-        assertEquals(reader.get(), expected);
+        assertEquals(expected, reader.get());
     }
 
     private void verifyWrite(byte[] expected, int data, int N) {
@@ -364,6 +364,6 @@ public final class BinaryPrimitivesTest {
         ByteBuffer buf = ByteBuffer.allocate(2 * expected.length);
         w.configure(data, N, 1).write(buf);
         buf.flip();
-        assertEquals(buf, ByteBuffer.wrap(expected));
+        assertEquals(ByteBuffer.wrap(expected), buf);
     }
 }
diff --git a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/CircularBufferTest.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/CircularBufferTest.java
index 307cbd77db9..835d261805c 100644
--- a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/CircularBufferTest.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/CircularBufferTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  */
 package jdk.internal.net.http.hpack;
 
-import org.testng.annotations.Test;
 import jdk.internal.net.http.hpack.SimpleHeaderTable.CircularBuffer;
 
 import java.util.Arrays;
@@ -31,10 +30,11 @@ import java.util.Random;
 import java.util.concurrent.ArrayBlockingQueue;
 
 import static jdk.internal.net.http.common.Utils.pow2Size;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static jdk.internal.net.http.hpack.TestHelper.assertVoidThrows;
 import static jdk.internal.net.http.hpack.TestHelper.newRandom;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 public final class CircularBufferTest {
 
@@ -143,7 +143,7 @@ public final class CircularBufferTest {
             for (int i = 0; i < gets; i++) {
                 Integer expected = referenceQueue.poll();
                 Integer actual = buffer.remove();
-                assertEquals(actual, expected);
+                assertEquals(expected, actual);
             }
         }
     }
diff --git a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/DecoderTest.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/DecoderTest.java
index 2f82852ae8a..1e60315469b 100644
--- a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/DecoderTest.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/DecoderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  */
 package jdk.internal.net.http.hpack;
 
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -33,9 +32,9 @@ import java.util.List;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static jdk.internal.net.http.hpack.TestHelper.*;
+import org.junit.jupiter.api.Test;
 
 //
 // Tests whose names start with "testX" are the ones captured from real HPACK
@@ -402,9 +401,9 @@ public final class DecoderTest {
     @Test
     public void sizeUpdate() throws IOException {
         Decoder d = new Decoder(4096);
-        assertEquals(d.getTable().maxSize(), 4096);
+        assertEquals(4096, d.getTable().maxSize());
         d.decode(ByteBuffer.wrap(new byte[]{0b00111110}), true, nopCallback()); // newSize = 30
-        assertEquals(d.getTable().maxSize(), 30);
+        assertEquals(30, d.getTable().maxSize());
     }
 
     @Test
@@ -650,8 +649,8 @@ public final class DecoderTest {
                     throw new UncheckedIOException(e);
                 }
             } while (i.hasNext());
-            assertEquals(d.getTable().getStateString(), expectedHeaderTable);
-            assertEquals(actual.stream().collect(Collectors.joining("\n")), expectedHeaderList);
+            assertEquals(expectedHeaderTable, d.getTable().getStateString());
+            assertEquals(expectedHeaderList, actual.stream().collect(Collectors.joining("\n")));
         });
 
         // Now introduce last ByteBuffer which is empty and EOF (mimics idiom
@@ -690,8 +689,8 @@ public final class DecoderTest {
                 throw new UncheckedIOException(e);
             }
 
-            assertEquals(d.getTable().getStateString(), expectedHeaderTable);
-            assertEquals(actual.stream().collect(Collectors.joining("\n")), expectedHeaderList);
+            assertEquals(expectedHeaderTable, d.getTable().getStateString());
+            assertEquals(expectedHeaderList, actual.stream().collect(Collectors.joining("\n")));
         });
     }
 
@@ -717,8 +716,8 @@ public final class DecoderTest {
             throw new UncheckedIOException(e);
         }
 
-        assertEquals(d.getTable().getStateString(), expectedHeaderTable);
-        assertEquals(actual.stream().collect(Collectors.joining("\n")), expectedHeaderList);
+        assertEquals(expectedHeaderTable, d.getTable().getStateString());
+        assertEquals(expectedHeaderList, actual.stream().collect(Collectors.joining("\n")));
     }
 
     private static DecodingCallback nopCallback() {
diff --git a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/EncoderTest.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/EncoderTest.java
index bf7769c7eb0..cfb5654f163 100644
--- a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/EncoderTest.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/EncoderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  */
 package jdk.internal.net.http.hpack;
 
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.nio.Buffer;
@@ -40,8 +39,9 @@ import static jdk.internal.net.http.hpack.BuffersTestingKit.forEachSplit;
 import static jdk.internal.net.http.hpack.SpecHelper.toHexdump;
 import static jdk.internal.net.http.hpack.TestHelper.assertVoidThrows;
 import static java.util.Arrays.asList;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 // TODO: map textual representation of commands from the spec to actual
 // calls to encoder (actually, this is a good idea for decoder as well)
@@ -627,10 +627,10 @@ public final class EncoderTest {
                              String expectedTableState) {
 
         String actualTableState = encoder.getHeaderTable().getStateString();
-        assertEquals(actualTableState, expectedTableState);
+        assertEquals(expectedTableState, actualTableState);
 
         String actualHexdump = toHexdump(output);
-        assertEquals(actualHexdump, expectedHexdump.replaceAll("\\n", " "));
+        assertEquals(expectedHexdump.replaceAll("\\n", " "), actualHexdump);
     }
 
     // initial size - the size encoder is constructed with
@@ -657,7 +657,7 @@ public final class EncoderTest {
                 actual.add(capacity);
             }
         });
-        assertEquals(actual, expected);
+        assertEquals(expected, actual);
     }
 
     //
diff --git a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HeaderTableTest.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HeaderTableTest.java
index 88987b43d94..0eb1714da35 100644
--- a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HeaderTableTest.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HeaderTableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,15 +23,15 @@
 package jdk.internal.net.http.hpack;
 
 import jdk.internal.net.http.hpack.SimpleHeaderTable.HeaderField;
-import org.testng.annotations.Test;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.AssertJUnit.assertTrue;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 public class HeaderTableTest extends SimpleHeaderTableTest {
 
@@ -61,8 +61,8 @@ public class HeaderTableTest extends SimpleHeaderTableTest {
         staticHeaderFields.forEach((key, expectedHeaderField) -> {
             // lookup
             HeaderField actualHeaderField = table.get(key);
-            assertEquals(actualHeaderField.name, expectedHeaderField.name);
-            assertEquals(actualHeaderField.value, expectedHeaderField.value);
+            assertEquals(expectedHeaderField.name, actualHeaderField.name);
+            assertEquals(expectedHeaderField.value, actualHeaderField.value);
 
             // reverse lookup (name, value)
             String hName = expectedHeaderField.name;
@@ -70,13 +70,13 @@ public class HeaderTableTest extends SimpleHeaderTableTest {
             int expectedIndex = key;
             int actualIndex = table.indexOf(hName, hValue);
 
-            assertEquals(actualIndex, expectedIndex);
+            assertEquals(expectedIndex, actualIndex);
 
             // reverse lookup (name)
             Set<Integer> expectedIndexes = indexes.get(hName);
             int actualMinimalIndex = table.indexOf(hName, "blah-blah");
 
-            assertTrue(expectedIndexes.contains(-actualMinimalIndex));
+            Assertions.assertTrue(expectedIndexes.contains(-actualMinimalIndex));
         });
     }
 
@@ -88,9 +88,9 @@ public class HeaderTableTest extends SimpleHeaderTableTest {
         table.put("bender", "rodriguez");
         table.put("bender", "rodriguez");
 
-        assertEquals(table.length(), oldLength + 3); // more like an assumption
+        assertEquals(oldLength + 3, table.length()); // more like an assumption
         int i = table.indexOf("bender", "rodriguez");
-        assertEquals(i, oldLength + 1);
+        assertEquals(oldLength + 1, i);
     }
 
     @Test
@@ -98,13 +98,13 @@ public class HeaderTableTest extends SimpleHeaderTableTest {
         HeaderTable table = createHeaderTable(256);
         int oldLength = table.length();
         table.put("bender", "rodriguez");
-        assertEquals(table.indexOf("bender", "rodriguez"), oldLength + 1);
+        assertEquals(oldLength + 1, table.indexOf("bender", "rodriguez"));
         table.put("bender", "rodriguez");
-        assertEquals(table.indexOf("bender", "rodriguez"), oldLength + 1);
+        assertEquals(oldLength + 1, table.indexOf("bender", "rodriguez"));
         table.evictEntry();
-        assertEquals(table.indexOf("bender", "rodriguez"), oldLength + 1);
+        assertEquals(oldLength + 1, table.indexOf("bender", "rodriguez"));
         table.evictEntry();
-        assertEquals(table.indexOf("bender", "rodriguez"), 0);
+        assertEquals(0, table.indexOf("bender", "rodriguez"));
     }
 
     @Test
@@ -114,9 +114,9 @@ public class HeaderTableTest extends SimpleHeaderTableTest {
         int idx = rnd.nextInt(oldLength) + 1;
         HeaderField f = table.get(idx);
         table.put(f.name, f.value);
-        assertEquals(table.length(), oldLength + 1);
+        assertEquals(oldLength + 1, table.length());
         int i = table.indexOf(f.name, f.value);
-        assertEquals(i, idx);
+        assertEquals(idx, i);
     }
 
     @Test
@@ -137,16 +137,16 @@ public class HeaderTableTest extends SimpleHeaderTableTest {
             String s = String.valueOf(j);
             int actualIndex = table.indexOf(s, s);
             int expectedIndex = STATIC_TABLE_LENGTH + NUM_HEADERS - j + 1;
-            assertEquals(actualIndex, expectedIndex);
+            assertEquals(expectedIndex, actualIndex);
         }
         // as well as for just a name lookup
         for (int j = 1; j <= NUM_HEADERS; j++) {
             String s = String.valueOf(j);
             int actualIndex = table.indexOf(s, "blah");
             int expectedIndex = -(STATIC_TABLE_LENGTH + NUM_HEADERS - j + 1);
-            assertEquals(actualIndex, expectedIndex);
+            assertEquals(expectedIndex, actualIndex);
         }
         // lookup for non-existent name returns 0
-        assertEquals(table.indexOf("chupacabra", "1"), 0);
+        assertEquals(0, table.indexOf("chupacabra", "1"));
     }
 }
diff --git a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HuffmanTest.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HuffmanTest.java
index ae92e4a4503..4ce10929c24 100644
--- a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HuffmanTest.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HuffmanTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@ package jdk.internal.net.http.hpack;
 
 import jdk.internal.net.http.hpack.Huffman.Reader;
 import jdk.internal.net.http.hpack.Huffman.Writer;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -39,8 +38,9 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static jdk.internal.net.http.hpack.HPACK.bytesForBits;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 public final class HuffmanTest {
 
@@ -412,8 +412,8 @@ public final class HuffmanTest {
             // might not be printable/visible)
             int expected = code.sym;
             int actual = (int) output.charAt(0);
-            assertEquals(output.length(), 1); // exactly 1 character
-            assertEquals(actual, expected);
+            assertEquals(1, output.length()); // exactly 1 character
+            assertEquals(expected, actual);
         }
     }
 
@@ -653,7 +653,7 @@ public final class HuffmanTest {
                 w.from(str, 0, str.length()).write(buffer);
                 Reader r = READER.get();
                 r.read(buffer.flip(), b, true);
-                assertEquals(b.toString(), str);
+                assertEquals(str, b.toString());
             }
 
             private void roundTrip(int... lengths) throws IOException {
@@ -765,7 +765,7 @@ public final class HuffmanTest {
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
-        assertEquals(actual.toString(), decoded);
+        assertEquals(decoded, actual.toString());
     }
 
     private static void readExhaustively(String hexdump, String decoded) {
@@ -782,7 +782,7 @@ public final class HuffmanTest {
             } catch (IOException e) {
                 throw new UncheckedIOException(e);
             }
-            assertEquals(actual.toString(), decoded);
+            assertEquals(decoded, actual.toString());
             reader.reset();
             actual.setLength(0);
         });
@@ -796,7 +796,7 @@ public final class HuffmanTest {
         boolean written = writer.write(destination);
         assertTrue(written);
         String actual = SpecHelper.toHexdump(destination.flip());
-        assertEquals(actual, hexdump);
+        assertEquals(hexdump, actual);
         writer.reset();
     }
 
@@ -815,7 +815,7 @@ public final class HuffmanTest {
             assertTrue(written);
             ByteBuffer concated = BuffersTestingKit.concat(byteBuffers);
             String actual = SpecHelper.toHexdump(concated);
-            assertEquals(actual, hexdump);
+            assertEquals(hexdump, actual);
             writer.reset();
         });
     }
diff --git a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/SimpleHeaderTableTest.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/SimpleHeaderTableTest.java
index 79ffed84767..8513916a130 100644
--- a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/SimpleHeaderTableTest.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/SimpleHeaderTableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,6 @@
 package jdk.internal.net.http.hpack;
 
 import jdk.internal.net.http.hpack.SimpleHeaderTable.HeaderField;
-import org.testng.annotations.Test;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
@@ -39,7 +38,8 @@ import static jdk.internal.net.http.hpack.TestHelper.assertThrows;
 import static jdk.internal.net.http.hpack.TestHelper.assertVoidThrows;
 import static jdk.internal.net.http.hpack.TestHelper.newRandom;
 import static java.lang.String.format;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 public class SimpleHeaderTableTest {
 
@@ -125,8 +125,8 @@ public class SimpleHeaderTableTest {
         Map<Integer, HeaderField> staticHeaderFields = createStaticEntries();
         staticHeaderFields.forEach((index, expectedHeaderField) -> {
             SimpleHeaderTable.HeaderField actualHeaderField = table.get(index);
-            assertEquals(actualHeaderField.name, expectedHeaderField.name);
-            assertEquals(actualHeaderField.value, expectedHeaderField.value);
+            assertEquals(expectedHeaderField.name, actualHeaderField.name);
+            assertEquals(expectedHeaderField.value, actualHeaderField.value);
         });
     }
 
@@ -134,8 +134,8 @@ public class SimpleHeaderTableTest {
     public void constructorSetsMaxSize() {
         int size = rnd.nextInt(64);
         SimpleHeaderTable table = createHeaderTable(size);
-        assertEquals(table.size(), 0);
-        assertEquals(table.maxSize(), size);
+        assertEquals(0, table.size());
+        assertEquals(size, table.maxSize());
     }
 
     @Test
@@ -152,7 +152,7 @@ public class SimpleHeaderTableTest {
     public void zeroMaximumSize() {
         SimpleHeaderTable table = createHeaderTable(0);
         table.setMaxSize(0);
-        assertEquals(table.maxSize(), 0);
+        assertEquals(0, table.maxSize());
     }
 
     @Test
@@ -177,7 +177,7 @@ public class SimpleHeaderTableTest {
     @Test
     public void length() {
         SimpleHeaderTable table = createHeaderTable(0);
-        assertEquals(table.length(), STATIC_TABLE_LENGTH);
+        assertEquals(STATIC_TABLE_LENGTH, table.length());
     }
 
     @Test
@@ -203,14 +203,14 @@ public class SimpleHeaderTableTest {
 
         table.put(name, value);
         SimpleHeaderTable.HeaderField f = table.get(idx);
-        assertEquals(f.name, name);
-        assertEquals(f.value, value);
+        assertEquals(name, f.name);
+        assertEquals(value, f.value);
     }
 
     @Test
     public void staticTableHasZeroSize() {
         SimpleHeaderTable table = createHeaderTable(0);
-        assertEquals(table.size(), 0);
+        assertEquals(0, table.size());
     }
 
     // TODO: negative indexes check
@@ -236,13 +236,13 @@ public class SimpleHeaderTableTest {
             SimpleHeaderTable.HeaderField f = table.get(STATIC_TABLE_LENGTH + j);
             int actualName = Integer.parseInt(f.name);
             int expectedName = NUM_HEADERS - j + 1;
-            assertEquals(actualName, expectedName);
+            assertEquals(expectedName, actualName);
         }
         // Entries MUST be evicted in the order they were added:
         //   the newer the entry the later it is evicted
         for (int k = 1; k <= NUM_HEADERS; k++) {
             SimpleHeaderTable.HeaderField f = table.evictEntry();
-            assertEquals(f.name, String.valueOf(k));
+            assertEquals(String.valueOf(k), f.name);
         }
     }
 
@@ -257,7 +257,7 @@ public class SimpleHeaderTableTest {
         Locale.setDefault(Locale.FRENCH);
         try {
             String s = format("%.1f", 3.1);
-            assertEquals(s, "3,1"); // assumption of the test, otherwise the test is useless
+            assertEquals("3,1", s); // assumption of the test, otherwise the test is useless
             testToString0();
         } finally {
             Locale.setDefault(locale);
@@ -272,7 +272,7 @@ public class SimpleHeaderTableTest {
             String expected = format(
                     "dynamic length: %s, full length: %s, used space: %s/%s (%.1f%%)",
                     0, STATIC_TABLE_LENGTH, 0, maxSize, 0.0);
-            assertEquals(table.toString(), expected);
+            assertEquals(expected, table.toString());
         }
 
         {
@@ -290,7 +290,7 @@ public class SimpleHeaderTableTest {
             String expected = format(
                     "dynamic length: %s, full length: %s, used space: %s/%s (%.1f%%)",
                     1, STATIC_TABLE_LENGTH + 1, used, size, ratio);
-            assertEquals(s, expected);
+            assertEquals(expected, s);
         }
 
         {
@@ -301,7 +301,7 @@ public class SimpleHeaderTableTest {
             String expected =
                     format("dynamic length: %s, full length: %s, used space: %s/%s (%.1f%%)",
                            2, STATIC_TABLE_LENGTH + 2, 78, 78, 100.0);
-            assertEquals(s, expected);
+            assertEquals(expected, s);
         }
     }
 
@@ -310,9 +310,8 @@ public class SimpleHeaderTableTest {
         SimpleHeaderTable table = createHeaderTable(256);
         table.put("custom-key", "custom-header");
         // @formatter:off
-        assertEquals(table.getStateString(),
-                     "[  1] (s =  55) custom-key: custom-header\n" +
-                     "      Table size:  55");
+        assertEquals("[  1] (s =  55) custom-key: custom-header\n" +
+                     "      Table size:  55", table.getStateString());
         // @formatter:on
     }
 
diff --git a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/TestHelper.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/TestHelper.java
index 89982a46a1f..b140440b0fa 100644
--- a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/TestHelper.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/TestHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
  */
 package jdk.internal.net.http.hpack;
 
-import org.testng.annotations.Test;
 
 import java.util.Objects;
 import java.util.Random;
+import org.junit.jupiter.api.Test;
 
 public final class TestHelper {
 
diff --git a/test/jdk/java/net/httpclient/http3/BadCipherSuiteErrorTest.java b/test/jdk/java/net/httpclient/http3/BadCipherSuiteErrorTest.java
index abe6889e497..727f2c78352 100644
--- a/test/jdk/java/net/httpclient/http3/BadCipherSuiteErrorTest.java
+++ b/test/jdk/java/net/httpclient/http3/BadCipherSuiteErrorTest.java
@@ -65,7 +65,7 @@ public class BadCipherSuiteErrorTest implements HttpServerAdapters {
     //@Test(timeOut=5000)
     @Test
     public void test() throws Exception {
-        SSLContext sslContext = (new SimpleSSLContext()).get();
+        SSLContext sslContext = SimpleSSLContext.findSSLContext();
         ExecutorService exec = Executors.newCachedThreadPool();
         var builder = newClientBuilderForH3()
                                       .executor(exec)
@@ -80,7 +80,7 @@ public class BadCipherSuiteErrorTest implements HttpServerAdapters {
 
         HttpTestServer httpsServer = null;
         try {
-            SSLContext serverContext = (new SimpleSSLContext()).get();
+            SSLContext serverContext = SimpleSSLContext.findSSLContext();
             SSLParameters p = serverContext.getSupportedSSLParameters();
             p.setApplicationProtocols(new String[]{"h3"});
             httpsServer = HttpTestServer.create(HTTP_3_URI_ONLY, serverContext);
diff --git a/test/jdk/java/net/httpclient/http3/GetHTTP3Test.java b/test/jdk/java/net/httpclient/http3/GetHTTP3Test.java
index 14842d401fd..17fc33f3aa5 100644
--- a/test/jdk/java/net/httpclient/http3/GetHTTP3Test.java
+++ b/test/jdk/java/net/httpclient/http3/GetHTTP3Test.java
@@ -91,7 +91,7 @@ public class GetHTTP3Test implements HttpServerAdapters {
             May the sun shine warm upon your face;
             """;
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer h3TestServer;  // HTTP/2 ( h2 + h3)
     String h3URI;
 
@@ -400,10 +400,6 @@ public class GetHTTP3Test implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         final Http2TestServer h2WithAltService = new Http2TestServer("localhost", true,
                 sslContext).enableH3AltServiceOnSamePort();
         h3TestServer = HttpTestServer.of(h2WithAltService);
diff --git a/test/jdk/java/net/httpclient/http3/H3BadHeadersTest.java b/test/jdk/java/net/httpclient/http3/H3BadHeadersTest.java
index 3bc59a4d67f..fb0e1ef3085 100644
--- a/test/jdk/java/net/httpclient/http3/H3BadHeadersTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3BadHeadersTest.java
@@ -75,7 +75,7 @@ public class H3BadHeadersTest implements HttpServerAdapters  {
 
     static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer http3TestServer;   // HTTP/3 ( h3 only )
     HttpTestServer https2TestServer;  // HTTP/2 ( h2 + h3 )
     String http3URI;
@@ -272,10 +272,6 @@ public class H3BadHeadersTest implements HttpServerAdapters  {
     @BeforeTest
     public void setup() throws Exception {
         System.out.println("creating servers");
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         http3TestServer =  HttpTestServer.create(Http3DiscoveryMode.HTTP_3_URI_ONLY, sslContext);
         http3TestServer.addHandler(new BadHeadersHandler(), "/http3/echo");
         http3URI = "https://" + http3TestServer.serverAuthority() + "/http3/echo";
diff --git a/test/jdk/java/net/httpclient/http3/H3BasicTest.java b/test/jdk/java/net/httpclient/http3/H3BasicTest.java
index b99520ab830..79002d98995 100644
--- a/test/jdk/java/net/httpclient/http3/H3BasicTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3BasicTest.java
@@ -84,13 +84,11 @@ public class H3BasicTest implements HttpServerAdapters {
     static HttpClient client = null;
     static ExecutorService clientExec;
     static ExecutorService serverExec;
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     static volatile String http3URIString, pingURIString, https2URIString;
 
     static void initialize() throws Exception {
         try {
-            SimpleSSLContext sslct = new SimpleSSLContext();
-            sslContext = sslct.get();
             client = getClient();
 
             // server that only supports HTTP/3
diff --git a/test/jdk/java/net/httpclient/http3/H3ConcurrentPush.java b/test/jdk/java/net/httpclient/http3/H3ConcurrentPush.java
index f0a9a947d13..0cdb2f900fd 100644
--- a/test/jdk/java/net/httpclient/http3/H3ConcurrentPush.java
+++ b/test/jdk/java/net/httpclient/http3/H3ConcurrentPush.java
@@ -112,7 +112,7 @@ public class H3ConcurrentPush implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        server = HttpTestServer.create(ANY, new SimpleSSLContext().get());
+        server = HttpTestServer.create(ANY, SimpleSSLContext.findSSLContext());
         pushHandler = new ServerPushHandler(MAIN_RESPONSE_BODY, PUSH_PROMISES);
         server.addHandler(pushHandler, "/push/");
         server.addHandler(new HttpHeadOrGetHandler(), "/head/");
@@ -193,7 +193,7 @@ public class H3ConcurrentPush implements HttpServerAdapters {
         try (HttpClient client = newClientBuilderForH3()
                 .proxy(Builder.NO_PROXY)
                 .version(Version.HTTP_3)
-                .sslContext(new SimpleSSLContext().get())
+                .sslContext(SimpleSSLContext.findSSLContext())
                 .build()) {
 
             sendHeadRequest(client);
diff --git a/test/jdk/java/net/httpclient/http3/H3ConnectionPoolTest.java b/test/jdk/java/net/httpclient/http3/H3ConnectionPoolTest.java
index 719067a7c3c..0449db3e961 100644
--- a/test/jdk/java/net/httpclient/http3/H3ConnectionPoolTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3ConnectionPoolTest.java
@@ -76,7 +76,7 @@ public class H3ConnectionPoolTest implements HttpServerAdapters {
     static Http3TestServer http3OnlyServer;
     static Http2TestServer https2AltSvcServer;
     static volatile HttpClient client = null;
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     static volatile String http3OnlyURIString, https2URIString, http3AltSvcURIString, http3DirectURIString;
 
     static void initialize(boolean samePort) throws Exception {
@@ -87,8 +87,6 @@ public class H3ConnectionPoolTest implements HttpServerAdapters {
         System.out.println("\nConfiguring for advertised AltSvc on "
                 + (samePort ? "same port" : "ephemeral port"));
         try {
-            SimpleSSLContext sslct = new SimpleSSLContext();
-            sslContext = sslct.get();
             client = null;
             client = getClient();
 
diff --git a/test/jdk/java/net/httpclient/http3/H3DataLimitsTest.java b/test/jdk/java/net/httpclient/http3/H3DataLimitsTest.java
index 1443c03bf5d..9f509b5440a 100644
--- a/test/jdk/java/net/httpclient/http3/H3DataLimitsTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3DataLimitsTest.java
@@ -72,7 +72,7 @@ import static org.testng.Assert.assertEquals;
  */
 public class H3DataLimitsTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer h3TestServer;
     String h3URI;
 
@@ -210,11 +210,6 @@ public class H3DataLimitsTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
-
         // An HTTP/3 server that only supports HTTP/3
         h3TestServer = HttpTestServer.of(new Http3TestServer(sslContext));
         final HttpTestHandler h3Handler = new Handler();
diff --git a/test/jdk/java/net/httpclient/http3/H3ErrorHandlingTest.java b/test/jdk/java/net/httpclient/http3/H3ErrorHandlingTest.java
index 4315fd36de5..44071ea566d 100644
--- a/test/jdk/java/net/httpclient/http3/H3ErrorHandlingTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3ErrorHandlingTest.java
@@ -71,6 +71,7 @@ import static org.testng.Assert.*;
 
 /*
  * @test
+ * @bug 8373409
  * @key intermittent
  * @comment testResetControlStream may fail if the client doesn't read the stream type
  *              before the stream is reset,
@@ -87,7 +88,7 @@ import static org.testng.Assert.*;
  */
 public class H3ErrorHandlingTest implements HttpServerAdapters {
 
-    private SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private QuicStandaloneServer server;
     private String requestURIBase;
 
@@ -230,10 +231,6 @@ public class H3ErrorHandlingTest implements HttpServerAdapters {
 
     @BeforeClass
     public void beforeClass() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         server = QuicStandaloneServer.newBuilder()
                 .availableVersions(new QuicVersion[]{QuicVersion.QUIC_V1})
                 .sslContext(sslContext)
diff --git a/test/jdk/java/net/httpclient/http3/H3FixedThreadPoolTest.java b/test/jdk/java/net/httpclient/http3/H3FixedThreadPoolTest.java
index 9e801ac2ea4..c513cd092c7 100644
--- a/test/jdk/java/net/httpclient/http3/H3FixedThreadPoolTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3FixedThreadPoolTest.java
@@ -71,14 +71,12 @@ public class H3FixedThreadPoolTest implements HttpServerAdapters {
     static HttpTestServer http3Server, https2Server;
     static volatile HttpClient client = null;
     static ExecutorService exec;
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
     static String http3URIString, https2URIString;
 
     static void initialize() throws Exception {
         try {
-            SimpleSSLContext sslct = new SimpleSSLContext();
-            sslContext = sslct.get();
             client = getClient();
             exec = Executors.newCachedThreadPool();
             http3Server = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext, exec);
diff --git a/test/jdk/java/net/httpclient/http3/H3GoAwayTest.java b/test/jdk/java/net/httpclient/http3/H3GoAwayTest.java
index fc6166cb66c..b9d50ce2939 100644
--- a/test/jdk/java/net/httpclient/http3/H3GoAwayTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3GoAwayTest.java
@@ -67,13 +67,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 public class H3GoAwayTest {
 
     private static String REQ_URI_BASE;
-    private static SSLContext sslCtx;
+    private static final SSLContext sslCtx = SimpleSSLContext.findSSLContext();
     private static Http3TestServer server;
 
     @BeforeAll
     static void beforeAll() throws Exception {
-        sslCtx = new SimpleSSLContext().get();
-        assertNotNull(sslCtx, "SSLContext couldn't be created");
         server = new Http3TestServer(sslCtx);
         final RequestApprover reqApprover = new RequestApprover();
         server.setRequestApprover(reqApprover::allowNewRequest);
diff --git a/test/jdk/java/net/httpclient/http3/H3HeaderSizeLimitTest.java b/test/jdk/java/net/httpclient/http3/H3HeaderSizeLimitTest.java
index 06e3c2ac521..b48ef9a33f3 100644
--- a/test/jdk/java/net/httpclient/http3/H3HeaderSizeLimitTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3HeaderSizeLimitTest.java
@@ -64,16 +64,12 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
 public class H3HeaderSizeLimitTest implements HttpServerAdapters {
 
     private static final long HEADER_SIZE_LIMIT_BYTES = 1024;
-    private SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private HttpTestServer h3Server;
     private String requestURIBase;
 
     @BeforeClass
     public void beforeClass() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         final QuicServer quicServer = Http3TestServer.quicServerBuilder()
                 .sslContext(sslContext)
                 .build();
diff --git a/test/jdk/java/net/httpclient/http3/H3HeadersEncoding.java b/test/jdk/java/net/httpclient/http3/H3HeadersEncoding.java
index e63ae88ed32..44ccfac4a6a 100644
--- a/test/jdk/java/net/httpclient/http3/H3HeadersEncoding.java
+++ b/test/jdk/java/net/httpclient/http3/H3HeadersEncoding.java
@@ -76,7 +76,7 @@ public class H3HeadersEncoding {
 
     private static final int REQUESTS_COUNT = 500;
     private static final int HEADERS_PER_REQUEST = 20;
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer http3TestServer;
     HeadersHandler serverHeadersHandler;
     String http3URI;
@@ -84,10 +84,6 @@ public class H3HeadersEncoding {
     @BeforeTest
     public void setup() throws Exception {
         System.out.println("Creating servers");
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         http3TestServer = HttpTestServer.create(Http3DiscoveryMode.HTTP_3_URI_ONLY, sslContext);
         serverHeadersHandler = new HeadersHandler();
         http3TestServer.addHandler(serverHeadersHandler, "/http3/headers");
diff --git a/test/jdk/java/net/httpclient/http3/H3IdleExceedsQuicIdleTimeout.java b/test/jdk/java/net/httpclient/http3/H3IdleExceedsQuicIdleTimeout.java
index 6b62fcf6043..1028eefe828 100644
--- a/test/jdk/java/net/httpclient/http3/H3IdleExceedsQuicIdleTimeout.java
+++ b/test/jdk/java/net/httpclient/http3/H3IdleExceedsQuicIdleTimeout.java
@@ -70,12 +70,10 @@ class H3IdleExceedsQuicIdleTimeout {
     private static final String REQ_PATH = "/8371802";
 
     private static HttpTestServer h3Server;
-    private static SSLContext sslCtx;
+    private static final SSLContext sslCtx = SimpleSSLContext.findSSLContext();
 
     @BeforeAll
     static void beforeAll() throws Exception {
-        sslCtx = new SimpleSSLContext().get();
-        assert sslCtx != null : "SSLContext is null";
         h3Server = HttpTestServer.create(HTTP_3_URI_ONLY, sslCtx);
         h3Server.addHandler(new Handler(), REQ_PATH);
         h3Server.start();
diff --git a/test/jdk/java/net/httpclient/http3/H3ImplicitPushCancel.java b/test/jdk/java/net/httpclient/http3/H3ImplicitPushCancel.java
index 735a68c88cf..130ccd40cd6 100644
--- a/test/jdk/java/net/httpclient/http3/H3ImplicitPushCancel.java
+++ b/test/jdk/java/net/httpclient/http3/H3ImplicitPushCancel.java
@@ -85,7 +85,7 @@ public class H3ImplicitPushCancel implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        server = HttpTestServer.create(ANY, new SimpleSSLContext().get());
+        server = HttpTestServer.create(ANY, SimpleSSLContext.findSSLContext());
         HttpTestHandler pushHandler = new ServerPushHandler(MAIN_RESPONSE_BODY,
                                                      PUSH_PROMISES);
         server.addHandler(pushHandler, "/push/");
@@ -125,7 +125,7 @@ public class H3ImplicitPushCancel implements HttpServerAdapters {
         try (HttpClient client = newClientBuilderForH3()
                 .proxy(Builder.NO_PROXY)
                 .version(Version.HTTP_3)
-                .sslContext(new SimpleSSLContext().get())
+                .sslContext(SimpleSSLContext.findSSLContext())
                 .build()) {
 
             sendHeadRequest(client);
diff --git a/test/jdk/java/net/httpclient/http3/H3InsertionsLimitTest.java b/test/jdk/java/net/httpclient/http3/H3InsertionsLimitTest.java
index 19c19561cf9..ff38cd4fa98 100644
--- a/test/jdk/java/net/httpclient/http3/H3InsertionsLimitTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3InsertionsLimitTest.java
@@ -74,7 +74,7 @@ public class H3InsertionsLimitTest implements HttpServerAdapters {
 
     private static final long HEADER_SIZE_LIMIT_BYTES = 8192;
     private static final long MAX_SERVER_DT_CAPACITY = 4096;
-    private SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private HttpTestServer h3Server;
     private String requestURIBase;
     public static final long MAX_LITERALS_WITH_INDEXING = 32L;
@@ -122,10 +122,6 @@ public class H3InsertionsLimitTest implements HttpServerAdapters {
 
     @BeforeClass
     public void beforeClass() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         final QuicServer quicServer = Http3TestServer.quicServerBuilder()
                 .bindAddress(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0))
                 .sslContext(sslContext)
diff --git a/test/jdk/java/net/httpclient/http3/H3LogHandshakeErrors.java b/test/jdk/java/net/httpclient/http3/H3LogHandshakeErrors.java
index 32872f4fb12..f7a258c069c 100644
--- a/test/jdk/java/net/httpclient/http3/H3LogHandshakeErrors.java
+++ b/test/jdk/java/net/httpclient/http3/H3LogHandshakeErrors.java
@@ -70,7 +70,7 @@ import static org.testng.Assert.*;
 // -Djava.security.debug=all
 public class H3LogHandshakeErrors implements HttpServerAdapters {
 
-    private SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private HttpTestServer h3Server;
     private ServerSocket tcpServerSocket = null;
     private Thread tcpServerThread = null;
@@ -79,10 +79,6 @@ public class H3LogHandshakeErrors implements HttpServerAdapters {
 
     @BeforeClass
     public void beforeClass() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         // create an H3 only server
         h3Server = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
         h3Server.addHandler((exchange) -> exchange.sendResponseHeaders(200, 0), "/hello");
diff --git a/test/jdk/java/net/httpclient/http3/H3MalformedResponseTest.java b/test/jdk/java/net/httpclient/http3/H3MalformedResponseTest.java
index 881277da1f8..5ef45f8b230 100644
--- a/test/jdk/java/net/httpclient/http3/H3MalformedResponseTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3MalformedResponseTest.java
@@ -22,410 +22,452 @@
  */
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
-import jdk.httpclient.test.lib.quic.QuicServerConnection;
 import jdk.httpclient.test.lib.quic.QuicStandaloneServer;
-import jdk.internal.net.http.http3.Http3Error;
-import jdk.internal.net.http.quic.TerminationCause;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.Utils;
 import jdk.internal.net.quic.QuicVersion;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.net.URIBuilder;
-import jdk.test.lib.Utils;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import javax.net.ssl.SSLContext;
+import java.io.IOException;
 import java.io.OutputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
+import java.net.ProtocolException;
 import java.net.http.HttpClient;
 import java.net.http.HttpClient.Version;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.util.HexFormat;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BooleanSupplier;
 
-import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
+import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
-import static org.testng.Assert.*;
+import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /*
  * @test
- * @summary Verifies that the HTTP client correctly handles malformed responses
- * @library /test/lib /test/jdk/java/net/httpclient/lib
- * @library ../access
- * @build jdk.test.lib.net.SimpleSSLContext
- *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @build java.net.http/jdk.internal.net.http.Http3ConnectionAccess
- * @run testng/othervm
- *              -Djdk.internal.httpclient.debug=true
- *              -Djdk.httpclient.HttpClient.log=requests,responses,errors H3MalformedResponseTest
+ * @bug 8369595
+ * @summary Verifies that the HTTP/3 malformed responses are correctly handled
+ * @library /test/jdk/java/net/httpclient/lib
+ *          /test/lib
+ * @run junit ${test.main.class}
  */
-public class H3MalformedResponseTest implements HttpServerAdapters {
 
-    private SSLContext sslContext;
-    private QuicStandaloneServer server;
-    private String requestURIBase;
+/// Verifies that the HTTP/3 malformed responses are correctly handled.
+///
+/// ### HTTP/3 `HEADERS` frame & QPACK Field Section encoding crash course
+///
+/// Consider an HTTP/3 `HEADERS` frame that carries:
+///
+/// ```
+/// :status: 200
+/// content-length: 2
+/// ```
+///
+/// This will be encoded as the following byte sequence:
+///
+/// ```
+/// 01 06 00 00 D9 54 01 32
+/// ```
+///
+/// Let's start with decoding the HTTP/3 frame:
+///
+/// - `01`: Frame Type (`01` denotes `HEADERS``)
+///
+/// - `06`: Payload length (6 bytes)
+///
+/// Figured this is a `HEADERS` frame containing 6 bytes: `00 00 D9 54 01 32`.
+/// Let's decode the QPACK Field Section
+///
+/// - `00`: Required Insert Count (0)
+///
+/// - `00`: Base (0)
+///
+/// - `D9`:
+///   QPACK has a static table (indexed from 0) and `:status: 200` is at the
+///   static-table index 25.
+///
+///   ```
+///   D9 = <1101 1001>
+///      = <1> (Indexed Field Line)
+///      + <1> (Static Table)
+///      + <01 1001> (entry index = 25)
+///   ```
+///
+/// - `54 01 32`:
+///   `content-length: 2` can be encoded as a *literal field line with name
+///   reference* using the static name `content-length` (static index 4) and
+///   the literal value `2`.
+///
+///   ```
+///   54 01 32 = <0101 0100 0000 0001 0011 0010>
+///            = <0> (Literal Field Line)
+///            + <1> (Name Reference)
+///            + <0100> (entry index = 4)
+///            + <0000 0001> (value length = 1 byte)
+///            + <0011 0010> (value = ASCII "2" = 0x32 = 50)
+///   ```
+///
+/// Note that the `value length` field (i.e., `0000 0001`) follows a variable
+/// coding scheme:
+///
+/// | Prefix                | Total size | Payload size | Max value     |
+/// | --------------------- | ---------- | ------------ | ------------- |
+/// | `00xx xxxx`           | 1 byte     | 6 bits       | 63            |
+/// | `01xx xxxx xxxx xxxx` | 2 bytes    | 14 bits      | 16,383        |
+/// | `10xx xxx…`           | 4 bytes    | 30 bits      | 1,073,741,823 |
+/// | `11xx xxx…`           | 8 bytes    | 62 bits      | 4.61e18       |
+class H3MalformedResponseTest {
 
-    // These responses are malformed and should not be accepted by the client,
-    // but they should not cause connection closure
-    @DataProvider
-    public static Object[][] malformedResponse() {
+    private static final String CLASS_NAME = H3MalformedResponseTest.class.getSimpleName();
+
+    private static final Logger LOGGER = Utils.getDebugLogger(CLASS_NAME::toString, Utils.DEBUG);
+
+    private static final SSLContext SSL_CONTEXT = SimpleSSLContext.findSSLContext();
+
+    private static QuicStandaloneServer SERVER;
+
+    private static HttpRequest REQUEST;
+
+    @BeforeAll
+    static void setUp() throws Exception {
+
+        // Create and start the server
+        SERVER = QuicStandaloneServer.newBuilder()
+                .availableVersions(new QuicVersion[]{QuicVersion.QUIC_V1})
+                .sslContext(SSL_CONTEXT)
+                .alpn("h3")
+                .build();
+        SERVER.start();
+        LOGGER.log("Server is started at {}", SERVER.getAddress());
+
+        // Create the request
+        var requestURI = URIBuilder.newBuilder()
+                .scheme("https")
+                .loopback()
+                .port(SERVER.getAddress().getPort())
+                .path("/" + CLASS_NAME)
+                .build();
+        REQUEST = HttpRequest.newBuilder(requestURI)
+                .version(Version.HTTP_3)
+                .setOption(H3_DISCOVERY, HTTP_3_URI_ONLY)
+                .build();
+
+    }
+
+    @AfterAll
+    static void tearDown() {
+        close("server", SERVER);
+    }
+
+    private static void close(String name, AutoCloseable closeable) {
+        if (closeable != null) {
+            LOGGER.log("Closing {}", name);
+            try {
+                closeable.close();
+            } catch (Exception e) {
+                LOGGER.log("Could not close " + name, e);
+            }
+        }
+    }
+
+    /// Malformed responses that should not be accepted by the client, but
+    /// should neither cause the connection to get closed.
+    static Object[][] malformedResponsesPreservingConnection() {
         return new Object[][]{
-                new Object[] {"empty", HexFormat.of().parseHex(
-                        ""
+                {"empty", IOException.class, parseHex("")},
+                {"non-final response", IOException.class, parseHex(
+                        "01040000", // headers, length 4, section prefix
+                        "ff00" // :status:100
                 )},
-                new Object[] {"non-final response", HexFormat.of().parseHex(
-                        "01040000"+ // headers, length 4, section prefix
-                                "ff00" // :status:100
+                {"uppercase header name", ProtocolException.class, parseHex(
+                        "01090000", // headers, length 9, section prefix
+                        "d9", // :status:200
+                        "234147450130", // AGE:0
+                        "000100" // data, 1 byte
                 )},
-                new Object[] {"uppercase header name", HexFormat.of().parseHex(
-                        "01090000"+ // headers, length 9, section prefix
-                                "d9"+ // :status:200
-                                "234147450130"+ // AGE:0
+                {"content too long", IOException.class, parseHex(
+                        "01040000", // headers, length 4, section prefix
+                        "d9", // :status:200
+                        "c4", // content-length:0
+                        "000100" // data, 1 byte
+                )},
+                {"content too short", IOException.class, parseHex(
+                        "01060000", // headers, length 6, section prefix
+                        "d9", // :status:200
+                        "540132", // content-length:2
+                        "000100" // data, 1 byte
+                )},
+                {"text in content-length", ProtocolException.class, parseHex(
+                        "01060000" + // headers, length 6, section prefix
+                                "d9" + // :status:200
+                                "540161" + // content-length:a
                                 "000100" // data, 1 byte
                 )},
-                new Object[] {"content too long", HexFormat.of().parseHex(
-                        "01040000"+ // headers, length 4, section prefix
-                                "d9"+ // :status:200
-                                "c4"+ // content-length:0
-                                "000100" // data, 1 byte
-                )},
-                new Object[] {"content too short", HexFormat.of().parseHex(
-                        "01060000"+ // headers, length 6, section prefix
-                                "d9"+ // :status:200
-                                "540132"+ // content-length:2
-                                "000100" // data, 1 byte
-                )},
-                new Object[] {"text in content-length", HexFormat.of().parseHex(
-                        "01060000"+ // headers, length 6, section prefix
-                                "d9"+ // :status:200
-                                "540161"+ // content-length:a
-                                "000100" // data, 1 byte
-                )},
-                new Object[] {"connection: close", HexFormat.of().parseHex(
-                        "01150000"+ // headers, length 21, section prefix
-                                "d9"+ // :status:200
-                                "2703636F6E6E656374696F6E05636C6F7365"+ // connection:close
+                {"connection: close", ProtocolException.class, parseHex(
+                        "01150000", // headers, length 21, section prefix
+                        "d9", // :status:200
+                        "2703636F6E6E656374696F6E05636C6F7365" + // connection:close
                                 "000100" // data, 1 byte
                 )},
                 // request pseudo-headers in response
-                new Object[] {":method in response", HexFormat.of().parseHex(
-                        "01040000"+ // headers, length 4, section prefix
-                                "d9"+ // :status:200
-                                "d1"+ // :method:get
-                                "000100" // data, 1 byte
+                {":method in response", ProtocolException.class, parseHex(
+                        "01040000", // headers, length 4, section prefix
+                        "d9", // :status:200
+                        "d1", // :method:get
+                        "000100" // data, 1 byte
                 )},
-                new Object[] {":authority in response", HexFormat.of().parseHex(
-                        "01100000"+ // headers, length 16, section prefix
-                                "d9"+ // :status:200
-                                "508b089d5c0b8170dc702fbce7"+ // :authority
-                                "000100" // data, 1 byte
+                {":authority in response", ProtocolException.class, parseHex(
+                        "01100000", // headers, length 16, section prefix
+                        "d9", // :status:200
+                        "508b089d5c0b8170dc702fbce7", // :authority
+                        "000100" // data, 1 byte
                 )},
-                new Object[] {":path in response", HexFormat.of().parseHex(
-                        "010a0000"+ // headers, length 10, section prefix
-                                "d9"+ // :status:200
-                                "51856272d141ff"+ // :path
-                                "000100" // data, 1 byte
+                {":path in response", ProtocolException.class, parseHex(
+                        "010a0000", // headers, length 10, section prefix
+                        "d9", // :status:200
+                        "51856272d141ff", // :path
+                        "000100" // data, 1 byte
                 )},
-                new Object[] {":scheme in response", HexFormat.of().parseHex(
-                        "01040000"+ // headers, length 4, section prefix
-                                "d9"+ // :status:200
-                                "d7"+ // :scheme:https
-                                "000100" // data, 1 byte
+                {":scheme in response", ProtocolException.class, parseHex(
+                        "01040000", // headers, length 4, section prefix
+                        "d9", // :status:200
+                        "d7", // :scheme:https
+                        "000100" // data, 1 byte
                 )},
-                new Object[] {"undefined pseudo-header", HexFormat.of().parseHex(
-                        "01080000"+ // headers, length 8, section prefix
-                                "d9"+ // :status:200
-                                "223A6D0130"+ // :m:0
-                                "000100" // data, 1 byte
+                {"undefined pseudo-header", ProtocolException.class, parseHex(
+                        "01080000", // headers, length 8, section prefix
+                        "d9", // :status:200
+                        "223A6D0130", // :m:0
+                        "000100" // data, 1 byte
                 )},
-                new Object[] {"pseudo-header after regular", HexFormat.of().parseHex(
-                        "011a0000"+ // headers, length 26, section prefix
-                                "5f5094ca3ee35a74a6b589418b5258132b1aa496ca8747"+ //user-agent
-                                "d9"+ // :status:200
-                                "000100" // data, 1 byte
+                {"pseudo-header after regular", ProtocolException.class, parseHex(
+                        "011a0000", // headers, length 26, section prefix
+                        "5f5094ca3ee35a74a6b589418b5258132b1aa496ca8747", //user-agent
+                        "d9", // :status:200
+                        "000100" // data, 1 byte
                 )},
-                new Object[] {"trailer", HexFormat.of().parseHex(
+                {"trailer", IOException.class, parseHex(
                         "01020000" // headers, length 2, section prefix
                 )},
-                new Object[] {"trailer+data", HexFormat.of().parseHex(
-                        "01020000"+ // headers, length 2, section prefix
-                                "000100" // data, 1 byte
+                {"trailer+data", IOException.class, parseHex(
+                        "01020000", // headers, length 2, section prefix
+                        "000100" // data, 1 byte
                 )},
                 //  valid characters include \t, 0x20-0x7e, 0x80-0xff (RFC 9110, section 5.5)
-                new Object[] {"invalid character in field value 00", HexFormat.of().parseHex(
-                        "01060000"+ // headers, length 6, section prefix
-                                "d9"+ // :status:200
-                                "570100"+ // etag:\0
-                                "000100" // data, 1 byte
+                {"invalid character in field value 00", ProtocolException.class, parseHex(
+                        "01060000", // headers, length 6, section prefix
+                        "d9", // :status:200
+                        "570100", // etag:\0
+                        "000100" // data, 1 byte
                 )},
-                new Object[] {"invalid character in field value 0a", HexFormat.of().parseHex(
-                        "01060000"+ // headers, length 6, section prefix
-                                "d9"+ // :status:200
-                                "57010a"+ // etag:\n
-                                "000100" // data, 1 byte
+                {"invalid character in field value 0a", ProtocolException.class, parseHex(
+                        "01060000", // headers, length 6, section prefix
+                        "d9", // :status:200
+                        "57010a", // etag:\n
+                        "000100" // data, 1 byte
                 )},
-                new Object[] {"invalid character in field value 0d", HexFormat.of().parseHex(
-                        "01060000"+ // headers, length 6, section prefix
-                                "d9"+ // :status:200
-                                "57010d"+ // etag:\r
-                                "000100" // data, 1 byte
+                {"invalid character in field value 0d", ProtocolException.class, parseHex(
+                        "01060000", // headers, length 6, section prefix
+                        "d9", // :status:200
+                        "57010d", // etag:\r
+                        "000100" // data, 1 byte
                 )},
-                new Object[] {"invalid character in field value 7f", HexFormat.of().parseHex(
-                        "01060000"+ // headers, length 6, section prefix
-                                "d9"+ // :status:200
-                                "57017f"+ // etag: 0x7f
-                                "000100" // data, 1 byte
+                {"invalid character in field value 7f", ProtocolException.class, parseHex(
+                        "01060000", // headers, length 6, section prefix
+                        "d9", // :status:200
+                        "57017f", // etag: 0x7f
+                        "000100" // data, 1 byte
                 )},
         };
     }
 
-    // These responses are malformed and should not be accepted by the client.
-    // They might or might not cause connection closure (H3_FRAME_UNEXPECTED)
-    @DataProvider
-    public static Object[][] malformedResponse2() {
+    /// Malformed responses that should not be accepted by the client.
+    /// They might or might not cause the connection to get closed (`H3_FRAME_UNEXPECTED`).
+    static Object[][] malformedResponses() {
         // data before headers is covered by H3ErrorHandlingTest
         return new Object[][]{
-                new Object[] {"100+data", HexFormat.of().parseHex(
-                        "01040000"+ // headers, length 4, section prefix
-                                "ff00"+ // :status:100
-                                "000100" // data, 1 byte
+                {"100+data", IOException.class, parseHex(
+                        "01040000", // headers, length 4, section prefix
+                        "ff00", // :status:100
+                        "000100" // data, 1 byte
                 )},
-                new Object[] {"100+data+200", HexFormat.of().parseHex(
-                        "01040000"+ // headers, length 4, section prefix
-                                "ff00"+ // :status:100
-                                "000100"+ // data, 1 byte
-                                "01030000"+ // headers, length 3, section prefix
-                                "d9" // :status:200
+                {"100+data+200", IOException.class, parseHex(
+                        "01040000", // headers, length 4, section prefix
+                        "ff00", // :status:100
+                        "000100", // data, 1 byte
+                        "01030000", // headers, length 3, section prefix
+                        "d9" // :status:200
                 )},
-                new Object[] {"200+data+200", HexFormat.of().parseHex(
-                        "01030000"+ // headers, length 3, section prefix
-                                "d9"+ // :status:200
-                                "000100"+ // data, 1 byte
-                                "01030000"+ // headers, length 3, section prefix
-                                "d9" // :status:200
+                {"200+data+200", IOException.class, parseHex(
+                        "01030000", // headers, length 3, section prefix
+                        "d9", // :status:200
+                        "000100", // data, 1 byte
+                        "01030000", // headers, length 3, section prefix
+                        "d9" // :status:200
                 )},
-                new Object[] {"200+data+100", HexFormat.of().parseHex(
-                        "01030000"+ // headers, length 3, section prefix
-                                "d9"+ // :status:200
-                                "000100"+ // data, 1 byte
-                                "01040000"+ // headers, length 4, section prefix
-                                "ff00" // :status:100
+                {"200+data+100", IOException.class, parseHex(
+                        "01030000", // headers, length 3, section prefix
+                        "d9", // :status:200
+                        "000100", // data, 1 byte
+                        "01040000", // headers, length 4, section prefix
+                        "ff00" // :status:100
                 )},
-                new Object[] {"200+data+trailers+data", HexFormat.of().parseHex(
-                        "01030000"+ // headers, length 3, section prefix
-                                "d9"+ // :status:200
-                                "000100"+ // data, 1 byte
-                                "01020000"+ // trailers, length 2, section prefix
-                                "000100" // data, 1 byte
+                {"200+data+trailers+data", ProtocolException.class, parseHex(
+                        "01030000", // headers, length 3, section prefix
+                        "d9", // :status:200
+                        "000100", // data, 1 byte
+                        "01020000", // trailers, length 2, section prefix
+                        "000100" // data, 1 byte
                 )},
-                new Object[] {"200+trailers+data", HexFormat.of().parseHex(
-                        "01030000"+ // headers, length 3, section prefix
-                                "d9"+ // :status:200
-                                "01020000"+ // trailers, length 2, section prefix
-                                "000100" // data, 1 byte
+                {"200+trailers+data", IOException.class, parseHex(
+                        "01030000", // headers, length 3, section prefix
+                        "d9", // :status:200
+                        "01020000", // trailers, length 2, section prefix
+                        "000100" // data, 1 byte
                 )},
-                new Object[] {"200+200", HexFormat.of().parseHex(
-                        "01030000"+ // headers, length 3, section prefix
-                                "d9"+ // :status:200
-                                "01030000"+ // headers, length 3, section prefix
-                                "d9" // :status:200
+                {"200+200", IOException.class, parseHex(
+                        "01030000", // headers, length 3, section prefix
+                        "d9", // :status:200
+                        "01030000", // headers, length 3, section prefix
+                        "d9" // :status:200
                 )},
-                new Object[] {"200+100", HexFormat.of().parseHex(
-                        "01030000"+ // headers, length 3, section prefix
-                                "d9"+ // :status:200
-                                "01040000"+ // headers, length 4, section prefix
-                                "ff00" // :status:100
+                {"200+100", IOException.class, parseHex(
+                        "01030000", // headers, length 3, section prefix
+                        "d9", // :status:200
+                        "01040000", // headers, length 4, section prefix
+                        "ff00" // :status:100
                 )},
         };
     }
 
-    @DataProvider
-    public static Object[][] wellformedResponse() {
+    /// Well-formed responses that should be accepted by the client.
+    static Object[][] wellFormedResponses() {
         return new Object[][]{
-                new Object[] {"100+200+data+reserved", HexFormat.of().parseHex(
-                        "01040000"+ // headers, length 4, section prefix
-                                "ff00"+ // :status:100
-                        "01030000"+ // headers, length 3, section prefix
-                                "d9"+ // :status:200
-                                "000100"+ // data, 1 byte
-                                "210100" // reserved, 1 byte
+                {"100+200+data+reserved", parseHex(
+                        "01040000", // headers, length 4, section prefix
+                        "ff00", // :status:100
+                        "01030000", // headers, length 3, section prefix
+                        "d9", // :status:200
+                        "000100", // data, 1 byte
+                        "210100" // reserved, 1 byte
                 )},
-                new Object[] {"200+data+reserved", HexFormat.of().parseHex(
-                        "01030000"+ // headers, length 3, section prefix
-                                "d9"+ // :status:200
-                                "000100"+ // data, 1 byte
-                                "210100" // reserved, 1 byte
+                {"200+data+reserved", parseHex(
+                        "01030000", // headers, length 3, section prefix
+                        "d9", // :status:200
+                        "000100", // data, 1 byte
+                        "210100" // reserved, 1 byte
                 )},
-                new Object[] {"200+data", HexFormat.of().parseHex(
-                        "01030000"+ // headers, length 3, section prefix
-                                "d9"+ // :status:200
-                                "000100" // data, 1 byte
+                {"200+data", parseHex(
+                        "01030000", // headers, length 3, section prefix
+                        "d9", // :status:200
+                        "000100" // data, 1 byte
                 )},
-                new Object[] {"200+user-agent+data", HexFormat.of().parseHex(
-                        "011a0000"+ // headers, length 26, section prefix
-                                "d9"+ // :status:200
-                                "5f5094ca3ee35a74a6b589418b5258132b1aa496ca8747"+ //user-agent
-                                "000100" // data, 1 byte
+                {"200+user-agent+data", parseHex(
+                        "011a0000", // headers, length 26, section prefix
+                        "d9", // :status:200
+                        "5f5094ca3ee35a74a6b589418b5258132b1aa496ca8747", //user-agent
+                        "000100" // data, 1 byte
                 )},
-                new Object[] {"200", HexFormat.of().parseHex(
-                        "01030000"+ // headers, length 3, section prefix
-                                "d9" // :status:200
+                {"200", parseHex(
+                        "01030000", // headers, length 3, section prefix
+                        "d9" // :status:200
                 )},
-                new Object[] {"200+data+data", HexFormat.of().parseHex(
-                        "01030000"+ // headers, length 3, section prefix
-                                "d9"+ // :status:200
-                                "000100"+ // data, 1 byte
-                                "000100" // data, 1 byte
+                {"200+data+data", parseHex(
+                        "01030000", // headers, length 3, section prefix
+                        "d9", // :status:200
+                        "000100", // data, 1 byte
+                        "000100" // data, 1 byte
                 )},
-                new Object[] {"200+data+trailers", HexFormat.of().parseHex(
-                        "01030000"+ // headers, length 3, section prefix
-                                "d9"+ // :status:200
-                                "000100"+ // data, 1 byte
-                                "01020000" // trailers, length 2, section prefix
+                {"200+data+trailers", parseHex(
+                        "01030000", // headers, length 3, section prefix
+                        "d9", // :status:200
+                        "000100", // data, 1 byte
+                        "01020000" // trailers, length 2, section prefix
                 )},
-                new Object[] {"200+trailers", HexFormat.of().parseHex(
-                        "01030000"+ // headers, length 3, section prefix
-                                "d9"+ // :status:200
-                                "01020000" // trailers, length 2, section prefix
+                {"200+trailers", parseHex(
+                        "01030000", // headers, length 3, section prefix
+                        "d9", // :status:200
+                        "01020000" // trailers, length 2, section prefix
                 )},
         };
     }
 
-    @BeforeClass
-    public void beforeClass() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
+    private static byte[] parseHex(String... strings) {
+        var buffer = new StringBuilder();
+        for (String string : strings) {
+            buffer.append(string);
         }
-        server = QuicStandaloneServer.newBuilder()
-                .availableVersions(new QuicVersion[]{QuicVersion.QUIC_V1})
-                .sslContext(sslContext)
-                .alpn("h3")
+        return HexFormat.of().parseHex(buffer.toString());
+    }
+
+    @ParameterizedTest
+    @MethodSource("wellFormedResponses")
+    void testWellFormedResponse(String desc, byte[] serverResponseBytes) throws Exception {
+        var connectionTerminated = configureServerResponse(serverResponseBytes);
+        try (var client = createClient()) {
+            final HttpResponse<Void> response = client.send(REQUEST, BodyHandlers.discarding());
+            assertEquals(200, response.statusCode());
+            assertFalse(connectionTerminated.getAsBoolean(), "Expected the connection to be open");
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("malformedResponsesPreservingConnection")
+    void testMalformedResponsePreservingConnection(
+            String desc,
+            Class<? extends Exception> exceptionClass,
+            byte[] serverResponseBytes) {
+        var connectionTerminated = configureServerResponse(serverResponseBytes);
+        try (var client = createClient()) {
+            var exception = assertThrows(exceptionClass, () -> client.send(REQUEST, BodyHandlers.discarding()));
+            LOGGER.log("Got expected exception for: " + desc, exception);
+            assertFalse(connectionTerminated.getAsBoolean(), "Expected the connection to be open");
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("malformedResponses")
+    void testMalformedResponse(
+            String desc,
+            Class<? extends Exception> exceptionClass,
+            byte[] serverResponseBytes) {
+        configureServerResponse(serverResponseBytes);
+        try (var client = createClient()) {
+            var exception = assertThrows(exceptionClass, () -> client.send(REQUEST, BodyHandlers.discarding()));
+            LOGGER.log("Got expected exception for: " + desc, exception);
+        }
+    }
+
+    private static HttpClient createClient() {
+        return HttpServerAdapters.createClientBuilderForH3()
+                .proxy(NO_PROXY)
+                .version(Version.HTTP_3)
+                .sslContext(SSL_CONTEXT)
                 .build();
-        server.start();
-        System.out.println("Server started at " + server.getAddress());
-        requestURIBase = URIBuilder.newBuilder().scheme("https").loopback()
-                .port(server.getAddress().getPort()).build().toString();
     }
 
-    @AfterClass
-    public void afterClass() throws Exception {
-        if (server != null) {
-            System.out.println("Stopping server " + server.getAddress());
-            server.close();
-        }
-    }
-
-    /**
-     * Server sends a well-formed response
-     */
-    @Test(dataProvider = "wellformedResponse")
-    public void testWellFormedResponse(String desc, byte[] response) throws Exception {
-        CompletableFuture<TerminationCause> errorCF = new CompletableFuture<>();
-        server.addHandler((c,s)-> {
+    private static BooleanSupplier configureServerResponse(byte[] serverResponseBytes) {
+        var connectionTerminated = new AtomicBoolean();
+        SERVER.addHandler((c, s)-> {
             try (OutputStream outputStream = s.outputStream()) {
-                outputStream.write(response);
+                outputStream.write(serverResponseBytes);
             }
-            // verify that the connection stays open
-            completeUponTermination(c, errorCF);
+            c.futureTerminationCause().handle((_, _) -> {
+                connectionTerminated.set(true);
+                return true;
+            });
         });
-        HttpClient client = getHttpClient();
-        try {
-            HttpRequest request = getRequest();
-            final HttpResponse<Void> response1 = client.send(
-                    request,
-                    BodyHandlers.discarding());
-            assertEquals(response1.statusCode(), 200);
-            assertFalse(errorCF.isDone(), "Expected the connection to be open");
-        } finally {
-            client.shutdownNow();
-        }
+        return connectionTerminated::get;
     }
 
-
-    /**
-     * Server sends a malformed response that should not close connection
-     */
-    @Test(dataProvider = "malformedResponse")
-    public void testMalformedResponse(String desc, byte[] response) throws Exception {
-        CompletableFuture<TerminationCause> errorCF = new CompletableFuture<>();
-        server.addHandler((c,s)-> {
-            try (OutputStream outputStream = s.outputStream()) {
-                outputStream.write(response);
-            }
-            // verify that the connection stays open
-            completeUponTermination(c, errorCF);
-        });
-        HttpClient client = getHttpClient();
-        try {
-            HttpRequest request = getRequest();
-            final HttpResponse<Void> response1 = client.send(
-                            request,
-                            BodyHandlers.discarding());
-            fail("Expected the request to fail, got " + response1);
-        } catch (Exception e) {
-            System.out.println("Got expected exception: " +e);
-            e.printStackTrace();
-            assertFalse(errorCF.isDone(), "Expected the connection to be open");
-        } finally {
-            client.shutdownNow();
-        }
-    }
-
-    /**
-     * Server sends a malformed response that might close connection
-     */
-    @Test(dataProvider = "malformedResponse2")
-    public void testMalformedResponse2(String desc, byte[] response) throws Exception {
-        server.addHandler((c,s)-> {
-            try (OutputStream outputStream = s.outputStream()) {
-                outputStream.write(response);
-            }
-        });
-        HttpClient client = getHttpClient();
-        try {
-            HttpRequest request = getRequest();
-            final HttpResponse<Void> response1 = client.send(
-                            request,
-                            BodyHandlers.discarding());
-            fail("Expected the request to fail, got " + response1);
-        } catch (Exception e) {
-            System.out.println("Got expected exception: " +e);
-            e.printStackTrace();
-        } finally {
-            client.shutdownNow();
-        }
-    }
-
-    private HttpRequest getRequest() throws URISyntaxException {
-        final URI reqURI = new URI(requestURIBase + "/hello");
-        final HttpRequest.Builder reqBuilder = HttpRequest.newBuilder(reqURI)
-                .version(Version.HTTP_3)
-                .setOption(H3_DISCOVERY, HTTP_3_URI_ONLY);
-        return reqBuilder.build();
-    }
-
-    private HttpClient getHttpClient() {
-        final HttpClient client = newClientBuilderForH3()
-                .proxy(HttpClient.Builder.NO_PROXY)
-                .version(Version.HTTP_3)
-                .sslContext(sslContext).build();
-        return client;
-    }
-
-    private static String toHexString(final Http3Error error) {
-        return error.name() + "(0x" + Long.toHexString(error.code()) + ")";
-    }
-
-    private static void completeUponTermination(final QuicServerConnection serverConnection,
-                                                final CompletableFuture<TerminationCause> cf) {
-        serverConnection.futureTerminationCause().handle(
-                (r,t) -> t != null ? cf.completeExceptionally(t) : cf.complete(r));
-    }
 }
diff --git a/test/jdk/java/net/httpclient/http3/H3MaxInitialTimeoutTest.java b/test/jdk/java/net/httpclient/http3/H3MaxInitialTimeoutTest.java
index 30f48c56454..27eec672bcd 100644
--- a/test/jdk/java/net/httpclient/http3/H3MaxInitialTimeoutTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3MaxInitialTimeoutTest.java
@@ -83,7 +83,7 @@ import static org.testng.Assert.assertEquals;
  */
 public class H3MaxInitialTimeoutTest implements HttpServerAdapters {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     DatagramChannel receiver;
     String h3URI;
 
@@ -224,10 +224,6 @@ public class H3MaxInitialTimeoutTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         receiver = DatagramChannel.open();
         receiver.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
         h3URI = URIBuilder.newBuilder()
diff --git a/test/jdk/java/net/httpclient/http3/H3MemoryHandlingTest.java b/test/jdk/java/net/httpclient/http3/H3MemoryHandlingTest.java
index f270297d85c..c9474be51c2 100644
--- a/test/jdk/java/net/httpclient/http3/H3MemoryHandlingTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3MemoryHandlingTest.java
@@ -70,16 +70,12 @@ import static org.testng.Assert.*;
  */
 public class H3MemoryHandlingTest implements HttpServerAdapters {
 
-    private SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private QuicStandaloneServer server;
     private String requestURIBase;
 
     @BeforeClass
     public void beforeClass() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         server = QuicStandaloneServer.newBuilder()
                 .availableVersions(new QuicVersion[]{QuicVersion.QUIC_V1})
                 .sslContext(sslContext)
diff --git a/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java b/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java
index 2e4047cf5ea..14149da7815 100644
--- a/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java
+++ b/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java
@@ -172,7 +172,7 @@ import static jdk.internal.net.http.Http3ClientProperties.MAX_STREAM_LIMIT_WAIT_
 public class H3MultipleConnectionsToSameHost implements HttpServerAdapters {
     static HttpTestServer httpsServer;
     static HttpClient client = null;
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     static String httpsURIString;
     static ExecutorService serverExec =
             Executors.newThreadPerTaskExecutor(Thread.ofVirtual()
@@ -180,8 +180,6 @@ public class H3MultipleConnectionsToSameHost implements HttpServerAdapters {
 
     static void initialize() throws Exception {
         try {
-            SimpleSSLContext sslct = new SimpleSSLContext();
-            sslContext = sslct.get();
             client = getClient();
 
             httpsServer = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext, serverExec);
@@ -198,9 +196,6 @@ public class H3MultipleConnectionsToSameHost implements HttpServerAdapters {
     }
 
     private static void warmup() throws Exception {
-        SimpleSSLContext sslct = new SimpleSSLContext();
-        var sslContext = sslct.get();
-
         // warmup server
         try (var client2 = createClient(sslContext, Executors.newVirtualThreadPerTaskExecutor())) {
             HttpRequest request = HttpRequest.newBuilder(URI.create(httpsURIString))
diff --git a/test/jdk/java/net/httpclient/http3/H3ProxyTest.java b/test/jdk/java/net/httpclient/http3/H3ProxyTest.java
index 4555f259e07..58deeec1982 100644
--- a/test/jdk/java/net/httpclient/http3/H3ProxyTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3ProxyTest.java
@@ -65,11 +65,7 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
 public class H3ProxyTest implements HttpServerAdapters {
 
     static {
-        try {
-            SSLContext.setDefault(new SimpleSSLContext().get());
-        } catch (IOException ex) {
-            throw new ExceptionInInitializerError(ex);
-        }
+        SSLContext.setDefault(SimpleSSLContext.findSSLContext());
     }
 
     static final String RESPONSE = "<html><body><p>Hello World!</body></html>";
@@ -157,7 +153,7 @@ public class H3ProxyTest implements HttpServerAdapters {
                     InetSocketAddress.createUnresolved("localhost", proxy.getAddress().getPort()));
             HttpClient client = HttpServerAdapters.createClientBuilderForH3()
                     .version(Version.HTTP_3)
-                    .sslContext(new SimpleSSLContext().get())
+                    .sslContext(SimpleSSLContext.findSSLContext())
                     .proxy(ps)
                     .build();
             try (client) {
diff --git a/test/jdk/java/net/httpclient/http3/H3PushCancel.java b/test/jdk/java/net/httpclient/http3/H3PushCancel.java
index a5293444ade..324942b67d0 100644
--- a/test/jdk/java/net/httpclient/http3/H3PushCancel.java
+++ b/test/jdk/java/net/httpclient/http3/H3PushCancel.java
@@ -100,7 +100,7 @@ public class H3PushCancel implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        server = HttpTestServer.create(ANY, new SimpleSSLContext().get());
+        server = HttpTestServer.create(ANY, SimpleSSLContext.findSSLContext());
         pushHandler = new ServerPushHandler(MAIN_RESPONSE_BODY, PUSH_PROMISES);
         server.addHandler(pushHandler, "/push/");
         server.addHandler(new HttpHeadOrGetHandler(), "/head/");
@@ -137,7 +137,7 @@ public class H3PushCancel implements HttpServerAdapters {
         try (HttpClient client = newClientBuilderForH3()
                 .proxy(Builder.NO_PROXY)
                 .version(Version.HTTP_3)
-                .sslContext(new SimpleSSLContext().get())
+                .sslContext(SimpleSSLContext.findSSLContext())
                 .build()) {
 
             sendHeadRequest(client);
@@ -243,7 +243,7 @@ public class H3PushCancel implements HttpServerAdapters {
         try (HttpClient client = newClientBuilderForH3()
                 .proxy(Builder.NO_PROXY)
                 .version(Version.HTTP_3)
-                .sslContext(new SimpleSSLContext().get())
+                .sslContext(SimpleSSLContext.findSSLContext())
                 .build()) {
 
             sendHeadRequest(client);
diff --git a/test/jdk/java/net/httpclient/http3/H3QuicTLSConnection.java b/test/jdk/java/net/httpclient/http3/H3QuicTLSConnection.java
index cd699e7774d..6086c26729b 100644
--- a/test/jdk/java/net/httpclient/http3/H3QuicTLSConnection.java
+++ b/test/jdk/java/net/httpclient/http3/H3QuicTLSConnection.java
@@ -83,7 +83,7 @@ public class H3QuicTLSConnection {
 
     public static void main(String[] args) throws Exception {
         // create and set the default SSLContext
-        SSLContext context = new SimpleSSLContext().get();
+        SSLContext context = SimpleSSLContext.findSSLContext();
         SSLContext.setDefault(context);
 
         Handler handler = new Handler();
diff --git a/test/jdk/java/net/httpclient/http3/H3QuicVTTest.java b/test/jdk/java/net/httpclient/http3/H3QuicVTTest.java
index b00f6b1522d..7ea24d81ded 100644
--- a/test/jdk/java/net/httpclient/http3/H3QuicVTTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3QuicVTTest.java
@@ -114,7 +114,7 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 // -Djava.security.debug=all
 class H3QuicVTTest implements HttpServerAdapters {
 
-    private static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private static HttpTestServer h3Server;
     private static String requestURI;
 
@@ -139,10 +139,6 @@ class H3QuicVTTest implements HttpServerAdapters {
 
     @BeforeAll
     static void beforeClass() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         // create an H3 only server
         h3Server = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
         h3Server.addHandler((exchange) -> exchange.sendResponseHeaders(200, 0), "/hello");
diff --git a/test/jdk/java/net/httpclient/http3/H3RedirectTest.java b/test/jdk/java/net/httpclient/http3/H3RedirectTest.java
index 4f6fbaeef6f..0a5546bc1c1 100644
--- a/test/jdk/java/net/httpclient/http3/H3RedirectTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3RedirectTest.java
@@ -57,7 +57,7 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
 
 public class H3RedirectTest implements HttpServerAdapters {
     static int httpPort;
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     static HttpTestServer http3Server;
     static HttpClient client;
 
@@ -106,8 +106,6 @@ public class H3RedirectTest implements HttpServerAdapters {
 
     static void initialize() throws Exception {
         try {
-            SimpleSSLContext sslct = new SimpleSSLContext();
-            sslContext = sslct.get();
             client = getClient();
             http3Server = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
             httpPort = http3Server.getAddress().getPort();
diff --git a/test/jdk/java/net/httpclient/http3/H3RequestRejectedTest.java b/test/jdk/java/net/httpclient/http3/H3RequestRejectedTest.java
index 1731ddae833..834011bf4f5 100644
--- a/test/jdk/java/net/httpclient/http3/H3RequestRejectedTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3RequestRejectedTest.java
@@ -72,12 +72,10 @@ class H3RequestRejectedTest {
     private static final String HANDLER_PATH = "/foo";
 
     private static HttpTestServer server;
-    private static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
     @BeforeAll
     static void beforeAll() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        assertNotNull(sslContext, "SSLContext could not be constructed");
         server = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
         server.addHandler(new Handler(), HANDLER_PATH);
         server.start();
diff --git a/test/jdk/java/net/httpclient/http3/H3ServerPush.java b/test/jdk/java/net/httpclient/http3/H3ServerPush.java
index 4b271320b0d..83f68a15579 100644
--- a/test/jdk/java/net/httpclient/http3/H3ServerPush.java
+++ b/test/jdk/java/net/httpclient/http3/H3ServerPush.java
@@ -90,7 +90,7 @@ public class H3ServerPush implements HttpServerAdapters {
     @BeforeTest
     public void setup() throws Exception {
         tempFile = createTempFileOfSize(CLASS_NAME, ".dat", FILE_SIZE);
-        var sslContext = new SimpleSSLContext().get();
+        var sslContext = SimpleSSLContext.findSSLContext();
         var h2Server = new Http2TestServer(true, sslContext);
         h2Server.enableH3AltServiceOnSamePort();
         h2Server.addHandler(new PushHandler(tempFile, LOOPS), "/foo/");
@@ -133,7 +133,7 @@ public class H3ServerPush implements HttpServerAdapters {
         };
 
         try (HttpClient client = newClientBuilderForH3().proxy(Builder.NO_PROXY)
-                .sslContext(new SimpleSSLContext().get())
+                .sslContext(SimpleSSLContext.findSSLContext())
                 .version(Version.HTTP_3).build()) {
             sendHeadRequest(client);
 
@@ -183,7 +183,7 @@ public class H3ServerPush implements HttpServerAdapters {
                 PushPromiseHandler.of(pushPromise -> BodyHandlers.ofString(UTF_8), resultMap);
 
         try (HttpClient client = newClientBuilderForH3().proxy(Builder.NO_PROXY)
-                .sslContext(new SimpleSSLContext().get())
+                .sslContext(SimpleSSLContext.findSSLContext())
                 .version(Version.HTTP_3).build()) {
             sendHeadRequest(client);
             HttpRequest request = HttpRequest.newBuilder(uri).GET().build();
@@ -231,7 +231,7 @@ public class H3ServerPush implements HttpServerAdapters {
         };
 
         try (HttpClient client = newClientBuilderForH3().proxy(Builder.NO_PROXY)
-                .sslContext(new SimpleSSLContext().get())
+                .sslContext(SimpleSSLContext.findSSLContext())
                 .version(Version.HTTP_3).build()) {
             sendHeadRequest(client);
 
@@ -263,7 +263,7 @@ public class H3ServerPush implements HttpServerAdapters {
                 PushPromiseHandler.of(H3ServerPush::requestToPath, resultsMap);
 
         try (HttpClient client = newClientBuilderForH3().proxy(Builder.NO_PROXY)
-                .sslContext(new SimpleSSLContext().get())
+                .sslContext(SimpleSSLContext.findSSLContext())
                 .version(Version.HTTP_3).build()) {
             sendHeadRequest(client);
 
@@ -316,7 +316,7 @@ public class H3ServerPush implements HttpServerAdapters {
                 = new ConcurrentHashMap<>();
 
         try (HttpClient client = newClientBuilderForH3().proxy(Builder.NO_PROXY)
-                .sslContext(new SimpleSSLContext().get())
+                .sslContext(SimpleSSLContext.findSSLContext())
                 .version(Version.HTTP_3).build()) {
             sendHeadRequest(client);
 
@@ -361,7 +361,7 @@ public class H3ServerPush implements HttpServerAdapters {
                 = new ConcurrentHashMap<>();
 
         try (HttpClient client = newClientBuilderForH3().proxy(Builder.NO_PROXY)
-                .sslContext(new SimpleSSLContext().get())
+                .sslContext(SimpleSSLContext.findSSLContext())
                 .version(Version.HTTP_3).build()) {
             sendHeadRequest(client);
 
diff --git a/test/jdk/java/net/httpclient/http3/H3ServerPushCancel.java b/test/jdk/java/net/httpclient/http3/H3ServerPushCancel.java
index 32ca87e20f5..312b9ac507d 100644
--- a/test/jdk/java/net/httpclient/http3/H3ServerPushCancel.java
+++ b/test/jdk/java/net/httpclient/http3/H3ServerPushCancel.java
@@ -116,7 +116,7 @@ public class H3ServerPushCancel implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        server = HttpTestServer.create(ANY, new SimpleSSLContext().get());
+        server = HttpTestServer.create(ANY, SimpleSSLContext.findSSLContext());
         pushHandler = new ServerPushHandler(MAIN_RESPONSE_BODY, PUSH_PROMISES);
         server.addHandler(pushHandler, "/push/");
         server.addHandler(new HttpHeadOrGetHandler(), "/head/");
@@ -222,7 +222,7 @@ public class H3ServerPushCancel implements HttpServerAdapters {
         try (HttpClient client = newClientBuilderForH3()
                 .proxy(Builder.NO_PROXY)
                 .version(HTTP_3)
-                .sslContext(new SimpleSSLContext().get())
+                .sslContext(SimpleSSLContext.findSSLContext())
                 .build()) {
 
             sendHeadRequest(client);
diff --git a/test/jdk/java/net/httpclient/http3/H3ServerPushTest.java b/test/jdk/java/net/httpclient/http3/H3ServerPushTest.java
index ed5a14d8576..00fe651c9cf 100644
--- a/test/jdk/java/net/httpclient/http3/H3ServerPushTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3ServerPushTest.java
@@ -95,15 +95,7 @@ class H3ServerPushTest {
 
     private static final HttpHeaders EMPTY_HEADERS = HttpHeaders.of(Map.of(), (_, _) -> false);
 
-    private static final SSLContext SSL_CONTEXT = createSslContext();
-
-    private static SSLContext createSslContext() {
-        try {
-            return new SimpleSSLContext().get();
-        } catch (IOException exception) {
-            throw new RuntimeException(exception);
-        }
-    }
+    private static final SSLContext SSL_CONTEXT = SimpleSSLContext.findSSLContext();
 
     @Test
     @Order(1)
diff --git a/test/jdk/java/net/httpclient/http3/H3ServerPushWithDiffTypes.java b/test/jdk/java/net/httpclient/http3/H3ServerPushWithDiffTypes.java
index af22651f0a0..d00012826ef 100644
--- a/test/jdk/java/net/httpclient/http3/H3ServerPushWithDiffTypes.java
+++ b/test/jdk/java/net/httpclient/http3/H3ServerPushWithDiffTypes.java
@@ -95,7 +95,7 @@ public class H3ServerPushWithDiffTypes implements HttpServerAdapters {
 
     @Test
     public void test() throws Exception {
-        var sslContext = new SimpleSSLContext().get();
+        var sslContext = SimpleSSLContext.findSSLContext();
         try (HttpTestServer server = HttpTestServer.create(ANY, sslContext)) {
             HttpTestHandler pushHandler =
                     new ServerPushHandler("the main response body",
diff --git a/test/jdk/java/net/httpclient/http3/H3SimpleGet.java b/test/jdk/java/net/httpclient/http3/H3SimpleGet.java
index fe0217e64b6..3745c32afbf 100644
--- a/test/jdk/java/net/httpclient/http3/H3SimpleGet.java
+++ b/test/jdk/java/net/httpclient/http3/H3SimpleGet.java
@@ -208,7 +208,7 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
 public class H3SimpleGet implements HttpServerAdapters {
     static HttpTestServer httpsServer;
     static HttpClient client = null;
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     static String httpsURIString;
     static ExecutorService serverExec =
             Executors.newThreadPerTaskExecutor(Thread.ofVirtual()
@@ -216,8 +216,6 @@ public class H3SimpleGet implements HttpServerAdapters {
 
     static void initialize() throws Exception {
         try {
-            SimpleSSLContext sslct = new SimpleSSLContext();
-            sslContext = sslct.get();
             client = getClient();
 
             httpsServer = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext, serverExec);
@@ -234,9 +232,6 @@ public class H3SimpleGet implements HttpServerAdapters {
     }
 
     private static void warmup() throws Exception {
-        SimpleSSLContext sslct = new SimpleSSLContext();
-        var sslContext = sslct.get();
-
         // warmup server
         try (var client2 = createClient(sslContext, Executors.newThreadPerTaskExecutor(
                 Thread.ofVirtual().name("client-2-vt-worker", 1).factory()))) {
diff --git a/test/jdk/java/net/httpclient/http3/H3SimplePost.java b/test/jdk/java/net/httpclient/http3/H3SimplePost.java
index dc8848947b3..4cf46988873 100644
--- a/test/jdk/java/net/httpclient/http3/H3SimplePost.java
+++ b/test/jdk/java/net/httpclient/http3/H3SimplePost.java
@@ -64,7 +64,7 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
 public class H3SimplePost implements HttpServerAdapters {
     static HttpTestServer httpsServer;
     static HttpClient client = null;
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     static String httpsURIString;
     static ExecutorService serverExec =
             Executors.newThreadPerTaskExecutor(Thread.ofVirtual()
@@ -72,8 +72,6 @@ public class H3SimplePost implements HttpServerAdapters {
 
     static void initialize() throws Exception {
         try {
-            SimpleSSLContext sslct = new SimpleSSLContext();
-            sslContext = sslct.get();
             client = getClient();
 
             httpsServer = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext, serverExec);
@@ -90,9 +88,6 @@ public class H3SimplePost implements HttpServerAdapters {
     }
 
     private static void warmup() throws Exception {
-        SimpleSSLContext sslct = new SimpleSSLContext();
-        var sslContext = sslct.get();
-
         // warmup server
         try (var client2 = createClient(sslContext, Executors.newVirtualThreadPerTaskExecutor())) {
             HttpRequest request = HttpRequest.newBuilder(URI.create(httpsURIString))
diff --git a/test/jdk/java/net/httpclient/http3/H3SimpleTest.java b/test/jdk/java/net/httpclient/http3/H3SimpleTest.java
index 8531f10bea7..1880d436501 100644
--- a/test/jdk/java/net/httpclient/http3/H3SimpleTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3SimpleTest.java
@@ -73,16 +73,12 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
 // -Djava.security.debug=all
 public class H3SimpleTest implements HttpServerAdapters {
 
-    private SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private HttpTestServer h3Server;
     private String requestURI;
 
     @BeforeClass
     public void beforeClass() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         // create an H3 only server
         h3Server = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
         h3Server.addHandler((exchange) -> exchange.sendResponseHeaders(200, 0), "/hello");
diff --git a/test/jdk/java/net/httpclient/http3/H3StopSendingTest.java b/test/jdk/java/net/httpclient/http3/H3StopSendingTest.java
index 1855cdba6ff..5b017c15d9b 100644
--- a/test/jdk/java/net/httpclient/http3/H3StopSendingTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3StopSendingTest.java
@@ -61,7 +61,7 @@ public class H3StopSendingTest {
     HttpRequest postRequestNoError, postRequestError;
     HttpRequest postRequestNoErrorWithData, postRequestErrorWithData;
     URI h3TestServerUriNoError, h3TestServerUriError;
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
     static final String TEST_ROOT_PATH = "/h3_stop_sending_test";
     static final String NO_ERROR_PATH = TEST_ROOT_PATH + "/no_error_path";
@@ -128,7 +128,6 @@ public class H3StopSendingTest {
     @BeforeTest
     public void setup() throws IOException {
 
-        sslContext  = new SimpleSSLContext().get();
         h3TestServer = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
         h3TestServer.addHandler(new ServerRequestStopSendingHandler(), TEST_ROOT_PATH);
         h3TestServerUriError = URI.create("https://" + h3TestServer.serverAuthority() + ERROR_PATH);
diff --git a/test/jdk/java/net/httpclient/http3/H3StreamLimitReachedTest.java b/test/jdk/java/net/httpclient/http3/H3StreamLimitReachedTest.java
index 0de80c6d587..a4524b9ae5e 100644
--- a/test/jdk/java/net/httpclient/http3/H3StreamLimitReachedTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3StreamLimitReachedTest.java
@@ -135,7 +135,7 @@ public class H3StreamLimitReachedTest implements HttpServerAdapters {
     static Http3TestServer http3OnlyServer;
     static Http2TestServer https2AltSvcServer;
     static volatile HttpClient client = null;
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     static volatile String http3OnlyURIString, https2URIString, http3AltSvcURIString, http3DirectURIString;
 
     static void initialize(boolean samePort) throws Exception {
@@ -149,8 +149,6 @@ public class H3StreamLimitReachedTest implements HttpServerAdapters {
         System.out.println("\nConfiguring for advertised AltSvc on "
                 + (samePort ? "same port" : "ephemeral port"));
         try {
-            SimpleSSLContext sslct = new SimpleSSLContext();
-            sslContext = sslct.get();
             client = null;
             client = getClient();
 
diff --git a/test/jdk/java/net/httpclient/http3/H3Timeout.java b/test/jdk/java/net/httpclient/http3/H3Timeout.java
index 81a0f87467b..fedb4d46952 100644
--- a/test/jdk/java/net/httpclient/http3/H3Timeout.java
+++ b/test/jdk/java/net/httpclient/http3/H3Timeout.java
@@ -61,7 +61,7 @@ public class H3Timeout implements HttpServerAdapters {
     private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
 
     public static void main(String[] args) throws Exception {
-        SSLContext context = new SimpleSSLContext().get();
+        SSLContext context = SimpleSSLContext.findSSLContext();
         testConnect(context, false);
         testConnect(context, true);
         testTimeout(context, false);
diff --git a/test/jdk/java/net/httpclient/http3/H3UserInfoTest.java b/test/jdk/java/net/httpclient/http3/H3UserInfoTest.java
index 15e25b865cd..8eaad2ce4de 100644
--- a/test/jdk/java/net/httpclient/http3/H3UserInfoTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3UserInfoTest.java
@@ -70,11 +70,10 @@ public class H3UserInfoTest implements HttpServerAdapters {
     static HttpTestServer server3;
     static String serverURI;
     static String server3URI;
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
     @BeforeAll
     static void before() throws Exception {
-        sslContext = new SimpleSSLContext().get();
         HttpTestHandler handler = new HttpHandler();
 
         server = HttpTestServer.create(ANY, sslContext);
diff --git a/test/jdk/java/net/httpclient/http3/HTTP3NoBodyTest.java b/test/jdk/java/net/httpclient/http3/HTTP3NoBodyTest.java
index f04588e9362..601e40c7dc6 100644
--- a/test/jdk/java/net/httpclient/http3/HTTP3NoBodyTest.java
+++ b/test/jdk/java/net/httpclient/http3/HTTP3NoBodyTest.java
@@ -76,15 +76,13 @@ public class HTTP3NoBodyTest {
     static HttpClient client = null;
     static ExecutorService clientExec;
     static ExecutorService serverExec;
-    static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     static final String TEST_STRING = "The quick brown fox jumps over the lazy dog ";
 
     static volatile String http3URIString, https2URIString;
 
     static void initialize() throws Exception {
         try {
-            SimpleSSLContext sslct = new SimpleSSLContext();
-            sslContext = sslct.get();
             client = getClient();
 
             // server that only supports HTTP/3
diff --git a/test/jdk/java/net/httpclient/http3/Http3ExpectContinueTest.java b/test/jdk/java/net/httpclient/http3/Http3ExpectContinueTest.java
index 2052671b697..53ce6a68d38 100644
--- a/test/jdk/java/net/httpclient/http3/Http3ExpectContinueTest.java
+++ b/test/jdk/java/net/httpclient/http3/Http3ExpectContinueTest.java
@@ -76,7 +76,7 @@ public class Http3ExpectContinueTest implements HttpServerAdapters {
     static final String CONTINUE_100 = "100 Continue";
     static final String RESPONSE_BODY= "Verify response received";
     static final String BODY = "Post body";
-    private SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
     @DataProvider(name = "uris")
     public Object[][] urisData() {
@@ -151,10 +151,6 @@ public class Http3ExpectContinueTest implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         final QuicServer quicServer = Http3TestServer.quicServerBuilder()
                 .sslContext(sslContext)
                 .build();
diff --git a/test/jdk/java/net/httpclient/http3/PostHTTP3Test.java b/test/jdk/java/net/httpclient/http3/PostHTTP3Test.java
index 8bb6515d4ff..90f2c41f4e5 100644
--- a/test/jdk/java/net/httpclient/http3/PostHTTP3Test.java
+++ b/test/jdk/java/net/httpclient/http3/PostHTTP3Test.java
@@ -96,7 +96,7 @@ public class PostHTTP3Test implements HttpServerAdapters {
             May the sun shine warm upon your face;
             """;
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpTestServer h3TestServer;  // HTTP/2 ( h2 + h3)
     String h3URI;
 
@@ -443,9 +443,6 @@ public class PostHTTP3Test implements HttpServerAdapters {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
         final Http2TestServer h2WithAltService = new Http2TestServer("localhost", true, sslContext)
                 .enableH3AltServiceOnSamePort();
         h3TestServer = HttpTestServer.of(h2WithAltService);
diff --git a/test/jdk/java/net/httpclient/http3/StopSendingTest.java b/test/jdk/java/net/httpclient/http3/StopSendingTest.java
index 2a029e176a2..ff1b8db7bc8 100644
--- a/test/jdk/java/net/httpclient/http3/StopSendingTest.java
+++ b/test/jdk/java/net/httpclient/http3/StopSendingTest.java
@@ -64,16 +64,12 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
  */
 public class StopSendingTest implements HttpServerAdapters {
 
-    private SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private HttpTestServer h3Server;
     private String requestURIBase;
 
     @BeforeClass
     public void beforeClass() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         h3Server = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
         h3Server.addHandler(new Handler(), "/hello");
         h3Server.start();
diff --git a/test/jdk/java/net/httpclient/http3/StreamLimitTest.java b/test/jdk/java/net/httpclient/http3/StreamLimitTest.java
index 105417950a1..e0610cf89b8 100644
--- a/test/jdk/java/net/httpclient/http3/StreamLimitTest.java
+++ b/test/jdk/java/net/httpclient/http3/StreamLimitTest.java
@@ -68,7 +68,7 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
  */
 public class StreamLimitTest {
 
-    private SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private HttpTestServer server;
     private QuicServer quicServer;
     private URI requestURI;
@@ -99,10 +99,6 @@ public class StreamLimitTest {
 
     @BeforeClass
     public void beforeClass() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         quicServer = Http3TestServer.quicServerBuilder().sslContext(sslContext).build();
         final Http3TestServer h3Server = new Http3TestServer(quicServer) {
             @Override
diff --git a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http3/Http3ServerExchange.java b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http3/Http3ServerExchange.java
index 9a39ba4358d..c127abf3c0f 100644
--- a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http3/Http3ServerExchange.java
+++ b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http3/Http3ServerExchange.java
@@ -108,6 +108,11 @@ public final class Http3ServerExchange implements Http2TestExchange {
         rspheadersBuilder = new HttpHeadersBuilder();
     }
 
+    Http3ServerConnection http3Connection() {
+        return serverConn;
+    }
+
+
     String connectionTag() {
         return serverConn.quicConnection().logTag();
     }
diff --git a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http3/Http3TestServer.java b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http3/Http3TestServer.java
index ff76c67ed7e..6e81813cac3 100644
--- a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http3/Http3TestServer.java
+++ b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http3/Http3TestServer.java
@@ -55,6 +55,7 @@ import jdk.internal.net.http.http3.ConnectionSettings;
 import jdk.internal.net.http.http3.Http3Error;
 import jdk.internal.net.http.http3.frames.SettingsFrame;
 import jdk.internal.net.quic.QuicTLSContext;
+import jdk.internal.net.quic.QuicTransportErrors;
 import jdk.internal.net.quic.QuicVersion;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 
@@ -261,7 +262,23 @@ public class Http3TestServer implements QuicServer.ConnectionAcceptor, AutoClose
                 handler.handle(exchange);
             } catch (Throwable failure) {
                 System.err.println("Failed to handle exchange: " + failure);
-                failure.printStackTrace();
+                boolean noError = false;
+                if (exchange instanceof Http3ServerExchange http3ServerExchange) {
+                    var quicConnection = http3ServerExchange.http3Connection().quicConnection();
+                    var cause = quicConnection.terminationCause();
+                    if (cause != null) {
+                        var code = cause.getCloseCode();
+                        noError = cause.isAppLayer()
+                                ? Http3Error.isNoError(code)
+                                : code == QuicTransportErrors.NO_ERROR.code();
+                    }
+                }
+                // don't print the full stack trace if the connection
+                // is terminated with no error, in order to avoid
+                // cluttering the log.
+                if (!noError) {
+                    failure.printStackTrace();
+                }
                 final var ioException = (failure instanceof IOException)
                         ? (IOException) failure
                         : new IOException(failure);
diff --git a/test/jdk/java/net/httpclient/qpack/BlockingDecodingTest.java b/test/jdk/java/net/httpclient/qpack/BlockingDecodingTest.java
index c588f8117ae..778783ad64c 100644
--- a/test/jdk/java/net/httpclient/qpack/BlockingDecodingTest.java
+++ b/test/jdk/java/net/httpclient/qpack/BlockingDecodingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,6 @@ import jdk.internal.net.http.http3.frames.SettingsFrame;
 import jdk.internal.net.http.qpack.DecodingCallback;
 import jdk.internal.net.http.qpack.DynamicTable;
 import jdk.internal.net.http.qpack.Encoder;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -43,7 +41,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.testng.Assert.assertNotEquals;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
@@ -59,7 +59,7 @@ import static org.testng.Assert.assertNotEquals;
  *          java.net.http/jdk.internal.net.http.http3.frames
  *          java.net.http/jdk.internal.net.http.http3
  * @build EncoderDecoderConnector
- * @run testng/othervm -Djdk.internal.httpclient.qpack.log.level=EXTRA BlockingDecodingTest
+ * @run junit/othervm -Djdk.internal.httpclient.qpack.log.level=EXTRA BlockingDecodingTest
  */
 
 
@@ -94,7 +94,7 @@ public class BlockingDecodingTest {
         encoder.header(context, header.name(), header.value(),
                 false, IGNORE_RECEIVED_COUNT_CHECK);
         headerFrameWriter.write(headersBb);
-        assertNotEquals(headersBb.position(), 0);
+        assertNotEquals(0, headersBb.position());
         headersBb.flip();
         buffers.add(headersBb);
 
@@ -110,8 +110,8 @@ public class BlockingDecodingTest {
         // and the default number of blocked streams (0) will be exceeded (1).
         var lastHttp3Error = decodingCallback.lastHttp3Error.get();
         System.err.println("Last Http3Error: " + lastHttp3Error);
-        Assert.assertEquals(lastHttp3Error, Http3Error.QPACK_DECOMPRESSION_FAILED);
-        Assert.assertFalse(decodingCallback.completed.isDone());
+        Assertions.assertEquals(Http3Error.QPACK_DECOMPRESSION_FAILED, lastHttp3Error);
+        Assertions.assertFalse(decodingCallback.completed.isDone());
     }
 
     @Test
@@ -149,7 +149,7 @@ public class BlockingDecodingTest {
         encoder.header(context, expectedHeader.name,
                 expectedHeader.value, false, IGNORE_RECEIVED_COUNT_CHECK);
         headerFrameWriter.write(headersBb);
-        assertNotEquals(headersBb.position(), 0);
+        assertNotEquals(0, headersBb.position());
         headersBb.flip();
         buffers.add(headersBb);
 
@@ -165,12 +165,12 @@ public class BlockingDecodingTest {
         // and the default number of blocked streams (0) will be exceeded (1).
         var lastHttp3Error = decodingCallback.lastHttp3Error.get();
         System.err.println("Last Http3Error: " + lastHttp3Error);
-        Assert.assertNull(lastHttp3Error);
-        Assert.assertNull(decodingCallback.lastThrowable.get());
-        Assert.assertTrue(decodingCallback.completed.isDone());
+        Assertions.assertNull(lastHttp3Error);
+        Assertions.assertNull(decodingCallback.lastThrowable.get());
+        Assertions.assertTrue(decodingCallback.completed.isDone());
         // Check that onDecoded was called for the test entry
         var decodedHeader = decodingCallback.decodedHeaders.get(0);
-        Assert.assertEquals(decodedHeader, expectedHeader);
+        Assertions.assertEquals(expectedHeader, decodedHeader);
     }
 
     @Test
@@ -224,7 +224,7 @@ public class BlockingDecodingTest {
                                 IGNORE_RECEIVED_COUNT_CHECK);
                         headerFrameWriter.write(headersBb);
                     }
-                    assertNotEquals(headersBb.position(), 0);
+                    assertNotEquals(0, headersBb.position());
                     headersBb.flip();
                     buffers.add(headersBb);
 
@@ -261,13 +261,13 @@ public class BlockingDecodingTest {
         // Check results of each decoding task
         for (var decodingResultFuture : decodingTaskResults) {
             var taskCallback = decodingResultFuture.get();
-            Assert.assertNull(taskCallback.lastHttp3Error.get());
-            Assert.assertNull(taskCallback.lastThrowable.get());
+            Assertions.assertNull(taskCallback.lastHttp3Error.get());
+            Assertions.assertNull(taskCallback.lastThrowable.get());
             long decodingTaskCompleted = taskCallback.completedTimestamp.get();
             System.err.println("Decoding task completion timestamp: " + decodingTaskCompleted);
-            Assert.assertTrue(decodingTaskCompleted >= updateDoneTimeStamp);
+            Assertions.assertTrue(decodingTaskCompleted >= updateDoneTimeStamp);
             var decodedHeaders = taskCallback.decodedHeaders;
-            Assert.assertEquals(decodedHeaders, expectedHeaders);
+            Assertions.assertEquals(expectedHeaders, decodedHeaders);
         }
     }
 
diff --git a/test/jdk/java/net/httpclient/qpack/DecoderSectionSizeLimitTest.java b/test/jdk/java/net/httpclient/qpack/DecoderSectionSizeLimitTest.java
index 4b715a46e08..1ad094916d4 100644
--- a/test/jdk/java/net/httpclient/qpack/DecoderSectionSizeLimitTest.java
+++ b/test/jdk/java/net/httpclient/qpack/DecoderSectionSizeLimitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
  *          java.net.http/jdk.internal.net.http.http3.frames
  *          java.net.http/jdk.internal.net.http.http3
  * @build EncoderDecoderConnector
- * @run testng/othervm -Djdk.internal.httpclient.qpack.log.level=NORMAL
+ * @run junit/othervm -Djdk.internal.httpclient.qpack.log.level=NORMAL
  *                    DecoderSectionSizeLimitTest
  */
 
@@ -48,18 +48,21 @@ import jdk.internal.net.http.qpack.DecodingCallback;
 import jdk.internal.net.http.qpack.DynamicTable;
 import jdk.internal.net.http.qpack.Encoder;
 import jdk.test.lib.RandomFactory;
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicReference;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class DecoderSectionSizeLimitTest {
-    @Test(dataProvider = "headerSequences")
+    @ParameterizedTest
+    @MethodSource("headerSequences")
     public void fieldSectionSizeLimitExceeded(List<TestHeader> headersSequence,
                                               long maxFieldSectionSize) {
 
@@ -144,21 +147,20 @@ public class DecoderSectionSizeLimitTest {
                 System.err.printf("Decoding error observed during buffer #%d processing: %s throwable: %s%n",
                         bufferIdx, decodingError, decodingCallback.lastThrowable.get());
                 if (decoderErrorExpected) {
-                    Assert.assertEquals(decodingError, Http3Error.QPACK_DECOMPRESSION_FAILED);
+                    Assertions.assertEquals(Http3Error.QPACK_DECOMPRESSION_FAILED, decodingError);
                     return;
                 } else {
-                    Assert.fail("No HTTP/3 error was expected");
+                    Assertions.fail("No HTTP/3 error was expected");
                 }
             } else {
                 System.err.println("Buffer #" + bufferIdx + " readout completed without errors");
             }
         }
         if (decoderErrorExpected) {
-            Assert.fail("HTTP/3 error was expected but was not observed");
+            Assertions.fail("HTTP/3 error was expected but was not observed");
         }
     }
 
-    @DataProvider
     public Object[][] headerSequences() {
         List<Object[]> testCases = new ArrayList<>();
         for (var sequence : generateHeaderSequences()) {
diff --git a/test/jdk/java/net/httpclient/qpack/DecoderTest.java b/test/jdk/java/net/httpclient/qpack/DecoderTest.java
index 37f87bdda59..15d4bef7cc9 100644
--- a/test/jdk/java/net/httpclient/qpack/DecoderTest.java
+++ b/test/jdk/java/net/httpclient/qpack/DecoderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,8 +31,6 @@ import jdk.internal.net.http.qpack.readers.HeaderFrameReader;
 import jdk.internal.net.http.qpack.writers.IntegerWriter;
 import jdk.internal.net.http.qpack.StaticTable;
 import jdk.internal.net.http.qpack.writers.StringWriter;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -40,7 +38,11 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -51,8 +53,9 @@ import static org.testng.Assert.*;
  *          java.net.http/jdk.internal.net.http.http3.streams
  *          java.net.http/jdk.internal.net.http.http3.frames
  *          java.net.http/jdk.internal.net.http.http3
- * @run testng/othervm DecoderTest
+ * @run junit/othervm DecoderTest
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class DecoderTest {
 
     private final Random random = new Random();
@@ -78,7 +81,6 @@ public class DecoderTest {
         return null;
     }
 
-    @DataProvider(name = "indexProvider")
     public Object[][] indexProvider() {
         AtomicInteger tableIndex = new AtomicInteger();
         return StaticTable.HTTP3_HEADER_FIELDS.stream()
@@ -87,7 +89,6 @@ public class DecoderTest {
                 .toArray(Object[][]::new);
     }
 
-    @DataProvider(name = "nameReferenceProvider")
     public Object[][] nameReferenceProvider() {
         AtomicInteger tableIndex = new AtomicInteger();
         return StaticTable.HTTP3_HEADER_FIELDS.stream()
@@ -95,7 +96,6 @@ public class DecoderTest {
                 .map(List::toArray).toArray(Object[][]::new);
     }
 
-    @DataProvider(name = "literalProvider")
     public Object[][] literalProvider() {
         var output = new String[100][];
         for (int i = 0; i < 100; i++) {
@@ -104,7 +104,8 @@ public class DecoderTest {
         return output;
     }
 
-    @Test(dataProvider = "indexProvider")
+    @ParameterizedTest
+    @MethodSource("indexProvider")
     public void testIndexedOnStaticTable(int index, HeaderField h) throws IOException {
         var actual = writeIndex(index);
         var callback = new TestingCallBack(index, h.name(), h.value());
@@ -112,7 +113,8 @@ public class DecoderTest {
         dr.decoder().decodeHeader(actual, true, dr.reader());
     }
 
-    @Test(dataProvider = "nameReferenceProvider")
+    @ParameterizedTest
+    @MethodSource("nameReferenceProvider")
     public void testLiteralWithNameReferenceOnStaticTable(int index, String name, String value) throws IOException {
         boolean sensitive = random.nextBoolean();
 
@@ -122,7 +124,8 @@ public class DecoderTest {
         dr.decoder().decodeHeader(actual, true, dr.reader());
     }
 
-    @Test(dataProvider = "literalProvider")
+    @ParameterizedTest
+    @MethodSource("literalProvider")
     public void testLiteralWithLiteralNameOnStaticTable(String name, String value) throws IOException {
         boolean sensitive = random.nextBoolean();
 
@@ -345,30 +348,30 @@ public class DecoderTest {
 
         @Override
         public void onIndexed(long index, CharSequence name, CharSequence value) {
-            assertEquals(this.index, index);
-            assertEquals(this.name, name.toString());
-            assertEquals(this.value, value.toString());
+            assertEquals(index, this.index);
+            assertEquals(name.toString(), this.name);
+            assertEquals(value.toString(), this.value);
         }
 
         @Override
         public void onLiteralWithNameReference(long index, CharSequence name,
                                                CharSequence value, boolean huffmanValue,
                                                boolean sensitive) {
-            assertEquals(this.index, index);
-            assertEquals(this.value, value.toString());
-            assertEquals(this.huffmanValue, huffmanValue);
-            assertEquals(this.sensitive, sensitive);
+            assertEquals(index, this.index);
+            assertEquals(value.toString(), this.value);
+            assertEquals(huffmanValue, this.huffmanValue);
+            assertEquals(sensitive, this.sensitive);
         }
 
         @Override
         public void onLiteralWithLiteralName(CharSequence name, boolean huffmanName,
                                              CharSequence value, boolean huffmanValue,
                                              boolean sensitive) {
-            assertEquals(this.name, name.toString());
-            assertEquals(this.huffmanName, huffmanName);
-            assertEquals(this.value, value.toString());
-            assertEquals(this.huffmanValue, huffmanValue);
-            assertEquals(this.sensitive, sensitive);
+            assertEquals(name.toString(), this.name);
+            assertEquals(huffmanName, this.huffmanName);
+            assertEquals(value.toString(), this.value);
+            assertEquals(huffmanValue, this.huffmanValue);
+            assertEquals(sensitive, this.sensitive);
         }
 
         @Override
diff --git a/test/jdk/java/net/httpclient/qpack/DynamicTableFieldLineRepresentationTest.java b/test/jdk/java/net/httpclient/qpack/DynamicTableFieldLineRepresentationTest.java
index cdf584d1854..c314688ab52 100644
--- a/test/jdk/java/net/httpclient/qpack/DynamicTableFieldLineRepresentationTest.java
+++ b/test/jdk/java/net/httpclient/qpack/DynamicTableFieldLineRepresentationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@ import jdk.internal.net.http.qpack.DecodingCallback;
 import jdk.internal.net.http.qpack.DynamicTable;
 import jdk.internal.net.http.qpack.Encoder;
 import jdk.test.lib.RandomFactory;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -37,7 +36,8 @@ import java.util.List;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
@@ -55,7 +55,7 @@ import static org.testng.Assert.*;
  *          java.net.http/jdk.internal.net.http.http3.frames
  *          java.net.http/jdk.internal.net.http.http3
  * @build EncoderDecoderConnector
- * @run testng/othervm -Djdk.internal.httpclient.qpack.log.level=EXTRA
+ * @run junit/othervm -Djdk.internal.httpclient.qpack.log.level=EXTRA
  *                     -Djdk.http.qpack.allowBlockingEncoding=true
  *                     -Djdk.http.qpack.decoderBlockedStreams=4
  *                     DynamicTableFieldLineRepresentationTest
@@ -105,7 +105,7 @@ public class DynamicTableFieldLineRepresentationTest {
 
         // Write the header
         headerFrameWriter.write(headersBb);
-        assertNotEquals(headersBb.position(), 0);
+        assertNotEquals(0, headersBb.position());
         headersBb.flip();
         buffers.add(headersBb);
 
@@ -115,7 +115,7 @@ public class DynamicTableFieldLineRepresentationTest {
         // Decode headers
         decoder.decodeHeader(buffers.get(0), false, headerFrameReader);
         decoder.decodeHeader(buffers.get(1), true, headerFrameReader);
-        assertEquals(callback.lastIndexedName,name);
+        assertEquals(name, callback.lastIndexedName);
     }
 
     //4.5.3.  Indexed Field Line with Post-Base Index
@@ -160,7 +160,7 @@ public class DynamicTableFieldLineRepresentationTest {
 
         // Write the header
         headerFrameWriter.write(headersBb);
-        assertNotEquals(headersBb.position(), 0);
+        assertNotEquals(0, headersBb.position());
         headersBb.flip();
         buffers.add(headersBb);
 
@@ -170,8 +170,8 @@ public class DynamicTableFieldLineRepresentationTest {
         // Decode headers
         decoder.decodeHeader(buffers.get(0), false, headerFrameReader);
         decoder.decodeHeader(buffers.get(1), true, headerFrameReader);
-        assertEquals(callback.lastIndexedName,name);
-        assertEquals(callback.lastValue,value);
+        assertEquals(name, callback.lastIndexedName);
+        assertEquals(value, callback.lastValue);
     }
 
     // 4.5.4.  Literal Field Line with Name Reference
@@ -221,7 +221,7 @@ public class DynamicTableFieldLineRepresentationTest {
 
         // Write the header
         headerFrameWriter.write(headersBb);
-        assertNotEquals(headersBb.position(), 0);
+        assertNotEquals(0, headersBb.position());
         headersBb.flip();
         buffers.add(headersBb);
 
@@ -231,7 +231,7 @@ public class DynamicTableFieldLineRepresentationTest {
         // Decode headers
         decoder.decodeHeader(buffers.get(0), false, headerFrameReader);
         decoder.decodeHeader(buffers.get(1), true, headerFrameReader);
-        assertEquals(callback.lastReferenceName, name);
+        assertEquals(name, callback.lastReferenceName);
     }
 
     //4.5.5.  Literal Field Line with Post-Base Name Reference
@@ -276,7 +276,7 @@ public class DynamicTableFieldLineRepresentationTest {
 
         // Write the header
         headerFrameWriter.write(headersBb);
-        assertNotEquals(headersBb.position(), 0);
+        assertNotEquals(0, headersBb.position());
         headersBb.flip();
         buffers.add(headersBb);
 
@@ -286,8 +286,8 @@ public class DynamicTableFieldLineRepresentationTest {
         // Decode headers
         decoder.decodeHeader(buffers.get(0), false, headerFrameReader);
         decoder.decodeHeader(buffers.get(1), true, headerFrameReader);
-        assertEquals(callback.lastReferenceName, name);
-        assertEquals(callback.lastValue, value);
+        assertEquals(name, callback.lastReferenceName);
+        assertEquals(value, callback.lastValue);
     }
 
     private void configureConnector(EncoderDecoderConnector.EncoderDecoderPair connector, int numberOfEntries){
@@ -362,8 +362,8 @@ public class DynamicTableFieldLineRepresentationTest {
         @Override
         public void onIndexed(long actualIndex, CharSequence actualName, CharSequence actualValue) {
             System.out.println("Indexed called");
-            assertEquals(actualName, name);
-            assertEquals(actualValue, value);
+            assertEquals(name, actualName);
+            assertEquals(value, actualValue);
             lastValue = value;
             lastIndexedName = name;
         }
@@ -375,8 +375,8 @@ public class DynamicTableFieldLineRepresentationTest {
                                                boolean valueHuffman,
                                                boolean hideIntermediary) {
             System.out.println("Literal with name reference called");
-            assertEquals(actualName.toString(), name);
-            assertEquals(actualValue.toString(), value);
+            assertEquals(name, actualName.toString());
+            assertEquals(value, actualValue.toString());
             lastReferenceName = name;
             lastValue = value;
         }
@@ -386,8 +386,8 @@ public class DynamicTableFieldLineRepresentationTest {
                                              CharSequence actualValue, boolean valueHuffman,
                                              boolean hideIntermediary) {
             System.out.println("Literal with literal name called");
-            assertEquals(actualName.toString(), name);
-            assertEquals(actualValue.toString(), value);
+            assertEquals(name, actualName.toString());
+            assertEquals(value, actualValue.toString());
             lastLiteralName = name;
             lastValue = value;
         }
diff --git a/test/jdk/java/net/httpclient/qpack/DynamicTableTest.java b/test/jdk/java/net/httpclient/qpack/DynamicTableTest.java
index 80765e41787..c340a25088a 100644
--- a/test/jdk/java/net/httpclient/qpack/DynamicTableTest.java
+++ b/test/jdk/java/net/httpclient/qpack/DynamicTableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @library /test/lib
  * @modules java.net.http/jdk.internal.net.http.qpack:+open
  *          java.net.http/jdk.internal.net.http.qpack.readers
- * @run testng/othervm -Djdk.internal.httpclient.qpack.log.level=NORMAL DynamicTableTest
+ * @run junit/othervm -Djdk.internal.httpclient.qpack.log.level=NORMAL DynamicTableTest
  */
 
 import jdk.internal.net.http.qpack.DynamicTable;
@@ -35,9 +35,6 @@ import jdk.internal.net.http.qpack.HeaderField;
 import jdk.internal.net.http.qpack.QPACK;
 import jdk.internal.net.http.qpack.readers.IntegerReader;
 import jdk.test.lib.RandomFactory;
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -47,7 +44,13 @@ import java.util.Arrays;
 import java.util.Random;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.stream.IntStream;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class DynamicTableTest {
 
     // Test for addition to the table and that indices are growing monotonically,
@@ -74,7 +77,7 @@ public class DynamicTableTest {
             long addedId = dynamicTable.insert(name, value);
 
             // Check that dynamic table put gives back monotonically increasing indexes
-            Assert.assertEquals(addedId, lastAddedId);
+            Assertions.assertEquals(lastAddedId, addedId);
 
             if (lastAddedId > maxElementsInTable) {
                 // Check that oldest element is available and not reclaimed
@@ -98,21 +101,21 @@ public class DynamicTableTest {
                 long onlyNameSearchResult = dynamicTable.search(rName, "notFoundInTable");
                 long noMatchResult = dynamicTable.search(HEADER_NAME_PREFIX, HEADER_VALUE_PREFIX);
 
-                Assert.assertEquals(fullMatchSearchResult - 1, rid);
-                Assert.assertEquals(-onlyNameSearchResult - 1, rid);
-                Assert.assertEquals(noMatchResult, 0);
+                Assertions.assertEquals(rid, fullMatchSearchResult - 1);
+                Assertions.assertEquals(rid, -onlyNameSearchResult - 1);
+                Assertions.assertEquals(0, noMatchResult);
             }
         }
     }
 
-    @Test(dataProvider = "randomTableResizeData")
+    @ParameterizedTest
+    @MethodSource("randomTableResizeData")
     public void randomTableResize(int initialSize, long tail, long head, int resizeTo)
             throws Throwable {
         HeaderField[] initial = generateHeadersArray(initialSize, tail, head);
         resizeTestRunner(initial, tail, head, resizeTo);
     }
 
-    @DataProvider
     public Object[][] randomTableResizeData() {
         return IntStream.range(0, 1000)
                 .boxed()
@@ -127,31 +130,29 @@ public class DynamicTableTest {
         var dynamicTable = new DynamicTable(QPACK.getLogger().subLogger("tableResizeTests"));
 
         // Check that the initial array length is DynamicTable.INITIAL_HOLDER_ARRAY_SIZE
-        Assert.assertEquals(getElementsArrayLength(dynamicTable),
-                INITIAL_HOLDER_ARRAY_SIZE);
+        Assertions.assertEquals(                INITIAL_HOLDER_ARRAY_SIZE, getElementsArrayLength(dynamicTable));
 
         // Update dynamic table capacity to maximum allowed value and check
         // that holder array is not changed
         dynamicTable.setMaxTableCapacity(IntegerReader.QPACK_MAX_INTEGER_VALUE);
         dynamicTable.setCapacity(IntegerReader.QPACK_MAX_INTEGER_VALUE);
-        Assert.assertEquals(getElementsArrayLength(dynamicTable),
-                INITIAL_HOLDER_ARRAY_SIZE);
+        Assertions.assertEquals(                INITIAL_HOLDER_ARRAY_SIZE, getElementsArrayLength(dynamicTable));
 
         // Add DynamicTable.INITIAL_HOLDER_ARRAY_SIZE + 1 element to the dynamic table
         // and check that its length is increased 2 times
         for (int i = 0; i <= INITIAL_HOLDER_ARRAY_SIZE; i++) {
             dynamicTable.insert("name" + i, "value" + i);
         }
-        Assert.assertEquals(getElementsArrayLength(dynamicTable), INITIAL_HOLDER_ARRAY_SIZE << 1);
+        Assertions.assertEquals(INITIAL_HOLDER_ARRAY_SIZE << 1, getElementsArrayLength(dynamicTable));
     }
 
     // Test for a simple resize that checks that unique indexes still reference the correct entry
-    @Test(dataProvider = "simpleTableResizeData")
+    @ParameterizedTest
+    @MethodSource("simpleTableResizeData")
     public void simpleTableResize(HeaderField[] array, long tail, long head, int resizeTo) throws Throwable {
         resizeTestRunner(array, tail, head, resizeTo);
     }
 
-    @DataProvider
     public Object[][] simpleTableResizeData() {
         return new Object[][]{
                 tableResizeScenario1(), tableResizeScenario2(),
@@ -270,13 +271,13 @@ public class DynamicTableTest {
     }
 
     private static void checkResizeResult(HeaderField[] initial, HeaderField[] resized, HeaderField[] expected) {
-        Assert.assertEquals(resized.length, expected.length);
+        Assertions.assertEquals(expected.length, resized.length);
         for (int index = 0; index < expected.length; index++) {
             if (!sameHeaderField(expected[index], resized[index])) {
                 System.err.println("Initial Array:" + Arrays.deepToString(initial));
                 System.err.println("Resized Array:" + Arrays.deepToString(resized));
                 System.err.println("Expected Array:" + Arrays.deepToString(expected));
-                Assert.fail("DynamicTable.resize failed");
+                Assertions.fail("DynamicTable.resize failed");
             }
         }
     }
@@ -299,7 +300,7 @@ public class DynamicTableTest {
             MethodType mt = MethodType.methodType(void.class, int.class);
             return DT_LOOKUP.findVirtual(DynamicTable.class, "resize", mt);
         } catch (Exception e) {
-            Assert.fail("Failed to initialize DynamicTable.resize MH", e);
+            Assertions.fail("Failed to initialize DynamicTable.resize MH", e);
             return null;
         }
     }
@@ -308,7 +309,7 @@ public class DynamicTableTest {
         try {
             return DT_LOOKUP.findVarHandle(DynamicTable.class, fieldName, fieldType);
         } catch (Exception e) {
-            Assert.fail("Failed to initialize DynamicTable private Lookup instance", e);
+            Assertions.fail("Failed to initialize DynamicTable private Lookup instance", e);
             return null;
         }
     }
@@ -318,7 +319,7 @@ public class DynamicTableTest {
             var vh = DT_LOOKUP.findStaticVarHandle(DynamicTable.class, fieldName, fieldType);
             return (T) vh.get();
         } catch (Exception e) {
-            Assert.fail("Failed to read DynamicTable static field value", e);
+            Assertions.fail("Failed to read DynamicTable static field value", e);
             return null;
         }
     }
@@ -327,7 +328,7 @@ public class DynamicTableTest {
         try {
             return MethodHandles.privateLookupIn(DynamicTable.class, MethodHandles.lookup());
         } catch (IllegalAccessException e) {
-            Assert.fail("Failed to initialize DynamicTable private Lookup instance", e);
+            Assertions.fail("Failed to initialize DynamicTable private Lookup instance", e);
             return null;
         }
     }
diff --git a/test/jdk/java/net/httpclient/qpack/EncoderDecoderConnectionTest.java b/test/jdk/java/net/httpclient/qpack/EncoderDecoderConnectionTest.java
index 418af9be2ad..c2bed98bc3c 100644
--- a/test/jdk/java/net/httpclient/qpack/EncoderDecoderConnectionTest.java
+++ b/test/jdk/java/net/httpclient/qpack/EncoderDecoderConnectionTest.java
@@ -27,12 +27,12 @@ import jdk.internal.net.http.http3.frames.SettingsFrame;
 import jdk.internal.net.http.qpack.TableEntry;
 import jdk.internal.net.http.qpack.writers.EncoderInstructionsWriter;
 import jdk.internal.net.http.qpack.writers.HeaderFrameWriter;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicReference;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
@@ -48,7 +48,7 @@ import java.util.concurrent.atomic.AtomicReference;
  *          java.net.http/jdk.internal.net.http.http3.frames
  *          java.net.http/jdk.internal.net.http.http3
  * @build EncoderDecoderConnector
- * @run testng/othervm -Djdk.internal.httpclient.qpack.log.level=EXTRA
+ * @run junit/othervm -Djdk.internal.httpclient.qpack.log.level=EXTRA
  *                     EncoderDecoderConnectionTest
  */
 public class EncoderDecoderConnectionTest {
@@ -77,17 +77,17 @@ public class EncoderDecoderConnectionTest {
         encoder.setTableCapacity(capacityToSet);
 
         // Check that no errors observed
-        Assert.assertNull(encoderErrorHandler.error.get());
-        Assert.assertNull(encoderErrorHandler.http3Error.get());
-        Assert.assertNull(decoderErrorHandler.error.get());
-        Assert.assertNull(decoderErrorHandler.http3Error.get());
+        Assertions.assertNull(encoderErrorHandler.error.get());
+        Assertions.assertNull(encoderErrorHandler.http3Error.get());
+        Assertions.assertNull(decoderErrorHandler.error.get());
+        Assertions.assertNull(decoderErrorHandler.http3Error.get());
 
         // Check that encoder's table capacity is updated
-        Assert.assertEquals(conn.encoderTable().capacity(), capacityToSet);
+        Assertions.assertEquals(capacityToSet, conn.encoderTable().capacity());
         // Since encoder/decoder streams are cross-wired we expect see dynamic
         // table capacity updated for the decoder too
-        Assert.assertEquals(conn.decoderTable().capacity(),
-                conn.encoderTable().capacity());
+        Assertions.assertEquals(conn.encoderTable().capacity(),
+                                conn.decoderTable().capacity());
     }
 
     @Test
@@ -122,10 +122,10 @@ public class EncoderDecoderConnectionTest {
         var encoderInstructionWriter = new EncoderInstructionsWriter();
 
         // Check that no errors observed
-        Assert.assertNull(encoderErrorHandler.error.get());
-        Assert.assertNull(encoderErrorHandler.http3Error.get());
-        Assert.assertNull(decoderErrorHandler.error.get());
-        Assert.assertNull(decoderErrorHandler.http3Error.get());
+        Assertions.assertNull(encoderErrorHandler.error.get());
+        Assertions.assertNull(encoderErrorHandler.http3Error.get());
+        Assertions.assertNull(decoderErrorHandler.error.get());
+        Assertions.assertNull(decoderErrorHandler.http3Error.get());
 
         // Issue the insert instruction on encoder stream
         conn.encoderTable().insertWithEncoderStreamUpdate(entryToInsert,
@@ -133,8 +133,8 @@ public class EncoderDecoderConnectionTest {
                 encoder.newEncodingContext(0, 0, new HeaderFrameWriter()));
         var encoderHeader = conn.encoderTable().get(0);
         var decoderHeader = conn.decoderTable().get(0);
-        Assert.assertEquals(encoderHeader.name(), decoderHeader.name());
-        Assert.assertEquals(encoderHeader.value(), decoderHeader.value());
+        Assertions.assertEquals(decoderHeader.name(), encoderHeader.name());
+        Assertions.assertEquals(decoderHeader.value(), encoderHeader.value());
     }
 
     @Test
@@ -160,12 +160,12 @@ public class EncoderDecoderConnectionTest {
 
         // QPACK_ENCODER_STREAM_ERROR is expected on the decoder side
         // since the decoder dynamic table capacity was not updated
-        Assert.assertEquals(decoderErrorHandler.http3Error.get(),
-                Http3Error.QPACK_ENCODER_STREAM_ERROR);
+        Assertions.assertEquals(Http3Error.QPACK_ENCODER_STREAM_ERROR,
+                                decoderErrorHandler.http3Error.get());
 
         // It is expected that http3 error reported to
         // the decoder error handler only
-        Assert.assertNull(encoderErrorHandler.http3Error.get());
+        Assertions.assertNull(encoderErrorHandler.http3Error.get());
     }
 
     @Test
@@ -208,13 +208,13 @@ public class EncoderDecoderConnectionTest {
         System.err.println("Decoder Http3 error: " + decoderHttp3Error);
 
         if (encoderError == null || !(encoderError instanceof IOException)) {
-            Assert.fail("Incorrect encoder error type", encoderError);
+            Assertions.fail("Incorrect encoder error type", encoderError);
         }
         if (decoderError == null || !(decoderError instanceof IOException)) {
-            Assert.fail("Incorrect decoder error type", decoderError);
+            Assertions.fail("Incorrect decoder error type", decoderError);
         }
-        Assert.assertEquals(encoderHttp3Error, Http3Error.QPACK_DECODER_STREAM_ERROR);
-        Assert.assertEquals(decoderHttp3Error, Http3Error.QPACK_ENCODER_STREAM_ERROR);
+        Assertions.assertEquals(Http3Error.QPACK_DECODER_STREAM_ERROR, encoderHttp3Error);
+        Assertions.assertEquals(Http3Error.QPACK_ENCODER_STREAM_ERROR, decoderHttp3Error);
     }
 
     private static ByteBuffer instructionWithOverflowInteger(int N, int payload) {
diff --git a/test/jdk/java/net/httpclient/qpack/EncoderDecoderConnector.java b/test/jdk/java/net/httpclient/qpack/EncoderDecoderConnector.java
index 3cf185ff8a7..1eba2b2682a 100644
--- a/test/jdk/java/net/httpclient/qpack/EncoderDecoderConnector.java
+++ b/test/jdk/java/net/httpclient/qpack/EncoderDecoderConnector.java
@@ -44,7 +44,6 @@ import jdk.internal.net.http.quic.streams.QuicSenderStream;
 import jdk.internal.net.http.quic.streams.QuicStream;
 import jdk.internal.net.http.quic.streams.QuicStreamWriter;
 import jdk.internal.net.quic.QuicTLSEngine;
-import org.testng.Assert;
 
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
@@ -58,6 +57,7 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
+import org.junit.jupiter.api.Assertions;
 
 /**
  * Instance of this class provides a stubbed Quic Connection implementation that
@@ -175,7 +175,7 @@ public class EncoderDecoderConnector {
         try {
             return MethodHandles.privateLookupIn(clz, MethodHandles.lookup());
         } catch (IllegalAccessException e) {
-            Assert.fail("Failed to initialize private Lookup instance", e);
+            Assertions.fail("Failed to initialize private Lookup instance", e);
             return null;
         }
     }
@@ -185,7 +185,7 @@ public class EncoderDecoderConnector {
         try {
             return lookup.findVarHandle(recv, "dynamicTable", DynamicTable.class);
         } catch (Exception e) {
-            Assert.fail("Failed to acquire dynamic table VarHandle instance", e);
+            Assertions.fail("Failed to acquire dynamic table VarHandle instance", e);
             return null;
         }
     }
diff --git a/test/jdk/java/net/httpclient/qpack/EncoderDecoderTest.java b/test/jdk/java/net/httpclient/qpack/EncoderDecoderTest.java
index a1fa9745e05..7dc1bf73960 100644
--- a/test/jdk/java/net/httpclient/qpack/EncoderDecoderTest.java
+++ b/test/jdk/java/net/httpclient/qpack/EncoderDecoderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,6 @@ import jdk.internal.net.http.qpack.Encoder;
 import jdk.internal.net.http.qpack.HeaderField;
 import jdk.internal.net.http.hpack.QuickHuffman;
 import jdk.internal.net.http.qpack.StaticTable;
-import org.testng.annotations.Test;
-import org.testng.annotations.DataProvider;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -41,10 +39,13 @@ import java.util.Random;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -60,8 +61,9 @@ import static org.testng.Assert.fail;
  *          java.net.http/jdk.internal.net.http.http3.frames
  *          java.net.http/jdk.internal.net.http.http3
  * @build EncoderDecoderConnector
- * @run testng/othervm EncoderDecoderTest
+ * @run junit/othervm EncoderDecoderTest
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class EncoderDecoderTest {
     private final Random random = new Random();
 
@@ -72,7 +74,6 @@ public class EncoderDecoderTest {
         fail(http3Error + "QPACK error:" + http3Error, error);
     }
 
-    @DataProvider(name = "indexProvider")
     public Object[][] indexProvider() {
         AtomicLong index = new AtomicLong();
         return StaticTable.HTTP3_HEADER_FIELDS.stream()
@@ -81,7 +82,6 @@ public class EncoderDecoderTest {
                 .toArray(Object[][]::new);
     }
 
-    @DataProvider(name = "nameReferenceProvider")
     public Object[][] nameReferenceProvider() {
         AtomicLong tableIndex = new AtomicLong();
         Map<String, List<Long>> map = new HashMap<>();
@@ -98,7 +98,6 @@ public class EncoderDecoderTest {
                 .map(List::toArray).toArray(Object[][]::new);
     }
 
-    @DataProvider(name = "literalProvider")
     public Object[][] literalProvider() {
         var output = new String[100][];
         for (int i = 0; i < 100; i++) {
@@ -112,7 +111,8 @@ public class EncoderDecoderTest {
         if (error != null) throw new AssertionError(error);
     }
 
-    @Test(dataProvider = "indexProvider")
+    @ParameterizedTest
+    @MethodSource("indexProvider")
     public void encodeDecodeIndexedOnStaticTable(long index, HeaderField h) throws IOException {
         var actual = allocateIndexTestBuffer(index);
         List<ByteBuffer> buffers = new ArrayList<>();
@@ -148,7 +148,7 @@ public class EncoderDecoderTest {
 
         // Write the header
         headerFrameWriter.write(actual);
-        assertNotEquals(actual.position(), 0);
+        assertNotEquals(0, actual.position());
         actual.flip();
         buffers.add(actual);
 
@@ -161,7 +161,8 @@ public class EncoderDecoderTest {
         assertNotFailed(error);
     }
 
-    @Test(dataProvider = "nameReferenceProvider")
+    @ParameterizedTest
+    @MethodSource("nameReferenceProvider")
     public void encodeDecodeLiteralWithNameRefOnStaticTable(String name, String value, List<Long> validIndices) throws IOException {
         long index = Collections.max(validIndices);
         boolean sensitive = random.nextBoolean();
@@ -194,7 +195,7 @@ public class EncoderDecoderTest {
 
         // Write the header
         headerFrameWriter.write(actual);
-        assertNotEquals(actual.position(), 0);
+        assertNotEquals(0, actual.position());
         actual.flip();
         buffers.add(actual);
 
@@ -207,7 +208,8 @@ public class EncoderDecoderTest {
         assertNotFailed(error);
     }
 
-    @Test(dataProvider = "literalProvider")
+    @ParameterizedTest
+    @MethodSource("literalProvider")
     public void encodeDecodeLiteralWithLiteralNameOnStaticTable(String name, String value) throws IOException {
         boolean sensitive = random.nextBoolean();
         List<ByteBuffer> buffers = new ArrayList<>();
@@ -237,7 +239,7 @@ public class EncoderDecoderTest {
         encoder.header(context, name, value, sensitive);
         // Write the header
         headerFrameWriter.write(actual);
-        assertNotEquals(actual.position(), 0);
+        assertNotEquals(0, actual.position());
         actual.flip();
         buffers.add(actual);
 
@@ -412,9 +414,9 @@ public class EncoderDecoderTest {
 
         @Override
         public void onIndexed(long actualIndex, CharSequence actualName, CharSequence actualValue) {
-            assertEquals(actualIndex, index);
-            assertEquals(actualName, name);
-            assertEquals(actualValue, value);
+            assertEquals(index, actualIndex);
+            assertEquals(name, actualName);
+            assertEquals(value, actualValue);
         }
 
         @Override
@@ -422,21 +424,21 @@ public class EncoderDecoderTest {
                                                CharSequence actualValue, boolean huffmanValue,
                                                boolean actualHideIntermediary) {
             assertTrue(validIndices.contains(actualIndex));
-            assertEquals(actualName.toString(), name);
-            assertEquals(actualValue.toString(), value);
+            assertEquals(name, actualName.toString());
+            assertEquals(value, actualValue.toString());
             assertEquals(huffmanValue, huffmanValue);
-            assertEquals(actualHideIntermediary, sensitive);
+            assertEquals(sensitive, actualHideIntermediary);
         }
 
         @Override
         public void onLiteralWithLiteralName(CharSequence actualName, boolean actualHuffmanName,
                                              CharSequence actualValue, boolean actualHuffmanValue,
                                              boolean actualHideIntermediary) {
-            assertEquals(actualName.toString(), name);
-            assertEquals(actualHuffmanName, huffmanName);
-            assertEquals(actualValue.toString(), value);
-            assertEquals(actualHuffmanValue, huffmanValue);
-            assertEquals(actualHideIntermediary, sensitive);
+            assertEquals(name, actualName.toString());
+            assertEquals(huffmanName, actualHuffmanName);
+            assertEquals(value, actualValue.toString());
+            assertEquals(huffmanValue, actualHuffmanValue);
+            assertEquals(sensitive, actualHideIntermediary);
         }
     }
 }
diff --git a/test/jdk/java/net/httpclient/qpack/EncoderTest.java b/test/jdk/java/net/httpclient/qpack/EncoderTest.java
index a80a0899420..b721fa3d27a 100644
--- a/test/jdk/java/net/httpclient/qpack/EncoderTest.java
+++ b/test/jdk/java/net/httpclient/qpack/EncoderTest.java
@@ -46,8 +46,6 @@ import jdk.internal.net.http.quic.streams.QuicSenderStream.SendingStreamState;
 import jdk.internal.net.http.quic.streams.QuicStream;
 import jdk.internal.net.http.quic.streams.QuicStreamWriter;
 import jdk.internal.net.quic.QuicTLSEngine;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -69,7 +67,10 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -84,15 +85,15 @@ import static org.testng.Assert.*;
  *          java.net.http/jdk.internal.net.http.http3.streams
  *          java.net.http/jdk.internal.net.http.http3.frames
  *          java.net.http/jdk.internal.net.http.http3
- * @run testng/othervm EncoderTest
+ * @run junit/othervm EncoderTest
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class EncoderTest {
     private final Random random = new Random();
     private final IntegerWriter intWriter = new IntegerWriter();
     private final StringWriter stringWriter = new StringWriter();
     private static final int TEST_STR_MAX_LENGTH = 10;
 
-    @DataProvider(name = "indexProvider")
     public Object[][] indexProvider() {
         AtomicInteger tableIndex = new AtomicInteger();
         return StaticTable.HTTP3_HEADER_FIELDS.stream()
@@ -101,7 +102,6 @@ public class EncoderTest {
                 .toArray(Object[][]::new);
     }
 
-    @DataProvider
     public Object[][] staticNameReferenceProvider() {
         AtomicInteger tableIndex = new AtomicInteger();
         Map<String, List<Integer>> map = new HashMap<>();
@@ -117,7 +117,6 @@ public class EncoderTest {
                 .map(List::toArray).toArray(Object[][]::new);
     }
 
-    @DataProvider
     public Object[][] literalsProvider() {
         var output = new String[100][];
         for (int i = 0; i < 100; i++) {
@@ -161,7 +160,8 @@ public class EncoderTest {
         fail(http3Error + "QPACK error:" + http3Error, error);
     }
 
-    @Test(dataProvider = "indexProvider")
+    @ParameterizedTest
+    @MethodSource("indexProvider")
     public void testFieldLineWriterWithStaticIndex(int index, HeaderField h) {
         var actual = allocateIndexBuffer(index);
         var expected = writeIndex(index);
@@ -177,14 +177,15 @@ public class EncoderTest {
 
         encoder.header(context, h.name(), h.value(), false);
         headerFrameWriter.write(actual);
-        assertNotEquals(actual.position(), 0);
+        assertNotEquals(0, actual.position());
         actual.flip();
 
-        assertEquals(actual, expected, debug(h.name(), h.value(), actual, expected));
+        assertEquals(expected, actual, debug(h.name(), h.value(), actual, expected));
         assertNotFailed(error);
     }
 
-    @Test(dataProvider = "staticNameReferenceProvider")
+    @ParameterizedTest
+    @MethodSource("staticNameReferenceProvider")
     public void testInsertWithStaticTableNameReference(String name, String value, List<Integer> validIndices) {
         int index = Collections.max(validIndices);
 
@@ -203,7 +204,7 @@ public class EncoderTest {
                 encoder.newEncodingContext(0, 0, headerFrameWriter);
         encoder.header(context, name, value, false);
         headerFrameWriter.write(actual);
-        assertNotEquals(actual.position(), 0);
+        assertNotEquals(0, actual.position());
         actual.flip();
 
         TestQuicStreamWriter quicStreamWriter = quicConnection.sender.writer;
@@ -212,7 +213,8 @@ public class EncoderTest {
         assertNotFailed(error);
     }
 
-    @Test(dataProvider = "staticNameReferenceProvider")
+    @ParameterizedTest
+    @MethodSource("staticNameReferenceProvider")
     public void testFieldLineWithStaticTableNameReference(String name, String value, List<Integer> validIndices) {
         int index = Collections.max(validIndices);
         boolean sensitive = random.nextBoolean();
@@ -231,14 +233,15 @@ public class EncoderTest {
                 encoder.newEncodingContext(0, 0, headerFrameWriter);
         encoder.header(context, name, value, sensitive);
         headerFrameWriter.write(actual);
-        assertNotEquals(actual.position(), 0);
+        assertNotEquals(0, actual.position());
         actual.flip();
 
         assertTrue(expected.contains(actual), debug(name, value, actual, expected));
         assertNotFailed(error);
     }
 
-    @Test(dataProvider = "literalsProvider")
+    @ParameterizedTest
+    @MethodSource("literalsProvider")
     public void testInsertWithLiterals(String name, String value) {
         var expected = writeInsertLiteral(name, value);
         var actual = allocateInsertLiteralBuffer(name, value);
@@ -255,14 +258,15 @@ public class EncoderTest {
                 encoder.newEncodingContext(0, 0, headerFrameWriter);
         encoder.header(context, name, value, false);
         headerFrameWriter.write(actual);
-        assertNotEquals(actual.position(), 0);
+        assertNotEquals(0, actual.position());
         actual.flip();
         TestQuicStreamWriter quicStreamWriter = quicConnection.sender.writer;
-        assertEquals(quicStreamWriter.get(), expected, debug(name, value, quicStreamWriter.get(), expected));
+        assertEquals(expected, quicStreamWriter.get(), debug(name, value, quicStreamWriter.get(), expected));
         assertNotFailed(error);
     }
 
-    @Test(dataProvider = "literalsProvider")
+    @ParameterizedTest
+    @MethodSource("literalsProvider")
     public void testFieldLineEncodingWithLiterals(String name, String value) {
         boolean sensitive = random.nextBoolean();
 
@@ -280,10 +284,10 @@ public class EncoderTest {
                 encoder.newEncodingContext(0, 0, headerFrameWriter);
         encoder.header(context, name, value, sensitive);
         headerFrameWriter.write(actual);
-        assertNotEquals(actual.position(), 0);
+        assertNotEquals(0, actual.position());
         actual.flip();
 
-        assertEquals(actual, expected, debug(name, value, actual, expected));
+        assertEquals(expected, actual, debug(name, value, actual, expected));
         assertNotFailed(error);
     }
 
diff --git a/test/jdk/java/net/httpclient/qpack/EntriesEvictionTest.java b/test/jdk/java/net/httpclient/qpack/EntriesEvictionTest.java
index c295ec5d01d..76d15d0ace9 100644
--- a/test/jdk/java/net/httpclient/qpack/EntriesEvictionTest.java
+++ b/test/jdk/java/net/httpclient/qpack/EntriesEvictionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@
  *          java.net.http/jdk.internal.net.http.http3.streams
  *          java.net.http/jdk.internal.net.http.http3.frames
  *          java.net.http/jdk.internal.net.http.http3
- * @run testng/othervm -Djdk.internal.httpclient.qpack.log.level=EXTRA EntriesEvictionTest
+ * @run junit/othervm -Djdk.internal.httpclient.qpack.log.level=EXTRA EntriesEvictionTest
  */
 
 import java.util.ArrayList;
@@ -47,13 +47,16 @@ import jdk.internal.net.http.qpack.Encoder.SectionReference;
 import jdk.internal.net.http.qpack.HeaderField;
 import jdk.internal.net.http.qpack.QPACK;
 import jdk.internal.net.http.qpack.QPACK.Logger;
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class EntriesEvictionTest {
 
-    @Test(dataProvider = "evictionScenarios")
+    @ParameterizedTest
+    @MethodSource("evictionScenarios")
     public void evictionInsertionTest(TestHeader headerToAdd,
                                       SectionReference sectionReference,
                                       long insertedId,
@@ -71,12 +74,12 @@ public class EntriesEvictionTest {
         // Insert last entry
         long id = dynamicTable.insert(headerToAdd.name, headerToAdd.value, sectionReference);
 
-        Assert.assertEquals(id, insertedId);
+        Assertions.assertEquals(insertedId, id);
 
         if (largestEvictedId != -1) {
             // Check that evicted entry with the largest absolute index
             // is not accessible
-            Assert.assertThrows(() -> dynamicTable.get(largestEvictedId));
+            Assertions.assertThrows(Throwable.class, () -> dynamicTable.get(largestEvictedId));
             // Check that an entry after that can be acquired with its
             // absolute index
             dynamicTable.get(largestEvictedId + 1);
@@ -84,12 +87,11 @@ public class EntriesEvictionTest {
 
         if (insertedId != -1) {
             HeaderField insertedField = dynamicTable.get(insertedId);
-            Assert.assertEquals(insertedField,
-                    new HeaderField(headerToAdd.name(), headerToAdd.value()));
+            Assertions.assertEquals(new HeaderField(headerToAdd.name(), headerToAdd.value()),
+                                    insertedField);
         }
     }
 
-    @DataProvider
     public static Object[][] evictionScenarios() {
 
         // Header that requires only one entry to be evicted
diff --git a/test/jdk/java/net/httpclient/qpack/FieldSectionPrefixTest.java b/test/jdk/java/net/httpclient/qpack/FieldSectionPrefixTest.java
index e9a7a86e975..b6fac8291f8 100644
--- a/test/jdk/java/net/httpclient/qpack/FieldSectionPrefixTest.java
+++ b/test/jdk/java/net/httpclient/qpack/FieldSectionPrefixTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
  *          java.net.http/jdk.internal.net.http.http3.streams
  *          java.net.http/jdk.internal.net.http.http3.frames
  *          java.net.http/jdk.internal.net.http.http3
- * @run testng FieldSectionPrefixTest
+ * @run junit FieldSectionPrefixTest
  */
 
 
@@ -41,21 +41,26 @@ import jdk.internal.net.http.qpack.FieldSectionPrefix;
 import jdk.internal.net.http.qpack.QPACK;
 import jdk.internal.net.http.qpack.readers.HeaderFrameReader;
 import jdk.internal.net.http.qpack.writers.FieldLineSectionPrefixWriter;
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Stream;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class FieldSectionPrefixTest {
 
     private static final long DT_CAPACITY = 220L;
     private static final long MAX_ENTRIES = DT_CAPACITY / 32L;
 
-    @Test(dataProvider = "encodingCases")
+    @ParameterizedTest
+    @MethodSource("encodingCases")
     public void encodingTest(long base, long requiredInsertCount,
                              byte expectedRic, byte expectedBase) {
         var fieldSectionPrefix = new FieldSectionPrefix(requiredInsertCount, base);
@@ -64,23 +69,23 @@ public class FieldSectionPrefixTest {
         var byteBuffer = ByteBuffer.allocate(bytesNeeded);
         writer.write(byteBuffer);
         byteBuffer.flip();
-        Assert.assertEquals(byteBuffer.get(0), expectedRic);
-        Assert.assertEquals(byteBuffer.get(1), expectedBase);
+        Assertions.assertEquals(expectedRic, byteBuffer.get(0));
+        Assertions.assertEquals(expectedBase, byteBuffer.get(1));
     }
 
-    @DataProvider(name = "encodingCases")
-    public Object[][] encodingCases() {
-        var cases = new ArrayList<Object[]>();
-        // Simple with 0 values
-        cases.add(new Object[]{0L, 0L, (byte) 0x0, (byte) 0x0});
-        // Based on RFC-9204: "B.2. Dynamic Table example"
-        cases.add(new Object[]{0L, 2L, (byte) 0x3, (byte) 0x81});
-        // Based on RFC-9204: "Duplicate Instruction, Stream Cancellation"
-        cases.add(new Object[]{4L, 4L, (byte) 0x5, (byte) 0x0});
-        return cases.toArray(Object[][]::new);
+    public Stream<Arguments> encodingCases() {
+        return Stream.of(
+                // Simple with 0 values
+                Arguments.of(0L, 0L, (byte) 0x0, (byte) 0x0),
+                // Based on RFC-9204: "B.2. Dynamic Table example"
+                Arguments.of(0L, 2L, (byte) 0x3, (byte) 0x81),
+                // Based on RFC-9204: "Duplicate Instruction, Stream Cancellation"
+                Arguments.of(4L, 4L, (byte) 0x5, (byte) 0x0)
+        );
     }
 
-    @Test(dataProvider = "decodingCases")
+    @ParameterizedTest
+    @MethodSource("decodingCases")
     public void decodingTest(long expectedRIC, long expectedBase, byte... bytes) throws IOException {
         var logger = QPACK.getLogger().subLogger("decodingTest");
         var dt = new DynamicTable(logger, false);
@@ -117,17 +122,16 @@ public class FieldSectionPrefixTest {
 
         System.err.println("Required Insert Count:" + fsp.requiredInsertCount());
         System.err.println("Base:" + fsp.base());
-        Assert.assertEquals(fsp.requiredInsertCount(), expectedRIC);
-        Assert.assertEquals(fsp.base(), expectedBase);
+        Assertions.assertEquals(expectedRIC, fsp.requiredInsertCount());
+        Assertions.assertEquals(expectedBase, fsp.base());
 
     }
 
-    @DataProvider(name = "decodingCases")
-    public Object[][] decodingCases() {
-        var cases = new ArrayList<Object[]>();
-        cases.add(new Object[]{0L, 0L, (byte) 0x0, (byte) 0x0});
-        cases.add(new Object[]{4L, 4L, (byte) 0x5, (byte) 0x0});
-        cases.add(new Object[]{2L, 0L, (byte) 0x3, (byte) 0x81});
-        return cases.toArray(Object[][]::new);
+    public Stream<Arguments> decodingCases() {
+        return Stream.of(
+                Arguments.of(0L, 0L, new byte[]{0x0, 0x0}),
+                Arguments.of(4L, 4L, new byte[]{0x5, 0x0}),
+                Arguments.of(2L, 0L, new byte[]{0x3, (byte) 0x81})
+        );
     }
 }
diff --git a/test/jdk/java/net/httpclient/qpack/IntegerReaderMaxValuesTest.java b/test/jdk/java/net/httpclient/qpack/IntegerReaderMaxValuesTest.java
index 6f21549f497..ac156e2b547 100644
--- a/test/jdk/java/net/httpclient/qpack/IntegerReaderMaxValuesTest.java
+++ b/test/jdk/java/net/httpclient/qpack/IntegerReaderMaxValuesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,12 +24,13 @@
 import jdk.internal.net.http.qpack.QPackException;
 import jdk.internal.net.http.qpack.readers.IntegerReader;
 import jdk.internal.net.http.qpack.writers.IntegerWriter;
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.nio.ByteBuffer;
 import java.util.stream.IntStream;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -39,11 +40,11 @@ import java.util.stream.IntStream;
  *          java.net.http/jdk.internal.net.http.qpack
  *          java.net.http/jdk.internal.net.http.qpack.readers
  *          java.net.http/jdk.internal.net.http.qpack.writers
- * @run testng/othervm -Djdk.internal.httpclient.qpack.log.level=INFO
+ * @run junit/othervm -Djdk.internal.httpclient.qpack.log.level=INFO
  *                     IntegerReaderMaxValuesTest
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class IntegerReaderMaxValuesTest {
-    @DataProvider
     public Object[][] nValues() {
         return IntStream.range(1, 8)
                 .boxed()
@@ -51,7 +52,8 @@ public class IntegerReaderMaxValuesTest {
                 .toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "nValues")
+    @ParameterizedTest
+    @MethodSource("nValues")
     public void maxIntegerWriteRead(int N) {
         IntegerWriter writer = new IntegerWriter();
         writer.configure(IntegerReader.QPACK_MAX_INTEGER_VALUE, N, 0);
@@ -62,23 +64,26 @@ public class IntegerReaderMaxValuesTest {
         buffer.flip();
         reader.read(buffer);
         long result = reader.get();
-        Assert.assertEquals(result, IntegerReader.QPACK_MAX_INTEGER_VALUE);
+        Assertions.assertEquals(IntegerReader.QPACK_MAX_INTEGER_VALUE, result);
     }
 
-    @Test(dataProvider = "nValues", expectedExceptions = QPackException.class)
+    @ParameterizedTest
+    @MethodSource("nValues")
     public void overflowInteger(int N) {
-        // Construct buffer with overflowed integer
-        ByteBuffer overflowBuffer = ByteBuffer.allocate(11);
+        Assertions.assertThrows(QPackException.class, () -> {
+            // Construct buffer with overflowed integer
+            ByteBuffer overflowBuffer = ByteBuffer.allocate(11);
 
-        overflowBuffer.put((byte) ((2 << (N - 1)) - 1));
-        for (int i = 0; i < 9; i++) {
-            overflowBuffer.put((byte) 128);
-        }
-        overflowBuffer.put((byte) 10);
-        overflowBuffer.flip();
-        // Read the buffer with IntegerReader
-        IntegerReader reader = new IntegerReader();
-        reader.configure(N);
-        reader.read(overflowBuffer);
+            overflowBuffer.put((byte) ((2 << (N - 1)) - 1));
+            for (int i = 0; i < 9; i++) {
+                overflowBuffer.put((byte) 128);
+            }
+            overflowBuffer.put((byte) 10);
+            overflowBuffer.flip();
+            // Read the buffer with IntegerReader
+            IntegerReader reader = new IntegerReader();
+            reader.configure(N);
+            reader.read(overflowBuffer);
+        });
     }
 }
diff --git a/test/jdk/java/net/httpclient/qpack/StaticTableFieldsTest.java b/test/jdk/java/net/httpclient/qpack/StaticTableFieldsTest.java
index 662d0c264d8..eea9b31e932 100644
--- a/test/jdk/java/net/httpclient/qpack/StaticTableFieldsTest.java
+++ b/test/jdk/java/net/httpclient/qpack/StaticTableFieldsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,21 +24,23 @@
 /*
  * @test
  * @modules java.net.http/jdk.internal.net.http.qpack
- * @run testng/othervm -Djdk.internal.httpclient.qpack.log.level=NORMAL StaticTableFieldsTest
+ * @run junit/othervm -Djdk.internal.httpclient.qpack.log.level=NORMAL StaticTableFieldsTest
  */
 
 import jdk.internal.net.http.qpack.StaticTable;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class StaticTableFieldsTest {
 
-    @BeforeTest
+    @BeforeAll
     public void setUp() {
         // Populate expected table as defined by RFC
         expectedTable = new ArrayList<>();
@@ -66,10 +68,10 @@ public class StaticTableFieldsTest {
 
     @Test
     public void testStaticTable() {
-        assertEquals(actualTable.size(), expectedTable.size());
+        assertEquals(expectedTable.size(), actualTable.size());
         for (int i = 0; i < expectedTable.size(); i++) {
-            assertEquals(actualTable.get(i).name(), expectedTable.get(i).name());
-            assertEquals(actualTable.get(i).value(), expectedTable.get(i).value());
+            assertEquals(expectedTable.get(i).name(), actualTable.get(i).name());
+            assertEquals(expectedTable.get(i).value(), actualTable.get(i).value());
         }
     }
 
diff --git a/test/jdk/java/net/httpclient/qpack/StringLengthLimitsTest.java b/test/jdk/java/net/httpclient/qpack/StringLengthLimitsTest.java
index ade50d2843b..7c94abf1504 100644
--- a/test/jdk/java/net/httpclient/qpack/StringLengthLimitsTest.java
+++ b/test/jdk/java/net/httpclient/qpack/StringLengthLimitsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,9 +34,6 @@ import jdk.internal.net.http.qpack.readers.StringReader;
 import jdk.internal.net.http.qpack.writers.HeaderFrameWriter;
 import jdk.internal.net.http.qpack.writers.IntegerWriter;
 import jdk.internal.net.http.qpack.writers.StringWriter;
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.net.ProtocolException;
@@ -44,6 +41,10 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -59,12 +60,12 @@ import java.util.concurrent.atomic.AtomicReference;
  *          java.net.http/jdk.internal.net.http.http3.frames
  *          java.net.http/jdk.internal.net.http.http3
  * @build EncoderDecoderConnector
- * @run testng/othervm -Djdk.http.qpack.allowBlockingEncoding=true
+ * @run junit/othervm -Djdk.http.qpack.allowBlockingEncoding=true
  *                      StringLengthLimitsTest
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class StringLengthLimitsTest {
 
-    @DataProvider
     Object[][] stringReaderLimitsData() {
         return new Object[][]{
                 {STRING_READER_STRING_LENGTH, STRING_READER_STRING_LENGTH, false, false},
@@ -74,7 +75,8 @@ public class StringLengthLimitsTest {
         };
     }
 
-    @Test(dataProvider = "stringReaderLimitsData")
+    @ParameterizedTest
+    @MethodSource("stringReaderLimitsData")
     public void stringReaderLimits(int length, int limit, boolean huffmanBit,
                                    boolean exceptionExpected) throws IOException {
         IntegerWriter intWriter = new IntegerWriter();
@@ -82,26 +84,25 @@ public class StringLengthLimitsTest {
 
         var byteBuffer = ByteBuffer.allocate(2);
         if (!intWriter.write(byteBuffer)) {
-            Assert.fail("Error with test buffer preparations");
+            Assertions.fail("Error with test buffer preparations");
         }
         byteBuffer.flip();
 
         StringReader stringReader = new StringReader();
         StringBuilder unusedOutput = new StringBuilder();
         if (exceptionExpected) {
-            QPackException exception = Assert.expectThrows(QPackException.class,
+            QPackException exception = Assertions.assertThrows(QPackException.class,
                     () -> stringReader.read(byteBuffer, unusedOutput, limit));
             Throwable cause = exception.getCause();
-            Assert.assertNotNull(cause);
-            Assert.assertTrue(cause instanceof ProtocolException);
+            Assertions.assertNotNull(cause);
+            Assertions.assertTrue(cause instanceof ProtocolException);
             System.err.println("Got expected ProtocolException: " + cause);
         } else {
             boolean done = stringReader.read(byteBuffer, unusedOutput, limit);
-            Assert.assertFalse(done, "read done");
+            Assertions.assertFalse(done, "read done");
         }
     }
 
-    @DataProvider
     Object[][] encoderInstructionLimitsData() {
         int maxEntrySize = ENCODER_INSTRUCTIONS_DT_CAPACITY - 32;
         return new Object[][]{
@@ -144,7 +145,8 @@ public class StringLengthLimitsTest {
         };
     }
 
-    @Test(dataProvider = "encoderInstructionLimitsData")
+    @ParameterizedTest
+    @MethodSource("encoderInstructionLimitsData")
     public void encoderInstructionLimits(EncoderInstruction instruction,
                                          int nameLength, boolean nameHuffman,
                                          int valueLength, boolean valueHuffman,
@@ -177,9 +179,9 @@ public class StringLengthLimitsTest {
         }
         Throwable error = observedError.get();
         if (successExpected && error != null) {
-            Assert.fail("Unexpected error", error);
+            Assertions.fail("Unexpected error", error);
         } else if (error == null && !successExpected) {
-            Assert.fail("Expected error");
+            Assertions.fail("Expected error");
         }
     }
 
@@ -244,7 +246,6 @@ public class StringLengthLimitsTest {
         return instructionBuffers;
     }
 
-    @DataProvider
     Object[][] fieldLineLimitsData() {
         return new Object[][]{
                 // Post-Base Index
@@ -273,7 +274,8 @@ public class StringLengthLimitsTest {
         };
     }
 
-    @Test(dataProvider = "fieldLineLimitsData")
+    @ParameterizedTest
+    @MethodSource("fieldLineLimitsData")
     public void fieldLineLimits(int nameLength, int valueLength,
                                 String name, String value,
                                 boolean isPostBase, boolean successExpected) throws IOException {
@@ -385,9 +387,9 @@ public class StringLengthLimitsTest {
         var error = decodingCallbackError.get();
         System.err.println("Decoding callback error: " + error);
         if (successExpected && error != null) {
-            Assert.fail("Unexpected error", error);
+            Assertions.fail("Unexpected error", error);
         } else if (error == null && !successExpected) {
-            Assert.fail("Error expected");
+            Assertions.fail("Error expected");
         }
     }
 
diff --git a/test/jdk/java/net/httpclient/qpack/TablesIndexerTest.java b/test/jdk/java/net/httpclient/qpack/TablesIndexerTest.java
index 4ed489ca6dd..1a175342c6b 100644
--- a/test/jdk/java/net/httpclient/qpack/TablesIndexerTest.java
+++ b/test/jdk/java/net/httpclient/qpack/TablesIndexerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @modules java.net.http/jdk.internal.net.http.qpack
- * @run testng/othervm -Djdk.internal.httpclient.qpack.log.level=INFO TablesIndexerTest
+ * @run junit/othervm -Djdk.internal.httpclient.qpack.log.level=INFO TablesIndexerTest
  */
 
 import jdk.internal.net.http.qpack.DynamicTable;
@@ -33,9 +33,6 @@ import jdk.internal.net.http.qpack.QPACK;
 import jdk.internal.net.http.qpack.StaticTable;
 import jdk.internal.net.http.qpack.TableEntry;
 import jdk.internal.net.http.qpack.TablesIndexer;
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,10 +41,14 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 
 import static jdk.internal.net.http.qpack.TableEntry.EntryType;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TablesIndexerTest {
 
-    @DataProvider(name = "indicesLookupData")
     public Object[][] indicesData() {
         List<Object[]> tcs = new ArrayList<>();
 
@@ -68,7 +69,8 @@ public class TablesIndexerTest {
         return tcs.toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "indicesLookupData")
+    @ParameterizedTest
+    @MethodSource("indicesData")
     public void checkIndicesLookup(String name, String value,
                                    String dynamicTableValue,
                                    Set<Long> indices, EntryType type) {
@@ -88,45 +90,46 @@ public class TablesIndexerTest {
                 IGNORE_RECEIVED_COUNT_CHECK);
 
         // TableEntry should be for static table only
-        Assert.assertTrue(tableEntry.isStaticTable());
+        Assertions.assertTrue(tableEntry.isStaticTable());
 
         // If value is not equal to dynamicTableValue, the full name:dynamicTableValue
         // should be found in the dynamic table with index 0
         if (!value.equals(dynamicTableValue)) {
             TableEntry dtEntry = tablesIndexer.entryOf(name, dynamicTableValue,
                     IGNORE_RECEIVED_COUNT_CHECK);
-            Assert.assertFalse(dtEntry.isStaticTable());
-            Assert.assertEquals(dtEntry.type(), EntryType.NAME_VALUE);
-            Assert.assertEquals(dtEntry.index(), 0L);
+            Assertions.assertFalse(dtEntry.isStaticTable());
+            Assertions.assertEquals(EntryType.NAME_VALUE, dtEntry.type());
+            Assertions.assertEquals(0L, dtEntry.index());
         }
 
         // Check that found index is contained in a set and returned indices match
-        Assert.assertTrue(indices.contains(tableEntry.index()));
+        Assertions.assertTrue(indices.contains(tableEntry.index()));
 
         // Check that entry type matches
-        Assert.assertEquals(tableEntry.type(), type);
+        Assertions.assertEquals(type, tableEntry.type());
 
         var headerField = STATIC_TABLE.get(tableEntry.index());
         // Check that name and/or value matches the one that can be acquired by
         // using looked-up index
         if (tableEntry.type() == EntryType.NAME) {
-            Assert.assertEquals(headerField.name(), name);
+            Assertions.assertEquals(name, headerField.name());
             // If only name entry is found huffmanName should be set to false
-            Assert.assertFalse(tableEntry.huffmanName());
+            Assertions.assertFalse(tableEntry.huffmanName());
         } else if (tableEntry.type() == EntryType.NAME_VALUE) {
-            Assert.assertEquals(headerField.name(), name);
-            Assert.assertEquals(headerField.value(), value);
+            Assertions.assertEquals(name, headerField.name());
+            Assertions.assertEquals(value, headerField.value());
             // If "name:value" match is found huffmanName and huffmanValue should
             // be set to false
-            Assert.assertFalse(tableEntry.huffmanName());
-            Assert.assertFalse(tableEntry.huffmanValue());
+            Assertions.assertFalse(tableEntry.huffmanName());
+            Assertions.assertFalse(tableEntry.huffmanValue());
 
         } else {
-            Assert.fail("Unexpected TableEntry type returned:" + tableEntry);
+            Assertions.fail("Unexpected TableEntry type returned:" + tableEntry);
         }
     }
 
-    @Test(dataProvider = "unacknowledgedEntriesLookupData")
+    @ParameterizedTest
+    @MethodSource("unacknowledgedEntriesLookupData")
     public void unacknowledgedEntryLookup(String headerName, String headerValue,
                                           boolean staticEntryExpected,
                                           EntryType expectedType) {
@@ -137,12 +140,11 @@ public class TablesIndexerTest {
         // Search for an entry in the dynamic and the static tables
         var entry = tablesIndexer.entryOf(headerName, headerValue, TEST_KNOWN_RECEIVED_COUNT);
         // Check that entry references expected table
-        Assert.assertEquals(entry.isStaticTable(), staticEntryExpected);
+        Assertions.assertEquals(staticEntryExpected, entry.isStaticTable());
         // And the type of found entry matches expectations
-        Assert.assertEquals(entry.type(), expectedType);
+        Assertions.assertEquals(expectedType, entry.type());
     }
 
-    @DataProvider
     public Object[][] unacknowledgedEntriesLookupData() {
         List<Object[]> data = new ArrayList<>();
         data.add(new Object[]{USER_AGENT_ST_NAME, "not-in-dynamic", true, EntryType.NAME});
diff --git a/test/jdk/java/net/httpclient/qpack/UnacknowledgedInsertionTest.java b/test/jdk/java/net/httpclient/qpack/UnacknowledgedInsertionTest.java
index 7b621e2d69d..5d0129234f3 100644
--- a/test/jdk/java/net/httpclient/qpack/UnacknowledgedInsertionTest.java
+++ b/test/jdk/java/net/httpclient/qpack/UnacknowledgedInsertionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,6 @@ import jdk.internal.net.http.http3.Http3Error;
 import jdk.internal.net.http.http3.frames.SettingsFrame;
 import jdk.internal.net.http.qpack.DecodingCallback;
 import jdk.internal.net.http.qpack.Encoder;
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -38,7 +35,11 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.testng.Assert.assertNotEquals;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -56,11 +57,13 @@ import static org.testng.Assert.assertNotEquals;
  *          java.net.http/jdk.internal.net.http.http3.frames
  *          java.net.http/jdk.internal.net.http.http3
  * @build EncoderDecoderConnector
- * @run testng/othervm -Djdk.internal.httpclient.qpack.log.level=EXTRA UnacknowledgedInsertionTest
+ * @run junit/othervm -Djdk.internal.httpclient.qpack.log.level=EXTRA UnacknowledgedInsertionTest
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class UnacknowledgedInsertionTest {
 
-    @Test(dataProvider = "duplicateEntryInsertions")
+    @ParameterizedTest
+    @MethodSource("duplicateEntryInsertionsData")
     public void unacknowledgedDoubleInsertion(long knownReceiveCount, List<EncodingType> expectedHeadersEncodingType) throws Exception {
         // When knownReceiveCount is set to -1 the Encoder.knownReceiveCount()
         // value is used to encode headers - otherwise the provided value is used
@@ -101,10 +104,10 @@ public class UnacknowledgedInsertionTest {
         }
 
         // Only two entries are expected to be inserted to the dynamic table
-        Assert.assertEquals(ed.decoderTable().insertCount(), 2);
+        Assertions.assertEquals(2, ed.decoderTable().insertCount());
 
         // Check that headers byte buffer is not empty
-        assertNotEquals(headersBb.position(), 0);
+        assertNotEquals(0, headersBb.position());
         headersBb.flip();
         buffers.add(headersBb);
 
@@ -119,11 +122,10 @@ public class UnacknowledgedInsertionTest {
                 .stream()
                 .map(DecodedHeader::encodingType)
                 .toList();
-        Assert.assertEquals(actualHeaderEncodingTypes, expectedHeadersEncodingType);
+        Assertions.assertEquals(expectedHeadersEncodingType, actualHeaderEncodingTypes);
     }
 
 
-    @DataProvider(name = "duplicateEntryInsertions")
     private Object[][] duplicateEntryInsertionsData() {
         return new Object[][]{
                 {0, List.of(EncodingType.LITERAL, EncodingType.LITERAL, EncodingType.LITERAL)},
@@ -167,7 +169,7 @@ public class UnacknowledgedInsertionTest {
 
         @Override
         public void onDecoded(CharSequence name, CharSequence value) {
-            Assert.fail("onDecoded not expected to be called");
+            Assertions.fail("onDecoded not expected to be called");
         }
 
         @Override
diff --git a/test/jdk/java/net/httpclient/quic/KeyUpdateTest.java b/test/jdk/java/net/httpclient/quic/KeyUpdateTest.java
index 631a054b2f9..d6d287be9e0 100644
--- a/test/jdk/java/net/httpclient/quic/KeyUpdateTest.java
+++ b/test/jdk/java/net/httpclient/quic/KeyUpdateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,7 @@ import static org.testng.Assert.assertTrue;
 public class KeyUpdateTest {
 
     private QuicStandaloneServer server;
-    private SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private ExecutorService executor;
 
     private static final byte[] HELLO_MSG = "Hello Quic".getBytes(StandardCharsets.UTF_8);
@@ -94,10 +94,6 @@ public class KeyUpdateTest {
 
     @BeforeClass
     public void beforeClass() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         executor = Executors.newCachedThreadPool();
         server = QuicStandaloneServer.newBuilder()
                 .availableVersions(new QuicVersion[]{QuicVersion.QUIC_V1})
diff --git a/test/jdk/java/net/httpclient/quic/PacketLossTest.java b/test/jdk/java/net/httpclient/quic/PacketLossTest.java
index 1298e0977de..1f75e1feb95 100644
--- a/test/jdk/java/net/httpclient/quic/PacketLossTest.java
+++ b/test/jdk/java/net/httpclient/quic/PacketLossTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,17 +67,13 @@ import org.junit.jupiter.api.Test;
  */
 public class PacketLossTest {
 
-    private static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private static ExecutorService executor;
 
     private static final byte[] HELLO_MSG = "Hello Quic".getBytes(StandardCharsets.UTF_8);
 
     @BeforeAll
     public static void beforeAll() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         executor = Executors.newCachedThreadPool();
     }
 
diff --git a/test/jdk/java/net/httpclient/quic/QuicRequestResponseTest.java b/test/jdk/java/net/httpclient/quic/QuicRequestResponseTest.java
index 2c5844dc4c4..9d5c35f5414 100644
--- a/test/jdk/java/net/httpclient/quic/QuicRequestResponseTest.java
+++ b/test/jdk/java/net/httpclient/quic/QuicRequestResponseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,17 +59,13 @@ import org.testng.annotations.Test;
 public class QuicRequestResponseTest {
 
     private QuicStandaloneServer server;
-    private SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private ExecutorService executor;
 
     private static final byte[] HELLO_MSG = "Hello Quic".getBytes(StandardCharsets.UTF_8);
 
     @BeforeClass
     public void beforeClass() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         executor = Executors.newCachedThreadPool();
         server = QuicStandaloneServer.newBuilder()
                 .availableVersions(new QuicVersion[]{QuicVersion.QUIC_V1})
diff --git a/test/jdk/java/net/httpclient/quic/StatelessResetReceiptTest.java b/test/jdk/java/net/httpclient/quic/StatelessResetReceiptTest.java
index 8eb7a3663d8..a20494095bd 100644
--- a/test/jdk/java/net/httpclient/quic/StatelessResetReceiptTest.java
+++ b/test/jdk/java/net/httpclient/quic/StatelessResetReceiptTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,7 @@ import jdk.internal.net.http.common.MinimalFuture;
 import jdk.internal.net.http.quic.QuicClient;
 import jdk.internal.net.http.quic.QuicConnectionId;
 import jdk.internal.net.http.quic.QuicConnectionImpl;
+import jdk.internal.net.http.quic.QuicTransportParameters;
 import jdk.internal.net.http.quic.TerminationCause;
 import jdk.internal.net.quic.QuicTLSContext;
 import jdk.internal.net.quic.QuicVersion;
@@ -58,11 +59,13 @@ import static jdk.internal.net.http.quic.TerminationCause.forTransportError;
 import static jdk.internal.net.quic.QuicTransportErrors.NO_VIABLE_PATH;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /*
  * @test
+ * @bug 8373877
  * @summary verify that when a QUIC (client) connection receives a stateless reset
  *          from the peer, then the connection is properly terminated
  * @library /test/lib /test/jdk/java/net/httpclient/lib
@@ -73,20 +76,20 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 public class StatelessResetReceiptTest {
 
     private static QuicStandaloneServer server;
-    private static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private static ExecutorService executor;
 
     @BeforeAll
     static void beforeAll() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         executor = Executors.newCachedThreadPool();
         server = QuicStandaloneServer.newBuilder()
                 .availableVersions(new QuicVersion[]{QuicVersion.QUIC_V1})
                 .sslContext(sslContext)
                 .build();
+        // Use a longer max ack delay to inflate the draining time (3xPTO)
+        final QuicTransportParameters transportParameters = new QuicTransportParameters();
+        transportParameters.setIntParameter(QuicTransportParameters.ParameterId.max_ack_delay,
+                (1 << 14) - 1); // 16 seconds, maximum allowed
         server.start();
         System.out.println("Server started at " + server.getAddress());
     }
@@ -179,6 +182,9 @@ public class StatelessResetReceiptTest {
             conn.close();
             // verify connection is no longer open
             assertFalse(conn.underlyingQuicConnection().isOpen(), "QUIC connection is still open");
+            // Check that the (closing) connection is still registered with the endpoint
+            assertNotEquals(0, conn.endpoint().connectionCount(),
+                    "Expected the QUIC connection to be registered");
             // now send a stateless reset from the server connection
             sendStatelessResetFrom(serverConn);
             // wait for the stateless reset to be processed
@@ -231,12 +237,19 @@ public class StatelessResetReceiptTest {
                     .loggedAs("intentionally closed by server to initiate draining state" +
                             " on client connection");
             serverConn.connectionTerminator().terminate(tc);
+            // send ping in case the connection_close message gets lost
+            conn.underlyingQuicConnection().requestSendPing();
             // wait for client conn to terminate
             final TerminationCause clientTC = ((QuicConnectionImpl) conn.underlyingQuicConnection())
                     .futureTerminationCause().get();
             // verify connection closed for the right reason
             assertEquals(NO_VIABLE_PATH.code(), clientTC.getCloseCode(),
                     "unexpected termination cause");
+            // wait for a while to let the connection close completely
+            Thread.sleep(10);
+            // Check that the (draining) connection is still registered with the endpoint
+            assertNotEquals(0, conn.endpoint().connectionCount(),
+                    "Expected the QUIC connection to be registered");
             // now send a stateless reset from the server connection
             sendStatelessResetFrom(serverConn);
             // wait for the stateless reset to be processed
diff --git a/test/jdk/java/net/httpclient/quic/VersionNegotiationTest.java b/test/jdk/java/net/httpclient/quic/VersionNegotiationTest.java
index d0de5ce9a60..973477a63dc 100644
--- a/test/jdk/java/net/httpclient/quic/VersionNegotiationTest.java
+++ b/test/jdk/java/net/httpclient/quic/VersionNegotiationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,15 +61,11 @@ import static org.testng.Assert.expectThrows;
  */
 public class VersionNegotiationTest {
 
-    private static SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private static ExecutorService executor;
 
     @BeforeClass
     public static void beforeClass() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null) {
-            throw new AssertionError("Unexpected null sslContext");
-        }
         executor = Executors.newCachedThreadPool();
     }
 
diff --git a/test/jdk/java/net/httpclient/quic/tls/QuicTLSEngineBadParametersTest.java b/test/jdk/java/net/httpclient/quic/tls/QuicTLSEngineBadParametersTest.java
index e6a99caebad..0b7e6875b96 100644
--- a/test/jdk/java/net/httpclient/quic/tls/QuicTLSEngineBadParametersTest.java
+++ b/test/jdk/java/net/httpclient/quic/tls/QuicTLSEngineBadParametersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ public class QuicTLSEngineBadParametersTest {
 
     @Test
     void testServerConsumerExceptionPropagated() throws IOException {
-        SSLContext ctx = SimpleSSLContext.getContext("TLSv1.3");
+        SSLContext ctx = SimpleSSLContext.findSSLContext("TLSv1.3");
         QuicTLSContext qctx = new QuicTLSContext(ctx);
         QuicTLSEngine clientEngine = createClientEngine(qctx);
         QuicTLSEngine serverEngine = createServerEngine(qctx);
@@ -68,7 +68,7 @@ public class QuicTLSEngineBadParametersTest {
 
     @Test
     void testClientConsumerExceptionPropagated() throws IOException, QuicTransportException {
-        SSLContext ctx = SimpleSSLContext.getContext("TLSv1.3");
+        SSLContext ctx = SimpleSSLContext.findSSLContext("TLSv1.3");
         QuicTLSContext qctx = new QuicTLSContext(ctx);
         QuicTLSEngine clientEngine = createClientEngine(qctx);
         QuicTLSEngine serverEngine = createServerEngine(qctx);
diff --git a/test/jdk/java/net/httpclient/quic/tls/QuicTLSEngineFailedALPNTest.java b/test/jdk/java/net/httpclient/quic/tls/QuicTLSEngineFailedALPNTest.java
index fa7df3bc5c3..5767d81cc83 100644
--- a/test/jdk/java/net/httpclient/quic/tls/QuicTLSEngineFailedALPNTest.java
+++ b/test/jdk/java/net/httpclient/quic/tls/QuicTLSEngineFailedALPNTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ public class QuicTLSEngineFailedALPNTest {
 
     @Test
     void testServerRequiresALPN() throws IOException {
-        SSLContext ctx = SimpleSSLContext.getContext("TLSv1.3");
+        SSLContext ctx = SimpleSSLContext.findSSLContext("TLSv1.3");
         QuicTLSContext qctx = new QuicTLSContext(ctx);
         QuicTLSEngine clientEngine = createClientEngine(qctx);
         QuicTLSEngine serverEngine = createServerEngine(qctx);
@@ -63,7 +63,7 @@ public class QuicTLSEngineFailedALPNTest {
 
     @Test
     void testClientRequiresALPN() throws IOException, QuicTransportException {
-        SSLContext ctx = SimpleSSLContext.getContext("TLSv1.3");
+        SSLContext ctx = SimpleSSLContext.findSSLContext("TLSv1.3");
         QuicTLSContext qctx = new QuicTLSContext(ctx);
         QuicTLSEngine clientEngine = createClientEngine(qctx);
         QuicTLSEngine serverEngine = createServerEngine(qctx);
diff --git a/test/jdk/java/net/httpclient/quic/tls/QuicTLSEngineMissingParametersTest.java b/test/jdk/java/net/httpclient/quic/tls/QuicTLSEngineMissingParametersTest.java
index da9f06785a2..933d258f912 100644
--- a/test/jdk/java/net/httpclient/quic/tls/QuicTLSEngineMissingParametersTest.java
+++ b/test/jdk/java/net/httpclient/quic/tls/QuicTLSEngineMissingParametersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ public class QuicTLSEngineMissingParametersTest {
 
     @Test
     void testServerRequiresTransportParameters() throws IOException {
-        SSLContext ctx = SimpleSSLContext.getContext("TLSv1.3");
+        SSLContext ctx = SimpleSSLContext.findSSLContext("TLSv1.3");
         QuicTLSContext qctx = new QuicTLSContext(ctx);
         QuicTLSEngine clientEngine = createClientEngine(qctx);
         QuicTLSEngine serverEngine = createServerEngine(qctx);
@@ -63,7 +63,7 @@ public class QuicTLSEngineMissingParametersTest {
 
     @Test
     void testClientRequiresTransportParameters() throws IOException, QuicTransportException {
-        SSLContext ctx = SimpleSSLContext.getContext("TLSv1.3");
+        SSLContext ctx = SimpleSSLContext.findSSLContext("TLSv1.3");
         QuicTLSContext qctx = new QuicTLSContext(ctx);
         QuicTLSEngine clientEngine = createClientEngine(qctx);
         QuicTLSEngine serverEngine = createServerEngine(qctx);
diff --git a/test/jdk/java/net/httpclient/websocket/DummyWebSocketServer.java b/test/jdk/java/net/httpclient/websocket/DummyWebSocketServer.java
index 9034cf9f28a..abc1748e3f2 100644
--- a/test/jdk/java/net/httpclient/websocket/DummyWebSocketServer.java
+++ b/test/jdk/java/net/httpclient/websocket/DummyWebSocketServer.java
@@ -351,7 +351,14 @@ public class DummyWebSocketServer implements Closeable {
         if (!started.get()) {
             throw new IllegalStateException("Not yet started");
         }
-        return URI.create("ws://localhost:" + address.getPort());
+        String ip = address.getAddress().isAnyLocalAddress()
+                ? InetAddress.getLoopbackAddress().getHostAddress()
+                : address.getAddress().getHostAddress();
+        if (ip.indexOf(':') >= 0) {
+            ip = String.format("[%s]", ip);
+        }
+
+        return URI.create("ws://" + ip + ":" + address.getPort());
     }
 
     private boolean readRequest(SocketChannel channel, StringBuilder request)
diff --git a/test/jdk/java/net/httpclient/websocket/HandshakeUrlEncodingTest.java b/test/jdk/java/net/httpclient/websocket/HandshakeUrlEncodingTest.java
index 6d242a596e7..25a6893ff13 100644
--- a/test/jdk/java/net/httpclient/websocket/HandshakeUrlEncodingTest.java
+++ b/test/jdk/java/net/httpclient/websocket/HandshakeUrlEncodingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,7 @@ import static java.lang.System.out;
 
 public class HandshakeUrlEncodingTest {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpServer httpTestServer;
     HttpsServer httpsTestServer;
     String httpURI;
@@ -135,11 +135,6 @@ public class HandshakeUrlEncodingTest {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
-
         InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         queryPart = "?&raw=abc+def/ghi=xyz&encoded=abc%2Bdef%2Fghi%3Dxyz";
         httpTestServer = HttpServer.create(sa, 10);
diff --git a/test/jdk/java/net/httpclient/websocket/WSHandshakeExceptionTest.java b/test/jdk/java/net/httpclient/websocket/WSHandshakeExceptionTest.java
index 6a02b774929..90db79dc8ef 100644
--- a/test/jdk/java/net/httpclient/websocket/WSHandshakeExceptionTest.java
+++ b/test/jdk/java/net/httpclient/websocket/WSHandshakeExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,7 @@ import static java.lang.System.out;
 
 public class WSHandshakeExceptionTest {
 
-    SSLContext sslContext;
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     HttpServer httpTestServer;         // HTTP/1.1    [ 2 servers ]
     HttpsServer httpsTestServer;       // HTTPS/1.1
     String httpURI;
@@ -161,10 +161,6 @@ public class WSHandshakeExceptionTest {
 
     @BeforeTest
     public void setup() throws Exception {
-        sslContext = new SimpleSSLContext().get();
-        if (sslContext == null)
-            throw new AssertionError("Unexpected null sslContext");
-
         // HTTP/1.1
         InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         httpTestServer = HttpServer.create(sa, 0);
diff --git a/test/jdk/java/net/httpclient/websocket/WebSocketProxyTest.java b/test/jdk/java/net/httpclient/websocket/WebSocketProxyTest.java
index 405edd270a4..46758b2fe6e 100644
--- a/test/jdk/java/net/httpclient/websocket/WebSocketProxyTest.java
+++ b/test/jdk/java/net/httpclient/websocket/WebSocketProxyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,11 +79,7 @@ public class WebSocketProxyTest {
     private static final String PASSWORD = "xyz987";
 
     static {
-        try {
-            SSLContext.setDefault(new SimpleSSLContext().get());
-        } catch (IOException ex) {
-            throw new ExceptionInInitializerError(ex);
-        }
+        SSLContext.setDefault(SimpleSSLContext.findSSLContext());
     }
 
     static class WSAuthenticator extends Authenticator {
diff --git a/test/jdk/java/net/httpclient/whitebox/AltSvcFrameTest.java b/test/jdk/java/net/httpclient/whitebox/AltSvcFrameTest.java
index 949c950fd76..589e5409044 100644
--- a/test/jdk/java/net/httpclient/whitebox/AltSvcFrameTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/AltSvcFrameTest.java
@@ -107,11 +107,10 @@ public class AltSvcFrameTest {
     static Http2TestServer https2Server;
     static String https2URI;
     static HttpClient client;
-    static SSLContext server;
+    private static final SSLContext server = SimpleSSLContext.findSSLContext();
 
     @BeforeTest
     public void setUp() throws Exception {
-        server = SimpleSSLContext.getContext("TLS");
         getRegistry();
         https2Server = new Http2TestServer("localhost", true, server);
         https2Server.addHandler(new AltSvcFrameTestHandler(), "/");
diff --git a/test/jdk/java/net/httpclient/whitebox/AltSvcRegistryTest.java b/test/jdk/java/net/httpclient/whitebox/AltSvcRegistryTest.java
index 47e69338715..b853f715415 100644
--- a/test/jdk/java/net/httpclient/whitebox/AltSvcRegistryTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/AltSvcRegistryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,11 +87,10 @@ public class AltSvcRegistryTest implements HttpServerAdapters {
     static HttpTestServer https2Server;
     static String https2URI;
     static HttpClient client;
-    static SSLContext server;
+    private static final SSLContext server = SimpleSSLContext.findSSLContext();
 
     @BeforeTest
     public void setUp() throws Exception {
-        server = SimpleSSLContext.getContext("TLS");
         getRegistry();
         final ExecutorService executor = Executors.newCachedThreadPool();
         https2Server = HttpServerAdapters.HttpTestServer.of(
diff --git a/test/jdk/java/net/httpclient/whitebox/FlowTestDriver.java b/test/jdk/java/net/httpclient/whitebox/FlowTestDriver.java
index a0130de5a67..c24a733db3b 100644
--- a/test/jdk/java/net/httpclient/whitebox/FlowTestDriver.java
+++ b/test/jdk/java/net/httpclient/whitebox/FlowTestDriver.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @compile/module=java.net.http ../../../../../../lib/jdk/test/lib/net/SimpleSSLContext.java
  * @modules java.net.http/jdk.internal.net.http
  * @run testng/timeout=480 java.net.http/jdk.internal.net.http.FlowTest
  */
diff --git a/test/jdk/java/net/httpclient/whitebox/SSLEchoTubeTestDriver.java b/test/jdk/java/net/httpclient/whitebox/SSLEchoTubeTestDriver.java
index 2ae82454cff..d641513b298 100644
--- a/test/jdk/java/net/httpclient/whitebox/SSLEchoTubeTestDriver.java
+++ b/test/jdk/java/net/httpclient/whitebox/SSLEchoTubeTestDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @compile/module=java.net.http ../../../../../../lib/jdk/test/lib/net/SimpleSSLContext.java
  * @modules java.net.http/jdk.internal.net.http
  * @run testng/othervm
  *      -Djdk.internal.httpclient.debug=true
diff --git a/test/jdk/java/net/httpclient/whitebox/SSLFlowDelegateTestDriver.java b/test/jdk/java/net/httpclient/whitebox/SSLFlowDelegateTestDriver.java
index 083a291751f..a49f53a844a 100644
--- a/test/jdk/java/net/httpclient/whitebox/SSLFlowDelegateTestDriver.java
+++ b/test/jdk/java/net/httpclient/whitebox/SSLFlowDelegateTestDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8308144
  * @summary tests that the SSLFlowDelegate doesn't accumulate application data when the
  *          downReader doesn't request any
+ * @compile/module=java.net.http ../../../../../../lib/jdk/test/lib/net/SimpleSSLContext.java
  * @modules java.net.http/jdk.internal.net.http
  * @run testng/othervm  -Djdk.internal.httpclient.debug=true
  *                      -Djavax.net.debug=ssl:handshake
diff --git a/test/jdk/java/net/httpclient/whitebox/SSLTubeTestDriver.java b/test/jdk/java/net/httpclient/whitebox/SSLTubeTestDriver.java
index e4809b60355..b1994777b14 100644
--- a/test/jdk/java/net/httpclient/whitebox/SSLTubeTestDriver.java
+++ b/test/jdk/java/net/httpclient/whitebox/SSLTubeTestDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @compile/module=java.net.http ../../../../../../lib/jdk/test/lib/net/SimpleSSLContext.java
  * @modules java.net.http/jdk.internal.net.http
  * @run testng/othervm
  *      -Djdk.internal.httpclient.debug=true
diff --git a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AbstractSSLTubeTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AbstractSSLTubeTest.java
index f1e54b47730..944f8ae0872 100644
--- a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AbstractSSLTubeTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AbstractSSLTubeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -286,8 +286,8 @@ public class AbstractSSLTubeTest extends AbstractRandomTest {
         }
     }
 
-    protected static SSLEngine createSSLEngine(boolean client) throws IOException {
-        SSLContext context = (new SimpleSSLContext()).get();
+    protected static SSLEngine createSSLEngine(boolean client) {
+        SSLContext context = SimpleSSLContextWhiteboxAdapter.findSSLContext();
         SSLEngine engine = context.createSSLEngine();
         SSLParameters params = context.getSupportedSSLParameters();
         if (client) {
diff --git a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/FlowTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/FlowTest.java
index 7fa717639db..3e9e967c061 100644
--- a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/FlowTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/FlowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,7 +76,7 @@ public class FlowTest extends AbstractRandomTest {
         executor = Executors.newCachedThreadPool();
         srcPublisher = new SubmissionPublisher<>(executor, 20,
                                                  this::handlePublisherException);
-        SSLContext ctx = (new SimpleSSLContext()).get();
+        SSLContext ctx = SimpleSSLContextWhiteboxAdapter.findSSLContext();
         SSLEngine engineClient = ctx.createSSLEngine();
         SSLParameters params = ctx.getSupportedSSLParameters();
         params.setApplicationProtocols(new String[]{"proto1", "proto2"}); // server will choose proto2
diff --git a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SSLFlowDelegateTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SSLFlowDelegateTest.java
index 45af27a96a8..6b031bdfa58 100644
--- a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SSLFlowDelegateTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SSLFlowDelegateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,7 +71,6 @@ public class SSLFlowDelegateTest {
     private static final byte DATA_BYTE = (byte) random.nextInt();
 
     private ExecutorService executor;
-    private SSLContext sslContext;
     private SSLParameters sslParams;
     private SSLServerSocket sslServerSocket;
     private SSLEngine clientEngine;
@@ -80,18 +79,18 @@ public class SSLFlowDelegateTest {
     @BeforeTest
     public void beforeTest() throws Exception {
         this.executor = Executors.newCachedThreadPool();
-        this.sslContext = new jdk.internal.net.http.SimpleSSLContext().get();
         this.testCompletion = new CompletableFuture<>();
 
         final SSLParameters sp = new SSLParameters();
         sp.setApplicationProtocols(new String[]{ALPN});
         this.sslParams = sp;
 
-        this.sslServerSocket = startServer(this.sslContext);
+        var sslContext = SimpleSSLContextWhiteboxAdapter.findSSLContext();
+        this.sslServerSocket = startServer(sslContext);
         println(debugTag, "Server started at " + this.sslServerSocket.getInetAddress() + ":"
                 + this.sslServerSocket.getLocalPort());
 
-        this.clientEngine = createClientEngine(this.sslContext);
+        this.clientEngine = createClientEngine(sslContext);
     }
 
     @AfterTest
diff --git a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SSLTubeTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SSLTubeTest.java
index 114110344a4..ac6a235b8e2 100644
--- a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SSLTubeTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SSLTubeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ public class SSLTubeTest extends AbstractSSLTubeTest {
         /* Start of wiring */
         /* Emulates an echo server */
         SSLLoopbackSubscriber server =
-                new SSLLoopbackSubscriber((new SimpleSSLContext()).get(),
+                new SSLLoopbackSubscriber(SimpleSSLContextWhiteboxAdapter.findSSLContext(),
                         sslExecutor,
                         allBytesReceived);
         server.start();
diff --git a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SimpleSSLContext.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SimpleSSLContext.java
deleted file mode 100644
index 00b261292fa..00000000000
--- a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SimpleSSLContext.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.internal.net.http;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-import java.util.StringTokenizer;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
-
-/**
- * Creates a simple usable SSLContext for SSLSocketFactory
- * or a HttpsServer using a default keystore in the test tree.
- */
-public class SimpleSSLContext {
-
-    private final SSLContext ssl;
-
-    /**
-     * Loads default keystore from SimpleSSLContext source directory
-     */
-    public SimpleSSLContext() throws IOException {
-        String paths = System.getProperty("test.src.path");
-        StringTokenizer st = new StringTokenizer(paths, File.pathSeparator);
-        SSLContext sslContext = null;
-        while (st.hasMoreTokens()) {
-            String path = st.nextToken();
-            File f = new File(path, "../../../../../lib/jdk/test/lib/net/testkeys");
-            if (f.exists()) {
-                try (FileInputStream fis = new FileInputStream(f)) {
-                    sslContext = init(fis);
-                    break;
-                }
-            }
-        }
-        ssl = sslContext;
-    }
-
-    private SSLContext init(InputStream i) throws IOException {
-        try {
-            char[] passphrase = "passphrase".toCharArray();
-            KeyStore ks = KeyStore.getInstance("PKCS12");
-            ks.load(i, passphrase);
-
-            KeyManagerFactory kmf = KeyManagerFactory.getInstance("PKIX");
-            kmf.init(ks, passphrase);
-
-            TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
-            tmf.init(ks);
-
-            SSLContext ssl = SSLContext.getInstance("TLS");
-            ssl.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-            return ssl;
-        } catch (KeyManagementException | KeyStoreException |
-                UnrecoverableKeyException | CertificateException |
-                NoSuchAlgorithmException e) {
-            throw new RuntimeException(e.getMessage());
-        }
-    }
-
-    public SSLContext get() {
-        return ssl;
-    }
-}
diff --git a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SimpleSSLContextWhiteboxAdapter.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SimpleSSLContextWhiteboxAdapter.java
new file mode 100644
index 00000000000..8b22de543d3
--- /dev/null
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SimpleSSLContextWhiteboxAdapter.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.net.http;
+
+import jdk.test.lib.net.SimpleSSLContext;
+
+import javax.net.ssl.SSLContext;
+
+/**
+ * Adapter for {@link SimpleSSLContext} for whitebox tests.
+ */
+public final class SimpleSSLContextWhiteboxAdapter {
+
+    private SimpleSSLContextWhiteboxAdapter() {}
+
+    /**
+     * {@return a new {@link SSLContext} instance by searching for a key store
+     * file path, and loading the first found one}
+     *
+     * @throws RuntimeException if no key store file can be found or the found
+     * one cannot be loaded
+     */
+    public static SSLContext findSSLContext() {
+        return SimpleSSLContext.findSSLContext("../../../../../lib/jdk/test/lib/net/testkeys", "TLS");
+    }
+
+}
diff --git a/test/jdk/java/nio/channels/AsynchronousFileChannel/BufferPositions.java b/test/jdk/java/nio/channels/AsynchronousFileChannel/BufferPositions.java
new file mode 100644
index 00000000000..661696a0581
--- /dev/null
+++ b/test/jdk/java/nio/channels/AsynchronousFileChannel/BufferPositions.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8374382
+ * @summary Test AsynchronousFileChannel.read/write with ByteBuffers and varied buffer positions
+ * @run junit/othervm BufferPositions
+ */
+
+import java.lang.foreign.Arena;
+import java.nio.ByteBuffer;
+import java.nio.channels.AsynchronousFileChannel;
+import java.nio.channels.CompletionHandler;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.stream.Stream;
+import static java.nio.file.StandardOpenOption.*;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.*;
+
+class BufferPositions {
+
+    private static final int BUF_SIZE = 32;
+
+    /**
+     * The buffers to test.
+     */
+    static Stream<ByteBuffer> buffers() {
+        List<ByteBuffer> buffers = List.of(
+                ByteBuffer.allocate(BUF_SIZE),
+                ByteBuffer.allocateDirect(BUF_SIZE),
+                ByteBuffer.wrap(new byte[BUF_SIZE]),
+                Arena.global().allocate(BUF_SIZE).asByteBuffer(),
+                Arena.ofAuto().allocate(BUF_SIZE).asByteBuffer(),
+                Arena.ofShared().allocate(BUF_SIZE).asByteBuffer()
+        );
+        Stream<ByteBuffer> slices = buffers.stream()
+                .map(bb -> bb.slice(1, bb.capacity() - 1));
+        return Stream.concat(buffers.stream(), slices);
+    }
+
+    /**
+     * Test using an AsynchronousFileChannel to read bytes into the given buffer.
+     */
+    @ParameterizedTest
+    @MethodSource("buffers")
+    void testRead(ByteBuffer bb) throws Exception {
+        Path file = Files.createTempFile(Path.of("."), "test", "dat");
+
+        // populate temp file
+        int size = bb.capacity();
+        byte[] contents = new byte[size];
+        for (int i = 0; i < size; i++) {
+            contents[i] = (byte)(i + 1);
+        }
+        Files.write(file, contents);
+
+        // read bytes using the buffer as the destination and all possible buffer positions
+        try (AsynchronousFileChannel ch = AsynchronousFileChannel.open(file, READ)) {
+            for (int filePosition = 0; filePosition < size; filePosition++) {
+                for (int bufPos = 0; bufPos < size; bufPos++) {
+                    // read one byte
+                    bb.position(bufPos);
+                    bb.limit(bufPos + 1);
+                    int n = read(ch, filePosition, bb);
+                    assertEquals(1, n);
+                    assertEquals(bufPos + 1, bb.position());
+                    assertEquals(contents[filePosition], bb.get(bufPos));
+                }
+            }
+        }
+    }
+
+    /**
+     * Test using an AsynchronousFileChannel to write bytes from the given buffer.
+     */
+    @ParameterizedTest
+    @MethodSource("buffers")
+    void testWrite(ByteBuffer bb) throws Exception {
+        Path file = Files.createTempFile(Path.of("."), "test", "dat");
+
+        // populate temp file, all zeros
+        int size = bb.capacity();
+        byte[] contents = new byte[size];
+        Files.write(file, contents);
+
+        // write bytes using the buffer as the source and all possible buffer positions
+        try (AsynchronousFileChannel ch = AsynchronousFileChannel.open(file, READ, WRITE)) {
+            for (int filePosition = 0; filePosition < size; filePosition++) {
+                for (int bufPos = 0; bufPos < size; bufPos++) {
+                    // write one byte
+                    byte b = (byte) ThreadLocalRandom.current().nextInt();
+                    bb.position(bufPos);
+                    bb.limit(bufPos + 1);
+                    bb.put(bufPos, b);
+                    int n = write(ch, filePosition, bb);
+                    assertEquals(1, n);
+                    assertEquals(bufPos + 1, bb.position());
+                    assertEquals(b, bb.get(bufPos));
+
+                    // check byte was written at the expected file position
+                    ByteBuffer dst = ByteBuffer.allocate(1);
+                    int nread = ch.read(dst, filePosition).get();
+                    assertEquals(1, nread);
+                    assertEquals(b, dst.get(0));
+                }
+            }
+        }
+    }
+
+    /**
+     * Reads a byte from a channel into the given buffer, at the given file position.
+     */
+    private int read(AsynchronousFileChannel ch, long position, ByteBuffer bb) throws Exception {
+        if (ThreadLocalRandom.current().nextBoolean()) {
+            return ch.read(bb, position).get();
+        } else {
+            var handler = new Handler<Integer>();
+            ch.read(bb, position, null, handler);
+            return handler.result();
+        }
+    }
+
+    /**
+     * Writes a byte to a channel from the given buffer, at the given file position.
+     */
+    private int write(AsynchronousFileChannel ch, long position, ByteBuffer bb) throws Exception {
+        if (ThreadLocalRandom.current().nextBoolean()) {
+            return ch.write(bb, position).get();
+        } else {
+            var handler = new Handler<Integer>();
+            ch.write(bb, position, null, handler);
+            return handler.result();
+        }
+    }
+
+    /**
+     * CompletionHandler that defines a method to await the result of an I/O operation.
+     */
+    private static class Handler<T> implements CompletionHandler<T, Void> {
+        T result;
+        Throwable ex;
+        final CountDownLatch done = new CountDownLatch(1);
+
+        @Override
+        public void completed(T result, Void att) {
+            this.result = result;
+            done.countDown();
+        }
+
+        @Override
+        public void failed(Throwable ex, Void att) {
+            this.ex = ex;
+            done.countDown();
+        }
+
+        T result() throws InterruptedException {
+            done.await();
+            assertNull(ex);
+            return result;
+        }
+    }
+}
diff --git a/test/jdk/java/nio/channels/Channels/SocketChannelStreams.java b/test/jdk/java/nio/channels/Channels/SocketChannelStreams.java
index 72c07392d7c..519de1e725f 100644
--- a/test/jdk/java/nio/channels/Channels/SocketChannelStreams.java
+++ b/test/jdk/java/nio/channels/Channels/SocketChannelStreams.java
@@ -22,10 +22,10 @@
  */
 
 /* @test
- * @bug 8279339
- * @run testng SocketChannelStreams
+ * @bug 8279339 8371718
  * @summary Exercise InputStream/OutputStream returned by Channels.newXXXStream
  *    when channel is a SocketChannel
+ * @run testng SocketChannelStreams
  */
 
 import java.io.Closeable;
@@ -35,6 +35,8 @@ import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.nio.ByteBuffer;
+import java.nio.channels.ByteChannel;
 import java.nio.channels.Channels;
 import java.nio.channels.IllegalBlockingModeException;
 import java.nio.channels.ServerSocketChannel;
@@ -51,6 +53,9 @@ import static org.testng.Assert.*;
 
 @Test
 public class SocketChannelStreams {
+    // Maximum size of internal temporary buffer
+    private static final int MAX_BUFFER_SIZE = 128*1024;
+
     private ScheduledExecutorService executor;
 
     @BeforeClass()
@@ -379,6 +384,25 @@ public class SocketChannelStreams {
         });
     }
 
+    /**
+     * Test that internal buffers have at most MAX_BUFFER_SIZE bytes remaining.
+     */
+    public void testReadLimit() throws IOException {
+        InputStream in = Channels.newInputStream(new TestChannel());
+        byte[] b = new byte[3*MAX_BUFFER_SIZE];
+        int n = in.read(b, 0, b.length);
+        assertEquals(n, MAX_BUFFER_SIZE);
+    }
+
+    /**
+     * Test that internal buffers have at most MAX_BUFFER_SIZE bytes remaining.
+     */
+    public void testWriteLimit() throws IOException {
+        OutputStream out = Channels.newOutputStream(new TestChannel());
+        byte[] b = new byte[3*MAX_BUFFER_SIZE];
+        out.write(b, 0, b.length);
+    }
+
     // -- test infrastructure --
 
     private interface ThrowingTask {
@@ -477,4 +501,40 @@ public class SocketChannelStreams {
     private Future<?> schedule(Runnable task, long delay) {
         return executor.schedule(task, delay, TimeUnit.MILLISECONDS);
     }
+
+    /**
+     * ByteChannel that throws if more than 128k bytes remain
+     * in the buffer supplied for reading or writing.
+     */
+    private static class TestChannel implements ByteChannel {
+        @Override
+        public int read(ByteBuffer bb) throws IOException {
+            int rem = bb.remaining();
+            if (rem > MAX_BUFFER_SIZE) {
+                throw new IOException("too big");
+            }
+            bb.position(bb.limit());
+            return rem;
+        }
+
+        @Override
+        public int write(ByteBuffer bb) throws IOException {
+            int rem = bb.remaining();
+            if (rem > MAX_BUFFER_SIZE) {
+                throw new IOException("too big");
+            }
+            bb.position(bb.limit());
+            return rem;
+        }
+
+        @Override
+        public boolean isOpen() {
+            return true;
+        }
+
+        @Override
+        public void close() {
+            throw new UnsupportedOperationException();
+        }
+    }
 }
diff --git a/test/jdk/java/nio/channels/FileChannel/directio/DirectIOTest.java b/test/jdk/java/nio/channels/FileChannel/directio/DirectIOTest.java
index b9dd309d0f7..b6c10a592cc 100644
--- a/test/jdk/java/nio/channels/FileChannel/directio/DirectIOTest.java
+++ b/test/jdk/java/nio/channels/FileChannel/directio/DirectIOTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/nio/channels/FileChannel/directio/libDirectIO.c b/test/jdk/java/nio/channels/FileChannel/directio/libDirectIO.c
index 5eea51da4c7..f02a2b53c8f 100644
--- a/test/jdk/java/nio/channels/FileChannel/directio/libDirectIO.c
+++ b/test/jdk/java/nio/channels/FileChannel/directio/libDirectIO.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java
index 99a127ca5ad..934bf509d88 100644
--- a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java
+++ b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java
@@ -40,7 +40,6 @@
  * @key intermittent
  */
 
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -77,7 +76,7 @@ public class InheritedChannelTest {
         };
     }
 
-    @Test(dataProvider = "testCases", timeOut=30000)
+    @Test(dataProvider = "testCases")
     public void test(String desc, List<String> opts) throws Throwable {
         String pathVar = Platform.sharedLibraryPathVariableName();
         System.out.println(pathVar + "=" + libraryPath);
diff --git a/test/jdk/java/nio/file/Files/NotADirectory.java b/test/jdk/java/nio/file/Files/NotADirectory.java
index bd561ca5c4b..5bae8a6caa2 100644
--- a/test/jdk/java/nio/file/Files/NotADirectory.java
+++ b/test/jdk/java/nio/file/Files/NotADirectory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,10 @@
  */
 
 /* @test
- * @bug 8356678
+ * @bug 8356678 8374441
  * @requires (os.family != "windows")
- * @summary Test Files operations when a path component is not a directory
+ * @summary Test Files and FileSystemProvider operations when a path component
+ *          is not a directory
  * @run junit NotADirectory
  */
 
@@ -32,10 +33,12 @@ import java.io.IOException;
 import java.nio.file.CopyOption;
 import java.nio.file.Files;
 import java.nio.file.FileSystemException;
+import java.nio.file.FileSystems;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.PosixFileAttributes;
+import java.nio.file.spi.FileSystemProvider;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
@@ -51,10 +54,14 @@ import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class NotADirectory {
+    private static final FileSystemProvider PROVIDER =
+        FileSystems.getDefault().provider();
+
     private static final Path ROOT      = Path.of(".");
     private static final Path NOT_EXIST = ROOT.resolve("notExist");
     private static final Path DIR       = ROOT.resolve("dir");
@@ -143,6 +150,18 @@ public class NotADirectory {
                      () -> Files.readAttributes(BOGUS, PosixFileAttributes.class));
     }
 
+    @Test
+    public void readBasicIfExists() throws IOException {
+        assertNull(
+            PROVIDER.readAttributesIfExists(BOGUS, BasicFileAttributes.class));
+    }
+
+    @Test
+    public void readPosixIfExists() throws IOException {
+        assertNull(
+            PROVIDER.readAttributesIfExists(BOGUS, PosixFileAttributes.class));
+    }
+
     @Test
     public void exists() throws IOException {
         assertFalse(Files.exists(BOGUS));
diff --git a/test/jdk/java/nio/file/Path/UriImportExport.java b/test/jdk/java/nio/file/Path/UriImportExport.java
index 2ab93ee399e..6a0dd1acc8e 100644
--- a/test/jdk/java/nio/file/Path/UriImportExport.java
+++ b/test/jdk/java/nio/file/Path/UriImportExport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java b/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java
index 92ab35ce5d0..4586c33521f 100644
--- a/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java
+++ b/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/nio/file/spi/CustomSystemClassLoader.java b/test/jdk/java/nio/file/spi/CustomSystemClassLoader.java
index 8ad9a41c5fd..aa19206bd29 100644
--- a/test/jdk/java/nio/file/spi/CustomSystemClassLoader.java
+++ b/test/jdk/java/nio/file/spi/CustomSystemClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/nio/file/spi/SetDefaultProvider.java b/test/jdk/java/nio/file/spi/SetDefaultProvider.java
index 4d74c8fee93..69da5ff0933 100644
--- a/test/jdk/java/nio/file/spi/SetDefaultProvider.java
+++ b/test/jdk/java/nio/file/spi/SetDefaultProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/security/KeyFactory/KeyFactoryGetKeySpecForInvalidSpec.java b/test/jdk/java/security/KeyFactory/KeyFactoryGetKeySpecForInvalidSpec.java
index a8346089db7..5f53b344820 100644
--- a/test/jdk/java/security/KeyFactory/KeyFactoryGetKeySpecForInvalidSpec.java
+++ b/test/jdk/java/security/KeyFactory/KeyFactoryGetKeySpecForInvalidSpec.java
@@ -1,6 +1,6 @@
 /*
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/time/nontestng/java/time/chrono/HijrahConfigCheck.java b/test/jdk/java/time/nonjunit/java/time/chrono/HijrahConfigCheck.java
similarity index 100%
rename from test/jdk/java/time/nontestng/java/time/chrono/HijrahConfigCheck.java
rename to test/jdk/java/time/nonjunit/java/time/chrono/HijrahConfigCheck.java
diff --git a/test/jdk/java/time/nontestng/java/time/chrono/HijrahConfigTest.java b/test/jdk/java/time/nonjunit/java/time/chrono/HijrahConfigTest.java
similarity index 100%
rename from test/jdk/java/time/nontestng/java/time/chrono/HijrahConfigTest.java
rename to test/jdk/java/time/nonjunit/java/time/chrono/HijrahConfigTest.java
diff --git a/test/jdk/java/time/nontestng/java/time/chrono/hijrah-config-Hijrah-test_islamic-test.properties b/test/jdk/java/time/nonjunit/java/time/chrono/hijrah-config-Hijrah-test_islamic-test.properties
similarity index 100%
rename from test/jdk/java/time/nontestng/java/time/chrono/hijrah-config-Hijrah-test_islamic-test.properties
rename to test/jdk/java/time/nonjunit/java/time/chrono/hijrah-config-Hijrah-test_islamic-test.properties
diff --git a/test/jdk/java/time/nontestng/java/time/zone/CustomZoneNameTest.java b/test/jdk/java/time/nonjunit/java/time/zone/CustomZoneNameTest.java
similarity index 100%
rename from test/jdk/java/time/nontestng/java/time/zone/CustomZoneNameTest.java
rename to test/jdk/java/time/nonjunit/java/time/zone/CustomZoneNameTest.java
diff --git a/test/jdk/java/time/nontestng/java/time/zone/zoneProvider/META-INF/services/java.time.zone.ZoneRulesProvider b/test/jdk/java/time/nonjunit/java/time/zone/zoneProvider/META-INF/services/java.time.zone.ZoneRulesProvider
similarity index 100%
rename from test/jdk/java/time/nontestng/java/time/zone/zoneProvider/META-INF/services/java.time.zone.ZoneRulesProvider
rename to test/jdk/java/time/nonjunit/java/time/zone/zoneProvider/META-INF/services/java.time.zone.ZoneRulesProvider
diff --git a/test/jdk/java/time/nontestng/java/time/zone/zoneProvider/META-INF/services/java.util.spi.TimeZoneNameProvider b/test/jdk/java/time/nonjunit/java/time/zone/zoneProvider/META-INF/services/java.util.spi.TimeZoneNameProvider
similarity index 100%
rename from test/jdk/java/time/nontestng/java/time/zone/zoneProvider/META-INF/services/java.util.spi.TimeZoneNameProvider
rename to test/jdk/java/time/nonjunit/java/time/zone/zoneProvider/META-INF/services/java.util.spi.TimeZoneNameProvider
diff --git a/test/jdk/java/time/nontestng/java/time/zone/zoneProvider/custom/CustomTimeZoneNameProvider.java b/test/jdk/java/time/nonjunit/java/time/zone/zoneProvider/custom/CustomTimeZoneNameProvider.java
similarity index 100%
rename from test/jdk/java/time/nontestng/java/time/zone/zoneProvider/custom/CustomTimeZoneNameProvider.java
rename to test/jdk/java/time/nonjunit/java/time/zone/zoneProvider/custom/CustomTimeZoneNameProvider.java
diff --git a/test/jdk/java/time/nontestng/java/time/zone/zoneProvider/custom/CustomZoneRulesProvider.java b/test/jdk/java/time/nonjunit/java/time/zone/zoneProvider/custom/CustomZoneRulesProvider.java
similarity index 100%
rename from test/jdk/java/time/nontestng/java/time/zone/zoneProvider/custom/CustomZoneRulesProvider.java
rename to test/jdk/java/time/nonjunit/java/time/zone/zoneProvider/custom/CustomZoneRulesProvider.java
diff --git a/test/jdk/java/time/tck/TEST.properties b/test/jdk/java/time/tck/TEST.properties
index 056694122b0..70c91dbfcb5 100644
--- a/test/jdk/java/time/tck/TEST.properties
+++ b/test/jdk/java/time/tck/TEST.properties
@@ -1,5 +1,5 @@
-# java.time tests use TestNG
-TestNG.dirs = ..
+# java.time tests use JUnit
+JUnit.dirs = ..
 othervm.dirs = java/time/chrono
 lib.dirs = /test/lib /test/jdk/tools/lib
 lib.build = jdk.test.lib.RandomFactory
diff --git a/test/jdk/java/time/tck/java/time/AbstractDateTimeTest.java b/test/jdk/java/time/tck/java/time/AbstractDateTimeTest.java
index e7c6db6ef9d..f96ab522517 100644
--- a/test/jdk/java/time/tck/java/time/AbstractDateTimeTest.java
+++ b/test/jdk/java/time/tck/java/time/AbstractDateTimeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,8 @@
  */
 package tck.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.DateTimeException;
 import java.time.temporal.TemporalAccessor;
@@ -68,7 +68,9 @@ import java.time.temporal.TemporalField;
 import java.time.temporal.TemporalQuery;
 import java.util.List;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 import test.java.time.temporal.MockFieldNoValue;
 
 /**
@@ -101,7 +103,7 @@ public abstract class AbstractDateTimeTest extends AbstractTCKTest {
     public void basicTest_isSupported_TemporalField_supported() {
         for (TemporalAccessor sample : samples()) {
             for (TemporalField field : validFields()) {
-                assertEquals(sample.isSupported(field), true, "Failed on " + sample + " " + field);
+                assertEquals(true, sample.isSupported(field), "Failed on " + sample + " " + field);
             }
         }
     }
@@ -110,7 +112,7 @@ public abstract class AbstractDateTimeTest extends AbstractTCKTest {
     public void basicTest_isSupported_TemporalField_unsupported() {
         for (TemporalAccessor sample : samples()) {
             for (TemporalField field : invalidFields()) {
-                assertEquals(sample.isSupported(field), false, "Failed on " + sample + " " + field);
+                assertEquals(false, sample.isSupported(field), "Failed on " + sample + " " + field);
             }
         }
     }
@@ -118,7 +120,7 @@ public abstract class AbstractDateTimeTest extends AbstractTCKTest {
     @Test()
     public void basicTest_isSupported_TemporalField_null() {
         for (TemporalAccessor sample : samples()) {
-            assertEquals(sample.isSupported(null), false, "Failed on " + sample);
+            assertEquals(false, sample.isSupported(null), "Failed on " + sample);
         }
     }
 
@@ -195,11 +197,13 @@ public abstract class AbstractDateTimeTest extends AbstractTCKTest {
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_get_TemporalField_invalidField() {
-        for (TemporalAccessor sample : samples()) {
-            sample.get(MockFieldNoValue.INSTANCE);
-        }
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            for (TemporalAccessor sample : samples()) {
+                sample.get(MockFieldNoValue.INSTANCE);
+            }
+        });
     }
 
     @Test()
@@ -240,11 +244,13 @@ public abstract class AbstractDateTimeTest extends AbstractTCKTest {
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_getLong_TemporalField_invalidField() {
-        for (TemporalAccessor sample : samples()) {
-            sample.getLong(MockFieldNoValue.INSTANCE);
-        }
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            for (TemporalAccessor sample : samples()) {
+                sample.getLong(MockFieldNoValue.INSTANCE);
+            }
+        });
     }
 
     @Test()
@@ -263,12 +269,12 @@ public abstract class AbstractDateTimeTest extends AbstractTCKTest {
     @Test
     public void basicTest_query() {
         for (TemporalAccessor sample : samples()) {
-            assertEquals(sample.query(new TemporalQuery<String>() {
+            assertEquals("foo", sample.query(new TemporalQuery<String>() {
                 @Override
                 public String queryFrom(TemporalAccessor temporal) {
                     return "foo";
                 }
-            }), "foo");
+            }));
         }
     }
 
diff --git a/test/jdk/java/time/tck/java/time/AbstractTCKTest.java b/test/jdk/java/time/tck/java/time/AbstractTCKTest.java
index 0db507e400a..d8d53f931df 100644
--- a/test/jdk/java/time/tck/java/time/AbstractTCKTest.java
+++ b/test/jdk/java/time/tck/java/time/AbstractTCKTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,9 +54,9 @@
  */
 package tck.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -70,6 +70,8 @@ import java.io.Serializable;
 import java.util.Formatter;
 import java.util.Map;
 
+import org.junit.jupiter.api.Assertions;
+
 /**
  * Base test class.
  */
@@ -107,13 +109,13 @@ public abstract class AbstractTCKTest {
     }
 
     protected static void assertSerializable(Object object) throws IOException, ClassNotFoundException {
-        assertEquals(object instanceof Serializable, true);
+        assertEquals(true, object instanceof Serializable);
         Object deserializedObject = writeThenRead(object);
-        assertEquals(deserializedObject, object);
+        assertEquals(object, deserializedObject);
     }
 
     protected static void assertSerializableSame(Object object) throws IOException, ClassNotFoundException {
-        assertEquals(object instanceof Serializable, true);
+        assertEquals(true, object instanceof Serializable);
         Object deserializedObject = writeThenRead(object);
         assertSame(deserializedObject, object);
     }
@@ -139,26 +141,26 @@ public abstract class AbstractTCKTest {
         byte[] bytes = baos.toByteArray();
         ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
         try (DataInputStream dis = new DataInputStream(bais)) {
-            assertEquals(dis.readShort(), ObjectStreamConstants.STREAM_MAGIC);
-            assertEquals(dis.readShort(), ObjectStreamConstants.STREAM_VERSION);
-            assertEquals(dis.readByte(), ObjectStreamConstants.TC_OBJECT);
-            assertEquals(dis.readByte(), ObjectStreamConstants.TC_CLASSDESC);
-            assertEquals(dis.readUTF(), serClass);
-            assertEquals(dis.readLong(), serVer);
-            assertEquals(dis.readByte(), ObjectStreamConstants.SC_EXTERNALIZABLE | ObjectStreamConstants.SC_BLOCK_DATA);
-            assertEquals(dis.readShort(), 0);  // number of fields
-            assertEquals(dis.readByte(), ObjectStreamConstants.TC_ENDBLOCKDATA);  // end of classdesc
-            assertEquals(dis.readByte(), ObjectStreamConstants.TC_NULL);  // no superclasses
+            assertEquals(ObjectStreamConstants.STREAM_MAGIC, dis.readShort());
+            assertEquals(ObjectStreamConstants.STREAM_VERSION, dis.readShort());
+            assertEquals(ObjectStreamConstants.TC_OBJECT, dis.readByte());
+            assertEquals(ObjectStreamConstants.TC_CLASSDESC, dis.readByte());
+            assertEquals(serClass, dis.readUTF());
+            assertEquals(serVer, dis.readLong());
+            assertEquals(ObjectStreamConstants.SC_EXTERNALIZABLE | ObjectStreamConstants.SC_BLOCK_DATA, dis.readByte());
+            assertEquals(0, dis.readShort());  // number of fields
+            assertEquals(ObjectStreamConstants.TC_ENDBLOCKDATA, dis.readByte());  // end of classdesc
+            assertEquals(ObjectStreamConstants.TC_NULL, dis.readByte());  // no superclasses
             if (expectedBytes.length < 256) {
-                assertEquals(dis.readByte(), ObjectStreamConstants.TC_BLOCKDATA);
-                assertEquals(dis.readUnsignedByte(), expectedBytes.length, "blockdata length incorrect");
+                assertEquals(ObjectStreamConstants.TC_BLOCKDATA, dis.readByte());
+                assertEquals(expectedBytes.length, dis.readUnsignedByte(), "blockdata length incorrect");
             } else {
-                assertEquals(dis.readByte(), ObjectStreamConstants.TC_BLOCKDATALONG);
-                assertEquals(dis.readInt(), expectedBytes.length, "blockdatalong length incorrect");
+                assertEquals(ObjectStreamConstants.TC_BLOCKDATALONG, dis.readByte());
+                assertEquals(expectedBytes.length, dis.readInt(), "blockdatalong length incorrect");
             }
             byte[] input = new byte[expectedBytes.length];
             dis.readFully(input);
-            assertEquals(input, expectedBytes);
+            Assertions.assertArrayEquals(expectedBytes, input);
             if (matches.length > 0) {
                 for (byte[] match : matches) {
                     boolean matched = false;
@@ -167,7 +169,7 @@ public abstract class AbstractTCKTest {
                             dis.mark(1000);
                             byte[] possible = new byte[match.length];
                             dis.readFully(possible);
-                            assertEquals(possible, match);
+                            Assertions.assertArrayEquals(match, possible);
                             matched = true;
                         } catch (AssertionError ex) {
                             dis.reset();
@@ -176,8 +178,8 @@ public abstract class AbstractTCKTest {
                     }
                 }
             } else {
-                assertEquals(dis.readByte(), ObjectStreamConstants.TC_ENDBLOCKDATA);  // end of blockdata
-                assertEquals(dis.read(), -1);
+                assertEquals(ObjectStreamConstants.TC_ENDBLOCKDATA, dis.readByte());  // end of blockdata
+                assertEquals(-1, dis.read());
             }
         }
     }
diff --git a/test/jdk/java/time/tck/java/time/TCKClock.java b/test/jdk/java/time/tck/java/time/TCKClock.java
index 843992e0d79..9e98756109b 100644
--- a/test/jdk/java/time/tck/java/time/TCKClock.java
+++ b/test/jdk/java/time/tck/java/time/TCKClock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,18 +59,17 @@
  */
 package tck.java.time;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.Clock;
 import java.time.Instant;
 import java.time.ZoneId;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Clock.
  */
-@Test
 public class TCKClock {
 
     static class MockInstantClock extends Clock {
@@ -117,18 +116,18 @@ public class TCKClock {
     //-----------------------------------------------------------------------
     @Test
     public void test_mockInstantClock_get() {
-        assertEquals(MOCK_INSTANT.instant(), INSTANT);
-        assertEquals(MOCK_INSTANT.millis(), INSTANT.toEpochMilli());
-        assertEquals(MOCK_INSTANT.getZone(), ZONE);
+        assertEquals(INSTANT, MOCK_INSTANT.instant());
+        assertEquals(INSTANT.toEpochMilli(), MOCK_INSTANT.millis());
+        assertEquals(ZONE, MOCK_INSTANT.getZone());
     }
 
     @Test
     public void test_mockInstantClock_withZone() {
         ZoneId london = ZoneId.of("Europe/London");
         Clock changed = MOCK_INSTANT.withZone(london);
-        assertEquals(MOCK_INSTANT.instant(), INSTANT);
-        assertEquals(MOCK_INSTANT.millis(), INSTANT.toEpochMilli());
-        assertEquals(changed.getZone(), london);
+        assertEquals(INSTANT, MOCK_INSTANT.instant());
+        assertEquals(INSTANT.toEpochMilli(), MOCK_INSTANT.millis());
+        assertEquals(london, changed.getZone());
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/TCKClock_Fixed.java b/test/jdk/java/time/tck/java/time/TCKClock_Fixed.java
index 3dc567d0ec1..0c95af5ea08 100644
--- a/test/jdk/java/time/tck/java/time/TCKClock_Fixed.java
+++ b/test/jdk/java/time/tck/java/time/TCKClock_Fixed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@
  */
 package tck.java.time;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.time.Clock;
@@ -68,12 +68,12 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test fixed clock.
  */
-@Test
 public class TCKClock_Fixed extends AbstractTCKTest {
 
     private static final ZoneId MOSCOW = ZoneId.of("Europe/Moscow");
@@ -81,72 +81,77 @@ public class TCKClock_Fixed extends AbstractTCKTest {
     private static final Instant INSTANT = LocalDateTime.of(2008, 6, 30, 11, 30, 10, 500).atZone(ZoneOffset.ofHours(2)).toInstant();
 
     //-------------------------------------------------------------------------
+    @Test
     public void test_fixed_InstantZoneId() {
         Clock test = Clock.fixed(INSTANT, PARIS);
-        assertEquals(test.instant(), INSTANT);
-        assertEquals(test.getZone(), PARIS);
-   assertEquals(test.instant().getEpochSecond()*1000, test.millis());
+        assertEquals(INSTANT, test.instant());
+        assertEquals(PARIS, test.getZone());
+        assertEquals(test.millis(), test.instant().getEpochSecond()*1000);
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_fixed_InstantZoneId_nullInstant() {
-        Clock.fixed(null, PARIS);
+        Assertions.assertThrows(NullPointerException.class, () -> Clock.fixed(null, PARIS));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_fixed_InstantZoneId_nullZoneId() {
-        Clock.fixed(INSTANT, null);
+        Assertions.assertThrows(NullPointerException.class, () -> Clock.fixed(INSTANT, null));
     }
 
     //-------------------------------------------------------------------------
+    @Test
     public void test_withZone() {
         Clock test = Clock.fixed(INSTANT, PARIS);
         Clock changed = test.withZone(MOSCOW);
-        assertEquals(test.getZone(), PARIS);
-        assertEquals(changed.getZone(), MOSCOW);
+        assertEquals(PARIS, test.getZone());
+        assertEquals(MOSCOW, changed.getZone());
     }
 
+    @Test
     public void test_withZone_equal() {
         Clock test = Clock.fixed(INSTANT, PARIS);
         Clock changed = test.withZone(PARIS);
-        assertEquals(changed.getZone(), PARIS);
+        assertEquals(PARIS, changed.getZone());
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_withZone_null() {
-        Clock.fixed(INSTANT, PARIS).withZone(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Clock.fixed(INSTANT, PARIS).withZone(null));
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_equals() {
         Clock a = Clock.fixed(INSTANT, ZoneOffset.UTC);
         Clock b = Clock.fixed(INSTANT, ZoneOffset.UTC);
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), true);
-        assertEquals(b.equals(a), true);
-        assertEquals(b.equals(b), true);
+        assertEquals(true, a.equals(a));
+        assertEquals(true, a.equals(b));
+        assertEquals(true, b.equals(a));
+        assertEquals(true, b.equals(b));
 
         Clock c = Clock.fixed(INSTANT, PARIS);
-        assertEquals(a.equals(c), false);
+        assertEquals(false, a.equals(c));
 
         Clock d = Clock.fixed(INSTANT.minusNanos(1), ZoneOffset.UTC);
-        assertEquals(a.equals(d), false);
+        assertEquals(false, a.equals(d));
 
-        assertEquals(a.equals(null), false);
-        assertEquals(a.equals("other type"), false);
-        assertEquals(a.equals(Clock.systemUTC()), false);
+        assertEquals(false, a.equals(null));
+        assertEquals(false, a.equals("other type"));
+        assertEquals(false, a.equals(Clock.systemUTC()));
     }
 
+    @Test
     public void test_hashCode() {
         Clock a = Clock.fixed(INSTANT, ZoneOffset.UTC);
         Clock b = Clock.fixed(INSTANT, ZoneOffset.UTC);
         assertEquals(a.hashCode(), a.hashCode());
-        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(b.hashCode(), a.hashCode());
 
         Clock c = Clock.fixed(INSTANT, PARIS);
-        assertEquals(a.hashCode() == c.hashCode(), false);
+        assertEquals(false, a.hashCode() == c.hashCode());
 
         Clock d = Clock.fixed(INSTANT.minusNanos(1), ZoneOffset.UTC);
-        assertEquals(a.hashCode() == d.hashCode(), false);
+        assertEquals(false, a.hashCode() == d.hashCode());
     }
 }
diff --git a/test/jdk/java/time/tck/java/time/TCKClock_Offset.java b/test/jdk/java/time/tck/java/time/TCKClock_Offset.java
index 644c1a63880..5adb61da589 100644
--- a/test/jdk/java/time/tck/java/time/TCKClock_Offset.java
+++ b/test/jdk/java/time/tck/java/time/TCKClock_Offset.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,8 @@
  */
 package tck.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -69,12 +69,12 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test offset clock.
  */
-@Test
 public class TCKClock_Offset extends AbstractTCKTest {
 
     private static final ZoneId MOSCOW = ZoneId.of("Europe/Moscow");
@@ -83,80 +83,86 @@ public class TCKClock_Offset extends AbstractTCKTest {
     private static final Duration OFFSET = Duration.ofSeconds(2);
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_offset_ClockDuration() {
         Clock test = Clock.offset(Clock.fixed(INSTANT, PARIS), OFFSET);
         //System.out.println(test.instant());
         //System.out.println(INSTANT.plus(OFFSET));
-        assertEquals(test.instant(), INSTANT.plus(OFFSET));
-        assertEquals(test.getZone(), PARIS);
+        assertEquals(INSTANT.plus(OFFSET), test.instant());
+        assertEquals(PARIS, test.getZone());
     }
 
+    @Test
     public void test_offset_ClockDuration_zeroDuration() {
         Clock underlying = Clock.system(PARIS);
         Clock test = Clock.offset(underlying, Duration.ZERO);
         assertSame(test, underlying);  // spec says same
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_offset_ClockDuration_nullClock() {
-        Clock.offset(null, Duration.ZERO);
+        Assertions.assertThrows(NullPointerException.class, () -> Clock.offset(null, Duration.ZERO));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_offset_ClockDuration_nullDuration() {
-        Clock.offset(Clock.systemUTC(), null);
+        Assertions.assertThrows(NullPointerException.class, () -> Clock.offset(Clock.systemUTC(), null));
     }
 
     //-------------------------------------------------------------------------
+    @Test
     public void test_withZone() {
         Clock test = Clock.offset(Clock.system(PARIS), OFFSET);
         Clock changed = test.withZone(MOSCOW);
-        assertEquals(test.getZone(), PARIS);
-        assertEquals(changed.getZone(), MOSCOW);
+        assertEquals(PARIS, test.getZone());
+        assertEquals(MOSCOW, changed.getZone());
     }
 
+    @Test
     public void test_withZone_equal() {
         Clock test = Clock.offset(Clock.system(PARIS), OFFSET);
         Clock changed = test.withZone(PARIS);
-        assertEquals(test, changed);
+        assertEquals(changed, test);
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_withZone_null() {
-        Clock.offset(Clock.system(PARIS), OFFSET).withZone(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Clock.offset(Clock.system(PARIS), OFFSET).withZone(null));
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_equals() {
         Clock a = Clock.offset(Clock.system(PARIS), OFFSET);
         Clock b = Clock.offset(Clock.system(PARIS), OFFSET);
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), true);
-        assertEquals(b.equals(a), true);
-        assertEquals(b.equals(b), true);
+        assertEquals(true, a.equals(a));
+        assertEquals(true, a.equals(b));
+        assertEquals(true, b.equals(a));
+        assertEquals(true, b.equals(b));
 
         Clock c = Clock.offset(Clock.system(MOSCOW), OFFSET);
-        assertEquals(a.equals(c), false);
+        assertEquals(false, a.equals(c));
 
         Clock d = Clock.offset(Clock.system(PARIS), OFFSET.minusNanos(1));
-        assertEquals(a.equals(d), false);
+        assertEquals(false, a.equals(d));
 
-        assertEquals(a.equals(null), false);
-        assertEquals(a.equals("other type"), false);
-        assertEquals(a.equals(Clock.systemUTC()), false);
+        assertEquals(false, a.equals(null));
+        assertEquals(false, a.equals("other type"));
+        assertEquals(false, a.equals(Clock.systemUTC()));
     }
 
+    @Test
     public void test_hashCode() {
         Clock a = Clock.offset(Clock.system(PARIS), OFFSET);
         Clock b = Clock.offset(Clock.system(PARIS), OFFSET);
         assertEquals(a.hashCode(), a.hashCode());
-        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(b.hashCode(), a.hashCode());
 
         Clock c = Clock.offset(Clock.system(MOSCOW), OFFSET);
-        assertEquals(a.hashCode() == c.hashCode(), false);
+        assertEquals(false, a.hashCode() == c.hashCode());
 
         Clock d = Clock.offset(Clock.system(PARIS), OFFSET.minusNanos(1));
-        assertEquals(a.hashCode() == d.hashCode(), false);
+        assertEquals(false, a.hashCode() == d.hashCode());
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/TCKClock_System.java b/test/jdk/java/time/tck/java/time/TCKClock_System.java
index 94f3b57a4aa..5e5fd2a579d 100644
--- a/test/jdk/java/time/tck/java/time/TCKClock_System.java
+++ b/test/jdk/java/time/tck/java/time/TCKClock_System.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,29 +59,30 @@
  */
 package tck.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.Clock;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test system clock.
  */
-@Test
 public class TCKClock_System extends AbstractTCKTest {
 
     private static final ZoneId MOSCOW = ZoneId.of("Europe/Moscow");
     private static final ZoneId PARIS = ZoneId.of("Europe/Paris");
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_instant() {
         Clock system = Clock.systemUTC();
-        assertEquals(system.getZone(), ZoneOffset.UTC);
+        assertEquals(ZoneOffset.UTC, system.getZone());
         for (int i = 0; i < 10000; i++) {
             // assume can eventually get these within 10 milliseconds
             Instant instant = system.instant();
@@ -93,9 +94,10 @@ public class TCKClock_System extends AbstractTCKTest {
         fail();
     }
 
+    @Test
     public void test_millis() {
         Clock system = Clock.systemUTC();
-        assertEquals(system.getZone(), ZoneOffset.UTC);
+        assertEquals(ZoneOffset.UTC, system.getZone());
         for (int i = 0; i < 10000; i++) {
             // assume can eventually get these within 10 milliseconds
             long instant = system.millis();
@@ -108,85 +110,93 @@ public class TCKClock_System extends AbstractTCKTest {
     }
 
     //-------------------------------------------------------------------------
+    @Test
     public void test_systemUTC() {
         Clock test = Clock.systemUTC();
-        assertEquals(test.getZone(), ZoneOffset.UTC);
-        assertEquals(test, Clock.system(ZoneOffset.UTC));
+        assertEquals(ZoneOffset.UTC, test.getZone());
+        assertEquals(Clock.system(ZoneOffset.UTC), test);
     }
 
+    @Test
     public void test_systemDefaultZone() {
         Clock test = Clock.systemDefaultZone();
-        assertEquals(test.getZone(), ZoneId.systemDefault());
-        assertEquals(test, Clock.system(ZoneId.systemDefault()));
+        assertEquals(ZoneId.systemDefault(), test.getZone());
+        assertEquals(Clock.system(ZoneId.systemDefault()), test);
     }
 
+    @Test
     public void test_system_ZoneId() {
         Clock test = Clock.system(PARIS);
-        assertEquals(test.getZone(), PARIS);
+        assertEquals(PARIS, test.getZone());
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_zoneId_nullZoneId() {
-        Clock.system(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Clock.system(null));
     }
 
     //-------------------------------------------------------------------------
+    @Test
     public void test_withZone() {
         Clock test = Clock.system(PARIS);
         Clock changed = test.withZone(MOSCOW);
-        assertEquals(test.getZone(), PARIS);
-        assertEquals(changed.getZone(), MOSCOW);
+        assertEquals(PARIS, test.getZone());
+        assertEquals(MOSCOW, changed.getZone());
     }
 
+    @Test
     public void test_withZone_equal() {
         Clock test = Clock.system(PARIS);
         Clock changed = test.withZone(PARIS);
-        assertEquals(changed.getZone(), PARIS);
+        assertEquals(PARIS, changed.getZone());
     }
 
+    @Test
     public void test_withZone_fromUTC() {
         Clock test = Clock.systemUTC();
         Clock changed = test.withZone(PARIS);
-        assertEquals(changed.getZone(), PARIS);
+        assertEquals(PARIS, changed.getZone());
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_withZone_null() {
-        Clock.systemUTC().withZone(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Clock.systemUTC().withZone(null));
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_equals() {
         Clock a = Clock.systemUTC();
         Clock b = Clock.systemUTC();
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), true);
-        assertEquals(b.equals(a), true);
-        assertEquals(b.equals(b), true);
+        assertEquals(true, a.equals(a));
+        assertEquals(true, a.equals(b));
+        assertEquals(true, b.equals(a));
+        assertEquals(true, b.equals(b));
 
         Clock c = Clock.system(PARIS);
         Clock d = Clock.system(PARIS);
-        assertEquals(c.equals(c), true);
-        assertEquals(c.equals(d), true);
-        assertEquals(d.equals(c), true);
-        assertEquals(d.equals(d), true);
+        assertEquals(true, c.equals(c));
+        assertEquals(true, c.equals(d));
+        assertEquals(true, d.equals(c));
+        assertEquals(true, d.equals(d));
 
-        assertEquals(a.equals(c), false);
-        assertEquals(c.equals(a), false);
+        assertEquals(false, a.equals(c));
+        assertEquals(false, c.equals(a));
 
-        assertEquals(a.equals(null), false);
-        assertEquals(a.equals("other type"), false);
-        assertEquals(a.equals(Clock.fixed(Instant.now(), ZoneOffset.UTC)), false);
+        assertEquals(false, a.equals(null));
+        assertEquals(false, a.equals("other type"));
+        assertEquals(false, a.equals(Clock.fixed(Instant.now(), ZoneOffset.UTC)));
     }
 
+    @Test
     public void test_hashCode() {
         Clock a = Clock.system(ZoneOffset.UTC);
         Clock b = Clock.system(ZoneOffset.UTC);
         assertEquals(a.hashCode(), a.hashCode());
-        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(b.hashCode(), a.hashCode());
 
         Clock c = Clock.system(PARIS);
-        assertEquals(a.hashCode() == c.hashCode(), false);
+        assertEquals(false, a.hashCode() == c.hashCode());
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/TCKClock_Tick.java b/test/jdk/java/time/tck/java/time/TCKClock_Tick.java
index 08b0a524828..d589daede5f 100644
--- a/test/jdk/java/time/tck/java/time/TCKClock_Tick.java
+++ b/test/jdk/java/time/tck/java/time/TCKClock_Tick.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,8 @@
  */
 package tck.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -70,12 +70,12 @@ import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test tick clock.
  */
-@Test
 public class TCKClock_Tick extends AbstractTCKTest {
 
     private static final ZoneId MOSCOW = ZoneId.of("Europe/Moscow");
@@ -83,170 +83,182 @@ public class TCKClock_Tick extends AbstractTCKTest {
     private static final ZonedDateTime ZDT = LocalDateTime.of(2008, 6, 30, 11, 30, 10, 500).atZone(ZoneOffset.ofHours(2));
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_tick_ClockDuration_250millis() {
         for (int i = 0; i < 1000; i++) {
             Clock test = Clock.tick(Clock.fixed(ZDT.withNano(i * 1000_000).toInstant(), PARIS), Duration.ofMillis(250));
-            assertEquals(test.instant(), ZDT.withNano((i / 250) * 250_000_000).toInstant());
-            assertEquals(test.getZone(), PARIS);
+            assertEquals(ZDT.withNano((i / 250) * 250_000_000).toInstant(), test.instant());
+            assertEquals(PARIS, test.getZone());
         }
     }
 
+    @Test
     public void test_tick_ClockDuration_250micros() {
         for (int i = 0; i < 1000; i++) {
             Clock test = Clock.tick(Clock.fixed(ZDT.withNano(i * 1000).toInstant(), PARIS), Duration.ofNanos(250_000));
-            assertEquals(test.instant(), ZDT.withNano((i / 250) * 250_000).toInstant());
-            assertEquals(test.getZone(), PARIS);
+            assertEquals(ZDT.withNano((i / 250) * 250_000).toInstant(), test.instant());
+            assertEquals(PARIS, test.getZone());
         }
     }
 
+    @Test
     public void test_tick_ClockDuration_20nanos() {
         for (int i = 0; i < 1000; i++) {
             Clock test = Clock.tick(Clock.fixed(ZDT.withNano(i).toInstant(), PARIS), Duration.ofNanos(20));
-            assertEquals(test.instant(), ZDT.withNano((i / 20) * 20).toInstant());
-            assertEquals(test.getZone(), PARIS);
+            assertEquals(ZDT.withNano((i / 20) * 20).toInstant(), test.instant());
+            assertEquals(PARIS, test.getZone());
         }
     }
 
+    @Test
     public void test_tick_ClockDuration_zeroDuration() {
         Clock underlying = Clock.system(PARIS);
         Clock test = Clock.tick(underlying, Duration.ZERO);
         assertSame(test, underlying);  // spec says same
     }
 
+    @Test
     public void test_tick_ClockDuration_1nsDuration() {
         Clock underlying = Clock.system(PARIS);
         Clock test = Clock.tick(underlying, Duration.ofNanos(1));
         assertSame(test, underlying);  // spec says same
     }
 
-    @Test(expectedExceptions = ArithmeticException.class)
+    @Test
     public void test_tick_ClockDuration_maxDuration() {
-        Clock.tick(Clock.systemUTC(), Duration.ofSeconds(Long.MAX_VALUE));
+        Assertions.assertThrows(ArithmeticException.class, () -> Clock.tick(Clock.systemUTC(), Duration.ofSeconds(Long.MAX_VALUE)));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test_tick_ClockDuration_subMilliNotDivisible_123ns() {
-        Clock.tick(Clock.systemUTC(), Duration.ofSeconds(0, 123));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> Clock.tick(Clock.systemUTC(), Duration.ofSeconds(0, 123)));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test_tick_ClockDuration_subMilliNotDivisible_999ns() {
-        Clock.tick(Clock.systemUTC(), Duration.ofSeconds(0, 999));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> Clock.tick(Clock.systemUTC(), Duration.ofSeconds(0, 999)));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test_tick_ClockDuration_subMilliNotDivisible_999_999_999ns() {
-        Clock.tick(Clock.systemUTC(), Duration.ofSeconds(0, 999_999_999));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> Clock.tick(Clock.systemUTC(), Duration.ofSeconds(0, 999_999_999)));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test_tick_ClockDuration_negative1ns() {
-        Clock.tick(Clock.systemUTC(), Duration.ofSeconds(0, -1));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> Clock.tick(Clock.systemUTC(), Duration.ofSeconds(0, -1)));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test_tick_ClockDuration_negative1s() {
-        Clock.tick(Clock.systemUTC(), Duration.ofSeconds(-1));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> Clock.tick(Clock.systemUTC(), Duration.ofSeconds(-1)));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_tick_ClockDuration_nullClock() {
-        Clock.tick(null, Duration.ZERO);
+        Assertions.assertThrows(NullPointerException.class, () -> Clock.tick(null, Duration.ZERO));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_tick_ClockDuration_nullDuration() {
-        Clock.tick(Clock.systemUTC(), null);
+        Assertions.assertThrows(NullPointerException.class, () -> Clock.tick(Clock.systemUTC(), null));
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_tickMillis_ZoneId() throws Exception {
         Clock test = Clock.tickMillis(PARIS);
-        assertEquals(test.getZone(), PARIS);
-        assertEquals(test.instant().getNano() % 1000_000, 0);
+        assertEquals(PARIS, test.getZone());
+        assertEquals(0, test.instant().getNano() % 1000_000);
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_tickMillis_ZoneId_nullZoneId() {
-        Clock.tickMillis(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Clock.tickMillis(null));
     }
     //-----------------------------------------------------------------------
+    @Test
     public void test_tickSeconds_ZoneId() throws Exception {
         Clock test = Clock.tickSeconds(PARIS);
-        assertEquals(test.getZone(), PARIS);
-        assertEquals(test.instant().getNano(), 0);
+        assertEquals(PARIS, test.getZone());
+        assertEquals(0, test.instant().getNano());
         Thread.sleep(100);
-        assertEquals(test.instant().getNano(), 0);
+        assertEquals(0, test.instant().getNano());
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_tickSeconds_ZoneId_nullZoneId() {
-        Clock.tickSeconds(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Clock.tickSeconds(null));
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_tickMinutes_ZoneId() {
         Clock test = Clock.tickMinutes(PARIS);
-        assertEquals(test.getZone(), PARIS);
+        assertEquals(PARIS, test.getZone());
         Instant instant = test.instant();
-        assertEquals(instant.getEpochSecond() % 60, 0);
-        assertEquals(instant.getNano(), 0);
+        assertEquals(0, instant.getEpochSecond() % 60);
+        assertEquals(0, instant.getNano());
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_tickMinutes_ZoneId_nullZoneId() {
-        Clock.tickMinutes(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Clock.tickMinutes(null));
     }
 
     //-------------------------------------------------------------------------
+    @Test
     public void test_withZone() {
         Clock test = Clock.tick(Clock.system(PARIS), Duration.ofMillis(500));
         Clock changed = test.withZone(MOSCOW);
-        assertEquals(test.getZone(), PARIS);
-        assertEquals(changed.getZone(), MOSCOW);
+        assertEquals(PARIS, test.getZone());
+        assertEquals(MOSCOW, changed.getZone());
     }
 
+    @Test
     public void test_withZone_equal() {
         Clock test = Clock.tick(Clock.system(PARIS), Duration.ofMillis(500));
         Clock changed = test.withZone(PARIS);
-        assertEquals(test, changed);
+        assertEquals(changed, test);
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_withZone_null() {
-        Clock.tick(Clock.system(PARIS), Duration.ofMillis(500)).withZone(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Clock.tick(Clock.system(PARIS), Duration.ofMillis(500)).withZone(null));
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test__equals() {
         Clock a = Clock.tick(Clock.system(PARIS), Duration.ofMillis(500));
         Clock b = Clock.tick(Clock.system(PARIS), Duration.ofMillis(500));
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), true);
-        assertEquals(b.equals(a), true);
-        assertEquals(b.equals(b), true);
+        assertEquals(true, a.equals(a));
+        assertEquals(true, a.equals(b));
+        assertEquals(true, b.equals(a));
+        assertEquals(true, b.equals(b));
 
         Clock c = Clock.tick(Clock.system(MOSCOW), Duration.ofMillis(500));
-        assertEquals(a.equals(c), false);
+        assertEquals(false, a.equals(c));
 
         Clock d = Clock.tick(Clock.system(PARIS), Duration.ofMillis(499));
-        assertEquals(a.equals(d), false);
+        assertEquals(false, a.equals(d));
 
-        assertEquals(a.equals(null), false);
-        assertEquals(a.equals("other type"), false);
-        assertEquals(a.equals(Clock.systemUTC()), false);
+        assertEquals(false, a.equals(null));
+        assertEquals(false, a.equals("other type"));
+        assertEquals(false, a.equals(Clock.systemUTC()));
     }
 
+    @Test
     public void test_hashCode() {
         Clock a = Clock.tick(Clock.system(PARIS), Duration.ofMillis(500));
         Clock b = Clock.tick(Clock.system(PARIS), Duration.ofMillis(500));
         assertEquals(a.hashCode(), a.hashCode());
-        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(b.hashCode(), a.hashCode());
 
         Clock c = Clock.tick(Clock.system(MOSCOW), Duration.ofMillis(500));
-        assertEquals(a.hashCode() == c.hashCode(), false);
+        assertEquals(false, a.hashCode() == c.hashCode());
 
         Clock d = Clock.tick(Clock.system(PARIS), Duration.ofMillis(499));
-        assertEquals(a.hashCode() == d.hashCode(), false);
+        assertEquals(false, a.hashCode() == d.hashCode());
     }
 }
diff --git a/test/jdk/java/time/tck/java/time/TCKDayOfWeek.java b/test/jdk/java/time/tck/java/time/TCKDayOfWeek.java
index e3f0e719ccb..efb6fc7e9ae 100644
--- a/test/jdk/java/time/tck/java/time/TCKDayOfWeek.java
+++ b/test/jdk/java/time/tck/java/time/TCKDayOfWeek.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,8 +63,9 @@ import static java.time.DayOfWeek.MONDAY;
 import static java.time.DayOfWeek.SUNDAY;
 import static java.time.DayOfWeek.WEDNESDAY;
 import static java.time.temporal.ChronoField.DAY_OF_WEEK;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.time.DateTimeException;
 import java.time.DayOfWeek;
@@ -84,17 +85,20 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test DayOfWeek.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKDayOfWeek extends AbstractDateTimeTest {
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
     }
 
@@ -128,35 +132,35 @@ public class TCKDayOfWeek extends AbstractDateTimeTest {
     public void test_factory_int_singleton() {
         for (int i = 1; i <= 7; i++) {
             DayOfWeek test = DayOfWeek.of(i);
-            assertEquals(test.getValue(), i);
+            assertEquals(i, test.getValue());
             assertSame(DayOfWeek.of(i), test);
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_valueTooLow() {
-        DayOfWeek.of(0);
+        Assertions.assertThrows(DateTimeException.class, () -> DayOfWeek.of(0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_valueTooHigh() {
-        DayOfWeek.of(8);
+        Assertions.assertThrows(DateTimeException.class, () -> DayOfWeek.of(8));
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_factory_CalendricalObject() {
-        assertEquals(DayOfWeek.from(LocalDate.of(2011, 6, 6)), DayOfWeek.MONDAY);
+        assertEquals(DayOfWeek.MONDAY, DayOfWeek.from(LocalDate.of(2011, 6, 6)));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_CalendricalObject_invalid_noDerive() {
-        DayOfWeek.from(LocalTime.of(12, 30));
+        Assertions.assertThrows(DateTimeException.class, () -> DayOfWeek.from(LocalTime.of(12, 30)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_factory_CalendricalObject_null() {
-        DayOfWeek.from((TemporalAccessor) null);
+        Assertions.assertThrows(NullPointerException.class, () -> DayOfWeek.from((TemporalAccessor) null));
     }
 
     //-----------------------------------------------------------------------
@@ -164,37 +168,37 @@ public class TCKDayOfWeek extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalField() {
-        assertEquals(DayOfWeek.THURSDAY.isSupported((TemporalField) null), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.NANO_OF_SECOND), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.NANO_OF_DAY), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.MICRO_OF_SECOND), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.MICRO_OF_DAY), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.MILLI_OF_SECOND), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.MILLI_OF_DAY), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.SECOND_OF_MINUTE), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.SECOND_OF_DAY), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.MINUTE_OF_HOUR), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.MINUTE_OF_DAY), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.HOUR_OF_AMPM), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.HOUR_OF_DAY), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.AMPM_OF_DAY), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.DAY_OF_WEEK), true);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.DAY_OF_MONTH), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.DAY_OF_YEAR), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.EPOCH_DAY), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.MONTH_OF_YEAR), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.PROLEPTIC_MONTH), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.YEAR), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.YEAR_OF_ERA), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.ERA), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.INSTANT_SECONDS), false);
-        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.OFFSET_SECONDS), false);
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported((TemporalField) null));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.NANO_OF_SECOND));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.NANO_OF_DAY));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.MICRO_OF_SECOND));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.MICRO_OF_DAY));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.MILLI_OF_SECOND));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.MILLI_OF_DAY));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.SECOND_OF_DAY));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.MINUTE_OF_DAY));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.HOUR_OF_AMPM));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.HOUR_OF_DAY));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.CLOCK_HOUR_OF_DAY));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.AMPM_OF_DAY));
+        assertEquals(true, DayOfWeek.THURSDAY.isSupported(ChronoField.DAY_OF_WEEK));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.DAY_OF_MONTH));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.DAY_OF_YEAR));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.EPOCH_DAY));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.MONTH_OF_YEAR));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.PROLEPTIC_MONTH));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.YEAR));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.YEAR_OF_ERA));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.ERA));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.INSTANT_SECONDS));
+        assertEquals(false, DayOfWeek.THURSDAY.isSupported(ChronoField.OFFSET_SECONDS));
     }
 
     //-----------------------------------------------------------------------
@@ -202,18 +206,17 @@ public class TCKDayOfWeek extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_get_TemporalField() {
-        assertEquals(DayOfWeek.WEDNESDAY.getLong(ChronoField.DAY_OF_WEEK), 3);
+        assertEquals(3, DayOfWeek.WEDNESDAY.getLong(ChronoField.DAY_OF_WEEK));
     }
 
     @Test
     public void test_getLong_TemporalField() {
-        assertEquals(DayOfWeek.WEDNESDAY.getLong(ChronoField.DAY_OF_WEEK), 3);
+        assertEquals(3, DayOfWeek.WEDNESDAY.getLong(ChronoField.DAY_OF_WEEK));
     }
 
     //-----------------------------------------------------------------------
     // query(TemporalQuery)
     //-----------------------------------------------------------------------
-    @DataProvider(name="query")
     Object[][] data_query() {
         return new Object[][] {
                 {DayOfWeek.FRIDAY, TemporalQueries.chronology(), null},
@@ -226,19 +229,21 @@ public class TCKDayOfWeek extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_query(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(temporal.query(query), expected);
+        assertEquals(expected, temporal.query(query));
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_queryFrom(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(query.queryFrom(temporal), expected);
+        assertEquals(expected, query.queryFrom(temporal));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_query_null() {
-        DayOfWeek.FRIDAY.query(null);
+        Assertions.assertThrows(NullPointerException.class, () -> DayOfWeek.FRIDAY.query(null));
     }
 
     //-----------------------------------------------------------------------
@@ -246,23 +251,22 @@ public class TCKDayOfWeek extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_getText() {
-        assertEquals(DayOfWeek.MONDAY.getDisplayName(TextStyle.SHORT, Locale.US), "Mon");
+        assertEquals("Mon", DayOfWeek.MONDAY.getDisplayName(TextStyle.SHORT, Locale.US));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_getText_nullStyle() {
-        DayOfWeek.MONDAY.getDisplayName(null, Locale.US);
+        Assertions.assertThrows(NullPointerException.class, () -> DayOfWeek.MONDAY.getDisplayName(null, Locale.US));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_getText_nullLocale() {
-        DayOfWeek.MONDAY.getDisplayName(TextStyle.FULL, null);
+        Assertions.assertThrows(NullPointerException.class, () -> DayOfWeek.MONDAY.getDisplayName(TextStyle.FULL, null));
     }
 
     //-----------------------------------------------------------------------
     // plus(long), plus(long,unit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="plus")
     Object[][] data_plus() {
         return new Object[][] {
             {1, -8, 7},
@@ -301,15 +305,15 @@ public class TCKDayOfWeek extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="plus")
+    @ParameterizedTest
+    @MethodSource("data_plus")
     public void test_plus_long(int base, long amount, int expected) {
-        assertEquals(DayOfWeek.of(base).plus(amount), DayOfWeek.of(expected));
+        assertEquals(DayOfWeek.of(expected), DayOfWeek.of(base).plus(amount));
     }
 
     //-----------------------------------------------------------------------
     // minus(long), minus(long,unit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="minus")
     Object[][] data_minus() {
         return new Object[][] {
             {1, -8, 2},
@@ -332,9 +336,10 @@ public class TCKDayOfWeek extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="minus")
+    @ParameterizedTest
+    @MethodSource("data_minus")
     public void test_minus_long(int base, long amount, int expected) {
-        assertEquals(DayOfWeek.of(base).minus(amount), DayOfWeek.of(expected));
+        assertEquals(DayOfWeek.of(expected), DayOfWeek.of(base).minus(amount));
     }
 
     //-----------------------------------------------------------------------
@@ -342,16 +347,16 @@ public class TCKDayOfWeek extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_adjustInto() {
-        assertEquals(DayOfWeek.MONDAY.adjustInto(LocalDate.of(2012, 9, 2)), LocalDate.of(2012, 8, 27));
-        assertEquals(DayOfWeek.MONDAY.adjustInto(LocalDate.of(2012, 9, 3)), LocalDate.of(2012, 9, 3));
-        assertEquals(DayOfWeek.MONDAY.adjustInto(LocalDate.of(2012, 9, 4)), LocalDate.of(2012, 9, 3));
-        assertEquals(DayOfWeek.MONDAY.adjustInto(LocalDate.of(2012, 9, 10)), LocalDate.of(2012, 9, 10));
-        assertEquals(DayOfWeek.MONDAY.adjustInto(LocalDate.of(2012, 9, 11)), LocalDate.of(2012, 9, 10));
+        assertEquals(LocalDate.of(2012, 8, 27), DayOfWeek.MONDAY.adjustInto(LocalDate.of(2012, 9, 2)));
+        assertEquals(LocalDate.of(2012, 9, 3), DayOfWeek.MONDAY.adjustInto(LocalDate.of(2012, 9, 3)));
+        assertEquals(LocalDate.of(2012, 9, 3), DayOfWeek.MONDAY.adjustInto(LocalDate.of(2012, 9, 4)));
+        assertEquals(LocalDate.of(2012, 9, 10), DayOfWeek.MONDAY.adjustInto(LocalDate.of(2012, 9, 10)));
+        assertEquals(LocalDate.of(2012, 9, 10), DayOfWeek.MONDAY.adjustInto(LocalDate.of(2012, 9, 11)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_adjustInto_null() {
-        DayOfWeek.MONDAY.adjustInto((Temporal) null);
+        Assertions.assertThrows(NullPointerException.class, () -> DayOfWeek.MONDAY.adjustInto((Temporal) null));
     }
 
     //-----------------------------------------------------------------------
@@ -359,13 +364,13 @@ public class TCKDayOfWeek extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_toString() {
-        assertEquals(DayOfWeek.MONDAY.toString(), "MONDAY");
-        assertEquals(DayOfWeek.TUESDAY.toString(), "TUESDAY");
-        assertEquals(DayOfWeek.WEDNESDAY.toString(), "WEDNESDAY");
-        assertEquals(DayOfWeek.THURSDAY.toString(), "THURSDAY");
-        assertEquals(DayOfWeek.FRIDAY.toString(), "FRIDAY");
-        assertEquals(DayOfWeek.SATURDAY.toString(), "SATURDAY");
-        assertEquals(DayOfWeek.SUNDAY.toString(), "SUNDAY");
+        assertEquals("MONDAY", DayOfWeek.MONDAY.toString());
+        assertEquals("TUESDAY", DayOfWeek.TUESDAY.toString());
+        assertEquals("WEDNESDAY", DayOfWeek.WEDNESDAY.toString());
+        assertEquals("THURSDAY", DayOfWeek.THURSDAY.toString());
+        assertEquals("FRIDAY", DayOfWeek.FRIDAY.toString());
+        assertEquals("SATURDAY", DayOfWeek.SATURDAY.toString());
+        assertEquals("SUNDAY", DayOfWeek.SUNDAY.toString());
     }
 
     //-----------------------------------------------------------------------
@@ -373,8 +378,8 @@ public class TCKDayOfWeek extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_enum() {
-        assertEquals(DayOfWeek.valueOf("MONDAY"), DayOfWeek.MONDAY);
-        assertEquals(DayOfWeek.values()[0], DayOfWeek.MONDAY);
+        assertEquals(DayOfWeek.MONDAY, DayOfWeek.valueOf("MONDAY"));
+        assertEquals(DayOfWeek.MONDAY, DayOfWeek.values()[0]);
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/TCKDuration.java b/test/jdk/java/time/tck/java/time/TCKDuration.java
index 2057e8e8939..1c9225e178a 100644
--- a/test/jdk/java/time/tck/java/time/TCKDuration.java
+++ b/test/jdk/java/time/tck/java/time/TCKDuration.java
@@ -70,11 +70,12 @@ import static java.time.temporal.ChronoUnit.NANOS;
 import static java.time.temporal.ChronoUnit.SECONDS;
 import static java.time.temporal.ChronoUnit.WEEKS;
 import static java.time.temporal.ChronoUnit.YEARS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertThrows;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -97,13 +98,16 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test Duration.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKDuration extends AbstractTCKTest {
 
     private static final long CYCLE_SECS = 146097L * 86400L;
@@ -113,22 +117,22 @@ public class TCKDuration extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_zero() {
-        assertEquals(Duration.ZERO.getSeconds(), 0L);
-        assertEquals(Duration.ZERO.getNano(), 0);
+        assertEquals(0L, Duration.ZERO.getSeconds());
+        assertEquals(0, Duration.ZERO.getNano());
     }
 
     @Test
     public void test_min() {
-        assertEquals(Duration.MIN.getSeconds(), Long.MIN_VALUE);
-        assertEquals(Duration.MIN.getNano(), 0);
+        assertEquals(Long.MIN_VALUE, Duration.MIN.getSeconds());
+        assertEquals(0, Duration.MIN.getNano());
         // no duration minimally less than MIN
         assertThrows(ArithmeticException.class, () -> Duration.MIN.minusNanos(1));
     }
 
     @Test
     public void test_max() {
-        assertEquals(Duration.MAX.getSeconds(), Long.MAX_VALUE);
-        assertEquals(Duration.MAX.getNano(), 999_999_999);
+        assertEquals(Long.MAX_VALUE, Duration.MAX.getSeconds());
+        assertEquals(999_999_999, Duration.MAX.getNano());
         // no duration minimally greater than MAX
         assertThrows(ArithmeticException.class, () -> Duration.MAX.plusNanos(1));
     }
@@ -144,15 +148,15 @@ public class TCKDuration extends AbstractTCKTest {
 
         assertTrue(Duration.MIN.compareTo(Duration.ZERO) < 0);
         assertTrue(Duration.ZERO.compareTo(Duration.MIN) > 0);
-        assertNotEquals(Duration.ZERO, Duration.MIN);
+        assertNotEquals(Duration.MIN, Duration.ZERO);
 
         assertTrue(Duration.ZERO.compareTo(Duration.MAX) < 0);
         assertTrue(Duration.MAX.compareTo(Duration.ZERO) > 0);
-        assertNotEquals(Duration.ZERO, Duration.MAX);
+        assertNotEquals(Duration.MAX, Duration.ZERO);
 
         assertTrue(Duration.MIN.compareTo(Duration.MAX) < 0);
         assertTrue(Duration.MAX.compareTo(Duration.MIN) > 0);
-        assertNotEquals(Duration.MIN, Duration.MAX);
+        assertNotEquals(Duration.MAX, Duration.MIN);
     }
 
     //-----------------------------------------------------------------------
@@ -162,8 +166,8 @@ public class TCKDuration extends AbstractTCKTest {
     public void factory_seconds_long() {
         for (long i = -2; i <= 2; i++) {
             Duration t = Duration.ofSeconds(i);
-            assertEquals(t.getSeconds(), i);
-            assertEquals(t.getNano(), 0);
+            assertEquals(i, t.getSeconds());
+            assertEquals(0, t.getNano());
         }
     }
 
@@ -175,18 +179,18 @@ public class TCKDuration extends AbstractTCKTest {
         for (long i = -2; i <= 2; i++) {
             for (int j = 0; j < 10; j++) {
                 Duration t = Duration.ofSeconds(i, j);
-                assertEquals(t.getSeconds(), i);
-                assertEquals(t.getNano(), j);
+                assertEquals(i, t.getSeconds());
+                assertEquals(j, t.getNano());
             }
             for (int j = -10; j < 0; j++) {
                 Duration t = Duration.ofSeconds(i, j);
-                assertEquals(t.getSeconds(), i - 1);
-                assertEquals(t.getNano(), j + 1000000000);
+                assertEquals(i - 1, t.getSeconds());
+                assertEquals(j + 1000000000, t.getNano());
             }
             for (int j = 999999990; j < 1000000000; j++) {
                 Duration t = Duration.ofSeconds(i, j);
-                assertEquals(t.getSeconds(), i);
-                assertEquals(t.getNano(), j);
+                assertEquals(i, t.getSeconds());
+                assertEquals(j, t.getNano());
             }
         }
     }
@@ -194,19 +198,18 @@ public class TCKDuration extends AbstractTCKTest {
     @Test
     public void factory_seconds_long_long_nanosNegativeAdjusted() {
         Duration test = Duration.ofSeconds(2L, -1);
-        assertEquals(test.getSeconds(), 1);
-        assertEquals(test.getNano(), 999999999);
+        assertEquals(1, test.getSeconds());
+        assertEquals(999999999, test.getNano());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void factory_seconds_long_long_tooBig() {
-        Duration.ofSeconds(Long.MAX_VALUE, 1000000000);
+        Assertions.assertThrows(ArithmeticException.class, () -> Duration.ofSeconds(Long.MAX_VALUE, 1000000000));
     }
 
     //-----------------------------------------------------------------------
     // ofMillis(long)
     //-----------------------------------------------------------------------
-    @DataProvider(name="MillisDurationNoNanos")
     Object[][] provider_factory_millis_long() {
         return new Object[][] {
             {0, 0, 0},
@@ -223,11 +226,12 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="MillisDurationNoNanos")
+    @ParameterizedTest
+    @MethodSource("provider_factory_millis_long")
     public void factory_millis_long(long millis, long expectedSeconds, int expectedNanoOfSecond) {
         Duration test = Duration.ofMillis(millis);
-        assertEquals(test.getSeconds(), expectedSeconds);
-        assertEquals(test.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, test.getSeconds());
+        assertEquals(expectedNanoOfSecond, test.getNano());
     }
 
     //-----------------------------------------------------------------------
@@ -236,36 +240,36 @@ public class TCKDuration extends AbstractTCKTest {
     @Test
     public void factory_nanos_nanos() {
         Duration test = Duration.ofNanos(1);
-        assertEquals(test.getSeconds(), 0);
-        assertEquals(test.getNano(), 1);
+        assertEquals(0, test.getSeconds());
+        assertEquals(1, test.getNano());
     }
 
     @Test
     public void factory_nanos_nanosSecs() {
         Duration test = Duration.ofNanos(1000000002);
-        assertEquals(test.getSeconds(), 1);
-        assertEquals(test.getNano(), 2);
+        assertEquals(1, test.getSeconds());
+        assertEquals(2, test.getNano());
     }
 
     @Test
     public void factory_nanos_negative() {
         Duration test = Duration.ofNanos(-2000000001);
-        assertEquals(test.getSeconds(), -3);
-        assertEquals(test.getNano(), 999999999);
+        assertEquals(-3, test.getSeconds());
+        assertEquals(999999999, test.getNano());
     }
 
     @Test
     public void factory_nanos_max() {
         Duration test = Duration.ofNanos(Long.MAX_VALUE);
-        assertEquals(test.getSeconds(), Long.MAX_VALUE / 1000000000);
-        assertEquals(test.getNano(), Long.MAX_VALUE % 1000000000);
+        assertEquals(Long.MAX_VALUE / 1000000000, test.getSeconds());
+        assertEquals(Long.MAX_VALUE % 1000000000, test.getNano());
     }
 
     @Test
     public void factory_nanos_min() {
         Duration test = Duration.ofNanos(Long.MIN_VALUE);
-        assertEquals(test.getSeconds(), Long.MIN_VALUE / 1000000000 - 1);
-        assertEquals(test.getNano(), Long.MIN_VALUE % 1000000000 + 1000000000);
+        assertEquals(Long.MIN_VALUE / 1000000000 - 1, test.getSeconds());
+        assertEquals(Long.MIN_VALUE % 1000000000 + 1000000000, test.getNano());
     }
 
     //-----------------------------------------------------------------------
@@ -274,32 +278,32 @@ public class TCKDuration extends AbstractTCKTest {
     @Test
     public void factory_minutes() {
         Duration test = Duration.ofMinutes(2);
-        assertEquals(test.getSeconds(), 120);
-        assertEquals(test.getNano(), 0);
+        assertEquals(120, test.getSeconds());
+        assertEquals(0, test.getNano());
     }
 
     @Test
     public void factory_minutes_max() {
         Duration test = Duration.ofMinutes(Long.MAX_VALUE / 60);
-        assertEquals(test.getSeconds(), (Long.MAX_VALUE / 60) * 60);
-        assertEquals(test.getNano(), 0);
+        assertEquals((Long.MAX_VALUE / 60) * 60, test.getSeconds());
+        assertEquals(0, test.getNano());
     }
 
     @Test
     public void factory_minutes_min() {
         Duration test = Duration.ofMinutes(Long.MIN_VALUE / 60);
-        assertEquals(test.getSeconds(), (Long.MIN_VALUE / 60) * 60);
-        assertEquals(test.getNano(), 0);
+        assertEquals((Long.MIN_VALUE / 60) * 60, test.getSeconds());
+        assertEquals(0, test.getNano());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void factory_minutes_tooBig() {
-        Duration.ofMinutes(Long.MAX_VALUE / 60 + 1);
+        Assertions.assertThrows(ArithmeticException.class, () -> Duration.ofMinutes(Long.MAX_VALUE / 60 + 1));
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void factory_minutes_tooSmall() {
-        Duration.ofMinutes(Long.MIN_VALUE / 60 - 1);
+        Assertions.assertThrows(ArithmeticException.class, () -> Duration.ofMinutes(Long.MIN_VALUE / 60 - 1));
     }
 
     //-----------------------------------------------------------------------
@@ -308,32 +312,32 @@ public class TCKDuration extends AbstractTCKTest {
     @Test
     public void factory_hours() {
         Duration test = Duration.ofHours(2);
-        assertEquals(test.getSeconds(), 2 * 3600);
-        assertEquals(test.getNano(), 0);
+        assertEquals(2 * 3600, test.getSeconds());
+        assertEquals(0, test.getNano());
     }
 
     @Test
     public void factory_hours_max() {
         Duration test = Duration.ofHours(Long.MAX_VALUE / 3600);
-        assertEquals(test.getSeconds(), (Long.MAX_VALUE / 3600) * 3600);
-        assertEquals(test.getNano(), 0);
+        assertEquals((Long.MAX_VALUE / 3600) * 3600, test.getSeconds());
+        assertEquals(0, test.getNano());
     }
 
     @Test
     public void factory_hours_min() {
         Duration test = Duration.ofHours(Long.MIN_VALUE / 3600);
-        assertEquals(test.getSeconds(), (Long.MIN_VALUE / 3600) * 3600);
-        assertEquals(test.getNano(), 0);
+        assertEquals((Long.MIN_VALUE / 3600) * 3600, test.getSeconds());
+        assertEquals(0, test.getNano());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void factory_hours_tooBig() {
-        Duration.ofHours(Long.MAX_VALUE / 3600 + 1);
+        Assertions.assertThrows(ArithmeticException.class, () -> Duration.ofHours(Long.MAX_VALUE / 3600 + 1));
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void factory_hours_tooSmall() {
-        Duration.ofHours(Long.MIN_VALUE / 3600 - 1);
+        Assertions.assertThrows(ArithmeticException.class, () -> Duration.ofHours(Long.MIN_VALUE / 3600 - 1));
     }
 
     //-----------------------------------------------------------------------
@@ -342,38 +346,37 @@ public class TCKDuration extends AbstractTCKTest {
     @Test
     public void factory_days() {
         Duration test = Duration.ofDays(2);
-        assertEquals(test.getSeconds(), 2 * 86400);
-        assertEquals(test.getNano(), 0);
+        assertEquals(2 * 86400, test.getSeconds());
+        assertEquals(0, test.getNano());
     }
 
     @Test
     public void factory_days_max() {
         Duration test = Duration.ofDays(Long.MAX_VALUE / 86400);
-        assertEquals(test.getSeconds(), (Long.MAX_VALUE / 86400) * 86400);
-        assertEquals(test.getNano(), 0);
+        assertEquals((Long.MAX_VALUE / 86400) * 86400, test.getSeconds());
+        assertEquals(0, test.getNano());
     }
 
     @Test
     public void factory_days_min() {
         Duration test = Duration.ofDays(Long.MIN_VALUE / 86400);
-        assertEquals(test.getSeconds(), (Long.MIN_VALUE / 86400) * 86400);
-        assertEquals(test.getNano(), 0);
+        assertEquals((Long.MIN_VALUE / 86400) * 86400, test.getSeconds());
+        assertEquals(0, test.getNano());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void factory_days_tooBig() {
-        Duration.ofDays(Long.MAX_VALUE / 86400 + 1);
+        Assertions.assertThrows(ArithmeticException.class, () -> Duration.ofDays(Long.MAX_VALUE / 86400 + 1));
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void factory_days_tooSmall() {
-        Duration.ofDays(Long.MIN_VALUE / 86400 - 1);
+        Assertions.assertThrows(ArithmeticException.class, () -> Duration.ofDays(Long.MIN_VALUE / 86400 - 1));
     }
 
     //-----------------------------------------------------------------------
     // of(long,TemporalUnit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="OfTemporalUnit")
     Object[][] provider_factory_of_longTemporalUnit() {
         return new Object[][] {
             {0, NANOS, 0, 0},
@@ -433,14 +436,14 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="OfTemporalUnit")
+    @ParameterizedTest
+    @MethodSource("provider_factory_of_longTemporalUnit")
     public void factory_of_longTemporalUnit(long amount, TemporalUnit unit, long expectedSeconds, int expectedNanoOfSecond) {
         Duration t = Duration.of(amount, unit);
-        assertEquals(t.getSeconds(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, t.getSeconds());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
-    @DataProvider(name="OfTemporalUnitOutOfRange")
     Object[][] provider_factory_of_longTemporalUnit_outOfRange() {
         return new Object[][] {
             {Long.MAX_VALUE / 60 + 1, MINUTES},
@@ -452,19 +455,20 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="OfTemporalUnitOutOfRange", expectedExceptions=ArithmeticException.class)
+    @ParameterizedTest
+    @MethodSource("provider_factory_of_longTemporalUnit_outOfRange")
     public void factory_of_longTemporalUnit_outOfRange(long amount, TemporalUnit unit) {
-        Duration.of(amount, unit);
+        Assertions.assertThrows(ArithmeticException.class, () -> Duration.of(amount, unit));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_longTemporalUnit_estimatedUnit() {
-        Duration.of(2, WEEKS);
+        Assertions.assertThrows(DateTimeException.class, () -> Duration.of(2, WEEKS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_longTemporalUnit_null() {
-        Duration.of(1, (TemporalUnit) null);
+        Assertions.assertThrows(NullPointerException.class, () -> Duration.of(1, (TemporalUnit) null));
     }
 
     //-----------------------------------------------------------------------
@@ -473,7 +477,7 @@ public class TCKDuration extends AbstractTCKTest {
     @Test
     public void factory_from_TemporalAmount_Duration() {
         TemporalAmount amount = Duration.ofHours(3);
-        assertEquals(Duration.from(amount), Duration.ofHours(3));
+        assertEquals(Duration.ofHours(3), Duration.from(amount));
     }
 
     @Test
@@ -504,47 +508,48 @@ public class TCKDuration extends AbstractTCKTest {
             }
         };
         Duration t = Duration.from(amount);
-        assertEquals(t.getSeconds(), 23 * 86400);
-        assertEquals(t.getNano(), 45);
+        assertEquals(23 * 86400, t.getSeconds());
+        assertEquals(45, t.getNano());
     }
 
-    @Test(expectedExceptions = ArithmeticException.class)
+    @Test
     public void factory_from_TemporalAmount_Minutes_tooBig() {
-        TemporalAmount amount = new TemporalAmount() {
-            @Override
-            public long get(TemporalUnit unit) {
-                return (Long.MAX_VALUE / 60) + 2;
-            }
-            @Override
-            public List<TemporalUnit> getUnits() {
-                return Collections.<TemporalUnit>singletonList(MINUTES);
-            }
-            @Override
-            public Temporal addTo(Temporal temporal) {
-                throw new UnsupportedOperationException();
-            }
-            @Override
-            public Temporal subtractFrom(Temporal temporal) {
-                throw new UnsupportedOperationException();
-            }
-        };
-        Duration.from(amount);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            TemporalAmount amount = new TemporalAmount() {
+                @Override
+                public long get(TemporalUnit unit) {
+                    return (Long.MAX_VALUE / 60) + 2;
+                }
+                @Override
+                public List<TemporalUnit> getUnits() {
+                    return Collections.<TemporalUnit>singletonList(MINUTES);
+                }
+                @Override
+                public Temporal addTo(Temporal temporal) {
+                    throw new UnsupportedOperationException();
+                }
+                @Override
+                public Temporal subtractFrom(Temporal temporal) {
+                    throw new UnsupportedOperationException();
+                }
+            };
+            Duration.from(amount);
+        });
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void factory_from_TemporalAmount_Period() {
-        Duration.from(Period.ZERO);
+        Assertions.assertThrows(DateTimeException.class, () -> Duration.from(Period.ZERO));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void factory_from_TemporalAmount_null() {
-        Duration.from(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Duration.from(null));
     }
 
     //-----------------------------------------------------------------------
     // parse(String)
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseSuccess")
     Object[][] data_parseSuccess() {
         return new Object[][] {
                 {"PT0S", 0, 0},
@@ -687,49 +692,53 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_parseSuccess")
     public void factory_parse(String text, long expectedSeconds, int expectedNanoOfSecond) {
         Duration test = Duration.parse(text);
-        assertEquals(test.getSeconds(), expectedSeconds);
-        assertEquals(test.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, test.getSeconds());
+        assertEquals(expectedNanoOfSecond, test.getNano());
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_parseSuccess")
     public void factory_parse_plus(String text, long expectedSeconds, int expectedNanoOfSecond) {
         Duration test = Duration.parse("+" + text);
-        assertEquals(test.getSeconds(), expectedSeconds);
-        assertEquals(test.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, test.getSeconds());
+        assertEquals(expectedNanoOfSecond, test.getNano());
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_parseSuccess")
     public void factory_parse_minus(String text, long expectedSeconds, int expectedNanoOfSecond) {
         Duration test;
         try {
             test = Duration.parse("-" + text);
         } catch (DateTimeParseException ex) {
-            assertEquals(expectedSeconds == Long.MIN_VALUE, true);
+            assertEquals(true, expectedSeconds == Long.MIN_VALUE);
             return;
         }
         // not inside try/catch or it breaks test
-        assertEquals(test, Duration.ofSeconds(expectedSeconds, expectedNanoOfSecond).negated());
+        assertEquals(Duration.ofSeconds(expectedSeconds, expectedNanoOfSecond).negated(), test);
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_parseSuccess")
     public void factory_parse_comma(String text, long expectedSeconds, int expectedNanoOfSecond) {
         text = text.replace('.', ',');
         Duration test = Duration.parse(text);
-        assertEquals(test.getSeconds(), expectedSeconds);
-        assertEquals(test.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, test.getSeconds());
+        assertEquals(expectedNanoOfSecond, test.getNano());
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_parseSuccess")
     public void factory_parse_lowerCase(String text, long expectedSeconds, int expectedNanoOfSecond) {
         Duration test = Duration.parse(text.toLowerCase(Locale.ENGLISH));
-        assertEquals(test.getSeconds(), expectedSeconds);
-        assertEquals(test.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, test.getSeconds());
+        assertEquals(expectedNanoOfSecond, test.getNano());
     }
 
-    @DataProvider(name="parseFailure")
     Object[][] data_parseFailure() {
         return new Object[][] {
                 {""},
@@ -778,46 +787,47 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="parseFailure", expectedExceptions=DateTimeParseException.class)
+    @ParameterizedTest
+    @MethodSource("data_parseFailure")
     public void factory_parseFailures(String text) {
-        Duration.parse(text);
+        Assertions.assertThrows(DateTimeParseException.class, () -> Duration.parse(text));
     }
 
-    @Test(dataProvider="parseFailure", expectedExceptions=DateTimeParseException.class)
+    @ParameterizedTest
+    @MethodSource("data_parseFailure")
     public void factory_parseFailures_comma(String text) {
-        text = text.replace('.', ',');
-        Duration.parse(text);
+        var commaText = text.replace('.', ',');
+        Assertions.assertThrows(DateTimeParseException.class, () -> Duration.parse(commaText));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_tooBig() {
-        Duration.parse("PT" + Long.MAX_VALUE + "1S");
+        Assertions.assertThrows(DateTimeParseException.class, () -> Duration.parse("PT" + Long.MAX_VALUE + "1S"));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_tooBig_decimal() {
-        Duration.parse("PT" + Long.MAX_VALUE + "1.1S");
+        Assertions.assertThrows(DateTimeParseException.class, () -> Duration.parse("PT" + Long.MAX_VALUE + "1.1S"));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_tooSmall() {
-        Duration.parse("PT" + Long.MIN_VALUE + "1S");
+        Assertions.assertThrows(DateTimeParseException.class, () -> Duration.parse("PT" + Long.MIN_VALUE + "1S"));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_tooSmall_decimal() {
-        Duration.parse("PT" + Long.MIN_VALUE + ".1S");
+        Assertions.assertThrows(DateTimeParseException.class, () -> Duration.parse("PT" + Long.MIN_VALUE + ".1S"));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_nullText() {
-        Duration.parse(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Duration.parse(null));
     }
 
     //-----------------------------------------------------------------------
     // between()
     //-----------------------------------------------------------------------
-    @DataProvider(name="durationBetweenInstant")
     Object[][] data_durationBetweenInstant() {
         return new Object[][] {
                 {0, 0, 0, 0, 0, 0},
@@ -832,23 +842,24 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="durationBetweenInstant")
+    @ParameterizedTest
+    @MethodSource("data_durationBetweenInstant")
     public void factory_between_TemporalTemporal_Instant(long secs1, int nanos1, long secs2, int nanos2, long expectedSeconds, int expectedNanoOfSecond) {
         Instant start = Instant.ofEpochSecond(secs1, nanos1);
         Instant end = Instant.ofEpochSecond(secs2, nanos2);
         Duration t = Duration.between(start, end);
-        assertEquals(t.getSeconds(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, t.getSeconds());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
-    @Test(dataProvider="durationBetweenInstant")
+    @ParameterizedTest
+    @MethodSource("data_durationBetweenInstant")
     public void factory_between_TemporalTemporal_Instant_negated(long secs1, int nanos1, long secs2, int nanos2, long expectedSeconds, int expectedNanoOfSecond) {
         Instant start = Instant.ofEpochSecond(secs1, nanos1);
         Instant end = Instant.ofEpochSecond(secs2, nanos2);
-        assertEquals(Duration.between(end, start), Duration.between(start, end).negated());
+        assertEquals(Duration.between(start, end).negated(), Duration.between(end, start));
     }
 
-    @DataProvider(name="durationBetweenLocalTime")
     Object[][] data_durationBetweenLocalTime() {
         return new Object[][] {
                 {LocalTime.of(11, 0, 30), LocalTime.of(11, 0, 45), 15L, 0},
@@ -856,19 +867,20 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="durationBetweenLocalTime")
+    @ParameterizedTest
+    @MethodSource("data_durationBetweenLocalTime")
     public void factory_between_TemporalTemporal_LT(LocalTime start, LocalTime end, long expectedSeconds, int expectedNanoOfSecond) {
         Duration t = Duration.between(start, end);
-        assertEquals(t.getSeconds(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, t.getSeconds());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
-    @Test(dataProvider="durationBetweenLocalTime")
+    @ParameterizedTest
+    @MethodSource("data_durationBetweenLocalTime")
     public void factory_between_TemporalTemporal_LT_negated(LocalTime start, LocalTime end, long expectedSeconds, int expectedNanoOfSecond) {
-        assertEquals(Duration.between(end, start), Duration.between(start, end).negated());
+        assertEquals(Duration.between(start, end).negated(), Duration.between(end, start));
     }
 
-    @DataProvider(name="durationBetweenLocalDateTime")
     Object[][] data_durationBetweenLocalDateTime() {
         return new Object[][] {
                 {LocalDateTime.of(2013, 3, 24, 0, 44, 31, 565_000_000), LocalDateTime.of(2013, 3, 24, 0, 44, 30, 65_000_000), -2L, 500_000_000},
@@ -895,42 +907,50 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="durationBetweenLocalDateTime")
+    @ParameterizedTest
+    @MethodSource("data_durationBetweenLocalDateTime")
     public void factory_between_TemporalTemporal_LDT(LocalDateTime start, LocalDateTime end, long expectedSeconds, int expectedNanoOfSecond) {
         Duration t = Duration.between(start, end);
-        assertEquals(t.getSeconds(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, t.getSeconds());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
-    @Test(dataProvider="durationBetweenLocalDateTime")
+    @ParameterizedTest
+    @MethodSource("data_durationBetweenLocalDateTime")
     public void factory_between_TemporalTemporal_LDT_negated(LocalDateTime start, LocalDateTime end, long expectedSeconds, int expectedNanoOfSecond) {
-        assertEquals(Duration.between(end, start), Duration.between(start, end).negated());
+        assertEquals(Duration.between(start, end).negated(), Duration.between(end, start));
     }
 
     @Test
     public void factory_between_TemporalTemporal_mixedTypes() {
         Instant start = Instant.ofEpochSecond(1);
         ZonedDateTime end = Instant.ofEpochSecond(4).atZone(ZoneOffset.UTC);
-        assertEquals(Duration.between(start, end), Duration.ofSeconds(3));
+        assertEquals(Duration.ofSeconds(3), Duration.between(start, end));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_between_TemporalTemporal_invalidMixedTypes() {
-        Instant start = Instant.ofEpochSecond(1);
-        LocalDate end = LocalDate.of(2010, 6, 20);
-        Duration.between(start, end);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant start = Instant.ofEpochSecond(1);
+            LocalDate end = LocalDate.of(2010, 6, 20);
+            Duration.between(start, end);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_between__TemporalTemporal_startNull() {
-        Instant end = Instant.ofEpochSecond(1);
-        Duration.between(null, end);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            Instant end = Instant.ofEpochSecond(1);
+            Duration.between(null, end);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_between__TemporalTemporal_endNull() {
-        Instant start = Instant.ofEpochSecond(1);
-        Duration.between(start, null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            Instant start = Instant.ofEpochSecond(1);
+            Duration.between(start, null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -938,48 +958,47 @@ public class TCKDuration extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isZero() {
-        assertEquals(Duration.ofNanos(0).isZero(), true);
-        assertEquals(Duration.ofSeconds(0).isZero(), true);
-        assertEquals(Duration.ofNanos(1).isZero(), false);
-        assertEquals(Duration.ofSeconds(1).isZero(), false);
-        assertEquals(Duration.ofSeconds(1, 1).isZero(), false);
-        assertEquals(Duration.ofNanos(-1).isZero(), false);
-        assertEquals(Duration.ofSeconds(-1).isZero(), false);
-        assertEquals(Duration.ofSeconds(-1, -1).isZero(), false);
+        assertEquals(true, Duration.ofNanos(0).isZero());
+        assertEquals(true, Duration.ofSeconds(0).isZero());
+        assertEquals(false, Duration.ofNanos(1).isZero());
+        assertEquals(false, Duration.ofSeconds(1).isZero());
+        assertEquals(false, Duration.ofSeconds(1, 1).isZero());
+        assertEquals(false, Duration.ofNanos(-1).isZero());
+        assertEquals(false, Duration.ofSeconds(-1).isZero());
+        assertEquals(false, Duration.ofSeconds(-1, -1).isZero());
     }
 
     @Test
     public void test_isPositive() {
-        assertEquals(Duration.ofNanos(0).isPositive(), false);
-        assertEquals(Duration.ofSeconds(0).isPositive(), false);
-        assertEquals(Duration.ofNanos(1).isPositive(), true);
-        assertEquals(Duration.ofSeconds(1).isPositive(), true);
-        assertEquals(Duration.ofSeconds(1, 1).isPositive(), true);
-        assertEquals(Duration.ofSeconds(Long.MAX_VALUE, 999_999_999).isPositive(), true);
-        assertEquals(Duration.ofNanos(-1).isPositive(), false);
-        assertEquals(Duration.ofSeconds(-1).isPositive(), false);
-        assertEquals(Duration.ofSeconds(-1, -1).isPositive(), false);
-        assertEquals(Duration.ofSeconds(Long.MIN_VALUE).isPositive(), false);
+        assertEquals(false, Duration.ofNanos(0).isPositive());
+        assertEquals(false, Duration.ofSeconds(0).isPositive());
+        assertEquals(true, Duration.ofNanos(1).isPositive());
+        assertEquals(true, Duration.ofSeconds(1).isPositive());
+        assertEquals(true, Duration.ofSeconds(1, 1).isPositive());
+        assertEquals(true, Duration.ofSeconds(Long.MAX_VALUE, 999_999_999).isPositive());
+        assertEquals(false, Duration.ofNanos(-1).isPositive());
+        assertEquals(false, Duration.ofSeconds(-1).isPositive());
+        assertEquals(false, Duration.ofSeconds(-1, -1).isPositive());
+        assertEquals(false, Duration.ofSeconds(Long.MIN_VALUE).isPositive());
     }
 
     @Test
     public void test_isNegative() {
-        assertEquals(Duration.ofNanos(0).isNegative(), false);
-        assertEquals(Duration.ofSeconds(0).isNegative(), false);
-        assertEquals(Duration.ofNanos(1).isNegative(), false);
-        assertEquals(Duration.ofSeconds(1).isNegative(), false);
-        assertEquals(Duration.ofSeconds(1, 1).isNegative(), false);
-        assertEquals(Duration.ofSeconds(Long.MAX_VALUE, 999_999_999).isNegative(), false);
-        assertEquals(Duration.ofNanos(-1).isNegative(), true);
-        assertEquals(Duration.ofSeconds(-1).isNegative(), true);
-        assertEquals(Duration.ofSeconds(-1, -1).isNegative(), true);
-        assertEquals(Duration.ofSeconds(Long.MIN_VALUE).isNegative(), true);
+        assertEquals(false, Duration.ofNanos(0).isNegative());
+        assertEquals(false, Duration.ofSeconds(0).isNegative());
+        assertEquals(false, Duration.ofNanos(1).isNegative());
+        assertEquals(false, Duration.ofSeconds(1).isNegative());
+        assertEquals(false, Duration.ofSeconds(1, 1).isNegative());
+        assertEquals(false, Duration.ofSeconds(Long.MAX_VALUE, 999_999_999).isNegative());
+        assertEquals(true, Duration.ofNanos(-1).isNegative());
+        assertEquals(true, Duration.ofSeconds(-1).isNegative());
+        assertEquals(true, Duration.ofSeconds(-1, -1).isNegative());
+        assertEquals(true, Duration.ofSeconds(Long.MIN_VALUE).isNegative());
     }
 
     //-----------------------------------------------------------------------
     // plus()
     //-----------------------------------------------------------------------
-    @DataProvider(name="Plus")
     Object[][] provider_plus() {
         return new Object[][] {
             {Long.MIN_VALUE, 0, Long.MAX_VALUE, 0, -1, 0},
@@ -1164,23 +1183,28 @@ public class TCKDuration extends AbstractTCKTest {
        };
     }
 
-    @Test(dataProvider="Plus")
+    @ParameterizedTest
+    @MethodSource("provider_plus")
     public void plus(long seconds, int nanos, long otherSeconds, int otherNanos, long expectedSeconds, int expectedNanoOfSecond) {
        Duration t = Duration.ofSeconds(seconds, nanos).plus(Duration.ofSeconds(otherSeconds, otherNanos));
-       assertEquals(t.getSeconds(), expectedSeconds);
-       assertEquals(t.getNano(), expectedNanoOfSecond);
+       assertEquals(expectedSeconds, t.getSeconds());
+       assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void plusOverflowTooBig() {
-       Duration t = Duration.ofSeconds(Long.MAX_VALUE, 999999999);
-       t.plus(Duration.ofSeconds(0, 1));
+       Assertions.assertThrows(ArithmeticException.class, () -> {
+           Duration t = Duration.ofSeconds(Long.MAX_VALUE, 999999999);
+           t.plus(Duration.ofSeconds(0, 1));
+        });
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void plusOverflowTooSmall() {
-       Duration t = Duration.ofSeconds(Long.MIN_VALUE);
-       t.plus(Duration.ofSeconds(-1, 999999999));
+       Assertions.assertThrows(ArithmeticException.class, () -> {
+           Duration t = Duration.ofSeconds(Long.MIN_VALUE);
+           t.plus(Duration.ofSeconds(-1, 999999999));
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1216,14 +1240,15 @@ public class TCKDuration extends AbstractTCKTest {
         assertEquals(1, t.getNano());
      }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void plus_longTemporalUnit_null() {
-       Duration t = Duration.ofSeconds(1);
-       t.plus(1, (TemporalUnit) null);
+       Assertions.assertThrows(NullPointerException.class, () -> {
+           Duration t = Duration.ofSeconds(1);
+           t.plus(1, (TemporalUnit) null);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="PlusDays")
     Object[][] provider_plusDays_long() {
         return new Object[][] {
             {0, 0, 0},
@@ -1245,27 +1270,31 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="PlusDays")
+    @ParameterizedTest
+    @MethodSource("provider_plusDays_long")
     public void plusDays_long(long days, long amount, long expectedDays) {
         Duration t = Duration.ofDays(days);
         t = t.plusDays(amount);
-        assertEquals(t.toDays(), expectedDays);
+        assertEquals(expectedDays, t.toDays());
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void plusDays_long_overflowTooBig() {
-        Duration t = Duration.ofDays(1);
-        t.plusDays(Long.MAX_VALUE/3600/24);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofDays(1);
+            t.plusDays(Long.MAX_VALUE/3600/24);
+        });
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void plusDays_long_overflowTooSmall() {
-        Duration t = Duration.ofDays(-1);
-        t.plusDays(Long.MIN_VALUE/3600/24);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofDays(-1);
+            t.plusDays(Long.MIN_VALUE/3600/24);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="PlusHours")
     Object[][] provider_plusHours_long() {
         return new Object[][] {
             {0, 0, 0},
@@ -1287,27 +1316,31 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="PlusHours")
+    @ParameterizedTest
+    @MethodSource("provider_plusHours_long")
     public void plusHours_long(long hours, long amount, long expectedHours) {
         Duration t = Duration.ofHours(hours);
         t = t.plusHours(amount);
-        assertEquals(t.toHours(), expectedHours);
+        assertEquals(expectedHours, t.toHours());
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void plusHours_long_overflowTooBig() {
-        Duration t = Duration.ofHours(1);
-        t.plusHours(Long.MAX_VALUE/3600);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofHours(1);
+            t.plusHours(Long.MAX_VALUE/3600);
+        });
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void plusHours_long_overflowTooSmall() {
-        Duration t = Duration.ofHours(-1);
-        t.plusHours(Long.MIN_VALUE/3600);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofHours(-1);
+            t.plusHours(Long.MIN_VALUE/3600);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="PlusMinutes")
     Object[][] provider_plusMinutes_long() {
         return new Object[][] {
             {0, 0, 0},
@@ -1329,27 +1362,31 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="PlusMinutes")
+    @ParameterizedTest
+    @MethodSource("provider_plusMinutes_long")
     public void plusMinutes_long(long minutes, long amount, long expectedMinutes) {
         Duration t = Duration.ofMinutes(minutes);
         t = t.plusMinutes(amount);
-        assertEquals(t.toMinutes(), expectedMinutes);
+        assertEquals(expectedMinutes, t.toMinutes());
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void plusMinutes_long_overflowTooBig() {
-        Duration t = Duration.ofMinutes(1);
-        t.plusMinutes(Long.MAX_VALUE/60);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofMinutes(1);
+            t.plusMinutes(Long.MAX_VALUE/60);
+        });
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void plusMinutes_long_overflowTooSmall() {
-        Duration t = Duration.ofMinutes(-1);
-        t.plusMinutes(Long.MIN_VALUE/60);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofMinutes(-1);
+            t.plusMinutes(Long.MIN_VALUE/60);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="PlusSeconds")
     Object[][] provider_plusSeconds_long() {
         return new Object[][] {
             {0, 0, 0, 0, 0},
@@ -1375,28 +1412,32 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="PlusSeconds")
+    @ParameterizedTest
+    @MethodSource("provider_plusSeconds_long")
     public void plusSeconds_long(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Duration t = Duration.ofSeconds(seconds, nanos);
         t = t.plusSeconds(amount);
-        assertEquals(t.getSeconds(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, t.getSeconds());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void plusSeconds_long_overflowTooBig() {
-        Duration t = Duration.ofSeconds(1, 0);
-        t.plusSeconds(Long.MAX_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofSeconds(1, 0);
+            t.plusSeconds(Long.MAX_VALUE);
+        });
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void plusSeconds_long_overflowTooSmall() {
-        Duration t = Duration.ofSeconds(-1, 0);
-        t.plusSeconds(Long.MIN_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofSeconds(-1, 0);
+            t.plusSeconds(Long.MIN_VALUE);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="PlusMillis")
     Object[][] provider_plusMillis_long() {
         return new Object[][] {
             {0, 0, 0,       0, 0},
@@ -1451,58 +1492,64 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="PlusMillis")
+    @ParameterizedTest
+    @MethodSource("provider_plusMillis_long")
     public void plusMillis_long(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Duration t = Duration.ofSeconds(seconds, nanos);
         t = t.plusMillis(amount);
-        assertEquals(t.getSeconds(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, t.getSeconds());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
-    @Test(dataProvider="PlusMillis")
+    @ParameterizedTest
+    @MethodSource("provider_plusMillis_long")
     public void plusMillis_long_oneMore(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Duration t = Duration.ofSeconds(seconds + 1, nanos);
         t = t.plusMillis(amount);
-        assertEquals(t.getSeconds(), expectedSeconds + 1);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds + 1, t.getSeconds());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
-    @Test(dataProvider="PlusMillis")
+    @ParameterizedTest
+    @MethodSource("provider_plusMillis_long")
     public void plusMillis_long_minusOneLess(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Duration t = Duration.ofSeconds(seconds - 1, nanos);
         t = t.plusMillis(amount);
-        assertEquals(t.getSeconds(), expectedSeconds - 1);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds - 1, t.getSeconds());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
     @Test
     public void plusMillis_long_max() {
         Duration t = Duration.ofSeconds(Long.MAX_VALUE, 998999999);
         t = t.plusMillis(1);
-        assertEquals(t.getSeconds(), Long.MAX_VALUE);
-        assertEquals(t.getNano(), 999999999);
+        assertEquals(Long.MAX_VALUE, t.getSeconds());
+        assertEquals(999999999, t.getNano());
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void plusMillis_long_overflowTooBig() {
-        Duration t = Duration.ofSeconds(Long.MAX_VALUE, 999000000);
-        t.plusMillis(1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofSeconds(Long.MAX_VALUE, 999000000);
+            t.plusMillis(1);
+        });
     }
 
     @Test
     public void plusMillis_long_min() {
         Duration t = Duration.ofSeconds(Long.MIN_VALUE, 1000000);
         t = t.plusMillis(-1);
-        assertEquals(t.getSeconds(), Long.MIN_VALUE);
-        assertEquals(t.getNano(), 0);
+        assertEquals(Long.MIN_VALUE, t.getSeconds());
+        assertEquals(0, t.getNano());
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void plusMillis_long_overflowTooSmall() {
-        Duration t = Duration.ofSeconds(Long.MIN_VALUE, 0);
-        t.plusMillis(-1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofSeconds(Long.MIN_VALUE, 0);
+            t.plusMillis(-1);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="PlusNanos")
     Object[][] provider_plusNanos_long() {
         return new Object[][] {
             {0, 0, 0,           0, 0},
@@ -1577,28 +1624,32 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="PlusNanos")
+    @ParameterizedTest
+    @MethodSource("provider_plusNanos_long")
     public void plusNanos_long(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Duration t = Duration.ofSeconds(seconds, nanos);
         t = t.plusNanos(amount);
-        assertEquals(t.getSeconds(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, t.getSeconds());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void plusNanos_long_overflowTooBig() {
-        Duration t = Duration.ofSeconds(Long.MAX_VALUE, 999999999);
-        t.plusNanos(1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofSeconds(Long.MAX_VALUE, 999999999);
+            t.plusNanos(1);
+        });
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void plusNanos_long_overflowTooSmall() {
-        Duration t = Duration.ofSeconds(Long.MIN_VALUE, 0);
-        t.plusNanos(-1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofSeconds(Long.MIN_VALUE, 0);
+            t.plusNanos(-1);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="Minus")
     Object[][] provider_minus() {
         return new Object[][] {
             {Long.MIN_VALUE, 0, Long.MIN_VALUE + 1, 0, -1, 0},
@@ -1783,23 +1834,28 @@ public class TCKDuration extends AbstractTCKTest {
        };
     }
 
-    @Test(dataProvider="Minus")
+    @ParameterizedTest
+    @MethodSource("provider_minus")
     public void minus(long seconds, int nanos, long otherSeconds, int otherNanos, long expectedSeconds, int expectedNanoOfSecond) {
        Duration t = Duration.ofSeconds(seconds, nanos).minus(Duration.ofSeconds(otherSeconds, otherNanos));
-       assertEquals(t.getSeconds(), expectedSeconds);
-       assertEquals(t.getNano(), expectedNanoOfSecond);
+       assertEquals(expectedSeconds, t.getSeconds());
+       assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void minusOverflowTooSmall() {
-       Duration t = Duration.ofSeconds(Long.MIN_VALUE);
-       t.minus(Duration.ofSeconds(0, 1));
+       Assertions.assertThrows(ArithmeticException.class, () -> {
+           Duration t = Duration.ofSeconds(Long.MIN_VALUE);
+           t.minus(Duration.ofSeconds(0, 1));
+        });
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void minusOverflowTooBig() {
-       Duration t = Duration.ofSeconds(Long.MAX_VALUE, 999999999);
-       t.minus(Duration.ofSeconds(-1, 999999999));
+       Assertions.assertThrows(ArithmeticException.class, () -> {
+           Duration t = Duration.ofSeconds(Long.MAX_VALUE, 999999999);
+           t.minus(Duration.ofSeconds(-1, 999999999));
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1835,14 +1891,15 @@ public class TCKDuration extends AbstractTCKTest {
         assertEquals(999999999, t.getNano());
      }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void minus_longTemporalUnit_null() {
-       Duration t = Duration.ofSeconds(1);
-       t.minus(1, (TemporalUnit) null);
+       Assertions.assertThrows(NullPointerException.class, () -> {
+           Duration t = Duration.ofSeconds(1);
+           t.minus(1, (TemporalUnit) null);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="MinusDays")
     Object[][] provider_minusDays_long() {
         return new Object[][] {
             {0, 0, 0},
@@ -1864,27 +1921,31 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="MinusDays")
+    @ParameterizedTest
+    @MethodSource("provider_minusDays_long")
     public void minusDays_long(long days, long amount, long expectedDays) {
         Duration t = Duration.ofDays(days);
         t = t.minusDays(amount);
-        assertEquals(t.toDays(), expectedDays);
+        assertEquals(expectedDays, t.toDays());
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void minusDays_long_overflowTooBig() {
-        Duration t = Duration.ofDays(Long.MAX_VALUE/3600/24);
-        t.minusDays(-1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofDays(Long.MAX_VALUE/3600/24);
+            t.minusDays(-1);
+        });
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void minusDays_long_overflowTooSmall() {
-        Duration t = Duration.ofDays(Long.MIN_VALUE/3600/24);
-        t.minusDays(1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofDays(Long.MIN_VALUE/3600/24);
+            t.minusDays(1);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="MinusHours")
     Object[][] provider_minusHours_long() {
         return new Object[][] {
             {0, 0, 0},
@@ -1906,27 +1967,31 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="MinusHours")
+    @ParameterizedTest
+    @MethodSource("provider_minusHours_long")
     public void minusHours_long(long hours, long amount, long expectedHours) {
         Duration t = Duration.ofHours(hours);
         t = t.minusHours(amount);
-        assertEquals(t.toHours(), expectedHours);
+        assertEquals(expectedHours, t.toHours());
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void minusHours_long_overflowTooBig() {
-        Duration t = Duration.ofHours(Long.MAX_VALUE/3600);
-        t.minusHours(-1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofHours(Long.MAX_VALUE/3600);
+            t.minusHours(-1);
+        });
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void minusHours_long_overflowTooSmall() {
-        Duration t = Duration.ofHours(Long.MIN_VALUE/3600);
-        t.minusHours(1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofHours(Long.MIN_VALUE/3600);
+            t.minusHours(1);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="MinusMinutes")
     Object[][] provider_minusminutes_long() {
         return new Object[][] {
             {0, 0, 0},
@@ -1948,27 +2013,31 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="MinusMinutes")
+    @ParameterizedTest
+    @MethodSource("provider_minusminutes_long")
     public void minusMinutes_long(long minutes, long amount, long expectedMinutes) {
         Duration t = Duration.ofMinutes(minutes);
         t = t.minusMinutes(amount);
-        assertEquals(t.toMinutes(), expectedMinutes);
+        assertEquals(expectedMinutes, t.toMinutes());
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void minusMinutes_long_overflowTooBig() {
-        Duration t = Duration.ofMinutes(Long.MAX_VALUE/60);
-        t.minusMinutes(-1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofMinutes(Long.MAX_VALUE/60);
+            t.minusMinutes(-1);
+        });
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void minusMinutes_long_overflowTooSmall() {
-        Duration t = Duration.ofMinutes(Long.MIN_VALUE/60);
-        t.minusMinutes(1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofMinutes(Long.MIN_VALUE/60);
+            t.minusMinutes(1);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="MinusSeconds")
     Object[][] provider_minusSeconds_long() {
         return new Object[][] {
             {0, 0, 0, 0, 0},
@@ -1994,28 +2063,32 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="MinusSeconds")
+    @ParameterizedTest
+    @MethodSource("provider_minusSeconds_long")
     public void minusSeconds_long(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Duration t = Duration.ofSeconds(seconds, nanos);
         t = t.minusSeconds(amount);
-        assertEquals(t.getSeconds(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, t.getSeconds());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void minusSeconds_long_overflowTooBig() {
-        Duration t = Duration.ofSeconds(1, 0);
-        t.minusSeconds(Long.MIN_VALUE + 1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofSeconds(1, 0);
+            t.minusSeconds(Long.MIN_VALUE + 1);
+        });
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void minusSeconds_long_overflowTooSmall() {
-        Duration t = Duration.ofSeconds(-2, 0);
-        t.minusSeconds(Long.MAX_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofSeconds(-2, 0);
+            t.minusSeconds(Long.MAX_VALUE);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="MinusMillis")
     Object[][] provider_minusMillis_long() {
         return new Object[][] {
             {0, 0, 0,       0, 0},
@@ -2070,58 +2143,64 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="MinusMillis")
+    @ParameterizedTest
+    @MethodSource("provider_minusMillis_long")
     public void minusMillis_long(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Duration t = Duration.ofSeconds(seconds, nanos);
         t = t.minusMillis(amount);
-        assertEquals(t.getSeconds(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, t.getSeconds());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
-    @Test(dataProvider="MinusMillis")
+    @ParameterizedTest
+    @MethodSource("provider_minusMillis_long")
     public void minusMillis_long_oneMore(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Duration t = Duration.ofSeconds(seconds + 1, nanos);
         t = t.minusMillis(amount);
-        assertEquals(t.getSeconds(), expectedSeconds + 1);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds + 1, t.getSeconds());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
-    @Test(dataProvider="MinusMillis")
+    @ParameterizedTest
+    @MethodSource("provider_minusMillis_long")
     public void minusMillis_long_minusOneLess(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Duration t = Duration.ofSeconds(seconds - 1, nanos);
         t = t.minusMillis(amount);
-        assertEquals(t.getSeconds(), expectedSeconds - 1);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds - 1, t.getSeconds());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
     @Test
     public void minusMillis_long_max() {
         Duration t = Duration.ofSeconds(Long.MAX_VALUE, 998999999);
         t = t.minusMillis(-1);
-        assertEquals(t.getSeconds(), Long.MAX_VALUE);
-        assertEquals(t.getNano(), 999999999);
+        assertEquals(Long.MAX_VALUE, t.getSeconds());
+        assertEquals(999999999, t.getNano());
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void minusMillis_long_overflowTooBig() {
-        Duration t = Duration.ofSeconds(Long.MAX_VALUE, 999000000);
-        t.minusMillis(-1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofSeconds(Long.MAX_VALUE, 999000000);
+            t.minusMillis(-1);
+        });
     }
 
     @Test
     public void minusMillis_long_min() {
         Duration t = Duration.ofSeconds(Long.MIN_VALUE, 1000000);
         t = t.minusMillis(1);
-        assertEquals(t.getSeconds(), Long.MIN_VALUE);
-        assertEquals(t.getNano(), 0);
+        assertEquals(Long.MIN_VALUE, t.getSeconds());
+        assertEquals(0, t.getNano());
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void minusMillis_long_overflowTooSmall() {
-        Duration t = Duration.ofSeconds(Long.MIN_VALUE, 0);
-        t.minusMillis(1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofSeconds(Long.MIN_VALUE, 0);
+            t.minusMillis(1);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="MinusNanos")
     Object[][] provider_minusNanos_long() {
         return new Object[][] {
             {0, 0, 0,           0, 0},
@@ -2196,30 +2275,34 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="MinusNanos")
+    @ParameterizedTest
+    @MethodSource("provider_minusNanos_long")
     public void minusNanos_long(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Duration t = Duration.ofSeconds(seconds, nanos);
         t = t.minusNanos(amount);
-        assertEquals(t.getSeconds(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, t.getSeconds());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void minusNanos_long_overflowTooBig() {
-        Duration t = Duration.ofSeconds(Long.MAX_VALUE, 999999999);
-        t.minusNanos(-1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofSeconds(Long.MAX_VALUE, 999999999);
+            t.minusNanos(-1);
+        });
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void minusNanos_long_overflowTooSmall() {
-        Duration t = Duration.ofSeconds(Long.MIN_VALUE, 0);
-        t.minusNanos(1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration t = Duration.ofSeconds(Long.MIN_VALUE, 0);
+            t.minusNanos(1);
+        });
     }
 
     //-----------------------------------------------------------------------
     // multipliedBy()
     //-----------------------------------------------------------------------
-    @DataProvider(name="MultipliedBy")
     Object[][] provider_multipliedBy() {
        return new Object[][] {
           {-4, 666666667, -3,   9, 999999999},
@@ -2312,36 +2395,41 @@ public class TCKDuration extends AbstractTCKTest {
        };
     }
 
-    @Test(dataProvider="MultipliedBy")
+    @ParameterizedTest
+    @MethodSource("provider_multipliedBy")
     public void multipliedBy(long seconds, int nanos, int multiplicand, long expectedSeconds, int expectedNanos) {
         Duration t = Duration.ofSeconds(seconds, nanos);
         t = t.multipliedBy(multiplicand);
-        assertEquals(t.getSeconds(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanos);
+        assertEquals(expectedSeconds, t.getSeconds());
+        assertEquals(expectedNanos, t.getNano());
     }
 
     @Test
     public void multipliedBy_max() {
         Duration test = Duration.ofSeconds(1);
-        assertEquals(test.multipliedBy(Long.MAX_VALUE), Duration.ofSeconds(Long.MAX_VALUE));
+        assertEquals(Duration.ofSeconds(Long.MAX_VALUE), test.multipliedBy(Long.MAX_VALUE));
     }
 
     @Test
     public void multipliedBy_min() {
         Duration test = Duration.ofSeconds(1);
-        assertEquals(test.multipliedBy(Long.MIN_VALUE), Duration.ofSeconds(Long.MIN_VALUE));
+        assertEquals(Duration.ofSeconds(Long.MIN_VALUE), test.multipliedBy(Long.MIN_VALUE));
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void multipliedBy_tooBig() {
-        Duration test = Duration.ofSeconds(1, 1);
-        test.multipliedBy(Long.MAX_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration test = Duration.ofSeconds(1, 1);
+            test.multipliedBy(Long.MAX_VALUE);
+        });
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void multipliedBy_tooBig_negative() {
-        Duration test = Duration.ofSeconds(1, 1);
-        test.multipliedBy(Long.MIN_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration test = Duration.ofSeconds(1, 1);
+            test.multipliedBy(Long.MIN_VALUE);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -2417,7 +2505,6 @@ public class TCKDuration extends AbstractTCKTest {
         }
     };
 
-    @DataProvider(name="truncatedToValid")
     Object[][] data_truncatedToValid() {
         return new Object[][] {
                 {Duration.ofSeconds(86400 + 3600 + 60 + 1, 123_456_789), NANOS, Duration.ofSeconds(86400 + 3600 + 60 + 1, 123_456_789)},
@@ -2446,12 +2533,12 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="truncatedToValid")
+    @ParameterizedTest
+    @MethodSource("data_truncatedToValid")
     public void test_truncatedTo_valid(Duration input, TemporalUnit unit, Duration expected) {
-        assertEquals(input.truncatedTo(unit), expected);
+        assertEquals(expected, input.truncatedTo(unit));
     }
 
-    @DataProvider(name="truncatedToInvalid")
     Object[][] data_truncatedToInvalid() {
         return new Object[][] {
                 {Duration.ofSeconds(1, 123_456_789), NINETY_FIVE_MINS},
@@ -2461,20 +2548,20 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="truncatedToInvalid", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_truncatedToInvalid")
     public void test_truncatedTo_invalid(Duration input, TemporalUnit unit) {
-        input.truncatedTo(unit);
+        Assertions.assertThrows(DateTimeException.class, () -> input.truncatedTo(unit));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_truncatedTo_null() {
-        Duration.ofSeconds(1234).truncatedTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Duration.ofSeconds(1234).truncatedTo(null));
     }
 
     //-----------------------------------------------------------------------
     // dividedBy()
     //-----------------------------------------------------------------------
-    @DataProvider(name="DividedBy")
     Object[][] provider_dividedBy() {
        return new Object[][] {
           {-4, 666666667, -3,  1, 111111111},
@@ -2556,32 +2643,35 @@ public class TCKDuration extends AbstractTCKTest {
        };
     }
 
-    @Test(dataProvider="DividedBy")
+    @ParameterizedTest
+    @MethodSource("provider_dividedBy")
     public void dividedBy(long seconds, int nanos, int divisor, long expectedSeconds, int expectedNanos) {
         Duration t = Duration.ofSeconds(seconds, nanos);
         t = t.dividedBy(divisor);
-        assertEquals(t.getSeconds(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanos);
+        assertEquals(expectedSeconds, t.getSeconds());
+        assertEquals(expectedNanos, t.getNano());
     }
 
-    @Test(dataProvider="DividedBy", expectedExceptions=ArithmeticException.class)
+    @ParameterizedTest
+    @MethodSource("provider_dividedBy")
     public void dividedByZero(long seconds, int nanos, int divisor, long expectedSeconds, int expectedNanos) {
-       Duration t = Duration.ofSeconds(seconds, nanos);
-       t.dividedBy(0);
-       fail(t + " divided by zero did not throw ArithmeticException");
+       Assertions.assertThrows(ArithmeticException.class, () -> {
+           Duration t = Duration.ofSeconds(seconds, nanos);
+           t.dividedBy(0);
+            fail(t + " divided by zero did not throw ArithmeticException");
+        });
     }
 
     @Test
     public void dividedBy_max() {
         Duration test = Duration.ofSeconds(Long.MAX_VALUE);
-        assertEquals(test.dividedBy(Long.MAX_VALUE), Duration.ofSeconds(1));
+        assertEquals(Duration.ofSeconds(1), test.dividedBy(Long.MAX_VALUE));
     }
 
     //-----------------------------------------------------------------------
     // dividedbyDur()
     //-----------------------------------------------------------------------
 
-    @DataProvider(name="dividedByDur_provider")
     Object[][] provider_dividedByDur() {
         return new Object[][] {
             {Duration.ofSeconds(0, 0), Duration.ofSeconds(1, 0), 0},
@@ -2612,28 +2702,35 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="dividedByDur_provider")
+    @ParameterizedTest
+    @MethodSource("provider_dividedByDur")
     public void test_dividedByDur(Duration dividend, Duration divisor, long expected) {
-        assertEquals(dividend.dividedBy(divisor), expected);
+        assertEquals(expected, dividend.dividedBy(divisor));
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_dividedByDur_zero() {
-       Duration t = Duration.ofSeconds(1, 0);
-       t.dividedBy(Duration.ZERO);
+       Assertions.assertThrows(ArithmeticException.class, () -> {
+           Duration t = Duration.ofSeconds(1, 0);
+           t.dividedBy(Duration.ZERO);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_dividedByDur_null() {
-       Duration t = Duration.ofSeconds(1, 0);
-       t.dividedBy(null);
+       Assertions.assertThrows(NullPointerException.class, () -> {
+           Duration t = Duration.ofSeconds(1, 0);
+           t.dividedBy(null);
+        });
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_dividedByDur_overflow() {
-       Duration dur1 = Duration.ofSeconds(Long.MAX_VALUE, 0);
-       Duration dur2 = Duration.ofNanos(1);
-       dur1.dividedBy(dur2);
+       Assertions.assertThrows(ArithmeticException.class, () -> {
+           Duration dur1 = Duration.ofSeconds(Long.MAX_VALUE, 0);
+           Duration dur2 = Duration.ofNanos(1);
+           dur1.dividedBy(dur2);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -2641,19 +2738,19 @@ public class TCKDuration extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_negated() {
-        assertEquals(Duration.ofSeconds(0).negated(), Duration.ofSeconds(0));
-        assertEquals(Duration.ofSeconds(12).negated(), Duration.ofSeconds(-12));
-        assertEquals(Duration.ofSeconds(-12).negated(), Duration.ofSeconds(12));
-        assertEquals(Duration.ofSeconds(12, 20).negated(), Duration.ofSeconds(-12, -20));
-        assertEquals(Duration.ofSeconds(12, -20).negated(), Duration.ofSeconds(-12, 20));
-        assertEquals(Duration.ofSeconds(-12, -20).negated(), Duration.ofSeconds(12, 20));
-        assertEquals(Duration.ofSeconds(-12, 20).negated(), Duration.ofSeconds(12, -20));
-        assertEquals(Duration.ofSeconds(Long.MAX_VALUE).negated(), Duration.ofSeconds(-Long.MAX_VALUE));
+        assertEquals(Duration.ofSeconds(0), Duration.ofSeconds(0).negated());
+        assertEquals(Duration.ofSeconds(-12), Duration.ofSeconds(12).negated());
+        assertEquals(Duration.ofSeconds(12), Duration.ofSeconds(-12).negated());
+        assertEquals(Duration.ofSeconds(-12, -20), Duration.ofSeconds(12, 20).negated());
+        assertEquals(Duration.ofSeconds(-12, 20), Duration.ofSeconds(12, -20).negated());
+        assertEquals(Duration.ofSeconds(12, 20), Duration.ofSeconds(-12, -20).negated());
+        assertEquals(Duration.ofSeconds(12, -20), Duration.ofSeconds(-12, 20).negated());
+        assertEquals(Duration.ofSeconds(-Long.MAX_VALUE), Duration.ofSeconds(Long.MAX_VALUE).negated());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_negated_overflow() {
-        Duration.ofSeconds(Long.MIN_VALUE).negated();
+        Assertions.assertThrows(ArithmeticException.class, () -> Duration.ofSeconds(Long.MIN_VALUE).negated());
     }
 
     //-----------------------------------------------------------------------
@@ -2661,19 +2758,19 @@ public class TCKDuration extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_abs() {
-        assertEquals(Duration.ofSeconds(0).abs(), Duration.ofSeconds(0));
-        assertEquals(Duration.ofSeconds(12).abs(), Duration.ofSeconds(12));
-        assertEquals(Duration.ofSeconds(-12).abs(), Duration.ofSeconds(12));
-        assertEquals(Duration.ofSeconds(12, 20).abs(), Duration.ofSeconds(12, 20));
-        assertEquals(Duration.ofSeconds(12, -20).abs(), Duration.ofSeconds(12, -20));
-        assertEquals(Duration.ofSeconds(-12, -20).abs(), Duration.ofSeconds(12, 20));
-        assertEquals(Duration.ofSeconds(-12, 20).abs(), Duration.ofSeconds(12, -20));
-        assertEquals(Duration.ofSeconds(Long.MAX_VALUE).abs(), Duration.ofSeconds(Long.MAX_VALUE));
+        assertEquals(Duration.ofSeconds(0), Duration.ofSeconds(0).abs());
+        assertEquals(Duration.ofSeconds(12), Duration.ofSeconds(12).abs());
+        assertEquals(Duration.ofSeconds(12), Duration.ofSeconds(-12).abs());
+        assertEquals(Duration.ofSeconds(12, 20), Duration.ofSeconds(12, 20).abs());
+        assertEquals(Duration.ofSeconds(12, -20), Duration.ofSeconds(12, -20).abs());
+        assertEquals(Duration.ofSeconds(12, 20), Duration.ofSeconds(-12, -20).abs());
+        assertEquals(Duration.ofSeconds(12, -20), Duration.ofSeconds(-12, 20).abs());
+        assertEquals(Duration.ofSeconds(Long.MAX_VALUE), Duration.ofSeconds(Long.MAX_VALUE).abs());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_abs_overflow() {
-        Duration.ofSeconds(Long.MIN_VALUE).abs();
+        Assertions.assertThrows(ArithmeticException.class, () -> Duration.ofSeconds(Long.MIN_VALUE).abs());
     }
 
     //-----------------------------------------------------------------------
@@ -2681,33 +2778,37 @@ public class TCKDuration extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_toNanos() {
-        assertEquals(Duration.ofSeconds(321, 123456789).toNanos(), 321123456789L);
-        assertEquals(Duration.ofNanos(Long.MAX_VALUE).toNanos(), 9223372036854775807L);
-        assertEquals(Duration.ofNanos(Long.MIN_VALUE).toNanos(), -9223372036854775808L);
+        assertEquals(321123456789L, Duration.ofSeconds(321, 123456789).toNanos());
+        assertEquals(9223372036854775807L, Duration.ofNanos(Long.MAX_VALUE).toNanos());
+        assertEquals(-9223372036854775808L, Duration.ofNanos(Long.MIN_VALUE).toNanos());
     }
 
     @Test
     public void test_toNanos_max() {
         Duration test = Duration.ofSeconds(0, Long.MAX_VALUE);
-        assertEquals(test.toNanos(), Long.MAX_VALUE);
+        assertEquals(Long.MAX_VALUE, test.toNanos());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_toNanos_tooBig() {
-        Duration test = Duration.ofSeconds(0, Long.MAX_VALUE).plusNanos(1);
-        test.toNanos();
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration test = Duration.ofSeconds(0, Long.MAX_VALUE).plusNanos(1);
+            test.toNanos();
+        });
     }
 
     @Test
     public void test_toNanos_min() {
         Duration test = Duration.ofSeconds(0, Long.MIN_VALUE);
-        assertEquals(test.toNanos(), Long.MIN_VALUE);
+        assertEquals(Long.MIN_VALUE, test.toNanos());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_toNanos_tooSmall() {
-        Duration test = Duration.ofSeconds(0, Long.MIN_VALUE).minusNanos(1);
-        test.toNanos();
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration test = Duration.ofSeconds(0, Long.MIN_VALUE).minusNanos(1);
+            test.toNanos();
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -2715,39 +2816,42 @@ public class TCKDuration extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_toMillis() {
-        assertEquals(Duration.ofSeconds(321, 123456789).toMillis(), 321000 + 123);
-        assertEquals(Duration.ofMillis(Long.MAX_VALUE).toMillis(), 9223372036854775807L);
-        assertEquals(Duration.ofMillis(Long.MIN_VALUE).toMillis(), -9223372036854775808L);
+        assertEquals(321000 + 123, Duration.ofSeconds(321, 123456789).toMillis());
+        assertEquals(9223372036854775807L, Duration.ofMillis(Long.MAX_VALUE).toMillis());
+        assertEquals(-9223372036854775808L, Duration.ofMillis(Long.MIN_VALUE).toMillis());
     }
 
     @Test
     public void test_toMillis_max() {
         Duration test = Duration.ofSeconds(Long.MAX_VALUE / 1000, (Long.MAX_VALUE % 1000) * 1000000);
-        assertEquals(test.toMillis(), Long.MAX_VALUE);
+        assertEquals(Long.MAX_VALUE, test.toMillis());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_toMillis_tooBig() {
-        Duration test = Duration.ofSeconds(Long.MAX_VALUE / 1000, ((Long.MAX_VALUE % 1000) + 1) * 1000000);
-        test.toMillis();
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration test = Duration.ofSeconds(Long.MAX_VALUE / 1000, ((Long.MAX_VALUE % 1000) + 1) * 1000000);
+            test.toMillis();
+        });
     }
 
     @Test
     public void test_toMillis_min() {
         Duration test = Duration.ofSeconds(Long.MIN_VALUE / 1000, (Long.MIN_VALUE % 1000) * 1000000);
-        assertEquals(test.toMillis(), Long.MIN_VALUE);
+        assertEquals(Long.MIN_VALUE, test.toMillis());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_toMillis_tooSmall() {
-        Duration test = Duration.ofSeconds(Long.MIN_VALUE / 1000, ((Long.MIN_VALUE % 1000) - 1) * 1000000);
-        test.toMillis();
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Duration test = Duration.ofSeconds(Long.MIN_VALUE / 1000, ((Long.MIN_VALUE % 1000) - 1) * 1000000);
+            test.toMillis();
+        });
     }
 
     //-----------------------------------------------------------------------
     // toSeconds()
     //-----------------------------------------------------------------------
-    @DataProvider(name="toSeconds_provider")
     Object[][] provider_toSeconds() {
         return new Object[][] {
             {Duration.ofSeconds(365 * 86400 + 5 * 3600 + 48 * 60 + 46, 123_456_789), 31556926L},
@@ -2761,15 +2865,15 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="toSeconds_provider")
+    @ParameterizedTest
+    @MethodSource("provider_toSeconds")
     public void test_toSeconds(Duration dur, long seconds) {
-        assertEquals(dur.toSeconds(), seconds);
+        assertEquals(seconds, dur.toSeconds());
     }
 
     //-----------------------------------------------------------------------
     // toDaysPart()
     //-----------------------------------------------------------------------
-    @DataProvider(name="toDaysPart_provider")
     Object[][] provider_toDaysPart() {
         return new Object[][] {
             {Duration.ofSeconds(365 * 86400 + 5 * 3600 + 48 * 60 + 46, 123_456_789), 365L},
@@ -2781,15 +2885,15 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="toDaysPart_provider")
+    @ParameterizedTest
+    @MethodSource("provider_toDaysPart")
     public void test_toDaysPart(Duration dur, long days) {
-        assertEquals(dur.toDaysPart(), days);
+        assertEquals(days, dur.toDaysPart());
     }
 
     //-----------------------------------------------------------------------
     // toHoursPart()
     //-----------------------------------------------------------------------
-    @DataProvider(name="toHoursPart_provider")
     Object[][] provider_toHoursPart() {
         return new Object[][] {
             {Duration.ofSeconds(365 * 86400 + 5 * 3600 + 48 * 60 + 46, 123_456_789), 5},
@@ -2800,15 +2904,15 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="toHoursPart_provider")
+    @ParameterizedTest
+    @MethodSource("provider_toHoursPart")
     public void test_toHoursPart(Duration dur, int hours) {
-        assertEquals(dur.toHoursPart(), hours);
+        assertEquals(hours, dur.toHoursPart());
     }
 
     //-----------------------------------------------------------------------
     // toMinutesPart()
     //-----------------------------------------------------------------------
-    @DataProvider(name="toMinutesPart_provider")
     Object[][] provider_toMinutesPart() {
         return new Object[][] {
             {Duration.ofSeconds(365 * 86400 + 5 * 3600 + 48 * 60 + 46, 123_456_789), 48},
@@ -2820,15 +2924,15 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="toMinutesPart_provider")
+    @ParameterizedTest
+    @MethodSource("provider_toMinutesPart")
     public void test_toMinutesPart(Duration dur, int minutes) {
-        assertEquals(dur.toMinutesPart(), minutes);
+        assertEquals(minutes, dur.toMinutesPart());
     }
 
     //-----------------------------------------------------------------------
     // toSecondsPart()
     //-----------------------------------------------------------------------
-    @DataProvider(name="toSecondsPart_provider")
     Object[][] provider_toSecondsPart() {
         return new Object[][] {
             {Duration.ofSeconds(365 * 86400 + 5 * 3600 + 48 * 60 + 46, 123_456_789), 46},
@@ -2840,15 +2944,15 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="toSecondsPart_provider")
+    @ParameterizedTest
+    @MethodSource("provider_toSecondsPart")
     public void test_toSecondsPart(Duration dur, int seconds) {
-        assertEquals(dur.toSecondsPart(), seconds);
+        assertEquals(seconds, dur.toSecondsPart());
     }
 
     //-----------------------------------------------------------------------
     // toMillisPart()
     //-----------------------------------------------------------------------
-    @DataProvider(name="toMillisPart_provider")
     Object[][] provider_toMillisPart() {
         return new Object[][] {
             {Duration.ofSeconds(365 * 86400 + 5 * 3600 + 48 * 60 + 46, 123_456_789), 123},
@@ -2860,15 +2964,15 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="toMillisPart_provider")
+    @ParameterizedTest
+    @MethodSource("provider_toMillisPart")
     public void test_toMillisPart(Duration dur, int millis) {
-        assertEquals(dur.toMillisPart(), millis);
+        assertEquals(millis, dur.toMillisPart());
     }
 
     //-----------------------------------------------------------------------
     // toNanosPart()
     //-----------------------------------------------------------------------
-    @DataProvider(name="toNanosPart_provider")
     Object[][] provider_toNanosPart() {
         return new Object[][] {
             {Duration.ofSeconds(365 * 86400 + 5 * 3600 + 48 * 60 + 46, 123_456_789), 123_456_789},
@@ -2880,9 +2984,10 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="toNanosPart_provider")
+    @ParameterizedTest
+    @MethodSource("provider_toNanosPart")
     public void test_toNanosPart(Duration dur, int nanos) {
-        assertEquals(dur.toNanosPart(), nanos);
+        assertEquals(nanos, dur.toNanosPart());
     }
 
     //-----------------------------------------------------------------------
@@ -2913,30 +3018,34 @@ public class TCKDuration extends AbstractTCKTest {
             for (int j = 0; j < durations.length; j++) {
                 Duration b = durations[j];
                 if (i < j) {
-                    assertEquals(a.compareTo(b)< 0, true, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(true, a.compareTo(b)< 0, a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else if (i > j) {
-                    assertEquals(a.compareTo(b) > 0, true, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(true, a.compareTo(b) > 0, a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else {
-                    assertEquals(a.compareTo(b), 0, a + " <=> " + b);
-                    assertEquals(a.equals(b), true, a + " <=> " + b);
+                    assertEquals(0, a.compareTo(b), a + " <=> " + b);
+                    assertEquals(true, a.equals(b), a + " <=> " + b);
                 }
             }
         }
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_compareTo_ObjectNull() {
-        Duration a = Duration.ofSeconds(0L, 0);
-        a.compareTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            Duration a = Duration.ofSeconds(0L, 0);
+            a.compareTo(null);
+        });
     }
 
-    @Test(expectedExceptions=ClassCastException.class)
     @SuppressWarnings({ "unchecked", "rawtypes" })
+    @Test
     public void compareToNonDuration() {
-       Comparable c = Duration.ofSeconds(0L);
-       c.compareTo(new Object());
+       Assertions.assertThrows(ClassCastException.class, () -> {
+           Comparable c = Duration.ofSeconds(0L);
+           c.compareTo(new Object());
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -2949,37 +3058,37 @@ public class TCKDuration extends AbstractTCKTest {
         Duration test5n = Duration.ofSeconds(5L, 30);
         Duration test6 = Duration.ofSeconds(6L, 20);
 
-        assertEquals(test5a.equals(test5a), true);
-        assertEquals(test5a.equals(test5b), true);
-        assertEquals(test5a.equals(test5n), false);
-        assertEquals(test5a.equals(test6), false);
+        assertEquals(true, test5a.equals(test5a));
+        assertEquals(true, test5a.equals(test5b));
+        assertEquals(false, test5a.equals(test5n));
+        assertEquals(false, test5a.equals(test6));
 
-        assertEquals(test5b.equals(test5a), true);
-        assertEquals(test5b.equals(test5b), true);
-        assertEquals(test5b.equals(test5n), false);
-        assertEquals(test5b.equals(test6), false);
+        assertEquals(true, test5b.equals(test5a));
+        assertEquals(true, test5b.equals(test5b));
+        assertEquals(false, test5b.equals(test5n));
+        assertEquals(false, test5b.equals(test6));
 
-        assertEquals(test5n.equals(test5a), false);
-        assertEquals(test5n.equals(test5b), false);
-        assertEquals(test5n.equals(test5n), true);
-        assertEquals(test5n.equals(test6), false);
+        assertEquals(false, test5n.equals(test5a));
+        assertEquals(false, test5n.equals(test5b));
+        assertEquals(true, test5n.equals(test5n));
+        assertEquals(false, test5n.equals(test6));
 
-        assertEquals(test6.equals(test5a), false);
-        assertEquals(test6.equals(test5b), false);
-        assertEquals(test6.equals(test5n), false);
-        assertEquals(test6.equals(test6), true);
+        assertEquals(false, test6.equals(test5a));
+        assertEquals(false, test6.equals(test5b));
+        assertEquals(false, test6.equals(test5n));
+        assertEquals(true, test6.equals(test6));
     }
 
     @Test
     public void test_equals_null() {
         Duration test5 = Duration.ofSeconds(5L, 20);
-        assertEquals(test5.equals(null), false);
+        assertEquals(false, test5.equals(null));
     }
 
     @Test
     public void test_equals_otherClass() {
         Duration test5 = Duration.ofSeconds(5L, 20);
-        assertEquals(test5.equals(""), false);
+        assertEquals(false, test5.equals(""));
     }
 
     //-----------------------------------------------------------------------
@@ -2992,16 +3101,15 @@ public class TCKDuration extends AbstractTCKTest {
         Duration test5n = Duration.ofSeconds(5L, 30);
         Duration test6 = Duration.ofSeconds(6L, 20);
 
-        assertEquals(test5a.hashCode() == test5a.hashCode(), true);
-        assertEquals(test5a.hashCode() == test5b.hashCode(), true);
-        assertEquals(test5b.hashCode() == test5b.hashCode(), true);
+        assertEquals(true, test5a.hashCode() == test5a.hashCode());
+        assertEquals(true, test5a.hashCode() == test5b.hashCode());
+        assertEquals(true, test5b.hashCode() == test5b.hashCode());
 
-        assertEquals(test5a.hashCode() == test5n.hashCode(), false);
-        assertEquals(test5a.hashCode() == test6.hashCode(), false);
+        assertEquals(false, test5a.hashCode() == test5n.hashCode());
+        assertEquals(false, test5a.hashCode() == test6.hashCode());
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="withNanos")
     Object[][] provider_withNanos_int() {
         return new Object[][] {
             {0, 0, 0,           0, 0},
@@ -3025,16 +3133,16 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="withNanos")
+    @ParameterizedTest
+    @MethodSource("provider_withNanos_int")
     public void withNanos_long(long seconds, int nanos, int amount, long expectedSeconds, int expectedNanoOfSecond) {
         Duration t = Duration.ofSeconds(seconds, nanos);
         t = t.withNanos(amount);
-        assertEquals(t.getSeconds(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, t.getSeconds());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="withSeconds")
     Object[][] provider_withSeconds_long() {
         return new Object[][] {
             {0, 0, 0, 0, 0},
@@ -3057,18 +3165,18 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="withSeconds")
+    @ParameterizedTest
+    @MethodSource("provider_withSeconds_long")
     public void withSeconds_long(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Duration t = Duration.ofSeconds(seconds, nanos);
         t = t.withSeconds(amount);
-        assertEquals(t.getSeconds(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, t.getSeconds());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
-    @DataProvider(name="toString")
     Object[][] provider_toString() {
         return new Object[][] {
             {0, 0, "PT0S"},
@@ -3114,18 +3222,19 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="toString")
+    @ParameterizedTest
+    @MethodSource("provider_toString")
     public void test_toString(long seconds, int nanos, String expected) {
         Duration t = Duration.ofSeconds(seconds, nanos);
-        assertEquals(t.toString(), expected);
+        assertEquals(expected, t.toString());
     }
 
     //-----------------------------------------------------------------------
-    @Test(groups="{tck}")
+    @Test
     public void test_duration_getUnits() {
         Duration duration = Duration.ofSeconds(5000, 1000);
         List<TemporalUnit> units = duration.getUnits();
-        assertEquals(units.size(), 2, "Period.getUnits length");
+        assertEquals(2, units.size(), "Period.getUnits length");
         assertTrue(units.contains(ChronoUnit.SECONDS), "Period.getUnits contains ChronoUnit.SECONDS");
         assertTrue(units.contains(ChronoUnit.NANOS), "contains ChronoUnit.NANOS");
     }
@@ -3134,12 +3243,11 @@ public class TCKDuration extends AbstractTCKTest {
     public void test_getUnit() {
         Duration test = Duration.ofSeconds(2000, 1000);
         long seconds = test.get(ChronoUnit.SECONDS);
-        assertEquals(seconds, 2000, "duration.get(SECONDS)");
+        assertEquals(2000, seconds, "duration.get(SECONDS)");
         long nanos = test.get(ChronoUnit.NANOS);
-        assertEquals(nanos, 1000, "duration.get(NANOS)");
+        assertEquals(1000, nanos, "duration.get(NANOS)");
     }
 
-    @DataProvider(name="BadTemporalUnit")
     Object[][] provider_factory_of_badTemporalUnit() {
         return new Object[][] {
             {0, MICROS},
@@ -3156,9 +3264,12 @@ public class TCKDuration extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="BadTemporalUnit", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("provider_factory_of_badTemporalUnit")
     public void test_bad_getUnit(long amount, TemporalUnit unit) {
-        Duration t = Duration.of(amount, unit);
-        t.get(unit);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Duration t = Duration.of(amount, unit);
+            t.get(unit);
+        });
     }
 }
diff --git a/test/jdk/java/time/tck/java/time/TCKInstant.java b/test/jdk/java/time/tck/java/time/TCKInstant.java
index d92d46d62bd..4a512d37665 100644
--- a/test/jdk/java/time/tck/java/time/TCKInstant.java
+++ b/test/jdk/java/time/tck/java/time/TCKInstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,9 +73,10 @@ import static java.time.temporal.ChronoUnit.NANOS;
 import static java.time.temporal.ChronoUnit.SECONDS;
 import static java.time.temporal.ChronoUnit.WEEKS;
 import static java.time.temporal.ChronoUnit.YEARS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -107,16 +108,20 @@ import java.util.List;
 import java.util.Locale;
 
 import java.util.Optional;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test Instant.
  *
  * @bug 8133022 8307466
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKInstant extends AbstractDateTimeTest {
 
     private static final long MIN_SECOND = Instant.MIN.getEpochSecond();
@@ -126,7 +131,7 @@ public class TCKInstant extends AbstractDateTimeTest {
 
     private Instant TEST_12345_123456789;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_12345_123456789 = Instant.ofEpochSecond(12345, 123456789);
     }
@@ -161,8 +166,8 @@ public class TCKInstant extends AbstractDateTimeTest {
 
     //-----------------------------------------------------------------------
     private void check(Instant instant, long epochSecs, int nos) {
-        assertEquals(instant.getEpochSecond(), epochSecs);
-        assertEquals(instant.getNano(), nos);
+        assertEquals(epochSecs, instant.getEpochSecond());
+        assertEquals(nos, instant.getNano());
         assertEquals(instant, instant);
         assertEquals(instant.hashCode(), instant.hashCode());
     }
@@ -208,9 +213,9 @@ public class TCKInstant extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // now(Clock)
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_Clock_nullClock() {
-        Instant.now(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Instant.now(null));
     }
 
     @Test
@@ -219,7 +224,7 @@ public class TCKInstant extends AbstractDateTimeTest {
             Instant expected = Instant.ofEpochSecond(i).plusNanos(123456789L);
             Clock clock = Clock.fixed(expected, ZoneOffset.UTC);
             Instant test = Instant.now(clock);
-            assertEquals(test, expected);
+            assertEquals(expected, test);
         }
     }
 
@@ -229,7 +234,7 @@ public class TCKInstant extends AbstractDateTimeTest {
             Instant expected = Instant.ofEpochSecond(i).plusNanos(123456789L);
             Clock clock = Clock.fixed(expected, ZoneOffset.UTC);
             Instant test = Instant.now(clock);
-            assertEquals(test, expected);
+            assertEquals(expected, test);
         }
     }
 
@@ -240,8 +245,8 @@ public class TCKInstant extends AbstractDateTimeTest {
     public void factory_seconds_long() {
         for (long i = -2; i <= 2; i++) {
             Instant t = Instant.ofEpochSecond(i);
-            assertEquals(t.getEpochSecond(), i);
-            assertEquals(t.getNano(), 0);
+            assertEquals(i, t.getEpochSecond());
+            assertEquals(0, t.getNano());
         }
     }
 
@@ -253,18 +258,18 @@ public class TCKInstant extends AbstractDateTimeTest {
         for (long i = -2; i <= 2; i++) {
             for (int j = 0; j < 10; j++) {
                 Instant t = Instant.ofEpochSecond(i, j);
-                assertEquals(t.getEpochSecond(), i);
-                assertEquals(t.getNano(), j);
+                assertEquals(i, t.getEpochSecond());
+                assertEquals(j, t.getNano());
             }
             for (int j = -10; j < 0; j++) {
                 Instant t = Instant.ofEpochSecond(i, j);
-                assertEquals(t.getEpochSecond(), i - 1);
-                assertEquals(t.getNano(), j + 1000000000);
+                assertEquals(i - 1, t.getEpochSecond());
+                assertEquals(j + 1000000000, t.getNano());
             }
             for (int j = 999999990; j < 1000000000; j++) {
                 Instant t = Instant.ofEpochSecond(i, j);
-                assertEquals(t.getEpochSecond(), i);
-                assertEquals(t.getNano(), j);
+                assertEquals(i, t.getEpochSecond());
+                assertEquals(j, t.getNano());
             }
         }
     }
@@ -272,24 +277,23 @@ public class TCKInstant extends AbstractDateTimeTest {
     @Test
     public void factory_seconds_long_long_nanosNegativeAdjusted() {
         Instant test = Instant.ofEpochSecond(2L, -1);
-        assertEquals(test.getEpochSecond(), 1);
-        assertEquals(test.getNano(), 999999999);
+        assertEquals(1, test.getEpochSecond());
+        assertEquals(999999999, test.getNano());
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_seconds_long_long_tooBig() {
-        Instant.ofEpochSecond(MAX_SECOND, 1000000000);
+        Assertions.assertThrows(DateTimeException.class, () -> Instant.ofEpochSecond(MAX_SECOND, 1000000000));
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void factory_seconds_long_long_tooBigBig() {
-        Instant.ofEpochSecond(Long.MAX_VALUE, Long.MAX_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> Instant.ofEpochSecond(Long.MAX_VALUE, Long.MAX_VALUE));
     }
 
     //-----------------------------------------------------------------------
     // ofEpochMilli(long)
     //-----------------------------------------------------------------------
-    @DataProvider(name="MillisInstantNoNanos")
     Object[][] provider_factory_millis_long() {
         return new Object[][] {
                 {0, 0, 0},
@@ -306,18 +310,18 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="MillisInstantNoNanos")
+    @ParameterizedTest
+    @MethodSource("provider_factory_millis_long")
     public void factory_millis_long(long millis, long expectedSeconds, int expectedNanoOfSecond) {
         Instant t = Instant.ofEpochMilli(millis);
-        assertEquals(t.getEpochSecond(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, t.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
     //-----------------------------------------------------------------------
     // parse(String)
     //-----------------------------------------------------------------------
     // see also parse tests under toString()
-    @DataProvider(name="Parse")
     Object[][] provider_factory_parse() {
         return new Object[][] {
                 {"1970-01-01T00:00:00Z", 0, 0},
@@ -338,18 +342,20 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="Parse")
+    @ParameterizedTest
+    @MethodSource("provider_factory_parse")
     public void factory_parse(String text, long expectedEpochSeconds, int expectedNanoOfSecond) {
         Instant t = Instant.parse(text);
-        assertEquals(t.getEpochSecond(), expectedEpochSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedEpochSeconds, t.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
-    @Test(dataProvider="Parse")
+    @ParameterizedTest
+    @MethodSource("provider_factory_parse")
     public void factory_parseLowercase(String text, long expectedEpochSeconds, int expectedNanoOfSecond) {
         Instant t = Instant.parse(text.toLowerCase(Locale.ENGLISH));
-        assertEquals(t.getEpochSecond(), expectedEpochSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedEpochSeconds, t.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
 // TODO: should comma be accepted?
@@ -361,7 +367,6 @@ public class TCKInstant extends AbstractDateTimeTest {
 //        assertEquals(t.getNano(), expectedNanoOfSecond);
 //    }
 
-    @DataProvider(name="ParseFailures")
     Object[][] provider_factory_parseFailures() {
         return new Object[][] {
                 {""},
@@ -374,20 +379,22 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="ParseFailures", expectedExceptions=DateTimeParseException.class)
+    @ParameterizedTest
+    @MethodSource("provider_factory_parseFailures")
     public void factory_parseFailures(String text) {
-        Instant.parse(text);
+        Assertions.assertThrows(DateTimeParseException.class, () -> Instant.parse(text));
     }
 
-    @Test(dataProvider="ParseFailures", expectedExceptions=DateTimeParseException.class)
+    @ParameterizedTest
+    @MethodSource("provider_factory_parseFailures")
     public void factory_parseFailures_comma(String text) {
-        text = text.replace('.', ',');
-        Instant.parse(text);
+        var commaText = text.replace('.', ',');
+        Assertions.assertThrows(DateTimeParseException.class, () -> Instant.parse(commaText));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_nullText() {
-        Instant.parse(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Instant.parse(null));
     }
 
     //-----------------------------------------------------------------------
@@ -396,24 +403,23 @@ public class TCKInstant extends AbstractDateTimeTest {
     @Test
     public void test_get_TemporalField() {
         Instant test = TEST_12345_123456789;
-        assertEquals(test.get(ChronoField.NANO_OF_SECOND), 123456789);
-        assertEquals(test.get(ChronoField.MICRO_OF_SECOND), 123456);
-        assertEquals(test.get(ChronoField.MILLI_OF_SECOND), 123);
+        assertEquals(123456789, test.get(ChronoField.NANO_OF_SECOND));
+        assertEquals(123456, test.get(ChronoField.MICRO_OF_SECOND));
+        assertEquals(123, test.get(ChronoField.MILLI_OF_SECOND));
     }
 
     @Test
     public void test_getLong_TemporalField() {
         Instant test = TEST_12345_123456789;
-        assertEquals(test.getLong(ChronoField.NANO_OF_SECOND), 123456789);
-        assertEquals(test.getLong(ChronoField.MICRO_OF_SECOND), 123456);
-        assertEquals(test.getLong(ChronoField.MILLI_OF_SECOND), 123);
-        assertEquals(test.getLong(ChronoField.INSTANT_SECONDS), 12345);
+        assertEquals(123456789, test.getLong(ChronoField.NANO_OF_SECOND));
+        assertEquals(123456, test.getLong(ChronoField.MICRO_OF_SECOND));
+        assertEquals(123, test.getLong(ChronoField.MILLI_OF_SECOND));
+        assertEquals(12345, test.getLong(ChronoField.INSTANT_SECONDS));
     }
 
     //-----------------------------------------------------------------------
     // query(TemporalQuery)
     //-----------------------------------------------------------------------
-    @DataProvider(name="query")
     Object[][] data_query() {
         return new Object[][] {
                 {TEST_12345_123456789, TemporalQueries.chronology(), null},
@@ -426,25 +432,26 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_query(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(temporal.query(query), expected);
+        assertEquals(expected, temporal.query(query));
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_queryFrom(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(query.queryFrom(temporal), expected);
+        assertEquals(expected, query.queryFrom(temporal));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_query_null() {
-        TEST_12345_123456789.query(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12345_123456789.query(null));
     }
 
     //-----------------------------------------------------------------------
     // adjustInto(Temporal)
     //-----------------------------------------------------------------------
-    @DataProvider(name="adjustInto")
     Object[][] data_adjustInto() {
         return new Object[][]{
                 {Instant.ofEpochSecond(10, 200), Instant.ofEpochSecond(20), Instant.ofEpochSecond(10, 200), null},
@@ -464,11 +471,12 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="adjustInto")
+    @ParameterizedTest
+    @MethodSource("data_adjustInto")
     public void test_adjustInto(Instant test, Temporal temporal, Temporal expected, Class<?> expectedEx) {
         if (expectedEx == null) {
             Temporal result = test.adjustInto(temporal);
-            assertEquals(result, expected);
+            assertEquals(expected, result);
         } else {
             try {
                 Temporal result = test.adjustInto(temporal);
@@ -482,7 +490,6 @@ public class TCKInstant extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // with(TemporalAdjuster)
     //-----------------------------------------------------------------------
-    @DataProvider(name="with")
     Object[][] data_with() {
         return new Object[][]{
                 {Instant.ofEpochSecond(10, 200), Instant.ofEpochSecond(20), Instant.ofEpochSecond(20), null},
@@ -500,11 +507,12 @@ public class TCKInstant extends AbstractDateTimeTest {
     }
 
 
-    @Test(dataProvider="with")
+    @ParameterizedTest
+    @MethodSource("data_with")
     public void test_with_temporalAdjuster(Instant test, TemporalAdjuster adjuster, Instant expected, Class<?> expectedEx) {
         if (expectedEx == null) {
             Instant result = test.with(adjuster);
-            assertEquals(result, expected);
+            assertEquals(expected, result);
         } else {
             try {
                 Instant result = test.with(adjuster);
@@ -518,7 +526,6 @@ public class TCKInstant extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // with(TemporalField, long)
     //-----------------------------------------------------------------------
-    @DataProvider(name="with_longTemporalField")
     Object[][] data_with_longTemporalField() {
         return new Object[][]{
                 {Instant.ofEpochSecond(10, 200), ChronoField.INSTANT_SECONDS, 100, Instant.ofEpochSecond(100, 200), null},
@@ -548,11 +555,12 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="with_longTemporalField")
+    @ParameterizedTest
+    @MethodSource("data_with_longTemporalField")
     public void test_with_longTemporalField(Instant test, TemporalField field, long value, Instant expected, Class<?> expectedEx) {
         if (expectedEx == null) {
             Instant result = test.with(field, value);
-            assertEquals(result, expected);
+            assertEquals(expected, result);
         } else {
             try {
                 Instant result = test.with(field, value);
@@ -636,7 +644,6 @@ public class TCKInstant extends AbstractDateTimeTest {
         }
     };
 
-    @DataProvider(name="truncatedToValid")
     Object[][] data_truncatedToValid() {
         return new Object[][] {
                 {Instant.ofEpochSecond(86400 + 3600 + 60 + 1, 123_456_789), NANOS, Instant.ofEpochSecond(86400 + 3600 + 60 + 1, 123_456_789)},
@@ -658,12 +665,12 @@ public class TCKInstant extends AbstractDateTimeTest {
                 {Instant.ofEpochSecond(-86400 - 3600 - 120, 0), MINUTES, Instant.ofEpochSecond(-86400 - 3600 - 120, 0)},
         };
     }
-    @Test(dataProvider="truncatedToValid")
+    @ParameterizedTest
+    @MethodSource("data_truncatedToValid")
     public void test_truncatedTo_valid(Instant input, TemporalUnit unit, Instant expected) {
-        assertEquals(input.truncatedTo(unit), expected);
+        assertEquals(expected, input.truncatedTo(unit));
     }
 
-    @DataProvider(name="truncatedToInvalid")
     Object[][] data_truncatedToInvalid() {
         return new Object[][] {
                 {Instant.ofEpochSecond(1, 123_456_789), NINETY_FIVE_MINS},
@@ -673,20 +680,20 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="truncatedToInvalid", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_truncatedToInvalid")
     public void test_truncatedTo_invalid(Instant input, TemporalUnit unit) {
-        input.truncatedTo(unit);
+        Assertions.assertThrows(DateTimeException.class, () -> input.truncatedTo(unit));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_truncatedTo_null() {
-        TEST_12345_123456789.truncatedTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12345_123456789.truncatedTo(null));
     }
 
     //-----------------------------------------------------------------------
     // plus(TemporalAmount)
     //-----------------------------------------------------------------------
-    @DataProvider(name="plusTemporalAmount")
     Object[][] data_plusTemporalAmount() {
         return new Object[][] {
                 {DAYS, MockSimplePeriod.of(1, DAYS), 86401, 0},
@@ -704,15 +711,15 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="plusTemporalAmount")
+    @ParameterizedTest
+    @MethodSource("data_plusTemporalAmount")
     public void test_plusTemporalAmount(TemporalUnit unit, TemporalAmount amount, int seconds, int nanos) {
         Instant inst = Instant.ofEpochMilli(1000);
         Instant actual = inst.plus(amount);
         Instant expected = Instant.ofEpochSecond(seconds, nanos);
-        assertEquals(actual, expected, "plus(TemporalAmount) failed");
+        assertEquals(expected, actual, "plus(TemporalAmount) failed");
     }
 
-    @DataProvider(name="badTemporalAmount")
     Object[][] data_badPlusTemporalAmount() {
         return new Object[][] {
                 {MockSimplePeriod.of(2, YEARS)},
@@ -720,14 +727,16 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="badTemporalAmount",expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_badPlusTemporalAmount")
     public void test_badPlusTemporalAmount(TemporalAmount amount) {
-        Instant inst = Instant.ofEpochMilli(1000);
-        inst.plus(amount);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant inst = Instant.ofEpochMilli(1000);
+            inst.plus(amount);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="Plus")
     Object[][] provider_plus() {
         return new Object[][] {
                 {MIN_SECOND, 0, -MIN_SECOND, 0, 0, 0},
@@ -928,48 +937,57 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="Plus")
+    @ParameterizedTest
+    @MethodSource("provider_plus")
     public void plus_Duration(long seconds, int nanos, long otherSeconds, int otherNanos, long expectedSeconds, int expectedNanoOfSecond) {
         Instant i = Instant.ofEpochSecond(seconds, nanos).plus(Duration.ofSeconds(otherSeconds, otherNanos));
-        assertEquals(i.getEpochSecond(), expectedSeconds);
-        assertEquals(i.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, i.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, i.getNano());
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void plus_Duration_overflowTooBig() {
-        Instant i = Instant.ofEpochSecond(MAX_SECOND, 999999999);
-        i.plus(Duration.ofSeconds(0, 1));
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant i = Instant.ofEpochSecond(MAX_SECOND, 999999999);
+            i.plus(Duration.ofSeconds(0, 1));
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void plus_Duration_overflowTooSmall() {
-        Instant i = Instant.ofEpochSecond(MIN_SECOND);
-        i.plus(Duration.ofSeconds(-1, 999999999));
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant i = Instant.ofEpochSecond(MIN_SECOND);
+            i.plus(Duration.ofSeconds(-1, 999999999));
+        });
     }
 
     //-----------------------------------------------------------------------a
-    @Test(dataProvider="Plus")
+    @ParameterizedTest
+    @MethodSource("provider_plus")
     public void plus_longTemporalUnit(long seconds, int nanos, long otherSeconds, int otherNanos, long expectedSeconds, int expectedNanoOfSecond) {
         Instant i = Instant.ofEpochSecond(seconds, nanos).plus(otherSeconds, SECONDS).plus(otherNanos, NANOS);
-        assertEquals(i.getEpochSecond(), expectedSeconds);
-        assertEquals(i.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, i.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, i.getNano());
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void plus_longTemporalUnit_overflowTooBig() {
-        Instant i = Instant.ofEpochSecond(MAX_SECOND, 999999999);
-        i.plus(1, NANOS);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant i = Instant.ofEpochSecond(MAX_SECOND, 999999999);
+            i.plus(1, NANOS);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void plus_longTemporalUnit_overflowTooSmall() {
-        Instant i = Instant.ofEpochSecond(MIN_SECOND);
-        i.plus(999999999, NANOS);
-        i.plus(-1, SECONDS);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant i = Instant.ofEpochSecond(MIN_SECOND);
+            i.plus(999999999, NANOS);
+            i.plus(-1, SECONDS);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="PlusSeconds")
     Object[][] provider_plusSeconds_long() {
         return new Object[][] {
                 {0, 0, 0, 0, 0},
@@ -998,28 +1016,32 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="PlusSeconds")
+    @ParameterizedTest
+    @MethodSource("provider_plusSeconds_long")
     public void plusSeconds_long(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Instant t = Instant.ofEpochSecond(seconds, nanos);
         t = t.plusSeconds(amount);
-        assertEquals(t.getEpochSecond(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, t.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void plusSeconds_long_overflowTooBig() {
-        Instant t = Instant.ofEpochSecond(1, 0);
-        t.plusSeconds(Long.MAX_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Instant t = Instant.ofEpochSecond(1, 0);
+            t.plusSeconds(Long.MAX_VALUE);
+        });
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void plusSeconds_long_overflowTooSmall() {
-        Instant t = Instant.ofEpochSecond(-1, 0);
-        t.plusSeconds(Long.MIN_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Instant t = Instant.ofEpochSecond(-1, 0);
+            t.plusSeconds(Long.MIN_VALUE);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="PlusMillis")
     Object[][] provider_plusMillis_long() {
         return new Object[][] {
                 {0, 0, 0,       0, 0},
@@ -1077,58 +1099,64 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="PlusMillis")
+    @ParameterizedTest
+    @MethodSource("provider_plusMillis_long")
     public void plusMillis_long(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Instant t = Instant.ofEpochSecond(seconds, nanos);
         t = t.plusMillis(amount);
-        assertEquals(t.getEpochSecond(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, t.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
-    @Test(dataProvider="PlusMillis")
+    @ParameterizedTest
+    @MethodSource("provider_plusMillis_long")
     public void plusMillis_long_oneMore(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Instant t = Instant.ofEpochSecond(seconds + 1, nanos);
         t = t.plusMillis(amount);
-        assertEquals(t.getEpochSecond(), expectedSeconds + 1);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds + 1, t.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
-    @Test(dataProvider="PlusMillis")
+    @ParameterizedTest
+    @MethodSource("provider_plusMillis_long")
     public void plusMillis_long_minusOneLess(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Instant t = Instant.ofEpochSecond(seconds - 1, nanos);
         t = t.plusMillis(amount);
-        assertEquals(t.getEpochSecond(), expectedSeconds - 1);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds - 1, t.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
     @Test
     public void plusMillis_long_max() {
         Instant t = Instant.ofEpochSecond(MAX_SECOND, 998999999);
         t = t.plusMillis(1);
-        assertEquals(t.getEpochSecond(), MAX_SECOND);
-        assertEquals(t.getNano(), 999999999);
+        assertEquals(MAX_SECOND, t.getEpochSecond());
+        assertEquals(999999999, t.getNano());
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void plusMillis_long_overflowTooBig() {
-        Instant t = Instant.ofEpochSecond(MAX_SECOND, 999000000);
-        t.plusMillis(1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant t = Instant.ofEpochSecond(MAX_SECOND, 999000000);
+            t.plusMillis(1);
+        });
     }
 
     @Test
     public void plusMillis_long_min() {
         Instant t = Instant.ofEpochSecond(MIN_SECOND, 1000000);
         t = t.plusMillis(-1);
-        assertEquals(t.getEpochSecond(), MIN_SECOND);
-        assertEquals(t.getNano(), 0);
+        assertEquals(MIN_SECOND, t.getEpochSecond());
+        assertEquals(0, t.getNano());
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void plusMillis_long_overflowTooSmall() {
-        Instant t = Instant.ofEpochSecond(MIN_SECOND, 0);
-        t.plusMillis(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant t = Instant.ofEpochSecond(MIN_SECOND, 0);
+            t.plusMillis(-1);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="PlusNanos")
     Object[][] provider_plusNanos_long() {
         return new Object[][] {
                 {0, 0, 0,           0, 0},
@@ -1206,27 +1234,31 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="PlusNanos")
+    @ParameterizedTest
+    @MethodSource("provider_plusNanos_long")
     public void plusNanos_long(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Instant t = Instant.ofEpochSecond(seconds, nanos);
         t = t.plusNanos(amount);
-        assertEquals(t.getEpochSecond(), expectedSeconds);
-        assertEquals(t.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, t.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, t.getNano());
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void plusNanos_long_overflowTooBig() {
-        Instant t = Instant.ofEpochSecond(MAX_SECOND, 999999999);
-        t.plusNanos(1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant t = Instant.ofEpochSecond(MAX_SECOND, 999999999);
+            t.plusNanos(1);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void plusNanos_long_overflowTooSmall() {
-        Instant t = Instant.ofEpochSecond(MIN_SECOND, 0);
-        t.plusNanos(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant t = Instant.ofEpochSecond(MIN_SECOND, 0);
+            t.plusNanos(-1);
+        });
     }
 
-    @DataProvider(name = "PlusSaturating")
     Object[][] provider_plusSaturating() {
         return new Object[][]{
                 // 1. {edge or constant instants} x {edge or constant durations}
@@ -1267,27 +1299,27 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider = "PlusSaturating")
+    @ParameterizedTest
+    @MethodSource("provider_plusSaturating")
     public void plusSaturating(Instant i, Duration d, Optional<Instant> value) {
         var actual = i.plusSaturating(d);
         try {
-            assertEquals(actual, i.plus(d));
+            assertEquals(i.plus(d), actual);
             // If `value` is present, perform an additional check. It may be
             // important to ensure that not only does the result of `plusSaturating`
             // match that of `plus`, but that it also matches our expectation.
             // Because if it doesn’t, then the test isn’t testing what we think
             // it is, and needs to be fixed.
-            value.ifPresent(instant -> assertEquals(actual, instant));
+            value.ifPresent(instant -> assertEquals(instant, actual));
         } catch (DateTimeException /* instant overflow */
                  | ArithmeticException /* long overflow */ e) {
             if (value.isEmpty()) {
                 throw new AssertionError();
             }
-            assertEquals(actual, value.get());
+            assertEquals(value.get(), actual);
         }
     }
 
-    @DataProvider(name = "PlusSaturating_null")
     Object[][] provider_plusSaturating_null() {
         return new Object[][]{
                 {Instant.MIN},
@@ -1298,13 +1330,13 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(expectedExceptions = NullPointerException.class, dataProvider = "PlusSaturating_null")
+    @ParameterizedTest
+    @MethodSource("provider_plusSaturating_null")
     public void test_plusSaturating_null(Instant i) {
-        i.plusSaturating(null);
+        Assertions.assertThrows(NullPointerException.class, () -> i.plusSaturating(null));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="Minus")
     Object[][] provider_minus() {
         return new Object[][] {
                 {MIN_SECOND, 0, MIN_SECOND, 0, 0, 0},
@@ -1505,48 +1537,57 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="Minus")
+    @ParameterizedTest
+    @MethodSource("provider_minus")
     public void minus_Duration(long seconds, int nanos, long otherSeconds, int otherNanos, long expectedSeconds, int expectedNanoOfSecond) {
         Instant i = Instant.ofEpochSecond(seconds, nanos).minus(Duration.ofSeconds(otherSeconds, otherNanos));
-        assertEquals(i.getEpochSecond(), expectedSeconds);
-        assertEquals(i.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, i.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, i.getNano());
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void minus_Duration_overflowTooSmall() {
-        Instant i = Instant.ofEpochSecond(MIN_SECOND);
-        i.minus(Duration.ofSeconds(0, 1));
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant i = Instant.ofEpochSecond(MIN_SECOND);
+            i.minus(Duration.ofSeconds(0, 1));
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void minus_Duration_overflowTooBig() {
-        Instant i = Instant.ofEpochSecond(MAX_SECOND, 999999999);
-        i.minus(Duration.ofSeconds(-1, 999999999));
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant i = Instant.ofEpochSecond(MAX_SECOND, 999999999);
+            i.minus(Duration.ofSeconds(-1, 999999999));
+        });
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="Minus")
+    @ParameterizedTest
+    @MethodSource("provider_minus")
     public void minus_longTemporalUnit(long seconds, int nanos, long otherSeconds, int otherNanos, long expectedSeconds, int expectedNanoOfSecond) {
         Instant i = Instant.ofEpochSecond(seconds, nanos).minus(otherSeconds, SECONDS).minus(otherNanos, NANOS);
-        assertEquals(i.getEpochSecond(), expectedSeconds);
-        assertEquals(i.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, i.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, i.getNano());
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void minus_longTemporalUnit_overflowTooSmall() {
-        Instant i = Instant.ofEpochSecond(MIN_SECOND);
-        i.minus(1, NANOS);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant i = Instant.ofEpochSecond(MIN_SECOND);
+            i.minus(1, NANOS);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void minus_longTemporalUnit_overflowTooBig() {
-        Instant i = Instant.ofEpochSecond(MAX_SECOND, 999999999);
-        i.minus(999999999, NANOS);
-        i.minus(-1, SECONDS);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant i = Instant.ofEpochSecond(MAX_SECOND, 999999999);
+            i.minus(999999999, NANOS);
+            i.minus(-1, SECONDS);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="MinusSeconds")
     Object[][] provider_minusSeconds_long() {
         return new Object[][] {
                 {0, 0, 0, 0, 0},
@@ -1575,28 +1616,32 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="MinusSeconds")
+    @ParameterizedTest
+    @MethodSource("provider_minusSeconds_long")
     public void minusSeconds_long(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Instant i = Instant.ofEpochSecond(seconds, nanos);
         i = i.minusSeconds(amount);
-        assertEquals(i.getEpochSecond(), expectedSeconds);
-        assertEquals(i.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, i.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, i.getNano());
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void minusSeconds_long_overflowTooBig() {
-        Instant i = Instant.ofEpochSecond(1, 0);
-        i.minusSeconds(Long.MIN_VALUE + 1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Instant i = Instant.ofEpochSecond(1, 0);
+            i.minusSeconds(Long.MIN_VALUE + 1);
+        });
     }
 
-    @Test(expectedExceptions = {ArithmeticException.class})
+    @Test
     public void minusSeconds_long_overflowTooSmall() {
-        Instant i = Instant.ofEpochSecond(-2, 0);
-        i.minusSeconds(Long.MAX_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Instant i = Instant.ofEpochSecond(-2, 0);
+            i.minusSeconds(Long.MAX_VALUE);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="MinusMillis")
     Object[][] provider_minusMillis_long() {
         return new Object[][] {
                 {0, 0, 0,       0, 0},
@@ -1654,60 +1699,66 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="MinusMillis")
+    @ParameterizedTest
+    @MethodSource("provider_minusMillis_long")
     public void minusMillis_long(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Instant i = Instant.ofEpochSecond(seconds, nanos);
         i = i.minusMillis(amount);
-        assertEquals(i.getEpochSecond(), expectedSeconds);
-        assertEquals(i.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, i.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, i.getNano());
     }
 
-    @Test(dataProvider="MinusMillis")
+    @ParameterizedTest
+    @MethodSource("provider_minusMillis_long")
     public void minusMillis_long_oneMore(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Instant i = Instant.ofEpochSecond(seconds + 1, nanos);
         i = i.minusMillis(amount);
-        assertEquals(i.getEpochSecond(), expectedSeconds + 1);
-        assertEquals(i.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds + 1, i.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, i.getNano());
     }
 
-    @Test(dataProvider="MinusMillis")
+    @ParameterizedTest
+    @MethodSource("provider_minusMillis_long")
     public void minusMillis_long_minusOneLess(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Instant i = Instant.ofEpochSecond(seconds - 1, nanos);
         i = i.minusMillis(amount);
-        assertEquals(i.getEpochSecond(), expectedSeconds - 1);
-        assertEquals(i.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds - 1, i.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, i.getNano());
     }
 
     @Test
     public void minusMillis_long_max() {
         Instant i = Instant.ofEpochSecond(MAX_SECOND, 998999999);
         i = i.minusMillis(-1);
-        assertEquals(i.getEpochSecond(), MAX_SECOND);
-        assertEquals(i.getNano(), 999999999);
+        assertEquals(MAX_SECOND, i.getEpochSecond());
+        assertEquals(999999999, i.getNano());
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void minusMillis_long_overflowTooBig() {
-        Instant i = Instant.ofEpochSecond(MAX_SECOND, 999000000);
-        i.minusMillis(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant i = Instant.ofEpochSecond(MAX_SECOND, 999000000);
+            i.minusMillis(-1);
+        });
     }
 
     @Test
     public void minusMillis_long_min() {
         Instant i = Instant.ofEpochSecond(MIN_SECOND, 1000000);
         i = i.minusMillis(1);
-        assertEquals(i.getEpochSecond(), MIN_SECOND);
-        assertEquals(i.getNano(), 0);
+        assertEquals(MIN_SECOND, i.getEpochSecond());
+        assertEquals(0, i.getNano());
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void minusMillis_long_overflowTooSmall() {
-        Instant i = Instant.ofEpochSecond(MIN_SECOND, 0);
-        i.minusMillis(1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant i = Instant.ofEpochSecond(MIN_SECOND, 0);
+            i.minusMillis(1);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="MinusNanos")
     Object[][] provider_minusNanos_long() {
         return new Object[][] {
                 {0, 0, 0,           0, 0},
@@ -1785,30 +1836,34 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="MinusNanos")
+    @ParameterizedTest
+    @MethodSource("provider_minusNanos_long")
     public void minusNanos_long(long seconds, int nanos, long amount, long expectedSeconds, int expectedNanoOfSecond) {
         Instant i = Instant.ofEpochSecond(seconds, nanos);
         i = i.minusNanos(amount);
-        assertEquals(i.getEpochSecond(), expectedSeconds);
-        assertEquals(i.getNano(), expectedNanoOfSecond);
+        assertEquals(expectedSeconds, i.getEpochSecond());
+        assertEquals(expectedNanoOfSecond, i.getNano());
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void minusNanos_long_overflowTooBig() {
-        Instant i = Instant.ofEpochSecond(MAX_SECOND, 999999999);
-        i.minusNanos(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant i = Instant.ofEpochSecond(MAX_SECOND, 999999999);
+            i.minusNanos(-1);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void minusNanos_long_overflowTooSmall() {
-        Instant i = Instant.ofEpochSecond(MIN_SECOND, 0);
-        i.minusNanos(1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant i = Instant.ofEpochSecond(MIN_SECOND, 0);
+            i.minusNanos(1);
+        });
     }
 
     //-----------------------------------------------------------------------
     // until(Temporal, TemporalUnit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="periodUntilUnit")
     Object[][] data_periodUntilUnit() {
         return new Object[][] {
                 {5, 650, -1, 650, SECONDS, -6},
@@ -1958,56 +2013,61 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit(long seconds1, int nanos1, long seconds2, long nanos2, TemporalUnit unit, long expected) {
         Instant i1 = Instant.ofEpochSecond(seconds1, nanos1);
         Instant i2 = Instant.ofEpochSecond(seconds2, nanos2);
         long amount = i1.until(i2, unit);
-        assertEquals(amount, expected);
+        assertEquals(expected, amount);
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit_negated(long seconds1, int nanos1, long seconds2, long nanos2, TemporalUnit unit, long expected) {
         Instant i1 = Instant.ofEpochSecond(seconds1, nanos1);
         Instant i2 = Instant.ofEpochSecond(seconds2, nanos2);
         long amount = i2.until(i1, unit);
-        assertEquals(amount, -expected);
+        assertEquals(-expected, amount);
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit_between(long seconds1, int nanos1, long seconds2, long nanos2, TemporalUnit unit, long expected) {
         Instant i1 = Instant.ofEpochSecond(seconds1, nanos1);
         Instant i2 = Instant.ofEpochSecond(seconds2, nanos2);
         long amount = unit.between(i1, i2);
-        assertEquals(amount, expected);
+        assertEquals(expected, amount);
     }
 
     @Test
     public void test_until_convertedType() {
         Instant start = Instant.ofEpochSecond(12, 3000);
         OffsetDateTime end = start.plusSeconds(2).atOffset(ZoneOffset.ofHours(2));
-        assertEquals(start.until(end, SECONDS), 2);
+        assertEquals(2, start.until(end, SECONDS));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_until_invalidType() {
-        Instant start = Instant.ofEpochSecond(12, 3000);
-        start.until(LocalTime.of(11, 30), SECONDS);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant start = Instant.ofEpochSecond(12, 3000);
+            start.until(LocalTime.of(11, 30), SECONDS);
+        });
     }
 
-    @Test(expectedExceptions = UnsupportedTemporalTypeException.class)
+    @Test
     public void test_until_TemporalUnit_unsupportedUnit() {
-        TEST_12345_123456789.until(TEST_12345_123456789, MONTHS);
+        Assertions.assertThrows(UnsupportedTemporalTypeException.class, () -> TEST_12345_123456789.until(TEST_12345_123456789, MONTHS));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_until_TemporalUnit_nullEnd() {
-        TEST_12345_123456789.until(null, HOURS);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12345_123456789.until(null, HOURS));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_until_TemporalUnit_nullUnit() {
-        TEST_12345_123456789.until(TEST_12345_123456789, null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12345_123456789.until(TEST_12345_123456789, null));
     }
 
     //-----------------------------------------------------------------------
@@ -2018,18 +2078,18 @@ public class TCKInstant extends AbstractDateTimeTest {
         for (int i = 0; i < (24 * 60 * 60); i++) {
             Instant instant = Instant.ofEpochSecond(i);
             OffsetDateTime test = instant.atOffset(ZoneOffset.ofHours(1));
-            assertEquals(test.getYear(), 1970);
-            assertEquals(test.getMonthValue(), 1);
-            assertEquals(test.getDayOfMonth(), 1 + (i >= 23 * 60 * 60 ? 1 : 0));
-            assertEquals(test.getHour(), ((i / (60 * 60)) + 1) % 24);
-            assertEquals(test.getMinute(), (i / 60) % 60);
-            assertEquals(test.getSecond(), i % 60);
+            assertEquals(1970, test.getYear());
+            assertEquals(1, test.getMonthValue());
+            assertEquals(1 + (i >= 23 * 60 * 60 ? 1 : 0), test.getDayOfMonth());
+            assertEquals(((i / (60 * 60)) + 1) % 24, test.getHour());
+            assertEquals((i / 60) % 60, test.getMinute());
+            assertEquals(i % 60, test.getSecond());
         }
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_atOffset_null() {
-        TEST_12345_123456789.atOffset(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12345_123456789.atOffset(null));
     }
 
     //-----------------------------------------------------------------------
@@ -2040,18 +2100,18 @@ public class TCKInstant extends AbstractDateTimeTest {
         for (int i = 0; i < (24 * 60 * 60); i++) {
             Instant instant = Instant.ofEpochSecond(i);
             ZonedDateTime test = instant.atZone(ZoneOffset.ofHours(1));
-            assertEquals(test.getYear(), 1970);
-            assertEquals(test.getMonthValue(), 1);
-            assertEquals(test.getDayOfMonth(), 1 + (i >= 23 * 60 * 60 ? 1 : 0));
-            assertEquals(test.getHour(), ((i / (60 * 60)) + 1) % 24);
-            assertEquals(test.getMinute(), (i / 60) % 60);
-            assertEquals(test.getSecond(), i % 60);
+            assertEquals(1970, test.getYear());
+            assertEquals(1, test.getMonthValue());
+            assertEquals(1 + (i >= 23 * 60 * 60 ? 1 : 0), test.getDayOfMonth());
+            assertEquals(((i / (60 * 60)) + 1) % 24, test.getHour());
+            assertEquals((i / 60) % 60, test.getMinute());
+            assertEquals(i % 60, test.getSecond());
         }
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_atZone_null() {
-        TEST_12345_123456789.atZone(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12345_123456789.atZone(null));
     }
 
     //-----------------------------------------------------------------------
@@ -2059,40 +2119,40 @@ public class TCKInstant extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_toEpochMilli() {
-        assertEquals(Instant.ofEpochSecond(1L, 1000000).toEpochMilli(), 1001L);
-        assertEquals(Instant.ofEpochSecond(1L, 2000000).toEpochMilli(), 1002L);
-        assertEquals(Instant.ofEpochSecond(1L, 567).toEpochMilli(), 1000L);
-        assertEquals(Instant.ofEpochSecond(Long.MAX_VALUE / 1000).toEpochMilli(), (Long.MAX_VALUE / 1000) * 1000);
-        assertEquals(Instant.ofEpochSecond(Long.MIN_VALUE / 1000).toEpochMilli(), (Long.MIN_VALUE / 1000) * 1000);
-        assertEquals(Instant.ofEpochSecond(0L, -1000000).toEpochMilli(), -1L);
-        assertEquals(Instant.ofEpochSecond(0L, 1000000).toEpochMilli(), 1);
-        assertEquals(Instant.ofEpochSecond(0L, 999999).toEpochMilli(), 0);
-        assertEquals(Instant.ofEpochSecond(0L, 1).toEpochMilli(), 0);
-        assertEquals(Instant.ofEpochSecond(0L, 0).toEpochMilli(), 0);
-        assertEquals(Instant.ofEpochSecond(0L, -1).toEpochMilli(), -1L);
-        assertEquals(Instant.ofEpochSecond(0L, -999999).toEpochMilli(), -1L);
-        assertEquals(Instant.ofEpochSecond(0L, -1000000).toEpochMilli(), -1L);
-        assertEquals(Instant.ofEpochSecond(0L, -1000001).toEpochMilli(), -2L);
+        assertEquals(1001L, Instant.ofEpochSecond(1L, 1000000).toEpochMilli());
+        assertEquals(1002L, Instant.ofEpochSecond(1L, 2000000).toEpochMilli());
+        assertEquals(1000L, Instant.ofEpochSecond(1L, 567).toEpochMilli());
+        assertEquals((Long.MAX_VALUE / 1000) * 1000, Instant.ofEpochSecond(Long.MAX_VALUE / 1000).toEpochMilli());
+        assertEquals((Long.MIN_VALUE / 1000) * 1000, Instant.ofEpochSecond(Long.MIN_VALUE / 1000).toEpochMilli());
+        assertEquals(-1L, Instant.ofEpochSecond(0L, -1000000).toEpochMilli());
+        assertEquals(1, Instant.ofEpochSecond(0L, 1000000).toEpochMilli());
+        assertEquals(0, Instant.ofEpochSecond(0L, 999999).toEpochMilli());
+        assertEquals(0, Instant.ofEpochSecond(0L, 1).toEpochMilli());
+        assertEquals(0, Instant.ofEpochSecond(0L, 0).toEpochMilli());
+        assertEquals(-1L, Instant.ofEpochSecond(0L, -1).toEpochMilli());
+        assertEquals(-1L, Instant.ofEpochSecond(0L, -999999).toEpochMilli());
+        assertEquals(-1L, Instant.ofEpochSecond(0L, -1000000).toEpochMilli());
+        assertEquals(-2L, Instant.ofEpochSecond(0L, -1000001).toEpochMilli());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_toEpochMilli_tooBig() {
-        Instant.ofEpochSecond(Long.MAX_VALUE / 1000 + 1).toEpochMilli();
+        Assertions.assertThrows(ArithmeticException.class, () -> Instant.ofEpochSecond(Long.MAX_VALUE / 1000 + 1).toEpochMilli());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_toEpochMilli_tooSmall() {
-        Instant.ofEpochSecond(Long.MIN_VALUE / 1000 - 1).toEpochMilli();
+        Assertions.assertThrows(ArithmeticException.class, () -> Instant.ofEpochSecond(Long.MIN_VALUE / 1000 - 1).toEpochMilli());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_toEpochMillis_overflow() {
-        Instant.ofEpochSecond(Long.MAX_VALUE / 1000, 809_000_000).toEpochMilli();
+        Assertions.assertThrows(ArithmeticException.class, () -> Instant.ofEpochSecond(Long.MAX_VALUE / 1000, 809_000_000).toEpochMilli());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_toEpochMillis_overflow2() {
-        Instant.ofEpochSecond(-9223372036854776L, 1).toEpochMilli();
+        Assertions.assertThrows(ArithmeticException.class, () -> Instant.ofEpochSecond(-9223372036854776L, 1).toEpochMilli());
     }
 
     //-----------------------------------------------------------------------
@@ -2123,48 +2183,56 @@ public class TCKInstant extends AbstractDateTimeTest {
             for (int j = 0; j < instants.length; j++) {
                 Instant b = instants[j];
                 if (i < j) {
-                    assertEquals(a.compareTo(b) < 0, true, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), true, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(true, a.compareTo(b) < 0, a + " <=> " + b);
+                    assertEquals(true, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else if (i > j) {
-                    assertEquals(a.compareTo(b) > 0, true, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), true, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(true, a.compareTo(b) > 0, a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(true, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else {
-                    assertEquals(a.compareTo(b), 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), true, a + " <=> " + b);
+                    assertEquals(0, a.compareTo(b), a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(true, a.equals(b), a + " <=> " + b);
                 }
             }
         }
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_compareTo_ObjectNull() {
-        Instant a = Instant.ofEpochSecond(0L, 0);
-        a.compareTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            Instant a = Instant.ofEpochSecond(0L, 0);
+            a.compareTo(null);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isBefore_ObjectNull() {
-        Instant a = Instant.ofEpochSecond(0L, 0);
-        a.isBefore(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            Instant a = Instant.ofEpochSecond(0L, 0);
+            a.isBefore(null);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isAfter_ObjectNull() {
-        Instant a = Instant.ofEpochSecond(0L, 0);
-        a.isAfter(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            Instant a = Instant.ofEpochSecond(0L, 0);
+            a.isAfter(null);
+        });
     }
 
-    @Test(expectedExceptions=ClassCastException.class)
     @SuppressWarnings({"unchecked", "rawtypes"})
+    @Test
     public void compareToNonInstant() {
-        Comparable c = Instant.ofEpochSecond(0L);
-        c.compareTo(new Object());
+        Assertions.assertThrows(ClassCastException.class, () -> {
+            Comparable c = Instant.ofEpochSecond(0L);
+            c.compareTo(new Object());
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -2177,37 +2245,37 @@ public class TCKInstant extends AbstractDateTimeTest {
         Instant test5n = Instant.ofEpochSecond(5L, 30);
         Instant test6 = Instant.ofEpochSecond(6L, 20);
 
-        assertEquals(test5a.equals(test5a), true);
-        assertEquals(test5a.equals(test5b), true);
-        assertEquals(test5a.equals(test5n), false);
-        assertEquals(test5a.equals(test6), false);
+        assertEquals(true, test5a.equals(test5a));
+        assertEquals(true, test5a.equals(test5b));
+        assertEquals(false, test5a.equals(test5n));
+        assertEquals(false, test5a.equals(test6));
 
-        assertEquals(test5b.equals(test5a), true);
-        assertEquals(test5b.equals(test5b), true);
-        assertEquals(test5b.equals(test5n), false);
-        assertEquals(test5b.equals(test6), false);
+        assertEquals(true, test5b.equals(test5a));
+        assertEquals(true, test5b.equals(test5b));
+        assertEquals(false, test5b.equals(test5n));
+        assertEquals(false, test5b.equals(test6));
 
-        assertEquals(test5n.equals(test5a), false);
-        assertEquals(test5n.equals(test5b), false);
-        assertEquals(test5n.equals(test5n), true);
-        assertEquals(test5n.equals(test6), false);
+        assertEquals(false, test5n.equals(test5a));
+        assertEquals(false, test5n.equals(test5b));
+        assertEquals(true, test5n.equals(test5n));
+        assertEquals(false, test5n.equals(test6));
 
-        assertEquals(test6.equals(test5a), false);
-        assertEquals(test6.equals(test5b), false);
-        assertEquals(test6.equals(test5n), false);
-        assertEquals(test6.equals(test6), true);
+        assertEquals(false, test6.equals(test5a));
+        assertEquals(false, test6.equals(test5b));
+        assertEquals(false, test6.equals(test5n));
+        assertEquals(true, test6.equals(test6));
     }
 
     @Test
     public void test_equals_null() {
         Instant test5 = Instant.ofEpochSecond(5L, 20);
-        assertEquals(test5.equals(null), false);
+        assertEquals(false, test5.equals(null));
     }
 
     @Test
     public void test_equals_otherClass() {
         Instant test5 = Instant.ofEpochSecond(5L, 20);
-        assertEquals(test5.equals(""), false);
+        assertEquals(false, test5.equals(""));
     }
 
     //-----------------------------------------------------------------------
@@ -2220,18 +2288,17 @@ public class TCKInstant extends AbstractDateTimeTest {
         Instant test5n = Instant.ofEpochSecond(5L, 30);
         Instant test6 = Instant.ofEpochSecond(6L, 20);
 
-        assertEquals(test5a.hashCode() == test5a.hashCode(), true);
-        assertEquals(test5a.hashCode() == test5b.hashCode(), true);
-        assertEquals(test5b.hashCode() == test5b.hashCode(), true);
+        assertEquals(true, test5a.hashCode() == test5a.hashCode());
+        assertEquals(true, test5a.hashCode() == test5b.hashCode());
+        assertEquals(true, test5b.hashCode() == test5b.hashCode());
 
-        assertEquals(test5a.hashCode() == test5n.hashCode(), false);
-        assertEquals(test5a.hashCode() == test6.hashCode(), false);
+        assertEquals(false, test5a.hashCode() == test5n.hashCode());
+        assertEquals(false, test5a.hashCode() == test6.hashCode());
     }
 
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
-    @DataProvider(name="toStringParse")
     Object[][] data_toString() {
         return new Object[][] {
                 {Instant.ofEpochSecond(65L, 567), "1970-01-01T00:01:05.000000567Z"},
@@ -2297,19 +2364,22 @@ public class TCKInstant extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="toStringParse")
+    @ParameterizedTest
+    @MethodSource("data_toString")
     public void test_toString(Instant instant, String expected) {
-        assertEquals(instant.toString(), expected);
+        assertEquals(expected, instant.toString());
     }
 
-    @Test(dataProvider="toStringParse")
+    @ParameterizedTest
+    @MethodSource("data_toString")
     public void test_parse(Instant instant, String text) {
-        assertEquals(Instant.parse(text), instant);
+        assertEquals(instant, Instant.parse(text));
     }
 
-    @Test(dataProvider="toStringParse")
+    @ParameterizedTest
+    @MethodSource("data_toString")
     public void test_parseLowercase(Instant instant, String text) {
-        assertEquals(Instant.parse(text.toLowerCase(Locale.ENGLISH)), instant);
+        assertEquals(instant, Instant.parse(text.toLowerCase(Locale.ENGLISH)));
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/TCKLocalDate.java b/test/jdk/java/time/tck/java/time/TCKLocalDate.java
index 2b5832465c9..281007e7665 100644
--- a/test/jdk/java/time/tck/java/time/TCKLocalDate.java
+++ b/test/jdk/java/time/tck/java/time/TCKLocalDate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -80,11 +80,12 @@ import static java.time.temporal.ChronoUnit.MILLENNIA;
 import static java.time.temporal.ChronoUnit.MONTHS;
 import static java.time.temporal.ChronoUnit.WEEKS;
 import static java.time.temporal.ChronoUnit.YEARS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.Clock;
 import java.time.DateTimeException;
@@ -122,16 +123,20 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import test.java.time.MockSimplePeriod;
 import test.java.time.temporal.MockFieldNoValue;
 
 /**
  * Test LocalDate.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKLocalDate extends AbstractDateTimeTest {
 
     private static final ZoneOffset OFFSET_PONE = ZoneOffset.ofHours(1);
@@ -148,7 +153,7 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     private Instant MAX_INSTANT;
     private Instant MIN_INSTANT;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_2007_07_15 = LocalDate.of(2007, 7, 15);
 
@@ -201,12 +206,12 @@ public class TCKLocalDate extends AbstractDateTimeTest {
 
     //-----------------------------------------------------------------------
     private void check(LocalDate test, int y, int m, int d) {
-        assertEquals(test.getYear(), y);
-        assertEquals(test.getMonth().getValue(), m);
-        assertEquals(test.getDayOfMonth(), d);
+        assertEquals(y, test.getYear());
+        assertEquals(m, test.getMonth().getValue());
+        assertEquals(d, test.getDayOfMonth());
         assertEquals(test, test);
         assertEquals(test.hashCode(), test.hashCode());
-        assertEquals(LocalDate.of(y, m, d), test);
+        assertEquals(test, LocalDate.of(y, m, d));
     }
 
     //-----------------------------------------------------------------------
@@ -236,15 +241,15 @@ public class TCKLocalDate extends AbstractDateTimeTest {
             expected = LocalDate.now(Clock.systemDefaultZone());
             test = LocalDate.now();
         }
-        assertEquals(test, expected);
+        assertEquals(expected, test);
     }
 
     //-----------------------------------------------------------------------
     // now(ZoneId)
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_ZoneId_nullZoneId() {
-        LocalDate.now((ZoneId) null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDate.now((ZoneId) null));
     }
 
     @Test
@@ -259,15 +264,15 @@ public class TCKLocalDate extends AbstractDateTimeTest {
             expected = LocalDate.now(Clock.system(zone));
             test = LocalDate.now(zone);
         }
-        assertEquals(test, expected);
+        assertEquals(expected, test);
     }
 
     //-----------------------------------------------------------------------
     // now(Clock)
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_Clock_nullClock() {
-        LocalDate.now((Clock) null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDate.now((Clock) null));
     }
 
     @Test
@@ -276,9 +281,9 @@ public class TCKLocalDate extends AbstractDateTimeTest {
             Instant instant = Instant.ofEpochSecond(i);
             Clock clock = Clock.fixed(instant, ZoneOffset.UTC);
             LocalDate test = LocalDate.now(clock);
-            assertEquals(test.getYear(), 1970);
-            assertEquals(test.getMonth(), Month.JANUARY);
-            assertEquals(test.getDayOfMonth(), (i < 24 * 60 * 60 ? 1 : 2));
+            assertEquals(1970, test.getYear());
+            assertEquals(Month.JANUARY, test.getMonth());
+            assertEquals((i < 24 * 60 * 60 ? 1 : 2), test.getDayOfMonth());
         }
     }
 
@@ -288,9 +293,9 @@ public class TCKLocalDate extends AbstractDateTimeTest {
             Instant instant = Instant.ofEpochSecond(i);
             Clock clock = Clock.fixed(instant.minusSeconds(OFFSET_PONE.getTotalSeconds()), OFFSET_PONE);
             LocalDate test = LocalDate.now(clock);
-            assertEquals(test.getYear(), 1970);
-            assertEquals(test.getMonth(), Month.JANUARY);
-            assertEquals(test.getDayOfMonth(), (i < 24 * 60 * 60) ? 1 : 2);
+            assertEquals(1970, test.getYear());
+            assertEquals(Month.JANUARY, test.getMonth());
+            assertEquals((i < 24 * 60 * 60) ? 1 : 2, test.getDayOfMonth());
         }
     }
 
@@ -300,9 +305,9 @@ public class TCKLocalDate extends AbstractDateTimeTest {
             Instant instant = Instant.ofEpochSecond(i);
             Clock clock = Clock.fixed(instant, ZoneOffset.UTC);
             LocalDate test = LocalDate.now(clock);
-            assertEquals(test.getYear(), 1969);
-            assertEquals(test.getMonth(), Month.DECEMBER);
-            assertEquals(test.getDayOfMonth(), (i >= -24 * 60 * 60 ? 31 : 30));
+            assertEquals(1969, test.getYear());
+            assertEquals(Month.DECEMBER, test.getMonth());
+            assertEquals((i >= -24 * 60 * 60 ? 31 : 30), test.getDayOfMonth());
         }
     }
 
@@ -311,26 +316,30 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     public void now_Clock_maxYear() {
         Clock clock = Clock.fixed(MAX_INSTANT, ZoneOffset.UTC);
         LocalDate test = LocalDate.now(clock);
-        assertEquals(test, MAX_DATE);
+        assertEquals(MAX_DATE, test);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void now_Clock_tooBig() {
-        Clock clock = Clock.fixed(MAX_INSTANT.plusSeconds(24 * 60 * 60), ZoneOffset.UTC);
-        LocalDate.now(clock);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Clock clock = Clock.fixed(MAX_INSTANT.plusSeconds(24 * 60 * 60), ZoneOffset.UTC);
+            LocalDate.now(clock);
+        });
     }
 
     @Test
     public void now_Clock_minYear() {
         Clock clock = Clock.fixed(MIN_INSTANT, ZoneOffset.UTC);
         LocalDate test = LocalDate.now(clock);
-        assertEquals(test, MIN_DATE);
+        assertEquals(MIN_DATE, test);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void now_Clock_tooLow() {
-        Clock clock = Clock.fixed(MIN_INSTANT.minusNanos(1), ZoneOffset.UTC);
-        LocalDate.now(clock);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Clock clock = Clock.fixed(MIN_INSTANT.minusNanos(1), ZoneOffset.UTC);
+            LocalDate.now(clock);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -338,37 +347,37 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void factory_of_intsMonth() {
-        assertEquals(TEST_2007_07_15, LocalDate.of(2007, Month.JULY, 15));
+        assertEquals(LocalDate.of(2007, Month.JULY, 15), TEST_2007_07_15);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_intsMonth_29febNonLeap() {
-        LocalDate.of(2007, Month.FEBRUARY, 29);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(2007, Month.FEBRUARY, 29));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_intsMonth_31apr() {
-        LocalDate.of(2007, Month.APRIL, 31);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(2007, Month.APRIL, 31));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_intsMonth_dayTooLow() {
-        LocalDate.of(2007, Month.JANUARY, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(2007, Month.JANUARY, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_intsMonth_dayTooHigh() {
-        LocalDate.of(2007, Month.JANUARY, 32);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(2007, Month.JANUARY, 32));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_intsMonth_nullMonth() {
-        LocalDate.of(2007, null, 30);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDate.of(2007, null, 30));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_intsMonth_yearTooLow() {
-        LocalDate.of(Integer.MIN_VALUE, Month.JANUARY, 1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Integer.MIN_VALUE, Month.JANUARY, 1));
     }
 
     //-----------------------------------------------------------------------
@@ -377,39 +386,39 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         check(TEST_2007_07_15, 2007, 7, 15);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_ints_29febNonLeap() {
-        LocalDate.of(2007, 2, 29);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(2007, 2, 29));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_ints_31apr() {
-        LocalDate.of(2007, 4, 31);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(2007, 4, 31));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_ints_dayTooLow() {
-        LocalDate.of(2007, 1, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(2007, 1, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_ints_dayTooHigh() {
-        LocalDate.of(2007, 1, 32);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(2007, 1, 32));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_ints_monthTooLow() {
-        LocalDate.of(2007, 0, 1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(2007, 0, 1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_ints_monthTooHigh() {
-        LocalDate.of(2007, 13, 1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(2007, 13, 1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_ints_yearTooLow() {
-        LocalDate.of(Integer.MIN_VALUE, 1, 1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Integer.MIN_VALUE, 1, 1));
     }
 
     //-----------------------------------------------------------------------
@@ -417,7 +426,7 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     public void factory_ofYearDay_ints_nonLeap() {
         LocalDate date = LocalDate.of(2007, 1, 1);
         for (int i = 1; i < 365; i++) {
-            assertEquals(LocalDate.ofYearDay(2007, i), date);
+            assertEquals(date, LocalDate.ofYearDay(2007, i));
             date = next(date);
         }
     }
@@ -426,29 +435,29 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     public void factory_ofYearDay_ints_leap() {
         LocalDate date = LocalDate.of(2008, 1, 1);
         for (int i = 1; i < 366; i++) {
-            assertEquals(LocalDate.ofYearDay(2008, i), date);
+            assertEquals(date, LocalDate.ofYearDay(2008, i));
             date = next(date);
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofYearDay_ints_366nonLeap() {
-        LocalDate.ofYearDay(2007, 366);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.ofYearDay(2007, 366));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofYearDay_ints_dayTooLow() {
-        LocalDate.ofYearDay(2007, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.ofYearDay(2007, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofYearDay_ints_dayTooHigh() {
-        LocalDate.ofYearDay(2007, 367);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.ofYearDay(2007, 367));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofYearDay_ints_yearTooLow() {
-        LocalDate.ofYearDay(Integer.MIN_VALUE, 1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.ofYearDay(Integer.MIN_VALUE, 1));
     }
 
     //-----------------------------------------------------------------------
@@ -480,7 +489,6 @@ public class TCKLocalDate extends AbstractDateTimeTest {
      //-----------------------------------------------------------------------
      // ofInstant()
      //-----------------------------------------------------------------------
-     @DataProvider(name="instantFactory")
      Object[][] data_instantFactory() {
          return new Object[][] {
                  {Instant.ofEpochSecond(86400 + 3600 + 120 + 4, 500), ZONE_PARIS, LocalDate.of(1970, 1, 2)},
@@ -493,30 +501,31 @@ public class TCKLocalDate extends AbstractDateTimeTest {
          };
      }
 
-     @Test(dataProvider="instantFactory")
+     @ParameterizedTest
+    @MethodSource("data_instantFactory")
      public void factory_ofInstant(Instant instant, ZoneId zone, LocalDate expected) {
          LocalDate test = LocalDate.ofInstant(instant, zone);
-         assertEquals(test, expected);
+         assertEquals(expected, test);
      }
 
-     @Test(expectedExceptions=DateTimeException.class)
+     @Test
      public void factory_ofInstant_instantTooBig() {
-         LocalDate.ofInstant(Instant.MAX, OFFSET_PONE);
+         Assertions.assertThrows(DateTimeException.class, () -> LocalDate.ofInstant(Instant.MAX, OFFSET_PONE));
      }
 
-     @Test(expectedExceptions=DateTimeException.class)
+     @Test
      public void factory_ofInstant_instantTooSmall() {
-         LocalDate.ofInstant(Instant.MIN, OFFSET_PONE);
+         Assertions.assertThrows(DateTimeException.class, () -> LocalDate.ofInstant(Instant.MIN, OFFSET_PONE));
      }
 
-     @Test(expectedExceptions=NullPointerException.class)
+     @Test
      public void factory_ofInstant_nullInstant() {
-         LocalDate.ofInstant((Instant) null, ZONE_GAZA);
+         Assertions.assertThrows(NullPointerException.class, () -> LocalDate.ofInstant((Instant) null, ZONE_GAZA));
      }
 
-     @Test(expectedExceptions=NullPointerException.class)
+     @Test
      public void factory_ofInstant_nullZone() {
-         LocalDate.ofInstant(Instant.EPOCH, (ZoneId) null);
+         Assertions.assertThrows(NullPointerException.class, () -> LocalDate.ofInstant(Instant.EPOCH, (ZoneId) null));
      }
 
     //-----------------------------------------------------------------------
@@ -525,32 +534,32 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     @Test
     public void factory_ofEpochDay() {
         long date_0000_01_01 = -678941 - 40587;
-        assertEquals(LocalDate.ofEpochDay(0), LocalDate.of(1970, 1, 1));
-        assertEquals(LocalDate.ofEpochDay(date_0000_01_01), LocalDate.of(0, 1, 1));
-        assertEquals(LocalDate.ofEpochDay(date_0000_01_01 - 1), LocalDate.of(-1, 12, 31));
-        assertEquals(LocalDate.ofEpochDay(MAX_VALID_EPOCHDAYS), LocalDate.of(Year.MAX_VALUE, 12, 31));
-        assertEquals(LocalDate.ofEpochDay(MIN_VALID_EPOCHDAYS), LocalDate.of(Year.MIN_VALUE, 1, 1));
+        assertEquals(LocalDate.of(1970, 1, 1), LocalDate.ofEpochDay(0));
+        assertEquals(LocalDate.of(0, 1, 1), LocalDate.ofEpochDay(date_0000_01_01));
+        assertEquals(LocalDate.of(-1, 12, 31), LocalDate.ofEpochDay(date_0000_01_01 - 1));
+        assertEquals(LocalDate.of(Year.MAX_VALUE, 12, 31), LocalDate.ofEpochDay(MAX_VALID_EPOCHDAYS));
+        assertEquals(LocalDate.of(Year.MIN_VALUE, 1, 1), LocalDate.ofEpochDay(MIN_VALID_EPOCHDAYS));
 
         LocalDate test = LocalDate.of(0, 1, 1);
         for (long i = date_0000_01_01; i < 700000; i++) {
-            assertEquals(LocalDate.ofEpochDay(i), test);
+            assertEquals(test, LocalDate.ofEpochDay(i));
             test = next(test);
         }
         test = LocalDate.of(0, 1, 1);
         for (long i = date_0000_01_01; i > -2000000; i--) {
-            assertEquals(LocalDate.ofEpochDay(i), test);
+            assertEquals(test, LocalDate.ofEpochDay(i));
             test = previous(test);
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofEpochDay_aboveMax() {
-        LocalDate.ofEpochDay(MAX_VALID_EPOCHDAYS + 1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.ofEpochDay(MAX_VALID_EPOCHDAYS + 1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofEpochDay_belowMin() {
-        LocalDate.ofEpochDay(MIN_VALID_EPOCHDAYS - 1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.ofEpochDay(MIN_VALID_EPOCHDAYS - 1));
     }
 
     //-----------------------------------------------------------------------
@@ -558,33 +567,33 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_from_TemporalAccessor() {
-        assertEquals(LocalDate.from(LocalDate.of(2007, 7, 15)), LocalDate.of(2007, 7, 15));
-        assertEquals(LocalDate.from(LocalDateTime.of(2007, 7, 15, 12, 30)), LocalDate.of(2007, 7, 15));
+        assertEquals(LocalDate.of(2007, 7, 15), LocalDate.from(LocalDate.of(2007, 7, 15)));
+        assertEquals(LocalDate.of(2007, 7, 15), LocalDate.from(LocalDateTime.of(2007, 7, 15, 12, 30)));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_from_TemporalAccessor_invalid_noDerive() {
-        LocalDate.from(LocalTime.of(12, 30));
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.from(LocalTime.of(12, 30)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_from_TemporalAccessor_null() {
-        LocalDate.from((TemporalAccessor) null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDate.from((TemporalAccessor) null));
     }
 
     //-----------------------------------------------------------------------
     // parse()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleToString")
+    @ParameterizedTest
+    @MethodSource("provider_sampleToString")
     public void factory_parse_validText(int y, int m, int d, String parsable) {
         LocalDate t = LocalDate.parse(parsable);
         assertNotNull(t, parsable);
-        assertEquals(t.getYear(), y, parsable);
-        assertEquals(t.getMonth().getValue(), m, parsable);
-        assertEquals(t.getDayOfMonth(), d, parsable);
+        assertEquals(y, t.getYear(), parsable);
+        assertEquals(m, t.getMonth().getValue(), parsable);
+        assertEquals(d, t.getDayOfMonth(), parsable);
     }
 
-    @DataProvider(name="sampleBadParse")
     Object[][] provider_sampleBadParse() {
         return new Object[][]{
                 {"2008/07/05"},
@@ -601,24 +610,25 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleBadParse", expectedExceptions={DateTimeParseException.class})
+    @ParameterizedTest
+    @MethodSource("provider_sampleBadParse")
     public void factory_parse_invalidText(String unparsable) {
-        LocalDate.parse(unparsable);
+        Assertions.assertThrows(DateTimeParseException.class, () -> LocalDate.parse(unparsable));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_illegalValue() {
-        LocalDate.parse("2008-06-32");
+        Assertions.assertThrows(DateTimeParseException.class, () -> LocalDate.parse("2008-06-32"));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_invalidValue() {
-        LocalDate.parse("2008-06-31");
+        Assertions.assertThrows(DateTimeParseException.class, () -> LocalDate.parse("2008-06-31"));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_nullText() {
-        LocalDate.parse((String) null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDate.parse((String) null));
     }
 
     //-----------------------------------------------------------------------
@@ -628,18 +638,20 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     public void factory_parse_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d");
         LocalDate test = LocalDate.parse("2010 12 3", f);
-        assertEquals(test, LocalDate.of(2010, 12, 3));
+        assertEquals(LocalDate.of(2010, 12, 3), test);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullText() {
-        DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d");
-        LocalDate.parse((String) null, f);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d");
+            LocalDate.parse((String) null, f);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullFormatter() {
-        LocalDate.parse("ANY", null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDate.parse("ANY", null));
     }
 
     //-----------------------------------------------------------------------
@@ -647,37 +659,37 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalField() {
-        assertEquals(TEST_2007_07_15.isSupported((TemporalField) null), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.NANO_OF_SECOND), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.NANO_OF_DAY), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.MICRO_OF_SECOND), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.MICRO_OF_DAY), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.MILLI_OF_SECOND), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.MILLI_OF_DAY), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.SECOND_OF_MINUTE), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.SECOND_OF_DAY), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.MINUTE_OF_HOUR), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.MINUTE_OF_DAY), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.HOUR_OF_AMPM), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.HOUR_OF_DAY), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.AMPM_OF_DAY), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.DAY_OF_WEEK), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.DAY_OF_MONTH), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.DAY_OF_YEAR), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.EPOCH_DAY), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.MONTH_OF_YEAR), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.PROLEPTIC_MONTH), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.YEAR), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.YEAR_OF_ERA), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.ERA), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.INSTANT_SECONDS), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoField.OFFSET_SECONDS), false);
+        assertEquals(false, TEST_2007_07_15.isSupported((TemporalField) null));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.NANO_OF_SECOND));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.NANO_OF_DAY));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.MICRO_OF_SECOND));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.MICRO_OF_DAY));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.MILLI_OF_SECOND));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.MILLI_OF_DAY));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.SECOND_OF_DAY));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.MINUTE_OF_DAY));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.HOUR_OF_AMPM));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.HOUR_OF_DAY));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.CLOCK_HOUR_OF_DAY));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.AMPM_OF_DAY));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoField.DAY_OF_WEEK));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoField.DAY_OF_MONTH));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoField.DAY_OF_YEAR));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoField.EPOCH_DAY));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoField.MONTH_OF_YEAR));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoField.PROLEPTIC_MONTH));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoField.YEAR));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoField.YEAR_OF_ERA));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoField.ERA));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.INSTANT_SECONDS));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoField.OFFSET_SECONDS));
     }
 
     //-----------------------------------------------------------------------
@@ -685,23 +697,23 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalUnit() {
-        assertEquals(TEST_2007_07_15.isSupported((TemporalUnit) null), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.NANOS), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.MICROS), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.MILLIS), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.SECONDS), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.MINUTES), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.HOURS), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.HALF_DAYS), false);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.DAYS), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.WEEKS), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.MONTHS), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.YEARS), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.DECADES), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.CENTURIES), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.MILLENNIA), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.ERAS), true);
-        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.FOREVER), false);
+        assertEquals(false, TEST_2007_07_15.isSupported((TemporalUnit) null));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoUnit.NANOS));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoUnit.MICROS));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoUnit.MILLIS));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoUnit.SECONDS));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoUnit.MINUTES));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoUnit.HOURS));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoUnit.HALF_DAYS));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoUnit.DAYS));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoUnit.WEEKS));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoUnit.MONTHS));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoUnit.YEARS));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoUnit.DECADES));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoUnit.CENTURIES));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoUnit.MILLENNIA));
+        assertEquals(true, TEST_2007_07_15.isSupported(ChronoUnit.ERAS));
+        assertEquals(false, TEST_2007_07_15.isSupported(ChronoUnit.FOREVER));
     }
 
     //-----------------------------------------------------------------------
@@ -710,32 +722,31 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     @Test
     public void test_get_TemporalField() {
         LocalDate test = LocalDate.of(2008, 6, 30);
-        assertEquals(test.get(YEAR), 2008);
-        assertEquals(test.get(MONTH_OF_YEAR), 6);
-        assertEquals(test.get(YEAR_OF_ERA), 2008);
-        assertEquals(test.get(ERA), 1);
-        assertEquals(test.get(DAY_OF_MONTH), 30);
-        assertEquals(test.get(DAY_OF_WEEK), 1);
-        assertEquals(test.get(DAY_OF_YEAR), 182);
+        assertEquals(2008, test.get(YEAR));
+        assertEquals(6, test.get(MONTH_OF_YEAR));
+        assertEquals(2008, test.get(YEAR_OF_ERA));
+        assertEquals(1, test.get(ERA));
+        assertEquals(30, test.get(DAY_OF_MONTH));
+        assertEquals(1, test.get(DAY_OF_WEEK));
+        assertEquals(182, test.get(DAY_OF_YEAR));
     }
 
     @Test
     public void test_getLong_TemporalField() {
         LocalDate test = LocalDate.of(2008, 6, 30);
-        assertEquals(test.getLong(YEAR), 2008);
-        assertEquals(test.getLong(MONTH_OF_YEAR), 6);
-        assertEquals(test.getLong(YEAR_OF_ERA), 2008);
-        assertEquals(test.getLong(ERA), 1);
-        assertEquals(test.getLong(PROLEPTIC_MONTH), 2008 * 12 + 6 - 1);
-        assertEquals(test.getLong(DAY_OF_MONTH), 30);
-        assertEquals(test.getLong(DAY_OF_WEEK), 1);
-        assertEquals(test.getLong(DAY_OF_YEAR), 182);
+        assertEquals(2008, test.getLong(YEAR));
+        assertEquals(6, test.getLong(MONTH_OF_YEAR));
+        assertEquals(2008, test.getLong(YEAR_OF_ERA));
+        assertEquals(1, test.getLong(ERA));
+        assertEquals(2008 * 12 + 6 - 1, test.getLong(PROLEPTIC_MONTH));
+        assertEquals(30, test.getLong(DAY_OF_MONTH));
+        assertEquals(1, test.getLong(DAY_OF_WEEK));
+        assertEquals(182, test.getLong(DAY_OF_YEAR));
     }
 
     //-----------------------------------------------------------------------
     // query(TemporalQuery)
     //-----------------------------------------------------------------------
-    @DataProvider(name="query")
     Object[][] data_query() {
         return new Object[][] {
                 {TEST_2007_07_15, TemporalQueries.chronology(), IsoChronology.INSTANCE},
@@ -748,25 +759,26 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_query(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(temporal.query(query), expected);
+        assertEquals(expected, temporal.query(query));
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_queryFrom(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(query.queryFrom(temporal), expected);
+        assertEquals(expected, query.queryFrom(temporal));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_query_null() {
-        TEST_2007_07_15.query(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15.query(null));
     }
 
     //-----------------------------------------------------------------------
     // get*()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleDates")
     Object[][] provider_sampleDates() {
         return new Object[][] {
             {2008, 7, 5},
@@ -779,15 +791,17 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleDates")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDates")
     public void test_get(int y, int m, int d) {
         LocalDate a = LocalDate.of(y, m, d);
-        assertEquals(a.getYear(), y);
-        assertEquals(a.getMonth(), Month.of(m));
-        assertEquals(a.getDayOfMonth(), d);
+        assertEquals(y, a.getYear());
+        assertEquals(Month.of(m), a.getMonth());
+        assertEquals(d, a.getDayOfMonth());
     }
 
-    @Test(dataProvider="sampleDates")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDates")
     public void test_getDOY(int y, int m, int d) {
         LocalDate a = LocalDate.of(y, m, d);
         int total = 0;
@@ -795,7 +809,7 @@ public class TCKLocalDate extends AbstractDateTimeTest {
             total += Month.of(i).length(isIsoLeap(y));
         }
         int doy = total + d;
-        assertEquals(a.getDayOfYear(), doy);
+        assertEquals(doy, a.getDayOfYear());
     }
 
     @Test
@@ -816,19 +830,19 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isLeapYear() {
-        assertEquals(LocalDate.of(1999, 1, 1).isLeapYear(), false);
-        assertEquals(LocalDate.of(2000, 1, 1).isLeapYear(), true);
-        assertEquals(LocalDate.of(2001, 1, 1).isLeapYear(), false);
-        assertEquals(LocalDate.of(2002, 1, 1).isLeapYear(), false);
-        assertEquals(LocalDate.of(2003, 1, 1).isLeapYear(), false);
-        assertEquals(LocalDate.of(2004, 1, 1).isLeapYear(), true);
-        assertEquals(LocalDate.of(2005, 1, 1).isLeapYear(), false);
+        assertEquals(false, LocalDate.of(1999, 1, 1).isLeapYear());
+        assertEquals(true, LocalDate.of(2000, 1, 1).isLeapYear());
+        assertEquals(false, LocalDate.of(2001, 1, 1).isLeapYear());
+        assertEquals(false, LocalDate.of(2002, 1, 1).isLeapYear());
+        assertEquals(false, LocalDate.of(2003, 1, 1).isLeapYear());
+        assertEquals(true, LocalDate.of(2004, 1, 1).isLeapYear());
+        assertEquals(false, LocalDate.of(2005, 1, 1).isLeapYear());
 
-        assertEquals(LocalDate.of(1500, 1, 1).isLeapYear(), false);
-        assertEquals(LocalDate.of(1600, 1, 1).isLeapYear(), true);
-        assertEquals(LocalDate.of(1700, 1, 1).isLeapYear(), false);
-        assertEquals(LocalDate.of(1800, 1, 1).isLeapYear(), false);
-        assertEquals(LocalDate.of(1900, 1, 1).isLeapYear(), false);
+        assertEquals(false, LocalDate.of(1500, 1, 1).isLeapYear());
+        assertEquals(true, LocalDate.of(1600, 1, 1).isLeapYear());
+        assertEquals(false, LocalDate.of(1700, 1, 1).isLeapYear());
+        assertEquals(false, LocalDate.of(1800, 1, 1).isLeapYear());
+        assertEquals(false, LocalDate.of(1900, 1, 1).isLeapYear());
     }
 
     //-----------------------------------------------------------------------
@@ -836,34 +850,34 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_lengthOfMonth_notLeapYear() {
-        assertEquals(LocalDate.of(2007, 1, 1).lengthOfMonth(), 31);
-        assertEquals(LocalDate.of(2007, 2, 1).lengthOfMonth(), 28);
-        assertEquals(LocalDate.of(2007, 3, 1).lengthOfMonth(), 31);
-        assertEquals(LocalDate.of(2007, 4, 1).lengthOfMonth(), 30);
-        assertEquals(LocalDate.of(2007, 5, 1).lengthOfMonth(), 31);
-        assertEquals(LocalDate.of(2007, 6, 1).lengthOfMonth(), 30);
-        assertEquals(LocalDate.of(2007, 7, 1).lengthOfMonth(), 31);
-        assertEquals(LocalDate.of(2007, 8, 1).lengthOfMonth(), 31);
-        assertEquals(LocalDate.of(2007, 9, 1).lengthOfMonth(), 30);
-        assertEquals(LocalDate.of(2007, 10, 1).lengthOfMonth(), 31);
-        assertEquals(LocalDate.of(2007, 11, 1).lengthOfMonth(), 30);
-        assertEquals(LocalDate.of(2007, 12, 1).lengthOfMonth(), 31);
+        assertEquals(31, LocalDate.of(2007, 1, 1).lengthOfMonth());
+        assertEquals(28, LocalDate.of(2007, 2, 1).lengthOfMonth());
+        assertEquals(31, LocalDate.of(2007, 3, 1).lengthOfMonth());
+        assertEquals(30, LocalDate.of(2007, 4, 1).lengthOfMonth());
+        assertEquals(31, LocalDate.of(2007, 5, 1).lengthOfMonth());
+        assertEquals(30, LocalDate.of(2007, 6, 1).lengthOfMonth());
+        assertEquals(31, LocalDate.of(2007, 7, 1).lengthOfMonth());
+        assertEquals(31, LocalDate.of(2007, 8, 1).lengthOfMonth());
+        assertEquals(30, LocalDate.of(2007, 9, 1).lengthOfMonth());
+        assertEquals(31, LocalDate.of(2007, 10, 1).lengthOfMonth());
+        assertEquals(30, LocalDate.of(2007, 11, 1).lengthOfMonth());
+        assertEquals(31, LocalDate.of(2007, 12, 1).lengthOfMonth());
     }
 
     @Test
     public void test_lengthOfMonth_leapYear() {
-        assertEquals(LocalDate.of(2008, 1, 1).lengthOfMonth(), 31);
-        assertEquals(LocalDate.of(2008, 2, 1).lengthOfMonth(), 29);
-        assertEquals(LocalDate.of(2008, 3, 1).lengthOfMonth(), 31);
-        assertEquals(LocalDate.of(2008, 4, 1).lengthOfMonth(), 30);
-        assertEquals(LocalDate.of(2008, 5, 1).lengthOfMonth(), 31);
-        assertEquals(LocalDate.of(2008, 6, 1).lengthOfMonth(), 30);
-        assertEquals(LocalDate.of(2008, 7, 1).lengthOfMonth(), 31);
-        assertEquals(LocalDate.of(2008, 8, 1).lengthOfMonth(), 31);
-        assertEquals(LocalDate.of(2008, 9, 1).lengthOfMonth(), 30);
-        assertEquals(LocalDate.of(2008, 10, 1).lengthOfMonth(), 31);
-        assertEquals(LocalDate.of(2008, 11, 1).lengthOfMonth(), 30);
-        assertEquals(LocalDate.of(2008, 12, 1).lengthOfMonth(), 31);
+        assertEquals(31, LocalDate.of(2008, 1, 1).lengthOfMonth());
+        assertEquals(29, LocalDate.of(2008, 2, 1).lengthOfMonth());
+        assertEquals(31, LocalDate.of(2008, 3, 1).lengthOfMonth());
+        assertEquals(30, LocalDate.of(2008, 4, 1).lengthOfMonth());
+        assertEquals(31, LocalDate.of(2008, 5, 1).lengthOfMonth());
+        assertEquals(30, LocalDate.of(2008, 6, 1).lengthOfMonth());
+        assertEquals(31, LocalDate.of(2008, 7, 1).lengthOfMonth());
+        assertEquals(31, LocalDate.of(2008, 8, 1).lengthOfMonth());
+        assertEquals(30, LocalDate.of(2008, 9, 1).lengthOfMonth());
+        assertEquals(31, LocalDate.of(2008, 10, 1).lengthOfMonth());
+        assertEquals(30, LocalDate.of(2008, 11, 1).lengthOfMonth());
+        assertEquals(31, LocalDate.of(2008, 12, 1).lengthOfMonth());
     }
 
     //-----------------------------------------------------------------------
@@ -871,8 +885,8 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_lengthOfYear() {
-        assertEquals(LocalDate.of(2007, 1, 1).lengthOfYear(), 365);
-        assertEquals(LocalDate.of(2008, 1, 1).lengthOfYear(), 366);
+        assertEquals(365, LocalDate.of(2007, 1, 1).lengthOfYear());
+        assertEquals(366, LocalDate.of(2008, 1, 1).lengthOfYear());
     }
 
     //-----------------------------------------------------------------------
@@ -887,12 +901,12 @@ public class TCKLocalDate extends AbstractDateTimeTest {
                 return sample;
             }
         };
-        assertEquals(TEST_2007_07_15.with(adjuster), sample);
+        assertEquals(sample, TEST_2007_07_15.with(adjuster));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_with_adjustment_null() {
-        TEST_2007_07_15.with((TemporalAdjuster) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15.with((TemporalAdjuster) null));
     }
 
     //-----------------------------------------------------------------------
@@ -901,27 +915,27 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     @Test
     public void test_with_TemporalField_long_normal() {
         LocalDate t = TEST_2007_07_15.with(YEAR, 2008);
-        assertEquals(t, LocalDate.of(2008, 7, 15));
+        assertEquals(LocalDate.of(2008, 7, 15), t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class )
+    @Test
     public void test_with_TemporalField_long_null() {
-        TEST_2007_07_15.with((TemporalField) null, 1);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15.with((TemporalField) null, 1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class )
+    @Test
     public void test_with_TemporalField_long_invalidField() {
-        TEST_2007_07_15.with(MockFieldNoValue.INSTANCE, 1);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15.with(MockFieldNoValue.INSTANCE, 1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class )
+    @Test
     public void test_with_TemporalField_long_timeField() {
-        TEST_2007_07_15.with(ChronoField.AMPM_OF_DAY, 1);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15.with(ChronoField.AMPM_OF_DAY, 1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class )
+    @Test
     public void test_with_TemporalField_long_invalidValue() {
-        TEST_2007_07_15.with(ChronoField.DAY_OF_WEEK, -1);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15.with(ChronoField.DAY_OF_WEEK, -1));
     }
 
     //-----------------------------------------------------------------------
@@ -930,19 +944,19 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     @Test
     public void test_withYear_int_normal() {
         LocalDate t = TEST_2007_07_15.withYear(2008);
-        assertEquals(t, LocalDate.of(2008, 7, 15));
+        assertEquals(LocalDate.of(2008, 7, 15), t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withYear_int_invalid() {
-        TEST_2007_07_15.withYear(Year.MIN_VALUE - 1);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15.withYear(Year.MIN_VALUE - 1));
     }
 
     @Test
     public void test_withYear_int_adjustDay() {
         LocalDate t = LocalDate.of(2008, 2, 29).withYear(2007);
         LocalDate expected = LocalDate.of(2007, 2, 28);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
     //-----------------------------------------------------------------------
@@ -951,19 +965,19 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     @Test
     public void test_withMonth_int_normal() {
         LocalDate t = TEST_2007_07_15.withMonth(1);
-        assertEquals(t, LocalDate.of(2007, 1, 15));
+        assertEquals(LocalDate.of(2007, 1, 15), t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withMonth_int_invalid() {
-        TEST_2007_07_15.withMonth(13);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15.withMonth(13));
     }
 
     @Test
     public void test_withMonth_int_adjustDay() {
         LocalDate t = LocalDate.of(2007, 12, 31).withMonth(11);
         LocalDate expected = LocalDate.of(2007, 11, 30);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
     //-----------------------------------------------------------------------
@@ -972,17 +986,17 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     @Test
     public void test_withDayOfMonth_normal() {
         LocalDate t = TEST_2007_07_15.withDayOfMonth(1);
-        assertEquals(t, LocalDate.of(2007, 7, 1));
+        assertEquals(LocalDate.of(2007, 7, 1), t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfMonth_illegal() {
-        TEST_2007_07_15.withDayOfMonth(32);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15.withDayOfMonth(32));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfMonth_invalid() {
-        LocalDate.of(2007, 11, 30).withDayOfMonth(31);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(2007, 11, 30).withDayOfMonth(31));
     }
 
     //-----------------------------------------------------------------------
@@ -991,17 +1005,17 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     @Test
     public void test_withDayOfYear_normal() {
         LocalDate t = TEST_2007_07_15.withDayOfYear(33);
-        assertEquals(t, LocalDate.of(2007, 2, 2));
+        assertEquals(LocalDate.of(2007, 2, 2), t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfYear_illegal() {
-        TEST_2007_07_15.withDayOfYear(367);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15.withDayOfYear(367));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfYear_invalid() {
-        TEST_2007_07_15.withDayOfYear(366);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15.withDayOfYear(366));
     }
 
     //-----------------------------------------------------------------------
@@ -1011,37 +1025,43 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     public void test_plus_Period_positiveMonths() {
         MockSimplePeriod period = MockSimplePeriod.of(7, ChronoUnit.MONTHS);
         LocalDate t = TEST_2007_07_15.plus(period);
-        assertEquals(t, LocalDate.of(2008, 2, 15));
+        assertEquals(LocalDate.of(2008, 2, 15), t);
     }
 
     @Test
     public void test_plus_Period_negativeDays() {
         MockSimplePeriod period = MockSimplePeriod.of(-25, ChronoUnit.DAYS);
         LocalDate t = TEST_2007_07_15.plus(period);
-        assertEquals(t, LocalDate.of(2007, 6, 20));
+        assertEquals(LocalDate.of(2007, 6, 20), t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plus_Period_timeNotAllowed() {
-        MockSimplePeriod period = MockSimplePeriod.of(7, ChronoUnit.HOURS);
-        TEST_2007_07_15.plus(period);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            MockSimplePeriod period = MockSimplePeriod.of(7, ChronoUnit.HOURS);
+            TEST_2007_07_15.plus(period);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_plus_Period_null() {
-        TEST_2007_07_15.plus((MockSimplePeriod) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15.plus((MockSimplePeriod) null));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plus_Period_invalidTooLarge() {
-        MockSimplePeriod period = MockSimplePeriod.of(1, ChronoUnit.YEARS);
-        LocalDate.of(Year.MAX_VALUE, 1, 1).plus(period);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            MockSimplePeriod period = MockSimplePeriod.of(1, ChronoUnit.YEARS);
+            LocalDate.of(Year.MAX_VALUE, 1, 1).plus(period);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plus_Period_invalidTooSmall() {
-        MockSimplePeriod period = MockSimplePeriod.of(-1, ChronoUnit.YEARS);
-        LocalDate.of(Year.MIN_VALUE, 1, 1).plus(period);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            MockSimplePeriod period = MockSimplePeriod.of(-1, ChronoUnit.YEARS);
+            LocalDate.of(Year.MIN_VALUE, 1, 1).plus(period);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1050,33 +1070,33 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     @Test
     public void test_plus_longTemporalUnit_positiveMonths() {
         LocalDate t = TEST_2007_07_15.plus(7, ChronoUnit.MONTHS);
-        assertEquals(t, LocalDate.of(2008, 2, 15));
+        assertEquals(LocalDate.of(2008, 2, 15), t);
     }
 
     @Test
     public void test_plus_longTemporalUnit_negativeDays() {
         LocalDate t = TEST_2007_07_15.plus(-25, ChronoUnit.DAYS);
-        assertEquals(t, LocalDate.of(2007, 6, 20));
+        assertEquals(LocalDate.of(2007, 6, 20), t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plus_longTemporalUnit_timeNotAllowed() {
-        TEST_2007_07_15.plus(7, ChronoUnit.HOURS);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15.plus(7, ChronoUnit.HOURS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_plus_longTemporalUnit_null() {
-        TEST_2007_07_15.plus(1, (TemporalUnit) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15.plus(1, (TemporalUnit) null));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plus_longTemporalUnit_invalidTooLarge() {
-        LocalDate.of(Year.MAX_VALUE, 1, 1).plus(1, ChronoUnit.YEARS);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MAX_VALUE, 1, 1).plus(1, ChronoUnit.YEARS));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plus_longTemporalUnit_invalidTooSmall() {
-        LocalDate.of(Year.MIN_VALUE, 1, 1).plus(-1, ChronoUnit.YEARS);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MIN_VALUE, 1, 1).plus(-1, ChronoUnit.YEARS));
     }
 
     //-----------------------------------------------------------------------
@@ -1085,55 +1105,61 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     @Test
     public void test_plusYears_long_normal() {
         LocalDate t = TEST_2007_07_15.plusYears(1);
-        assertEquals(t, LocalDate.of(2008, 7, 15));
+        assertEquals(LocalDate.of(2008, 7, 15), t);
     }
 
     @Test
     public void test_plusYears_long_negative() {
         LocalDate t = TEST_2007_07_15.plusYears(-1);
-        assertEquals(t, LocalDate.of(2006, 7, 15));
+        assertEquals(LocalDate.of(2006, 7, 15), t);
     }
 
     @Test
     public void test_plusYears_long_adjustDay() {
         LocalDate t = LocalDate.of(2008, 2, 29).plusYears(1);
         LocalDate expected = LocalDate.of(2009, 2, 28);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
     @Test
     public void test_plusYears_long_big() {
         long years = 20L + Year.MAX_VALUE;
         LocalDate test = LocalDate.of(-40, 6, 1).plusYears(years);
-        assertEquals(test, LocalDate.of((int) (-40L + years), 6, 1));
+        assertEquals(LocalDate.of((int) (-40L + years), 6, 1), test);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusYears_long_invalidTooLarge() {
-        LocalDate test = LocalDate.of(Year.MAX_VALUE, 6, 1);
-        test.plusYears(1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate test = LocalDate.of(Year.MAX_VALUE, 6, 1);
+            test.plusYears(1);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusYears_long_invalidTooLargeMaxAddMax() {
-        LocalDate test = LocalDate.of(Year.MAX_VALUE, 12, 1);
-        test.plusYears(Long.MAX_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate test = LocalDate.of(Year.MAX_VALUE, 12, 1);
+            test.plusYears(Long.MAX_VALUE);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusYears_long_invalidTooLargeMaxAddMin() {
-        LocalDate test = LocalDate.of(Year.MAX_VALUE, 12, 1);
-        test.plusYears(Long.MIN_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate test = LocalDate.of(Year.MAX_VALUE, 12, 1);
+            test.plusYears(Long.MIN_VALUE);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusYears_long_invalidTooSmall_validInt() {
-        LocalDate.of(Year.MIN_VALUE, 1, 1).plusYears(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MIN_VALUE, 1, 1).plusYears(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusYears_long_invalidTooSmall_invalidInt() {
-        LocalDate.of(Year.MIN_VALUE, 1, 1).plusYears(-10);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MIN_VALUE, 1, 1).plusYears(-10));
     }
 
     //-----------------------------------------------------------------------
@@ -1142,153 +1168,156 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     @Test
     public void test_plusMonths_long_normal() {
         LocalDate t = TEST_2007_07_15.plusMonths(1);
-        assertEquals(t, LocalDate.of(2007, 8, 15));
+        assertEquals(LocalDate.of(2007, 8, 15), t);
     }
 
     @Test
     public void test_plusMonths_long_overYears() {
         LocalDate t = TEST_2007_07_15.plusMonths(25);
-        assertEquals(t, LocalDate.of(2009, 8, 15));
+        assertEquals(LocalDate.of(2009, 8, 15), t);
     }
 
     @Test
     public void test_plusMonths_long_negative() {
         LocalDate t = TEST_2007_07_15.plusMonths(-1);
-        assertEquals(t, LocalDate.of(2007, 6, 15));
+        assertEquals(LocalDate.of(2007, 6, 15), t);
     }
 
     @Test
     public void test_plusMonths_long_negativeAcrossYear() {
         LocalDate t = TEST_2007_07_15.plusMonths(-7);
-        assertEquals(t, LocalDate.of(2006, 12, 15));
+        assertEquals(LocalDate.of(2006, 12, 15), t);
     }
 
     @Test
     public void test_plusMonths_long_negativeOverYears() {
         LocalDate t = TEST_2007_07_15.plusMonths(-31);
-        assertEquals(t, LocalDate.of(2004, 12, 15));
+        assertEquals(LocalDate.of(2004, 12, 15), t);
     }
 
     @Test
     public void test_plusMonths_long_adjustDayFromLeapYear() {
         LocalDate t = LocalDate.of(2008, 2, 29).plusMonths(12);
         LocalDate expected = LocalDate.of(2009, 2, 28);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
     @Test
     public void test_plusMonths_long_adjustDayFromMonthLength() {
         LocalDate t = LocalDate.of(2007, 3, 31).plusMonths(1);
         LocalDate expected = LocalDate.of(2007, 4, 30);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
     @Test
     public void test_plusMonths_long_big() {
         long months = 20L + Integer.MAX_VALUE;
         LocalDate test = LocalDate.of(-40, 6, 1).plusMonths(months);
-        assertEquals(test, LocalDate.of((int) (-40L + months / 12), 6 + (int) (months % 12), 1));
+        assertEquals(LocalDate.of((int) (-40L + months / 12), 6 + (int) (months % 12), 1), test);
     }
 
-    @Test(expectedExceptions={DateTimeException.class})
+    @Test
     public void test_plusMonths_long_invalidTooLarge() {
-        LocalDate.of(Year.MAX_VALUE, 12, 1).plusMonths(1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MAX_VALUE, 12, 1).plusMonths(1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusMonths_long_invalidTooLargeMaxAddMax() {
-        LocalDate test = LocalDate.of(Year.MAX_VALUE, 12, 1);
-        test.plusMonths(Long.MAX_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate test = LocalDate.of(Year.MAX_VALUE, 12, 1);
+            test.plusMonths(Long.MAX_VALUE);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusMonths_long_invalidTooLargeMaxAddMin() {
-        LocalDate test = LocalDate.of(Year.MAX_VALUE, 12, 1);
-        test.plusMonths(Long.MIN_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate test = LocalDate.of(Year.MAX_VALUE, 12, 1);
+            test.plusMonths(Long.MIN_VALUE);
+        });
     }
 
-    @Test(expectedExceptions={DateTimeException.class})
+    @Test
     public void test_plusMonths_long_invalidTooSmall() {
-        LocalDate.of(Year.MIN_VALUE, 1, 1).plusMonths(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MIN_VALUE, 1, 1).plusMonths(-1));
     }
 
     @Test
     public void test_plusWeeks_normal() {
         LocalDate t = TEST_2007_07_15.plusWeeks(1);
-        assertEquals(t, LocalDate.of(2007, 7, 22));
+        assertEquals(LocalDate.of(2007, 7, 22), t);
     }
 
     @Test
     public void test_plusWeeks_overMonths() {
         LocalDate t = TEST_2007_07_15.plusWeeks(9);
-        assertEquals(t, LocalDate.of(2007, 9, 16));
+        assertEquals(LocalDate.of(2007, 9, 16), t);
     }
 
     @Test
     public void test_plusWeeks_overYears() {
         LocalDate t = LocalDate.of(2006, 7, 16).plusWeeks(52);
-        assertEquals(t, TEST_2007_07_15);
+        assertEquals(TEST_2007_07_15, t);
     }
 
     @Test
     public void test_plusWeeks_overLeapYears() {
         LocalDate t = TEST_2007_07_15.plusYears(-1).plusWeeks(104);
-        assertEquals(t, LocalDate.of(2008, 7, 12));
+        assertEquals(LocalDate.of(2008, 7, 12), t);
     }
 
     @Test
     public void test_plusWeeks_negative() {
         LocalDate t = TEST_2007_07_15.plusWeeks(-1);
-        assertEquals(t, LocalDate.of(2007, 7, 8));
+        assertEquals(LocalDate.of(2007, 7, 8), t);
     }
 
     @Test
     public void test_plusWeeks_negativeAcrossYear() {
         LocalDate t = TEST_2007_07_15.plusWeeks(-28);
-        assertEquals(t, LocalDate.of(2006, 12, 31));
+        assertEquals(LocalDate.of(2006, 12, 31), t);
     }
 
     @Test
     public void test_plusWeeks_negativeOverYears() {
         LocalDate t = TEST_2007_07_15.plusWeeks(-104);
-        assertEquals(t, LocalDate.of(2005, 7, 17));
+        assertEquals(LocalDate.of(2005, 7, 17), t);
     }
 
     @Test
     public void test_plusWeeks_maximum() {
         LocalDate t = LocalDate.of(Year.MAX_VALUE, 12, 24).plusWeeks(1);
         LocalDate expected = LocalDate.of(Year.MAX_VALUE, 12, 31);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
     @Test
     public void test_plusWeeks_minimum() {
         LocalDate t = LocalDate.of(Year.MIN_VALUE, 1, 8).plusWeeks(-1);
         LocalDate expected = LocalDate.of(Year.MIN_VALUE, 1, 1);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
-    @Test(expectedExceptions={DateTimeException.class})
+    @Test
     public void test_plusWeeks_invalidTooLarge() {
-        LocalDate.of(Year.MAX_VALUE, 12, 25).plusWeeks(1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MAX_VALUE, 12, 25).plusWeeks(1));
     }
 
-    @Test(expectedExceptions={DateTimeException.class})
+    @Test
     public void test_plusWeeks_invalidTooSmall() {
-        LocalDate.of(Year.MIN_VALUE, 1, 7).plusWeeks(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MIN_VALUE, 1, 7).plusWeeks(-1));
     }
 
-    @Test(expectedExceptions={ArithmeticException.class})
+    @Test
     public void test_plusWeeks_invalidMaxMinusMax() {
-        LocalDate.of(Year.MAX_VALUE, 12, 25).plusWeeks(Long.MAX_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> LocalDate.of(Year.MAX_VALUE, 12, 25).plusWeeks(Long.MAX_VALUE));
     }
 
-    @Test(expectedExceptions={ArithmeticException.class})
+    @Test
     public void test_plusWeeks_invalidMaxMinusMin() {
-        LocalDate.of(Year.MAX_VALUE, 12, 25).plusWeeks(Long.MIN_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> LocalDate.of(Year.MAX_VALUE, 12, 25).plusWeeks(Long.MIN_VALUE));
     }
     //-----------------------------------------------------------------------
-    @DataProvider(name="PlusDays")
     Object[][] provider_plusDays() {
         return new Object[][] {
                 {LocalDate.of(2007, 7, 15), 1, LocalDate.of(2007, 7, 16)},
@@ -1312,80 +1341,81 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="PlusDays")
+    @ParameterizedTest
+    @MethodSource("provider_plusDays")
     public void test_plusDays_normal(LocalDate input, int amountsToAdd, LocalDate expected) {
         LocalDate actual = input.plusDays(amountsToAdd);
-        assertEquals(actual, expected);
+        assertEquals(expected, actual);
      }
 
     @Test
     public void test_plusDays_overMonths() {
         LocalDate t = TEST_2007_07_15.plusDays(62);
-        assertEquals(t, LocalDate.of(2007, 9, 15));
+        assertEquals(LocalDate.of(2007, 9, 15), t);
     }
 
     @Test
     public void test_plusDays_overYears() {
         LocalDate t = LocalDate.of(2006, 7, 14).plusDays(366);
-        assertEquals(t, TEST_2007_07_15);
+        assertEquals(TEST_2007_07_15, t);
     }
 
     @Test
     public void test_plusDays_overLeapYears() {
         LocalDate t = TEST_2007_07_15.plusYears(-1).plusDays(365 + 366);
-        assertEquals(t, LocalDate.of(2008, 7, 15));
+        assertEquals(LocalDate.of(2008, 7, 15), t);
     }
 
     @Test
     public void test_plusDays_negative() {
         LocalDate t = TEST_2007_07_15.plusDays(-1);
-        assertEquals(t, LocalDate.of(2007, 7, 14));
+        assertEquals(LocalDate.of(2007, 7, 14), t);
     }
 
     @Test
     public void test_plusDays_negativeAcrossYear() {
         LocalDate t = TEST_2007_07_15.plusDays(-196);
-        assertEquals(t, LocalDate.of(2006, 12, 31));
+        assertEquals(LocalDate.of(2006, 12, 31), t);
     }
 
     @Test
     public void test_plusDays_negativeOverYears() {
         LocalDate t = TEST_2007_07_15.plusDays(-730);
-        assertEquals(t, LocalDate.of(2005, 7, 15));
+        assertEquals(LocalDate.of(2005, 7, 15), t);
     }
 
     @Test
     public void test_plusDays_maximum() {
         LocalDate t = LocalDate.of(Year.MAX_VALUE, 12, 30).plusDays(1);
         LocalDate expected = LocalDate.of(Year.MAX_VALUE, 12, 31);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
     @Test
     public void test_plusDays_minimum() {
         LocalDate t = LocalDate.of(Year.MIN_VALUE, 1, 2).plusDays(-1);
         LocalDate expected = LocalDate.of(Year.MIN_VALUE, 1, 1);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
-    @Test(expectedExceptions={DateTimeException.class})
+    @Test
     public void test_plusDays_invalidTooLarge() {
-        LocalDate.of(Year.MAX_VALUE, 12, 31).plusDays(1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MAX_VALUE, 12, 31).plusDays(1));
     }
 
-    @Test(expectedExceptions={DateTimeException.class})
+    @Test
     public void test_plusDays_invalidTooSmall() {
-        LocalDate.of(Year.MIN_VALUE, 1, 1).plusDays(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MIN_VALUE, 1, 1).plusDays(-1));
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_plusDays_overflowTooLarge() {
-        LocalDate.of(Year.MAX_VALUE, 12, 31).plusDays(Long.MAX_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> LocalDate.of(Year.MAX_VALUE, 12, 31).plusDays(Long.MAX_VALUE));
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_plusDays_overflowTooSmall() {
-        LocalDate.of(Year.MIN_VALUE, 1, 1).plusDays(Long.MIN_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> LocalDate.of(Year.MIN_VALUE, 1, 1).plusDays(Long.MIN_VALUE));
     }
 
     //-----------------------------------------------------------------------
@@ -1395,37 +1425,43 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     public void test_minus_Period_positiveMonths() {
         MockSimplePeriod period = MockSimplePeriod.of(7, ChronoUnit.MONTHS);
         LocalDate t = TEST_2007_07_15.minus(period);
-        assertEquals(t, LocalDate.of(2006, 12, 15));
+        assertEquals(LocalDate.of(2006, 12, 15), t);
     }
 
     @Test
     public void test_minus_Period_negativeDays() {
         MockSimplePeriod period = MockSimplePeriod.of(-25, ChronoUnit.DAYS);
         LocalDate t = TEST_2007_07_15.minus(period);
-        assertEquals(t, LocalDate.of(2007, 8, 9));
+        assertEquals(LocalDate.of(2007, 8, 9), t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minus_Period_timeNotAllowed() {
-        MockSimplePeriod period = MockSimplePeriod.of(7, ChronoUnit.HOURS);
-        TEST_2007_07_15.minus(period);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            MockSimplePeriod period = MockSimplePeriod.of(7, ChronoUnit.HOURS);
+            TEST_2007_07_15.minus(period);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_minus_Period_null() {
-        TEST_2007_07_15.minus((MockSimplePeriod) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15.minus((MockSimplePeriod) null));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minus_Period_invalidTooLarge() {
-        MockSimplePeriod period = MockSimplePeriod.of(-1, ChronoUnit.YEARS);
-        LocalDate.of(Year.MAX_VALUE, 1, 1).minus(period);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            MockSimplePeriod period = MockSimplePeriod.of(-1, ChronoUnit.YEARS);
+            LocalDate.of(Year.MAX_VALUE, 1, 1).minus(period);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minus_Period_invalidTooSmall() {
-        MockSimplePeriod period = MockSimplePeriod.of(1, ChronoUnit.YEARS);
-        LocalDate.of(Year.MIN_VALUE, 1, 1).minus(period);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            MockSimplePeriod period = MockSimplePeriod.of(1, ChronoUnit.YEARS);
+            LocalDate.of(Year.MIN_VALUE, 1, 1).minus(period);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1434,33 +1470,33 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     @Test
     public void test_minus_longTemporalUnit_positiveMonths() {
         LocalDate t = TEST_2007_07_15.minus(7, ChronoUnit.MONTHS);
-        assertEquals(t, LocalDate.of(2006, 12, 15));
+        assertEquals(LocalDate.of(2006, 12, 15), t);
     }
 
     @Test
     public void test_minus_longTemporalUnit_negativeDays() {
         LocalDate t = TEST_2007_07_15.minus(-25, ChronoUnit.DAYS);
-        assertEquals(t, LocalDate.of(2007, 8, 9));
+        assertEquals(LocalDate.of(2007, 8, 9), t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minus_longTemporalUnit_timeNotAllowed() {
-        TEST_2007_07_15.minus(7, ChronoUnit.HOURS);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15.minus(7, ChronoUnit.HOURS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_minus_longTemporalUnit_null() {
-        TEST_2007_07_15.minus(1, (TemporalUnit) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15.minus(1, (TemporalUnit) null));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minus_longTemporalUnit_invalidTooLarge() {
-        LocalDate.of(Year.MAX_VALUE, 1, 1).minus(-1, ChronoUnit.YEARS);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MAX_VALUE, 1, 1).minus(-1, ChronoUnit.YEARS));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minus_longTemporalUnit_invalidTooSmall() {
-        LocalDate.of(Year.MIN_VALUE, 1, 1).minus(1, ChronoUnit.YEARS);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MIN_VALUE, 1, 1).minus(1, ChronoUnit.YEARS));
     }
 
     //-----------------------------------------------------------------------
@@ -1469,50 +1505,56 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     @Test
     public void test_minusYears_long_normal() {
         LocalDate t = TEST_2007_07_15.minusYears(1);
-        assertEquals(t, LocalDate.of(2006, 7, 15));
+        assertEquals(LocalDate.of(2006, 7, 15), t);
     }
 
     @Test
     public void test_minusYears_long_negative() {
         LocalDate t = TEST_2007_07_15.minusYears(-1);
-        assertEquals(t, LocalDate.of(2008, 7, 15));
+        assertEquals(LocalDate.of(2008, 7, 15), t);
     }
 
     @Test
     public void test_minusYears_long_adjustDay() {
         LocalDate t = LocalDate.of(2008, 2, 29).minusYears(1);
         LocalDate expected = LocalDate.of(2007, 2, 28);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
     @Test
     public void test_minusYears_long_big() {
         long years = 20L + Year.MAX_VALUE;
         LocalDate test = LocalDate.of(40, 6, 1).minusYears(years);
-        assertEquals(test, LocalDate.of((int) (40L - years), 6, 1));
+        assertEquals(LocalDate.of((int) (40L - years), 6, 1), test);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusYears_long_invalidTooLarge() {
-        LocalDate test = LocalDate.of(Year.MAX_VALUE, 6, 1);
-        test.minusYears(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate test = LocalDate.of(Year.MAX_VALUE, 6, 1);
+            test.minusYears(-1);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusYears_long_invalidTooLargeMaxAddMax() {
-        LocalDate test = LocalDate.of(Year.MAX_VALUE, 12, 1);
-        test.minusYears(Long.MAX_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate test = LocalDate.of(Year.MAX_VALUE, 12, 1);
+            test.minusYears(Long.MAX_VALUE);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusYears_long_invalidTooLargeMaxAddMin() {
-        LocalDate test = LocalDate.of(Year.MAX_VALUE, 12, 1);
-        test.minusYears(Long.MIN_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate test = LocalDate.of(Year.MAX_VALUE, 12, 1);
+            test.minusYears(Long.MIN_VALUE);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusYears_long_invalidTooSmall() {
-        LocalDate.of(Year.MIN_VALUE, 1, 1).minusYears(1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MIN_VALUE, 1, 1).minusYears(1));
     }
 
     //-----------------------------------------------------------------------
@@ -1521,232 +1563,235 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     @Test
     public void test_minusMonths_long_normal() {
         LocalDate t = TEST_2007_07_15.minusMonths(1);
-        assertEquals(t, LocalDate.of(2007, 6, 15));
+        assertEquals(LocalDate.of(2007, 6, 15), t);
     }
 
     @Test
     public void test_minusMonths_long_overYears() {
         LocalDate t = TEST_2007_07_15.minusMonths(25);
-        assertEquals(t, LocalDate.of(2005, 6, 15));
+        assertEquals(LocalDate.of(2005, 6, 15), t);
     }
 
     @Test
     public void test_minusMonths_long_negative() {
         LocalDate t = TEST_2007_07_15.minusMonths(-1);
-        assertEquals(t, LocalDate.of(2007, 8, 15));
+        assertEquals(LocalDate.of(2007, 8, 15), t);
     }
 
     @Test
     public void test_minusMonths_long_negativeAcrossYear() {
         LocalDate t = TEST_2007_07_15.minusMonths(-7);
-        assertEquals(t, LocalDate.of(2008, 2, 15));
+        assertEquals(LocalDate.of(2008, 2, 15), t);
     }
 
     @Test
     public void test_minusMonths_long_negativeOverYears() {
         LocalDate t = TEST_2007_07_15.minusMonths(-31);
-        assertEquals(t, LocalDate.of(2010, 2, 15));
+        assertEquals(LocalDate.of(2010, 2, 15), t);
     }
 
     @Test
     public void test_minusMonths_long_adjustDayFromLeapYear() {
         LocalDate t = LocalDate.of(2008, 2, 29).minusMonths(12);
         LocalDate expected = LocalDate.of(2007, 2, 28);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
     @Test
     public void test_minusMonths_long_adjustDayFromMonthLength() {
         LocalDate t = LocalDate.of(2007, 3, 31).minusMonths(1);
         LocalDate expected = LocalDate.of(2007, 2, 28);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
     @Test
     public void test_minusMonths_long_big() {
         long months = 20L + Integer.MAX_VALUE;
         LocalDate test = LocalDate.of(40, 6, 1).minusMonths(months);
-        assertEquals(test, LocalDate.of((int) (40L - months / 12), 6 - (int) (months % 12), 1));
+        assertEquals(LocalDate.of((int) (40L - months / 12), 6 - (int) (months % 12), 1), test);
     }
 
-    @Test(expectedExceptions={DateTimeException.class})
+    @Test
     public void test_minusMonths_long_invalidTooLarge() {
-        LocalDate.of(Year.MAX_VALUE, 12, 1).minusMonths(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MAX_VALUE, 12, 1).minusMonths(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusMonths_long_invalidTooLargeMaxAddMax() {
-        LocalDate test = LocalDate.of(Year.MAX_VALUE, 12, 1);
-        test.minusMonths(Long.MAX_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate test = LocalDate.of(Year.MAX_VALUE, 12, 1);
+            test.minusMonths(Long.MAX_VALUE);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusMonths_long_invalidTooLargeMaxAddMin() {
-        LocalDate test = LocalDate.of(Year.MAX_VALUE, 12, 1);
-        test.minusMonths(Long.MIN_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate test = LocalDate.of(Year.MAX_VALUE, 12, 1);
+            test.minusMonths(Long.MIN_VALUE);
+        });
     }
 
-    @Test(expectedExceptions={DateTimeException.class})
+    @Test
     public void test_minusMonths_long_invalidTooSmall() {
-        LocalDate.of(Year.MIN_VALUE, 1, 1).minusMonths(1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MIN_VALUE, 1, 1).minusMonths(1));
     }
 
     @Test
     public void test_minusWeeks_normal() {
         LocalDate t = TEST_2007_07_15.minusWeeks(1);
-        assertEquals(t, LocalDate.of(2007, 7, 8));
+        assertEquals(LocalDate.of(2007, 7, 8), t);
     }
 
     @Test
     public void test_minusWeeks_overMonths() {
         LocalDate t = TEST_2007_07_15.minusWeeks(9);
-        assertEquals(t, LocalDate.of(2007, 5, 13));
+        assertEquals(LocalDate.of(2007, 5, 13), t);
     }
 
     @Test
     public void test_minusWeeks_overYears() {
         LocalDate t = LocalDate.of(2008, 7, 13).minusWeeks(52);
-        assertEquals(t, TEST_2007_07_15);
+        assertEquals(TEST_2007_07_15, t);
     }
 
     @Test
     public void test_minusWeeks_overLeapYears() {
         LocalDate t = TEST_2007_07_15.minusYears(-1).minusWeeks(104);
-        assertEquals(t, LocalDate.of(2006, 7, 18));
+        assertEquals(LocalDate.of(2006, 7, 18), t);
     }
 
     @Test
     public void test_minusWeeks_negative() {
         LocalDate t = TEST_2007_07_15.minusWeeks(-1);
-        assertEquals(t, LocalDate.of(2007, 7, 22));
+        assertEquals(LocalDate.of(2007, 7, 22), t);
     }
 
     @Test
     public void test_minusWeeks_negativeAcrossYear() {
         LocalDate t = TEST_2007_07_15.minusWeeks(-28);
-        assertEquals(t, LocalDate.of(2008, 1, 27));
+        assertEquals(LocalDate.of(2008, 1, 27), t);
     }
 
     @Test
     public void test_minusWeeks_negativeOverYears() {
         LocalDate t = TEST_2007_07_15.minusWeeks(-104);
-        assertEquals(t, LocalDate.of(2009, 7, 12));
+        assertEquals(LocalDate.of(2009, 7, 12), t);
     }
 
     @Test
     public void test_minusWeeks_maximum() {
         LocalDate t = LocalDate.of(Year.MAX_VALUE, 12, 24).minusWeeks(-1);
         LocalDate expected = LocalDate.of(Year.MAX_VALUE, 12, 31);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
     @Test
     public void test_minusWeeks_minimum() {
         LocalDate t = LocalDate.of(Year.MIN_VALUE, 1, 8).minusWeeks(1);
         LocalDate expected = LocalDate.of(Year.MIN_VALUE, 1, 1);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
-    @Test(expectedExceptions={DateTimeException.class})
+    @Test
     public void test_minusWeeks_invalidTooLarge() {
-        LocalDate.of(Year.MAX_VALUE, 12, 25).minusWeeks(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MAX_VALUE, 12, 25).minusWeeks(-1));
     }
 
-    @Test(expectedExceptions={DateTimeException.class})
+    @Test
     public void test_minusWeeks_invalidTooSmall() {
-        LocalDate.of(Year.MIN_VALUE, 1, 7).minusWeeks(1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MIN_VALUE, 1, 7).minusWeeks(1));
     }
 
-    @Test(expectedExceptions={ArithmeticException.class})
+    @Test
     public void test_minusWeeks_invalidMaxMinusMax() {
-        LocalDate.of(Year.MAX_VALUE, 12, 25).minusWeeks(Long.MAX_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> LocalDate.of(Year.MAX_VALUE, 12, 25).minusWeeks(Long.MAX_VALUE));
     }
 
-    @Test(expectedExceptions={ArithmeticException.class})
+    @Test
     public void test_minusWeeks_invalidMaxMinusMin() {
-        LocalDate.of(Year.MAX_VALUE, 12, 25).minusWeeks(Long.MIN_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> LocalDate.of(Year.MAX_VALUE, 12, 25).minusWeeks(Long.MIN_VALUE));
     }
 
     @Test
     public void test_minusDays_normal() {
         LocalDate t = TEST_2007_07_15.minusDays(1);
-        assertEquals(t, LocalDate.of(2007, 7, 14));
+        assertEquals(LocalDate.of(2007, 7, 14), t);
     }
 
     @Test
     public void test_minusDays_overMonths() {
         LocalDate t = TEST_2007_07_15.minusDays(62);
-        assertEquals(t, LocalDate.of(2007, 5, 14));
+        assertEquals(LocalDate.of(2007, 5, 14), t);
     }
 
     @Test
     public void test_minusDays_overYears() {
         LocalDate t = LocalDate.of(2008, 7, 16).minusDays(367);
-        assertEquals(t, TEST_2007_07_15);
+        assertEquals(TEST_2007_07_15, t);
     }
 
     @Test
     public void test_minusDays_overLeapYears() {
         LocalDate t = TEST_2007_07_15.plusYears(2).minusDays(365 + 366);
-        assertEquals(t, TEST_2007_07_15);
+        assertEquals(TEST_2007_07_15, t);
     }
 
     @Test
     public void test_minusDays_negative() {
         LocalDate t = TEST_2007_07_15.minusDays(-1);
-        assertEquals(t, LocalDate.of(2007, 7, 16));
+        assertEquals(LocalDate.of(2007, 7, 16), t);
     }
 
     @Test
     public void test_minusDays_negativeAcrossYear() {
         LocalDate t = TEST_2007_07_15.minusDays(-169);
-        assertEquals(t, LocalDate.of(2007, 12, 31));
+        assertEquals(LocalDate.of(2007, 12, 31), t);
     }
 
     @Test
     public void test_minusDays_negativeOverYears() {
         LocalDate t = TEST_2007_07_15.minusDays(-731);
-        assertEquals(t, LocalDate.of(2009, 7, 15));
+        assertEquals(LocalDate.of(2009, 7, 15), t);
     }
 
     @Test
     public void test_minusDays_maximum() {
         LocalDate t = LocalDate.of(Year.MAX_VALUE, 12, 30).minusDays(-1);
         LocalDate expected = LocalDate.of(Year.MAX_VALUE, 12, 31);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
     @Test
     public void test_minusDays_minimum() {
         LocalDate t = LocalDate.of(Year.MIN_VALUE, 1, 2).minusDays(1);
         LocalDate expected = LocalDate.of(Year.MIN_VALUE, 1, 1);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
-    @Test(expectedExceptions={DateTimeException.class})
+    @Test
     public void test_minusDays_invalidTooLarge() {
-        LocalDate.of(Year.MAX_VALUE, 12, 31).minusDays(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MAX_VALUE, 12, 31).minusDays(-1));
     }
 
-    @Test(expectedExceptions={DateTimeException.class})
+    @Test
     public void test_minusDays_invalidTooSmall() {
-        LocalDate.of(Year.MIN_VALUE, 1, 1).minusDays(1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MIN_VALUE, 1, 1).minusDays(1));
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_minusDays_overflowTooLarge() {
-        LocalDate.of(Year.MAX_VALUE, 12, 31).minusDays(Long.MIN_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> LocalDate.of(Year.MAX_VALUE, 12, 31).minusDays(Long.MIN_VALUE));
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_minusDays_overflowTooSmall() {
-        LocalDate.of(Year.MIN_VALUE, 1, 1).minusDays(Long.MAX_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> LocalDate.of(Year.MIN_VALUE, 1, 1).minusDays(Long.MAX_VALUE));
     }
 
     //-----------------------------------------------------------------------
     // until(Temporal, TemporalUnit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="periodUntilUnit")
     Object[][] data_periodUntilUnit() {
         return new Object[][] {
                 {date(2000, 1, 1), date(2000, 1, 1), DAYS, 0},
@@ -1791,56 +1836,60 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit(LocalDate date1, LocalDate date2, TemporalUnit unit, long expected) {
         long amount = date1.until(date2, unit);
-        assertEquals(amount, expected);
+        assertEquals(expected, amount);
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit_negated(LocalDate date1, LocalDate date2, TemporalUnit unit, long expected) {
         long amount = date2.until(date1, unit);
-        assertEquals(amount, -expected);
+        assertEquals(-expected, amount);
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit_between(LocalDate date1, LocalDate date2, TemporalUnit unit, long expected) {
         long amount = unit.between(date1, date2);
-        assertEquals(amount, expected);
+        assertEquals(expected, amount);
     }
 
     @Test
     public void test_until_convertedType() {
         LocalDate start = LocalDate.of(2010, 6, 30);
         OffsetDateTime end = start.plusDays(2).atStartOfDay().atOffset(OFFSET_PONE);
-        assertEquals(start.until(end, DAYS), 2);
+        assertEquals(2, start.until(end, DAYS));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_until_invalidType() {
-        LocalDate start = LocalDate.of(2010, 6, 30);
-        start.until(LocalTime.of(11, 30), DAYS);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate start = LocalDate.of(2010, 6, 30);
+            start.until(LocalTime.of(11, 30), DAYS);
+        });
     }
 
-    @Test(expectedExceptions = UnsupportedTemporalTypeException.class)
+    @Test
     public void test_until_TemporalUnit_unsupportedUnit() {
-        TEST_2007_07_15.until(TEST_2007_07_15, HOURS);
+        Assertions.assertThrows(UnsupportedTemporalTypeException.class, () -> TEST_2007_07_15.until(TEST_2007_07_15, HOURS));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_until_TemporalUnit_nullEnd() {
-        TEST_2007_07_15.until(null, DAYS);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15.until(null, DAYS));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_until_TemporalUnit_nullUnit() {
-        TEST_2007_07_15.until(TEST_2007_07_15, null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15.until(TEST_2007_07_15, null));
     }
 
     //-----------------------------------------------------------------------
     // until(ChronoLocalDate)
     //-----------------------------------------------------------------------
-    @DataProvider(name="until")
     Object[][] data_periodUntil() {
         return new Object[][] {
                 {2010, 1, 1, 2010, 1, 1, 0, 0, 0},
@@ -1927,25 +1976,26 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="until")
+    @ParameterizedTest
+    @MethodSource("data_periodUntil")
     public void test_periodUntil_LocalDate(int y1, int m1, int d1, int y2, int m2, int d2, int ye, int me, int de) {
         LocalDate start = LocalDate.of(y1, m1, d1);
         LocalDate end = LocalDate.of(y2, m2, d2);
         Period test = start.until(end);
-        assertEquals(test.getYears(), ye);
-        assertEquals(test.getMonths(), me);
-        assertEquals(test.getDays(), de);
+        assertEquals(ye, test.getYears());
+        assertEquals(me, test.getMonths());
+        assertEquals(de, test.getDays());
     }
 
     @Test
     public void test_periodUntil_LocalDate_max() {
         int years = Math.toIntExact((long) Year.MAX_VALUE - (long) Year.MIN_VALUE);
-        assertEquals(LocalDate.MIN.until(LocalDate.MAX), Period.of(years, 11, 30));
+        assertEquals(Period.of(years, 11, 30), LocalDate.MIN.until(LocalDate.MAX));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_periodUntil_LocalDate_null() {
-        TEST_2007_07_15.until(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15.until(null));
     }
 
     //-----------------------------------------------------------------------
@@ -1955,12 +2005,12 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     public void test_format_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d");
         String t = LocalDate.of(2010, 12, 3).format(f);
-        assertEquals(t, "2010 12 3");
+        assertEquals("2010 12 3", t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_format_formatter_null() {
-        LocalDate.of(2010, 12, 3).format(null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDate.of(2010, 12, 3).format(null));
     }
 
     //-----------------------------------------------------------------------
@@ -1969,159 +2019,198 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     @Test
     public void test_atTime_LocalTime() {
         LocalDate t = LocalDate.of(2008, 6, 30);
-        assertEquals(t.atTime(LocalTime.of(11, 30)), LocalDateTime.of(2008, 6, 30, 11, 30));
+        assertEquals(LocalDateTime.of(2008, 6, 30, 11, 30), t.atTime(LocalTime.of(11, 30)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_atTime_LocalTime_null() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime((LocalTime) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime((LocalTime) null);
+        });
     }
 
     //-------------------------------------------------------------------------
     @Test
     public void test_atTime_int_int() {
         LocalDate t = LocalDate.of(2008, 6, 30);
-        assertEquals(t.atTime(11, 30), LocalDateTime.of(2008, 6, 30, 11, 30));
+        assertEquals(LocalDateTime.of(2008, 6, 30, 11, 30), t.atTime(11, 30));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_hourTooSmall() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(-1, 30);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(-1, 30);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_hourTooBig() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(24, 30);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(24, 30);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_minuteTooSmall() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(11, -1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(11, -1);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_minuteTooBig() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(11, 60);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(11, 60);
+        });
     }
 
     @Test
     public void test_atTime_int_int_int() {
         LocalDate t = LocalDate.of(2008, 6, 30);
-        assertEquals(t.atTime(11, 30, 40), LocalDateTime.of(2008, 6, 30, 11, 30, 40));
+        assertEquals(LocalDateTime.of(2008, 6, 30, 11, 30, 40), t.atTime(11, 30, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_int_hourTooSmall() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(-1, 30, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(-1, 30, 40);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_int_hourTooBig() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(24, 30, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(24, 30, 40);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_int_minuteTooSmall() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(11, -1, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(11, -1, 40);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_int_minuteTooBig() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(11, 60, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(11, 60, 40);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_int_secondTooSmall() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(11, 30, -1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(11, 30, -1);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_int_secondTooBig() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(11, 30, 60);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(11, 30, 60);
+        });
     }
 
     @Test
     public void test_atTime_int_int_int_int() {
         LocalDate t = LocalDate.of(2008, 6, 30);
-        assertEquals(t.atTime(11, 30, 40, 50), LocalDateTime.of(2008, 6, 30, 11, 30, 40, 50));
+        assertEquals(LocalDateTime.of(2008, 6, 30, 11, 30, 40, 50), t.atTime(11, 30, 40, 50));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_int_int_hourTooSmall() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(-1, 30, 40, 50);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(-1, 30, 40, 50);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_int_int_hourTooBig() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(24, 30, 40, 50);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(24, 30, 40, 50);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_int_int_minuteTooSmall() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(11, -1, 40, 50);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(11, -1, 40, 50);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_int_int_minuteTooBig() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(11, 60, 40, 50);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(11, 60, 40, 50);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_int_int_secondTooSmall() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(11, 30, -1, 50);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(11, 30, -1, 50);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_int_int_secondTooBig() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(11, 30, 60, 50);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(11, 30, 60, 50);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_int_int_nanoTooSmall() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(11, 30, 40, -1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(11, 30, 40, -1);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atTime_int_int_int_int_nanoTooBig() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime(11, 30, 40, 1000000000);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime(11, 30, 40, 1000000000);
+        });
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_atTime_OffsetTime() {
         LocalDate t = LocalDate.of(2008, 6, 30);
-        assertEquals(t.atTime(OffsetTime.of(11, 30, 0, 0, OFFSET_PONE)), OffsetDateTime.of(2008, 6, 30, 11, 30, 0, 0, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 6, 30, 11, 30, 0, 0, OFFSET_PONE), t.atTime(OffsetTime.of(11, 30, 0, 0, OFFSET_PONE)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_atTime_OffsetTime_null() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atTime((OffsetTime) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atTime((OffsetTime) null);
+        });
     }
 
     //-----------------------------------------------------------------------
     // atStartOfDay()
     //-----------------------------------------------------------------------
-    @DataProvider(name="atStartOfDay")
     Object[][] data_atStartOfDay() {
         return new Object[][] {
                 {LocalDate.of(2008, 6, 30), LocalDateTime.of(2008, 6, 30, 0, 0)},
@@ -2129,15 +2218,15 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="atStartOfDay")
+    @ParameterizedTest
+    @MethodSource("data_atStartOfDay")
     public void test_atStartOfDay(LocalDate test, LocalDateTime expected) {
-        assertEquals(test.atStartOfDay(), expected);
+        assertEquals(expected, test.atStartOfDay());
     }
 
     //-----------------------------------------------------------------------
     // atStartOfDay(ZoneId)
     //-----------------------------------------------------------------------
-    @DataProvider(name="atStartOfDayZoneId")
     Object[][] data_atStartOfDayZoneId() {
         return new Object[][] {
                 {LocalDate.of(2008, 6, 30), ZONE_PARIS, ZonedDateTime.of(LocalDateTime.of(2008, 6, 30, 0, 0), ZONE_PARIS)},
@@ -2146,15 +2235,18 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="atStartOfDayZoneId")
+    @ParameterizedTest
+    @MethodSource("data_atStartOfDayZoneId")
     public void test_atStartOfDay_ZoneId(LocalDate test, ZoneId zone, ZonedDateTime expected) {
-        assertEquals(test.atStartOfDay(zone), expected);
+        assertEquals(expected, test.atStartOfDay(zone));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_atStartOfDay_ZoneId_null() {
-        LocalDate t = LocalDate.of(2008, 6, 30);
-        t.atStartOfDay((ZoneId) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            LocalDate t = LocalDate.of(2008, 6, 30);
+            t.atStartOfDay((ZoneId) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -2166,26 +2258,25 @@ public class TCKLocalDate extends AbstractDateTimeTest {
 
         LocalDate test = LocalDate.of(0, 1, 1);
         for (long i = date_0000_01_01; i < 700000; i++) {
-            assertEquals(test.toEpochDay(), i);
+            assertEquals(i, test.toEpochDay());
             test = next(test);
         }
         test = LocalDate.of(0, 1, 1);
         for (long i = date_0000_01_01; i > -2000000; i--) {
-            assertEquals(test.toEpochDay(), i);
+            assertEquals(i, test.toEpochDay());
             test = previous(test);
         }
 
-        assertEquals(LocalDate.of(1858, 11, 17).toEpochDay(), -40587);
-        assertEquals(LocalDate.of(1, 1, 1).toEpochDay(), -678575 - 40587);
-        assertEquals(LocalDate.of(1995, 9, 27).toEpochDay(), 49987 - 40587);
-        assertEquals(LocalDate.of(1970, 1, 1).toEpochDay(), 0);
-        assertEquals(LocalDate.of(-1, 12, 31).toEpochDay(), -678942 - 40587);
+        assertEquals(-40587, LocalDate.of(1858, 11, 17).toEpochDay());
+        assertEquals(-678575 - 40587, LocalDate.of(1, 1, 1).toEpochDay());
+        assertEquals(49987 - 40587, LocalDate.of(1995, 9, 27).toEpochDay());
+        assertEquals(0, LocalDate.of(1970, 1, 1).toEpochDay());
+        assertEquals(-678942 - 40587, LocalDate.of(-1, 12, 31).toEpochDay());
     }
 
     //-----------------------------------------------------------------------
     // toEpochSecond
     //-----------------------------------------------------------------------
-    @DataProvider(name="epochSecond")
     Object[][] provider_toEpochSecond() {
         return new Object[][] {
             {LocalDate.of(1858, 11, 17).toEpochSecond(LocalTime.MIDNIGHT, OFFSET_PONE), -3506720400L},
@@ -2202,9 +2293,10 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="epochSecond")
+    @ParameterizedTest
+    @MethodSource("provider_toEpochSecond")
     public void test_toEpochSecond(long actual, long expected) {
-        assertEquals(actual, expected);
+        assertEquals(expected, actual);
     }
 
     //-----------------------------------------------------------------------
@@ -2240,27 +2332,27 @@ public class TCKLocalDate extends AbstractDateTimeTest {
                 LocalDate b = localDates[j];
                 if (i < j) {
                     assertTrue(a.compareTo(b) < 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), true, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(true, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else if (i > j) {
                     assertTrue(a.compareTo(b) > 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), true, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(true, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else {
-                    assertEquals(a.compareTo(b), 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), true, a + " <=> " + b);
+                    assertEquals(0, a.compareTo(b), a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(true, a.equals(b), a + " <=> " + b);
                 }
             }
         }
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_compareTo_ObjectNull() {
-        TEST_2007_07_15.compareTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15.compareTo(null));
     }
 
     @Test
@@ -2270,14 +2362,14 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         assertFalse(TEST_2007_07_15.isBefore(TEST_2007_07_15));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isBefore_ObjectNull() {
-        TEST_2007_07_15.isBefore(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15.isBefore(null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isAfter_ObjectNull() {
-        TEST_2007_07_15.isAfter(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15.isAfter(null));
     }
 
     @Test
@@ -2287,71 +2379,77 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         assertFalse(TEST_2007_07_15.isAfter(TEST_2007_07_15));
     }
 
-    @Test(expectedExceptions=ClassCastException.class)
     @SuppressWarnings({"unchecked", "rawtypes"})
+    @Test
     public void compareToNonLocalDate() {
-       Comparable c = TEST_2007_07_15;
-       c.compareTo(new Object());
+       Assertions.assertThrows(ClassCastException.class, () -> {
+           Comparable c = TEST_2007_07_15;
+           c.compareTo(new Object());
+        });
     }
 
     //-----------------------------------------------------------------------
     // equals()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleDates" )
+    @ParameterizedTest
+    @MethodSource("provider_sampleDates")
     public void test_equals_true(int y, int m, int d) {
         LocalDate a = LocalDate.of(y, m, d);
         LocalDate b = LocalDate.of(y, m, d);
-        assertEquals(a.equals(b), true);
+        assertEquals(true, a.equals(b));
     }
-    @Test(dataProvider="sampleDates")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDates")
     public void test_equals_false_year_differs(int y, int m, int d) {
         LocalDate a = LocalDate.of(y, m, d);
         LocalDate b = LocalDate.of(y + 1, m, d);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleDates")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDates")
     public void test_equals_false_month_differs(int y, int m, int d) {
         LocalDate a = LocalDate.of(y, m, d);
         LocalDate b = LocalDate.of(y, m + 1, d);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleDates")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDates")
     public void test_equals_false_day_differs(int y, int m, int d) {
         LocalDate a = LocalDate.of(y, m, d);
         LocalDate b = LocalDate.of(y, m, d + 1);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
 
     @Test
     public void test_equals_itself_true() {
-        assertEquals(TEST_2007_07_15.equals(TEST_2007_07_15), true);
+        assertEquals(true, TEST_2007_07_15.equals(TEST_2007_07_15));
     }
 
     @Test
     public void test_equals_string_false() {
-        assertEquals(TEST_2007_07_15.equals("2007-07-15"), false);
+        assertEquals(false, TEST_2007_07_15.equals("2007-07-15"));
     }
 
     @Test
     public void test_equals_null_false() {
-        assertEquals(TEST_2007_07_15.equals(null), false);
+        assertEquals(false, TEST_2007_07_15.equals(null));
     }
 
     //-----------------------------------------------------------------------
     // hashCode()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleDates")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDates")
     public void test_hashCode(int y, int m, int d) {
         LocalDate a = LocalDate.of(y, m, d);
         assertEquals(a.hashCode(), a.hashCode());
         LocalDate b = LocalDate.of(y, m, d);
-        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(b.hashCode(), a.hashCode());
     }
 
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleToString")
     Object[][] provider_sampleToString() {
         return new Object[][] {
             {2008, 7, 5, "2008-07-05"},
@@ -2367,11 +2465,12 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleToString")
+    @ParameterizedTest
+    @MethodSource("provider_sampleToString")
     public void test_toString(int y, int m, int d, String expected) {
         LocalDate t = LocalDate.of(y, m, d);
         String str = t.toString();
-        assertEquals(str, expected);
+        assertEquals(expected, str);
     }
 
     private LocalDate date(int year, int month, int day) {
@@ -2393,71 +2492,81 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     // ----------------------------------------------------------------
     @Test
     public void test_datesUntil() {
-        assertEquals(
-                date(2015, 9, 29).datesUntil(date(2015, 10, 3)).collect(
-                        Collectors.toList()), Arrays.asList(date(2015, 9, 29),
-                        date(2015, 9, 30), date(2015, 10, 1), date(2015, 10, 2)));
-        assertEquals(date(2015, 9, 29).datesUntil(date(2015, 10, 3), Period.ofDays(2))
-                .collect(Collectors.toList()), Arrays.asList(date(2015, 9, 29),
-                date(2015, 10, 1)));
-        assertEquals(date(2015, 1, 31).datesUntil(date(2015, 6, 1), Period.ofMonths(1))
-                .collect(Collectors.toList()), Arrays.asList(date(2015, 1, 31),
+        assertEquals(Arrays.asList(date(2015, 9, 29),
+                        date(2015, 9, 30), date(2015, 10, 1), date(2015, 10, 2)), date(2015, 9, 29).datesUntil(date(2015, 10, 3)).collect(
+                                Collectors.toList()));
+        assertEquals(Arrays.asList(date(2015, 9, 29),
+                date(2015, 10, 1)), date(2015, 9, 29).datesUntil(date(2015, 10, 3), Period.ofDays(2))
+                        .collect(Collectors.toList()));
+        assertEquals(Arrays.asList(date(2015, 1, 31),
                 date(2015, 2, 28), date(2015, 3, 31), date(2015, 4, 30),
-                date(2015, 5, 31)));
+                date(2015, 5, 31)), date(2015, 1, 31).datesUntil(date(2015, 6, 1), Period.ofMonths(1))
+                        .collect(Collectors.toList()));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_datesUntil_nullEnd() {
-        LocalDate date = date(2015, 1, 31);
-        date.datesUntil(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            LocalDate date = date(2015, 1, 31);
+            date.datesUntil(null);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_datesUntil_nullEndStep() {
-        LocalDate date = date(2015, 1, 31);
-        date.datesUntil(null, Period.ofDays(1));
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            LocalDate date = date(2015, 1, 31);
+            date.datesUntil(null, Period.ofDays(1));
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_datesUntil_nullStep() {
-        LocalDate date = date(2015, 1, 31);
-        date.datesUntil(date, null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            LocalDate date = date(2015, 1, 31);
+            date.datesUntil(date, null);
+        });
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test_datesUntil_endBeforeStart() {
-        date(2015, 1, 31).datesUntil(date(2015, 1, 30));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> date(2015, 1, 31).datesUntil(date(2015, 1, 30)));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test_datesUntil_endBeforeStartPositiveStep() {
-        date(2015, 1, 31).datesUntil(date(2015, 1, 30), Period.of(1, 0, 0));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> date(2015, 1, 31).datesUntil(date(2015, 1, 30), Period.of(1, 0, 0)));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test_datesUntil_endAfterStartNegativeStep() {
-        date(2015, 1, 30).datesUntil(date(2015, 1, 31), Period.of(0, -1, -1));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> date(2015, 1, 30).datesUntil(date(2015, 1, 31), Period.of(0, -1, -1)));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_datesUntil_zeroStep() {
-        LocalDate date = date(2015, 1, 31);
-        date.datesUntil(date, Period.ZERO);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            LocalDate date = date(2015, 1, 31);
+            date.datesUntil(date, Period.ZERO);
+        });
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_datesUntil_oppositeSign() {
-        LocalDate date = date(2015, 1, 31);
-        date.datesUntil(date, Period.of(1, 0, -1));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            LocalDate date = date(2015, 1, 31);
+            date.datesUntil(date, Period.of(1, 0, -1));
+        });
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_datesUntil_oppositeSign2() {
-        LocalDate date = date(2015, 1, 31);
-        date.datesUntil(date, Period.of(0, -1, 1));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            LocalDate date = date(2015, 1, 31);
+            date.datesUntil(date, Period.of(0, -1, 1));
+        });
     }
 
-    @DataProvider(name="datesUntil")
     public Object[][] provider_datesUntil() {
         return new Object[][] {
                 {MIN_DATE, MIN_DATE},
@@ -2471,14 +2580,13 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider = "datesUntil")
+    @ParameterizedTest
+    @MethodSource("provider_datesUntil")
     public void test_datesUntil_count(LocalDate start, LocalDate end) {
-        assertEquals(start.datesUntil(end).count(), start.until(end, ChronoUnit.DAYS));
-        assertEquals(start.datesUntil(end, Period.ofDays(1)).count(),
-                start.until(end, ChronoUnit.DAYS));
+        assertEquals(start.until(end, ChronoUnit.DAYS), start.datesUntil(end).count());
+        assertEquals(start.until(end, ChronoUnit.DAYS), start.datesUntil(end, Period.ofDays(1)).count());
     }
 
-    @DataProvider(name="datesUntilSteps")
     public Object[][] provider_datesUntil_steps() {
         List<Object[]> data = new ArrayList<>(Arrays.asList(new Object[][] {
             {MIN_DATE, MAX_DATE, Period.ofYears(Year.MAX_VALUE)},
@@ -2536,9 +2644,10 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         return data.toArray(new Object[data.size()][]);
     }
 
-    @Test(dataProvider="datesUntilSteps")
+    @ParameterizedTest
+    @MethodSource("provider_datesUntil_steps")
     public void test_datesUntil_step(LocalDate start, LocalDate end, Period step) {
-        assertEquals(start.datesUntil(start, step).count(), 0);
+        assertEquals(0, start.datesUntil(start, step).count());
         long count = start.datesUntil(end, step).count();
         assertTrue(count > 0);
         // the last value must be before the end date
@@ -2555,7 +2664,7 @@ public class TCKLocalDate extends AbstractDateTimeTest {
             for(long i=0; i<count; i++) {
                 list.add(start.plusMonths(step.toTotalMonths()*i).plusDays(step.getDays()*i));
             }
-            assertEquals(start.datesUntil(end, step).collect(Collectors.toList()), list);
+            assertEquals(list, start.datesUntil(end, step).collect(Collectors.toList()));
         }
 
         // swap end and start and negate the Period
@@ -2575,7 +2684,7 @@ public class TCKLocalDate extends AbstractDateTimeTest {
             for(long i=0; i<count; i++) {
                 list.add(end.minusMonths(step.toTotalMonths()*i).minusDays(step.getDays()*i));
             }
-            assertEquals(end.datesUntil(start, step.negated()).collect(Collectors.toList()), list);
+            assertEquals(list, end.datesUntil(start, step.negated()).collect(Collectors.toList()));
         }
     }
 
@@ -2585,6 +2694,6 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         LocalDate date = date(2015, 2, 10);
         Stream<LocalDate> stream = date.datesUntil(date.plusDays(5));
         long sum = stream.mapToInt(LocalDate::getDayOfMonth).sum();
-        assertEquals(sum, 60, "sum of 10, 11, 12, 13, 14 is wrong");
+        assertEquals(60, sum, "sum of 10, 11, 12, 13, 14 is wrong");
     }
 }
diff --git a/test/jdk/java/time/tck/java/time/TCKLocalDateTime.java b/test/jdk/java/time/tck/java/time/TCKLocalDateTime.java
index 487cd806a2b..9cf2a777ec7 100644
--- a/test/jdk/java/time/tck/java/time/TCKLocalDateTime.java
+++ b/test/jdk/java/time/tck/java/time/TCKLocalDateTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,11 +101,12 @@ import static java.time.temporal.ChronoUnit.NANOS;
 import static java.time.temporal.ChronoUnit.SECONDS;
 import static java.time.temporal.ChronoUnit.WEEKS;
 import static java.time.temporal.ChronoUnit.YEARS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.Clock;
 import java.time.DateTimeException;
@@ -141,14 +142,18 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test LocalDateTime.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKLocalDateTime extends AbstractDateTimeTest {
 
     private static final ZoneOffset OFFSET_PONE = ZoneOffset.ofHours(1);
@@ -163,7 +168,7 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     private Instant MAX_INSTANT;
     private Instant MIN_INSTANT;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         MAX_DATE_TIME = LocalDateTime.MAX;
         MIN_DATE_TIME = LocalDateTime.MIN;
@@ -225,16 +230,16 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
 
     //-----------------------------------------------------------------------
     private void check(LocalDateTime test, int y, int m, int d, int h, int mi, int s, int n) {
-        assertEquals(test.getYear(), y);
-        assertEquals(test.getMonth().getValue(), m);
-        assertEquals(test.getDayOfMonth(), d);
-        assertEquals(test.getHour(), h);
-        assertEquals(test.getMinute(), mi);
-        assertEquals(test.getSecond(), s);
-        assertEquals(test.getNano(), n);
+        assertEquals(y, test.getYear());
+        assertEquals(m, test.getMonth().getValue());
+        assertEquals(d, test.getDayOfMonth());
+        assertEquals(h, test.getHour());
+        assertEquals(mi, test.getMinute());
+        assertEquals(s, test.getSecond());
+        assertEquals(n, test.getNano());
         assertEquals(test, test);
         assertEquals(test.hashCode(), test.hashCode());
-        assertEquals(LocalDateTime.of(y, m, d, h, mi, s, n), test);
+        assertEquals(test, LocalDateTime.of(y, m, d, h, mi, s, n));
     }
 
     private LocalDateTime createDateMidnight(int year, int month, int day) {
@@ -257,7 +262,8 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // now()
     //-----------------------------------------------------------------------
-    @Test(timeOut=30000)  // TODO: remove when time zone loading is faster
+    @Test // TODO: remove when time zone loading is faster
+    @Timeout(30)
     public void now() {
         final long DELTA = 20_000_000_000L;    // 20 seconds of nanos leeway
         LocalDateTime expected = LocalDateTime.now(Clock.systemDefaultZone());
@@ -275,9 +281,9 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // now(ZoneId)
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_ZoneId_nullZoneId() {
-        LocalDateTime.now((ZoneId) null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDateTime.now((ZoneId) null));
     }
 
     @Test
@@ -285,16 +291,15 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         ZoneId zone = ZoneId.of("UTC+01:02:03");
         LocalDateTime expected = LocalDateTime.now(Clock.system(zone));
         LocalDateTime test = LocalDateTime.now(zone);
-        assertEquals(Duration.between(expected, test).truncatedTo(ChronoUnit.SECONDS),
-                Duration.ZERO);
+        assertEquals(Duration.ZERO, Duration.between(expected, test).truncatedTo(ChronoUnit.SECONDS));
     }
 
     //-----------------------------------------------------------------------
     // now(Clock)
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_Clock_nullClock() {
-        LocalDateTime.now((Clock) null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDateTime.now((Clock) null));
     }
 
     @Test
@@ -303,13 +308,13 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
             Instant instant = Instant.ofEpochSecond(i).plusNanos(123456789L);
             Clock clock = Clock.fixed(instant, ZoneOffset.UTC);
             LocalDateTime test = LocalDateTime.now(clock);
-            assertEquals(test.getYear(), 1970);
-            assertEquals(test.getMonth(), Month.JANUARY);
-            assertEquals(test.getDayOfMonth(), (i < 24 * 60 * 60 ? 1 : 2));
-            assertEquals(test.getHour(), (i / (60 * 60)) % 24);
-            assertEquals(test.getMinute(), (i / 60) % 60);
-            assertEquals(test.getSecond(), i % 60);
-            assertEquals(test.getNano(), 123456789);
+            assertEquals(1970, test.getYear());
+            assertEquals(Month.JANUARY, test.getMonth());
+            assertEquals((i < 24 * 60 * 60 ? 1 : 2), test.getDayOfMonth());
+            assertEquals((i / (60 * 60)) % 24, test.getHour());
+            assertEquals((i / 60) % 60, test.getMinute());
+            assertEquals(i % 60, test.getSecond());
+            assertEquals(123456789, test.getNano());
         }
     }
 
@@ -319,13 +324,13 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
             Instant instant = Instant.ofEpochSecond(i).plusNanos(123456789L);
             Clock clock = Clock.fixed(instant.minusSeconds(OFFSET_PONE.getTotalSeconds()), OFFSET_PONE);
             LocalDateTime test = LocalDateTime.now(clock);
-            assertEquals(test.getYear(), 1970);
-            assertEquals(test.getMonth(), Month.JANUARY);
-            assertEquals(test.getDayOfMonth(), (i < 24 * 60 * 60) ? 1 : 2);
-            assertEquals(test.getHour(), (i / (60 * 60)) % 24);
-            assertEquals(test.getMinute(), (i / 60) % 60);
-            assertEquals(test.getSecond(), i % 60);
-            assertEquals(test.getNano(), 123456789);
+            assertEquals(1970, test.getYear());
+            assertEquals(Month.JANUARY, test.getMonth());
+            assertEquals((i < 24 * 60 * 60) ? 1 : 2, test.getDayOfMonth());
+            assertEquals((i / (60 * 60)) % 24, test.getHour());
+            assertEquals((i / 60) % 60, test.getMinute());
+            assertEquals(i % 60, test.getSecond());
+            assertEquals(123456789, test.getNano());
         }
     }
 
@@ -336,11 +341,11 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
             Instant instant = Instant.ofEpochSecond(i).plusNanos(123456789L);
             Clock clock = Clock.fixed(instant, ZoneOffset.UTC);
             LocalDateTime test = LocalDateTime.now(clock);
-            assertEquals(test.getYear(), 1969);
-            assertEquals(test.getMonth(), Month.DECEMBER);
-            assertEquals(test.getDayOfMonth(), 31);
+            assertEquals(1969, test.getYear());
+            assertEquals(Month.DECEMBER, test.getMonth());
+            assertEquals(31, test.getDayOfMonth());
             expected = expected.minusSeconds(1);
-            assertEquals(test.toLocalTime(), expected);
+            assertEquals(expected, test.toLocalTime());
         }
     }
 
@@ -349,26 +354,30 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     public void now_Clock_maxYear() {
         Clock clock = Clock.fixed(MAX_INSTANT, ZoneOffset.UTC);
         LocalDateTime test = LocalDateTime.now(clock);
-        assertEquals(test, MAX_DATE_TIME);
+        assertEquals(MAX_DATE_TIME, test);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void now_Clock_tooBig() {
-        Clock clock = Clock.fixed(MAX_INSTANT.plusSeconds(24 * 60 * 60), ZoneOffset.UTC);
-        LocalDateTime.now(clock);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Clock clock = Clock.fixed(MAX_INSTANT.plusSeconds(24 * 60 * 60), ZoneOffset.UTC);
+            LocalDateTime.now(clock);
+        });
     }
 
     @Test
     public void now_Clock_minYear() {
         Clock clock = Clock.fixed(MIN_INSTANT, ZoneOffset.UTC);
         LocalDateTime test = LocalDateTime.now(clock);
-        assertEquals(test, MIN_DATE_TIME);
+        assertEquals(MIN_DATE_TIME, test);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void now_Clock_tooLow() {
-        Clock clock = Clock.fixed(MIN_INSTANT.minusNanos(1), ZoneOffset.UTC);
-        LocalDateTime.now(clock);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Clock clock = Clock.fixed(MIN_INSTANT.minusNanos(1), ZoneOffset.UTC);
+            LocalDateTime.now(clock);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -381,44 +390,44 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(dateTime, 2007, 7, 15, 12, 30, 0, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_4intsMonth_yearTooLow() {
-        LocalDateTime.of(Integer.MIN_VALUE, Month.JULY, 15, 12, 30);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(Integer.MIN_VALUE, Month.JULY, 15, 12, 30));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_4intsMonth_nullMonth() {
-        LocalDateTime.of(2007, null, 15, 12, 30);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDateTime.of(2007, null, 15, 12, 30));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_4intsMonth_dayTooLow() {
-        LocalDateTime.of(2007, Month.JULY, -1, 12, 30);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, -1, 12, 30));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_4intsMonth_dayTooHigh() {
-        LocalDateTime.of(2007, Month.JULY, 32, 12, 30);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 32, 12, 30));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_4intsMonth_hourTooLow() {
-        LocalDateTime.of(2007, Month.JULY, 15, -1, 30);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, -1, 30));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_4intsMonth_hourTooHigh() {
-        LocalDateTime.of(2007, Month.JULY, 15, 24, 30);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, 24, 30));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_4intsMonth_minuteTooLow() {
-        LocalDateTime.of(2007, Month.JULY, 15, 12, -1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, 12, -1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_4intsMonth_minuteTooHigh() {
-        LocalDateTime.of(2007, Month.JULY, 15, 12, 60);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, 12, 60));
     }
 
     //-----------------------------------------------------------------------
@@ -428,54 +437,54 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(dateTime, 2007, 7, 15, 12, 30, 40, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5intsMonth_yearTooLow() {
-        LocalDateTime.of(Integer.MIN_VALUE, Month.JULY, 15, 12, 30, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(Integer.MIN_VALUE, Month.JULY, 15, 12, 30, 40));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_5intsMonth_nullMonth() {
-        LocalDateTime.of(2007, null, 15, 12, 30, 40);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDateTime.of(2007, null, 15, 12, 30, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5intsMonth_dayTooLow() {
-        LocalDateTime.of(2007, Month.JULY, -1, 12, 30, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, -1, 12, 30, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5intsMonth_dayTooHigh() {
-        LocalDateTime.of(2007, Month.JULY, 32, 12, 30, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 32, 12, 30, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5intsMonth_hourTooLow() {
-        LocalDateTime.of(2007, Month.JULY, 15, -1, 30, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, -1, 30, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5intsMonth_hourTooHigh() {
-        LocalDateTime.of(2007, Month.JULY, 15, 24, 30, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, 24, 30, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5intsMonth_minuteTooLow() {
-        LocalDateTime.of(2007, Month.JULY, 15, 12, -1, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, 12, -1, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5intsMonth_minuteTooHigh() {
-        LocalDateTime.of(2007, Month.JULY, 15, 12, 60, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, 12, 60, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5intsMonth_secondTooLow() {
-        LocalDateTime.of(2007, Month.JULY, 15, 12, 30, -1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, 12, 30, -1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5intsMonth_secondTooHigh() {
-        LocalDateTime.of(2007, Month.JULY, 15, 12, 30, 60);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, 12, 30, 60));
     }
 
     //-----------------------------------------------------------------------
@@ -485,64 +494,64 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(dateTime, 2007, 7, 15, 12, 30, 40, 987654321);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6intsMonth_yearTooLow() {
-        LocalDateTime.of(Integer.MIN_VALUE, Month.JULY, 15, 12, 30, 40, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(Integer.MIN_VALUE, Month.JULY, 15, 12, 30, 40, 987654321));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_6intsMonth_nullMonth() {
-        LocalDateTime.of(2007, null, 15, 12, 30, 40, 987654321);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDateTime.of(2007, null, 15, 12, 30, 40, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6intsMonth_dayTooLow() {
-        LocalDateTime.of(2007, Month.JULY, -1, 12, 30, 40, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, -1, 12, 30, 40, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6intsMonth_dayTooHigh() {
-        LocalDateTime.of(2007, Month.JULY, 32, 12, 30, 40, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 32, 12, 30, 40, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6intsMonth_hourTooLow() {
-        LocalDateTime.of(2007, Month.JULY, 15, -1, 30, 40, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, -1, 30, 40, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6intsMonth_hourTooHigh() {
-        LocalDateTime.of(2007, Month.JULY, 15, 24, 30, 40, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, 24, 30, 40, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6intsMonth_minuteTooLow() {
-        LocalDateTime.of(2007, Month.JULY, 15, 12, -1, 40, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, 12, -1, 40, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6intsMonth_minuteTooHigh() {
-        LocalDateTime.of(2007, Month.JULY, 15, 12, 60, 40, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, 12, 60, 40, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6intsMonth_secondTooLow() {
-        LocalDateTime.of(2007, Month.JULY, 15, 12, 30, -1, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, 12, 30, -1, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6intsMonth_secondTooHigh() {
-        LocalDateTime.of(2007, Month.JULY, 15, 12, 30, 60, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, 12, 30, 60, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6intsMonth_nanoTooLow() {
-        LocalDateTime.of(2007, Month.JULY, 15, 12, 30, 40, -1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, 12, 30, 40, -1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6intsMonth_nanoTooHigh() {
-        LocalDateTime.of(2007, Month.JULY, 15, 12, 30, 40, 1000000000);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, Month.JULY, 15, 12, 30, 40, 1000000000));
     }
 
     //-----------------------------------------------------------------------
@@ -552,49 +561,49 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(dateTime, 2007, 7, 15, 12, 30, 0, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5ints_yearTooLow() {
-        LocalDateTime.of(Integer.MIN_VALUE, 7, 15, 12, 30);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(Integer.MIN_VALUE, 7, 15, 12, 30));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5ints_monthTooLow() {
-        LocalDateTime.of(2007, 0, 15, 12, 30);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 0, 15, 12, 30));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5ints_monthTooHigh() {
-        LocalDateTime.of(2007, 13, 15, 12, 30);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 13, 15, 12, 30));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5ints_dayTooLow() {
-        LocalDateTime.of(2007, 7, -1, 12, 30);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, -1, 12, 30));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5ints_dayTooHigh() {
-        LocalDateTime.of(2007, 7, 32, 12, 30);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 32, 12, 30));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5ints_hourTooLow() {
-        LocalDateTime.of(2007, 7, 15, -1, 30);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, -1, 30));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5ints_hourTooHigh() {
-        LocalDateTime.of(2007, 7, 15, 24, 30);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, 24, 30));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5ints_minuteTooLow() {
-        LocalDateTime.of(2007, 7, 15, 12, -1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, 12, -1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_5ints_minuteTooHigh() {
-        LocalDateTime.of(2007, 7, 15, 12, 60);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, 12, 60));
     }
 
     //-----------------------------------------------------------------------
@@ -604,59 +613,59 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(dateTime, 2007, 7, 15, 12, 30, 40, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6ints_yearTooLow() {
-        LocalDateTime.of(Integer.MIN_VALUE, 7, 15, 12, 30, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(Integer.MIN_VALUE, 7, 15, 12, 30, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6ints_monthTooLow() {
-        LocalDateTime.of(2007, 0, 15, 12, 30, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 0, 15, 12, 30, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6ints_monthTooHigh() {
-        LocalDateTime.of(2007, 13, 15, 12, 30, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 13, 15, 12, 30, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6ints_dayTooLow() {
-        LocalDateTime.of(2007, 7, -1, 12, 30, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, -1, 12, 30, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6ints_dayTooHigh() {
-        LocalDateTime.of(2007, 7, 32, 12, 30, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 32, 12, 30, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6ints_hourTooLow() {
-        LocalDateTime.of(2007, 7, 15, -1, 30, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, -1, 30, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6ints_hourTooHigh() {
-        LocalDateTime.of(2007, 7, 15, 24, 30, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, 24, 30, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6ints_minuteTooLow() {
-        LocalDateTime.of(2007, 7, 15, 12, -1, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, 12, -1, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6ints_minuteTooHigh() {
-        LocalDateTime.of(2007, 7, 15, 12, 60, 40);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, 12, 60, 40));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6ints_secondTooLow() {
-        LocalDateTime.of(2007, 7, 15, 12, 30, -1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, 12, 30, -1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_6ints_secondTooHigh() {
-        LocalDateTime.of(2007, 7, 15, 12, 30, 60);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, 12, 30, 60));
     }
 
     //-----------------------------------------------------------------------
@@ -666,69 +675,69 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(dateTime, 2007, 7, 15, 12, 30, 40, 987654321);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_7ints_yearTooLow() {
-        LocalDateTime.of(Integer.MIN_VALUE, 7, 15, 12, 30, 40, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(Integer.MIN_VALUE, 7, 15, 12, 30, 40, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_7ints_monthTooLow() {
-        LocalDateTime.of(2007, 0, 15, 12, 30, 40, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 0, 15, 12, 30, 40, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_7ints_monthTooHigh() {
-        LocalDateTime.of(2007, 13, 15, 12, 30, 40, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 13, 15, 12, 30, 40, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_7ints_dayTooLow() {
-        LocalDateTime.of(2007, 7, -1, 12, 30, 40, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, -1, 12, 30, 40, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_7ints_dayTooHigh() {
-        LocalDateTime.of(2007, 7, 32, 12, 30, 40, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 32, 12, 30, 40, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_7ints_hourTooLow() {
-        LocalDateTime.of(2007, 7, 15, -1, 30, 40, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, -1, 30, 40, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_7ints_hourTooHigh() {
-        LocalDateTime.of(2007, 7, 15, 24, 30, 40, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, 24, 30, 40, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_7ints_minuteTooLow() {
-        LocalDateTime.of(2007, 7, 15, 12, -1, 40, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, 12, -1, 40, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_7ints_minuteTooHigh() {
-        LocalDateTime.of(2007, 7, 15, 12, 60, 40, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, 12, 60, 40, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_7ints_secondTooLow() {
-        LocalDateTime.of(2007, 7, 15, 12, 30, -1, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, 12, 30, -1, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_7ints_secondTooHigh() {
-        LocalDateTime.of(2007, 7, 15, 12, 30, 60, 987654321);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, 12, 30, 60, 987654321));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_7ints_nanoTooLow() {
-        LocalDateTime.of(2007, 7, 15, 12, 30, 40, -1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, 12, 30, 40, -1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_7ints_nanoTooHigh() {
-        LocalDateTime.of(2007, 7, 15, 12, 30, 40, 1000000000);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 15, 12, 30, 40, 1000000000));
     }
 
     //-----------------------------------------------------------------------
@@ -738,20 +747,19 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(dateTime, 2007, 7, 15, 12, 30, 40, 987654321);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_LocalDate_LocalTime_nullLocalDate() {
-        LocalDateTime.of(null, LocalTime.of(12, 30, 40, 987654321));
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDateTime.of(null, LocalTime.of(12, 30, 40, 987654321)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_LocalDate_LocalTime_nullLocalTime() {
-        LocalDateTime.of(LocalDate.of(2007, 7, 15), null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDateTime.of(LocalDate.of(2007, 7, 15), null));
     }
 
     //-----------------------------------------------------------------------
     // ofInstant()
     //-----------------------------------------------------------------------
-    @DataProvider(name="instantFactory")
     Object[][] data_instantFactory() {
         return new Object[][] {
                 {Instant.ofEpochSecond(86400 + 3600 + 120 + 4, 500), ZONE_PARIS, LocalDateTime.of(1970, 1, 2, 2, 2, 4, 500)},
@@ -764,30 +772,31 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="instantFactory")
+    @ParameterizedTest
+    @MethodSource("data_instantFactory")
     public void factory_ofInstant(Instant instant, ZoneId zone, LocalDateTime expected) {
         LocalDateTime test = LocalDateTime.ofInstant(instant, zone);
-        assertEquals(test, expected);
+        assertEquals(expected, test);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofInstant_instantTooBig() {
-        LocalDateTime.ofInstant(Instant.MAX, OFFSET_PONE) ;
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.ofInstant(Instant.MAX, OFFSET_PONE)) ;
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofInstant_instantTooSmall() {
-        LocalDateTime.ofInstant(Instant.MIN, OFFSET_PONE) ;
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.ofInstant(Instant.MIN, OFFSET_PONE)) ;
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_ofInstant_nullInstant() {
-        LocalDateTime.ofInstant((Instant) null, ZONE_GAZA);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDateTime.ofInstant((Instant) null, ZONE_GAZA));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_ofInstant_nullZone() {
-        LocalDateTime.ofInstant(Instant.EPOCH, (ZoneId) null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDateTime.ofInstant(Instant.EPOCH, (ZoneId) null));
     }
 
     //-----------------------------------------------------------------------
@@ -798,7 +807,7 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         LocalDateTime base = LocalDateTime.of(1970, 1, 1, 2, 0, 0, 500);
         for (int i = 0; i < 100000; i++) {
             LocalDateTime test = LocalDateTime.ofEpochSecond(i, 500, OFFSET_PTWO);
-            assertEquals(test, base.plusSeconds(i));
+            assertEquals(base.plusSeconds(i), test);
         }
     }
 
@@ -807,33 +816,37 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         LocalDateTime base = LocalDateTime.of(1970, 1, 1, 2, 0, 0, 500);
         for (int i = 0; i < 100000; i++) {
             LocalDateTime test = LocalDateTime.ofEpochSecond(-i, 500, OFFSET_PTWO);
-            assertEquals(test, base.minusSeconds(i));
+            assertEquals(base.minusSeconds(i), test);
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofEpochSecond_longOffset_tooBig() {
-        LocalDateTime.ofEpochSecond(Long.MAX_VALUE, 500, OFFSET_PONE);  // TODO: better test
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDateTime.ofEpochSecond(Long.MAX_VALUE, 500, OFFSET_PONE);  // TODO: better test
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofEpochSecond_longOffset_tooSmall() {
-        LocalDateTime.ofEpochSecond(Long.MIN_VALUE, 500, OFFSET_PONE);  // TODO: better test
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDateTime.ofEpochSecond(Long.MIN_VALUE, 500, OFFSET_PONE);  // TODO: better test
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofEpochSecond_badNanos_toBig() {
-        LocalDateTime.ofEpochSecond(0, 1_000_000_000, OFFSET_PONE);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.ofEpochSecond(0, 1_000_000_000, OFFSET_PONE));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofEpochSecond_badNanos_toSmall() {
-        LocalDateTime.ofEpochSecond(0, -1, OFFSET_PONE);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.ofEpochSecond(0, -1, OFFSET_PONE));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_ofEpochSecond_longOffset_nullOffset() {
-        LocalDateTime.ofEpochSecond(0L, 500, null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDateTime.ofEpochSecond(0L, 500, null));
     }
 
     //-----------------------------------------------------------------------
@@ -842,48 +855,49 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     @Test
     public void test_from_TemporalAccessor() {
         LocalDateTime base = LocalDateTime.of(2007, 7, 15, 17, 30);
-        assertEquals(LocalDateTime.from(base), base);
-        assertEquals(LocalDateTime.from(ZonedDateTime.of(base, ZoneOffset.ofHours(2))), base);
+        assertEquals(base, LocalDateTime.from(base));
+        assertEquals(base, LocalDateTime.from(ZonedDateTime.of(base, ZoneOffset.ofHours(2))));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_from_TemporalAccessor_invalid_noDerive() {
-        LocalDateTime.from(LocalTime.of(12, 30));
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.from(LocalTime.of(12, 30)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_from_TemporalAccessor_null() {
-        LocalDateTime.from((TemporalAccessor) null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDateTime.from((TemporalAccessor) null));
     }
 
     //-----------------------------------------------------------------------
     // parse()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleToString")
+    @ParameterizedTest
+    @MethodSource("provider_sampleToString")
     public void test_parse(int y, int month, int d, int h, int m, int s, int n, String text) {
         LocalDateTime t = LocalDateTime.parse(text);
-        assertEquals(t.getYear(), y);
-        assertEquals(t.getMonth().getValue(), month);
-        assertEquals(t.getDayOfMonth(), d);
-        assertEquals(t.getHour(), h);
-        assertEquals(t.getMinute(), m);
-        assertEquals(t.getSecond(), s);
-        assertEquals(t.getNano(), n);
+        assertEquals(y, t.getYear());
+        assertEquals(month, t.getMonth().getValue());
+        assertEquals(d, t.getDayOfMonth());
+        assertEquals(h, t.getHour());
+        assertEquals(m, t.getMinute());
+        assertEquals(s, t.getSecond());
+        assertEquals(n, t.getNano());
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_illegalValue() {
-        LocalDateTime.parse("2008-06-32T11:15");
+        Assertions.assertThrows(DateTimeParseException.class, () -> LocalDateTime.parse("2008-06-32T11:15"));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_invalidValue() {
-        LocalDateTime.parse("2008-06-31T11:15");
+        Assertions.assertThrows(DateTimeParseException.class, () -> LocalDateTime.parse("2008-06-31T11:15"));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_nullText() {
-        LocalDateTime.parse((String) null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDateTime.parse((String) null));
     }
 
     //-----------------------------------------------------------------------
@@ -893,18 +907,20 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     public void factory_parse_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d H m s");
         LocalDateTime test = LocalDateTime.parse("2010 12 3 11 30 45", f);
-        assertEquals(test, LocalDateTime.of(2010, 12, 3, 11, 30, 45));
+        assertEquals(LocalDateTime.of(2010, 12, 3, 11, 30, 45), test);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullText() {
-        DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d H m s");
-        LocalDateTime.parse((String) null, f);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d H m s");
+            LocalDateTime.parse((String) null, f);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullFormatter() {
-        LocalDateTime.parse("ANY", null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDateTime.parse("ANY", null));
     }
 
     //-----------------------------------------------------------------------
@@ -912,37 +928,37 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalField() {
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported((TemporalField) null), false);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.NANO_OF_SECOND), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.NANO_OF_DAY), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MICRO_OF_SECOND), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MICRO_OF_DAY), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MILLI_OF_SECOND), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MILLI_OF_DAY), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.SECOND_OF_MINUTE), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.SECOND_OF_DAY), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MINUTE_OF_HOUR), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MINUTE_OF_DAY), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.HOUR_OF_AMPM), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.HOUR_OF_DAY), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.AMPM_OF_DAY), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.DAY_OF_WEEK), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.DAY_OF_MONTH), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.DAY_OF_YEAR), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.EPOCH_DAY), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MONTH_OF_YEAR), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.PROLEPTIC_MONTH), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.YEAR), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.YEAR_OF_ERA), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.ERA), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.INSTANT_SECONDS), false);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.OFFSET_SECONDS), false);
+        assertEquals(false, TEST_2007_07_15_12_30_40_987654321.isSupported((TemporalField) null));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.NANO_OF_SECOND));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.NANO_OF_DAY));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MICRO_OF_SECOND));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MICRO_OF_DAY));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MILLI_OF_SECOND));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MILLI_OF_DAY));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.SECOND_OF_DAY));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MINUTE_OF_DAY));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.HOUR_OF_AMPM));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.HOUR_OF_DAY));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.CLOCK_HOUR_OF_DAY));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.AMPM_OF_DAY));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.DAY_OF_WEEK));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.DAY_OF_MONTH));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.DAY_OF_YEAR));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.EPOCH_DAY));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MONTH_OF_YEAR));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.PROLEPTIC_MONTH));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.YEAR));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.YEAR_OF_ERA));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.ERA));
+        assertEquals(false, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.INSTANT_SECONDS));
+        assertEquals(false, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.OFFSET_SECONDS));
     }
 
     //-----------------------------------------------------------------------
@@ -950,23 +966,23 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalUnit() {
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported((TemporalUnit) null), false);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.NANOS), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.MICROS), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.MILLIS), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.SECONDS), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.MINUTES), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.HOURS), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.HALF_DAYS), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.DAYS), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.WEEKS), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.MONTHS), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.YEARS), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.DECADES), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.CENTURIES), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.MILLENNIA), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.ERAS), true);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.FOREVER), false);
+        assertEquals(false, TEST_2007_07_15_12_30_40_987654321.isSupported((TemporalUnit) null));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.NANOS));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.MICROS));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.MILLIS));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.SECONDS));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.MINUTES));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.HOURS));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.HALF_DAYS));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.DAYS));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.WEEKS));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.MONTHS));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.YEARS));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.DECADES));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.CENTURIES));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.MILLENNIA));
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.ERAS));
+        assertEquals(false, TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.FOREVER));
     }
 
     //-----------------------------------------------------------------------
@@ -975,41 +991,40 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     @Test
     public void test_get_TemporalField() {
         LocalDateTime test = LocalDateTime.of(2008, 6, 30, 12, 30, 40, 987654321);
-        assertEquals(test.get(ChronoField.YEAR), 2008);
-        assertEquals(test.get(ChronoField.MONTH_OF_YEAR), 6);
-        assertEquals(test.get(ChronoField.DAY_OF_MONTH), 30);
-        assertEquals(test.get(ChronoField.DAY_OF_WEEK), 1);
-        assertEquals(test.get(ChronoField.DAY_OF_YEAR), 182);
+        assertEquals(2008, test.get(ChronoField.YEAR));
+        assertEquals(6, test.get(ChronoField.MONTH_OF_YEAR));
+        assertEquals(30, test.get(ChronoField.DAY_OF_MONTH));
+        assertEquals(1, test.get(ChronoField.DAY_OF_WEEK));
+        assertEquals(182, test.get(ChronoField.DAY_OF_YEAR));
 
-        assertEquals(test.get(ChronoField.HOUR_OF_DAY), 12);
-        assertEquals(test.get(ChronoField.MINUTE_OF_HOUR), 30);
-        assertEquals(test.get(ChronoField.SECOND_OF_MINUTE), 40);
-        assertEquals(test.get(ChronoField.NANO_OF_SECOND), 987654321);
-        assertEquals(test.get(ChronoField.HOUR_OF_AMPM), 0);
-        assertEquals(test.get(ChronoField.AMPM_OF_DAY), 1);
+        assertEquals(12, test.get(ChronoField.HOUR_OF_DAY));
+        assertEquals(30, test.get(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(40, test.get(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(987654321, test.get(ChronoField.NANO_OF_SECOND));
+        assertEquals(0, test.get(ChronoField.HOUR_OF_AMPM));
+        assertEquals(1, test.get(ChronoField.AMPM_OF_DAY));
     }
 
     @Test
     public void test_getLong_TemporalField() {
         LocalDateTime test = LocalDateTime.of(2008, 6, 30, 12, 30, 40, 987654321);
-        assertEquals(test.getLong(ChronoField.YEAR), 2008);
-        assertEquals(test.getLong(ChronoField.MONTH_OF_YEAR), 6);
-        assertEquals(test.getLong(ChronoField.DAY_OF_MONTH), 30);
-        assertEquals(test.getLong(ChronoField.DAY_OF_WEEK), 1);
-        assertEquals(test.getLong(ChronoField.DAY_OF_YEAR), 182);
+        assertEquals(2008, test.getLong(ChronoField.YEAR));
+        assertEquals(6, test.getLong(ChronoField.MONTH_OF_YEAR));
+        assertEquals(30, test.getLong(ChronoField.DAY_OF_MONTH));
+        assertEquals(1, test.getLong(ChronoField.DAY_OF_WEEK));
+        assertEquals(182, test.getLong(ChronoField.DAY_OF_YEAR));
 
-        assertEquals(test.getLong(ChronoField.HOUR_OF_DAY), 12);
-        assertEquals(test.getLong(ChronoField.MINUTE_OF_HOUR), 30);
-        assertEquals(test.getLong(ChronoField.SECOND_OF_MINUTE), 40);
-        assertEquals(test.getLong(ChronoField.NANO_OF_SECOND), 987654321);
-        assertEquals(test.getLong(ChronoField.HOUR_OF_AMPM), 0);
-        assertEquals(test.getLong(ChronoField.AMPM_OF_DAY), 1);
+        assertEquals(12, test.getLong(ChronoField.HOUR_OF_DAY));
+        assertEquals(30, test.getLong(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(40, test.getLong(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(987654321, test.getLong(ChronoField.NANO_OF_SECOND));
+        assertEquals(0, test.getLong(ChronoField.HOUR_OF_AMPM));
+        assertEquals(1, test.getLong(ChronoField.AMPM_OF_DAY));
     }
 
     //-----------------------------------------------------------------------
     // query(TemporalQuery)
     //-----------------------------------------------------------------------
-    @DataProvider(name="query")
     Object[][] data_query() {
         return new Object[][] {
                 {TEST_2007_07_15_12_30_40_987654321, TemporalQueries.chronology(), IsoChronology.INSTANCE},
@@ -1022,23 +1037,24 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_query(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(temporal.query(query), expected);
+        assertEquals(expected, temporal.query(query));
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_queryFrom(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(query.queryFrom(temporal), expected);
+        assertEquals(expected, query.queryFrom(temporal));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_query_null() {
-        TEST_2007_07_15_12_30_40_987654321.query(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15_12_30_40_987654321.query(null));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleDates")
     Object[][] provider_sampleDates() {
         return new Object[][] {
             {2008, 7, 5},
@@ -1050,7 +1066,6 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @DataProvider(name="sampleTimes")
     Object[][] provider_sampleTimes() {
         return new Object[][] {
             {0, 0, 0, 0},
@@ -1075,15 +1090,17 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // get*()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleDates")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDates")
     public void test_get_dates(int y, int m, int d) {
         LocalDateTime a = LocalDateTime.of(y, m, d, 12, 30);
-        assertEquals(a.getYear(), y);
-        assertEquals(a.getMonth(), Month.of(m));
-        assertEquals(a.getDayOfMonth(), d);
+        assertEquals(y, a.getYear());
+        assertEquals(Month.of(m), a.getMonth());
+        assertEquals(d, a.getDayOfMonth());
     }
 
-    @Test(dataProvider="sampleDates")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDates")
     public void test_getDOY(int y, int m, int d) {
         LocalDateTime a = LocalDateTime.of(y, m, d, 12 ,30);
         int total = 0;
@@ -1091,16 +1108,17 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
             total += Month.of(i).length(isIsoLeap(y));
         }
         int doy = total + d;
-        assertEquals(a.getDayOfYear(), doy);
+        assertEquals(doy, a.getDayOfYear());
     }
 
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_get_times(int h, int m, int s, int ns) {
         LocalDateTime a = LocalDateTime.of(TEST_2007_07_15_12_30_40_987654321.toLocalDate(), LocalTime.of(h, m, s, ns));
-        assertEquals(a.getHour(), h);
-        assertEquals(a.getMinute(), m);
-        assertEquals(a.getSecond(), s);
-        assertEquals(a.getNano(), ns);
+        assertEquals(h, a.getHour());
+        assertEquals(m, a.getMinute());
+        assertEquals(s, a.getSecond());
+        assertEquals(ns, a.getNano());
     }
 
     //-----------------------------------------------------------------------
@@ -1123,7 +1141,6 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // adjustInto(Temporal)
     //-----------------------------------------------------------------------
-    @DataProvider(name="adjustInto")
     Object[][] data_adjustInto() {
         return new Object[][]{
                 {LocalDateTime.of(2012, 3, 4, 23, 5), LocalDateTime.of(2012, 3, 4, 1, 1, 1, 100), LocalDateTime.of(2012, 3, 4, 23, 5, 0, 0), null},
@@ -1145,11 +1162,12 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="adjustInto")
+    @ParameterizedTest
+    @MethodSource("data_adjustInto")
     public void test_adjustInto(LocalDateTime test, Temporal temporal, Temporal expected, Class<?> expectedEx) {
         if (expectedEx == null) {
             Temporal result = test.adjustInto(temporal);
-            assertEquals(result, expected);
+            assertEquals(expected, result);
         } else {
             try {
                 Temporal result = test.adjustInto(temporal);
@@ -1172,12 +1190,12 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
                 return sample;
             }
         };
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.with(adjuster), sample);
+        assertEquals(sample, TEST_2007_07_15_12_30_40_987654321.with(adjuster));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_with_adjustment_null() {
-        TEST_2007_07_15_12_30_40_987654321.with((TemporalAdjuster) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15_12_30_40_987654321.with((TemporalAdjuster) null));
     }
 
     //-----------------------------------------------------------------------
@@ -1189,16 +1207,16 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(t, 2008, 7, 15, 12, 30, 40, 987654321);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withYear_int_invalid() {
-        TEST_2007_07_15_12_30_40_987654321.withYear(Year.MIN_VALUE - 1);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15_12_30_40_987654321.withYear(Year.MIN_VALUE - 1));
     }
 
     @Test
     public void test_withYear_int_adjustDay() {
         LocalDateTime t = LocalDateTime.of(2008, 2, 29, 12, 30).withYear(2007);
         LocalDateTime expected = LocalDateTime.of(2007, 2, 28, 12, 30);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
     //-----------------------------------------------------------------------
@@ -1210,16 +1228,16 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(t, 2007, 1, 15, 12, 30, 40, 987654321);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withMonth_int_invalid() {
-        TEST_2007_07_15_12_30_40_987654321.withMonth(13);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15_12_30_40_987654321.withMonth(13));
     }
 
     @Test
     public void test_withMonth_int_adjustDay() {
         LocalDateTime t = LocalDateTime.of(2007, 12, 31, 12, 30).withMonth(11);
         LocalDateTime expected = LocalDateTime.of(2007, 11, 30, 12, 30);
-        assertEquals(t, expected);
+        assertEquals(expected, t);
     }
 
     //-----------------------------------------------------------------------
@@ -1231,14 +1249,14 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(t, 2007, 7, 1, 12, 30, 40, 987654321);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfMonth_invalid() {
-        LocalDateTime.of(2007, 11, 30, 12, 30).withDayOfMonth(32);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 11, 30, 12, 30).withDayOfMonth(32));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfMonth_invalidCombination() {
-        LocalDateTime.of(2007, 11, 30, 12, 30).withDayOfMonth(31);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 11, 30, 12, 30).withDayOfMonth(31));
     }
 
     //-----------------------------------------------------------------------
@@ -1247,17 +1265,17 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     @Test
     public void test_withDayOfYear_normal() {
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321.withDayOfYear(33);
-        assertEquals(t, LocalDateTime.of(2007, 2, 2, 12, 30, 40, 987654321));
+        assertEquals(LocalDateTime.of(2007, 2, 2, 12, 30, 40, 987654321), t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfYear_illegal() {
-        TEST_2007_07_15_12_30_40_987654321.withDayOfYear(367);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15_12_30_40_987654321.withDayOfYear(367));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfYear_invalid() {
-        TEST_2007_07_15_12_30_40_987654321.withDayOfYear(366);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15_12_30_40_987654321.withDayOfYear(366));
     }
 
     //-----------------------------------------------------------------------
@@ -1268,18 +1286,18 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321;
         for (int i = 0; i < 24; i++) {
             t = t.withHour(i);
-            assertEquals(t.getHour(), i);
+            assertEquals(i, t.getHour());
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withHour_hourTooLow() {
-        TEST_2007_07_15_12_30_40_987654321.withHour(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15_12_30_40_987654321.withHour(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withHour_hourTooHigh() {
-        TEST_2007_07_15_12_30_40_987654321.withHour(24);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15_12_30_40_987654321.withHour(24));
     }
 
     //-----------------------------------------------------------------------
@@ -1290,18 +1308,18 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321;
         for (int i = 0; i < 60; i++) {
             t = t.withMinute(i);
-            assertEquals(t.getMinute(), i);
+            assertEquals(i, t.getMinute());
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withMinute_minuteTooLow() {
-        TEST_2007_07_15_12_30_40_987654321.withMinute(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15_12_30_40_987654321.withMinute(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withMinute_minuteTooHigh() {
-        TEST_2007_07_15_12_30_40_987654321.withMinute(60);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15_12_30_40_987654321.withMinute(60));
     }
 
     //-----------------------------------------------------------------------
@@ -1312,18 +1330,18 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321;
         for (int i = 0; i < 60; i++) {
             t = t.withSecond(i);
-            assertEquals(t.getSecond(), i);
+            assertEquals(i, t.getSecond());
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withSecond_secondTooLow() {
-        TEST_2007_07_15_12_30_40_987654321.withSecond(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15_12_30_40_987654321.withSecond(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withSecond_secondTooHigh() {
-        TEST_2007_07_15_12_30_40_987654321.withSecond(60);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15_12_30_40_987654321.withSecond(60));
     }
 
     //-----------------------------------------------------------------------
@@ -1333,23 +1351,23 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     public void test_withNanoOfSecond_normal() {
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321;
         t = t.withNano(1);
-        assertEquals(t.getNano(), 1);
+        assertEquals(1, t.getNano());
         t = t.withNano(10);
-        assertEquals(t.getNano(), 10);
+        assertEquals(10, t.getNano());
         t = t.withNano(100);
-        assertEquals(t.getNano(), 100);
+        assertEquals(100, t.getNano());
         t = t.withNano(999999999);
-        assertEquals(t.getNano(), 999999999);
+        assertEquals(999999999, t.getNano());
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withNanoOfSecond_nanoTooLow() {
-        TEST_2007_07_15_12_30_40_987654321.withNano(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15_12_30_40_987654321.withNano(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withNanoOfSecond_nanoTooHigh() {
-        TEST_2007_07_15_12_30_40_987654321.withNano(1000000000);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2007_07_15_12_30_40_987654321.withNano(1000000000));
     }
 
     //-----------------------------------------------------------------------
@@ -1357,14 +1375,14 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_truncatedTo_normal() {
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.truncatedTo(NANOS), TEST_2007_07_15_12_30_40_987654321);
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.truncatedTo(SECONDS), TEST_2007_07_15_12_30_40_987654321.withNano(0));
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.truncatedTo(DAYS), TEST_2007_07_15_12_30_40_987654321.with(LocalTime.MIDNIGHT));
+        assertEquals(TEST_2007_07_15_12_30_40_987654321, TEST_2007_07_15_12_30_40_987654321.truncatedTo(NANOS));
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.withNano(0), TEST_2007_07_15_12_30_40_987654321.truncatedTo(SECONDS));
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.with(LocalTime.MIDNIGHT), TEST_2007_07_15_12_30_40_987654321.truncatedTo(DAYS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_truncatedTo_null() {
-        TEST_2007_07_15_12_30_40_987654321.truncatedTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15_12_30_40_987654321.truncatedTo(null));
     }
 
     //-----------------------------------------------------------------------
@@ -1374,31 +1392,35 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     public void test_plus_TemporalAmount_positiveMonths() {
         MockSimplePeriod period = MockSimplePeriod.of(7, MONTHS);
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321.plus(period);
-        assertEquals(t, LocalDateTime.of(2008, 2, 15, 12, 30, 40, 987654321));
+        assertEquals(LocalDateTime.of(2008, 2, 15, 12, 30, 40, 987654321), t);
     }
 
     @Test
     public void test_plus_TemporalAmount_negativeDays() {
         MockSimplePeriod period = MockSimplePeriod.of(-25, DAYS);
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321.plus(period);
-        assertEquals(t, LocalDateTime.of(2007, 6, 20, 12, 30, 40, 987654321));
+        assertEquals(LocalDateTime.of(2007, 6, 20, 12, 30, 40, 987654321), t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plus_TemporalAmount_invalidTooLarge() {
-        MockSimplePeriod period = MockSimplePeriod.of(1, YEARS);
-        LocalDateTime.of(Year.MAX_VALUE, 1, 1, 0, 0).plus(period);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            MockSimplePeriod period = MockSimplePeriod.of(1, YEARS);
+            LocalDateTime.of(Year.MAX_VALUE, 1, 1, 0, 0).plus(period);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plus_TemporalAmount_invalidTooSmall() {
-        MockSimplePeriod period = MockSimplePeriod.of(-1, YEARS);
-        LocalDateTime.of(Year.MIN_VALUE, 1, 1, 0, 0).plus(period);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            MockSimplePeriod period = MockSimplePeriod.of(-1, YEARS);
+            LocalDateTime.of(Year.MIN_VALUE, 1, 1, 0, 0).plus(period);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_plus_TemporalAmount_null() {
-        TEST_2007_07_15_12_30_40_987654321.plus((TemporalAmount) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15_12_30_40_987654321.plus((TemporalAmount) null));
     }
 
     //-----------------------------------------------------------------------
@@ -1407,28 +1429,28 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     @Test
     public void test_plus_longTemporalUnit_positiveMonths() {
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321.plus(7, ChronoUnit.MONTHS);
-        assertEquals(t, LocalDateTime.of(2008, 2, 15, 12, 30, 40, 987654321));
+        assertEquals(LocalDateTime.of(2008, 2, 15, 12, 30, 40, 987654321), t);
     }
 
     @Test
     public void test_plus_longTemporalUnit_negativeDays() {
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321.plus(-25, ChronoUnit.DAYS);
-        assertEquals(t, LocalDateTime.of(2007, 6, 20, 12, 30, 40, 987654321));
+        assertEquals(LocalDateTime.of(2007, 6, 20, 12, 30, 40, 987654321), t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_plus_longTemporalUnit_null() {
-        TEST_2007_07_15_12_30_40_987654321.plus(1, (TemporalUnit) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15_12_30_40_987654321.plus(1, (TemporalUnit) null));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plus_longTemporalUnit_invalidTooLarge() {
-        LocalDateTime.of(Year.MAX_VALUE, 1, 1, 0, 0).plus(1, ChronoUnit.YEARS);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(Year.MAX_VALUE, 1, 1, 0, 0).plus(1, ChronoUnit.YEARS));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plus_longTemporalUnit_invalidTooSmall() {
-        LocalDateTime.of(Year.MIN_VALUE, 1, 1, 0, 0).plus(-1, ChronoUnit.YEARS);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(Year.MIN_VALUE, 1, 1, 0, 0).plus(-1, ChronoUnit.YEARS));
     }
 
     //-----------------------------------------------------------------------
@@ -1452,14 +1474,14 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(t, 2009, 2, 28, 0, 0, 0, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusYears_int_invalidTooLarge() {
-        createDateMidnight(Year.MAX_VALUE, 1, 1).plusYears(1);
+        Assertions.assertThrows(DateTimeException.class, () -> createDateMidnight(Year.MAX_VALUE, 1, 1).plusYears(1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusYears_int_invalidTooSmall() {
-        LocalDate.of(Year.MIN_VALUE, 1, 1).plusYears(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.of(Year.MIN_VALUE, 1, 1).plusYears(-1));
     }
 
     //-----------------------------------------------------------------------
@@ -1507,20 +1529,19 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(t, 2007, 4, 30, 0, 0, 0, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusMonths_int_invalidTooLarge() {
-        createDateMidnight(Year.MAX_VALUE, 12, 1).plusMonths(1);
+        Assertions.assertThrows(DateTimeException.class, () -> createDateMidnight(Year.MAX_VALUE, 12, 1).plusMonths(1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusMonths_int_invalidTooSmall() {
-        createDateMidnight(Year.MIN_VALUE, 1, 1).plusMonths(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> createDateMidnight(Year.MIN_VALUE, 1, 1).plusMonths(-1));
     }
 
     //-----------------------------------------------------------------------
     // plusWeeks()
     //-----------------------------------------------------------------------
-    @DataProvider(name="samplePlusWeeksSymmetry")
     Object[][] provider_samplePlusWeeksSymmetry() {
         return new Object[][] {
             {createDateMidnight(-1, 1, 1)},
@@ -1552,14 +1573,15 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="samplePlusWeeksSymmetry")
+    @ParameterizedTest
+    @MethodSource("provider_samplePlusWeeksSymmetry")
     public void test_plusWeeks_symmetry(LocalDateTime reference) {
         for (int weeks = 0; weeks < 365 * 8; weeks++) {
             LocalDateTime t = reference.plusWeeks(weeks).plusWeeks(-weeks);
-            assertEquals(t, reference);
+            assertEquals(reference, t);
 
             t = reference.plusWeeks(-weeks).plusWeeks(weeks);
-            assertEquals(t, reference);
+            assertEquals(reference, t);
         }
     }
 
@@ -1578,7 +1600,7 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     @Test
     public void test_plusWeeks_overYears() {
         LocalDateTime t = LocalDateTime.of(2006, 7, 16, 12, 30, 40, 987654321).plusWeeks(52);
-        assertEquals(t, TEST_2007_07_15_12_30_40_987654321);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321, t);
     }
 
     @Test
@@ -1617,20 +1639,19 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(t, Year.MIN_VALUE, 1, 1, 0, 0, 0, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusWeeks_invalidTooLarge() {
-        createDateMidnight(Year.MAX_VALUE, 12, 25).plusWeeks(1);
+        Assertions.assertThrows(DateTimeException.class, () -> createDateMidnight(Year.MAX_VALUE, 12, 25).plusWeeks(1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusWeeks_invalidTooSmall() {
-        createDateMidnight(Year.MIN_VALUE, 1, 7).plusWeeks(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> createDateMidnight(Year.MIN_VALUE, 1, 7).plusWeeks(-1));
     }
 
     //-----------------------------------------------------------------------
     // plusDays()
     //-----------------------------------------------------------------------
-    @DataProvider(name="samplePlusDaysSymmetry")
     Object[][] provider_samplePlusDaysSymmetry() {
         return new Object[][] {
             {createDateMidnight(-1, 1, 1)},
@@ -1662,14 +1683,15 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="samplePlusDaysSymmetry")
+    @ParameterizedTest
+    @MethodSource("provider_samplePlusDaysSymmetry")
     public void test_plusDays_symmetry(LocalDateTime reference) {
         for (int days = 0; days < 365 * 8; days++) {
             LocalDateTime t = reference.plusDays(days).plusDays(-days);
-            assertEquals(t, reference);
+            assertEquals(reference, t);
 
             t = reference.plusDays(-days).plusDays(days);
-            assertEquals(t, reference);
+            assertEquals(reference, t);
         }
     }
 
@@ -1688,7 +1710,7 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     @Test
     public void test_plusDays_overYears() {
         LocalDateTime t = LocalDateTime.of(2006, 7, 14, 12, 30, 40, 987654321).plusDays(366);
-        assertEquals(t, TEST_2007_07_15_12_30_40_987654321);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321, t);
     }
 
     @Test
@@ -1727,24 +1749,24 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(t, Year.MIN_VALUE, 1, 1, 0, 0, 0, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusDays_invalidTooLarge() {
-        createDateMidnight(Year.MAX_VALUE, 12, 31).plusDays(1);
+        Assertions.assertThrows(DateTimeException.class, () -> createDateMidnight(Year.MAX_VALUE, 12, 31).plusDays(1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusDays_invalidTooSmall() {
-        createDateMidnight(Year.MIN_VALUE, 1, 1).plusDays(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> createDateMidnight(Year.MIN_VALUE, 1, 1).plusDays(-1));
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_plusDays_overflowTooLarge() {
-        createDateMidnight(Year.MAX_VALUE, 12, 31).plusDays(Long.MAX_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> createDateMidnight(Year.MAX_VALUE, 12, 31).plusDays(Long.MAX_VALUE));
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_plusDays_overflowTooSmall() {
-        createDateMidnight(Year.MIN_VALUE, 1, 1).plusDays(Long.MIN_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> createDateMidnight(Year.MIN_VALUE, 1, 1).plusDays(Long.MIN_VALUE));
     }
 
     //-----------------------------------------------------------------------
@@ -1762,8 +1784,8 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
                 d = d.plusDays(1);
             }
 
-            assertEquals(t.toLocalDate(), d);
-            assertEquals(t.getHour(), (i + 1) % 24);
+            assertEquals(d, t.toLocalDate());
+            assertEquals((i + 1) % 24, t.getHour());
         }
     }
 
@@ -1781,8 +1803,8 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
                 d = d.plusDays(1);
             }
 
-            assertEquals(dt.toLocalDate(), d);
-            assertEquals(dt.toLocalTime(), t);
+            assertEquals(d, dt.toLocalDate());
+            assertEquals(t, dt.toLocalTime());
         }
     }
 
@@ -1801,8 +1823,8 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
                 d = d.plusDays(1);
             }
 
-            assertEquals(dt.toLocalDate(), d);
-            assertEquals(dt.toLocalTime(), t);
+            assertEquals(d, dt.toLocalDate());
+            assertEquals(t, dt.toLocalTime());
         }
     }
 
@@ -1825,9 +1847,9 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
                 min = 0;
             }
 
-            assertEquals(t.toLocalDate(), d);
-            assertEquals(t.getHour(), hour);
-            assertEquals(t.getMinute(), min);
+            assertEquals(d, t.toLocalDate());
+            assertEquals(hour, t.getHour());
+            assertEquals(min, t.getMinute());
         }
     }
 
@@ -1845,15 +1867,15 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
                 d = d.plusDays(1);
             }
 
-            assertEquals(dt.toLocalDate(), d, String.valueOf(i));
-            assertEquals(dt.toLocalTime(), t, String.valueOf(i));
+            assertEquals(d, dt.toLocalDate(), String.valueOf(i));
+            assertEquals(t, dt.toLocalTime(), String.valueOf(i));
         }
     }
 
     @Test
     public void test_plusMinutes_noChange_oneDay() {
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321.plusMinutes(24 * 60);
-        assertEquals(t.toLocalDate(), TEST_2007_07_15_12_30_40_987654321.toLocalDate().plusDays(1));
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.toLocalDate().plusDays(1), t.toLocalDate());
     }
 
     //-----------------------------------------------------------------------
@@ -1880,14 +1902,13 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
                 min = 0;
             }
 
-            assertEquals(t.toLocalDate(), d);
-            assertEquals(t.getHour(), hour);
-            assertEquals(t.getMinute(), min);
-            assertEquals(t.getSecond(), sec);
+            assertEquals(d, t.toLocalDate());
+            assertEquals(hour, t.getHour());
+            assertEquals(min, t.getMinute());
+            assertEquals(sec, t.getSecond());
         }
     }
 
-    @DataProvider(name="plusSeconds_fromZero")
     Iterator<Object[]> plusSeconds_fromZero() {
         return new Iterator<Object[]>() {
             int delta = 30;
@@ -1934,21 +1955,22 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="plusSeconds_fromZero")
+    @ParameterizedTest
+    @MethodSource("plusSeconds_fromZero")
     public void test_plusSeconds_fromZero(int seconds, LocalDate date, int hour, int min, int sec) {
         LocalDateTime base = TEST_2007_07_15_12_30_40_987654321.with(LocalTime.MIDNIGHT);
         LocalDateTime t = base.plusSeconds(seconds);
 
-        assertEquals(date, t.toLocalDate());
-        assertEquals(hour, t.getHour());
-        assertEquals(min, t.getMinute());
-        assertEquals(sec, t.getSecond());
+        assertEquals(t.toLocalDate(), date);
+        assertEquals(t.getHour(), hour);
+        assertEquals(t.getMinute(), min);
+        assertEquals(t.getSecond(), sec);
     }
 
     @Test
     public void test_plusSeconds_noChange_oneDay() {
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321.plusSeconds(24 * 60 * 60);
-        assertEquals(t.toLocalDate(), TEST_2007_07_15_12_30_40_987654321.toLocalDate().plusDays(1));
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.toLocalDate().plusDays(1), t.toLocalDate());
     }
 
     //-----------------------------------------------------------------------
@@ -1980,15 +2002,14 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
                 min = 0;
             }
 
-            assertEquals(t.toLocalDate(), d, String.valueOf(i));
-            assertEquals(t.getHour(), hour);
-            assertEquals(t.getMinute(), min);
-            assertEquals(t.getSecond(), sec);
-            assertEquals(t.getNano(), nanos);
+            assertEquals(d, t.toLocalDate(), String.valueOf(i));
+            assertEquals(hour, t.getHour());
+            assertEquals(min, t.getMinute());
+            assertEquals(sec, t.getSecond());
+            assertEquals(nanos, t.getNano());
         }
     }
 
-    @DataProvider(name="plusNanos_fromZero")
     Iterator<Object[]> plusNanos_fromZero() {
         return new Iterator<Object[]>() {
             long delta = 7500000000L;
@@ -2038,22 +2059,23 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="plusNanos_fromZero")
+    @ParameterizedTest
+    @MethodSource("plusNanos_fromZero")
     public void test_plusNanos_fromZero(long nanoseconds, LocalDate date, int hour, int min, int sec, int nanos) {
         LocalDateTime base = TEST_2007_07_15_12_30_40_987654321.with(LocalTime.MIDNIGHT);
         LocalDateTime t = base.plusNanos(nanoseconds);
 
-        assertEquals(date, t.toLocalDate());
-        assertEquals(hour, t.getHour());
-        assertEquals(min, t.getMinute());
-        assertEquals(sec, t.getSecond());
-        assertEquals(nanos, t.getNano());
+        assertEquals(t.toLocalDate(), date);
+        assertEquals(t.getHour(), hour);
+        assertEquals(t.getMinute(), min);
+        assertEquals(t.getSecond(), sec);
+        assertEquals(t.getNano(), nanos);
     }
 
     @Test
     public void test_plusNanos_noChange_oneDay() {
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321.plusNanos(24 * 60 * 60 * 1000000000L);
-        assertEquals(t.toLocalDate(), TEST_2007_07_15_12_30_40_987654321.toLocalDate().plusDays(1));
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.toLocalDate().plusDays(1), t.toLocalDate());
     }
 
     //-----------------------------------------------------------------------
@@ -2063,31 +2085,35 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     public void test_minus_TemporalAmount_positiveMonths() {
         MockSimplePeriod period = MockSimplePeriod.of(7, MONTHS);
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321.minus(period);
-        assertEquals(t, LocalDateTime.of(2006, 12, 15, 12, 30, 40, 987654321));
+        assertEquals(LocalDateTime.of(2006, 12, 15, 12, 30, 40, 987654321), t);
     }
 
     @Test
     public void test_minus_TemporalAmount_negativeDays() {
         MockSimplePeriod period = MockSimplePeriod.of(-25, DAYS);
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321.minus(period);
-        assertEquals(t, LocalDateTime.of(2007, 8, 9, 12, 30, 40, 987654321));
+        assertEquals(LocalDateTime.of(2007, 8, 9, 12, 30, 40, 987654321), t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minus_TemporalAmount_invalidTooLarge() {
-        MockSimplePeriod period = MockSimplePeriod.of(-1, YEARS);
-        LocalDateTime.of(Year.MAX_VALUE, 1, 1, 0, 0).minus(period);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            MockSimplePeriod period = MockSimplePeriod.of(-1, YEARS);
+            LocalDateTime.of(Year.MAX_VALUE, 1, 1, 0, 0).minus(period);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minus_TemporalAmount_invalidTooSmall() {
-        MockSimplePeriod period = MockSimplePeriod.of(1, YEARS);
-        LocalDateTime.of(Year.MIN_VALUE, 1, 1, 0, 0).minus(period);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            MockSimplePeriod period = MockSimplePeriod.of(1, YEARS);
+            LocalDateTime.of(Year.MIN_VALUE, 1, 1, 0, 0).minus(period);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_minus_TemporalAmount_null() {
-        TEST_2007_07_15_12_30_40_987654321.minus((TemporalAmount) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15_12_30_40_987654321.minus((TemporalAmount) null));
     }
 
     //-----------------------------------------------------------------------
@@ -2096,28 +2122,28 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     @Test
     public void test_minus_longTemporalUnit_positiveMonths() {
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321.minus(7, ChronoUnit.MONTHS);
-        assertEquals(t, LocalDateTime.of(2006, 12, 15, 12, 30, 40, 987654321));
+        assertEquals(LocalDateTime.of(2006, 12, 15, 12, 30, 40, 987654321), t);
     }
 
     @Test
     public void test_minus_longTemporalUnit_negativeDays() {
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321.minus(-25, ChronoUnit.DAYS);
-        assertEquals(t, LocalDateTime.of(2007, 8, 9, 12, 30, 40, 987654321));
+        assertEquals(LocalDateTime.of(2007, 8, 9, 12, 30, 40, 987654321), t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_minus_longTemporalUnit_null() {
-        TEST_2007_07_15_12_30_40_987654321.minus(1, (TemporalUnit) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15_12_30_40_987654321.minus(1, (TemporalUnit) null));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minus_longTemporalUnit_invalidTooLarge() {
-        LocalDateTime.of(Year.MAX_VALUE, 1, 1, 0, 0).minus(-1, ChronoUnit.YEARS);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(Year.MAX_VALUE, 1, 1, 0, 0).minus(-1, ChronoUnit.YEARS));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minus_longTemporalUnit_invalidTooSmall() {
-        LocalDateTime.of(Year.MIN_VALUE, 1, 1, 0, 0).minus(1, ChronoUnit.YEARS);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(Year.MIN_VALUE, 1, 1, 0, 0).minus(1, ChronoUnit.YEARS));
     }
 
     //-----------------------------------------------------------------------
@@ -2141,14 +2167,14 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(t, 2007, 2, 28, 0, 0, 0, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusYears_int_invalidTooLarge() {
-        createDateMidnight(Year.MAX_VALUE, 1, 1).minusYears(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> createDateMidnight(Year.MAX_VALUE, 1, 1).minusYears(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusYears_int_invalidTooSmall() {
-        createDateMidnight(Year.MIN_VALUE, 1, 1).minusYears(1);
+        Assertions.assertThrows(DateTimeException.class, () -> createDateMidnight(Year.MIN_VALUE, 1, 1).minusYears(1));
     }
 
     //-----------------------------------------------------------------------
@@ -2196,20 +2222,19 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(t, 2007, 2, 28, 0, 0, 0, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusMonths_int_invalidTooLarge() {
-        createDateMidnight(Year.MAX_VALUE, 12, 1).minusMonths(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> createDateMidnight(Year.MAX_VALUE, 12, 1).minusMonths(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusMonths_int_invalidTooSmall() {
-        createDateMidnight(Year.MIN_VALUE, 1, 1).minusMonths(1);
+        Assertions.assertThrows(DateTimeException.class, () -> createDateMidnight(Year.MIN_VALUE, 1, 1).minusMonths(1));
     }
 
     //-----------------------------------------------------------------------
     // minusWeeks()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleMinusWeeksSymmetry")
     Object[][] provider_sampleMinusWeeksSymmetry() {
         return new Object[][] {
             {createDateMidnight(-1, 1, 1)},
@@ -2241,14 +2266,15 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleMinusWeeksSymmetry")
+    @ParameterizedTest
+    @MethodSource("provider_sampleMinusWeeksSymmetry")
     public void test_minusWeeks_symmetry(LocalDateTime reference) {
         for (int weeks = 0; weeks < 365 * 8; weeks++) {
             LocalDateTime t = reference.minusWeeks(weeks).minusWeeks(-weeks);
-            assertEquals(t, reference);
+            assertEquals(reference, t);
 
             t = reference.minusWeeks(-weeks).minusWeeks(weeks);
-            assertEquals(t, reference);
+            assertEquals(reference, t);
         }
     }
 
@@ -2267,7 +2293,7 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     @Test
     public void test_minusWeeks_overYears() {
         LocalDateTime t = LocalDateTime.of(2008, 7, 13, 12, 30, 40, 987654321).minusWeeks(52);
-        assertEquals(t, TEST_2007_07_15_12_30_40_987654321);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321, t);
     }
 
     @Test
@@ -2306,20 +2332,19 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(t, Year.MIN_VALUE, 1, 1, 0, 0, 0, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusWeeks_invalidTooLarge() {
-        createDateMidnight(Year.MAX_VALUE, 12, 25).minusWeeks(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> createDateMidnight(Year.MAX_VALUE, 12, 25).minusWeeks(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusWeeks_invalidTooSmall() {
-        createDateMidnight(Year.MIN_VALUE, 1, 7).minusWeeks(1);
+        Assertions.assertThrows(DateTimeException.class, () -> createDateMidnight(Year.MIN_VALUE, 1, 7).minusWeeks(1));
     }
 
     //-----------------------------------------------------------------------
     // minusDays()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleMinusDaysSymmetry")
     Object[][] provider_sampleMinusDaysSymmetry() {
         return new Object[][] {
             {createDateMidnight(-1, 1, 1)},
@@ -2351,14 +2376,15 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleMinusDaysSymmetry")
+    @ParameterizedTest
+    @MethodSource("provider_sampleMinusDaysSymmetry")
     public void test_minusDays_symmetry(LocalDateTime reference) {
         for (int days = 0; days < 365 * 8; days++) {
             LocalDateTime t = reference.minusDays(days).minusDays(-days);
-            assertEquals(t, reference);
+            assertEquals(reference, t);
 
             t = reference.minusDays(-days).minusDays(days);
-            assertEquals(t, reference);
+            assertEquals(reference, t);
         }
     }
 
@@ -2377,13 +2403,13 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     @Test
     public void test_minusDays_overYears() {
         LocalDateTime t = LocalDateTime.of(2008, 7, 16, 12, 30, 40, 987654321).minusDays(367);
-        assertEquals(t, TEST_2007_07_15_12_30_40_987654321);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321, t);
     }
 
     @Test
     public void test_minusDays_overLeapYears() {
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321.plusYears(2).minusDays(365 + 366);
-        assertEquals(t, TEST_2007_07_15_12_30_40_987654321);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321, t);
     }
 
     @Test
@@ -2416,24 +2442,24 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         check(t, Year.MIN_VALUE, 1, 1, 0, 0, 0, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusDays_invalidTooLarge() {
-        createDateMidnight(Year.MAX_VALUE, 12, 31).minusDays(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> createDateMidnight(Year.MAX_VALUE, 12, 31).minusDays(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusDays_invalidTooSmall() {
-        createDateMidnight(Year.MIN_VALUE, 1, 1).minusDays(1);
+        Assertions.assertThrows(DateTimeException.class, () -> createDateMidnight(Year.MIN_VALUE, 1, 1).minusDays(1));
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_minusDays_overflowTooLarge() {
-        createDateMidnight(Year.MAX_VALUE, 12, 31).minusDays(Long.MIN_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> createDateMidnight(Year.MAX_VALUE, 12, 31).minusDays(Long.MIN_VALUE));
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_minusDays_overflowTooSmall() {
-        createDateMidnight(Year.MIN_VALUE, 1, 1).minusDays(Long.MAX_VALUE);
+        Assertions.assertThrows(ArithmeticException.class, () -> createDateMidnight(Year.MIN_VALUE, 1, 1).minusDays(Long.MAX_VALUE));
     }
 
     //-----------------------------------------------------------------------
@@ -2451,8 +2477,8 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
                 d = d.minusDays(1);
             }
 
-            assertEquals(t.toLocalDate(), d);
-            assertEquals(t.getHour(), (((-i + 23) % 24) + 24) % 24);
+            assertEquals(d, t.toLocalDate());
+            assertEquals((((-i + 23) % 24) + 24) % 24, t.getHour());
         }
     }
 
@@ -2470,8 +2496,8 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
                 d = d.minusDays(1);
             }
 
-            assertEquals(dt.toLocalDate(), d, String.valueOf(i));
-            assertEquals(dt.toLocalTime(), t);
+            assertEquals(d, dt.toLocalDate(), String.valueOf(i));
+            assertEquals(t, dt.toLocalTime());
         }
     }
 
@@ -2490,8 +2516,8 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
                 d = d.minusDays(1);
             }
 
-            assertEquals(dt.toLocalDate(), d, String.valueOf(i));
-            assertEquals(dt.toLocalTime(), t);
+            assertEquals(d, dt.toLocalDate(), String.valueOf(i));
+            assertEquals(t, dt.toLocalTime());
         }
     }
 
@@ -2517,9 +2543,9 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
                     hour = 23;
                 }
             }
-            assertEquals(t.toLocalDate(), d);
-            assertEquals(t.getHour(), hour);
-            assertEquals(t.getMinute(), min);
+            assertEquals(d, t.toLocalDate());
+            assertEquals(hour, t.getHour());
+            assertEquals(min, t.getMinute());
         }
     }
 
@@ -2537,15 +2563,15 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
                 d = d.plusDays(1);
             }
 
-            assertEquals(dt.toLocalDate(), d);
-            assertEquals(dt.toLocalTime(), t);
+            assertEquals(d, dt.toLocalDate());
+            assertEquals(t, dt.toLocalTime());
         }
     }
 
     @Test
     public void test_minusMinutes_noChange_oneDay() {
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321.minusMinutes(24 * 60);
-        assertEquals(t.toLocalDate(), TEST_2007_07_15_12_30_40_987654321.toLocalDate().minusDays(1));
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.toLocalDate().minusDays(1), t.toLocalDate());
     }
 
     //-----------------------------------------------------------------------
@@ -2577,14 +2603,13 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
                 }
             }
 
-            assertEquals(t.toLocalDate(), d);
-            assertEquals(t.getHour(), hour);
-            assertEquals(t.getMinute(), min);
-            assertEquals(t.getSecond(), sec);
+            assertEquals(d, t.toLocalDate());
+            assertEquals(hour, t.getHour());
+            assertEquals(min, t.getMinute());
+            assertEquals(sec, t.getSecond());
         }
     }
 
-    @DataProvider(name="minusSeconds_fromZero")
     Iterator<Object[]> minusSeconds_fromZero() {
         return new Iterator<Object[]>() {
             int delta = 30;
@@ -2631,15 +2656,16 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="minusSeconds_fromZero")
+    @ParameterizedTest
+    @MethodSource("minusSeconds_fromZero")
     public void test_minusSeconds_fromZero(int seconds, LocalDate date, int hour, int min, int sec) {
         LocalDateTime base = TEST_2007_07_15_12_30_40_987654321.with(LocalTime.MIDNIGHT);
         LocalDateTime t = base.minusSeconds(seconds);
 
-        assertEquals(date, t.toLocalDate());
-        assertEquals(hour, t.getHour());
-        assertEquals(min, t.getMinute());
-        assertEquals(sec, t.getSecond());
+        assertEquals(t.toLocalDate(), date);
+        assertEquals(t.getHour(), hour);
+        assertEquals(t.getMinute(), min);
+        assertEquals(t.getSecond(), sec);
     }
 
     //-----------------------------------------------------------------------
@@ -2678,15 +2704,14 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
                 }
             }
 
-            assertEquals(t.toLocalDate(), d);
-            assertEquals(t.getHour(), hour);
-            assertEquals(t.getMinute(), min);
-            assertEquals(t.getSecond(), sec);
-            assertEquals(t.getNano(), nanos);
+            assertEquals(d, t.toLocalDate());
+            assertEquals(hour, t.getHour());
+            assertEquals(min, t.getMinute());
+            assertEquals(sec, t.getSecond());
+            assertEquals(nanos, t.getNano());
         }
     }
 
-    @DataProvider(name="minusNanos_fromZero")
     Iterator<Object[]> minusNanos_fromZero() {
         return new Iterator<Object[]>() {
             long delta = 7500000000L;
@@ -2736,22 +2761,22 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="minusNanos_fromZero")
+    @ParameterizedTest
+    @MethodSource("minusNanos_fromZero")
     public void test_minusNanos_fromZero(long nanoseconds, LocalDate date, int hour, int min, int sec, int nanos) {
         LocalDateTime base = TEST_2007_07_15_12_30_40_987654321.with(LocalTime.MIDNIGHT);
         LocalDateTime t = base.minusNanos(nanoseconds);
 
-        assertEquals(date, t.toLocalDate());
-        assertEquals(hour, t.getHour());
-        assertEquals(min, t.getMinute());
-        assertEquals(sec, t.getSecond());
-        assertEquals(nanos, t.getNano());
+        assertEquals(t.toLocalDate(), date);
+        assertEquals(t.getHour(), hour);
+        assertEquals(t.getMinute(), min);
+        assertEquals(t.getSecond(), sec);
+        assertEquals(t.getNano(), nanos);
     }
 
     //-----------------------------------------------------------------------
     // until(Temporal, TemporalUnit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="periodUntilUnit")
     Object[][] data_periodUntilUnit() {
         return new Object[][] {
                 // date only
@@ -2889,45 +2914,50 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit(LocalDateTime dt1, LocalDateTime dt2, TemporalUnit unit, long expected) {
         long amount = dt1.until(dt2, unit);
-        assertEquals(amount, expected);
+        assertEquals(expected, amount);
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit_negated(LocalDateTime dt1, LocalDateTime dt2, TemporalUnit unit, long expected) {
         long amount = dt2.until(dt1, unit);
-        assertEquals(amount, -expected);
+        assertEquals(-expected, amount);
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit_between(LocalDateTime dt1, LocalDateTime dt2, TemporalUnit unit, long expected) {
         long amount = unit.between(dt1, dt2);
-        assertEquals(amount, expected);
+        assertEquals(expected, amount);
     }
 
     @Test
     public void test_until_convertedType() {
         LocalDateTime start = LocalDateTime.of(2010, 6, 30, 2, 30);
         OffsetDateTime end = start.plusDays(2).atOffset(OFFSET_PONE);
-        assertEquals(start.until(end, DAYS), 2);
+        assertEquals(2, start.until(end, DAYS));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_until_invalidType() {
-        LocalDateTime start = LocalDateTime.of(2010, 6, 30, 2, 30);
-        start.until(LocalTime.of(11, 30), DAYS);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalDateTime start = LocalDateTime.of(2010, 6, 30, 2, 30);
+            start.until(LocalTime.of(11, 30), DAYS);
+        });
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_until_TemporalUnit_nullEnd() {
-        TEST_2007_07_15_12_30_40_987654321.until(null, HOURS);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15_12_30_40_987654321.until(null, HOURS));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_until_TemporalUnit_nullUnit() {
-        TEST_2007_07_15_12_30_40_987654321.until(TEST_2007_07_15_12_30_40_987654321, null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15_12_30_40_987654321.until(TEST_2007_07_15_12_30_40_987654321, null));
     }
 
     //-----------------------------------------------------------------------
@@ -2937,12 +2967,12 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     public void test_format_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d H m s");
         String t = LocalDateTime.of(2010, 12, 3, 11, 30, 45).format(f);
-        assertEquals(t, "2010 12 3 11 30 45");
+        assertEquals("2010 12 3 11 30 45", t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_format_formatter_null() {
-        LocalDateTime.of(2010, 12, 3, 11, 30, 45).format(null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalDateTime.of(2010, 12, 3, 11, 30, 45).format(null));
     }
 
     //-----------------------------------------------------------------------
@@ -2951,13 +2981,15 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     @Test
     public void test_atOffset() {
         LocalDateTime t = LocalDateTime.of(2008, 6, 30, 11, 30);
-        assertEquals(t.atOffset(OFFSET_PTWO), OffsetDateTime.of(LocalDateTime.of(2008, 6, 30, 11, 30), OFFSET_PTWO));
+        assertEquals(OffsetDateTime.of(LocalDateTime.of(2008, 6, 30, 11, 30), OFFSET_PTWO), t.atOffset(OFFSET_PTWO));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_atOffset_nullZoneOffset() {
-        LocalDateTime t = LocalDateTime.of(2008, 6, 30, 11, 30);
-        t.atOffset((ZoneOffset) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            LocalDateTime t = LocalDateTime.of(2008, 6, 30, 11, 30);
+            t.atOffset((ZoneOffset) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -2966,34 +2998,33 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     @Test
     public void test_atZone() {
         LocalDateTime t = LocalDateTime.of(2008, 6, 30, 11, 30);
-        assertEquals(t.atZone(ZONE_PARIS),
-                ZonedDateTime.of(LocalDateTime.of(2008, 6, 30, 11, 30), ZONE_PARIS));
+        assertEquals(ZonedDateTime.of(LocalDateTime.of(2008, 6, 30, 11, 30), ZONE_PARIS), t.atZone(ZONE_PARIS));
     }
 
     @Test
     public void test_atZone_Offset() {
         LocalDateTime t = LocalDateTime.of(2008, 6, 30, 11, 30);
-        assertEquals(t.atZone(OFFSET_PTWO), ZonedDateTime.of(LocalDateTime.of(2008, 6, 30, 11, 30), OFFSET_PTWO));
+        assertEquals(ZonedDateTime.of(LocalDateTime.of(2008, 6, 30, 11, 30), OFFSET_PTWO), t.atZone(OFFSET_PTWO));
     }
 
     @Test
     public void test_atZone_dstGap() {
         LocalDateTime t = LocalDateTime.of(2007, 4, 1, 0, 0);
-        assertEquals(t.atZone(ZONE_GAZA),
-                ZonedDateTime.of(LocalDateTime.of(2007, 4, 1, 1, 0), ZONE_GAZA));
+        assertEquals(ZonedDateTime.of(LocalDateTime.of(2007, 4, 1, 1, 0), ZONE_GAZA), t.atZone(ZONE_GAZA));
     }
 
     @Test
     public void test_atZone_dstOverlap() {
         LocalDateTime t = LocalDateTime.of(2007, 10, 28, 2, 30);
-        assertEquals(t.atZone(ZONE_PARIS),
-                ZonedDateTime.ofStrict(LocalDateTime.of(2007, 10, 28, 2, 30), OFFSET_PTWO, ZONE_PARIS));
+        assertEquals(ZonedDateTime.ofStrict(LocalDateTime.of(2007, 10, 28, 2, 30), OFFSET_PTWO, ZONE_PARIS), t.atZone(ZONE_PARIS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_atZone_nullTimeZone() {
-        LocalDateTime t = LocalDateTime.of(2008, 6, 30, 11, 30);
-        t.atZone((ZoneId) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            LocalDateTime t = LocalDateTime.of(2008, 6, 30, 11, 30);
+            t.atZone((ZoneId) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -3005,7 +3036,7 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
             ZoneOffset offset = ZoneOffset.ofHours(i);
             for (int j = 0; j < 100000; j++) {
                 LocalDateTime a = LocalDateTime.of(1970, 1, 1, 0, 0).plusSeconds(j);
-                assertEquals(a.toEpochSecond(offset), j - i * 3600);
+                assertEquals(j - i * 3600, a.toEpochSecond(offset));
             }
         }
     }
@@ -3014,7 +3045,7 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     public void test_toEpochSecond_beforeEpoch() {
         for (int i = 0; i < 100000; i++) {
             LocalDateTime a = LocalDateTime.of(1970, 1, 1, 0, 0).minusSeconds(i);
-            assertEquals(a.toEpochSecond(ZoneOffset.UTC), -i);
+            assertEquals(-i, a.toEpochSecond(ZoneOffset.UTC));
         }
     }
 
@@ -3084,50 +3115,51 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
                 LocalDateTime b = localDateTimes[j];
                 if (i < j) {
                     assertTrue(a.compareTo(b) < 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), true, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(true, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else if (i > j) {
                     assertTrue(a.compareTo(b) > 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), true, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(true, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else {
-                    assertEquals(a.compareTo(b), 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), true, a + " <=> " + b);
+                    assertEquals(0, a.compareTo(b), a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(true, a.equals(b), a + " <=> " + b);
                 }
             }
         }
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_compareTo_ObjectNull() {
-        TEST_2007_07_15_12_30_40_987654321.compareTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15_12_30_40_987654321.compareTo(null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isBefore_ObjectNull() {
-        TEST_2007_07_15_12_30_40_987654321.isBefore(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15_12_30_40_987654321.isBefore(null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isAfter_ObjectNull() {
-        TEST_2007_07_15_12_30_40_987654321.isAfter(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2007_07_15_12_30_40_987654321.isAfter(null));
     }
 
-    @Test(expectedExceptions=ClassCastException.class)
     @SuppressWarnings({"unchecked", "rawtypes"})
+    @Test
     public void compareToNonLocalDateTime() {
-       Comparable c = TEST_2007_07_15_12_30_40_987654321;
-       c.compareTo(new Object());
+       Assertions.assertThrows(ClassCastException.class, () -> {
+           Comparable c = TEST_2007_07_15_12_30_40_987654321;
+           c.compareTo(new Object());
+        });
     }
 
     //-----------------------------------------------------------------------
     // equals()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleDateTimes")
     Iterator<Object[]> provider_sampleDateTimes() {
         return new Iterator<Object[]>() {
             Object[][] sampleDates = provider_sampleDates();
@@ -3162,56 +3194,64 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleDateTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDateTimes")
     public void test_equals_true(int y, int m, int d, int h, int mi, int s, int n) {
         LocalDateTime a = LocalDateTime.of(y, m, d, h, mi, s, n);
         LocalDateTime b = LocalDateTime.of(y, m, d, h, mi, s, n);
         assertTrue(a.equals(b));
     }
 
-    @Test(dataProvider="sampleDateTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDateTimes")
     public void test_equals_false_year_differs(int y, int m, int d, int h, int mi, int s, int n) {
         LocalDateTime a = LocalDateTime.of(y, m, d, h, mi, s, n);
         LocalDateTime b = LocalDateTime.of(y + 1, m, d, h, mi, s, n);
         assertFalse(a.equals(b));
     }
 
-    @Test(dataProvider="sampleDateTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDateTimes")
     public void test_equals_false_month_differs(int y, int m, int d, int h, int mi, int s, int n) {
         LocalDateTime a = LocalDateTime.of(y, m, d, h, mi, s, n);
         LocalDateTime b = LocalDateTime.of(y, m + 1, d, h, mi, s, n);
         assertFalse(a.equals(b));
     }
 
-    @Test(dataProvider="sampleDateTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDateTimes")
     public void test_equals_false_day_differs(int y, int m, int d, int h, int mi, int s, int n) {
         LocalDateTime a = LocalDateTime.of(y, m, d, h, mi, s, n);
         LocalDateTime b = LocalDateTime.of(y, m, d + 1, h, mi, s, n);
         assertFalse(a.equals(b));
     }
 
-    @Test(dataProvider="sampleDateTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDateTimes")
     public void test_equals_false_hour_differs(int y, int m, int d, int h, int mi, int s, int n) {
         LocalDateTime a = LocalDateTime.of(y, m, d, h, mi, s, n);
         LocalDateTime b = LocalDateTime.of(y, m, d, h + 1, mi, s, n);
         assertFalse(a.equals(b));
     }
 
-    @Test(dataProvider="sampleDateTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDateTimes")
     public void test_equals_false_minute_differs(int y, int m, int d, int h, int mi, int s, int n) {
         LocalDateTime a = LocalDateTime.of(y, m, d, h, mi, s, n);
         LocalDateTime b = LocalDateTime.of(y, m, d, h, mi + 1, s, n);
         assertFalse(a.equals(b));
     }
 
-    @Test(dataProvider="sampleDateTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDateTimes")
     public void test_equals_false_second_differs(int y, int m, int d, int h, int mi, int s, int n) {
         LocalDateTime a = LocalDateTime.of(y, m, d, h, mi, s, n);
         LocalDateTime b = LocalDateTime.of(y, m, d, h, mi, s + 1, n);
         assertFalse(a.equals(b));
     }
 
-    @Test(dataProvider="sampleDateTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDateTimes")
     public void test_equals_false_nano_differs(int y, int m, int d, int h, int mi, int s, int n) {
         LocalDateTime a = LocalDateTime.of(y, m, d, h, mi, s, n);
         LocalDateTime b = LocalDateTime.of(y, m, d, h, mi, s, n + 1);
@@ -3220,34 +3260,34 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
 
     @Test
     public void test_equals_itself_true() {
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.equals(TEST_2007_07_15_12_30_40_987654321), true);
+        assertEquals(true, TEST_2007_07_15_12_30_40_987654321.equals(TEST_2007_07_15_12_30_40_987654321));
     }
 
     @Test
     public void test_equals_string_false() {
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.equals("2007-07-15T12:30:40.987654321"), false);
+        assertEquals(false, TEST_2007_07_15_12_30_40_987654321.equals("2007-07-15T12:30:40.987654321"));
     }
 
     @Test
     public void test_equals_null_false() {
-        assertEquals(TEST_2007_07_15_12_30_40_987654321.equals(null), false);
+        assertEquals(false, TEST_2007_07_15_12_30_40_987654321.equals(null));
     }
 
     //-----------------------------------------------------------------------
     // hashCode()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleDateTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDateTimes")
     public void test_hashCode(int y, int m, int d, int h, int mi, int s, int n) {
         LocalDateTime a = LocalDateTime.of(y, m, d, h, mi, s, n);
         assertEquals(a.hashCode(), a.hashCode());
         LocalDateTime b = LocalDateTime.of(y, m, d, h, mi, s, n);
-        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(b.hashCode(), a.hashCode());
     }
 
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleToString")
     Object[][] provider_sampleToString() {
         return new Object[][] {
             {2008, 7, 5, 2, 1, 0, 0, "2008-07-05T02:01"},
@@ -3258,11 +3298,12 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleToString")
+    @ParameterizedTest
+    @MethodSource("provider_sampleToString")
     public void test_toString(int y, int m, int d, int h, int mi, int s, int n, String expected) {
         LocalDateTime t = LocalDateTime.of(y, m, d, h, mi, s, n);
         String str = t.toString();
-        assertEquals(str, expected);
+        assertEquals(expected, str);
     }
 
     private LocalDateTime dtNoon(int year, int month, int day) {
diff --git a/test/jdk/java/time/tck/java/time/TCKLocalTime.java b/test/jdk/java/time/tck/java/time/TCKLocalTime.java
index 06f21613b04..bdec611ad76 100644
--- a/test/jdk/java/time/tck/java/time/TCKLocalTime.java
+++ b/test/jdk/java/time/tck/java/time/TCKLocalTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,11 +86,12 @@ import static java.time.temporal.ChronoUnit.NANOS;
 import static java.time.temporal.ChronoUnit.SECONDS;
 import static java.time.temporal.ChronoUnit.WEEKS;
 import static java.time.temporal.ChronoUnit.YEARS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.Clock;
 import java.time.DateTimeException;
@@ -127,14 +128,17 @@ import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.List;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test LocalTime.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKLocalTime extends AbstractDateTimeTest {
 
     private static final ZoneOffset OFFSET_PTWO = ZoneOffset.ofHours(2);
@@ -149,7 +153,7 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         INVALID_UNITS = set.toArray(new TemporalUnit[set.size()]);
     }
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_12_30_40_987654321 = LocalTime.of(12, 30, 40, 987654321);
     }
@@ -196,13 +200,13 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
 
     private void check(LocalTime test, int h, int m, int s, int n) {
-        assertEquals(test.getHour(), h);
-        assertEquals(test.getMinute(), m);
-        assertEquals(test.getSecond(), s);
-        assertEquals(test.getNano(), n);
+        assertEquals(h, test.getHour());
+        assertEquals(m, test.getMinute());
+        assertEquals(s, test.getSecond());
+        assertEquals(n, test.getNano());
         assertEquals(test, test);
         assertEquals(test.hashCode(), test.hashCode());
-        assertEquals(LocalTime.of(h, m, s, n), test);
+        assertEquals(test, LocalTime.of(h, m, s, n));
     }
 
     //-----------------------------------------------------------------------
@@ -231,9 +235,9 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // now(ZoneId)
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_ZoneId_nullZoneId() {
-        LocalTime.now((ZoneId) null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalTime.now((ZoneId) null));
     }
 
     @Test
@@ -241,16 +245,15 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         ZoneId zone = ZoneId.of("UTC+01:02:03");
         LocalTime expected = LocalTime.now(Clock.system(zone));
         LocalTime test = LocalTime.now(zone);
-        assertEquals(Duration.between(expected, test).truncatedTo(ChronoUnit.SECONDS),
-                Duration.ZERO);
+        assertEquals(Duration.ZERO, Duration.between(expected, test).truncatedTo(ChronoUnit.SECONDS));
     }
 
     //-----------------------------------------------------------------------
     // now(Clock)
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_Clock_nullClock() {
-        LocalTime.now((Clock) null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalTime.now((Clock) null));
     }
 
     @Test
@@ -259,10 +262,10 @@ public class TCKLocalTime extends AbstractDateTimeTest {
             Instant instant = Instant.ofEpochSecond(i, 8);
             Clock clock = Clock.fixed(instant, ZoneOffset.UTC);
             LocalTime test = LocalTime.now(clock);
-            assertEquals(test.getHour(), (i / (60 * 60)) % 24);
-            assertEquals(test.getMinute(), (i / 60) % 60);
-            assertEquals(test.getSecond(), i % 60);
-            assertEquals(test.getNano(), 8);
+            assertEquals((i / (60 * 60)) % 24, test.getHour());
+            assertEquals((i / 60) % 60, test.getMinute());
+            assertEquals(i % 60, test.getSecond());
+            assertEquals(8, test.getNano());
         }
     }
 
@@ -272,10 +275,10 @@ public class TCKLocalTime extends AbstractDateTimeTest {
             Instant instant = Instant.ofEpochSecond(i, 8);
             Clock clock = Clock.fixed(instant, ZoneOffset.UTC);
             LocalTime test = LocalTime.now(clock);
-            assertEquals(test.getHour(), ((i + 24 * 60 * 60) / (60 * 60)) % 24);
-            assertEquals(test.getMinute(), ((i + 24 * 60 * 60) / 60) % 60);
-            assertEquals(test.getSecond(), (i + 24 * 60 * 60) % 60);
-            assertEquals(test.getNano(), 8);
+            assertEquals(((i + 24 * 60 * 60) / (60 * 60)) % 24, test.getHour());
+            assertEquals(((i + 24 * 60 * 60) / 60) % 60, test.getMinute());
+            assertEquals((i + 24 * 60 * 60) % 60, test.getSecond());
+            assertEquals(8, test.getNano());
         }
     }
 
@@ -284,20 +287,20 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void now_Clock_max() {
         Clock clock = Clock.fixed(Instant.MAX, ZoneOffset.UTC);
         LocalTime test = LocalTime.now(clock);
-        assertEquals(test.getHour(), 23);
-        assertEquals(test.getMinute(), 59);
-        assertEquals(test.getSecond(), 59);
-        assertEquals(test.getNano(), 999_999_999);
+        assertEquals(23, test.getHour());
+        assertEquals(59, test.getMinute());
+        assertEquals(59, test.getSecond());
+        assertEquals(999_999_999, test.getNano());
     }
 
     @Test
     public void now_Clock_min() {
         Clock clock = Clock.fixed(Instant.MIN, ZoneOffset.UTC);
         LocalTime test = LocalTime.now(clock);
-        assertEquals(test.getHour(), 0);
-        assertEquals(test.getMinute(), 0);
-        assertEquals(test.getSecond(), 0);
-        assertEquals(test.getNano(), 0);
+        assertEquals(0, test.getHour());
+        assertEquals(0, test.getMinute());
+        assertEquals(0, test.getSecond());
+        assertEquals(0, test.getNano());
     }
 
     //-----------------------------------------------------------------------
@@ -309,24 +312,24 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         check(test, 12, 30, 0, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_2ints_hourTooLow() {
-        LocalTime.of(-1, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(-1, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_2ints_hourTooHigh() {
-        LocalTime.of(24, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(24, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_2ints_minuteTooLow() {
-        LocalTime.of(0, -1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(0, -1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_2ints_minuteTooHigh() {
-        LocalTime.of(0, 60);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(0, 60));
     }
 
     //-----------------------------------------------------------------------
@@ -336,34 +339,34 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         check(test, 12, 30, 40, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_3ints_hourTooLow() {
-        LocalTime.of(-1, 0, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(-1, 0, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_3ints_hourTooHigh() {
-        LocalTime.of(24, 0, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(24, 0, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_3ints_minuteTooLow() {
-        LocalTime.of(0, -1, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(0, -1, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_3ints_minuteTooHigh() {
-        LocalTime.of(0, 60, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(0, 60, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_3ints_secondTooLow() {
-        LocalTime.of(0, 0, -1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(0, 0, -1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_3ints_secondTooHigh() {
-        LocalTime.of(0, 0, 60);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(0, 0, 60));
     }
 
     //-----------------------------------------------------------------------
@@ -375,50 +378,49 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         check(test, 12, 0, 40, 987654321);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_4ints_hourTooLow() {
-        LocalTime.of(-1, 0, 0, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(-1, 0, 0, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_4ints_hourTooHigh() {
-        LocalTime.of(24, 0, 0, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(24, 0, 0, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_4ints_minuteTooLow() {
-        LocalTime.of(0, -1, 0, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(0, -1, 0, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_4ints_minuteTooHigh() {
-        LocalTime.of(0, 60, 0, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(0, 60, 0, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_4ints_secondTooLow() {
-        LocalTime.of(0, 0, -1, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(0, 0, -1, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_4ints_secondTooHigh() {
-        LocalTime.of(0, 0, 60, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(0, 0, 60, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_4ints_nanoTooLow() {
-        LocalTime.of(0, 0, 0, -1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(0, 0, 0, -1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_time_4ints_nanoTooHigh() {
-        LocalTime.of(0, 0, 0, 1000000000);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.of(0, 0, 0, 1000000000));
     }
 
      //-----------------------------------------------------------------------
      // ofInstant()
      //-----------------------------------------------------------------------
-     @DataProvider(name="instantFactory")
      Object[][] data_instantFactory() {
          return new Object[][] {
                  {Instant.ofEpochSecond(86400 + 3600 + 120 + 4, 500), ZONE_PARIS, LocalTime.of(2, 2, 4, 500)},
@@ -431,20 +433,21 @@ public class TCKLocalTime extends AbstractDateTimeTest {
          };
      }
 
-     @Test(dataProvider="instantFactory")
+     @ParameterizedTest
+    @MethodSource("data_instantFactory")
      public void factory_ofInstant(Instant instant, ZoneId zone, LocalTime expected) {
          LocalTime test = LocalTime.ofInstant(instant, zone);
-         assertEquals(test, expected);
+         assertEquals(expected, test);
      }
 
-     @Test(expectedExceptions=NullPointerException.class)
+     @Test
      public void factory_ofInstant_nullInstant() {
-         LocalTime.ofInstant((Instant) null, ZONE_PARIS);
+         Assertions.assertThrows(NullPointerException.class, () -> LocalTime.ofInstant((Instant) null, ZONE_PARIS));
      }
 
-     @Test(expectedExceptions=NullPointerException.class)
+     @Test
      public void factory_ofInstant_nullZone() {
-         LocalTime.ofInstant(Instant.EPOCH, (ZoneId) null);
+         Assertions.assertThrows(NullPointerException.class, () -> LocalTime.ofInstant(Instant.EPOCH, (ZoneId) null));
      }
 
     //-----------------------------------------------------------------------
@@ -456,14 +459,14 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         check(localTime, 2, 17, 23, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofSecondOfDay_tooLow() {
-        LocalTime.ofSecondOfDay(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.ofSecondOfDay(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofSecondOfDay_tooHigh() {
-        LocalTime.ofSecondOfDay(24 * 60 * 60);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.ofSecondOfDay(24 * 60 * 60));
     }
 
     //-----------------------------------------------------------------------
@@ -475,14 +478,14 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         check(localTime, 1, 0, 0, 17);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofNanoOfDay_tooLow() {
-        LocalTime.ofNanoOfDay(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.ofNanoOfDay(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofNanoOfDay_tooHigh() {
-        LocalTime.ofNanoOfDay(24 * 60 * 60 * 1000000000L);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.ofNanoOfDay(24 * 60 * 60 * 1000000000L));
     }
 
     //-----------------------------------------------------------------------
@@ -490,34 +493,34 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void factory_from_TemporalAccessor() {
-        assertEquals(LocalTime.from(LocalTime.of(17, 30)), LocalTime.of(17, 30));
-        assertEquals(LocalTime.from(LocalDateTime.of(2012, 5, 1, 17, 30)), LocalTime.of(17, 30));
+        assertEquals(LocalTime.of(17, 30), LocalTime.from(LocalTime.of(17, 30)));
+        assertEquals(LocalTime.of(17, 30), LocalTime.from(LocalDateTime.of(2012, 5, 1, 17, 30)));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_from_TemporalAccessor_invalid_noDerive() {
-        LocalTime.from(LocalDate.of(2007, 7, 15));
+        Assertions.assertThrows(DateTimeException.class, () -> LocalTime.from(LocalDate.of(2007, 7, 15)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_from_TemporalAccessor_null() {
-        LocalTime.from((TemporalAccessor) null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalTime.from((TemporalAccessor) null));
     }
 
     //-----------------------------------------------------------------------
     // parse()
     //-----------------------------------------------------------------------
-    @Test(dataProvider = "sampleToString")
+    @ParameterizedTest
+    @MethodSource("provider_sampleToString")
     public void factory_parse_validText(int h, int m, int s, int n, String parsable) {
         LocalTime t = LocalTime.parse(parsable);
         assertNotNull(t, parsable);
-        assertEquals(t.getHour(), h);
-        assertEquals(t.getMinute(), m);
-        assertEquals(t.getSecond(), s);
-        assertEquals(t.getNano(), n);
+        assertEquals(h, t.getHour());
+        assertEquals(m, t.getMinute());
+        assertEquals(s, t.getSecond());
+        assertEquals(n, t.getNano());
     }
 
-    @DataProvider(name="sampleBadParse")
     Object[][] provider_sampleBadParse() {
         return new Object[][]{
                 {"00;00"},
@@ -532,31 +535,32 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider = "sampleBadParse", expectedExceptions={DateTimeParseException.class})
+    @ParameterizedTest
+    @MethodSource("provider_sampleBadParse")
     public void factory_parse_invalidText(String unparsable) {
-        LocalTime.parse(unparsable);
+        Assertions.assertThrows(DateTimeParseException.class, () -> LocalTime.parse(unparsable));
     }
 
     //-----------------------------------------------------------------------s
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_illegalHour() {
-        LocalTime.parse("25:00");
+        Assertions.assertThrows(DateTimeParseException.class, () -> LocalTime.parse("25:00"));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_illegalMinute() {
-        LocalTime.parse("12:60");
+        Assertions.assertThrows(DateTimeParseException.class, () -> LocalTime.parse("12:60"));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_illegalSecond() {
-        LocalTime.parse("12:12:60");
+        Assertions.assertThrows(DateTimeParseException.class, () -> LocalTime.parse("12:12:60"));
     }
 
     //-----------------------------------------------------------------------s
-    @Test(expectedExceptions = {NullPointerException.class})
+    @Test
     public void factory_parse_nullTest() {
-        LocalTime.parse((String) null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalTime.parse((String) null));
     }
 
     //-----------------------------------------------------------------------
@@ -566,18 +570,20 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void factory_parse_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("H m s");
         LocalTime test = LocalTime.parse("14 30 40", f);
-        assertEquals(test, LocalTime.of(14, 30, 40));
+        assertEquals(LocalTime.of(14, 30, 40), test);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullText() {
-        DateTimeFormatter f = DateTimeFormatter.ofPattern("H m s");
-        LocalTime.parse((String) null, f);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter f = DateTimeFormatter.ofPattern("H m s");
+            LocalTime.parse((String) null, f);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullFormatter() {
-        LocalTime.parse("ANY", null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalTime.parse("ANY", null));
     }
 
     //-----------------------------------------------------------------------
@@ -585,37 +591,37 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalField() {
-        assertEquals(TEST_12_30_40_987654321.isSupported((TemporalField) null), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.NANO_OF_SECOND), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.NANO_OF_DAY), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.MICRO_OF_SECOND), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.MICRO_OF_DAY), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.MILLI_OF_SECOND), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.MILLI_OF_DAY), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.SECOND_OF_MINUTE), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.SECOND_OF_DAY), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.MINUTE_OF_HOUR), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.MINUTE_OF_DAY), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.HOUR_OF_AMPM), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.HOUR_OF_DAY), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.AMPM_OF_DAY), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.DAY_OF_WEEK), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.DAY_OF_MONTH), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.DAY_OF_YEAR), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.EPOCH_DAY), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.MONTH_OF_YEAR), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.PROLEPTIC_MONTH), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.YEAR), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.YEAR_OF_ERA), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.ERA), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.INSTANT_SECONDS), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.OFFSET_SECONDS), false);
+        assertEquals(false, TEST_12_30_40_987654321.isSupported((TemporalField) null));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoField.NANO_OF_SECOND));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoField.NANO_OF_DAY));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoField.MICRO_OF_SECOND));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoField.MICRO_OF_DAY));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoField.MILLI_OF_SECOND));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoField.MILLI_OF_DAY));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoField.SECOND_OF_DAY));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoField.MINUTE_OF_DAY));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoField.HOUR_OF_AMPM));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoField.HOUR_OF_DAY));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoField.CLOCK_HOUR_OF_DAY));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoField.AMPM_OF_DAY));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoField.DAY_OF_WEEK));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoField.DAY_OF_MONTH));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoField.DAY_OF_YEAR));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoField.EPOCH_DAY));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoField.MONTH_OF_YEAR));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoField.PROLEPTIC_MONTH));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoField.YEAR));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoField.YEAR_OF_ERA));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoField.ERA));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoField.INSTANT_SECONDS));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoField.OFFSET_SECONDS));
     }
 
     //-----------------------------------------------------------------------
@@ -623,23 +629,23 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalUnit() {
-        assertEquals(TEST_12_30_40_987654321.isSupported((TemporalUnit) null), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.NANOS), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.MICROS), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.MILLIS), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.SECONDS), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.MINUTES), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.HOURS), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.HALF_DAYS), true);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.DAYS), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.WEEKS), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.MONTHS), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.YEARS), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.DECADES), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.CENTURIES), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.MILLENNIA), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.ERAS), false);
-        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.FOREVER), false);
+        assertEquals(false, TEST_12_30_40_987654321.isSupported((TemporalUnit) null));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoUnit.NANOS));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoUnit.MICROS));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoUnit.MILLIS));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoUnit.SECONDS));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoUnit.MINUTES));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoUnit.HOURS));
+        assertEquals(true, TEST_12_30_40_987654321.isSupported(ChronoUnit.HALF_DAYS));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoUnit.DAYS));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoUnit.WEEKS));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoUnit.MONTHS));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoUnit.YEARS));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoUnit.DECADES));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoUnit.CENTURIES));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoUnit.MILLENNIA));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoUnit.ERAS));
+        assertEquals(false, TEST_12_30_40_987654321.isSupported(ChronoUnit.FOREVER));
     }
 
     //-----------------------------------------------------------------------
@@ -648,39 +654,38 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     @Test
     public void test_get_TemporalField() {
         LocalTime test = TEST_12_30_40_987654321;
-        assertEquals(test.get(ChronoField.HOUR_OF_DAY), 12);
-        assertEquals(test.get(ChronoField.MINUTE_OF_HOUR), 30);
-        assertEquals(test.get(ChronoField.SECOND_OF_MINUTE), 40);
-        assertEquals(test.get(ChronoField.NANO_OF_SECOND), 987654321);
+        assertEquals(12, test.get(ChronoField.HOUR_OF_DAY));
+        assertEquals(30, test.get(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(40, test.get(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(987654321, test.get(ChronoField.NANO_OF_SECOND));
 
-        assertEquals(test.get(ChronoField.SECOND_OF_DAY), 12 * 3600 + 30 * 60 + 40);
-        assertEquals(test.get(ChronoField.MINUTE_OF_DAY), 12 * 60 + 30);
-        assertEquals(test.get(ChronoField.HOUR_OF_AMPM), 0);
-        assertEquals(test.get(ChronoField.CLOCK_HOUR_OF_AMPM), 12);
-        assertEquals(test.get(ChronoField.CLOCK_HOUR_OF_DAY), 12);
-        assertEquals(test.get(ChronoField.AMPM_OF_DAY), 1);
+        assertEquals(12 * 3600 + 30 * 60 + 40, test.get(ChronoField.SECOND_OF_DAY));
+        assertEquals(12 * 60 + 30, test.get(ChronoField.MINUTE_OF_DAY));
+        assertEquals(0, test.get(ChronoField.HOUR_OF_AMPM));
+        assertEquals(12, test.get(ChronoField.CLOCK_HOUR_OF_AMPM));
+        assertEquals(12, test.get(ChronoField.CLOCK_HOUR_OF_DAY));
+        assertEquals(1, test.get(ChronoField.AMPM_OF_DAY));
     }
 
     @Test
     public void test_getLong_TemporalField() {
         LocalTime test = TEST_12_30_40_987654321;
-        assertEquals(test.getLong(ChronoField.HOUR_OF_DAY), 12);
-        assertEquals(test.getLong(ChronoField.MINUTE_OF_HOUR), 30);
-        assertEquals(test.getLong(ChronoField.SECOND_OF_MINUTE), 40);
-        assertEquals(test.getLong(ChronoField.NANO_OF_SECOND), 987654321);
+        assertEquals(12, test.getLong(ChronoField.HOUR_OF_DAY));
+        assertEquals(30, test.getLong(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(40, test.getLong(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(987654321, test.getLong(ChronoField.NANO_OF_SECOND));
 
-        assertEquals(test.getLong(ChronoField.SECOND_OF_DAY), 12 * 3600 + 30 * 60 + 40);
-        assertEquals(test.getLong(ChronoField.MINUTE_OF_DAY), 12 * 60 + 30);
-        assertEquals(test.getLong(ChronoField.HOUR_OF_AMPM), 0);
-        assertEquals(test.getLong(ChronoField.CLOCK_HOUR_OF_AMPM), 12);
-        assertEquals(test.getLong(ChronoField.CLOCK_HOUR_OF_DAY), 12);
-        assertEquals(test.getLong(ChronoField.AMPM_OF_DAY), 1);
+        assertEquals(12 * 3600 + 30 * 60 + 40, test.getLong(ChronoField.SECOND_OF_DAY));
+        assertEquals(12 * 60 + 30, test.getLong(ChronoField.MINUTE_OF_DAY));
+        assertEquals(0, test.getLong(ChronoField.HOUR_OF_AMPM));
+        assertEquals(12, test.getLong(ChronoField.CLOCK_HOUR_OF_AMPM));
+        assertEquals(12, test.getLong(ChronoField.CLOCK_HOUR_OF_DAY));
+        assertEquals(1, test.getLong(ChronoField.AMPM_OF_DAY));
     }
 
     //-----------------------------------------------------------------------
     // query(TemporalQuery)
     //-----------------------------------------------------------------------
-    @DataProvider(name="query")
     Object[][] data_query() {
         return new Object[][] {
                 {TEST_12_30_40_987654321, TemporalQueries.chronology(), null},
@@ -693,25 +698,26 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_query(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(temporal.query(query), expected);
+        assertEquals(expected, temporal.query(query));
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_queryFrom(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(query.queryFrom(temporal), expected);
+        assertEquals(expected, query.queryFrom(temporal));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_query_null() {
-        TEST_12_30_40_987654321.query(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12_30_40_987654321.query(null));
     }
 
     //-----------------------------------------------------------------------
     // get*()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleTimes")
     Object[][] provider_sampleTimes() {
         return new Object[][] {
             {0, 0, 0, 0},
@@ -734,19 +740,19 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_get(int h, int m, int s, int ns) {
         LocalTime a = LocalTime.of(h, m, s, ns);
-        assertEquals(a.getHour(), h);
-        assertEquals(a.getMinute(), m);
-        assertEquals(a.getSecond(), s);
-        assertEquals(a.getNano(), ns);
+        assertEquals(h, a.getHour());
+        assertEquals(m, a.getMinute());
+        assertEquals(s, a.getSecond());
+        assertEquals(ns, a.getNano());
     }
 
     //-----------------------------------------------------------------------
     // adjustInto(Temporal)
     //-----------------------------------------------------------------------
-    @DataProvider(name="adjustInto")
     Object[][] data_adjustInto() {
         return new Object[][]{
                 {LocalTime.of(23, 5), LocalTime.of(4, 1, 1, 100), LocalTime.of(23, 5, 0, 0), null},
@@ -772,11 +778,12 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="adjustInto")
+    @ParameterizedTest
+    @MethodSource("data_adjustInto")
     public void test_adjustInto(LocalTime test, Temporal temporal, Temporal expected, Class<?> expectedEx) {
         if (expectedEx == null) {
             Temporal result = test.adjustInto(temporal);
-            assertEquals(result, expected);
+            assertEquals(expected, result);
         } else {
             try {
                 Temporal result = test.adjustInto(temporal);
@@ -799,12 +806,12 @@ public class TCKLocalTime extends AbstractDateTimeTest {
                 return sample;
             }
         };
-        assertEquals(TEST_12_30_40_987654321.with(adjuster), sample);
+        assertEquals(sample, TEST_12_30_40_987654321.with(adjuster));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_with_adjustment_null() {
-        TEST_12_30_40_987654321.with((TemporalAdjuster) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12_30_40_987654321.with((TemporalAdjuster) null));
     }
 
     //-----------------------------------------------------------------------
@@ -830,10 +837,10 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_with_longTemporalField_nanoOfSecond() {
         for (long i : testPoints(1_000_000_000L)) {
             LocalTime test = TEST_12_30_40_987654321.with(NANO_OF_SECOND, i);
-            assertEquals(test.get(NANO_OF_SECOND),  i);
-            assertEquals(test.get(HOUR_OF_DAY), TEST_12_30_40_987654321.get(HOUR_OF_DAY));
-            assertEquals(test.get(MINUTE_OF_HOUR), TEST_12_30_40_987654321.get(MINUTE_OF_HOUR));
-            assertEquals(test.get(SECOND_OF_MINUTE), TEST_12_30_40_987654321.get(SECOND_OF_MINUTE));
+            assertEquals(i, test.get(NANO_OF_SECOND));
+            assertEquals(TEST_12_30_40_987654321.get(HOUR_OF_DAY), test.get(HOUR_OF_DAY));
+            assertEquals(TEST_12_30_40_987654321.get(MINUTE_OF_HOUR), test.get(MINUTE_OF_HOUR));
+            assertEquals(TEST_12_30_40_987654321.get(SECOND_OF_MINUTE), test.get(SECOND_OF_MINUTE));
         }
     }
 
@@ -843,7 +850,7 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_with_longTemporalField_nanoOfDay() {
         for (long i : testPoints(86_400_000_000_000L)) {
             LocalTime test = TEST_12_30_40_987654321.with(NANO_OF_DAY, i);
-            assertEquals(test, LocalTime.ofNanoOfDay(i));
+            assertEquals(LocalTime.ofNanoOfDay(i), test);
         }
     }
 
@@ -854,10 +861,10 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_with_longTemporalField_microOfSecond() {
         for (long i : testPoints(1_000_000L)) {
             LocalTime test = TEST_12_30_40_987654321.with(MICRO_OF_SECOND, i);
-            assertEquals(test.get(NANO_OF_SECOND),  i * 1_000);
-            assertEquals(test.get(HOUR_OF_DAY), TEST_12_30_40_987654321.get(HOUR_OF_DAY));
-            assertEquals(test.get(MINUTE_OF_HOUR), TEST_12_30_40_987654321.get(MINUTE_OF_HOUR));
-            assertEquals(test.get(SECOND_OF_MINUTE), TEST_12_30_40_987654321.get(SECOND_OF_MINUTE));
+            assertEquals(i * 1_000, test.get(NANO_OF_SECOND));
+            assertEquals(TEST_12_30_40_987654321.get(HOUR_OF_DAY), test.get(HOUR_OF_DAY));
+            assertEquals(TEST_12_30_40_987654321.get(MINUTE_OF_HOUR), test.get(MINUTE_OF_HOUR));
+            assertEquals(TEST_12_30_40_987654321.get(SECOND_OF_MINUTE), test.get(SECOND_OF_MINUTE));
         }
     }
 
@@ -868,7 +875,7 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_with_longTemporalField_microOfDay() {
         for (long i : testPoints(86_400_000_000L)) {
             LocalTime test = TEST_12_30_40_987654321.with(MICRO_OF_DAY, i);
-            assertEquals(test, LocalTime.ofNanoOfDay(i * 1000));
+            assertEquals(LocalTime.ofNanoOfDay(i * 1000), test);
         }
     }
 
@@ -879,10 +886,10 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_with_longTemporalField_milliOfSecond() {
         for (long i : testPoints(1_000L)) {
             LocalTime test = TEST_12_30_40_987654321.with(MILLI_OF_SECOND, i);
-            assertEquals(test.get(NANO_OF_SECOND),  i * 1_000_000);
-            assertEquals(test.get(HOUR_OF_DAY), TEST_12_30_40_987654321.get(HOUR_OF_DAY));
-            assertEquals(test.get(MINUTE_OF_HOUR), TEST_12_30_40_987654321.get(MINUTE_OF_HOUR));
-            assertEquals(test.get(SECOND_OF_MINUTE), TEST_12_30_40_987654321.get(SECOND_OF_MINUTE));
+            assertEquals(i * 1_000_000, test.get(NANO_OF_SECOND));
+            assertEquals(TEST_12_30_40_987654321.get(HOUR_OF_DAY), test.get(HOUR_OF_DAY));
+            assertEquals(TEST_12_30_40_987654321.get(MINUTE_OF_HOUR), test.get(MINUTE_OF_HOUR));
+            assertEquals(TEST_12_30_40_987654321.get(SECOND_OF_MINUTE), test.get(SECOND_OF_MINUTE));
         }
     }
 
@@ -893,7 +900,7 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_with_longTemporalField_milliOfDay() {
         for (long i : testPoints(86_400_000L)) {
             LocalTime test = TEST_12_30_40_987654321.with(MILLI_OF_DAY, i);
-            assertEquals(test, LocalTime.ofNanoOfDay(i * 1_000_000));
+            assertEquals(LocalTime.ofNanoOfDay(i * 1_000_000), test);
         }
     }
 
@@ -903,10 +910,10 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_with_longTemporalField_secondOfMinute() {
         for (long i : testPoints(60L)) {
             LocalTime test = TEST_12_30_40_987654321.with(SECOND_OF_MINUTE, i);
-            assertEquals(test.get(SECOND_OF_MINUTE), i);
-            assertEquals(test.get(HOUR_OF_DAY), TEST_12_30_40_987654321.get(HOUR_OF_DAY));
-            assertEquals(test.get(MINUTE_OF_HOUR), TEST_12_30_40_987654321.get(MINUTE_OF_HOUR));
-            assertEquals(test.get(NANO_OF_SECOND), TEST_12_30_40_987654321.get(NANO_OF_SECOND));
+            assertEquals(i, test.get(SECOND_OF_MINUTE));
+            assertEquals(TEST_12_30_40_987654321.get(HOUR_OF_DAY), test.get(HOUR_OF_DAY));
+            assertEquals(TEST_12_30_40_987654321.get(MINUTE_OF_HOUR), test.get(MINUTE_OF_HOUR));
+            assertEquals(TEST_12_30_40_987654321.get(NANO_OF_SECOND), test.get(NANO_OF_SECOND));
         }
     }
 
@@ -916,8 +923,8 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_with_longTemporalField_secondOfDay() {
         for (long i : testPoints(24 * 60 * 60)) {
             LocalTime test = TEST_12_30_40_987654321.with(SECOND_OF_DAY, i);
-            assertEquals(test.get(SECOND_OF_DAY), i);
-            assertEquals(test.get(NANO_OF_SECOND), TEST_12_30_40_987654321.get(NANO_OF_SECOND));
+            assertEquals(i, test.get(SECOND_OF_DAY));
+            assertEquals(TEST_12_30_40_987654321.get(NANO_OF_SECOND), test.get(NANO_OF_SECOND));
         }
     }
 
@@ -927,10 +934,10 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_with_longTemporalField_minuteOfHour() {
         for (long i : testPoints(60)) {
             LocalTime test = TEST_12_30_40_987654321.with(MINUTE_OF_HOUR, i);
-            assertEquals(test.get(MINUTE_OF_HOUR), i);
-            assertEquals(test.get(HOUR_OF_DAY), TEST_12_30_40_987654321.get(HOUR_OF_DAY));
-            assertEquals(test.get(SECOND_OF_MINUTE), TEST_12_30_40_987654321.get(SECOND_OF_MINUTE));
-            assertEquals(test.get(NANO_OF_SECOND), TEST_12_30_40_987654321.get(NANO_OF_SECOND));
+            assertEquals(i, test.get(MINUTE_OF_HOUR));
+            assertEquals(TEST_12_30_40_987654321.get(HOUR_OF_DAY), test.get(HOUR_OF_DAY));
+            assertEquals(TEST_12_30_40_987654321.get(SECOND_OF_MINUTE), test.get(SECOND_OF_MINUTE));
+            assertEquals(TEST_12_30_40_987654321.get(NANO_OF_SECOND), test.get(NANO_OF_SECOND));
         }
     }
 
@@ -940,9 +947,9 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_with_longTemporalField_minuteOfDay() {
         for (long i : testPoints(24 * 60)) {
             LocalTime test = TEST_12_30_40_987654321.with(MINUTE_OF_DAY, i);
-            assertEquals(test.get(MINUTE_OF_DAY), i);
-            assertEquals(test.get(SECOND_OF_MINUTE), TEST_12_30_40_987654321.get(SECOND_OF_MINUTE));
-            assertEquals(test.get(NANO_OF_SECOND), TEST_12_30_40_987654321.get(NANO_OF_SECOND));
+            assertEquals(i, test.get(MINUTE_OF_DAY));
+            assertEquals(TEST_12_30_40_987654321.get(SECOND_OF_MINUTE), test.get(SECOND_OF_MINUTE));
+            assertEquals(TEST_12_30_40_987654321.get(NANO_OF_SECOND), test.get(NANO_OF_SECOND));
         }
     }
 
@@ -952,11 +959,11 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_with_longTemporalField_hourOfAmPm() {
         for (int i = 0; i < 12; i++) {
             LocalTime test = TEST_12_30_40_987654321.with(HOUR_OF_AMPM, i);
-            assertEquals(test.get(HOUR_OF_AMPM), i);
-            assertEquals(test.get(AMPM_OF_DAY), TEST_12_30_40_987654321.get(AMPM_OF_DAY));
-            assertEquals(test.get(MINUTE_OF_HOUR), TEST_12_30_40_987654321.get(MINUTE_OF_HOUR));
-            assertEquals(test.get(SECOND_OF_MINUTE), TEST_12_30_40_987654321.get(SECOND_OF_MINUTE));
-            assertEquals(test.get(NANO_OF_SECOND), TEST_12_30_40_987654321.get(NANO_OF_SECOND));
+            assertEquals(i, test.get(HOUR_OF_AMPM));
+            assertEquals(TEST_12_30_40_987654321.get(AMPM_OF_DAY), test.get(AMPM_OF_DAY));
+            assertEquals(TEST_12_30_40_987654321.get(MINUTE_OF_HOUR), test.get(MINUTE_OF_HOUR));
+            assertEquals(TEST_12_30_40_987654321.get(SECOND_OF_MINUTE), test.get(SECOND_OF_MINUTE));
+            assertEquals(TEST_12_30_40_987654321.get(NANO_OF_SECOND), test.get(NANO_OF_SECOND));
         }
     }
 
@@ -966,11 +973,11 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_with_longTemporalField_clockHourOfAmPm() {
         for (int i = 1; i <= 12; i++) {
             LocalTime test = TEST_12_30_40_987654321.with(CLOCK_HOUR_OF_AMPM, i);
-            assertEquals(test.get(CLOCK_HOUR_OF_AMPM), i);
-            assertEquals(test.get(AMPM_OF_DAY), TEST_12_30_40_987654321.get(AMPM_OF_DAY));
-            assertEquals(test.get(MINUTE_OF_HOUR), TEST_12_30_40_987654321.get(MINUTE_OF_HOUR));
-            assertEquals(test.get(SECOND_OF_MINUTE), TEST_12_30_40_987654321.get(SECOND_OF_MINUTE));
-            assertEquals(test.get(NANO_OF_SECOND), TEST_12_30_40_987654321.get(NANO_OF_SECOND));
+            assertEquals(i, test.get(CLOCK_HOUR_OF_AMPM));
+            assertEquals(TEST_12_30_40_987654321.get(AMPM_OF_DAY), test.get(AMPM_OF_DAY));
+            assertEquals(TEST_12_30_40_987654321.get(MINUTE_OF_HOUR), test.get(MINUTE_OF_HOUR));
+            assertEquals(TEST_12_30_40_987654321.get(SECOND_OF_MINUTE), test.get(SECOND_OF_MINUTE));
+            assertEquals(TEST_12_30_40_987654321.get(NANO_OF_SECOND), test.get(NANO_OF_SECOND));
         }
     }
 
@@ -980,10 +987,10 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_with_longTemporalField_hourOfDay() {
         for (int i = 0; i < 24; i++) {
             LocalTime test = TEST_12_30_40_987654321.with(HOUR_OF_DAY, i);
-            assertEquals(test.get(HOUR_OF_DAY), i);
-            assertEquals(test.get(MINUTE_OF_HOUR), TEST_12_30_40_987654321.get(MINUTE_OF_HOUR));
-            assertEquals(test.get(SECOND_OF_MINUTE), TEST_12_30_40_987654321.get(SECOND_OF_MINUTE));
-            assertEquals(test.get(NANO_OF_SECOND), TEST_12_30_40_987654321.get(NANO_OF_SECOND));
+            assertEquals(i, test.get(HOUR_OF_DAY));
+            assertEquals(TEST_12_30_40_987654321.get(MINUTE_OF_HOUR), test.get(MINUTE_OF_HOUR));
+            assertEquals(TEST_12_30_40_987654321.get(SECOND_OF_MINUTE), test.get(SECOND_OF_MINUTE));
+            assertEquals(TEST_12_30_40_987654321.get(NANO_OF_SECOND), test.get(NANO_OF_SECOND));
         }
     }
 
@@ -993,10 +1000,10 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_with_longTemporalField_clockHourOfDay() {
         for (int i = 1; i <= 24; i++) {
             LocalTime test = TEST_12_30_40_987654321.with(CLOCK_HOUR_OF_DAY, i);
-            assertEquals(test.get(CLOCK_HOUR_OF_DAY), i);
-            assertEquals(test.get(MINUTE_OF_HOUR), TEST_12_30_40_987654321.get(MINUTE_OF_HOUR));
-            assertEquals(test.get(SECOND_OF_MINUTE), TEST_12_30_40_987654321.get(SECOND_OF_MINUTE));
-            assertEquals(test.get(NANO_OF_SECOND), TEST_12_30_40_987654321.get(NANO_OF_SECOND));
+            assertEquals(i, test.get(CLOCK_HOUR_OF_DAY));
+            assertEquals(TEST_12_30_40_987654321.get(MINUTE_OF_HOUR), test.get(MINUTE_OF_HOUR));
+            assertEquals(TEST_12_30_40_987654321.get(SECOND_OF_MINUTE), test.get(SECOND_OF_MINUTE));
+            assertEquals(TEST_12_30_40_987654321.get(NANO_OF_SECOND), test.get(NANO_OF_SECOND));
         }
     }
 
@@ -1006,18 +1013,17 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_with_longTemporalField_amPmOfDay() {
         for (int i = 0; i <= 1; i++) {
             LocalTime test = TEST_12_30_40_987654321.with(AMPM_OF_DAY, i);
-            assertEquals(test.get(AMPM_OF_DAY), i);
-            assertEquals(test.get(HOUR_OF_AMPM), TEST_12_30_40_987654321.get(HOUR_OF_AMPM));
-            assertEquals(test.get(MINUTE_OF_HOUR), TEST_12_30_40_987654321.get(MINUTE_OF_HOUR));
-            assertEquals(test.get(SECOND_OF_MINUTE), TEST_12_30_40_987654321.get(SECOND_OF_MINUTE));
-            assertEquals(test.get(NANO_OF_SECOND), TEST_12_30_40_987654321.get(NANO_OF_SECOND));
+            assertEquals(i, test.get(AMPM_OF_DAY));
+            assertEquals(TEST_12_30_40_987654321.get(HOUR_OF_AMPM), test.get(HOUR_OF_AMPM));
+            assertEquals(TEST_12_30_40_987654321.get(MINUTE_OF_HOUR), test.get(MINUTE_OF_HOUR));
+            assertEquals(TEST_12_30_40_987654321.get(SECOND_OF_MINUTE), test.get(SECOND_OF_MINUTE));
+            assertEquals(TEST_12_30_40_987654321.get(NANO_OF_SECOND), test.get(NANO_OF_SECOND));
         }
     }
 
     // The supported fields behave as follows...
     // In all cases, if the new value is outside the valid range of values for the field
     // then a {@code DateTimeException} will be thrown.
-    @DataProvider(name = "withTemporalField_outOfRange")
     Object[][] data_withTemporalField_outOfRange() {
         return new Object[][] {
                 {NANO_OF_SECOND, time(0, 0, 0, 0), NANO_OF_SECOND.range().getMinimum() - 1},
@@ -1067,7 +1073,8 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider = "withTemporalField_outOfRange")
+    @ParameterizedTest
+    @MethodSource("data_withTemporalField_outOfRange")
     public void test_with_longTemporalField_invalid(TemporalField field, LocalTime base, long newValue) {
         try {
             base.with(field, newValue);
@@ -1078,9 +1085,9 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     }
 
     // All other {@code ChronoField} instances will throw an {@code UnsupportedTemporalTypeException}.
-    @Test(expectedExceptions=UnsupportedTemporalTypeException.class)
+    @Test
     public void test_with_longTemporalField_otherChronoField() {
-        TEST_12_30_40_987654321.with(ChronoField.DAY_OF_MONTH, 1);
+        Assertions.assertThrows(UnsupportedTemporalTypeException.class, () -> TEST_12_30_40_987654321.with(ChronoField.DAY_OF_MONTH, 1));
     }
 
     // If the field is not a {@code ChronoField}, then the result of this method
@@ -1116,8 +1123,8 @@ public class TCKLocalTime extends AbstractDateTimeTest {
                 throw new UnsupportedOperationException();
             }
             public <R extends Temporal> R adjustInto(R temporal, long newValue) {
-                assertEquals(temporal, base);
-                assertEquals(newValue, 12L);
+                assertEquals(base, temporal);
+                assertEquals(12L, newValue);
                 @SuppressWarnings("unchecked")
                 R r = (R) result;
                 return r;
@@ -1127,9 +1134,9 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         assertSame(test, result);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_with_longTemporalField_null() {
-        TEST_12_30_40_987654321.with((TemporalField) null, 1);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12_30_40_987654321.with((TemporalField) null, 1));
     }
 
     //-----------------------------------------------------------------------
@@ -1140,36 +1147,36 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         LocalTime t = TEST_12_30_40_987654321;
         for (int i = 0; i < 24; i++) {
             t = t.withHour(i);
-            assertEquals(t.getHour(), i);
+            assertEquals(i, t.getHour());
         }
     }
 
     @Test
     public void test_withHour_noChange_equal() {
         LocalTime t = TEST_12_30_40_987654321.withHour(12);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_withHour_toMidnight_equal() {
         LocalTime t = LocalTime.of(1, 0).withHour(0);
-        assertEquals(t, LocalTime.MIDNIGHT);
+        assertEquals(LocalTime.MIDNIGHT, t);
     }
 
     @Test
     public void test_withHour_toMidday_equal() {
         LocalTime t = LocalTime.of(1, 0).withHour(12);
-        assertEquals(t, LocalTime.NOON);
+        assertEquals(LocalTime.NOON, t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withHour_hourTooLow() {
-        TEST_12_30_40_987654321.withHour(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_12_30_40_987654321.withHour(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withHour_hourTooHigh() {
-        TEST_12_30_40_987654321.withHour(24);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_12_30_40_987654321.withHour(24));
     }
 
     //-----------------------------------------------------------------------
@@ -1180,36 +1187,36 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         LocalTime t = TEST_12_30_40_987654321;
         for (int i = 0; i < 60; i++) {
             t = t.withMinute(i);
-            assertEquals(t.getMinute(), i);
+            assertEquals(i, t.getMinute());
         }
     }
 
     @Test
     public void test_withMinute_noChange_equal() {
         LocalTime t = TEST_12_30_40_987654321.withMinute(30);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_withMinute_toMidnight_equal() {
         LocalTime t = LocalTime.of(0, 1).withMinute(0);
-        assertEquals(t, LocalTime.MIDNIGHT);
+        assertEquals(LocalTime.MIDNIGHT, t);
     }
 
     @Test
     public void test_withMinute_toMidday_equals() {
         LocalTime t = LocalTime.of(12, 1).withMinute(0);
-        assertEquals(t, LocalTime.NOON);
+        assertEquals(LocalTime.NOON, t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withMinute_minuteTooLow() {
-        TEST_12_30_40_987654321.withMinute(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_12_30_40_987654321.withMinute(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withMinute_minuteTooHigh() {
-        TEST_12_30_40_987654321.withMinute(60);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_12_30_40_987654321.withMinute(60));
     }
 
     //-----------------------------------------------------------------------
@@ -1220,36 +1227,36 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         LocalTime t = TEST_12_30_40_987654321;
         for (int i = 0; i < 60; i++) {
             t = t.withSecond(i);
-            assertEquals(t.getSecond(), i);
+            assertEquals(i, t.getSecond());
         }
     }
 
     @Test
     public void test_withSecond_noChange_equal() {
         LocalTime t = TEST_12_30_40_987654321.withSecond(40);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_withSecond_toMidnight_equal() {
         LocalTime t = LocalTime.of(0, 0, 1).withSecond(0);
-        assertEquals(t, LocalTime.MIDNIGHT);
+        assertEquals(LocalTime.MIDNIGHT, t);
     }
 
     @Test
     public void test_withSecond_toMidday_equal() {
         LocalTime t = LocalTime.of(12, 0, 1).withSecond(0);
-        assertEquals(t, LocalTime.NOON);
+        assertEquals(LocalTime.NOON, t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withSecond_secondTooLow() {
-        TEST_12_30_40_987654321.withSecond(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_12_30_40_987654321.withSecond(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withSecond_secondTooHigh() {
-        TEST_12_30_40_987654321.withSecond(60);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_12_30_40_987654321.withSecond(60));
     }
 
     //-----------------------------------------------------------------------
@@ -1259,41 +1266,41 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_withNanoOfSecond_normal() {
         LocalTime t = TEST_12_30_40_987654321;
         t = t.withNano(1);
-        assertEquals(t.getNano(), 1);
+        assertEquals(1, t.getNano());
         t = t.withNano(10);
-        assertEquals(t.getNano(), 10);
+        assertEquals(10, t.getNano());
         t = t.withNano(100);
-        assertEquals(t.getNano(), 100);
+        assertEquals(100, t.getNano());
         t = t.withNano(999999999);
-        assertEquals(t.getNano(), 999999999);
+        assertEquals(999999999, t.getNano());
     }
 
     @Test
     public void test_withNanoOfSecond_noChange_equal() {
         LocalTime t = TEST_12_30_40_987654321.withNano(987654321);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_withNanoOfSecond_toMidnight_equal() {
         LocalTime t = LocalTime.of(0, 0, 0, 1).withNano(0);
-        assertEquals(t, LocalTime.MIDNIGHT);
+        assertEquals(LocalTime.MIDNIGHT, t);
     }
 
     @Test
     public void test_withNanoOfSecond_toMidday_equal() {
         LocalTime t = LocalTime.of(12, 0, 0, 1).withNano(0);
-        assertEquals(t, LocalTime.NOON);
+        assertEquals(LocalTime.NOON, t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withNanoOfSecond_nanoTooLow() {
-        TEST_12_30_40_987654321.withNano(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_12_30_40_987654321.withNano(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withNanoOfSecond_nanoTooHigh() {
-        TEST_12_30_40_987654321.withNano(1000000000);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_12_30_40_987654321.withNano(1000000000));
     }
 
     //-----------------------------------------------------------------------
@@ -1369,7 +1376,6 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         }
     };
 
-    @DataProvider(name="truncatedToValid")
     Object[][] data_truncatedToValid() {
         return new Object[][] {
             {LocalTime.of(1, 2, 3, 123_456_789), NANOS, LocalTime.of(1, 2, 3, 123_456_789)},
@@ -1386,12 +1392,12 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="truncatedToValid")
+    @ParameterizedTest
+    @MethodSource("data_truncatedToValid")
     public void test_truncatedTo_valid(LocalTime input, TemporalUnit unit, LocalTime expected) {
-        assertEquals(input.truncatedTo(unit), expected);
+        assertEquals(expected, input.truncatedTo(unit));
     }
 
-    @DataProvider(name="truncatedToInvalid")
     Object[][] data_truncatedToInvalid() {
         return new Object[][] {
             {LocalTime.of(1, 2, 3, 123_456_789), NINETY_FIVE_MINS},
@@ -1401,14 +1407,15 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="truncatedToInvalid", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_truncatedToInvalid")
     public void test_truncatedTo_invalid(LocalTime input, TemporalUnit unit) {
-        input.truncatedTo(unit);
+        Assertions.assertThrows(DateTimeException.class, () -> input.truncatedTo(unit));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_truncatedTo_null() {
-        TEST_12_30_40_987654321.truncatedTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12_30_40_987654321.truncatedTo(null));
     }
 
     //-----------------------------------------------------------------------
@@ -1418,39 +1425,41 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_plus_TemporalAmount_positiveHours() {
         TemporalAmount period = MockSimplePeriod.of(7, ChronoUnit.HOURS);
         LocalTime t = TEST_12_30_40_987654321.plus(period);
-        assertEquals(t, LocalTime.of(19, 30, 40, 987654321));
+        assertEquals(LocalTime.of(19, 30, 40, 987654321), t);
     }
 
     @Test
     public void test_plus_TemporalAmount_negativeMinutes() {
         TemporalAmount period = MockSimplePeriod.of(-25, ChronoUnit.MINUTES);
         LocalTime t = TEST_12_30_40_987654321.plus(period);
-        assertEquals(t, LocalTime.of(12, 5, 40, 987654321));
+        assertEquals(LocalTime.of(12, 5, 40, 987654321), t);
     }
 
     @Test
     public void test_plus_TemporalAmount_zero() {
         TemporalAmount period = Period.ZERO;
         LocalTime t = TEST_12_30_40_987654321.plus(period);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_plus_TemporalAmount_wrap() {
         TemporalAmount p = MockSimplePeriod.of(1, HOURS);
         LocalTime t = LocalTime.of(23, 30).plus(p);
-        assertEquals(t, LocalTime.of(0, 30));
+        assertEquals(LocalTime.of(0, 30), t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plus_TemporalAmount_dateNotAllowed() {
-        TemporalAmount period = MockSimplePeriod.of(7, ChronoUnit.MONTHS);
-        TEST_12_30_40_987654321.plus(period);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            TemporalAmount period = MockSimplePeriod.of(7, ChronoUnit.MONTHS);
+            TEST_12_30_40_987654321.plus(period);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_plus_TemporalAmount_null() {
-        TEST_12_30_40_987654321.plus((TemporalAmount) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12_30_40_987654321.plus((TemporalAmount) null));
     }
 
     //-----------------------------------------------------------------------
@@ -1459,19 +1468,19 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     @Test
     public void test_plus_longTemporalUnit_positiveHours() {
         LocalTime t = TEST_12_30_40_987654321.plus(7, ChronoUnit.HOURS);
-        assertEquals(t, LocalTime.of(19, 30, 40, 987654321));
+        assertEquals(LocalTime.of(19, 30, 40, 987654321), t);
     }
 
     @Test
     public void test_plus_longTemporalUnit_negativeMinutes() {
         LocalTime t = TEST_12_30_40_987654321.plus(-25, ChronoUnit.MINUTES);
-        assertEquals(t, LocalTime.of(12, 5, 40, 987654321));
+        assertEquals(LocalTime.of(12, 5, 40, 987654321), t);
     }
 
     @Test
     public void test_plus_longTemporalUnit_zero() {
         LocalTime t = TEST_12_30_40_987654321.plus(0, ChronoUnit.MINUTES);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
@@ -1486,9 +1495,9 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         }
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_plus_longTemporalUnit_null() {
-        TEST_12_30_40_987654321.plus(1, (TemporalUnit) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12_30_40_987654321.plus(1, (TemporalUnit) null));
     }
 
     //-----------------------------------------------------------------------
@@ -1499,7 +1508,7 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         LocalTime t = LocalTime.MIDNIGHT;
         for (int i = 0; i < 50; i++) {
             t = t.plusHours(1);
-            assertEquals(t.getHour(), (i + 1) % 24);
+            assertEquals((i + 1) % 24, t.getHour());
         }
     }
 
@@ -1508,7 +1517,7 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         LocalTime base = LocalTime.MIDNIGHT;
         for (int i = -50; i < 50; i++) {
             LocalTime t = base.plusHours(i);
-            assertEquals(t.getHour(), (i + 72) % 24);
+            assertEquals((i + 72) % 24, t.getHour());
         }
     }
 
@@ -1517,33 +1526,33 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         LocalTime base = LocalTime.of(1, 0);
         for (int i = -50; i < 50; i++) {
             LocalTime t = base.plusHours(i);
-            assertEquals(t.getHour(), (1 + i + 72) % 24);
+            assertEquals((1 + i + 72) % 24, t.getHour());
         }
     }
 
     @Test
     public void test_plusHours_noChange_equal() {
         LocalTime t = TEST_12_30_40_987654321.plusHours(0);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_plusHours_toMidnight_equal() {
         LocalTime t = LocalTime.of(23, 0).plusHours(1);
-        assertEquals(t, LocalTime.MIDNIGHT);
+        assertEquals(LocalTime.MIDNIGHT, t);
     }
 
     @Test
     public void test_plusHours_toMidday_equal() {
         LocalTime t = LocalTime.of(11, 0).plusHours(1);
-        assertEquals(t, LocalTime.NOON);
+        assertEquals(LocalTime.NOON, t);
     }
 
     @Test
     public void test_plusHours_big() {
         LocalTime t = LocalTime.of(2, 30).plusHours(Long.MAX_VALUE);
         int hours = (int) (Long.MAX_VALUE % 24L);
-        assertEquals(t, LocalTime.of(2, 30).plusHours(hours));
+        assertEquals(LocalTime.of(2, 30).plusHours(hours), t);
     }
 
     //-----------------------------------------------------------------------
@@ -1561,8 +1570,8 @@ public class TCKLocalTime extends AbstractDateTimeTest {
                 hour++;
                 min = 0;
             }
-            assertEquals(t.getHour(), hour);
-            assertEquals(t.getMinute(), min);
+            assertEquals(hour, t.getHour());
+            assertEquals(min, t.getMinute());
         }
     }
 
@@ -1586,40 +1595,40 @@ public class TCKLocalTime extends AbstractDateTimeTest {
                 hour = 0;
                 min = i;
             }
-            assertEquals(t.getHour(), hour);
-            assertEquals(t.getMinute(), min);
+            assertEquals(hour, t.getHour());
+            assertEquals(min, t.getMinute());
         }
     }
 
     @Test
     public void test_plusMinutes_noChange_equal() {
         LocalTime t = TEST_12_30_40_987654321.plusMinutes(0);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_plusMinutes_noChange_oneDay_equal() {
         LocalTime t = TEST_12_30_40_987654321.plusMinutes(24 * 60);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_plusMinutes_toMidnight_equal() {
         LocalTime t = LocalTime.of(23, 59).plusMinutes(1);
-        assertEquals(t, LocalTime.MIDNIGHT);
+        assertEquals(LocalTime.MIDNIGHT, t);
     }
 
     @Test
     public void test_plusMinutes_toMidday_equal() {
         LocalTime t = LocalTime.of(11, 59).plusMinutes(1);
-        assertEquals(t, LocalTime.NOON);
+        assertEquals(LocalTime.NOON, t);
     }
 
     @Test
     public void test_plusMinutes_big() {
         LocalTime t = LocalTime.of(2, 30).plusMinutes(Long.MAX_VALUE);
         int mins = (int) (Long.MAX_VALUE % (24L * 60L));
-        assertEquals(t, LocalTime.of(2, 30).plusMinutes(mins));
+        assertEquals(LocalTime.of(2, 30).plusMinutes(mins), t);
     }
 
     //-----------------------------------------------------------------------
@@ -1642,13 +1651,12 @@ public class TCKLocalTime extends AbstractDateTimeTest {
                 hour++;
                 min = 0;
             }
-            assertEquals(t.getHour(), hour);
-            assertEquals(t.getMinute(), min);
-            assertEquals(t.getSecond(), sec);
+            assertEquals(hour, t.getHour());
+            assertEquals(min, t.getMinute());
+            assertEquals(sec, t.getSecond());
         }
     }
 
-    @DataProvider(name="plusSeconds_fromZero")
     Iterator<Object[]> plusSeconds_fromZero() {
         return new Iterator<Object[]>() {
             int delta = 30;
@@ -1689,38 +1697,39 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="plusSeconds_fromZero")
+    @ParameterizedTest
+    @MethodSource("plusSeconds_fromZero")
     public void test_plusSeconds_fromZero(int seconds, int hour, int min, int sec) {
         LocalTime base = LocalTime.MIDNIGHT;
         LocalTime t = base.plusSeconds(seconds);
 
-        assertEquals(hour, t.getHour());
-        assertEquals(min, t.getMinute());
-        assertEquals(sec, t.getSecond());
+        assertEquals(t.getHour(), hour);
+        assertEquals(t.getMinute(), min);
+        assertEquals(t.getSecond(), sec);
     }
 
     @Test
     public void test_plusSeconds_noChange_equal() {
         LocalTime t = TEST_12_30_40_987654321.plusSeconds(0);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_plusSeconds_noChange_oneDay_equal() {
         LocalTime t = TEST_12_30_40_987654321.plusSeconds(24 * 60 * 60);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_plusSeconds_toMidnight_equal() {
         LocalTime t = LocalTime.of(23, 59, 59).plusSeconds(1);
-        assertEquals(t, LocalTime.MIDNIGHT);
+        assertEquals(LocalTime.MIDNIGHT, t);
     }
 
     @Test
     public void test_plusSeconds_toMidday_equal() {
         LocalTime t = LocalTime.of(11, 59, 59).plusSeconds(1);
-        assertEquals(t, LocalTime.NOON);
+        assertEquals(LocalTime.NOON, t);
     }
 
     //-----------------------------------------------------------------------
@@ -1748,14 +1757,13 @@ public class TCKLocalTime extends AbstractDateTimeTest {
                 hour++;
                 min = 0;
             }
-            assertEquals(t.getHour(), hour);
-            assertEquals(t.getMinute(), min);
-            assertEquals(t.getSecond(), sec);
-            assertEquals(t.getNano(), nanos);
+            assertEquals(hour, t.getHour());
+            assertEquals(min, t.getMinute());
+            assertEquals(sec, t.getSecond());
+            assertEquals(nanos, t.getNano());
         }
     }
 
-    @DataProvider(name="plusNanos_fromZero")
     Iterator<Object[]> plusNanos_fromZero() {
         return new Iterator<Object[]>() {
             long delta = 7500000000L;
@@ -1802,39 +1810,40 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="plusNanos_fromZero")
+    @ParameterizedTest
+    @MethodSource("plusNanos_fromZero")
     public void test_plusNanos_fromZero(long nanoseconds, int hour, int min, int sec, int nanos) {
         LocalTime base = LocalTime.MIDNIGHT;
         LocalTime t = base.plusNanos(nanoseconds);
 
-        assertEquals(hour, t.getHour());
-        assertEquals(min, t.getMinute());
-        assertEquals(sec, t.getSecond());
-        assertEquals(nanos, t.getNano());
+        assertEquals(t.getHour(), hour);
+        assertEquals(t.getMinute(), min);
+        assertEquals(t.getSecond(), sec);
+        assertEquals(t.getNano(), nanos);
     }
 
     @Test
     public void test_plusNanos_noChange_equal() {
         LocalTime t = TEST_12_30_40_987654321.plusNanos(0);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_plusNanos_noChange_oneDay_equal() {
         LocalTime t = TEST_12_30_40_987654321.plusNanos(24 * 60 * 60 * 1000000000L);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_plusNanos_toMidnight_equal() {
         LocalTime t = LocalTime.of(23, 59, 59, 999999999).plusNanos(1);
-        assertEquals(t, LocalTime.MIDNIGHT);
+        assertEquals(LocalTime.MIDNIGHT, t);
     }
 
     @Test
     public void test_plusNanos_toMidday_equal() {
         LocalTime t = LocalTime.of(11, 59, 59, 999999999).plusNanos(1);
-        assertEquals(t, LocalTime.NOON);
+        assertEquals(LocalTime.NOON, t);
     }
 
     //-----------------------------------------------------------------------
@@ -1844,39 +1853,41 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_minus_TemporalAmount_positiveHours() {
         TemporalAmount period = MockSimplePeriod.of(7, ChronoUnit.HOURS);
         LocalTime t = TEST_12_30_40_987654321.minus(period);
-        assertEquals(t, LocalTime.of(5, 30, 40, 987654321));
+        assertEquals(LocalTime.of(5, 30, 40, 987654321), t);
     }
 
     @Test
     public void test_minus_TemporalAmount_negativeMinutes() {
         TemporalAmount period = MockSimplePeriod.of(-25, ChronoUnit.MINUTES);
         LocalTime t = TEST_12_30_40_987654321.minus(period);
-        assertEquals(t, LocalTime.of(12, 55, 40, 987654321));
+        assertEquals(LocalTime.of(12, 55, 40, 987654321), t);
     }
 
     @Test
     public void test_minus_TemporalAmount_zero() {
         TemporalAmount period = Period.ZERO;
         LocalTime t = TEST_12_30_40_987654321.minus(period);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_minus_TemporalAmount_wrap() {
         TemporalAmount p = MockSimplePeriod.of(1, HOURS);
         LocalTime t = LocalTime.of(0, 30).minus(p);
-        assertEquals(t, LocalTime.of(23, 30));
+        assertEquals(LocalTime.of(23, 30), t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minus_TemporalAmount_dateNotAllowed() {
-        TemporalAmount period = MockSimplePeriod.of(7, ChronoUnit.MONTHS);
-        TEST_12_30_40_987654321.minus(period);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            TemporalAmount period = MockSimplePeriod.of(7, ChronoUnit.MONTHS);
+            TEST_12_30_40_987654321.minus(period);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_minus_TemporalAmount_null() {
-        TEST_12_30_40_987654321.minus((TemporalAmount) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12_30_40_987654321.minus((TemporalAmount) null));
     }
 
     //-----------------------------------------------------------------------
@@ -1885,19 +1896,19 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     @Test
     public void test_minus_longTemporalUnit_positiveHours() {
         LocalTime t = TEST_12_30_40_987654321.minus(7, ChronoUnit.HOURS);
-        assertEquals(t, LocalTime.of(5, 30, 40, 987654321));
+        assertEquals(LocalTime.of(5, 30, 40, 987654321), t);
     }
 
     @Test
     public void test_minus_longTemporalUnit_negativeMinutes() {
         LocalTime t = TEST_12_30_40_987654321.minus(-25, ChronoUnit.MINUTES);
-        assertEquals(t, LocalTime.of(12, 55, 40, 987654321));
+        assertEquals(LocalTime.of(12, 55, 40, 987654321), t);
     }
 
     @Test
     public void test_minus_longTemporalUnit_zero() {
         LocalTime t = TEST_12_30_40_987654321.minus(0, ChronoUnit.MINUTES);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
@@ -1912,9 +1923,9 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         }
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_minus_longTemporalUnit_null() {
-        TEST_12_30_40_987654321.minus(1, (TemporalUnit) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12_30_40_987654321.minus(1, (TemporalUnit) null));
     }
 
     //-----------------------------------------------------------------------
@@ -1925,7 +1936,7 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         LocalTime t = LocalTime.MIDNIGHT;
         for (int i = 0; i < 50; i++) {
             t = t.minusHours(1);
-            assertEquals(t.getHour(), (((-i + 23) % 24) + 24) % 24, String.valueOf(i));
+            assertEquals((((-i + 23) % 24) + 24) % 24, t.getHour(), String.valueOf(i));
         }
     }
 
@@ -1934,7 +1945,7 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         LocalTime base = LocalTime.MIDNIGHT;
         for (int i = -50; i < 50; i++) {
             LocalTime t = base.minusHours(i);
-            assertEquals(t.getHour(), ((-i % 24) + 24) % 24);
+            assertEquals(((-i % 24) + 24) % 24, t.getHour());
         }
     }
 
@@ -1943,33 +1954,33 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         LocalTime base = LocalTime.of(1, 0);
         for (int i = -50; i < 50; i++) {
             LocalTime t = base.minusHours(i);
-            assertEquals(t.getHour(), (1 + (-i % 24) + 24) % 24);
+            assertEquals((1 + (-i % 24) + 24) % 24, t.getHour());
         }
     }
 
     @Test
     public void test_minusHours_noChange_equal() {
         LocalTime t = TEST_12_30_40_987654321.minusHours(0);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_minusHours_toMidnight_equal() {
         LocalTime t = LocalTime.of(1, 0).minusHours(1);
-        assertEquals(t, LocalTime.MIDNIGHT);
+        assertEquals(LocalTime.MIDNIGHT, t);
     }
 
     @Test
     public void test_minusHours_toMidday_equal() {
         LocalTime t = LocalTime.of(13, 0).minusHours(1);
-        assertEquals(t, LocalTime.NOON);
+        assertEquals(LocalTime.NOON, t);
     }
 
     @Test
     public void test_minusHours_big() {
         LocalTime t = LocalTime.of(2, 30).minusHours(Long.MAX_VALUE);
         int hours = (int) (Long.MAX_VALUE % 24L);
-        assertEquals(t, LocalTime.of(2, 30).minusHours(hours));
+        assertEquals(LocalTime.of(2, 30).minusHours(hours), t);
     }
 
     //-----------------------------------------------------------------------
@@ -1991,8 +2002,8 @@ public class TCKLocalTime extends AbstractDateTimeTest {
                     hour = 23;
                 }
             }
-            assertEquals(t.getHour(), hour);
-            assertEquals(t.getMinute(), min);
+            assertEquals(hour, t.getHour());
+            assertEquals(min, t.getMinute());
         }
     }
 
@@ -2014,40 +2025,40 @@ public class TCKLocalTime extends AbstractDateTimeTest {
                 }
             }
 
-            assertEquals(t.getHour(), hour);
-            assertEquals(t.getMinute(), min);
+            assertEquals(hour, t.getHour());
+            assertEquals(min, t.getMinute());
         }
     }
 
     @Test
     public void test_minusMinutes_noChange_equal() {
         LocalTime t = TEST_12_30_40_987654321.minusMinutes(0);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_minusMinutes_noChange_oneDay_equal() {
         LocalTime t = TEST_12_30_40_987654321.minusMinutes(24 * 60);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_minusMinutes_toMidnight_equal() {
         LocalTime t = LocalTime.of(0, 1).minusMinutes(1);
-        assertEquals(t, LocalTime.MIDNIGHT);
+        assertEquals(LocalTime.MIDNIGHT, t);
     }
 
     @Test
     public void test_minusMinutes_toMidday_equals() {
         LocalTime t = LocalTime.of(12, 1).minusMinutes(1);
-        assertEquals(t, LocalTime.NOON);
+        assertEquals(LocalTime.NOON, t);
     }
 
     @Test
     public void test_minusMinutes_big() {
         LocalTime t = LocalTime.of(2, 30).minusMinutes(Long.MAX_VALUE);
         int mins = (int) (Long.MAX_VALUE % (24L * 60L));
-        assertEquals(t, LocalTime.of(2, 30).minusMinutes(mins));
+        assertEquals(LocalTime.of(2, 30).minusMinutes(mins), t);
     }
 
     //-----------------------------------------------------------------------
@@ -2075,13 +2086,12 @@ public class TCKLocalTime extends AbstractDateTimeTest {
                     }
                 }
             }
-            assertEquals(t.getHour(), hour);
-            assertEquals(t.getMinute(), min);
-            assertEquals(t.getSecond(), sec);
+            assertEquals(hour, t.getHour());
+            assertEquals(min, t.getMinute());
+            assertEquals(sec, t.getSecond());
         }
     }
 
-    @DataProvider(name="minusSeconds_fromZero")
     Iterator<Object[]> minusSeconds_fromZero() {
         return new Iterator<Object[]>() {
             int delta = 30;
@@ -2122,45 +2132,46 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="minusSeconds_fromZero")
+    @ParameterizedTest
+    @MethodSource("minusSeconds_fromZero")
     public void test_minusSeconds_fromZero(int seconds, int hour, int min, int sec) {
         LocalTime base = LocalTime.MIDNIGHT;
         LocalTime t = base.minusSeconds(seconds);
 
-        assertEquals(t.getHour(), hour);
-        assertEquals(t.getMinute(), min);
-        assertEquals(t.getSecond(), sec);
+        assertEquals(hour, t.getHour());
+        assertEquals(min, t.getMinute());
+        assertEquals(sec, t.getSecond());
     }
 
     @Test
     public void test_minusSeconds_noChange_equal() {
         LocalTime t = TEST_12_30_40_987654321.minusSeconds(0);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_minusSeconds_noChange_oneDay_equal() {
         LocalTime t = TEST_12_30_40_987654321.minusSeconds(24 * 60 * 60);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_minusSeconds_toMidnight_equal() {
         LocalTime t = LocalTime.of(0, 0, 1).minusSeconds(1);
-        assertEquals(t, LocalTime.MIDNIGHT);
+        assertEquals(LocalTime.MIDNIGHT, t);
     }
 
     @Test
     public void test_minusSeconds_toMidday_equal() {
         LocalTime t = LocalTime.of(12, 0, 1).minusSeconds(1);
-        assertEquals(t, LocalTime.NOON);
+        assertEquals(LocalTime.NOON, t);
     }
 
     @Test
     public void test_minusSeconds_big() {
         LocalTime t = LocalTime.of(2, 30).minusSeconds(Long.MAX_VALUE);
         int secs = (int) (Long.MAX_VALUE % (24L * 60L * 60L));
-        assertEquals(t, LocalTime.of(2, 30).minusSeconds(secs));
+        assertEquals(LocalTime.of(2, 30).minusSeconds(secs), t);
     }
 
     //-----------------------------------------------------------------------
@@ -2196,14 +2207,13 @@ public class TCKLocalTime extends AbstractDateTimeTest {
                 }
             }
 
-            assertEquals(t.getHour(), hour);
-            assertEquals(t.getMinute(), min);
-            assertEquals(t.getSecond(), sec);
-            assertEquals(t.getNano(), nanos);
+            assertEquals(hour, t.getHour());
+            assertEquals(min, t.getMinute());
+            assertEquals(sec, t.getSecond());
+            assertEquals(nanos, t.getNano());
         }
     }
 
-    @DataProvider(name="minusNanos_fromZero")
     Iterator<Object[]> minusNanos_fromZero() {
         return new Iterator<Object[]>() {
             long delta = 7500000000L;
@@ -2250,45 +2260,45 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="minusNanos_fromZero")
+    @ParameterizedTest
+    @MethodSource("minusNanos_fromZero")
     public void test_minusNanos_fromZero(long nanoseconds, int hour, int min, int sec, int nanos) {
         LocalTime base = LocalTime.MIDNIGHT;
         LocalTime t = base.minusNanos(nanoseconds);
 
-        assertEquals(hour, t.getHour());
-        assertEquals(min, t.getMinute());
-        assertEquals(sec, t.getSecond());
-        assertEquals(nanos, t.getNano());
+        assertEquals(t.getHour(), hour);
+        assertEquals(t.getMinute(), min);
+        assertEquals(t.getSecond(), sec);
+        assertEquals(t.getNano(), nanos);
     }
 
     @Test
     public void test_minusNanos_noChange_equal() {
         LocalTime t = TEST_12_30_40_987654321.minusNanos(0);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_minusNanos_noChange_oneDay_equal() {
         LocalTime t = TEST_12_30_40_987654321.minusNanos(24 * 60 * 60 * 1000000000L);
-        assertEquals(t, TEST_12_30_40_987654321);
+        assertEquals(TEST_12_30_40_987654321, t);
     }
 
     @Test
     public void test_minusNanos_toMidnight_equal() {
         LocalTime t = LocalTime.of(0, 0, 0, 1).minusNanos(1);
-        assertEquals(t, LocalTime.MIDNIGHT);
+        assertEquals(LocalTime.MIDNIGHT, t);
     }
 
     @Test
     public void test_minusNanos_toMidday_equal() {
         LocalTime t = LocalTime.of(12, 0, 0, 1).minusNanos(1);
-        assertEquals(t, LocalTime.NOON);
+        assertEquals(LocalTime.NOON, t);
     }
 
     //-----------------------------------------------------------------------
     // until(Temporal, TemporalUnit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="periodUntilUnit")
     Object[][] data_periodUntilUnit() {
         return new Object[][] {
                 {time(0, 0, 0, 0), time(0, 0, 0, 0), NANOS, 0},
@@ -2324,50 +2334,55 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit(LocalTime time1, LocalTime time2, TemporalUnit unit, long expected) {
         long amount = time1.until(time2, unit);
-        assertEquals(amount, expected);
+        assertEquals(expected, amount);
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit_negated(LocalTime time1, LocalTime time2, TemporalUnit unit, long expected) {
         long amount = time2.until(time1, unit);
-        assertEquals(amount, -expected);
+        assertEquals(-expected, amount);
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit_between(LocalTime time1, LocalTime time2, TemporalUnit unit, long expected) {
         long amount = unit.between(time1, time2);
-        assertEquals(amount, expected);
+        assertEquals(expected, amount);
     }
 
     @Test
     public void test_until_convertedType() {
         LocalTime start = LocalTime.of(11, 30);
         LocalDateTime end = start.plusSeconds(2).atDate(LocalDate.of(2010, 6, 30));
-        assertEquals(start.until(end, SECONDS), 2);
+        assertEquals(2, start.until(end, SECONDS));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_until_invalidType() {
-        LocalTime start = LocalTime.of(11, 30);
-        start.until(LocalDate.of(2010, 6, 30), SECONDS);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            LocalTime start = LocalTime.of(11, 30);
+            start.until(LocalDate.of(2010, 6, 30), SECONDS);
+        });
     }
 
-    @Test(expectedExceptions = UnsupportedTemporalTypeException.class)
+    @Test
     public void test_until_TemporalUnit_unsupportedUnit() {
-        TEST_12_30_40_987654321.until(TEST_12_30_40_987654321, DAYS);
+        Assertions.assertThrows(UnsupportedTemporalTypeException.class, () -> TEST_12_30_40_987654321.until(TEST_12_30_40_987654321, DAYS));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_until_TemporalUnit_nullEnd() {
-        TEST_12_30_40_987654321.until(null, HOURS);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12_30_40_987654321.until(null, HOURS));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_until_TemporalUnit_nullUnit() {
-        TEST_12_30_40_987654321.until(TEST_12_30_40_987654321, null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12_30_40_987654321.until(TEST_12_30_40_987654321, null));
     }
 
     //-----------------------------------------------------------------------
@@ -2377,12 +2392,12 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_format_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("H m s");
         String t = LocalTime.of(11, 30, 45).format(f);
-        assertEquals(t, "11 30 45");
+        assertEquals("11 30 45", t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_format_formatter_null() {
-        LocalTime.of(11, 30, 45).format(null);
+        Assertions.assertThrows(NullPointerException.class, () -> LocalTime.of(11, 30, 45).format(null));
     }
 
     //-----------------------------------------------------------------------
@@ -2391,12 +2406,12 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     @Test
     public void test_atDate() {
         LocalTime t = LocalTime.of(11, 30);
-        assertEquals(t.atDate(LocalDate.of(2012, 6, 30)), LocalDateTime.of(2012, 6, 30, 11, 30));
+        assertEquals(LocalDateTime.of(2012, 6, 30, 11, 30), t.atDate(LocalDate.of(2012, 6, 30)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_atDate_nullDate() {
-        TEST_12_30_40_987654321.atDate((LocalDate) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12_30_40_987654321.atDate((LocalDate) null));
     }
 
     //-----------------------------------------------------------------------
@@ -2405,13 +2420,15 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     @Test
     public void test_atOffset() {
         LocalTime t = LocalTime.of(11, 30);
-        assertEquals(t.atOffset(OFFSET_PTWO), OffsetTime.of(LocalTime.of(11, 30), OFFSET_PTWO));
+        assertEquals(OffsetTime.of(LocalTime.of(11, 30), OFFSET_PTWO), t.atOffset(OFFSET_PTWO));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_atOffset_nullZoneOffset() {
-        LocalTime t = LocalTime.of(11, 30);
-        t.atOffset((ZoneOffset) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            LocalTime t = LocalTime.of(11, 30);
+            t.atOffset((ZoneOffset) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -2421,7 +2438,7 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_toSecondOfDay() {
         LocalTime t = LocalTime.of(0, 0);
         for (int i = 0; i < 24 * 60 * 60; i++) {
-            assertEquals(t.toSecondOfDay(), i);
+            assertEquals(i, t.toSecondOfDay());
             t = t.plusSeconds(1);
         }
     }
@@ -2429,7 +2446,6 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // toEpochSecond()
     //--------------------------------------------------------------------------
-    @DataProvider(name="epochSecond")
     Object[][] provider__toEpochSecond() {
         return new Object[][] {
         {LocalTime.of(0, 0).toEpochSecond(LocalDate.of(1970, 1, 1), OFFSET_PTWO), -7200L},
@@ -2444,9 +2460,10 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="epochSecond")
+    @ParameterizedTest
+    @MethodSource("provider__toEpochSecond")
     public void test_toEpochSecond(long actual, long expected) {
-        assertEquals(actual, expected);
+        assertEquals(expected, actual);
     }
 
     //-----------------------------------------------------------------------
@@ -2456,7 +2473,7 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_toSecondOfDay_fromNanoOfDay_symmetry() {
         LocalTime t = LocalTime.of(0, 0);
         for (int i = 0; i < 24 * 60 * 60; i++) {
-            assertEquals(LocalTime.ofSecondOfDay(t.toSecondOfDay()), t);
+            assertEquals(t, LocalTime.ofSecondOfDay(t.toSecondOfDay()));
             t = t.plusSeconds(1);
         }
     }
@@ -2468,13 +2485,13 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_toNanoOfDay() {
         LocalTime t = LocalTime.of(0, 0);
         for (int i = 0; i < 1000000; i++) {
-            assertEquals(t.toNanoOfDay(), i);
+            assertEquals(i, t.toNanoOfDay());
             t = t.plusNanos(1);
         }
         t = LocalTime.of(0, 0);
         for (int i = 1; i <= 1000000; i++) {
             t = t.minusNanos(1);
-            assertEquals(t.toNanoOfDay(), 24 * 60 * 60 * 1000000000L - i);
+            assertEquals(24 * 60 * 60 * 1000000000L - i, t.toNanoOfDay());
         }
     }
 
@@ -2482,13 +2499,13 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     public void test_toNanoOfDay_fromNanoOfDay_symmetry() {
         LocalTime t = LocalTime.of(0, 0);
         for (int i = 0; i < 1000000; i++) {
-            assertEquals(LocalTime.ofNanoOfDay(t.toNanoOfDay()), t);
+            assertEquals(t, LocalTime.ofNanoOfDay(t.toNanoOfDay()));
             t = t.plusNanos(1);
         }
         t = LocalTime.of(0, 0);
         for (int i = 1; i <= 1000000; i++) {
             t = t.minusNanos(1);
-            assertEquals(LocalTime.ofNanoOfDay(t.toNanoOfDay()), t);
+            assertEquals(t, LocalTime.ofNanoOfDay(t.toNanoOfDay()));
         }
     }
 
@@ -2532,137 +2549,148 @@ public class TCKLocalTime extends AbstractDateTimeTest {
                 LocalTime b = localTimes[j];
                 if (i < j) {
                     assertTrue(a.compareTo(b) < 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), true, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(true, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else if (i > j) {
                     assertTrue(a.compareTo(b) > 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), true, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(true, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else {
-                    assertEquals(a.compareTo(b), 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), true, a + " <=> " + b);
+                    assertEquals(0, a.compareTo(b), a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(true, a.equals(b), a + " <=> " + b);
                 }
             }
         }
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_compareTo_ObjectNull() {
-        TEST_12_30_40_987654321.compareTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12_30_40_987654321.compareTo(null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isBefore_ObjectNull() {
-        TEST_12_30_40_987654321.isBefore(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12_30_40_987654321.isBefore(null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isAfter_ObjectNull() {
-        TEST_12_30_40_987654321.isAfter(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_12_30_40_987654321.isAfter(null));
     }
 
-    @Test(expectedExceptions=ClassCastException.class)
     @SuppressWarnings({"unchecked", "rawtypes"})
+    @Test
     public void compareToNonLocalTime() {
-       Comparable c = TEST_12_30_40_987654321;
-       c.compareTo(new Object());
+       Assertions.assertThrows(ClassCastException.class, () -> {
+           Comparable c = TEST_12_30_40_987654321;
+           c.compareTo(new Object());
+        });
     }
 
     //-----------------------------------------------------------------------
     // equals()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_true(int h, int m, int s, int n) {
         LocalTime a = LocalTime.of(h, m, s, n);
         LocalTime b = LocalTime.of(h, m, s, n);
-        assertEquals(a.equals(b), true);
+        assertEquals(true, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_hour_differs(int h, int m, int s, int n) {
         LocalTime a = LocalTime.of(h, m, s, n);
         LocalTime b = LocalTime.of(h + 1, m, s, n);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_minute_differs(int h, int m, int s, int n) {
         LocalTime a = LocalTime.of(h, m, s, n);
         LocalTime b = LocalTime.of(h, m + 1, s, n);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_second_differs(int h, int m, int s, int n) {
         LocalTime a = LocalTime.of(h, m, s, n);
         LocalTime b = LocalTime.of(h, m, s + 1, n);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_nano_differs(int h, int m, int s, int n) {
         LocalTime a = LocalTime.of(h, m, s, n);
         LocalTime b = LocalTime.of(h, m, s, n + 1);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
 
     @Test
     public void test_equals_itself_true() {
-        assertEquals(TEST_12_30_40_987654321.equals(TEST_12_30_40_987654321), true);
+        assertEquals(true, TEST_12_30_40_987654321.equals(TEST_12_30_40_987654321));
     }
 
     @Test
     public void test_equals_string_false() {
-        assertEquals(TEST_12_30_40_987654321.equals("2007-07-15"), false);
+        assertEquals(false, TEST_12_30_40_987654321.equals("2007-07-15"));
     }
 
     @Test
     public void test_equals_null_false() {
-        assertEquals(TEST_12_30_40_987654321.equals(null), false);
+        assertEquals(false, TEST_12_30_40_987654321.equals(null));
     }
 
     //-----------------------------------------------------------------------
     // hashCode()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_hashCode_same(int h, int m, int s, int n) {
         LocalTime a = LocalTime.of(h, m, s, n);
         LocalTime b = LocalTime.of(h, m, s, n);
-        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(b.hashCode(), a.hashCode());
     }
 
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_hashCode_hour_differs(int h, int m, int s, int n) {
         LocalTime a = LocalTime.of(h, m, s, n);
         LocalTime b = LocalTime.of(h + 1, m, s, n);
-        assertEquals(a.hashCode() == b.hashCode(), false);
+        assertEquals(false, a.hashCode() == b.hashCode());
     }
 
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_hashCode_minute_differs(int h, int m, int s, int n) {
         LocalTime a = LocalTime.of(h, m, s, n);
         LocalTime b = LocalTime.of(h, m + 1, s, n);
-        assertEquals(a.hashCode() == b.hashCode(), false);
+        assertEquals(false, a.hashCode() == b.hashCode());
     }
 
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_hashCode_second_differs(int h, int m, int s, int n) {
         LocalTime a = LocalTime.of(h, m, s, n);
         LocalTime b = LocalTime.of(h, m, s + 1, n);
-        assertEquals(a.hashCode() == b.hashCode(), false);
+        assertEquals(false, a.hashCode() == b.hashCode());
     }
 
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_hashCode_nano_differs(int h, int m, int s, int n) {
         LocalTime a = LocalTime.of(h, m, s, n);
         LocalTime b = LocalTime.of(h, m, s, n + 1);
-        assertEquals(a.hashCode() == b.hashCode(), false);
+        assertEquals(false, a.hashCode() == b.hashCode());
     }
 
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleToString")
     Object[][] provider_sampleToString() {
         return new Object[][] {
             {0, 0, 0, 0, "00:00"},
@@ -2694,11 +2722,12 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleToString")
+    @ParameterizedTest
+    @MethodSource("provider_sampleToString")
     public void test_toString(int h, int m, int s, int n, String expected) {
         LocalTime t = LocalTime.of(h, m, s, n);
         String str = t.toString();
-        assertEquals(str, expected);
+        assertEquals(expected, str);
     }
 
     private LocalTime time(int hour, int min, int sec, int nano) {
diff --git a/test/jdk/java/time/tck/java/time/TCKMonth.java b/test/jdk/java/time/tck/java/time/TCKMonth.java
index df879e7d1db..a2f1c6ccabf 100644
--- a/test/jdk/java/time/tck/java/time/TCKMonth.java
+++ b/test/jdk/java/time/tck/java/time/TCKMonth.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,8 @@
 package tck.java.time;
 
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.DateTimeException;
 import java.time.LocalDate;
@@ -80,13 +81,16 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test Month.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKMonth extends AbstractDateTimeTest {
 
     private static final int MAX_LENGTH = 12;
@@ -121,34 +125,34 @@ public class TCKMonth extends AbstractDateTimeTest {
     public void test_factory_int_singleton() {
         for (int i = 1; i <= MAX_LENGTH; i++) {
             Month test = Month.of(i);
-            assertEquals(test.getValue(), i);
+            assertEquals(i, test.getValue());
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_tooLow() {
-        Month.of(0);
+        Assertions.assertThrows(DateTimeException.class, () -> Month.of(0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_tooHigh() {
-        Month.of(13);
+        Assertions.assertThrows(DateTimeException.class, () -> Month.of(13));
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_factory_CalendricalObject() {
-        assertEquals(Month.from(LocalDate.of(2011, 6, 6)), Month.JUNE);
+        assertEquals(Month.JUNE, Month.from(LocalDate.of(2011, 6, 6)));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_CalendricalObject_invalid_noDerive() {
-        Month.from(LocalTime.of(12, 30));
+        Assertions.assertThrows(DateTimeException.class, () -> Month.from(LocalTime.of(12, 30)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_factory_CalendricalObject_null() {
-        Month.from((TemporalAccessor) null);
+        Assertions.assertThrows(NullPointerException.class, () -> Month.from((TemporalAccessor) null));
     }
 
     //-----------------------------------------------------------------------
@@ -156,37 +160,37 @@ public class TCKMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalField() {
-        assertEquals(Month.AUGUST.isSupported((TemporalField) null), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.NANO_OF_SECOND), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.NANO_OF_DAY), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.MICRO_OF_SECOND), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.MICRO_OF_DAY), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.MILLI_OF_SECOND), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.MILLI_OF_DAY), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.SECOND_OF_MINUTE), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.SECOND_OF_DAY), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.MINUTE_OF_HOUR), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.MINUTE_OF_DAY), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.HOUR_OF_AMPM), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.HOUR_OF_DAY), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.AMPM_OF_DAY), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.DAY_OF_WEEK), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.DAY_OF_MONTH), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.DAY_OF_YEAR), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.EPOCH_DAY), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.MONTH_OF_YEAR), true);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.PROLEPTIC_MONTH), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.YEAR), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.YEAR_OF_ERA), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.ERA), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.INSTANT_SECONDS), false);
-        assertEquals(Month.AUGUST.isSupported(ChronoField.OFFSET_SECONDS), false);
+        assertEquals(false, Month.AUGUST.isSupported((TemporalField) null));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.NANO_OF_SECOND));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.NANO_OF_DAY));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.MICRO_OF_SECOND));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.MICRO_OF_DAY));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.MILLI_OF_SECOND));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.MILLI_OF_DAY));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.SECOND_OF_DAY));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.MINUTE_OF_DAY));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.HOUR_OF_AMPM));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.HOUR_OF_DAY));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.CLOCK_HOUR_OF_DAY));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.AMPM_OF_DAY));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.DAY_OF_WEEK));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.DAY_OF_MONTH));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.DAY_OF_YEAR));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.EPOCH_DAY));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR));
+        assertEquals(true, Month.AUGUST.isSupported(ChronoField.MONTH_OF_YEAR));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.PROLEPTIC_MONTH));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.YEAR));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.YEAR_OF_ERA));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.ERA));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.INSTANT_SECONDS));
+        assertEquals(false, Month.AUGUST.isSupported(ChronoField.OFFSET_SECONDS));
     }
 
     //-----------------------------------------------------------------------
@@ -194,18 +198,17 @@ public class TCKMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_get_TemporalField() {
-        assertEquals(Month.JULY.get(ChronoField.MONTH_OF_YEAR), 7);
+        assertEquals(7, Month.JULY.get(ChronoField.MONTH_OF_YEAR));
     }
 
     @Test
     public void test_getLong_TemporalField() {
-        assertEquals(Month.JULY.getLong(ChronoField.MONTH_OF_YEAR), 7);
+        assertEquals(7, Month.JULY.getLong(ChronoField.MONTH_OF_YEAR));
     }
 
     //-----------------------------------------------------------------------
     // query(TemporalQuery)
     //-----------------------------------------------------------------------
-    @DataProvider(name="query")
     Object[][] data_query() {
         return new Object[][] {
                 {Month.JUNE, TemporalQueries.chronology(), IsoChronology.INSTANCE},
@@ -218,19 +221,21 @@ public class TCKMonth extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_query(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(temporal.query(query), expected);
+        assertEquals(expected, temporal.query(query));
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_queryFrom(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(query.queryFrom(temporal), expected);
+        assertEquals(expected, query.queryFrom(temporal));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_query_null() {
-        Month.JUNE.query(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Month.JUNE.query(null));
     }
 
     //-----------------------------------------------------------------------
@@ -238,23 +243,22 @@ public class TCKMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_getText() {
-        assertEquals(Month.JANUARY.getDisplayName(TextStyle.SHORT, Locale.US), "Jan");
+        assertEquals("Jan", Month.JANUARY.getDisplayName(TextStyle.SHORT, Locale.US));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_getText_nullStyle() {
-        Month.JANUARY.getDisplayName(null, Locale.US);
+        Assertions.assertThrows(NullPointerException.class, () -> Month.JANUARY.getDisplayName(null, Locale.US));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_getText_nullLocale() {
-        Month.JANUARY.getDisplayName(TextStyle.FULL, null);
+        Assertions.assertThrows(NullPointerException.class, () -> Month.JANUARY.getDisplayName(TextStyle.FULL, null));
     }
 
     //-----------------------------------------------------------------------
     // plus(long), plus(long,unit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="plus")
     Object[][] data_plus() {
         return new Object[][] {
             {1, -13, 12},
@@ -313,15 +317,15 @@ public class TCKMonth extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="plus")
+    @ParameterizedTest
+    @MethodSource("data_plus")
     public void test_plus_long(int base, long amount, int expected) {
-        assertEquals(Month.of(base).plus(amount), Month.of(expected));
+        assertEquals(Month.of(expected), Month.of(base).plus(amount));
     }
 
     //-----------------------------------------------------------------------
     // minus(long), minus(long,unit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="minus")
     Object[][] data_minus() {
         return new Object[][] {
             {1, -13, 2},
@@ -354,9 +358,10 @@ public class TCKMonth extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="minus")
+    @ParameterizedTest
+    @MethodSource("data_minus")
     public void test_minus_long(int base, long amount, int expected) {
-        assertEquals(Month.of(base).minus(amount), Month.of(expected));
+        assertEquals(Month.of(expected), Month.of(base).minus(amount));
     }
 
     //-----------------------------------------------------------------------
@@ -364,34 +369,34 @@ public class TCKMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_length_boolean_notLeapYear() {
-        assertEquals(Month.JANUARY.length(false), 31);
-        assertEquals(Month.FEBRUARY.length(false), 28);
-        assertEquals(Month.MARCH.length(false), 31);
-        assertEquals(Month.APRIL.length(false), 30);
-        assertEquals(Month.MAY.length(false), 31);
-        assertEquals(Month.JUNE.length(false), 30);
-        assertEquals(Month.JULY.length(false), 31);
-        assertEquals(Month.AUGUST.length(false), 31);
-        assertEquals(Month.SEPTEMBER.length(false), 30);
-        assertEquals(Month.OCTOBER.length(false), 31);
-        assertEquals(Month.NOVEMBER.length(false), 30);
-        assertEquals(Month.DECEMBER.length(false), 31);
+        assertEquals(31, Month.JANUARY.length(false));
+        assertEquals(28, Month.FEBRUARY.length(false));
+        assertEquals(31, Month.MARCH.length(false));
+        assertEquals(30, Month.APRIL.length(false));
+        assertEquals(31, Month.MAY.length(false));
+        assertEquals(30, Month.JUNE.length(false));
+        assertEquals(31, Month.JULY.length(false));
+        assertEquals(31, Month.AUGUST.length(false));
+        assertEquals(30, Month.SEPTEMBER.length(false));
+        assertEquals(31, Month.OCTOBER.length(false));
+        assertEquals(30, Month.NOVEMBER.length(false));
+        assertEquals(31, Month.DECEMBER.length(false));
     }
 
     @Test
     public void test_length_boolean_leapYear() {
-        assertEquals(Month.JANUARY.length(true), 31);
-        assertEquals(Month.FEBRUARY.length(true), 29);
-        assertEquals(Month.MARCH.length(true), 31);
-        assertEquals(Month.APRIL.length(true), 30);
-        assertEquals(Month.MAY.length(true), 31);
-        assertEquals(Month.JUNE.length(true), 30);
-        assertEquals(Month.JULY.length(true), 31);
-        assertEquals(Month.AUGUST.length(true), 31);
-        assertEquals(Month.SEPTEMBER.length(true), 30);
-        assertEquals(Month.OCTOBER.length(true), 31);
-        assertEquals(Month.NOVEMBER.length(true), 30);
-        assertEquals(Month.DECEMBER.length(true), 31);
+        assertEquals(31, Month.JANUARY.length(true));
+        assertEquals(29, Month.FEBRUARY.length(true));
+        assertEquals(31, Month.MARCH.length(true));
+        assertEquals(30, Month.APRIL.length(true));
+        assertEquals(31, Month.MAY.length(true));
+        assertEquals(30, Month.JUNE.length(true));
+        assertEquals(31, Month.JULY.length(true));
+        assertEquals(31, Month.AUGUST.length(true));
+        assertEquals(30, Month.SEPTEMBER.length(true));
+        assertEquals(31, Month.OCTOBER.length(true));
+        assertEquals(30, Month.NOVEMBER.length(true));
+        assertEquals(31, Month.DECEMBER.length(true));
     }
 
     //-----------------------------------------------------------------------
@@ -399,18 +404,18 @@ public class TCKMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_minLength() {
-        assertEquals(Month.JANUARY.minLength(), 31);
-        assertEquals(Month.FEBRUARY.minLength(), 28);
-        assertEquals(Month.MARCH.minLength(), 31);
-        assertEquals(Month.APRIL.minLength(), 30);
-        assertEquals(Month.MAY.minLength(), 31);
-        assertEquals(Month.JUNE.minLength(), 30);
-        assertEquals(Month.JULY.minLength(), 31);
-        assertEquals(Month.AUGUST.minLength(), 31);
-        assertEquals(Month.SEPTEMBER.minLength(), 30);
-        assertEquals(Month.OCTOBER.minLength(), 31);
-        assertEquals(Month.NOVEMBER.minLength(), 30);
-        assertEquals(Month.DECEMBER.minLength(), 31);
+        assertEquals(31, Month.JANUARY.minLength());
+        assertEquals(28, Month.FEBRUARY.minLength());
+        assertEquals(31, Month.MARCH.minLength());
+        assertEquals(30, Month.APRIL.minLength());
+        assertEquals(31, Month.MAY.minLength());
+        assertEquals(30, Month.JUNE.minLength());
+        assertEquals(31, Month.JULY.minLength());
+        assertEquals(31, Month.AUGUST.minLength());
+        assertEquals(30, Month.SEPTEMBER.minLength());
+        assertEquals(31, Month.OCTOBER.minLength());
+        assertEquals(30, Month.NOVEMBER.minLength());
+        assertEquals(31, Month.DECEMBER.minLength());
     }
 
     //-----------------------------------------------------------------------
@@ -418,18 +423,18 @@ public class TCKMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_maxLength() {
-        assertEquals(Month.JANUARY.maxLength(), 31);
-        assertEquals(Month.FEBRUARY.maxLength(), 29);
-        assertEquals(Month.MARCH.maxLength(), 31);
-        assertEquals(Month.APRIL.maxLength(), 30);
-        assertEquals(Month.MAY.maxLength(), 31);
-        assertEquals(Month.JUNE.maxLength(), 30);
-        assertEquals(Month.JULY.maxLength(), 31);
-        assertEquals(Month.AUGUST.maxLength(), 31);
-        assertEquals(Month.SEPTEMBER.maxLength(), 30);
-        assertEquals(Month.OCTOBER.maxLength(), 31);
-        assertEquals(Month.NOVEMBER.maxLength(), 30);
-        assertEquals(Month.DECEMBER.maxLength(), 31);
+        assertEquals(31, Month.JANUARY.maxLength());
+        assertEquals(29, Month.FEBRUARY.maxLength());
+        assertEquals(31, Month.MARCH.maxLength());
+        assertEquals(30, Month.APRIL.maxLength());
+        assertEquals(31, Month.MAY.maxLength());
+        assertEquals(30, Month.JUNE.maxLength());
+        assertEquals(31, Month.JULY.maxLength());
+        assertEquals(31, Month.AUGUST.maxLength());
+        assertEquals(30, Month.SEPTEMBER.maxLength());
+        assertEquals(31, Month.OCTOBER.maxLength());
+        assertEquals(30, Month.NOVEMBER.maxLength());
+        assertEquals(31, Month.DECEMBER.maxLength());
     }
 
     //-----------------------------------------------------------------------
@@ -437,34 +442,34 @@ public class TCKMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_firstDayOfYear_notLeapYear() {
-        assertEquals(Month.JANUARY.firstDayOfYear(false), 1);
-        assertEquals(Month.FEBRUARY.firstDayOfYear(false), 1 + 31);
-        assertEquals(Month.MARCH.firstDayOfYear(false), 1 + 31 + 28);
-        assertEquals(Month.APRIL.firstDayOfYear(false), 1 + 31 + 28 + 31);
-        assertEquals(Month.MAY.firstDayOfYear(false), 1 + 31 + 28 + 31 + 30);
-        assertEquals(Month.JUNE.firstDayOfYear(false), 1 + 31 + 28 + 31 + 30 + 31);
-        assertEquals(Month.JULY.firstDayOfYear(false), 1 + 31 + 28 + 31 + 30 + 31 + 30);
-        assertEquals(Month.AUGUST.firstDayOfYear(false), 1 + 31 + 28 + 31 + 30 + 31 + 30 + 31);
-        assertEquals(Month.SEPTEMBER.firstDayOfYear(false), 1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31);
-        assertEquals(Month.OCTOBER.firstDayOfYear(false), 1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30);
-        assertEquals(Month.NOVEMBER.firstDayOfYear(false), 1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31);
-        assertEquals(Month.DECEMBER.firstDayOfYear(false), 1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30);
+        assertEquals(1, Month.JANUARY.firstDayOfYear(false));
+        assertEquals(1 + 31, Month.FEBRUARY.firstDayOfYear(false));
+        assertEquals(1 + 31 + 28, Month.MARCH.firstDayOfYear(false));
+        assertEquals(1 + 31 + 28 + 31, Month.APRIL.firstDayOfYear(false));
+        assertEquals(1 + 31 + 28 + 31 + 30, Month.MAY.firstDayOfYear(false));
+        assertEquals(1 + 31 + 28 + 31 + 30 + 31, Month.JUNE.firstDayOfYear(false));
+        assertEquals(1 + 31 + 28 + 31 + 30 + 31 + 30, Month.JULY.firstDayOfYear(false));
+        assertEquals(1 + 31 + 28 + 31 + 30 + 31 + 30 + 31, Month.AUGUST.firstDayOfYear(false));
+        assertEquals(1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31, Month.SEPTEMBER.firstDayOfYear(false));
+        assertEquals(1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30, Month.OCTOBER.firstDayOfYear(false));
+        assertEquals(1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31, Month.NOVEMBER.firstDayOfYear(false));
+        assertEquals(1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30, Month.DECEMBER.firstDayOfYear(false));
     }
 
     @Test
     public void test_firstDayOfYear_leapYear() {
-        assertEquals(Month.JANUARY.firstDayOfYear(true), 1);
-        assertEquals(Month.FEBRUARY.firstDayOfYear(true), 1 + 31);
-        assertEquals(Month.MARCH.firstDayOfYear(true), 1 + 31 + 29);
-        assertEquals(Month.APRIL.firstDayOfYear(true), 1 + 31 + 29 + 31);
-        assertEquals(Month.MAY.firstDayOfYear(true), 1 + 31 + 29 + 31 + 30);
-        assertEquals(Month.JUNE.firstDayOfYear(true), 1 + 31 + 29 + 31 + 30 + 31);
-        assertEquals(Month.JULY.firstDayOfYear(true), 1 + 31 + 29 + 31 + 30 + 31 + 30);
-        assertEquals(Month.AUGUST.firstDayOfYear(true), 1 + 31 + 29 + 31 + 30 + 31 + 30 + 31);
-        assertEquals(Month.SEPTEMBER.firstDayOfYear(true), 1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31);
-        assertEquals(Month.OCTOBER.firstDayOfYear(true), 1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30);
-        assertEquals(Month.NOVEMBER.firstDayOfYear(true), 1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31);
-        assertEquals(Month.DECEMBER.firstDayOfYear(true), 1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30);
+        assertEquals(1, Month.JANUARY.firstDayOfYear(true));
+        assertEquals(1 + 31, Month.FEBRUARY.firstDayOfYear(true));
+        assertEquals(1 + 31 + 29, Month.MARCH.firstDayOfYear(true));
+        assertEquals(1 + 31 + 29 + 31, Month.APRIL.firstDayOfYear(true));
+        assertEquals(1 + 31 + 29 + 31 + 30, Month.MAY.firstDayOfYear(true));
+        assertEquals(1 + 31 + 29 + 31 + 30 + 31, Month.JUNE.firstDayOfYear(true));
+        assertEquals(1 + 31 + 29 + 31 + 30 + 31 + 30, Month.JULY.firstDayOfYear(true));
+        assertEquals(1 + 31 + 29 + 31 + 30 + 31 + 30 + 31, Month.AUGUST.firstDayOfYear(true));
+        assertEquals(1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31, Month.SEPTEMBER.firstDayOfYear(true));
+        assertEquals(1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30, Month.OCTOBER.firstDayOfYear(true));
+        assertEquals(1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31, Month.NOVEMBER.firstDayOfYear(true));
+        assertEquals(1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30, Month.DECEMBER.firstDayOfYear(true));
     }
 
     //-----------------------------------------------------------------------
@@ -472,18 +477,18 @@ public class TCKMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_firstMonthOfQuarter() {
-        assertEquals(Month.JANUARY.firstMonthOfQuarter(), Month.JANUARY);
-        assertEquals(Month.FEBRUARY.firstMonthOfQuarter(), Month.JANUARY);
-        assertEquals(Month.MARCH.firstMonthOfQuarter(), Month.JANUARY);
-        assertEquals(Month.APRIL.firstMonthOfQuarter(), Month.APRIL);
-        assertEquals(Month.MAY.firstMonthOfQuarter(), Month.APRIL);
-        assertEquals(Month.JUNE.firstMonthOfQuarter(), Month.APRIL);
-        assertEquals(Month.JULY.firstMonthOfQuarter(), Month.JULY);
-        assertEquals(Month.AUGUST.firstMonthOfQuarter(), Month.JULY);
-        assertEquals(Month.SEPTEMBER.firstMonthOfQuarter(), Month.JULY);
-        assertEquals(Month.OCTOBER.firstMonthOfQuarter(), Month.OCTOBER);
-        assertEquals(Month.NOVEMBER.firstMonthOfQuarter(), Month.OCTOBER);
-        assertEquals(Month.DECEMBER.firstMonthOfQuarter(), Month.OCTOBER);
+        assertEquals(Month.JANUARY, Month.JANUARY.firstMonthOfQuarter());
+        assertEquals(Month.JANUARY, Month.FEBRUARY.firstMonthOfQuarter());
+        assertEquals(Month.JANUARY, Month.MARCH.firstMonthOfQuarter());
+        assertEquals(Month.APRIL, Month.APRIL.firstMonthOfQuarter());
+        assertEquals(Month.APRIL, Month.MAY.firstMonthOfQuarter());
+        assertEquals(Month.APRIL, Month.JUNE.firstMonthOfQuarter());
+        assertEquals(Month.JULY, Month.JULY.firstMonthOfQuarter());
+        assertEquals(Month.JULY, Month.AUGUST.firstMonthOfQuarter());
+        assertEquals(Month.JULY, Month.SEPTEMBER.firstMonthOfQuarter());
+        assertEquals(Month.OCTOBER, Month.OCTOBER.firstMonthOfQuarter());
+        assertEquals(Month.OCTOBER, Month.NOVEMBER.firstMonthOfQuarter());
+        assertEquals(Month.OCTOBER, Month.DECEMBER.firstMonthOfQuarter());
     }
 
     //-----------------------------------------------------------------------
@@ -491,18 +496,18 @@ public class TCKMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_toString() {
-        assertEquals(Month.JANUARY.toString(), "JANUARY");
-        assertEquals(Month.FEBRUARY.toString(), "FEBRUARY");
-        assertEquals(Month.MARCH.toString(), "MARCH");
-        assertEquals(Month.APRIL.toString(), "APRIL");
-        assertEquals(Month.MAY.toString(), "MAY");
-        assertEquals(Month.JUNE.toString(), "JUNE");
-        assertEquals(Month.JULY.toString(), "JULY");
-        assertEquals(Month.AUGUST.toString(), "AUGUST");
-        assertEquals(Month.SEPTEMBER.toString(), "SEPTEMBER");
-        assertEquals(Month.OCTOBER.toString(), "OCTOBER");
-        assertEquals(Month.NOVEMBER.toString(), "NOVEMBER");
-        assertEquals(Month.DECEMBER.toString(), "DECEMBER");
+        assertEquals("JANUARY", Month.JANUARY.toString());
+        assertEquals("FEBRUARY", Month.FEBRUARY.toString());
+        assertEquals("MARCH", Month.MARCH.toString());
+        assertEquals("APRIL", Month.APRIL.toString());
+        assertEquals("MAY", Month.MAY.toString());
+        assertEquals("JUNE", Month.JUNE.toString());
+        assertEquals("JULY", Month.JULY.toString());
+        assertEquals("AUGUST", Month.AUGUST.toString());
+        assertEquals("SEPTEMBER", Month.SEPTEMBER.toString());
+        assertEquals("OCTOBER", Month.OCTOBER.toString());
+        assertEquals("NOVEMBER", Month.NOVEMBER.toString());
+        assertEquals("DECEMBER", Month.DECEMBER.toString());
     }
 
     //-----------------------------------------------------------------------
@@ -510,8 +515,8 @@ public class TCKMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_enum() {
-        assertEquals(Month.valueOf("JANUARY"), Month.JANUARY);
-        assertEquals(Month.values()[0], Month.JANUARY);
+        assertEquals(Month.JANUARY, Month.valueOf("JANUARY"));
+        assertEquals(Month.JANUARY, Month.values()[0]);
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/TCKMonthDay.java b/test/jdk/java/time/tck/java/time/TCKMonthDay.java
index 99a711666d8..84326a4c47a 100644
--- a/test/jdk/java/time/tck/java/time/TCKMonthDay.java
+++ b/test/jdk/java/time/tck/java/time/TCKMonthDay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,9 +61,10 @@ package tck.java.time;
 
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -94,19 +95,22 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test MonthDay.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKMonthDay extends AbstractDateTimeTest {
 
     private MonthDay TEST_07_15;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_07_15 = MonthDay.of(7, 15);
     }
@@ -139,8 +143,8 @@ public class TCKMonthDay extends AbstractDateTimeTest {
 
     //-----------------------------------------------------------------------
     void check(MonthDay test, int m, int d) {
-        assertEquals(test.getMonth().getValue(), m);
-        assertEquals(test.getDayOfMonth(), d);
+        assertEquals(m, test.getMonth().getValue());
+        assertEquals(d, test.getDayOfMonth());
     }
 
     //-----------------------------------------------------------------------
@@ -157,15 +161,15 @@ public class TCKMonthDay extends AbstractDateTimeTest {
             expected = MonthDay.now(Clock.systemDefaultZone());
             test = MonthDay.now();
         }
-        assertEquals(test, expected);
+        assertEquals(expected, test);
     }
 
     //-----------------------------------------------------------------------
     // now(ZoneId)
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_ZoneId_nullZoneId() {
-        MonthDay.now((ZoneId) null);
+        Assertions.assertThrows(NullPointerException.class, () -> MonthDay.now((ZoneId) null));
     }
 
     @Test
@@ -180,7 +184,7 @@ public class TCKMonthDay extends AbstractDateTimeTest {
             expected = MonthDay.now(Clock.system(zone));
             test = MonthDay.now(zone);
         }
-        assertEquals(test, expected);
+        assertEquals(expected, test);
     }
 
     //-----------------------------------------------------------------------
@@ -191,34 +195,34 @@ public class TCKMonthDay extends AbstractDateTimeTest {
         Instant instant = LocalDateTime.of(2010, 12, 31, 0, 0).toInstant(ZoneOffset.UTC);
         Clock clock = Clock.fixed(instant, ZoneOffset.UTC);
         MonthDay test = MonthDay.now(clock);
-        assertEquals(test.getMonth(), Month.DECEMBER);
-        assertEquals(test.getDayOfMonth(), 31);
+        assertEquals(Month.DECEMBER, test.getMonth());
+        assertEquals(31, test.getDayOfMonth());
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_Clock_nullClock() {
-        MonthDay.now((Clock) null);
+        Assertions.assertThrows(NullPointerException.class, () -> MonthDay.now((Clock) null));
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void factory_intMonth() {
-        assertEquals(TEST_07_15, MonthDay.of(Month.JULY, 15));
+        assertEquals(MonthDay.of(Month.JULY, 15), TEST_07_15);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_intMonth_dayTooLow() {
-        MonthDay.of(Month.JANUARY, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> MonthDay.of(Month.JANUARY, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_intMonth_dayTooHigh() {
-        MonthDay.of(Month.JANUARY, 32);
+        Assertions.assertThrows(DateTimeException.class, () -> MonthDay.of(Month.JANUARY, 32));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_intMonth_nullMonth() {
-        MonthDay.of(null, 15);
+        Assertions.assertThrows(NullPointerException.class, () -> MonthDay.of(null, 15));
     }
 
     //-----------------------------------------------------------------------
@@ -227,47 +231,46 @@ public class TCKMonthDay extends AbstractDateTimeTest {
         check(TEST_07_15, 7, 15);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_ints_dayTooLow() {
-        MonthDay.of(1, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> MonthDay.of(1, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_ints_dayTooHigh() {
-        MonthDay.of(1, 32);
+        Assertions.assertThrows(DateTimeException.class, () -> MonthDay.of(1, 32));
     }
 
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_ints_monthTooLow() {
-        MonthDay.of(0, 1);
+        Assertions.assertThrows(DateTimeException.class, () -> MonthDay.of(0, 1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_ints_monthTooHigh() {
-        MonthDay.of(13, 1);
+        Assertions.assertThrows(DateTimeException.class, () -> MonthDay.of(13, 1));
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_factory_CalendricalObject() {
-        assertEquals(MonthDay.from(LocalDate.of(2007, 7, 15)), TEST_07_15);
+        assertEquals(TEST_07_15, MonthDay.from(LocalDate.of(2007, 7, 15)));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_CalendricalObject_invalid_noDerive() {
-        MonthDay.from(LocalTime.of(12, 30));
+        Assertions.assertThrows(DateTimeException.class, () -> MonthDay.from(LocalTime.of(12, 30)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_factory_CalendricalObject_null() {
-        MonthDay.from((TemporalAccessor) null);
+        Assertions.assertThrows(NullPointerException.class, () -> MonthDay.from((TemporalAccessor) null));
     }
 
     //-----------------------------------------------------------------------
     // parse()
     //-----------------------------------------------------------------------
-    @DataProvider(name="goodParseData")
     Object[][] provider_goodParseData() {
         return new Object[][] {
                 {"--01-01", MonthDay.of(1, 1)},
@@ -297,14 +300,14 @@ public class TCKMonthDay extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="goodParseData")
+    @ParameterizedTest
+    @MethodSource("provider_goodParseData")
     public void factory_parse_success(String text, MonthDay expected) {
         MonthDay monthDay = MonthDay.parse(text);
-        assertEquals(monthDay, expected);
+        assertEquals(expected, monthDay);
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="badParseData")
     Object[][] provider_badParseData() {
         return new Object[][] {
                 {"", 0},
@@ -315,38 +318,40 @@ public class TCKMonthDay extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="badParseData", expectedExceptions=DateTimeParseException.class)
+    @ParameterizedTest
+    @MethodSource("provider_badParseData")
     public void factory_parse_fail(String text, int pos) {
-        try {
-            MonthDay.parse(text);
-            fail(String.format("Parse should have failed for %s at position %d", text, pos));
-        }
-        catch (DateTimeParseException ex) {
-            assertEquals(ex.getParsedString(), text);
-            assertEquals(ex.getErrorIndex(), pos);
-            throw ex;
-        }
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            try {
+                MonthDay.parse(text);
+                fail(String.format("Parse should have failed for %s at position %d", text, pos));
+            } catch (DateTimeParseException ex) {
+                assertEquals(text, ex.getParsedString());
+                assertEquals(pos, ex.getErrorIndex());
+                throw ex;
+            }
+        });
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_illegalValue_Day() {
-        MonthDay.parse("--06-32");
+        Assertions.assertThrows(DateTimeParseException.class, () -> MonthDay.parse("--06-32"));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_invalidValue_Day() {
-        MonthDay.parse("--06-31");
+        Assertions.assertThrows(DateTimeParseException.class, () -> MonthDay.parse("--06-31"));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_illegalValue_Month() {
-        MonthDay.parse("--13-25");
+        Assertions.assertThrows(DateTimeParseException.class, () -> MonthDay.parse("--13-25"));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_nullText() {
-        MonthDay.parse(null);
+        Assertions.assertThrows(NullPointerException.class, () -> MonthDay.parse(null));
     }
 
     //-----------------------------------------------------------------------
@@ -356,18 +361,20 @@ public class TCKMonthDay extends AbstractDateTimeTest {
     public void factory_parse_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("M d");
         MonthDay test = MonthDay.parse("12 3", f);
-        assertEquals(test, MonthDay.of(12, 3));
+        assertEquals(MonthDay.of(12, 3), test);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullText() {
-        DateTimeFormatter f = DateTimeFormatter.ofPattern("M d");
-        MonthDay.parse((String) null, f);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter f = DateTimeFormatter.ofPattern("M d");
+            MonthDay.parse((String) null, f);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullFormatter() {
-        MonthDay.parse("ANY", null);
+        Assertions.assertThrows(NullPointerException.class, () -> MonthDay.parse("ANY", null));
     }
 
     //-----------------------------------------------------------------------
@@ -375,37 +382,37 @@ public class TCKMonthDay extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalField() {
-        assertEquals(TEST_07_15.isSupported((TemporalField) null), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.NANO_OF_SECOND), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.NANO_OF_DAY), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.MICRO_OF_SECOND), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.MICRO_OF_DAY), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.MILLI_OF_SECOND), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.MILLI_OF_DAY), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.SECOND_OF_MINUTE), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.SECOND_OF_DAY), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.MINUTE_OF_HOUR), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.MINUTE_OF_DAY), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.HOUR_OF_AMPM), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.HOUR_OF_DAY), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.AMPM_OF_DAY), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.DAY_OF_WEEK), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.DAY_OF_MONTH), true);
-        assertEquals(TEST_07_15.isSupported(ChronoField.DAY_OF_YEAR), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.EPOCH_DAY), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.MONTH_OF_YEAR), true);
-        assertEquals(TEST_07_15.isSupported(ChronoField.PROLEPTIC_MONTH), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.YEAR), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.YEAR_OF_ERA), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.ERA), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.INSTANT_SECONDS), false);
-        assertEquals(TEST_07_15.isSupported(ChronoField.OFFSET_SECONDS), false);
+        assertEquals(false, TEST_07_15.isSupported((TemporalField) null));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.NANO_OF_SECOND));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.NANO_OF_DAY));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.MICRO_OF_SECOND));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.MICRO_OF_DAY));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.MILLI_OF_SECOND));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.MILLI_OF_DAY));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.SECOND_OF_DAY));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.MINUTE_OF_DAY));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.HOUR_OF_AMPM));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.HOUR_OF_DAY));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.CLOCK_HOUR_OF_DAY));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.AMPM_OF_DAY));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.DAY_OF_WEEK));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR));
+        assertEquals(true, TEST_07_15.isSupported(ChronoField.DAY_OF_MONTH));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.DAY_OF_YEAR));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.EPOCH_DAY));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR));
+        assertEquals(true, TEST_07_15.isSupported(ChronoField.MONTH_OF_YEAR));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.PROLEPTIC_MONTH));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.YEAR));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.YEAR_OF_ERA));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.ERA));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.INSTANT_SECONDS));
+        assertEquals(false, TEST_07_15.isSupported(ChronoField.OFFSET_SECONDS));
     }
 
     //-----------------------------------------------------------------------
@@ -413,20 +420,19 @@ public class TCKMonthDay extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_get_TemporalField() {
-        assertEquals(TEST_07_15.get(ChronoField.DAY_OF_MONTH), 15);
-        assertEquals(TEST_07_15.get(ChronoField.MONTH_OF_YEAR), 7);
+        assertEquals(15, TEST_07_15.get(ChronoField.DAY_OF_MONTH));
+        assertEquals(7, TEST_07_15.get(ChronoField.MONTH_OF_YEAR));
     }
 
     @Test
     public void test_getLong_TemporalField() {
-        assertEquals(TEST_07_15.getLong(ChronoField.DAY_OF_MONTH), 15);
-        assertEquals(TEST_07_15.getLong(ChronoField.MONTH_OF_YEAR), 7);
+        assertEquals(15, TEST_07_15.getLong(ChronoField.DAY_OF_MONTH));
+        assertEquals(7, TEST_07_15.getLong(ChronoField.MONTH_OF_YEAR));
     }
 
     //-----------------------------------------------------------------------
     // query(TemporalQuery)
     //-----------------------------------------------------------------------
-    @DataProvider(name="query")
     Object[][] data_query() {
         return new Object[][] {
                 {TEST_07_15, TemporalQueries.chronology(), IsoChronology.INSTANCE},
@@ -439,25 +445,26 @@ public class TCKMonthDay extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_query(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(temporal.query(query), expected);
+        assertEquals(expected, temporal.query(query));
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_queryFrom(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(query.queryFrom(temporal), expected);
+        assertEquals(expected, query.queryFrom(temporal));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_query_null() {
-        TEST_07_15.query(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_07_15.query(null));
     }
 
     //-----------------------------------------------------------------------
     // get*()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleDates")
     Object[][] provider_sampleDates() {
         return new Object[][] {
             {1, 1},
@@ -470,12 +477,13 @@ public class TCKMonthDay extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleDates")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDates")
     public void test_get(int m, int d) {
         MonthDay a = MonthDay.of(m, d);
-        assertEquals(a.getMonth(), Month.of(m));
-        assertEquals(a.getMonthValue(), m);
-        assertEquals(a.getDayOfMonth(), d);
+        assertEquals(Month.of(m), a.getMonth());
+        assertEquals(m, a.getMonthValue());
+        assertEquals(d, a.getDayOfMonth());
     }
 
     //-----------------------------------------------------------------------
@@ -483,28 +491,28 @@ public class TCKMonthDay extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_with_Month() {
-        assertEquals(MonthDay.of(6, 30).with(Month.JANUARY), MonthDay.of(1, 30));
+        assertEquals(MonthDay.of(1, 30), MonthDay.of(6, 30).with(Month.JANUARY));
     }
 
     @Test
     public void test_with_Month_adjustToValid() {
-        assertEquals(MonthDay.of(7, 31).with(Month.JUNE), MonthDay.of(6, 30));
+        assertEquals(MonthDay.of(6, 30), MonthDay.of(7, 31).with(Month.JUNE));
     }
 
     @Test
     public void test_with_Month_adjustToValidFeb() {
-        assertEquals(MonthDay.of(7, 31).with(Month.FEBRUARY), MonthDay.of(2, 29));
+        assertEquals(MonthDay.of(2, 29), MonthDay.of(7, 31).with(Month.FEBRUARY));
     }
 
     @Test
     public void test_with_Month_noChangeEqual() {
         MonthDay test = MonthDay.of(6, 30);
-        assertEquals(test.with(Month.JUNE), test);
+        assertEquals(test, test.with(Month.JUNE));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_with_Month_null() {
-        MonthDay.of(6, 30).with((Month) null);
+        Assertions.assertThrows(NullPointerException.class, () -> MonthDay.of(6, 30).with((Month) null));
     }
 
     //-----------------------------------------------------------------------
@@ -512,33 +520,33 @@ public class TCKMonthDay extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_withMonth() {
-        assertEquals(MonthDay.of(6, 30).withMonth(1), MonthDay.of(1, 30));
+        assertEquals(MonthDay.of(1, 30), MonthDay.of(6, 30).withMonth(1));
     }
 
     @Test
     public void test_withMonth_adjustToValid() {
-        assertEquals(MonthDay.of(7, 31).withMonth(6), MonthDay.of(6, 30));
+        assertEquals(MonthDay.of(6, 30), MonthDay.of(7, 31).withMonth(6));
     }
 
     @Test
     public void test_withMonth_adjustToValidFeb() {
-        assertEquals(MonthDay.of(7, 31).withMonth(2), MonthDay.of(2, 29));
+        assertEquals(MonthDay.of(2, 29), MonthDay.of(7, 31).withMonth(2));
     }
 
     @Test
     public void test_withMonth_int_noChangeEqual() {
         MonthDay test = MonthDay.of(6, 30);
-        assertEquals(test.withMonth(6), test);
+        assertEquals(test, test.withMonth(6));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withMonth_tooLow() {
-        MonthDay.of(6, 30).withMonth(0);
+        Assertions.assertThrows(DateTimeException.class, () -> MonthDay.of(6, 30).withMonth(0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withMonth_tooHigh() {
-        MonthDay.of(6, 30).withMonth(13);
+        Assertions.assertThrows(DateTimeException.class, () -> MonthDay.of(6, 30).withMonth(13));
     }
 
     //-----------------------------------------------------------------------
@@ -546,33 +554,33 @@ public class TCKMonthDay extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_withDayOfMonth() {
-        assertEquals(MonthDay.of(6, 30).withDayOfMonth(1), MonthDay.of(6, 1));
+        assertEquals(MonthDay.of(6, 1), MonthDay.of(6, 30).withDayOfMonth(1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfMonth_invalid() {
-        MonthDay.of(6, 30).withDayOfMonth(31);
+        Assertions.assertThrows(DateTimeException.class, () -> MonthDay.of(6, 30).withDayOfMonth(31));
     }
 
     @Test
     public void test_withDayOfMonth_adjustToValidFeb() {
-        assertEquals(MonthDay.of(2, 1).withDayOfMonth(29), MonthDay.of(2, 29));
+        assertEquals(MonthDay.of(2, 29), MonthDay.of(2, 1).withDayOfMonth(29));
     }
 
     @Test
     public void test_withDayOfMonth_noChangeEqual() {
         MonthDay test = MonthDay.of(6, 30);
-        assertEquals(test.withDayOfMonth(30), test);
+        assertEquals(test, test.withDayOfMonth(30));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfMonth_tooLow() {
-        MonthDay.of(6, 30).withDayOfMonth(0);
+        Assertions.assertThrows(DateTimeException.class, () -> MonthDay.of(6, 30).withDayOfMonth(0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfMonth_tooHigh() {
-        MonthDay.of(6, 30).withDayOfMonth(32);
+        Assertions.assertThrows(DateTimeException.class, () -> MonthDay.of(6, 30).withDayOfMonth(32));
     }
 
     //-----------------------------------------------------------------------
@@ -582,26 +590,26 @@ public class TCKMonthDay extends AbstractDateTimeTest {
     public void test_adjustDate() {
         MonthDay test = MonthDay.of(6, 30);
         LocalDate date = LocalDate.of(2007, 1, 1);
-        assertEquals(test.adjustInto(date), LocalDate.of(2007, 6, 30));
+        assertEquals(LocalDate.of(2007, 6, 30), test.adjustInto(date));
     }
 
     @Test
     public void test_adjustDate_resolve() {
         MonthDay test = MonthDay.of(2, 29);
         LocalDate date = LocalDate.of(2007, 6, 30);
-        assertEquals(test.adjustInto(date), LocalDate.of(2007, 2, 28));
+        assertEquals(LocalDate.of(2007, 2, 28), test.adjustInto(date));
     }
 
     @Test
     public void test_adjustDate_equal() {
         MonthDay test = MonthDay.of(6, 30);
         LocalDate date = LocalDate.of(2007, 6, 30);
-        assertEquals(test.adjustInto(date), date);
+        assertEquals(date, test.adjustInto(date));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_adjustDate_null() {
-        TEST_07_15.adjustInto((LocalDate) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_07_15.adjustInto((LocalDate) null));
     }
 
     //-----------------------------------------------------------------------
@@ -610,19 +618,19 @@ public class TCKMonthDay extends AbstractDateTimeTest {
     @Test
     public void test_isValidYear_june() {
         MonthDay test = MonthDay.of(6, 30);
-        assertEquals(test.isValidYear(2007), true);
+        assertEquals(true, test.isValidYear(2007));
     }
 
     @Test
     public void test_isValidYear_febNonLeap() {
         MonthDay test = MonthDay.of(2, 29);
-        assertEquals(test.isValidYear(2007), false);
+        assertEquals(false, test.isValidYear(2007));
     }
 
     @Test
     public void test_isValidYear_febLeap() {
         MonthDay test = MonthDay.of(2, 29);
-        assertEquals(test.isValidYear(2008), true);
+        assertEquals(true, test.isValidYear(2008));
     }
 
     //-----------------------------------------------------------------------
@@ -632,12 +640,12 @@ public class TCKMonthDay extends AbstractDateTimeTest {
     public void test_format_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("M d");
         String t = MonthDay.of(12, 3).format(f);
-        assertEquals(t, "12 3");
+        assertEquals("12 3", t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_format_formatter_null() {
-        MonthDay.of(12, 3).format(null);
+        Assertions.assertThrows(NullPointerException.class, () -> MonthDay.of(12, 3).format(null));
     }
 
     //-----------------------------------------------------------------------
@@ -646,19 +654,21 @@ public class TCKMonthDay extends AbstractDateTimeTest {
     @Test
     public void test_atYear_int() {
         MonthDay test = MonthDay.of(6, 30);
-        assertEquals(test.atYear(2008), LocalDate.of(2008, 6, 30));
+        assertEquals(LocalDate.of(2008, 6, 30), test.atYear(2008));
     }
 
     @Test
     public void test_atYear_int_leapYearAdjust() {
         MonthDay test = MonthDay.of(2, 29);
-        assertEquals(test.atYear(2005), LocalDate.of(2005, 2, 28));
+        assertEquals(LocalDate.of(2005, 2, 28), test.atYear(2005));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atYear_int_invalidYear() {
-        MonthDay test = MonthDay.of(6, 30);
-        test.atYear(Integer.MIN_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            MonthDay test = MonthDay.of(6, 30);
+            test.atYear(Integer.MIN_VALUE);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -683,37 +693,37 @@ public class TCKMonthDay extends AbstractDateTimeTest {
                 MonthDay b = localDates[j];
                 if (i < j) {
                     assertTrue(a.compareTo(b) < 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), true, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(true, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else if (i > j) {
                     assertTrue(a.compareTo(b) > 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), true, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(true, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else {
-                    assertEquals(a.compareTo(b), 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), true, a + " <=> " + b);
+                    assertEquals(0, a.compareTo(b), a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(true, a.equals(b), a + " <=> " + b);
                 }
             }
         }
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_compareTo_ObjectNull() {
-        TEST_07_15.compareTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_07_15.compareTo(null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isBefore_ObjectNull() {
-        TEST_07_15.isBefore(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_07_15.isBefore(null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isAfter_ObjectNull() {
-        TEST_07_15.isAfter(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_07_15.isAfter(null));
     }
 
     //-----------------------------------------------------------------------
@@ -726,51 +736,52 @@ public class TCKMonthDay extends AbstractDateTimeTest {
         MonthDay c = MonthDay.of(2, 1);
         MonthDay d = MonthDay.of(1, 2);
 
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), true);
-        assertEquals(a.equals(c), false);
-        assertEquals(a.equals(d), false);
+        assertEquals(true, a.equals(a));
+        assertEquals(true, a.equals(b));
+        assertEquals(false, a.equals(c));
+        assertEquals(false, a.equals(d));
 
-        assertEquals(b.equals(a), true);
-        assertEquals(b.equals(b), true);
-        assertEquals(b.equals(c), false);
-        assertEquals(b.equals(d), false);
+        assertEquals(true, b.equals(a));
+        assertEquals(true, b.equals(b));
+        assertEquals(false, b.equals(c));
+        assertEquals(false, b.equals(d));
 
-        assertEquals(c.equals(a), false);
-        assertEquals(c.equals(b), false);
-        assertEquals(c.equals(c), true);
-        assertEquals(c.equals(d), false);
+        assertEquals(false, c.equals(a));
+        assertEquals(false, c.equals(b));
+        assertEquals(true, c.equals(c));
+        assertEquals(false, c.equals(d));
 
-        assertEquals(d.equals(a), false);
-        assertEquals(d.equals(b), false);
-        assertEquals(d.equals(c), false);
-        assertEquals(d.equals(d), true);
+        assertEquals(false, d.equals(a));
+        assertEquals(false, d.equals(b));
+        assertEquals(false, d.equals(c));
+        assertEquals(true, d.equals(d));
     }
 
     @Test
     public void test_equals_itself_true() {
-        assertEquals(TEST_07_15.equals(TEST_07_15), true);
+        assertEquals(true, TEST_07_15.equals(TEST_07_15));
     }
 
     @Test
     public void test_equals_string_false() {
-        assertEquals(TEST_07_15.equals("2007-07-15"), false);
+        assertEquals(false, TEST_07_15.equals("2007-07-15"));
     }
 
     @Test
     public void test_equals_null_false() {
-        assertEquals(TEST_07_15.equals(null), false);
+        assertEquals(false, TEST_07_15.equals(null));
     }
 
     //-----------------------------------------------------------------------
     // hashCode()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleDates")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDates")
     public void test_hashCode(int m, int d) {
         MonthDay a = MonthDay.of(m, d);
         assertEquals(a.hashCode(), a.hashCode());
         MonthDay b = MonthDay.of(m, d);
-        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(b.hashCode(), a.hashCode());
     }
 
     @Test
@@ -789,7 +800,6 @@ public class TCKMonthDay extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleToString")
     Object[][] provider_sampleToString() {
         return new Object[][] {
             {7, 5, "--07-05"},
@@ -798,11 +808,12 @@ public class TCKMonthDay extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleToString")
+    @ParameterizedTest
+    @MethodSource("provider_sampleToString")
     public void test_toString(int m, int d, String expected) {
         MonthDay test = MonthDay.of(m, d);
         String str = test.toString();
-        assertEquals(str, expected);
+        assertEquals(expected, str);
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/TCKOffsetDateTime.java b/test/jdk/java/time/tck/java/time/TCKOffsetDateTime.java
index 7b45ba35ca6..f2b98ee9972 100644
--- a/test/jdk/java/time/tck/java/time/TCKOffsetDateTime.java
+++ b/test/jdk/java/time/tck/java/time/TCKOffsetDateTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -100,9 +100,10 @@ import static java.time.temporal.ChronoUnit.MINUTES;
 import static java.time.temporal.ChronoUnit.MONTHS;
 import static java.time.temporal.ChronoUnit.NANOS;
 import static java.time.temporal.ChronoUnit.SECONDS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.Clock;
 import java.time.DateTimeException;
@@ -135,15 +136,19 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import test.java.time.MockSimplePeriod;
 
 /**
  * Test OffsetDateTime.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKOffsetDateTime extends AbstractDateTimeTest {
 
     private static final ZoneId ZONE_PARIS = ZoneId.of("Europe/Paris");
@@ -154,7 +159,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     private static final ZoneOffset OFFSET_MTWO = ZoneOffset.ofHours(-2);
     private OffsetDateTime TEST_2008_6_30_11_30_59_000000500;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_2008_6_30_11_30_59_000000500 = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 500, OFFSET_PONE);
     }
@@ -253,14 +258,14 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
             Instant instant = Instant.ofEpochSecond(i).plusNanos(123456789L);
             Clock clock = Clock.fixed(instant, ZoneOffset.UTC);
             OffsetDateTime test = OffsetDateTime.now(clock);
-            assertEquals(test.getYear(), 1970);
-            assertEquals(test.getMonth(), Month.JANUARY);
-            assertEquals(test.getDayOfMonth(), (i < 24 * 60 * 60 ? 1 : 2));
-            assertEquals(test.getHour(), (i / (60 * 60)) % 24);
-            assertEquals(test.getMinute(), (i / 60) % 60);
-            assertEquals(test.getSecond(), i % 60);
-            assertEquals(test.getNano(), 123456789);
-            assertEquals(test.getOffset(), ZoneOffset.UTC);
+            assertEquals(1970, test.getYear());
+            assertEquals(Month.JANUARY, test.getMonth());
+            assertEquals((i < 24 * 60 * 60 ? 1 : 2), test.getDayOfMonth());
+            assertEquals((i / (60 * 60)) % 24, test.getHour());
+            assertEquals((i / 60) % 60, test.getMinute());
+            assertEquals(i % 60, test.getSecond());
+            assertEquals(123456789, test.getNano());
+            assertEquals(ZoneOffset.UTC, test.getOffset());
         }
     }
 
@@ -270,14 +275,14 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
             Instant instant = Instant.ofEpochSecond(i).plusNanos(123456789L);
             Clock clock = Clock.fixed(instant.minusSeconds(OFFSET_PONE.getTotalSeconds()), OFFSET_PONE);
             OffsetDateTime test = OffsetDateTime.now(clock);
-            assertEquals(test.getYear(), 1970);
-            assertEquals(test.getMonth(), Month.JANUARY);
-            assertEquals(test.getDayOfMonth(), (i < 24 * 60 * 60) ? 1 : 2);
-            assertEquals(test.getHour(), (i / (60 * 60)) % 24);
-            assertEquals(test.getMinute(), (i / 60) % 60);
-            assertEquals(test.getSecond(), i % 60);
-            assertEquals(test.getNano(), 123456789);
-            assertEquals(test.getOffset(), OFFSET_PONE);
+            assertEquals(1970, test.getYear());
+            assertEquals(Month.JANUARY, test.getMonth());
+            assertEquals((i < 24 * 60 * 60) ? 1 : 2, test.getDayOfMonth());
+            assertEquals((i / (60 * 60)) % 24, test.getHour());
+            assertEquals((i / 60) % 60, test.getMinute());
+            assertEquals(i % 60, test.getSecond());
+            assertEquals(123456789, test.getNano());
+            assertEquals(OFFSET_PONE, test.getOffset());
         }
     }
 
@@ -288,12 +293,12 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
             Instant instant = Instant.ofEpochSecond(i).plusNanos(123456789L);
             Clock clock = Clock.fixed(instant, ZoneOffset.UTC);
             OffsetDateTime test = OffsetDateTime.now(clock);
-            assertEquals(test.getYear(), 1969);
-            assertEquals(test.getMonth(), Month.DECEMBER);
-            assertEquals(test.getDayOfMonth(), 31);
+            assertEquals(1969, test.getYear());
+            assertEquals(Month.DECEMBER, test.getMonth());
+            assertEquals(31, test.getDayOfMonth());
             expected = expected.minusSeconds(1);
-            assertEquals(test.toLocalTime(), expected);
-            assertEquals(test.getOffset(), ZoneOffset.UTC);
+            assertEquals(expected, test.toLocalTime());
+            assertEquals(ZoneOffset.UTC, test.getOffset());
         }
     }
 
@@ -304,37 +309,37 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
             ZoneOffset offset = ZoneOffset.ofHours(i);
             Clock clock = Clock.fixed(base.toInstant(), offset);
             OffsetDateTime test = OffsetDateTime.now(clock);
-            assertEquals(test.getHour(), (12 + i) % 24);
-            assertEquals(test.getMinute(), 0);
-            assertEquals(test.getSecond(), 0);
-            assertEquals(test.getNano(), 0);
-            assertEquals(test.getOffset(), offset);
+            assertEquals((12 + i) % 24, test.getHour());
+            assertEquals(0, test.getMinute());
+            assertEquals(0, test.getSecond());
+            assertEquals(0, test.getNano());
+            assertEquals(offset, test.getOffset());
         }
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_Clock_nullZoneId() {
-        OffsetDateTime.now((ZoneId) null);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetDateTime.now((ZoneId) null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_Clock_nullClock() {
-        OffsetDateTime.now((Clock) null);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetDateTime.now((Clock) null));
     }
 
     //-----------------------------------------------------------------------
     private void check(OffsetDateTime test, int y, int mo, int d, int h, int m, int s, int n, ZoneOffset offset) {
-        assertEquals(test.getYear(), y);
-        assertEquals(test.getMonth().getValue(), mo);
-        assertEquals(test.getDayOfMonth(), d);
-        assertEquals(test.getHour(), h);
-        assertEquals(test.getMinute(), m);
-        assertEquals(test.getSecond(), s);
-        assertEquals(test.getNano(), n);
-        assertEquals(test.getOffset(), offset);
+        assertEquals(y, test.getYear());
+        assertEquals(mo, test.getMonth().getValue());
+        assertEquals(d, test.getDayOfMonth());
+        assertEquals(h, test.getHour());
+        assertEquals(m, test.getMinute());
+        assertEquals(s, test.getSecond());
+        assertEquals(n, test.getNano());
+        assertEquals(offset, test.getOffset());
         assertEquals(test, test);
         assertEquals(test.hashCode(), test.hashCode());
-        assertEquals(OffsetDateTime.of(LocalDateTime.of(y, mo, d, h, m, s, n), offset), test);
+        assertEquals(test, OffsetDateTime.of(LocalDateTime.of(y, mo, d, h, m, s, n), offset));
     }
 
     //-----------------------------------------------------------------------
@@ -355,23 +360,29 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         check(test, 2008, 6, 30, 11, 30, 10, 500, OFFSET_PONE);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_LocalDateLocalTimeZoneOffset_nullLocalDate() {
-        LocalTime time = LocalTime.of(11, 30, 10, 500);
-        OffsetDateTime.of((LocalDate) null, time, OFFSET_PONE);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            LocalTime time = LocalTime.of(11, 30, 10, 500);
+            OffsetDateTime.of((LocalDate) null, time, OFFSET_PONE);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_LocalDateLocalTimeZoneOffset_nullLocalTime() {
-        LocalDate date = LocalDate.of(2008, 6, 30);
-        OffsetDateTime.of(date, (LocalTime) null, OFFSET_PONE);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            LocalDate date = LocalDate.of(2008, 6, 30);
+            OffsetDateTime.of(date, (LocalTime) null, OFFSET_PONE);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_LocalDateLocalTimeZoneOffset_nullOffset() {
-        LocalDate date = LocalDate.of(2008, 6, 30);
-        LocalTime time = LocalTime.of(11, 30, 10, 500);
-        OffsetDateTime.of(date, time, (ZoneOffset) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            LocalDate date = LocalDate.of(2008, 6, 30);
+            LocalTime time = LocalTime.of(11, 30, 10, 500);
+            OffsetDateTime.of(date, time, (ZoneOffset) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -382,15 +393,17 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         check(test, 2008, 6, 30, 11, 30, 10, 500, OFFSET_PONE);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_LocalDateTimeZoneOffset_nullProvider() {
-        OffsetDateTime.of((LocalDateTime) null, OFFSET_PONE);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetDateTime.of((LocalDateTime) null, OFFSET_PONE));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_LocalDateTimeZoneOffset_nullOffset() {
-        LocalDateTime dt = LocalDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 10, 500));
-        OffsetDateTime.of(dt, (ZoneOffset) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            LocalDateTime dt = LocalDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 10, 500));
+            OffsetDateTime.of(dt, (ZoneOffset) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -398,50 +411,50 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_factory_CalendricalObject() {
-        assertEquals(OffsetDateTime.from(
-                OffsetDateTime.of(LocalDate.of(2007, 7, 15), LocalTime.of(17, 30), OFFSET_PONE)),
-                OffsetDateTime.of(LocalDate.of(2007, 7, 15), LocalTime.of(17, 30), OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2007, 7, 15), LocalTime.of(17, 30), OFFSET_PONE), OffsetDateTime.from(
+                OffsetDateTime.of(LocalDate.of(2007, 7, 15), LocalTime.of(17, 30), OFFSET_PONE)));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_CalendricalObject_invalid_noDerive() {
-        OffsetDateTime.from(LocalTime.of(12, 30));
+        Assertions.assertThrows(DateTimeException.class, () -> OffsetDateTime.from(LocalTime.of(12, 30)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_factory_Calendricals_null() {
-        OffsetDateTime.from((TemporalAccessor) null);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetDateTime.from((TemporalAccessor) null));
     }
 
     //-----------------------------------------------------------------------
     // parse()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleToString")
+    @ParameterizedTest
+    @MethodSource("provider_sampleToString")
     public void test_parse(int y, int month, int d, int h, int m, int s, int n, String offsetId, String text) {
         OffsetDateTime t = OffsetDateTime.parse(text);
-        assertEquals(t.getYear(), y);
-        assertEquals(t.getMonth().getValue(), month);
-        assertEquals(t.getDayOfMonth(), d);
-        assertEquals(t.getHour(), h);
-        assertEquals(t.getMinute(), m);
-        assertEquals(t.getSecond(), s);
-        assertEquals(t.getNano(), n);
-        assertEquals(t.getOffset().getId(), offsetId);
+        assertEquals(y, t.getYear());
+        assertEquals(month, t.getMonth().getValue());
+        assertEquals(d, t.getDayOfMonth());
+        assertEquals(h, t.getHour());
+        assertEquals(m, t.getMinute());
+        assertEquals(s, t.getSecond());
+        assertEquals(n, t.getNano());
+        assertEquals(offsetId, t.getOffset().getId());
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_illegalValue() {
-        OffsetDateTime.parse("2008-06-32T11:15+01:00");
+        Assertions.assertThrows(DateTimeParseException.class, () -> OffsetDateTime.parse("2008-06-32T11:15+01:00"));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_invalidValue() {
-        OffsetDateTime.parse("2008-06-31T11:15+01:00");
+        Assertions.assertThrows(DateTimeParseException.class, () -> OffsetDateTime.parse("2008-06-31T11:15+01:00"));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_nullText() {
-        OffsetDateTime.parse((String) null);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetDateTime.parse((String) null));
     }
 
     //-----------------------------------------------------------------------
@@ -451,35 +464,36 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void factory_parse_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d H m s XXX");
         OffsetDateTime test = OffsetDateTime.parse("2010 12 3 11 30 0 +01:00", f);
-        assertEquals(test, OffsetDateTime.of(LocalDate.of(2010, 12, 3), LocalTime.of(11, 30), ZoneOffset.ofHours(1)));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2010, 12, 3), LocalTime.of(11, 30), ZoneOffset.ofHours(1)), test);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullText() {
-        DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d H m s");
-        OffsetDateTime.parse((String) null, f);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d H m s");
+            OffsetDateTime.parse((String) null, f);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullFormatter() {
-        OffsetDateTime.parse("ANY", null);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetDateTime.parse("ANY", null));
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void constructor_nullTime() throws Throwable  {
-        OffsetDateTime.of(null, OFFSET_PONE);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetDateTime.of(null, OFFSET_PONE));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void constructor_nullOffset() throws Throwable  {
-        OffsetDateTime.of(LocalDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30)), null);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetDateTime.of(LocalDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30)), null));
     }
 
     //-----------------------------------------------------------------------
     // basics
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleTimes")
     Object[][] provider_sampleTimes() {
         return new Object[][] {
             {2008, 6, 30, 11, 30, 20, 500, OFFSET_PONE},
@@ -489,26 +503,27 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_get(int y, int o, int d, int h, int m, int s, int n, ZoneOffset offset) {
         LocalDate localDate = LocalDate.of(y, o, d);
         LocalTime localTime = LocalTime.of(h, m, s, n);
         LocalDateTime localDateTime = LocalDateTime.of(localDate, localTime);
         OffsetDateTime a = OffsetDateTime.of(localDateTime, offset);
 
-        assertEquals(a.getYear(), localDate.getYear());
-        assertEquals(a.getMonth(), localDate.getMonth());
-        assertEquals(a.getDayOfMonth(), localDate.getDayOfMonth());
-        assertEquals(a.getDayOfYear(), localDate.getDayOfYear());
-        assertEquals(a.getDayOfWeek(), localDate.getDayOfWeek());
+        assertEquals(localDate.getYear(), a.getYear());
+        assertEquals(localDate.getMonth(), a.getMonth());
+        assertEquals(localDate.getDayOfMonth(), a.getDayOfMonth());
+        assertEquals(localDate.getDayOfYear(), a.getDayOfYear());
+        assertEquals(localDate.getDayOfWeek(), a.getDayOfWeek());
 
-        assertEquals(a.getHour(), localDateTime.getHour());
-        assertEquals(a.getMinute(), localDateTime.getMinute());
-        assertEquals(a.getSecond(), localDateTime.getSecond());
-        assertEquals(a.getNano(), localDateTime.getNano());
+        assertEquals(localDateTime.getHour(), a.getHour());
+        assertEquals(localDateTime.getMinute(), a.getMinute());
+        assertEquals(localDateTime.getSecond(), a.getSecond());
+        assertEquals(localDateTime.getNano(), a.getNano());
 
-        assertEquals(a.toOffsetTime(), OffsetTime.of(localTime, offset));
-        assertEquals(a.toString(), localDateTime.toString() + offset.toString());
+        assertEquals(OffsetTime.of(localTime, offset), a.toOffsetTime());
+        assertEquals(localDateTime.toString() + offset.toString(), a.toString());
     }
 
     //-----------------------------------------------------------------------
@@ -516,37 +531,37 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalField() {
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported((TemporalField) null), false);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.NANO_OF_SECOND), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.NANO_OF_DAY), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MICRO_OF_SECOND), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MICRO_OF_DAY), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MILLI_OF_SECOND), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MILLI_OF_DAY), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.SECOND_OF_MINUTE), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.SECOND_OF_DAY), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MINUTE_OF_HOUR), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MINUTE_OF_DAY), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.HOUR_OF_AMPM), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.HOUR_OF_DAY), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.AMPM_OF_DAY), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.DAY_OF_WEEK), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.DAY_OF_MONTH), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.DAY_OF_YEAR), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.EPOCH_DAY), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MONTH_OF_YEAR), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.PROLEPTIC_MONTH), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.YEAR), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.YEAR_OF_ERA), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.ERA), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.INSTANT_SECONDS), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.OFFSET_SECONDS), true);
+        assertEquals(false, TEST_2008_6_30_11_30_59_000000500.isSupported((TemporalField) null));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.NANO_OF_SECOND));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.NANO_OF_DAY));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MICRO_OF_SECOND));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MICRO_OF_DAY));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MILLI_OF_SECOND));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MILLI_OF_DAY));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.SECOND_OF_DAY));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MINUTE_OF_DAY));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.HOUR_OF_AMPM));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.HOUR_OF_DAY));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.CLOCK_HOUR_OF_DAY));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.AMPM_OF_DAY));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.DAY_OF_WEEK));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.DAY_OF_MONTH));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.DAY_OF_YEAR));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.EPOCH_DAY));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MONTH_OF_YEAR));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.PROLEPTIC_MONTH));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.YEAR));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.YEAR_OF_ERA));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.ERA));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.INSTANT_SECONDS));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.OFFSET_SECONDS));
     }
 
     //-----------------------------------------------------------------------
@@ -554,23 +569,23 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalUnit() {
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported((TemporalUnit) null), false);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.NANOS), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.MICROS), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.MILLIS), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.SECONDS), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.MINUTES), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.HOURS), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.HALF_DAYS), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.DAYS), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.WEEKS), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.MONTHS), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.YEARS), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.DECADES), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.CENTURIES), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.MILLENNIA), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.ERAS), true);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.FOREVER), false);
+        assertEquals(false, TEST_2008_6_30_11_30_59_000000500.isSupported((TemporalUnit) null));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.NANOS));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.MICROS));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.MILLIS));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.SECONDS));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.MINUTES));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.HOURS));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.HALF_DAYS));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.DAYS));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.WEEKS));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.MONTHS));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.YEARS));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.DECADES));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.CENTURIES));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.MILLENNIA));
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.ERAS));
+        assertEquals(false, TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.FOREVER));
     }
 
     //-----------------------------------------------------------------------
@@ -579,46 +594,45 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     @Test
     public void test_get_TemporalField() {
         OffsetDateTime test = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(12, 30, 40, 987654321), OFFSET_PONE);
-        assertEquals(test.get(ChronoField.YEAR), 2008);
-        assertEquals(test.get(ChronoField.MONTH_OF_YEAR), 6);
-        assertEquals(test.get(ChronoField.DAY_OF_MONTH), 30);
-        assertEquals(test.get(ChronoField.DAY_OF_WEEK), 1);
-        assertEquals(test.get(ChronoField.DAY_OF_YEAR), 182);
+        assertEquals(2008, test.get(ChronoField.YEAR));
+        assertEquals(6, test.get(ChronoField.MONTH_OF_YEAR));
+        assertEquals(30, test.get(ChronoField.DAY_OF_MONTH));
+        assertEquals(1, test.get(ChronoField.DAY_OF_WEEK));
+        assertEquals(182, test.get(ChronoField.DAY_OF_YEAR));
 
-        assertEquals(test.get(ChronoField.HOUR_OF_DAY), 12);
-        assertEquals(test.get(ChronoField.MINUTE_OF_HOUR), 30);
-        assertEquals(test.get(ChronoField.SECOND_OF_MINUTE), 40);
-        assertEquals(test.get(ChronoField.NANO_OF_SECOND), 987654321);
-        assertEquals(test.get(ChronoField.HOUR_OF_AMPM), 0);
-        assertEquals(test.get(ChronoField.AMPM_OF_DAY), 1);
+        assertEquals(12, test.get(ChronoField.HOUR_OF_DAY));
+        assertEquals(30, test.get(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(40, test.get(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(987654321, test.get(ChronoField.NANO_OF_SECOND));
+        assertEquals(0, test.get(ChronoField.HOUR_OF_AMPM));
+        assertEquals(1, test.get(ChronoField.AMPM_OF_DAY));
 
-        assertEquals(test.get(ChronoField.OFFSET_SECONDS), 3600);
+        assertEquals(3600, test.get(ChronoField.OFFSET_SECONDS));
     }
 
     @Test
     public void test_getLong_TemporalField() {
         OffsetDateTime test = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(12, 30, 40, 987654321), OFFSET_PONE);
-        assertEquals(test.getLong(ChronoField.YEAR), 2008);
-        assertEquals(test.getLong(ChronoField.MONTH_OF_YEAR), 6);
-        assertEquals(test.getLong(ChronoField.DAY_OF_MONTH), 30);
-        assertEquals(test.getLong(ChronoField.DAY_OF_WEEK), 1);
-        assertEquals(test.getLong(ChronoField.DAY_OF_YEAR), 182);
+        assertEquals(2008, test.getLong(ChronoField.YEAR));
+        assertEquals(6, test.getLong(ChronoField.MONTH_OF_YEAR));
+        assertEquals(30, test.getLong(ChronoField.DAY_OF_MONTH));
+        assertEquals(1, test.getLong(ChronoField.DAY_OF_WEEK));
+        assertEquals(182, test.getLong(ChronoField.DAY_OF_YEAR));
 
-        assertEquals(test.getLong(ChronoField.HOUR_OF_DAY), 12);
-        assertEquals(test.getLong(ChronoField.MINUTE_OF_HOUR), 30);
-        assertEquals(test.getLong(ChronoField.SECOND_OF_MINUTE), 40);
-        assertEquals(test.getLong(ChronoField.NANO_OF_SECOND), 987654321);
-        assertEquals(test.getLong(ChronoField.HOUR_OF_AMPM), 0);
-        assertEquals(test.getLong(ChronoField.AMPM_OF_DAY), 1);
+        assertEquals(12, test.getLong(ChronoField.HOUR_OF_DAY));
+        assertEquals(30, test.getLong(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(40, test.getLong(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(987654321, test.getLong(ChronoField.NANO_OF_SECOND));
+        assertEquals(0, test.getLong(ChronoField.HOUR_OF_AMPM));
+        assertEquals(1, test.getLong(ChronoField.AMPM_OF_DAY));
 
-        assertEquals(test.getLong(ChronoField.INSTANT_SECONDS), test.toEpochSecond());
-        assertEquals(test.getLong(ChronoField.OFFSET_SECONDS), 3600);
+        assertEquals(test.toEpochSecond(), test.getLong(ChronoField.INSTANT_SECONDS));
+        assertEquals(3600, test.getLong(ChronoField.OFFSET_SECONDS));
     }
 
     //-----------------------------------------------------------------------
     // query(TemporalQuery)
     //-----------------------------------------------------------------------
-    @DataProvider(name="query")
     Object[][] data_query() {
         return new Object[][] {
                 {TEST_2008_6_30_11_30_59_000000500, TemporalQueries.chronology(), IsoChronology.INSTANCE},
@@ -631,25 +645,26 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_query(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(temporal.query(query), expected);
+        assertEquals(expected, temporal.query(query));
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_queryFrom(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(query.queryFrom(temporal), expected);
+        assertEquals(expected, query.queryFrom(temporal));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_query_null() {
-        TEST_2008_6_30_11_30_59_000000500.query(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008_6_30_11_30_59_000000500.query(null));
     }
 
     //-----------------------------------------------------------------------
     // adjustInto(Temporal)
     //-----------------------------------------------------------------------
-    @DataProvider(name="adjustInto")
     Object[][] data_adjustInto() {
         return new Object[][]{
                 {OffsetDateTime.of(2012, 3, 4, 23, 5, 0, 0, OFFSET_PONE), OffsetDateTime.of(2012, 3, 4, 1, 1, 1, 100, ZoneOffset.UTC), OffsetDateTime.of(2012, 3, 4, 23, 5, 0, 0, OFFSET_PONE), null},
@@ -671,11 +686,12 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="adjustInto")
+    @ParameterizedTest
+    @MethodSource("data_adjustInto")
     public void test_adjustInto(OffsetDateTime test, Temporal temporal, Temporal expected, Class<?> expectedEx) {
         if (expectedEx == null) {
             Temporal result = test.adjustInto(temporal);
-            assertEquals(result, expected);
+            assertEquals(expected, result);
         } else {
             try {
                 Temporal result = test.adjustInto(temporal);
@@ -698,60 +714,62 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
                 return sample;
             }
         };
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.with(adjuster), sample);
+        assertEquals(sample, TEST_2008_6_30_11_30_59_000000500.with(adjuster));
     }
 
     @Test
     public void test_with_adjustment_LocalDate() {
         OffsetDateTime test = TEST_2008_6_30_11_30_59_000000500.with(LocalDate.of(2012, 9, 3));
-        assertEquals(test, OffsetDateTime.of(LocalDate.of(2012, 9, 3), LocalTime.of(11, 30, 59, 500), OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2012, 9, 3), LocalTime.of(11, 30, 59, 500), OFFSET_PONE), test);
     }
 
     @Test
     public void test_with_adjustment_LocalTime() {
         OffsetDateTime test = TEST_2008_6_30_11_30_59_000000500.with(LocalTime.of(19, 15));
-        assertEquals(test, OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(19, 15), OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(19, 15), OFFSET_PONE), test);
     }
 
     @Test
     public void test_with_adjustment_LocalDateTime() {
         OffsetDateTime test = TEST_2008_6_30_11_30_59_000000500.with(LocalDateTime.of(LocalDate.of(2012, 9, 3), LocalTime.of(19, 15)));
-        assertEquals(test, OffsetDateTime.of(LocalDate.of(2012, 9, 3), LocalTime.of(19, 15), OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2012, 9, 3), LocalTime.of(19, 15), OFFSET_PONE), test);
     }
 
     @Test
     public void test_with_adjustment_OffsetTime() {
         OffsetDateTime test = TEST_2008_6_30_11_30_59_000000500.with(OffsetTime.of(LocalTime.of(19, 15), OFFSET_PTWO));
-        assertEquals(test, OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(19, 15), OFFSET_PTWO));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(19, 15), OFFSET_PTWO), test);
     }
 
     @Test
     public void test_with_adjustment_OffsetDateTime() {
         OffsetDateTime test = TEST_2008_6_30_11_30_59_000000500.with(OffsetDateTime.of(LocalDate.of(2012, 9, 3), LocalTime.of(19, 15), OFFSET_PTWO));
-        assertEquals(test, OffsetDateTime.of(LocalDate.of(2012, 9, 3), LocalTime.of(19, 15), OFFSET_PTWO));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2012, 9, 3), LocalTime.of(19, 15), OFFSET_PTWO), test);
     }
 
     @Test
     public void test_with_adjustment_Month() {
         OffsetDateTime test = TEST_2008_6_30_11_30_59_000000500.with(DECEMBER);
-        assertEquals(test, OffsetDateTime.of(LocalDate.of(2008, 12, 30),LocalTime.of(11, 30, 59, 500), OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2008, 12, 30),LocalTime.of(11, 30, 59, 500), OFFSET_PONE), test);
     }
 
     @Test
     public void test_with_adjustment_ZoneOffset() {
         OffsetDateTime test = TEST_2008_6_30_11_30_59_000000500.with(OFFSET_PTWO);
-        assertEquals(test, OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59, 500), OFFSET_PTWO));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59, 500), OFFSET_PTWO), test);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_with_adjustment_null() {
-        TEST_2008_6_30_11_30_59_000000500.with((TemporalAdjuster) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008_6_30_11_30_59_000000500.with((TemporalAdjuster) null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_withOffsetSameLocal_null() {
-        OffsetDateTime base = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59), OFFSET_PONE);
-        base.withOffsetSameLocal(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            OffsetDateTime base = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59), OFFSET_PONE);
+            base.withOffsetSameLocal(null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -762,19 +780,20 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         OffsetDateTime base = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59), OFFSET_PONE);
         OffsetDateTime test = base.withOffsetSameInstant(OFFSET_PTWO);
         OffsetDateTime expected = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(12, 30, 59), OFFSET_PTWO);
-        assertEquals(test, expected);
+        assertEquals(expected, test);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_withOffsetSameInstant_null() {
-        OffsetDateTime base = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59), OFFSET_PONE);
-        base.withOffsetSameInstant(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            OffsetDateTime base = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59), OFFSET_PONE);
+            base.withOffsetSameInstant(null);
+        });
     }
 
     //-----------------------------------------------------------------------
     // with(long,TemporalUnit)
     //-----------------------------------------------------------------------
-    @DataProvider(name = "withFieldLong")
     Object[][] data_withFieldLong() {
         return new Object[][] {
                 {TEST_2008_6_30_11_30_59_000000500, YEAR, 2009,
@@ -790,9 +809,10 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         };
     };
 
-    @Test(dataProvider = "withFieldLong")
+    @ParameterizedTest
+    @MethodSource("data_withFieldLong")
     public void test_with_fieldLong(OffsetDateTime base, TemporalField setField, long setValue, OffsetDateTime expected) {
-        assertEquals(base.with(setField, setValue), expected);
+        assertEquals(expected, base.with(setField, setValue));
     }
 
     //-----------------------------------------------------------------------
@@ -802,7 +822,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_withYear_normal() {
         OffsetDateTime base = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59), OFFSET_PONE);
         OffsetDateTime test = base.withYear(2007);
-        assertEquals(test, OffsetDateTime.of(LocalDate.of(2007, 6, 30), LocalTime.of(11, 30, 59), OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2007, 6, 30), LocalTime.of(11, 30, 59), OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -812,7 +832,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_withMonth_normal() {
         OffsetDateTime base = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59), OFFSET_PONE);
         OffsetDateTime test = base.withMonth(1);
-        assertEquals(test, OffsetDateTime.of(LocalDate.of(2008, 1, 30), LocalTime.of(11, 30, 59), OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2008, 1, 30), LocalTime.of(11, 30, 59), OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -822,7 +842,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_withDayOfMonth_normal() {
         OffsetDateTime base = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59), OFFSET_PONE);
         OffsetDateTime test = base.withDayOfMonth(15);
-        assertEquals(test, OffsetDateTime.of(LocalDate.of(2008, 6, 15), LocalTime.of(11, 30, 59), OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2008, 6, 15), LocalTime.of(11, 30, 59), OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -831,17 +851,17 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     @Test
     public void test_withDayOfYear_normal() {
         OffsetDateTime t = TEST_2008_6_30_11_30_59_000000500.withDayOfYear(33);
-        assertEquals(t, OffsetDateTime.of(LocalDate.of(2008, 2, 2), LocalTime.of(11, 30, 59, 500), OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2008, 2, 2), LocalTime.of(11, 30, 59, 500), OFFSET_PONE), t);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfYear_illegal() {
-        TEST_2008_6_30_11_30_59_000000500.withDayOfYear(367);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_2008_6_30_11_30_59_000000500.withDayOfYear(367));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfYear_invalid() {
-        OffsetDateTime.of(LocalDate.of(2007, 2, 2), LocalTime.of(11, 30), OFFSET_PONE).withDayOfYear(366);
+        Assertions.assertThrows(DateTimeException.class, () -> OffsetDateTime.of(LocalDate.of(2007, 2, 2), LocalTime.of(11, 30), OFFSET_PONE).withDayOfYear(366));
     }
 
     //-----------------------------------------------------------------------
@@ -851,7 +871,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_withHour_normal() {
         OffsetDateTime base = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59), OFFSET_PONE);
         OffsetDateTime test = base.withHour(15);
-        assertEquals(test, OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(15, 30, 59), OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(15, 30, 59), OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -861,7 +881,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_withMinute_normal() {
         OffsetDateTime base = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59), OFFSET_PONE);
         OffsetDateTime test = base.withMinute(15);
-        assertEquals(test, OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 15, 59), OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 15, 59), OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -871,7 +891,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_withSecond_normal() {
         OffsetDateTime base = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59), OFFSET_PONE);
         OffsetDateTime test = base.withSecond(15);
-        assertEquals(test, OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 15), OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 15), OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -881,7 +901,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_withNanoOfSecond_normal() {
         OffsetDateTime base = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59, 1), OFFSET_PONE);
         OffsetDateTime test = base.withNano(15);
-        assertEquals(test, OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59, 15), OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59, 15), OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -889,14 +909,14 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_truncatedTo_normal() {
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.truncatedTo(NANOS), TEST_2008_6_30_11_30_59_000000500);
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.truncatedTo(SECONDS), TEST_2008_6_30_11_30_59_000000500.withNano(0));
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.truncatedTo(DAYS), TEST_2008_6_30_11_30_59_000000500.with(LocalTime.MIDNIGHT));
+        assertEquals(TEST_2008_6_30_11_30_59_000000500, TEST_2008_6_30_11_30_59_000000500.truncatedTo(NANOS));
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.withNano(0), TEST_2008_6_30_11_30_59_000000500.truncatedTo(SECONDS));
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.with(LocalTime.MIDNIGHT), TEST_2008_6_30_11_30_59_000000500.truncatedTo(DAYS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_truncatedTo_null() {
-        TEST_2008_6_30_11_30_59_000000500.truncatedTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008_6_30_11_30_59_000000500.truncatedTo(null));
     }
 
     //-----------------------------------------------------------------------
@@ -906,7 +926,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_plus_Period() {
         MockSimplePeriod period = MockSimplePeriod.of(7, ChronoUnit.MONTHS);
         OffsetDateTime t = TEST_2008_6_30_11_30_59_000000500.plus(period);
-        assertEquals(t, OffsetDateTime.of(2009, 1, 30, 11, 30, 59, 500, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2009, 1, 30, 11, 30, 59, 500, OFFSET_PONE), t);
     }
 
     //-----------------------------------------------------------------------
@@ -916,18 +936,18 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_plus_Duration() {
         Duration dur = Duration.ofSeconds(62, 3);
         OffsetDateTime t = TEST_2008_6_30_11_30_59_000000500.plus(dur);
-        assertEquals(t, OffsetDateTime.of(2008, 6, 30, 11, 32, 1, 503, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 6, 30, 11, 32, 1, 503, OFFSET_PONE), t);
     }
 
     @Test
     public void test_plus_Duration_zero() {
         OffsetDateTime t = TEST_2008_6_30_11_30_59_000000500.plus(Duration.ZERO);
-        assertEquals(t, TEST_2008_6_30_11_30_59_000000500);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500, t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_plus_Duration_null() {
-        TEST_2008_6_30_11_30_59_000000500.plus((Duration) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008_6_30_11_30_59_000000500.plus((Duration) null));
     }
 
     //-----------------------------------------------------------------------
@@ -937,7 +957,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_plusYears() {
         OffsetDateTime base = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
         OffsetDateTime test = base.plusYears(1);
-        assertEquals(test, OffsetDateTime.of(2009, 6, 30, 11, 30, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2009, 6, 30, 11, 30, 59, 0, OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -947,7 +967,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_plusMonths() {
         OffsetDateTime base = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
         OffsetDateTime test = base.plusMonths(1);
-        assertEquals(test, OffsetDateTime.of(2008, 7, 30, 11, 30, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 7, 30, 11, 30, 59, 0, OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -957,7 +977,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_plusWeeks() {
         OffsetDateTime base = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
         OffsetDateTime test = base.plusWeeks(1);
-        assertEquals(test, OffsetDateTime.of(2008, 7, 7, 11, 30, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 7, 7, 11, 30, 59, 0, OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -967,7 +987,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_plusDays() {
         OffsetDateTime base = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
         OffsetDateTime test = base.plusDays(1);
-        assertEquals(test, OffsetDateTime.of(2008, 7, 1, 11, 30, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 7, 1, 11, 30, 59, 0, OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -977,7 +997,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_plusHours() {
         OffsetDateTime base = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
         OffsetDateTime test = base.plusHours(13);
-        assertEquals(test, OffsetDateTime.of(2008, 7, 1, 0, 30, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 7, 1, 0, 30, 59, 0, OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -987,7 +1007,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_plusMinutes() {
         OffsetDateTime base = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
         OffsetDateTime test = base.plusMinutes(30);
-        assertEquals(test, OffsetDateTime.of(2008, 6, 30, 12, 0, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 6, 30, 12, 0, 59, 0, OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -997,7 +1017,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_plusSeconds() {
         OffsetDateTime base = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
         OffsetDateTime test = base.plusSeconds(1);
-        assertEquals(test, OffsetDateTime.of(2008, 6, 30, 11, 31, 0, 0, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 6, 30, 11, 31, 0, 0, OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -1007,7 +1027,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_plusNanos() {
         OffsetDateTime base = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
         OffsetDateTime test = base.plusNanos(1);
-        assertEquals(test, OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 1, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 1, OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -1017,7 +1037,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_minus_Period() {
         MockSimplePeriod period = MockSimplePeriod.of(7, ChronoUnit.MONTHS);
         OffsetDateTime t = TEST_2008_6_30_11_30_59_000000500.minus(period);
-        assertEquals(t, OffsetDateTime.of(2007, 11, 30, 11, 30, 59, 500, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2007, 11, 30, 11, 30, 59, 500, OFFSET_PONE), t);
     }
 
     //-----------------------------------------------------------------------
@@ -1027,18 +1047,18 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_minus_Duration() {
         Duration dur = Duration.ofSeconds(62, 3);
         OffsetDateTime t = TEST_2008_6_30_11_30_59_000000500.minus(dur);
-        assertEquals(t, OffsetDateTime.of(2008, 6, 30, 11, 29, 57, 497, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 6, 30, 11, 29, 57, 497, OFFSET_PONE), t);
     }
 
     @Test
     public void test_minus_Duration_zero() {
         OffsetDateTime t = TEST_2008_6_30_11_30_59_000000500.minus(Duration.ZERO);
-        assertEquals(t, TEST_2008_6_30_11_30_59_000000500);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500, t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_minus_Duration_null() {
-        TEST_2008_6_30_11_30_59_000000500.minus((Duration) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008_6_30_11_30_59_000000500.minus((Duration) null));
     }
 
     //-----------------------------------------------------------------------
@@ -1048,7 +1068,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_minusYears() {
         OffsetDateTime base = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
         OffsetDateTime test = base.minusYears(1);
-        assertEquals(test, OffsetDateTime.of(2007, 6, 30, 11, 30, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2007, 6, 30, 11, 30, 59, 0, OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -1058,7 +1078,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_minusMonths() {
         OffsetDateTime base = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
         OffsetDateTime test = base.minusMonths(1);
-        assertEquals(test, OffsetDateTime.of(2008, 5, 30, 11, 30, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 5, 30, 11, 30, 59, 0, OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -1068,7 +1088,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_minusWeeks() {
         OffsetDateTime base = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
         OffsetDateTime test = base.minusWeeks(1);
-        assertEquals(test, OffsetDateTime.of(2008, 6, 23, 11, 30, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 6, 23, 11, 30, 59, 0, OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -1078,7 +1098,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_minusDays() {
         OffsetDateTime base = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
         OffsetDateTime test = base.minusDays(1);
-        assertEquals(test, OffsetDateTime.of(2008, 6, 29, 11, 30, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 6, 29, 11, 30, 59, 0, OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -1088,7 +1108,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_minusHours() {
         OffsetDateTime base = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
         OffsetDateTime test = base.minusHours(13);
-        assertEquals(test, OffsetDateTime.of(2008, 6, 29, 22, 30, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 6, 29, 22, 30, 59, 0, OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -1098,7 +1118,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_minusMinutes() {
         OffsetDateTime base = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
         OffsetDateTime test = base.minusMinutes(30);
-        assertEquals(test, OffsetDateTime.of(2008, 6, 30, 11, 0, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 6, 30, 11, 0, 59, 0, OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -1108,7 +1128,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_minusSeconds() {
         OffsetDateTime base = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
         OffsetDateTime test = base.minusSeconds(1);
-        assertEquals(test, OffsetDateTime.of(2008, 6, 30, 11, 30, 58, 0, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 6, 30, 11, 30, 58, 0, OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
@@ -1118,13 +1138,12 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_minusNanos() {
         OffsetDateTime base = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
         OffsetDateTime test = base.minusNanos(1);
-        assertEquals(test, OffsetDateTime.of(2008, 6, 30, 11, 30, 58, 999999999, OFFSET_PONE));
+        assertEquals(OffsetDateTime.of(2008, 6, 30, 11, 30, 58, 999999999, OFFSET_PONE), test);
     }
 
     //-----------------------------------------------------------------------
     // until(Temporal, TemporalUnit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="periodUntilUnit")
     Object[][] data_untilUnit() {
         return new Object[][] {
                 {OffsetDateTime.of(2010, 6, 30, 1, 1, 1, 0, OFFSET_PONE), OffsetDateTime.of(2010, 6, 30, 13, 1, 1, 0, OFFSET_PONE), HALF_DAYS, 1},
@@ -1151,42 +1170,49 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_untilUnit")
     public void test_until_TemporalUnit(OffsetDateTime odt1, OffsetDateTime odt2, TemporalUnit unit, long expected) {
         long amount = odt1.until(odt2, unit);
-        assertEquals(amount, expected);
+        assertEquals(expected, amount);
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_untilUnit")
     public void test_until_TemporalUnit_negated(OffsetDateTime odt1, OffsetDateTime odt2, TemporalUnit unit, long expected) {
         long amount = odt2.until(odt1, unit);
-        assertEquals(amount, -expected);
+        assertEquals(-expected, amount);
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_untilUnit")
     public void test_until_TemporalUnit_between(OffsetDateTime odt1, OffsetDateTime odt2, TemporalUnit unit, long expected) {
         long amount = unit.between(odt1, odt2);
-        assertEquals(amount, expected);
+        assertEquals(expected, amount);
     }
 
     @Test
     public void test_until_convertedType() {
         OffsetDateTime odt = OffsetDateTime.of(2010, 6, 30, 1, 1, 1, 0, OFFSET_PONE);
         ZonedDateTime zdt = odt.plusSeconds(3).toZonedDateTime();
-        assertEquals(odt.until(zdt, SECONDS), 3);
+        assertEquals(3, odt.until(zdt, SECONDS));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_until_invalidType() {
-        OffsetDateTime odt = OffsetDateTime.of(2010, 6, 30, 1, 1, 1, 0, OFFSET_PONE);
-        odt.until(Instant.ofEpochSecond(12), SECONDS);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            OffsetDateTime odt = OffsetDateTime.of(2010, 6, 30, 1, 1, 1, 0, OFFSET_PONE);
+            odt.until(Instant.ofEpochSecond(12), SECONDS);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_until_invalidTemporalUnit() {
-        OffsetDateTime odt1 = OffsetDateTime.of(2010, 6, 30, 1, 1, 1, 0, OFFSET_PONE);
-        OffsetDateTime odt2 = OffsetDateTime.of(2010, 6, 30, 2, 1, 1, 0, OFFSET_PONE);
-        odt1.until(odt2, FOREVER);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            OffsetDateTime odt1 = OffsetDateTime.of(2010, 6, 30, 1, 1, 1, 0, OFFSET_PONE);
+            OffsetDateTime odt2 = OffsetDateTime.of(2010, 6, 30, 2, 1, 1, 0, OFFSET_PONE);
+            odt1.until(odt2, FOREVER);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1196,12 +1222,12 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_format_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d H m s");
         String t = OffsetDateTime.of(2010, 12, 3, 11, 30, 0, 0, OFFSET_PONE).format(f);
-        assertEquals(t, "2010 12 3 11 30 0");
+        assertEquals("2010 12 3 11 30 0", t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_format_formatter_null() {
-        OffsetDateTime.of(2010, 12, 3, 11, 30, 0, 0, OFFSET_PONE).format(null);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetDateTime.of(2010, 12, 3, 11, 30, 0, 0, OFFSET_PONE).format(null));
     }
 
     //-----------------------------------------------------------------------
@@ -1210,14 +1236,15 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     @Test
     public void test_atZone() {
         OffsetDateTime t = OffsetDateTime.of(2008, 6, 30, 11, 30, 0, 0, OFFSET_MTWO);
-        assertEquals(t.atZoneSameInstant(ZONE_PARIS),
-                ZonedDateTime.of(2008, 6, 30, 15, 30, 0, 0, ZONE_PARIS));
+        assertEquals(ZonedDateTime.of(2008, 6, 30, 15, 30, 0, 0, ZONE_PARIS), t.atZoneSameInstant(ZONE_PARIS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_atZone_nullTimeZone() {
-        OffsetDateTime t = OffsetDateTime.of(2008, 6, 30, 11, 30, 0, 0, OFFSET_PTWO);
-        t.atZoneSameInstant((ZoneId) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            OffsetDateTime t = OffsetDateTime.of(2008, 6, 30, 11, 30, 0, 0, OFFSET_PTWO);
+            t.atZoneSameInstant((ZoneId) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1226,37 +1253,37 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     @Test
     public void test_atZoneSimilarLocal() {
         OffsetDateTime t = OffsetDateTime.of(2008, 6, 30, 11, 30, 0, 0, OFFSET_MTWO);
-        assertEquals(t.atZoneSimilarLocal(ZONE_PARIS),
-                ZonedDateTime.of(2008, 6, 30, 11, 30, 0, 0, ZONE_PARIS));
+        assertEquals(ZonedDateTime.of(2008, 6, 30, 11, 30, 0, 0, ZONE_PARIS), t.atZoneSimilarLocal(ZONE_PARIS));
     }
 
     @Test
     public void test_atZoneSimilarLocal_dstGap() {
         OffsetDateTime t = OffsetDateTime.of(2007, 4, 1, 0, 0, 0, 0, OFFSET_MTWO);
-        assertEquals(t.atZoneSimilarLocal(ZONE_GAZA),
-                ZonedDateTime.of(2007, 4, 1, 1, 0, 0, 0, ZONE_GAZA));
+        assertEquals(ZonedDateTime.of(2007, 4, 1, 1, 0, 0, 0, ZONE_GAZA), t.atZoneSimilarLocal(ZONE_GAZA));
     }
 
     @Test
     public void test_atZone_dstOverlapSummer() {
         OffsetDateTime t = OffsetDateTime.of(2007, 10, 28, 2, 30, 0, 0, OFFSET_PTWO);
-        assertEquals(t.atZoneSimilarLocal(ZONE_PARIS).toLocalDateTime(), t.toLocalDateTime());
-        assertEquals(t.atZoneSimilarLocal(ZONE_PARIS).getOffset(), OFFSET_PTWO);
-        assertEquals(t.atZoneSimilarLocal(ZONE_PARIS).getZone(), ZONE_PARIS);
+        assertEquals(t.toLocalDateTime(), t.atZoneSimilarLocal(ZONE_PARIS).toLocalDateTime());
+        assertEquals(OFFSET_PTWO, t.atZoneSimilarLocal(ZONE_PARIS).getOffset());
+        assertEquals(ZONE_PARIS, t.atZoneSimilarLocal(ZONE_PARIS).getZone());
     }
 
     @Test
     public void test_atZone_dstOverlapWinter() {
         OffsetDateTime t = OffsetDateTime.of(2007, 10, 28, 2, 30, 0, 0, OFFSET_PONE);
-        assertEquals(t.atZoneSimilarLocal(ZONE_PARIS).toLocalDateTime(), t.toLocalDateTime());
-        assertEquals(t.atZoneSimilarLocal(ZONE_PARIS).getOffset(), OFFSET_PONE);
-        assertEquals(t.atZoneSimilarLocal(ZONE_PARIS).getZone(), ZONE_PARIS);
+        assertEquals(t.toLocalDateTime(), t.atZoneSimilarLocal(ZONE_PARIS).toLocalDateTime());
+        assertEquals(OFFSET_PONE, t.atZoneSimilarLocal(ZONE_PARIS).getOffset());
+        assertEquals(ZONE_PARIS, t.atZoneSimilarLocal(ZONE_PARIS).getZone());
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_atZoneSimilarLocal_nullTimeZone() {
-        OffsetDateTime t = OffsetDateTime.of(2008, 6, 30, 11, 30, 0, 0, OFFSET_PTWO);
-        t.atZoneSimilarLocal((ZoneId) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            OffsetDateTime t = OffsetDateTime.of(2008, 6, 30, 11, 30, 0, 0, OFFSET_PTWO);
+            t.atZoneSimilarLocal((ZoneId) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1266,7 +1293,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_toEpochSecond_afterEpoch() {
         for (int i = 0; i < 100000; i++) {
             OffsetDateTime a = OffsetDateTime.of(1970, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC).plusSeconds(i);
-            assertEquals(a.toEpochSecond(), i);
+            assertEquals(i, a.toEpochSecond());
         }
     }
 
@@ -1274,7 +1301,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_toEpochSecond_beforeEpoch() {
         for (int i = 0; i < 100000; i++) {
             OffsetDateTime a = OffsetDateTime.of(1970, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC).minusSeconds(i);
-            assertEquals(a.toEpochSecond(), -i);
+            assertEquals(-i, a.toEpochSecond());
         }
     }
 
@@ -1285,136 +1312,140 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_compareTo_timeMins() {
         OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 29, 3, 0, OFFSET_PONE);
         OffsetDateTime b = OffsetDateTime.of(2008, 6, 30, 11, 30, 2, 0, OFFSET_PONE);  // a is before b due to time
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
-        assertEquals(a.toInstant().compareTo(b.toInstant()) < 0, true);
-        assertEquals(OffsetDateTime.timeLineOrder().compare(a, b) < 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
+        assertEquals(true, a.toInstant().compareTo(b.toInstant()) < 0);
+        assertEquals(true, OffsetDateTime.timeLineOrder().compare(a, b) < 0);
     }
 
     @Test
     public void test_compareTo_timeSecs() {
         OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 29, 2, 0, OFFSET_PONE);
         OffsetDateTime b = OffsetDateTime.of(2008, 6, 30, 11, 29, 3, 0, OFFSET_PONE);  // a is before b due to time
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
-        assertEquals(a.toInstant().compareTo(b.toInstant()) < 0, true);
-        assertEquals(OffsetDateTime.timeLineOrder().compare(a, b) < 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
+        assertEquals(true, a.toInstant().compareTo(b.toInstant()) < 0);
+        assertEquals(true, OffsetDateTime.timeLineOrder().compare(a, b) < 0);
     }
 
     @Test
     public void test_compareTo_timeNanos() {
         OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 29, 40, 4, OFFSET_PONE);
         OffsetDateTime b = OffsetDateTime.of(2008, 6, 30, 11, 29, 40, 5, OFFSET_PONE);  // a is before b due to time
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
-        assertEquals(a.toInstant().compareTo(b.toInstant()) < 0, true);
-        assertEquals(OffsetDateTime.timeLineOrder().compare(a, b) < 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
+        assertEquals(true, a.toInstant().compareTo(b.toInstant()) < 0);
+        assertEquals(true, OffsetDateTime.timeLineOrder().compare(a, b) < 0);
     }
 
     @Test
     public void test_compareTo_offset() {
         OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 30, 0, 0, OFFSET_PTWO);
         OffsetDateTime b = OffsetDateTime.of(2008, 6, 30, 11, 30, 0, 0, OFFSET_PONE);  // a is before b due to offset
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
-        assertEquals(a.toInstant().compareTo(b.toInstant()) < 0, true);
-        assertEquals(OffsetDateTime.timeLineOrder().compare(a, b) < 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
+        assertEquals(true, a.toInstant().compareTo(b.toInstant()) < 0);
+        assertEquals(true, OffsetDateTime.timeLineOrder().compare(a, b) < 0);
     }
 
     @Test
     public void test_compareTo_offsetNanos() {
         OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 30, 40, 6, OFFSET_PTWO);
         OffsetDateTime b = OffsetDateTime.of(2008, 6, 30, 11, 30, 40, 5, OFFSET_PONE);  // a is before b due to offset
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
-        assertEquals(a.toInstant().compareTo(b.toInstant()) < 0, true);
-        assertEquals(OffsetDateTime.timeLineOrder().compare(a, b) < 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
+        assertEquals(true, a.toInstant().compareTo(b.toInstant()) < 0);
+        assertEquals(true, OffsetDateTime.timeLineOrder().compare(a, b) < 0);
     }
 
     @Test
     public void test_compareTo_both() {
         OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 50, 0, 0, OFFSET_PTWO);
         OffsetDateTime b = OffsetDateTime.of(2008, 6, 30, 11, 20, 0, 0, OFFSET_PONE);  // a is before b on instant scale
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
-        assertEquals(a.toInstant().compareTo(b.toInstant()) < 0, true);
-        assertEquals(OffsetDateTime.timeLineOrder().compare(a, b) < 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
+        assertEquals(true, a.toInstant().compareTo(b.toInstant()) < 0);
+        assertEquals(true, OffsetDateTime.timeLineOrder().compare(a, b) < 0);
     }
 
     @Test
     public void test_compareTo_bothNanos() {
         OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 20, 40, 4, OFFSET_PTWO);
         OffsetDateTime b = OffsetDateTime.of(2008, 6, 30, 10, 20, 40, 5, OFFSET_PONE);  // a is before b on instant scale
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
-        assertEquals(a.toInstant().compareTo(b.toInstant()) < 0, true);
-        assertEquals(OffsetDateTime.timeLineOrder().compare(a, b) < 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
+        assertEquals(true, a.toInstant().compareTo(b.toInstant()) < 0);
+        assertEquals(true, OffsetDateTime.timeLineOrder().compare(a, b) < 0);
     }
 
     @Test
     public void test_compareTo_bothInstantComparator() {
         OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 20, 40, 4, OFFSET_PTWO);
         OffsetDateTime b = OffsetDateTime.of(2008, 6, 30, 10, 20, 40, 5, OFFSET_PONE);
-        assertEquals(a.compareTo(b), OffsetDateTime.timeLineOrder().compare(a,b), "for nano != nano, compareTo and timeLineOrder() should be the same");
+        assertEquals(OffsetDateTime.timeLineOrder().compare(a,b), a.compareTo(b), "for nano != nano, compareTo and timeLineOrder() should be the same");
     }
 
     @Test
     public void test_compareTo_hourDifference() {
         OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 10, 0, 0, 0, OFFSET_PONE);
         OffsetDateTime b = OffsetDateTime.of(2008, 6, 30, 11, 0, 0, 0, OFFSET_PTWO);  // a is before b despite being same time-line time
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
-        assertEquals(a.toInstant().compareTo(b.toInstant()) == 0, true);
-        assertEquals(OffsetDateTime.timeLineOrder().compare(a,b) == 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
+        assertEquals(true, a.toInstant().compareTo(b.toInstant()) == 0);
+        assertEquals(true, OffsetDateTime.timeLineOrder().compare(a,b) == 0);
     }
 
     @Test
     public void test_compareTo_max() {
         OffsetDateTime a = OffsetDateTime.of(Year.MAX_VALUE, 12, 31, 23, 59, 0, 0, OFFSET_MONE);
         OffsetDateTime b = OffsetDateTime.of(Year.MAX_VALUE, 12, 31, 23, 59, 0, 0, OFFSET_MTWO);  // a is before b due to offset
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
     }
 
     @Test
     public void test_compareTo_min() {
         OffsetDateTime a = OffsetDateTime.of(Year.MIN_VALUE, 1, 1, 0, 0, 0, 0, OFFSET_PTWO);
         OffsetDateTime b = OffsetDateTime.of(Year.MIN_VALUE, 1, 1, 0, 0, 0, 0, OFFSET_PONE);  // a is before b due to offset
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_compareTo_null() {
-        OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
-        a.compareTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
+            a.compareTo(null);
+        });
     }
 
-    @Test(expectedExceptions=ClassCastException.class)
     @SuppressWarnings({"unchecked", "rawtypes"})
+    @Test
     public void compareToNonOffsetDateTime() {
-       Comparable c = TEST_2008_6_30_11_30_59_000000500;
-       c.compareTo(new Object());
+       Assertions.assertThrows(ClassCastException.class, () -> {
+           Comparable c = TEST_2008_6_30_11_30_59_000000500;
+           c.compareTo(new Object());
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1424,156 +1455,168 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
     public void test_isBeforeIsAfterIsEqual1() {
         OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 30, 58, 3, OFFSET_PONE);
         OffsetDateTime b = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 2, OFFSET_PONE);  // a is before b due to time
-        assertEquals(a.isBefore(b), true);
-        assertEquals(a.isEqual(b), false);
-        assertEquals(a.isAfter(b), false);
+        assertEquals(true, a.isBefore(b));
+        assertEquals(false, a.isEqual(b));
+        assertEquals(false, a.isAfter(b));
 
-        assertEquals(b.isBefore(a), false);
-        assertEquals(b.isEqual(a), false);
-        assertEquals(b.isAfter(a), true);
+        assertEquals(false, b.isBefore(a));
+        assertEquals(false, b.isEqual(a));
+        assertEquals(true, b.isAfter(a));
 
-        assertEquals(a.isBefore(a), false);
-        assertEquals(b.isBefore(b), false);
+        assertEquals(false, a.isBefore(a));
+        assertEquals(false, b.isBefore(b));
 
-        assertEquals(a.isEqual(a), true);
-        assertEquals(b.isEqual(b), true);
+        assertEquals(true, a.isEqual(a));
+        assertEquals(true, b.isEqual(b));
 
-        assertEquals(a.isAfter(a), false);
-        assertEquals(b.isAfter(b), false);
+        assertEquals(false, a.isAfter(a));
+        assertEquals(false, b.isAfter(b));
     }
 
     @Test
     public void test_isBeforeIsAfterIsEqual2() {
         OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 2, OFFSET_PONE);
         OffsetDateTime b = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 3, OFFSET_PONE);  // a is before b due to time
-        assertEquals(a.isBefore(b), true);
-        assertEquals(a.isEqual(b), false);
-        assertEquals(a.isAfter(b), false);
+        assertEquals(true, a.isBefore(b));
+        assertEquals(false, a.isEqual(b));
+        assertEquals(false, a.isAfter(b));
 
-        assertEquals(b.isBefore(a), false);
-        assertEquals(b.isEqual(a), false);
-        assertEquals(b.isAfter(a), true);
+        assertEquals(false, b.isBefore(a));
+        assertEquals(false, b.isEqual(a));
+        assertEquals(true, b.isAfter(a));
 
-        assertEquals(a.isBefore(a), false);
-        assertEquals(b.isBefore(b), false);
+        assertEquals(false, a.isBefore(a));
+        assertEquals(false, b.isBefore(b));
 
-        assertEquals(a.isEqual(a), true);
-        assertEquals(b.isEqual(b), true);
+        assertEquals(true, a.isEqual(a));
+        assertEquals(true, b.isEqual(b));
 
-        assertEquals(a.isAfter(a), false);
-        assertEquals(b.isAfter(b), false);
+        assertEquals(false, a.isAfter(a));
+        assertEquals(false, b.isAfter(b));
     }
 
     @Test
     public void test_isBeforeIsAfterIsEqual_instantComparison() {
         OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 10, 0, 0, 0, OFFSET_PONE);
         OffsetDateTime b = OffsetDateTime.of(2008, 6, 30, 11, 0, 0, 0, OFFSET_PTWO);  // a is same instant as b
-        assertEquals(a.isBefore(b), false);
-        assertEquals(a.isEqual(b), true);
-        assertEquals(a.isAfter(b), false);
+        assertEquals(false, a.isBefore(b));
+        assertEquals(true, a.isEqual(b));
+        assertEquals(false, a.isAfter(b));
 
-        assertEquals(b.isBefore(a), false);
-        assertEquals(b.isEqual(a), true);
-        assertEquals(b.isAfter(a), false);
+        assertEquals(false, b.isBefore(a));
+        assertEquals(true, b.isEqual(a));
+        assertEquals(false, b.isAfter(a));
 
-        assertEquals(a.isBefore(a), false);
-        assertEquals(b.isBefore(b), false);
+        assertEquals(false, a.isBefore(a));
+        assertEquals(false, b.isBefore(b));
 
-        assertEquals(a.isEqual(a), true);
-        assertEquals(b.isEqual(b), true);
+        assertEquals(true, a.isEqual(a));
+        assertEquals(true, b.isEqual(b));
 
-        assertEquals(a.isAfter(a), false);
-        assertEquals(b.isAfter(b), false);
+        assertEquals(false, a.isAfter(a));
+        assertEquals(false, b.isAfter(b));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isBefore_null() {
-        OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
-        a.isBefore(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
+            a.isBefore(null);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isEqual_null() {
-        OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
-        a.isEqual(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
+            a.isEqual(null);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isAfter_null() {
-        OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
-        a.isAfter(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 0, OFFSET_PONE);
+            a.isAfter(null);
+        });
     }
 
     //-----------------------------------------------------------------------
     // equals() / hashCode()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_true(int y, int o, int d, int h, int m, int s, int n, ZoneOffset ignored) {
         OffsetDateTime a = OffsetDateTime.of(y, o, d, h, m, s, n, OFFSET_PONE);
         OffsetDateTime b = OffsetDateTime.of(y, o, d, h, m, s, n, OFFSET_PONE);
-        assertEquals(a.equals(b), true);
-        assertEquals(a.hashCode() == b.hashCode(), true);
+        assertEquals(true, a.equals(b));
+        assertEquals(true, a.hashCode() == b.hashCode());
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_year_differs(int y, int o, int d, int h, int m, int s, int n, ZoneOffset ignored) {
         OffsetDateTime a = OffsetDateTime.of(y, o, d, h, m, s, n, OFFSET_PONE);
         OffsetDateTime b = OffsetDateTime.of(y + 1, o, d, h, m, s, n, OFFSET_PONE);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_hour_differs(int y, int o, int d, int h, int m, int s, int n, ZoneOffset ignored) {
         h = (h == 23 ? 22 : h);
         OffsetDateTime a = OffsetDateTime.of(y, o, d, h, m, s, n, OFFSET_PONE);
         OffsetDateTime b = OffsetDateTime.of(y, o, d, h + 1, m, s, n, OFFSET_PONE);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_minute_differs(int y, int o, int d, int h, int m, int s, int n, ZoneOffset ignored) {
         m = (m == 59 ? 58 : m);
         OffsetDateTime a = OffsetDateTime.of(y, o, d, h, m, s, n, OFFSET_PONE);
         OffsetDateTime b = OffsetDateTime.of(y, o, d, h, m + 1, s, n, OFFSET_PONE);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_second_differs(int y, int o, int d, int h, int m, int s, int n, ZoneOffset ignored) {
         s = (s == 59 ? 58 : s);
         OffsetDateTime a = OffsetDateTime.of(y, o, d, h, m, s, n, OFFSET_PONE);
         OffsetDateTime b = OffsetDateTime.of(y, o, d, h, m, s + 1, n, OFFSET_PONE);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_nano_differs(int y, int o, int d, int h, int m, int s, int n, ZoneOffset ignored) {
         n = (n == 999999999 ? 999999998 : n);
         OffsetDateTime a = OffsetDateTime.of(y, o, d, h, m, s, n, OFFSET_PONE);
         OffsetDateTime b = OffsetDateTime.of(y, o, d, h, m, s, n + 1, OFFSET_PONE);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_offset_differs(int y, int o, int d, int h, int m, int s, int n, ZoneOffset ignored) {
         OffsetDateTime a = OffsetDateTime.of(y, o, d, h, m, s, n, OFFSET_PONE);
         OffsetDateTime b = OffsetDateTime.of(y, o, d, h, m, s, n, OFFSET_PTWO);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
 
     @Test
     public void test_equals_itself_true() {
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.equals(TEST_2008_6_30_11_30_59_000000500), true);
+        assertEquals(true, TEST_2008_6_30_11_30_59_000000500.equals(TEST_2008_6_30_11_30_59_000000500));
     }
 
     @Test
     public void test_equals_string_false() {
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.equals("2007-07-15"), false);
+        assertEquals(false, TEST_2008_6_30_11_30_59_000000500.equals("2007-07-15"));
     }
 
     @Test
     public void test_equals_null_false() {
-        assertEquals(TEST_2008_6_30_11_30_59_000000500.equals(null), false);
+        assertEquals(false, TEST_2008_6_30_11_30_59_000000500.equals(null));
     }
 
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleToString")
     Object[][] provider_sampleToString() {
         return new Object[][] {
             {2008, 6, 30, 11, 30, 59, 0, "Z", "2008-06-30T11:30:59Z"},
@@ -1587,11 +1630,12 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleToString")
+    @ParameterizedTest
+    @MethodSource("provider_sampleToString")
     public void test_toString(int y, int o, int d, int h, int m, int s, int n, String offsetId, String expected) {
         OffsetDateTime t = OffsetDateTime.of(y, o, d, h, m, s, n, ZoneOffset.of(offsetId));
         String str = t.toString();
-        assertEquals(str, expected);
+        assertEquals(expected, str);
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/TCKOffsetTime.java b/test/jdk/java/time/tck/java/time/TCKOffsetTime.java
index 738bb86c2f4..350b21574fa 100644
--- a/test/jdk/java/time/tck/java/time/TCKOffsetTime.java
+++ b/test/jdk/java/time/tck/java/time/TCKOffsetTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,10 +84,11 @@ import static java.time.temporal.ChronoUnit.MILLIS;
 import static java.time.temporal.ChronoUnit.HALF_DAYS;
 import static java.time.temporal.ChronoUnit.NANOS;
 import static java.time.temporal.ChronoUnit.SECONDS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.Clock;
 import java.time.DateTimeException;
@@ -118,15 +119,19 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import test.java.time.MockSimplePeriod;
 
 /**
  * Test OffsetTime.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKOffsetTime extends AbstractDateTimeTest {
 
     private static final ZoneId ZONE_GAZA = ZoneId.of("Asia/Gaza");
@@ -136,7 +141,7 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     private static final LocalDate DATE = LocalDate.of(2008, 12, 3);
     private OffsetTime TEST_11_30_59_500_PONE;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_11_30_59_500_PONE = OffsetTime.of(11, 30, 59, 500, OFFSET_PONE);
     }
@@ -212,7 +217,7 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
             diff = Math.abs(test.toLocalTime().toNanoOfDay() - expected.toLocalTime().toNanoOfDay());
         }
         assertTrue(diff < DELTA);
-        assertEquals(test.getOffset(), nowDT.getOffset());
+        assertEquals(nowDT.getOffset(), test.getOffset());
     }
 
     //-----------------------------------------------------------------------
@@ -224,11 +229,11 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
             Instant instant = Instant.ofEpochSecond(i, 8);
             Clock clock = Clock.fixed(instant, ZoneOffset.UTC);
             OffsetTime test = OffsetTime.now(clock);
-            assertEquals(test.getHour(), (i / (60 * 60)) % 24);
-            assertEquals(test.getMinute(), (i / 60) % 60);
-            assertEquals(test.getSecond(), i % 60);
-            assertEquals(test.getNano(), 8);
-            assertEquals(test.getOffset(), ZoneOffset.UTC);
+            assertEquals((i / (60 * 60)) % 24, test.getHour());
+            assertEquals((i / 60) % 60, test.getMinute());
+            assertEquals(i % 60, test.getSecond());
+            assertEquals(8, test.getNano());
+            assertEquals(ZoneOffset.UTC, test.getOffset());
         }
     }
 
@@ -238,11 +243,11 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
             Instant instant = Instant.ofEpochSecond(i, 8);
             Clock clock = Clock.fixed(instant, ZoneOffset.UTC);
             OffsetTime test = OffsetTime.now(clock);
-            assertEquals(test.getHour(), ((i + 24 * 60 * 60) / (60 * 60)) % 24);
-            assertEquals(test.getMinute(), ((i + 24 * 60 * 60) / 60) % 60);
-            assertEquals(test.getSecond(), (i + 24 * 60 * 60) % 60);
-            assertEquals(test.getNano(), 8);
-            assertEquals(test.getOffset(), ZoneOffset.UTC);
+            assertEquals(((i + 24 * 60 * 60) / (60 * 60)) % 24, test.getHour());
+            assertEquals(((i + 24 * 60 * 60) / 60) % 60, test.getMinute());
+            assertEquals((i + 24 * 60 * 60) % 60, test.getSecond());
+            assertEquals(8, test.getNano());
+            assertEquals(ZoneOffset.UTC, test.getOffset());
         }
     }
 
@@ -253,39 +258,39 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
             ZoneOffset offset = ZoneOffset.ofHours(i);
             Clock clock = Clock.fixed(base, offset);
             OffsetTime test = OffsetTime.now(clock);
-            assertEquals(test.getHour(), (12 + i) % 24);
-            assertEquals(test.getMinute(), 0);
-            assertEquals(test.getSecond(), 0);
-            assertEquals(test.getNano(), 0);
-            assertEquals(test.getOffset(), offset);
+            assertEquals((12 + i) % 24, test.getHour());
+            assertEquals(0, test.getMinute());
+            assertEquals(0, test.getSecond());
+            assertEquals(0, test.getNano());
+            assertEquals(offset, test.getOffset());
         }
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_Clock_nullZoneId() {
-        OffsetTime.now((ZoneId) null);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetTime.now((ZoneId) null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_Clock_nullClock() {
-        OffsetTime.now((Clock) null);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetTime.now((Clock) null));
     }
 
     //-----------------------------------------------------------------------
     // factories
     //-----------------------------------------------------------------------
     private void check(OffsetTime test, int h, int m, int s, int n, ZoneOffset offset) {
-        assertEquals(test.toLocalTime(), LocalTime.of(h, m, s, n));
-        assertEquals(test.getOffset(), offset);
+        assertEquals(LocalTime.of(h, m, s, n), test.toLocalTime());
+        assertEquals(offset, test.getOffset());
 
-        assertEquals(test.getHour(), h);
-        assertEquals(test.getMinute(), m);
-        assertEquals(test.getSecond(), s);
-        assertEquals(test.getNano(), n);
+        assertEquals(h, test.getHour());
+        assertEquals(m, test.getMinute());
+        assertEquals(s, test.getSecond());
+        assertEquals(n, test.getNano());
 
         assertEquals(test, test);
         assertEquals(test.hashCode(), test.hashCode());
-        assertEquals(OffsetTime.of(LocalTime.of(h, m, s, n), offset), test);
+        assertEquals(test, OffsetTime.of(LocalTime.of(h, m, s, n), offset));
     }
 
     //-----------------------------------------------------------------------
@@ -303,29 +308,33 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
         check(test, 11, 30, 10, 500, OFFSET_PONE);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_LocalTimeZoneOffset_nullTime() {
-        OffsetTime.of((LocalTime) null, OFFSET_PONE);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetTime.of((LocalTime) null, OFFSET_PONE));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_LocalTimeZoneOffset_nullOffset() {
-        LocalTime localTime = LocalTime.of(11, 30, 10, 500);
-        OffsetTime.of(localTime, (ZoneOffset) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            LocalTime localTime = LocalTime.of(11, 30, 10, 500);
+            OffsetTime.of(localTime, (ZoneOffset) null);
+        });
     }
 
     //-----------------------------------------------------------------------
     // ofInstant()
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_ofInstant_nullInstant() {
-        OffsetTime.ofInstant((Instant) null, ZoneOffset.UTC);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetTime.ofInstant((Instant) null, ZoneOffset.UTC));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_ofInstant_nullOffset() {
-        Instant instant = Instant.ofEpochSecond(0L);
-        OffsetTime.ofInstant(instant, (ZoneOffset) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            Instant instant = Instant.ofEpochSecond(0L);
+            OffsetTime.ofInstant(instant, (ZoneOffset) null);
+        });
     }
 
     @Test
@@ -333,10 +342,10 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
         for (int i = 0; i < (2 * 24 * 60 * 60); i++) {
             Instant instant = Instant.ofEpochSecond(i, 8);
             OffsetTime test = OffsetTime.ofInstant(instant, ZoneOffset.UTC);
-            assertEquals(test.getHour(), (i / (60 * 60)) % 24);
-            assertEquals(test.getMinute(), (i / 60) % 60);
-            assertEquals(test.getSecond(), i % 60);
-            assertEquals(test.getNano(), 8);
+            assertEquals((i / (60 * 60)) % 24, test.getHour());
+            assertEquals((i / 60) % 60, test.getMinute());
+            assertEquals(i % 60, test.getSecond());
+            assertEquals(8, test.getNano());
         }
     }
 
@@ -345,10 +354,10 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
         for (int i =-1; i >= -(24 * 60 * 60); i--) {
             Instant instant = Instant.ofEpochSecond(i, 8);
             OffsetTime test = OffsetTime.ofInstant(instant, ZoneOffset.UTC);
-            assertEquals(test.getHour(), ((i + 24 * 60 * 60) / (60 * 60)) % 24);
-            assertEquals(test.getMinute(), ((i + 24 * 60 * 60) / 60) % 60);
-            assertEquals(test.getSecond(), (i + 24 * 60 * 60) % 60);
-            assertEquals(test.getNano(), 8);
+            assertEquals(((i + 24 * 60 * 60) / (60 * 60)) % 24, test.getHour());
+            assertEquals(((i + 24 * 60 * 60) / 60) % 60, test.getMinute());
+            assertEquals((i + 24 * 60 * 60) % 60, test.getSecond());
+            assertEquals(8, test.getNano());
         }
     }
 
@@ -356,19 +365,19 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     @Test
     public void factory_ofInstant_maxYear() {
         OffsetTime test = OffsetTime.ofInstant(Instant.MAX, ZoneOffset.UTC);
-        assertEquals(test.getHour(), 23);
-        assertEquals(test.getMinute(), 59);
-        assertEquals(test.getSecond(), 59);
-        assertEquals(test.getNano(), 999_999_999);
+        assertEquals(23, test.getHour());
+        assertEquals(59, test.getMinute());
+        assertEquals(59, test.getSecond());
+        assertEquals(999_999_999, test.getNano());
     }
 
     @Test
     public void factory_ofInstant_minYear() {
         OffsetTime test = OffsetTime.ofInstant(Instant.MIN, ZoneOffset.UTC);
-        assertEquals(test.getHour(), 0);
-        assertEquals(test.getMinute(), 0);
-        assertEquals(test.getSecond(), 0);
-        assertEquals(test.getNano(), 0);
+        assertEquals(0, test.getHour());
+        assertEquals(0, test.getMinute());
+        assertEquals(0, test.getSecond());
+        assertEquals(0, test.getNano());
     }
 
     //-----------------------------------------------------------------------
@@ -376,36 +385,36 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void factory_from_TemporalAccessor_OT() {
-        assertEquals(OffsetTime.from(OffsetTime.of(17, 30, 0, 0, OFFSET_PONE)), OffsetTime.of(17, 30, 0, 0, OFFSET_PONE));
+        assertEquals(OffsetTime.of(17, 30, 0, 0, OFFSET_PONE), OffsetTime.from(OffsetTime.of(17, 30, 0, 0, OFFSET_PONE)));
     }
 
     @Test
     public void test_from_TemporalAccessor_ZDT() {
         ZonedDateTime base = LocalDateTime.of(2007, 7, 15, 11, 30, 59, 500).atZone(OFFSET_PONE);
-        assertEquals(OffsetTime.from(base), TEST_11_30_59_500_PONE);
+        assertEquals(TEST_11_30_59_500_PONE, OffsetTime.from(base));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_from_TemporalAccessor_invalid_noDerive() {
-        OffsetTime.from(LocalDate.of(2007, 7, 15));
+        Assertions.assertThrows(DateTimeException.class, () -> OffsetTime.from(LocalDate.of(2007, 7, 15)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_from_TemporalAccessor_null() {
-        OffsetTime.from((TemporalAccessor) null);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetTime.from((TemporalAccessor) null));
     }
 
     //-----------------------------------------------------------------------
     // parse()
     //-----------------------------------------------------------------------
-    @Test(dataProvider = "sampleToString")
+    @ParameterizedTest
+    @MethodSource("provider_sampleToString")
     public void factory_parse_validText(int h, int m, int s, int n, String offsetId, String parsable) {
         OffsetTime t = OffsetTime.parse(parsable);
         assertNotNull(t, parsable);
         check(t, h, m, s, n, ZoneOffset.of(offsetId));
     }
 
-    @DataProvider(name="sampleBadParse")
     Object[][] provider_sampleBadParse() {
         return new Object[][]{
                 {"00;00"},
@@ -420,25 +429,26 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider = "sampleBadParse", expectedExceptions={DateTimeParseException.class})
+    @ParameterizedTest
+    @MethodSource("provider_sampleBadParse")
     public void factory_parse_invalidText(String unparsable) {
-        OffsetTime.parse(unparsable);
+        Assertions.assertThrows(DateTimeParseException.class, () -> OffsetTime.parse(unparsable));
     }
 
     //-----------------------------------------------------------------------s
-    @Test(expectedExceptions={DateTimeParseException.class})
+    @Test
     public void factory_parse_illegalHour() {
-        OffsetTime.parse("25:00+01:00");
+        Assertions.assertThrows(DateTimeParseException.class, () -> OffsetTime.parse("25:00+01:00"));
     }
 
-    @Test(expectedExceptions={DateTimeParseException.class})
+    @Test
     public void factory_parse_illegalMinute() {
-        OffsetTime.parse("12:60+01:00");
+        Assertions.assertThrows(DateTimeParseException.class, () -> OffsetTime.parse("12:60+01:00"));
     }
 
-    @Test(expectedExceptions={DateTimeParseException.class})
+    @Test
     public void factory_parse_illegalSecond() {
-        OffsetTime.parse("12:12:60+01:00");
+        Assertions.assertThrows(DateTimeParseException.class, () -> OffsetTime.parse("12:12:60+01:00"));
     }
 
     //-----------------------------------------------------------------------
@@ -448,37 +458,38 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void factory_parse_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("H m s XXX");
         OffsetTime test = OffsetTime.parse("11 30 0 +01:00", f);
-        assertEquals(test, OffsetTime.of(11, 30, 0, 0, ZoneOffset.ofHours(1)));
+        assertEquals(OffsetTime.of(11, 30, 0, 0, ZoneOffset.ofHours(1)), test);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullText() {
-        DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d H m s");
-        OffsetTime.parse((String) null, f);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d H m s");
+            OffsetTime.parse((String) null, f);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullFormatter() {
-        OffsetTime.parse("ANY", null);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetTime.parse("ANY", null));
     }
 
     //-----------------------------------------------------------------------
     // constructor via factory
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void constructor_nullTime() throws Throwable  {
-        OffsetTime.of(null, OFFSET_PONE);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetTime.of(null, OFFSET_PONE));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void constructor_nullOffset() throws Throwable  {
-       OffsetTime.of(LocalTime.of(11, 30, 0, 0), null);
+       Assertions.assertThrows(NullPointerException.class, () -> OffsetTime.of(LocalTime.of(11, 30, 0, 0), null));
     }
 
     //-----------------------------------------------------------------------
     // basics
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleTimes")
     Object[][] provider_sampleTimes() {
         return new Object[][] {
             {11, 30, 20, 500, OFFSET_PONE},
@@ -487,18 +498,19 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_get(int h, int m, int s, int n, ZoneOffset offset) {
         LocalTime localTime = LocalTime.of(h, m, s, n);
         OffsetTime a = OffsetTime.of(localTime, offset);
 
-        assertEquals(a.toLocalTime(), localTime);
-        assertEquals(a.getOffset(), offset);
-        assertEquals(a.toString(), localTime.toString() + offset.toString());
-        assertEquals(a.getHour(), localTime.getHour());
-        assertEquals(a.getMinute(), localTime.getMinute());
-        assertEquals(a.getSecond(), localTime.getSecond());
-        assertEquals(a.getNano(), localTime.getNano());
+        assertEquals(localTime, a.toLocalTime());
+        assertEquals(offset, a.getOffset());
+        assertEquals(localTime.toString() + offset.toString(), a.toString());
+        assertEquals(localTime.getHour(), a.getHour());
+        assertEquals(localTime.getMinute(), a.getMinute());
+        assertEquals(localTime.getSecond(), a.getSecond());
+        assertEquals(localTime.getNano(), a.getNano());
     }
 
     //-----------------------------------------------------------------------
@@ -506,37 +518,37 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalField() {
-        assertEquals(TEST_11_30_59_500_PONE.isSupported((TemporalField) null), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.NANO_OF_SECOND), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.NANO_OF_DAY), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.MICRO_OF_SECOND), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.MICRO_OF_DAY), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.MILLI_OF_SECOND), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.MILLI_OF_DAY), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.SECOND_OF_MINUTE), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.SECOND_OF_DAY), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.MINUTE_OF_HOUR), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.MINUTE_OF_DAY), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.HOUR_OF_AMPM), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.HOUR_OF_DAY), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.AMPM_OF_DAY), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.DAY_OF_WEEK), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.DAY_OF_MONTH), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.DAY_OF_YEAR), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.EPOCH_DAY), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.MONTH_OF_YEAR), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.PROLEPTIC_MONTH), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.YEAR), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.YEAR_OF_ERA), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.ERA), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.INSTANT_SECONDS), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.OFFSET_SECONDS), true);
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported((TemporalField) null));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoField.NANO_OF_SECOND));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoField.NANO_OF_DAY));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoField.MICRO_OF_SECOND));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoField.MICRO_OF_DAY));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoField.MILLI_OF_SECOND));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoField.MILLI_OF_DAY));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoField.SECOND_OF_DAY));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoField.MINUTE_OF_DAY));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoField.HOUR_OF_AMPM));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoField.HOUR_OF_DAY));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoField.CLOCK_HOUR_OF_DAY));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoField.AMPM_OF_DAY));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoField.DAY_OF_WEEK));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoField.DAY_OF_MONTH));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoField.DAY_OF_YEAR));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoField.EPOCH_DAY));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoField.MONTH_OF_YEAR));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoField.PROLEPTIC_MONTH));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoField.YEAR));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoField.YEAR_OF_ERA));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoField.ERA));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoField.INSTANT_SECONDS));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoField.OFFSET_SECONDS));
     }
 
     //-----------------------------------------------------------------------
@@ -544,23 +556,23 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalUnit() {
-        assertEquals(TEST_11_30_59_500_PONE.isSupported((TemporalUnit) null), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.NANOS), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.MICROS), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.MILLIS), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.SECONDS), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.MINUTES), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.HOURS), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.HALF_DAYS), true);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.DAYS), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.WEEKS), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.MONTHS), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.YEARS), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.DECADES), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.CENTURIES), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.MILLENNIA), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.ERAS), false);
-        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.FOREVER), false);
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported((TemporalUnit) null));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoUnit.NANOS));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoUnit.MICROS));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoUnit.MILLIS));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoUnit.SECONDS));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoUnit.MINUTES));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoUnit.HOURS));
+        assertEquals(true, TEST_11_30_59_500_PONE.isSupported(ChronoUnit.HALF_DAYS));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoUnit.DAYS));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoUnit.WEEKS));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoUnit.MONTHS));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoUnit.YEARS));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoUnit.DECADES));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoUnit.CENTURIES));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoUnit.MILLENNIA));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoUnit.ERAS));
+        assertEquals(false, TEST_11_30_59_500_PONE.isSupported(ChronoUnit.FOREVER));
     }
 
     //-----------------------------------------------------------------------
@@ -569,33 +581,32 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     @Test
     public void test_get_TemporalField() {
         OffsetTime test = OffsetTime.of(12, 30, 40, 987654321, OFFSET_PONE);
-        assertEquals(test.get(ChronoField.HOUR_OF_DAY), 12);
-        assertEquals(test.get(ChronoField.MINUTE_OF_HOUR), 30);
-        assertEquals(test.get(ChronoField.SECOND_OF_MINUTE), 40);
-        assertEquals(test.get(ChronoField.NANO_OF_SECOND), 987654321);
-        assertEquals(test.get(ChronoField.HOUR_OF_AMPM), 0);
-        assertEquals(test.get(ChronoField.AMPM_OF_DAY), 1);
+        assertEquals(12, test.get(ChronoField.HOUR_OF_DAY));
+        assertEquals(30, test.get(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(40, test.get(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(987654321, test.get(ChronoField.NANO_OF_SECOND));
+        assertEquals(0, test.get(ChronoField.HOUR_OF_AMPM));
+        assertEquals(1, test.get(ChronoField.AMPM_OF_DAY));
 
-        assertEquals(test.get(ChronoField.OFFSET_SECONDS), 3600);
+        assertEquals(3600, test.get(ChronoField.OFFSET_SECONDS));
     }
 
     @Test
     public void test_getLong_TemporalField() {
         OffsetTime test = OffsetTime.of(12, 30, 40, 987654321, OFFSET_PONE);
-        assertEquals(test.getLong(ChronoField.HOUR_OF_DAY), 12);
-        assertEquals(test.getLong(ChronoField.MINUTE_OF_HOUR), 30);
-        assertEquals(test.getLong(ChronoField.SECOND_OF_MINUTE), 40);
-        assertEquals(test.getLong(ChronoField.NANO_OF_SECOND), 987654321);
-        assertEquals(test.getLong(ChronoField.HOUR_OF_AMPM), 0);
-        assertEquals(test.getLong(ChronoField.AMPM_OF_DAY), 1);
+        assertEquals(12, test.getLong(ChronoField.HOUR_OF_DAY));
+        assertEquals(30, test.getLong(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(40, test.getLong(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(987654321, test.getLong(ChronoField.NANO_OF_SECOND));
+        assertEquals(0, test.getLong(ChronoField.HOUR_OF_AMPM));
+        assertEquals(1, test.getLong(ChronoField.AMPM_OF_DAY));
 
-        assertEquals(test.getLong(ChronoField.OFFSET_SECONDS), 3600);
+        assertEquals(3600, test.getLong(ChronoField.OFFSET_SECONDS));
     }
 
     //-----------------------------------------------------------------------
     // query(TemporalQuery)
     //-----------------------------------------------------------------------
-    @DataProvider(name="query")
     Object[][] data_query() {
         return new Object[][] {
                 {TEST_11_30_59_500_PONE, TemporalQueries.chronology(), null},
@@ -608,19 +619,21 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_query(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(temporal.query(query), expected);
+        assertEquals(expected, temporal.query(query));
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_queryFrom(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(query.queryFrom(temporal), expected);
+        assertEquals(expected, query.queryFrom(temporal));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_query_null() {
-        TEST_11_30_59_500_PONE.query(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_11_30_59_500_PONE.query(null));
     }
 
     //-----------------------------------------------------------------------
@@ -630,21 +643,23 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_withOffsetSameLocal() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.withOffsetSameLocal(OFFSET_PTWO);
-        assertEquals(test.toLocalTime(), base.toLocalTime());
-        assertEquals(test.getOffset(), OFFSET_PTWO);
+        assertEquals(base.toLocalTime(), test.toLocalTime());
+        assertEquals(OFFSET_PTWO, test.getOffset());
     }
 
     @Test
     public void test_withOffsetSameLocal_noChange() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.withOffsetSameLocal(OFFSET_PONE);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_withOffsetSameLocal_null() {
-        OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
-        base.withOffsetSameLocal(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
+            base.withOffsetSameLocal(null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -655,26 +670,27 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.withOffsetSameInstant(OFFSET_PTWO);
         OffsetTime expected = OffsetTime.of(12, 30, 59, 0, OFFSET_PTWO);
-        assertEquals(test, expected);
+        assertEquals(expected, test);
     }
 
     @Test
     public void test_withOffsetSameInstant_noChange() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.withOffsetSameInstant(OFFSET_PONE);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_withOffsetSameInstant_null() {
-        OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
-        base.withOffsetSameInstant(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
+            base.withOffsetSameInstant(null);
+        });
     }
 
     //-----------------------------------------------------------------------
     // adjustInto(Temporal)
     //-----------------------------------------------------------------------
-    @DataProvider(name="adjustInto")
     Object[][] data_adjustInto() {
         return new Object[][]{
                 {OffsetTime.of(LocalTime.of(23, 5), OFFSET_PONE), OffsetTime.of(LocalTime.of(1, 1, 1, 100), ZoneOffset.UTC), OffsetTime.of(LocalTime.of(23, 5), OFFSET_PONE), null},
@@ -695,11 +711,12 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="adjustInto")
+    @ParameterizedTest
+    @MethodSource("data_adjustInto")
     public void test_adjustInto(OffsetTime test, Temporal temporal, Temporal expected, Class<?> expectedEx) {
         if (expectedEx == null) {
             Temporal result = test.adjustInto(temporal);
-            assertEquals(result, expected);
+            assertEquals(expected, result);
         } else {
             try {
                 Temporal result = test.adjustInto(temporal);
@@ -722,25 +739,25 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
                 return sample;
             }
         };
-        assertEquals(TEST_11_30_59_500_PONE.with(adjuster), sample);
+        assertEquals(sample, TEST_11_30_59_500_PONE.with(adjuster));
     }
 
     @Test
     public void test_with_adjustment_LocalTime() {
         OffsetTime test = TEST_11_30_59_500_PONE.with(LocalTime.of(13, 30));
-        assertEquals(test, OffsetTime.of(13, 30, 0, 0, OFFSET_PONE));
+        assertEquals(OffsetTime.of(13, 30, 0, 0, OFFSET_PONE), test);
     }
 
     @Test
     public void test_with_adjustment_OffsetTime() {
         OffsetTime test = TEST_11_30_59_500_PONE.with(OffsetTime.of(13, 35, 0, 0, OFFSET_PTWO));
-        assertEquals(test, OffsetTime.of(13, 35, 0, 0, OFFSET_PTWO));
+        assertEquals(OffsetTime.of(13, 35, 0, 0, OFFSET_PTWO), test);
     }
 
     @Test
     public void test_with_adjustment_ZoneOffset() {
         OffsetTime test = TEST_11_30_59_500_PONE.with(OFFSET_PTWO);
-        assertEquals(test, OffsetTime.of(11, 30, 59, 500, OFFSET_PTWO));
+        assertEquals(OffsetTime.of(11, 30, 59, 500, OFFSET_PTWO), test);
     }
 
     @Test
@@ -751,12 +768,12 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
                 return dateTime.with(HOUR_OF_DAY, 23);
             }
         });
-        assertEquals(test, OffsetTime.of(23, 30, 59, 500, OFFSET_PONE));
+        assertEquals(OffsetTime.of(23, 30, 59, 500, OFFSET_PONE), test);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_with_adjustment_null() {
-        TEST_11_30_59_500_PONE.with((TemporalAdjuster) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_11_30_59_500_PONE.with((TemporalAdjuster) null));
     }
 
     //-----------------------------------------------------------------------
@@ -765,24 +782,24 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     @Test
     public void test_with_TemporalField() {
         OffsetTime test = OffsetTime.of(12, 30, 40, 987654321, OFFSET_PONE);
-        assertEquals(test.with(ChronoField.HOUR_OF_DAY, 15), OffsetTime.of(15, 30, 40, 987654321, OFFSET_PONE));
-        assertEquals(test.with(ChronoField.MINUTE_OF_HOUR, 50), OffsetTime.of(12, 50, 40, 987654321, OFFSET_PONE));
-        assertEquals(test.with(ChronoField.SECOND_OF_MINUTE, 50), OffsetTime.of(12, 30, 50, 987654321, OFFSET_PONE));
-        assertEquals(test.with(ChronoField.NANO_OF_SECOND, 12345), OffsetTime.of(12, 30, 40, 12345, OFFSET_PONE));
-        assertEquals(test.with(ChronoField.HOUR_OF_AMPM, 6), OffsetTime.of(18, 30, 40, 987654321, OFFSET_PONE));
-        assertEquals(test.with(ChronoField.AMPM_OF_DAY, 0), OffsetTime.of(0, 30, 40, 987654321, OFFSET_PONE));
+        assertEquals(OffsetTime.of(15, 30, 40, 987654321, OFFSET_PONE), test.with(ChronoField.HOUR_OF_DAY, 15));
+        assertEquals(OffsetTime.of(12, 50, 40, 987654321, OFFSET_PONE), test.with(ChronoField.MINUTE_OF_HOUR, 50));
+        assertEquals(OffsetTime.of(12, 30, 50, 987654321, OFFSET_PONE), test.with(ChronoField.SECOND_OF_MINUTE, 50));
+        assertEquals(OffsetTime.of(12, 30, 40, 12345, OFFSET_PONE), test.with(ChronoField.NANO_OF_SECOND, 12345));
+        assertEquals(OffsetTime.of(18, 30, 40, 987654321, OFFSET_PONE), test.with(ChronoField.HOUR_OF_AMPM, 6));
+        assertEquals(OffsetTime.of(0, 30, 40, 987654321, OFFSET_PONE), test.with(ChronoField.AMPM_OF_DAY, 0));
 
-        assertEquals(test.with(ChronoField.OFFSET_SECONDS, 7205), OffsetTime.of(12, 30, 40, 987654321, ZoneOffset.ofHoursMinutesSeconds(2, 0, 5)));
+        assertEquals(OffsetTime.of(12, 30, 40, 987654321, ZoneOffset.ofHoursMinutesSeconds(2, 0, 5)), test.with(ChronoField.OFFSET_SECONDS, 7205));
     }
 
-    @Test(expectedExceptions=NullPointerException.class )
+    @Test
     public void test_with_TemporalField_null() {
-        TEST_11_30_59_500_PONE.with((TemporalField) null, 0);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_11_30_59_500_PONE.with((TemporalField) null, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class )
+    @Test
     public void test_with_TemporalField_invalidField() {
-        TEST_11_30_59_500_PONE.with(ChronoField.YEAR, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_11_30_59_500_PONE.with(ChronoField.YEAR, 0));
     }
 
     //-----------------------------------------------------------------------
@@ -792,14 +809,14 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_withHour_normal() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.withHour(15);
-        assertEquals(test, OffsetTime.of(15, 30, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetTime.of(15, 30, 59, 0, OFFSET_PONE), test);
     }
 
     @Test
     public void test_withHour_noChange() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.withHour(11);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -809,14 +826,14 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_withMinute_normal() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.withMinute(15);
-        assertEquals(test, OffsetTime.of(11, 15, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetTime.of(11, 15, 59, 0, OFFSET_PONE), test);
     }
 
     @Test
     public void test_withMinute_noChange() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.withMinute(30);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -826,14 +843,14 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_withSecond_normal() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.withSecond(15);
-        assertEquals(test, OffsetTime.of(11, 30, 15, 0, OFFSET_PONE));
+        assertEquals(OffsetTime.of(11, 30, 15, 0, OFFSET_PONE), test);
     }
 
     @Test
     public void test_withSecond_noChange() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.withSecond(59);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -843,14 +860,14 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_withNanoOfSecond_normal() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 1, OFFSET_PONE);
         OffsetTime test = base.withNano(15);
-        assertEquals(test, OffsetTime.of(11, 30, 59, 15, OFFSET_PONE));
+        assertEquals(OffsetTime.of(11, 30, 59, 15, OFFSET_PONE), test);
     }
 
     @Test
     public void test_withNanoOfSecond_noChange() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 1, OFFSET_PONE);
         OffsetTime test = base.withNano(1);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -858,14 +875,14 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_truncatedTo_normal() {
-        assertEquals(TEST_11_30_59_500_PONE.truncatedTo(NANOS), TEST_11_30_59_500_PONE);
-        assertEquals(TEST_11_30_59_500_PONE.truncatedTo(SECONDS), TEST_11_30_59_500_PONE.withNano(0));
-        assertEquals(TEST_11_30_59_500_PONE.truncatedTo(DAYS), TEST_11_30_59_500_PONE.with(LocalTime.MIDNIGHT));
+        assertEquals(TEST_11_30_59_500_PONE, TEST_11_30_59_500_PONE.truncatedTo(NANOS));
+        assertEquals(TEST_11_30_59_500_PONE.withNano(0), TEST_11_30_59_500_PONE.truncatedTo(SECONDS));
+        assertEquals(TEST_11_30_59_500_PONE.with(LocalTime.MIDNIGHT), TEST_11_30_59_500_PONE.truncatedTo(DAYS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_truncatedTo_null() {
-        TEST_11_30_59_500_PONE.truncatedTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_11_30_59_500_PONE.truncatedTo(null));
     }
 
     //-----------------------------------------------------------------------
@@ -875,24 +892,24 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_plus_PlusAdjuster() {
         MockSimplePeriod period = MockSimplePeriod.of(7, ChronoUnit.MINUTES);
         OffsetTime t = TEST_11_30_59_500_PONE.plus(period);
-        assertEquals(t, OffsetTime.of(11, 37, 59, 500, OFFSET_PONE));
+        assertEquals(OffsetTime.of(11, 37, 59, 500, OFFSET_PONE), t);
     }
 
     @Test
     public void test_plus_PlusAdjuster_noChange() {
         OffsetTime t = TEST_11_30_59_500_PONE.plus(MockSimplePeriod.of(0, SECONDS));
-        assertEquals(t, TEST_11_30_59_500_PONE);
+        assertEquals(TEST_11_30_59_500_PONE, t);
     }
 
     @Test
     public void test_plus_PlusAdjuster_zero() {
         OffsetTime t = TEST_11_30_59_500_PONE.plus(Period.ZERO);
-        assertEquals(t, TEST_11_30_59_500_PONE);
+        assertEquals(TEST_11_30_59_500_PONE, t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_plus_PlusAdjuster_null() {
-        TEST_11_30_59_500_PONE.plus((TemporalAmount) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_11_30_59_500_PONE.plus((TemporalAmount) null));
     }
 
     //-----------------------------------------------------------------------
@@ -902,14 +919,14 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_plusHours() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.plusHours(13);
-        assertEquals(test, OffsetTime.of(0, 30, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetTime.of(0, 30, 59, 0, OFFSET_PONE), test);
     }
 
     @Test
     public void test_plusHours_zero() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.plusHours(0);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -919,14 +936,14 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_plusMinutes() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.plusMinutes(30);
-        assertEquals(test, OffsetTime.of(12, 0, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetTime.of(12, 0, 59, 0, OFFSET_PONE), test);
     }
 
     @Test
     public void test_plusMinutes_zero() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.plusMinutes(0);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -936,14 +953,14 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_plusSeconds() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.plusSeconds(1);
-        assertEquals(test, OffsetTime.of(11, 31, 0, 0, OFFSET_PONE));
+        assertEquals(OffsetTime.of(11, 31, 0, 0, OFFSET_PONE), test);
     }
 
     @Test
     public void test_plusSeconds_zero() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.plusSeconds(0);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -953,14 +970,14 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_plusNanos() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.plusNanos(1);
-        assertEquals(test, OffsetTime.of(11, 30, 59, 1, OFFSET_PONE));
+        assertEquals(OffsetTime.of(11, 30, 59, 1, OFFSET_PONE), test);
     }
 
     @Test
     public void test_plusNanos_zero() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.plusNanos(0);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -970,24 +987,24 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_minus_MinusAdjuster() {
         MockSimplePeriod period = MockSimplePeriod.of(7, ChronoUnit.MINUTES);
         OffsetTime t = TEST_11_30_59_500_PONE.minus(period);
-        assertEquals(t, OffsetTime.of(11, 23, 59, 500, OFFSET_PONE));
+        assertEquals(OffsetTime.of(11, 23, 59, 500, OFFSET_PONE), t);
     }
 
     @Test
     public void test_minus_MinusAdjuster_noChange() {
         OffsetTime t = TEST_11_30_59_500_PONE.minus(MockSimplePeriod.of(0, SECONDS));
-        assertEquals(t, TEST_11_30_59_500_PONE);
+        assertEquals(TEST_11_30_59_500_PONE, t);
     }
 
     @Test
     public void test_minus_MinusAdjuster_zero() {
         OffsetTime t = TEST_11_30_59_500_PONE.minus(Period.ZERO);
-        assertEquals(t, TEST_11_30_59_500_PONE);
+        assertEquals(TEST_11_30_59_500_PONE, t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_minus_MinusAdjuster_null() {
-        TEST_11_30_59_500_PONE.minus((TemporalAmount) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_11_30_59_500_PONE.minus((TemporalAmount) null));
     }
 
     //-----------------------------------------------------------------------
@@ -997,14 +1014,14 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_minusHours() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.minusHours(-13);
-        assertEquals(test, OffsetTime.of(0, 30, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetTime.of(0, 30, 59, 0, OFFSET_PONE), test);
     }
 
     @Test
     public void test_minusHours_zero() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.minusHours(0);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -1014,14 +1031,14 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_minusMinutes() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.minusMinutes(50);
-        assertEquals(test, OffsetTime.of(10, 40, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetTime.of(10, 40, 59, 0, OFFSET_PONE), test);
     }
 
     @Test
     public void test_minusMinutes_zero() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.minusMinutes(0);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -1031,14 +1048,14 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_minusSeconds() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.minusSeconds(60);
-        assertEquals(test, OffsetTime.of(11, 29, 59, 0, OFFSET_PONE));
+        assertEquals(OffsetTime.of(11, 29, 59, 0, OFFSET_PONE), test);
     }
 
     @Test
     public void test_minusSeconds_zero() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.minusSeconds(0);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -1048,20 +1065,19 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_minusNanos() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.minusNanos(1);
-        assertEquals(test, OffsetTime.of(11, 30, 58, 999999999, OFFSET_PONE));
+        assertEquals(OffsetTime.of(11, 30, 58, 999999999, OFFSET_PONE), test);
     }
 
     @Test
     public void test_minusNanos_zero() {
         OffsetTime base = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
         OffsetTime test = base.minusNanos(0);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
     // until(Temporal, TemporalUnit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="periodUntilUnit")
     Object[][] data_untilUnit() {
         return new Object[][] {
                 {OffsetTime.of(1, 1, 1, 0, OFFSET_PONE), OffsetTime.of(13, 1, 1, 0, OFFSET_PONE), HALF_DAYS, 1},
@@ -1082,42 +1098,49 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_untilUnit")
     public void test_until_TemporalUnit(OffsetTime offsetTime1, OffsetTime offsetTime2, TemporalUnit unit, long expected) {
         long amount = offsetTime1.until(offsetTime2, unit);
-        assertEquals(amount, expected);
+        assertEquals(expected, amount);
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_untilUnit")
     public void test_until_TemporalUnit_negated(OffsetTime offsetTime1, OffsetTime offsetTime2, TemporalUnit unit, long expected) {
         long amount = offsetTime2.until(offsetTime1, unit);
-        assertEquals(amount, -expected);
+        assertEquals(-expected, amount);
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_untilUnit")
     public void test_until_TemporalUnit_between(OffsetTime offsetTime1, OffsetTime offsetTime2, TemporalUnit unit, long expected) {
         long amount = unit.between(offsetTime1, offsetTime2);
-        assertEquals(amount, expected);
+        assertEquals(expected, amount);
     }
 
     @Test
     public void test_until_convertedType() {
         OffsetTime offsetTime = OffsetTime.of(1, 1, 1, 0, OFFSET_PONE);
         OffsetDateTime offsetDateTime = offsetTime.plusSeconds(3).atDate(LocalDate.of(1980, 2, 10));
-        assertEquals(offsetTime.until(offsetDateTime, SECONDS), 3);
+        assertEquals(3, offsetTime.until(offsetDateTime, SECONDS));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_until_invalidType() {
-        OffsetTime offsetTime = OffsetTime.of(1, 1, 1, 0, OFFSET_PONE);
-        offsetTime.until(LocalDate.of(1980, 2, 10), SECONDS);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            OffsetTime offsetTime = OffsetTime.of(1, 1, 1, 0, OFFSET_PONE);
+            offsetTime.until(LocalDate.of(1980, 2, 10), SECONDS);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_until_invalidTemporalUnit() {
-        OffsetTime offsetTime1 = OffsetTime.of(1, 1, 1, 0, OFFSET_PONE);
-        OffsetTime offsetTime2 = OffsetTime.of(2, 1, 1, 0, OFFSET_PONE);
-        offsetTime1.until(offsetTime2, MONTHS);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            OffsetTime offsetTime1 = OffsetTime.of(1, 1, 1, 0, OFFSET_PONE);
+            OffsetTime offsetTime2 = OffsetTime.of(2, 1, 1, 0, OFFSET_PONE);
+            offsetTime1.until(offsetTime2, MONTHS);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1127,18 +1150,17 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_format_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("H m s");
         String t = OffsetTime.of(11, 30, 0, 0, OFFSET_PONE).format(f);
-        assertEquals(t, "11 30 0");
+        assertEquals("11 30 0", t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_format_formatter_null() {
-        OffsetTime.of(11, 30, 0, 0, OFFSET_PONE).format(null);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetTime.of(11, 30, 0, 0, OFFSET_PONE).format(null));
     }
 
     //-----------------------------------------------------------------------
     // toEpochSecond()
     //-----------------------------------------------------------------------
-    @DataProvider(name="epochSecond")
     Object[][] provider_toEpochSecond() {
         return new Object[][] {
         {OffsetTime.of(0, 0, 0, 0, OFFSET_PTWO).toEpochSecond(LocalDate.of(1970, 1, 1)), -7200L},
@@ -1153,9 +1175,10 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="epochSecond")
+    @ParameterizedTest
+    @MethodSource("provider_toEpochSecond")
     public void test_toEpochSecond(long actual, long expected) {
-        assertEquals(actual, expected);
+        assertEquals(expected, actual);
     }
 
     //-----------------------------------------------------------------------
@@ -1165,68 +1188,72 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_compareTo_time() {
         OffsetTime a = OffsetTime.of(11, 29, 0, 0, OFFSET_PONE);
         OffsetTime b = OffsetTime.of(11, 30, 0, 0, OFFSET_PONE);  // a is before b due to time
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
-        assertEquals(convertInstant(a).compareTo(convertInstant(b)) < 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
+        assertEquals(true, convertInstant(a).compareTo(convertInstant(b)) < 0);
     }
 
     @Test
     public void test_compareTo_offset() {
         OffsetTime a = OffsetTime.of(11, 30, 0, 0, OFFSET_PTWO);
         OffsetTime b = OffsetTime.of(11, 30, 0, 0, OFFSET_PONE);  // a is before b due to offset
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
-        assertEquals(convertInstant(a).compareTo(convertInstant(b)) < 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
+        assertEquals(true, convertInstant(a).compareTo(convertInstant(b)) < 0);
     }
 
     @Test
     public void test_compareTo_both() {
         OffsetTime a = OffsetTime.of(11, 50, 0, 0, OFFSET_PTWO);
         OffsetTime b = OffsetTime.of(11, 20, 0, 0, OFFSET_PONE);  // a is before b on instant scale
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
-        assertEquals(convertInstant(a).compareTo(convertInstant(b)) < 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
+        assertEquals(true, convertInstant(a).compareTo(convertInstant(b)) < 0);
     }
 
     @Test
     public void test_compareTo_bothNearStartOfDay() {
         OffsetTime a = OffsetTime.of(0, 10, 0, 0, OFFSET_PONE);
         OffsetTime b = OffsetTime.of(2, 30, 0, 0, OFFSET_PTWO);  // a is before b on instant scale
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
-        assertEquals(convertInstant(a).compareTo(convertInstant(b)) < 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
+        assertEquals(true, convertInstant(a).compareTo(convertInstant(b)) < 0);
     }
 
     @Test
     public void test_compareTo_hourDifference() {
         OffsetTime a = OffsetTime.of(10, 0, 0, 0, OFFSET_PONE);
         OffsetTime b = OffsetTime.of(11, 0, 0, 0, OFFSET_PTWO);  // a is before b despite being same time-line time
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
-        assertEquals(convertInstant(a).compareTo(convertInstant(b)) == 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
+        assertEquals(true, convertInstant(a).compareTo(convertInstant(b)) == 0);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_compareTo_null() {
-        OffsetTime a = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
-        a.compareTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            OffsetTime a = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
+            a.compareTo(null);
+        });
     }
 
-    @Test(expectedExceptions=ClassCastException.class)
     @SuppressWarnings({"unchecked", "rawtypes"})
+    @Test
     public void compareToNonOffsetTime() {
-       Comparable c = TEST_11_30_59_500_PONE;
-       c.compareTo(new Object());
+       Assertions.assertThrows(ClassCastException.class, () -> {
+           Comparable c = TEST_11_30_59_500_PONE;
+           c.compareTo(new Object());
+        });
     }
 
     private Instant convertInstant(OffsetTime ot) {
@@ -1240,194 +1267,205 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_isBeforeIsAfterIsEqual1() {
         OffsetTime a = OffsetTime.of(11, 30, 58, 0, OFFSET_PONE);
         OffsetTime b = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);  // a is before b due to time
-        assertEquals(a.isBefore(b), true);
-        assertEquals(a.isEqual(b), false);
-        assertEquals(a.isAfter(b), false);
+        assertEquals(true, a.isBefore(b));
+        assertEquals(false, a.isEqual(b));
+        assertEquals(false, a.isAfter(b));
 
-        assertEquals(b.isBefore(a), false);
-        assertEquals(b.isEqual(a), false);
-        assertEquals(b.isAfter(a), true);
+        assertEquals(false, b.isBefore(a));
+        assertEquals(false, b.isEqual(a));
+        assertEquals(true, b.isAfter(a));
 
-        assertEquals(a.isBefore(a), false);
-        assertEquals(b.isBefore(b), false);
+        assertEquals(false, a.isBefore(a));
+        assertEquals(false, b.isBefore(b));
 
-        assertEquals(a.isEqual(a), true);
-        assertEquals(b.isEqual(b), true);
+        assertEquals(true, a.isEqual(a));
+        assertEquals(true, b.isEqual(b));
 
-        assertEquals(a.isAfter(a), false);
-        assertEquals(b.isAfter(b), false);
+        assertEquals(false, a.isAfter(a));
+        assertEquals(false, b.isAfter(b));
     }
 
     @Test
     public void test_isBeforeIsAfterIsEqual1nanos() {
         OffsetTime a = OffsetTime.of(11, 30, 59, 3, OFFSET_PONE);
         OffsetTime b = OffsetTime.of(11, 30, 59, 4, OFFSET_PONE);  // a is before b due to time
-        assertEquals(a.isBefore(b), true);
-        assertEquals(a.isEqual(b), false);
-        assertEquals(a.isAfter(b), false);
+        assertEquals(true, a.isBefore(b));
+        assertEquals(false, a.isEqual(b));
+        assertEquals(false, a.isAfter(b));
 
-        assertEquals(b.isBefore(a), false);
-        assertEquals(b.isEqual(a), false);
-        assertEquals(b.isAfter(a), true);
+        assertEquals(false, b.isBefore(a));
+        assertEquals(false, b.isEqual(a));
+        assertEquals(true, b.isAfter(a));
 
-        assertEquals(a.isBefore(a), false);
-        assertEquals(b.isBefore(b), false);
+        assertEquals(false, a.isBefore(a));
+        assertEquals(false, b.isBefore(b));
 
-        assertEquals(a.isEqual(a), true);
-        assertEquals(b.isEqual(b), true);
+        assertEquals(true, a.isEqual(a));
+        assertEquals(true, b.isEqual(b));
 
-        assertEquals(a.isAfter(a), false);
-        assertEquals(b.isAfter(b), false);
+        assertEquals(false, a.isAfter(a));
+        assertEquals(false, b.isAfter(b));
     }
 
     @Test
     public void test_isBeforeIsAfterIsEqual2() {
         OffsetTime a = OffsetTime.of(11, 30, 59, 0, OFFSET_PTWO);
         OffsetTime b = OffsetTime.of(11, 30, 58, 0, OFFSET_PONE);  // a is before b due to offset
-        assertEquals(a.isBefore(b), true);
-        assertEquals(a.isEqual(b), false);
-        assertEquals(a.isAfter(b), false);
+        assertEquals(true, a.isBefore(b));
+        assertEquals(false, a.isEqual(b));
+        assertEquals(false, a.isAfter(b));
 
-        assertEquals(b.isBefore(a), false);
-        assertEquals(b.isEqual(a), false);
-        assertEquals(b.isAfter(a), true);
+        assertEquals(false, b.isBefore(a));
+        assertEquals(false, b.isEqual(a));
+        assertEquals(true, b.isAfter(a));
 
-        assertEquals(a.isBefore(a), false);
-        assertEquals(b.isBefore(b), false);
+        assertEquals(false, a.isBefore(a));
+        assertEquals(false, b.isBefore(b));
 
-        assertEquals(a.isEqual(a), true);
-        assertEquals(b.isEqual(b), true);
+        assertEquals(true, a.isEqual(a));
+        assertEquals(true, b.isEqual(b));
 
-        assertEquals(a.isAfter(a), false);
-        assertEquals(b.isAfter(b), false);
+        assertEquals(false, a.isAfter(a));
+        assertEquals(false, b.isAfter(b));
     }
 
     @Test
     public void test_isBeforeIsAfterIsEqual2nanos() {
         OffsetTime a = OffsetTime.of(11, 30, 59, 4, ZoneOffset.ofTotalSeconds(OFFSET_PONE.getTotalSeconds() + 1));
         OffsetTime b = OffsetTime.of(11, 30, 59, 3, OFFSET_PONE);  // a is before b due to offset
-        assertEquals(a.isBefore(b), true);
-        assertEquals(a.isEqual(b), false);
-        assertEquals(a.isAfter(b), false);
+        assertEquals(true, a.isBefore(b));
+        assertEquals(false, a.isEqual(b));
+        assertEquals(false, a.isAfter(b));
 
-        assertEquals(b.isBefore(a), false);
-        assertEquals(b.isEqual(a), false);
-        assertEquals(b.isAfter(a), true);
+        assertEquals(false, b.isBefore(a));
+        assertEquals(false, b.isEqual(a));
+        assertEquals(true, b.isAfter(a));
 
-        assertEquals(a.isBefore(a), false);
-        assertEquals(b.isBefore(b), false);
+        assertEquals(false, a.isBefore(a));
+        assertEquals(false, b.isBefore(b));
 
-        assertEquals(a.isEqual(a), true);
-        assertEquals(b.isEqual(b), true);
+        assertEquals(true, a.isEqual(a));
+        assertEquals(true, b.isEqual(b));
 
-        assertEquals(a.isAfter(a), false);
-        assertEquals(b.isAfter(b), false);
+        assertEquals(false, a.isAfter(a));
+        assertEquals(false, b.isAfter(b));
     }
 
     @Test
     public void test_isBeforeIsAfterIsEqual_instantComparison() {
         OffsetTime a = OffsetTime.of(11, 30, 59, 0, OFFSET_PTWO);
         OffsetTime b = OffsetTime.of(10, 30, 59, 0, OFFSET_PONE);  // a is same instant as b
-        assertEquals(a.isBefore(b), false);
-        assertEquals(a.isEqual(b), true);
-        assertEquals(a.isAfter(b), false);
+        assertEquals(false, a.isBefore(b));
+        assertEquals(true, a.isEqual(b));
+        assertEquals(false, a.isAfter(b));
 
-        assertEquals(b.isBefore(a), false);
-        assertEquals(b.isEqual(a), true);
-        assertEquals(b.isAfter(a), false);
+        assertEquals(false, b.isBefore(a));
+        assertEquals(true, b.isEqual(a));
+        assertEquals(false, b.isAfter(a));
 
-        assertEquals(a.isBefore(a), false);
-        assertEquals(b.isBefore(b), false);
+        assertEquals(false, a.isBefore(a));
+        assertEquals(false, b.isBefore(b));
 
-        assertEquals(a.isEqual(a), true);
-        assertEquals(b.isEqual(b), true);
+        assertEquals(true, a.isEqual(a));
+        assertEquals(true, b.isEqual(b));
 
-        assertEquals(a.isAfter(a), false);
-        assertEquals(b.isAfter(b), false);
+        assertEquals(false, a.isAfter(a));
+        assertEquals(false, b.isAfter(b));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isBefore_null() {
-        OffsetTime a = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
-        a.isBefore(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            OffsetTime a = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
+            a.isBefore(null);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isAfter_null() {
-        OffsetTime a = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
-        a.isAfter(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            OffsetTime a = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
+            a.isAfter(null);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isEqual_null() {
-        OffsetTime a = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
-        a.isEqual(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            OffsetTime a = OffsetTime.of(11, 30, 59, 0, OFFSET_PONE);
+            a.isEqual(null);
+        });
     }
 
     //-----------------------------------------------------------------------
     // equals() / hashCode()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_true(int h, int m, int s, int n, ZoneOffset ignored) {
         OffsetTime a = OffsetTime.of(h, m, s, n, OFFSET_PONE);
         OffsetTime b = OffsetTime.of(h, m, s, n, OFFSET_PONE);
-        assertEquals(a.equals(b), true);
-        assertEquals(a.hashCode() == b.hashCode(), true);
+        assertEquals(true, a.equals(b));
+        assertEquals(true, a.hashCode() == b.hashCode());
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_hour_differs(int h, int m, int s, int n, ZoneOffset ignored) {
         h = (h == 23 ? 22 : h);
         OffsetTime a = OffsetTime.of(h, m, s, n, OFFSET_PONE);
         OffsetTime b = OffsetTime.of(h + 1, m, s, n, OFFSET_PONE);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_minute_differs(int h, int m, int s, int n, ZoneOffset ignored) {
         m = (m == 59 ? 58 : m);
         OffsetTime a = OffsetTime.of(h, m, s, n, OFFSET_PONE);
         OffsetTime b = OffsetTime.of(h, m + 1, s, n, OFFSET_PONE);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_second_differs(int h, int m, int s, int n, ZoneOffset ignored) {
         s = (s == 59 ? 58 : s);
         OffsetTime a = OffsetTime.of(h, m, s, n, OFFSET_PONE);
         OffsetTime b = OffsetTime.of(h, m, s + 1, n, OFFSET_PONE);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_nano_differs(int h, int m, int s, int n, ZoneOffset ignored) {
         n = (n == 999999999 ? 999999998 : n);
         OffsetTime a = OffsetTime.of(h, m, s, n, OFFSET_PONE);
         OffsetTime b = OffsetTime.of(h, m, s, n + 1, OFFSET_PONE);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_offset_differs(int h, int m, int s, int n, ZoneOffset ignored) {
         OffsetTime a = OffsetTime.of(h, m, s, n, OFFSET_PONE);
         OffsetTime b = OffsetTime.of(h, m, s, n, OFFSET_PTWO);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
 
     @Test
     public void test_equals_itself_true() {
-        assertEquals(TEST_11_30_59_500_PONE.equals(TEST_11_30_59_500_PONE), true);
+        assertEquals(true, TEST_11_30_59_500_PONE.equals(TEST_11_30_59_500_PONE));
     }
 
     @Test
     public void test_equals_string_false() {
-        assertEquals(TEST_11_30_59_500_PONE.equals("2007-07-15"), false);
+        assertEquals(false, TEST_11_30_59_500_PONE.equals("2007-07-15"));
     }
 
     @Test
     public void test_equals_null_false() {
-        assertEquals(TEST_11_30_59_500_PONE.equals(null), false);
+        assertEquals(false, TEST_11_30_59_500_PONE.equals(null));
     }
 
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleToString")
     Object[][] provider_sampleToString() {
         return new Object[][] {
             {11, 30, 59, 0, "Z", "11:30:59Z"},
@@ -1441,11 +1479,12 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleToString")
+    @ParameterizedTest
+    @MethodSource("provider_sampleToString")
     public void test_toString(int h, int m, int s, int n, String offsetId, String expected) {
         OffsetTime t = OffsetTime.of(h, m, s, n, ZoneOffset.of(offsetId));
         String str = t.toString();
-        assertEquals(str, expected);
+        assertEquals(expected, str);
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/TCKPeriod.java b/test/jdk/java/time/tck/java/time/TCKPeriod.java
index 7743512002f..2d85482d610 100644
--- a/test/jdk/java/time/tck/java/time/TCKPeriod.java
+++ b/test/jdk/java/time/tck/java/time/TCKPeriod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,8 @@ package tck.java.time;
 import static java.time.temporal.ChronoUnit.DAYS;
 import static java.time.temporal.ChronoUnit.HOURS;
 import static java.time.temporal.ChronoUnit.YEARS;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.DateTimeException;
 import java.time.Duration;
@@ -79,13 +80,16 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test Period.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKPeriod extends AbstractTCKTest {
 
     //-----------------------------------------------------------------------
@@ -191,78 +195,81 @@ public class TCKPeriod extends AbstractTCKTest {
         assertPeriod(Period.from(amount), 23, 0, 45);
     }
 
-    @Test(expectedExceptions = ArithmeticException.class)
+    @Test
     public void factory_from_TemporalAmount_Years_tooBig() {
-        TemporalAmount amount = new TemporalAmount() {
-            @Override
-            public long get(TemporalUnit unit) {
-                return ((long) (Integer.MAX_VALUE)) + 1;
-            }
-            @Override
-            public List<TemporalUnit> getUnits() {
-                return Collections.<TemporalUnit>singletonList(YEARS);
-            }
-            @Override
-            public Temporal addTo(Temporal temporal) {
-                throw new UnsupportedOperationException();
-            }
-            @Override
-            public Temporal subtractFrom(Temporal temporal) {
-                throw new UnsupportedOperationException();
-            }
-        };
-        Period.from(amount);
-    }
-
-    @Test(expectedExceptions = DateTimeException.class)
-    public void factory_from_TemporalAmount_DaysHours() {
-        TemporalAmount amount = new TemporalAmount() {
-            @Override
-            public long get(TemporalUnit unit) {
-                if (unit == DAYS) {
-                    return 1;
-                } else {
-                    return 2;
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            TemporalAmount amount = new TemporalAmount() {
+                @Override
+                public long get(TemporalUnit unit) {
+                    return ((long) (Integer.MAX_VALUE)) + 1;
                 }
-            }
-            @Override
-            public List<TemporalUnit> getUnits() {
-                List<TemporalUnit> list = new ArrayList<>();
-                list.add(DAYS);
-                list.add(HOURS);
-                return list;
-            }
-            @Override
-            public Temporal addTo(Temporal temporal) {
-                throw new UnsupportedOperationException();
-            }
-            @Override
-            public Temporal subtractFrom(Temporal temporal) {
-                throw new UnsupportedOperationException();
-            }
-        };
-        Period.from(amount);
+                @Override
+                public List<TemporalUnit> getUnits() {
+                    return Collections.<TemporalUnit>singletonList(YEARS);
+                }
+                @Override
+                public Temporal addTo(Temporal temporal) {
+                    throw new UnsupportedOperationException();
+                }
+                @Override
+                public Temporal subtractFrom(Temporal temporal) {
+                    throw new UnsupportedOperationException();
+                }
+            };
+            Period.from(amount);
+        });
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
+    public void factory_from_TemporalAmount_DaysHours() {
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            TemporalAmount amount = new TemporalAmount() {
+                @Override
+                public long get(TemporalUnit unit) {
+                    if (unit == DAYS) {
+                        return 1;
+                    } else {
+                        return 2;
+                    }
+                }
+                @Override
+                public List<TemporalUnit> getUnits() {
+                    List<TemporalUnit> list = new ArrayList<>();
+                    list.add(DAYS);
+                    list.add(HOURS);
+                    return list;
+                }
+                @Override
+                public Temporal addTo(Temporal temporal) {
+                    throw new UnsupportedOperationException();
+                }
+                @Override
+                public Temporal subtractFrom(Temporal temporal) {
+                    throw new UnsupportedOperationException();
+                }
+            };
+            Period.from(amount);
+        });
+    }
+
+    @Test
     public void factory_from_TemporalAmount_NonISO() {
-        Period.from(ThaiBuddhistChronology.INSTANCE.period(1, 1, 1));
+        Assertions.assertThrows(DateTimeException.class, () -> Period.from(ThaiBuddhistChronology.INSTANCE.period(1, 1, 1)));
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void factory_from_TemporalAmount_Duration() {
-        Period.from(Duration.ZERO);
+        Assertions.assertThrows(DateTimeException.class, () -> Period.from(Duration.ZERO));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void factory_from_TemporalAmount_null() {
-        Period.from(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Period.from(null));
     }
 
     //-----------------------------------------------------------------------
     // parse(String)
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseSuccess")
     Object[][] data_factory_parseSuccess() {
         return new Object[][] {
                 {"P1Y", Period.ofYears(1)},
@@ -335,40 +342,43 @@ public class TCKPeriod extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_factory_parseSuccess")
     public void factory_parse(String text, Period expected) {
         Period p = Period.parse(text);
-        assertEquals(p, expected);
+        assertEquals(expected, p);
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_factory_parseSuccess")
     public void factory_parse_plus(String text, Period expected) {
         Period p = Period.parse("+" + text);
-        assertEquals(p, expected);
+        assertEquals(expected, p);
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_factory_parseSuccess")
     public void factory_parse_minus(String text, Period expected) {
         Period p = null;
         try {
             p = Period.parse("-" + text);
         } catch (DateTimeParseException ex) {
-            assertEquals(expected.getYears() == Integer.MIN_VALUE ||
+            assertEquals(true, expected.getYears() == Integer.MIN_VALUE ||
                     expected.getMonths() == Integer.MIN_VALUE ||
-                    expected.getDays() == Integer.MIN_VALUE, true);
+                    expected.getDays() == Integer.MIN_VALUE);
             return;
         }
         // not inside try/catch or it breaks test
-        assertEquals(p, expected.negated());
+        assertEquals(expected.negated(), p);
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_factory_parseSuccess")
     public void factory_parse_lowerCase(String text, Period expected) {
         Period p = Period.parse(text.toLowerCase(Locale.ENGLISH));
-        assertEquals(p, expected);
+        assertEquals(expected, p);
     }
 
-    @DataProvider(name="parseFailure")
     Object[][] data_parseFailure() {
         return new Object[][] {
                 {""},
@@ -417,25 +427,27 @@ public class TCKPeriod extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="parseFailure", expectedExceptions=DateTimeParseException.class)
+    @ParameterizedTest
+    @MethodSource("data_parseFailure")
     public void factory_parseFailures(String text) {
-        try {
-            Period.parse(text);
-        } catch (DateTimeParseException ex) {
-            assertEquals(ex.getParsedString(), text);
-            throw ex;
-        }
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            try {
+                Period.parse(text);
+            } catch (DateTimeParseException ex) {
+                assertEquals(text, ex.getParsedString());
+                throw ex;
+            }
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_null() {
-        Period.parse(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Period.parse(null));
     }
 
     //-----------------------------------------------------------------------
     // between(LocalDate,LocalDate)
     //-----------------------------------------------------------------------
-    @DataProvider(name="between")
     Object[][] data_between() {
         return new Object[][] {
                 {2010, 1, 1, 2010, 1, 1, 0, 0, 0},
@@ -522,7 +534,8 @@ public class TCKPeriod extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="between")
+    @ParameterizedTest
+    @MethodSource("data_between")
     public void factory_between_LocalDate(int y1, int m1, int d1, int y2, int m2, int d2, int ye, int me, int de) {
         LocalDate start = LocalDate.of(y1, m1, d1);
         LocalDate end = LocalDate.of(y2, m2, d2);
@@ -531,14 +544,14 @@ public class TCKPeriod extends AbstractTCKTest {
         //assertEquals(start.plus(test), end);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_between_LocalDate_nullFirst() {
-        Period.between((LocalDate) null, LocalDate.of(2010, 1, 1));
+        Assertions.assertThrows(NullPointerException.class, () -> Period.between((LocalDate) null, LocalDate.of(2010, 1, 1)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_between_LocalDate_nullSecond() {
-        Period.between(LocalDate.of(2010, 1, 1), (LocalDate) null);
+        Assertions.assertThrows(NullPointerException.class, () -> Period.between(LocalDate.of(2010, 1, 1), (LocalDate) null));
     }
 
     //-----------------------------------------------------------------------
@@ -546,11 +559,11 @@ public class TCKPeriod extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isZero() {
-        assertEquals(Period.of(0, 0, 0).isZero(), true);
-        assertEquals(Period.of(1, 2, 3).isZero(), false);
-        assertEquals(Period.of(1, 0, 0).isZero(), false);
-        assertEquals(Period.of(0, 2, 0).isZero(), false);
-        assertEquals(Period.of(0, 0, 3).isZero(), false);
+        assertEquals(true, Period.of(0, 0, 0).isZero());
+        assertEquals(false, Period.of(1, 2, 3).isZero());
+        assertEquals(false, Period.of(1, 0, 0).isZero());
+        assertEquals(false, Period.of(0, 2, 0).isZero());
+        assertEquals(false, Period.of(0, 0, 3).isZero());
     }
 
     //-----------------------------------------------------------------------
@@ -558,19 +571,19 @@ public class TCKPeriod extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isPositive() {
-        assertEquals(Period.of(0, 0, 0).isNegative(), false);
-        assertEquals(Period.of(1, 2, 3).isNegative(), false);
-        assertEquals(Period.of(1, 0, 0).isNegative(), false);
-        assertEquals(Period.of(0, 2, 0).isNegative(), false);
-        assertEquals(Period.of(0, 0, 3).isNegative(), false);
+        assertEquals(false, Period.of(0, 0, 0).isNegative());
+        assertEquals(false, Period.of(1, 2, 3).isNegative());
+        assertEquals(false, Period.of(1, 0, 0).isNegative());
+        assertEquals(false, Period.of(0, 2, 0).isNegative());
+        assertEquals(false, Period.of(0, 0, 3).isNegative());
 
-        assertEquals(Period.of(-1, -2, -3).isNegative(), true);
-        assertEquals(Period.of(-1, -2, 3).isNegative(), true);
-        assertEquals(Period.of(1, -2, -3).isNegative(), true);
-        assertEquals(Period.of(-1, 2, -3).isNegative(), true);
-        assertEquals(Period.of(-1, 2, 3).isNegative(), true);
-        assertEquals(Period.of(1, -2, 3).isNegative(), true);
-        assertEquals(Period.of(1, 2, -3).isNegative(), true);
+        assertEquals(true, Period.of(-1, -2, -3).isNegative());
+        assertEquals(true, Period.of(-1, -2, 3).isNegative());
+        assertEquals(true, Period.of(1, -2, -3).isNegative());
+        assertEquals(true, Period.of(-1, 2, -3).isNegative());
+        assertEquals(true, Period.of(-1, 2, 3).isNegative());
+        assertEquals(true, Period.of(1, -2, 3).isNegative());
+        assertEquals(true, Period.of(1, 2, -3).isNegative());
     }
 
     //-----------------------------------------------------------------------
@@ -612,7 +625,6 @@ public class TCKPeriod extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     // plus(Period)
     //-----------------------------------------------------------------------
-    @DataProvider(name="plus")
     Object[][] data_plus() {
         return new Object[][] {
                 {pymd(0, 0, 0), pymd(0, 0, 0), pymd(0, 0, 0)},
@@ -630,44 +642,47 @@ public class TCKPeriod extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="plus")
+    @ParameterizedTest
+    @MethodSource("data_plus")
     public void test_plus_TemporalAmount(Period base, Period add, Period expected) {
-        assertEquals(base.plus(add), expected);
+        assertEquals(expected, base.plus(add));
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_plus_TemporalAmount_nonISO() {
-        pymd(4, 5, 6).plus(ThaiBuddhistChronology.INSTANCE.period(1, 0, 0));
+        Assertions.assertThrows(DateTimeException.class, () -> pymd(4, 5, 6).plus(ThaiBuddhistChronology.INSTANCE.period(1, 0, 0)));
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_plus_TemporalAmount_DaysHours() {
-        TemporalAmount amount = new TemporalAmount() {
-            @Override
-            public long get(TemporalUnit unit) {
-                if (unit == DAYS) {
-                    return 1;
-                } else {
-                    return 2;
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            TemporalAmount amount = new TemporalAmount() {
+                @Override
+                public long get(TemporalUnit unit) {
+                    if (unit == DAYS) {
+                        return 1;
+                    } else {
+                        return 2;
+                    }
                 }
-            }
-            @Override
-            public List<TemporalUnit> getUnits() {
-                List<TemporalUnit> list = new ArrayList<>();
-                list.add(DAYS);
-                list.add(HOURS);
-                return list;
-            }
-            @Override
-            public Temporal addTo(Temporal temporal) {
-                throw new UnsupportedOperationException();
-            }
-            @Override
-            public Temporal subtractFrom(Temporal temporal) {
-                throw new UnsupportedOperationException();
-            }
-        };
-        pymd(4, 5, 6).plus(amount);
+                @Override
+                public List<TemporalUnit> getUnits() {
+                    List<TemporalUnit> list = new ArrayList<>();
+                    list.add(DAYS);
+                    list.add(HOURS);
+                    return list;
+                }
+                @Override
+                public Temporal addTo(Temporal temporal) {
+                    throw new UnsupportedOperationException();
+                }
+                @Override
+                public Temporal subtractFrom(Temporal temporal) {
+                    throw new UnsupportedOperationException();
+                }
+            };
+            pymd(4, 5, 6).plus(amount);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -686,16 +701,20 @@ public class TCKPeriod extends AbstractTCKTest {
         assertPeriod(Period.of(1, 2, 3).plus(Period.ofYears(-1)), 0, 2, 3);
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_plusYears_overflowTooBig() {
-        Period test = Period.ofYears(Integer.MAX_VALUE);
-        test.plusYears(1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Period test = Period.ofYears(Integer.MAX_VALUE);
+            test.plusYears(1);
+        });
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_plusYears_overflowTooSmall() {
-        Period test = Period.ofYears(Integer.MIN_VALUE);
-        test.plusYears(-1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Period test = Period.ofYears(Integer.MIN_VALUE);
+            test.plusYears(-1);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -714,16 +733,20 @@ public class TCKPeriod extends AbstractTCKTest {
         assertPeriod(Period.of(1, 2, 3).plus(Period.ofMonths(-2)), 1, 0, 3);
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_plusMonths_overflowTooBig() {
-        Period test = Period.ofMonths(Integer.MAX_VALUE);
-        test.plusMonths(1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Period test = Period.ofMonths(Integer.MAX_VALUE);
+            test.plusMonths(1);
+        });
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_plusMonths_overflowTooSmall() {
-        Period test = Period.ofMonths(Integer.MIN_VALUE);
-        test.plusMonths(-1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Period test = Period.ofMonths(Integer.MIN_VALUE);
+            test.plusMonths(-1);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -742,22 +765,25 @@ public class TCKPeriod extends AbstractTCKTest {
         assertPeriod(Period.of(1, 2, 3).plus(Period.ofDays(-3)), 1, 2, 0);
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_plusDays_overflowTooBig() {
-        Period test = Period.ofDays(Integer.MAX_VALUE);
-        test.plusDays(1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Period test = Period.ofDays(Integer.MAX_VALUE);
+            test.plusDays(1);
+        });
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_plusDays_overflowTooSmall() {
-        Period test = Period.ofDays(Integer.MIN_VALUE);
-        test.plusDays(-1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Period test = Period.ofDays(Integer.MIN_VALUE);
+            test.plusDays(-1);
+        });
     }
 
     //-----------------------------------------------------------------------
     // minus(Period)
     //-----------------------------------------------------------------------
-    @DataProvider(name="minus")
     Object[][] data_minus() {
         return new Object[][] {
                 {pymd(0, 0, 0), pymd(0, 0, 0), pymd(0, 0, 0)},
@@ -775,44 +801,47 @@ public class TCKPeriod extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="minus")
+    @ParameterizedTest
+    @MethodSource("data_minus")
     public void test_minus_TemporalAmount(Period base, Period subtract, Period expected) {
-        assertEquals(base.minus(subtract), expected);
+        assertEquals(expected, base.minus(subtract));
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_minus_TemporalAmount_nonISO() {
-        pymd(4, 5, 6).minus(ThaiBuddhistChronology.INSTANCE.period(1, 0, 0));
+        Assertions.assertThrows(DateTimeException.class, () -> pymd(4, 5, 6).minus(ThaiBuddhistChronology.INSTANCE.period(1, 0, 0)));
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_minus_TemporalAmount_DaysHours() {
-        TemporalAmount amount = new TemporalAmount() {
-            @Override
-            public long get(TemporalUnit unit) {
-                if (unit == DAYS) {
-                    return 1;
-                } else {
-                    return 2;
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            TemporalAmount amount = new TemporalAmount() {
+                @Override
+                public long get(TemporalUnit unit) {
+                    if (unit == DAYS) {
+                        return 1;
+                    } else {
+                        return 2;
+                    }
                 }
-            }
-            @Override
-            public List<TemporalUnit> getUnits() {
-                List<TemporalUnit> list = new ArrayList<>();
-                list.add(DAYS);
-                list.add(HOURS);
-                return list;
-            }
-            @Override
-            public Temporal addTo(Temporal temporal) {
-                throw new UnsupportedOperationException();
-            }
-            @Override
-            public Temporal subtractFrom(Temporal temporal) {
-                throw new UnsupportedOperationException();
-            }
-        };
-        pymd(4, 5, 6).minus(amount);
+                @Override
+                public List<TemporalUnit> getUnits() {
+                    List<TemporalUnit> list = new ArrayList<>();
+                    list.add(DAYS);
+                    list.add(HOURS);
+                    return list;
+                }
+                @Override
+                public Temporal addTo(Temporal temporal) {
+                    throw new UnsupportedOperationException();
+                }
+                @Override
+                public Temporal subtractFrom(Temporal temporal) {
+                    throw new UnsupportedOperationException();
+                }
+            };
+            pymd(4, 5, 6).minus(amount);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -831,16 +860,20 @@ public class TCKPeriod extends AbstractTCKTest {
         assertPeriod(Period.of(1, 2, 3).minus(Period.ofYears(-1)), 2, 2, 3);
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_minusYears_overflowTooBig() {
-        Period test = Period.ofYears(Integer.MAX_VALUE);
-        test.minusYears(-1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Period test = Period.ofYears(Integer.MAX_VALUE);
+            test.minusYears(-1);
+        });
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_minusYears_overflowTooSmall() {
-        Period test = Period.ofYears(Integer.MIN_VALUE);
-        test.minusYears(1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Period test = Period.ofYears(Integer.MIN_VALUE);
+            test.minusYears(1);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -859,16 +892,20 @@ public class TCKPeriod extends AbstractTCKTest {
         assertPeriod(Period.of(1, 2, 3).minus(Period.ofMonths(-2)), 1, 4, 3);
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_minusMonths_overflowTooBig() {
-        Period test = Period.ofMonths(Integer.MAX_VALUE);
-        test.minusMonths(-1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Period test = Period.ofMonths(Integer.MAX_VALUE);
+            test.minusMonths(-1);
+        });
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_minusMonths_overflowTooSmall() {
-        Period test = Period.ofMonths(Integer.MIN_VALUE);
-        test.minusMonths(1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Period test = Period.ofMonths(Integer.MIN_VALUE);
+            test.minusMonths(1);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -887,16 +924,20 @@ public class TCKPeriod extends AbstractTCKTest {
         assertPeriod(Period.of(1, 2, 3).minus(Period.ofDays(-3)), 1, 2, 6);
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_minusDays_overflowTooBig() {
-        Period test = Period.ofDays(Integer.MAX_VALUE);
-        test.minusDays(-1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Period test = Period.ofDays(Integer.MAX_VALUE);
+            test.minusDays(-1);
+        });
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_minusDays_overflowTooSmall() {
-        Period test = Period.ofDays(Integer.MIN_VALUE);
-        test.minusDays(1);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Period test = Period.ofDays(Integer.MIN_VALUE);
+            test.minusDays(1);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -916,16 +957,20 @@ public class TCKPeriod extends AbstractTCKTest {
         assertPeriod(Period.ZERO.multipliedBy(2), 0, 0, 0);
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_multipliedBy_overflowTooBig() {
-        Period test = Period.ofYears(Integer.MAX_VALUE / 2 + 1);
-        test.multipliedBy(2);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Period test = Period.ofYears(Integer.MAX_VALUE / 2 + 1);
+            test.multipliedBy(2);
+        });
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_multipliedBy_overflowTooSmall() {
-        Period test = Period.ofYears(Integer.MIN_VALUE / 2 - 1);
-        test.multipliedBy(2);
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Period test = Period.ofYears(Integer.MIN_VALUE / 2 - 1);
+            test.multipliedBy(2);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -941,25 +986,24 @@ public class TCKPeriod extends AbstractTCKTest {
                 -Integer.MAX_VALUE, -Integer.MAX_VALUE, -Integer.MAX_VALUE);
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_negated_overflow_years() {
-        Period.ofYears(Integer.MIN_VALUE).negated();
+        Assertions.assertThrows(ArithmeticException.class, () -> Period.ofYears(Integer.MIN_VALUE).negated());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_negated_overflow_months() {
-        Period.ofMonths(Integer.MIN_VALUE).negated();
+        Assertions.assertThrows(ArithmeticException.class, () -> Period.ofMonths(Integer.MIN_VALUE).negated());
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_negated_overflow_days() {
-        Period.ofDays(Integer.MIN_VALUE).negated();
+        Assertions.assertThrows(ArithmeticException.class, () -> Period.ofDays(Integer.MIN_VALUE).negated());
     }
 
     //-----------------------------------------------------------------------
     // normalized()
     //-----------------------------------------------------------------------
-    @DataProvider(name="normalized")
     Object[][] data_normalized() {
         return new Object[][] {
                 {0, 0,  0, 0},
@@ -1002,32 +1046,37 @@ public class TCKPeriod extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="normalized")
+    @ParameterizedTest
+    @MethodSource("data_normalized")
     public void test_normalized(int inputYears, int inputMonths, int expectedYears, int expectedMonths) {
         assertPeriod(Period.of(inputYears, inputMonths, 0).normalized(), expectedYears, expectedMonths, 0);
     }
 
-    @Test(dataProvider="normalized")
+    @ParameterizedTest
+    @MethodSource("data_normalized")
     public void test_normalized_daysUnaffected(int inputYears, int inputMonths, int expectedYears, int expectedMonths) {
         assertPeriod(Period.of(inputYears, inputMonths, 5).normalized(), expectedYears, expectedMonths, 5);
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_normalized_min() {
-        Period base = Period.of(Integer.MIN_VALUE, -12, 0);
-        base.normalized();
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Period base = Period.of(Integer.MIN_VALUE, -12, 0);
+            base.normalized();
+        });
     }
 
-    @Test(expectedExceptions=ArithmeticException.class)
+    @Test
     public void test_normalized_max() {
-        Period base = Period.of(Integer.MAX_VALUE, 12, 0);
-        base.normalized();
+        Assertions.assertThrows(ArithmeticException.class, () -> {
+            Period base = Period.of(Integer.MAX_VALUE, 12, 0);
+            base.normalized();
+        });
     }
 
     //-----------------------------------------------------------------------
     // addTo()
     //-----------------------------------------------------------------------
-    @DataProvider(name="addTo")
     Object[][] data_addTo() {
         return new Object[][] {
                 {pymd(0, 0, 0),  date(2012, 6, 30), date(2012, 6, 30)},
@@ -1056,30 +1105,31 @@ public class TCKPeriod extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="addTo")
+    @ParameterizedTest
+    @MethodSource("data_addTo")
     public void test_addTo(Period period, LocalDate baseDate, LocalDate expected) {
-        assertEquals(period.addTo(baseDate), expected);
+        assertEquals(expected, period.addTo(baseDate));
     }
 
-    @Test(dataProvider="addTo")
+    @ParameterizedTest
+    @MethodSource("data_addTo")
     public void test_addTo_usingLocalDatePlus(Period period, LocalDate baseDate, LocalDate expected) {
-        assertEquals(baseDate.plus(period), expected);
+        assertEquals(expected, baseDate.plus(period));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_addTo_nullZero() {
-        Period.ZERO.addTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Period.ZERO.addTo(null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_addTo_nullNonZero() {
-        Period.ofDays(2).addTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Period.ofDays(2).addTo(null));
     }
 
     //-----------------------------------------------------------------------
     // subtractFrom()
     //-----------------------------------------------------------------------
-    @DataProvider(name="subtractFrom")
     Object[][] data_subtractFrom() {
         return new Object[][] {
                 {pymd(0, 0, 0), date(2012, 6, 30), date(2012, 6, 30)},
@@ -1109,24 +1159,26 @@ public class TCKPeriod extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="subtractFrom")
+    @ParameterizedTest
+    @MethodSource("data_subtractFrom")
     public void test_subtractFrom(Period period, LocalDate baseDate, LocalDate expected) {
-        assertEquals(period.subtractFrom(baseDate), expected);
+        assertEquals(expected, period.subtractFrom(baseDate));
     }
 
-    @Test(dataProvider="subtractFrom")
+    @ParameterizedTest
+    @MethodSource("data_subtractFrom")
     public void test_subtractFrom_usingLocalDateMinus(Period period, LocalDate baseDate, LocalDate expected) {
-        assertEquals(baseDate.minus(period), expected);
+        assertEquals(expected, baseDate.minus(period));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_subtractFrom_nullZero() {
-        Period.ZERO.subtractFrom(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Period.ZERO.subtractFrom(null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_subtractFrom_nullNonZero() {
-        Period.ofDays(2).subtractFrom(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Period.ofDays(2).subtractFrom(null));
     }
 
     //-----------------------------------------------------------------------
@@ -1136,14 +1188,13 @@ public class TCKPeriod extends AbstractTCKTest {
     public void test_Period_getUnits() {
         Period period = Period.of(2012, 1, 1);
         List<TemporalUnit> units = period.getUnits();
-        assertEquals(units.size(), 3, "Period.getUnits should return 3 units");
-        assertEquals(units.get(0), ChronoUnit.YEARS, "Period.getUnits contains ChronoUnit.YEARS");
-        assertEquals(units.get(1), ChronoUnit.MONTHS, "Period.getUnits contains ChronoUnit.MONTHS");
-        assertEquals(units.get(2), ChronoUnit.DAYS, "Period.getUnits contains ChronoUnit.DAYS");
+        assertEquals(3, units.size(), "Period.getUnits should return 3 units");
+        assertEquals(ChronoUnit.YEARS, units.get(0), "Period.getUnits contains ChronoUnit.YEARS");
+        assertEquals(ChronoUnit.MONTHS, units.get(1), "Period.getUnits contains ChronoUnit.MONTHS");
+        assertEquals(ChronoUnit.DAYS, units.get(2), "Period.getUnits contains ChronoUnit.DAYS");
     }
 
 
-    @DataProvider(name="GoodTemporalUnit")
     Object[][] data_goodTemporalUnit() {
         return new Object[][] {
             {2, ChronoUnit.DAYS},
@@ -1152,14 +1203,14 @@ public class TCKPeriod extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="GoodTemporalUnit")
+    @ParameterizedTest
+    @MethodSource("data_goodTemporalUnit")
     public void test_good_getUnit(long amount, TemporalUnit unit) {
         Period period = Period.of(2, 2, 2);
         long actual = period.get(unit);
-        assertEquals(actual, amount, "Value of unit: " + unit);
+        assertEquals(amount, actual, "Value of unit: " + unit);
     }
 
-    @DataProvider(name="BadTemporalUnit")
     Object[][] data_badTemporalUnit() {
         return new Object[][] {
             {ChronoUnit.MICROS},
@@ -1171,64 +1222,71 @@ public class TCKPeriod extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="BadTemporalUnit", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_badTemporalUnit")
     public void test_bad_getUnit(TemporalUnit unit) {
-        Period period = Period.of(2, 2, 2);
-        period.get(unit);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Period period = Period.of(2, 2, 2);
+            period.get(unit);
+        });
     }
 
     //-----------------------------------------------------------------------
     // equals() / hashCode()
     //-----------------------------------------------------------------------
+    @Test
     public void test_equals() {
-        assertEquals(Period.of(1, 0, 0).equals(Period.ofYears(1)), true);
-        assertEquals(Period.of(0, 1, 0).equals(Period.ofMonths(1)), true);
-        assertEquals(Period.of(0, 0, 1).equals(Period.ofDays(1)), true);
-        assertEquals(Period.of(1, 2, 3).equals(Period.of(1, 2, 3)), true);
+        assertEquals(true, Period.of(1, 0, 0).equals(Period.ofYears(1)));
+        assertEquals(true, Period.of(0, 1, 0).equals(Period.ofMonths(1)));
+        assertEquals(true, Period.of(0, 0, 1).equals(Period.ofDays(1)));
+        assertEquals(true, Period.of(1, 2, 3).equals(Period.of(1, 2, 3)));
 
-        assertEquals(Period.ofYears(1).equals(Period.ofYears(1)), true);
-        assertEquals(Period.ofYears(1).equals(Period.ofYears(2)), false);
+        assertEquals(true, Period.ofYears(1).equals(Period.ofYears(1)));
+        assertEquals(false, Period.ofYears(1).equals(Period.ofYears(2)));
 
-        assertEquals(Period.ofMonths(1).equals(Period.ofMonths(1)), true);
-        assertEquals(Period.ofMonths(1).equals(Period.ofMonths(2)), false);
+        assertEquals(true, Period.ofMonths(1).equals(Period.ofMonths(1)));
+        assertEquals(false, Period.ofMonths(1).equals(Period.ofMonths(2)));
 
-        assertEquals(Period.ofDays(1).equals(Period.ofDays(1)), true);
-        assertEquals(Period.ofDays(1).equals(Period.ofDays(2)), false);
+        assertEquals(true, Period.ofDays(1).equals(Period.ofDays(1)));
+        assertEquals(false, Period.ofDays(1).equals(Period.ofDays(2)));
 
-        assertEquals(Period.of(1, 2, 3).equals(Period.of(0, 2, 3)), false);
-        assertEquals(Period.of(1, 2, 3).equals(Period.of(1, 0, 3)), false);
-        assertEquals(Period.of(1, 2, 3).equals(Period.of(1, 2, 0)), false);
+        assertEquals(false, Period.of(1, 2, 3).equals(Period.of(0, 2, 3)));
+        assertEquals(false, Period.of(1, 2, 3).equals(Period.of(1, 0, 3)));
+        assertEquals(false, Period.of(1, 2, 3).equals(Period.of(1, 2, 0)));
     }
 
+    @Test
     public void test_equals_self() {
         Period test = Period.of(1, 2, 3);
-        assertEquals(test.equals(test), true);
+        assertEquals(true, test.equals(test));
     }
 
+    @Test
     public void test_equals_null() {
         Period test = Period.of(1, 2, 3);
-        assertEquals(test.equals(null), false);
+        assertEquals(false, test.equals(null));
     }
 
+    @Test
     public void test_equals_otherClass() {
         Period test = Period.of(1, 2, 3);
-        assertEquals(test.equals(""), false);
+        assertEquals(false, test.equals(""));
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_hashCode() {
         Period test5 = Period.ofDays(5);
         Period test6 = Period.ofDays(6);
         Period test5M = Period.ofMonths(5);
         Period test5Y = Period.ofYears(5);
-        assertEquals(test5.hashCode() == test5.hashCode(), true);
-        assertEquals(test5.hashCode() == test6.hashCode(), false);
+        assertEquals(true, test5.hashCode() == test5.hashCode());
+        assertEquals(false, test5.hashCode() == test6.hashCode());
     }
 
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
-    @DataProvider(name="toStringAndParse")
     Object[][] data_toString() {
         return new Object[][] {
                 {Period.ZERO, "P0D"},
@@ -1242,22 +1300,24 @@ public class TCKPeriod extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="toStringAndParse")
+    @ParameterizedTest
+    @MethodSource("data_toString")
     public void test_toString(Period input, String expected) {
-        assertEquals(input.toString(), expected);
+        assertEquals(expected, input.toString());
     }
 
-    @Test(dataProvider="toStringAndParse")
+    @ParameterizedTest
+    @MethodSource("data_toString")
     public void test_parse(Period test, String expected) {
-        assertEquals(Period.parse(expected), test);
+        assertEquals(test, Period.parse(expected));
     }
 
     //-----------------------------------------------------------------------
     private void assertPeriod(Period test, int y, int m, int d) {
-        assertEquals(test.getYears(), y, "years");
-        assertEquals(test.getMonths(), m, "months");
-        assertEquals(test.getDays(), d, "days");
-        assertEquals(test.toTotalMonths(), y * 12L + m, "totalMonths");
+        assertEquals(y, test.getYears(), "years");
+        assertEquals(m, test.getMonths(), "months");
+        assertEquals(d, test.getDays(), "days");
+        assertEquals(y * 12L + m, test.toTotalMonths(), "totalMonths");
     }
 
     private static Period pymd(int y, int m, int d) {
diff --git a/test/jdk/java/time/tck/java/time/TCKYear.java b/test/jdk/java/time/tck/java/time/TCKYear.java
index b86f3b567ac..7e4d15e146d 100644
--- a/test/jdk/java/time/tck/java/time/TCKYear.java
+++ b/test/jdk/java/time/tck/java/time/TCKYear.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,9 +68,10 @@ import static java.time.temporal.ChronoUnit.DECADES;
 import static java.time.temporal.ChronoUnit.MILLENNIA;
 import static java.time.temporal.ChronoUnit.MONTHS;
 import static java.time.temporal.ChronoUnit.YEARS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -107,19 +108,22 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test Year.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKYear extends AbstractDateTimeTest {
 
     private static final Year TEST_2008 = Year.of(2008);
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
     }
 
@@ -164,15 +168,15 @@ public class TCKYear extends AbstractDateTimeTest {
             expected = Year.now(Clock.systemDefaultZone());
             test = Year.now();
         }
-        assertEquals(test, expected);
+        assertEquals(expected, test);
     }
 
     //-----------------------------------------------------------------------
     // now(ZoneId)
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_ZoneId_nullZoneId() {
-        Year.now((ZoneId) null);
+        Assertions.assertThrows(NullPointerException.class, () -> Year.now((ZoneId) null));
     }
 
     @Test
@@ -187,7 +191,7 @@ public class TCKYear extends AbstractDateTimeTest {
             expected = Year.now(Clock.system(zone));
             test = Year.now(zone);
         }
-        assertEquals(test, expected);
+        assertEquals(expected, test);
     }
 
     //-----------------------------------------------------------------------
@@ -198,12 +202,12 @@ public class TCKYear extends AbstractDateTimeTest {
         Instant instant = OffsetDateTime.of(LocalDate.of(2010, 12, 31), LocalTime.of(0, 0), ZoneOffset.UTC).toInstant();
         Clock clock = Clock.fixed(instant, ZoneOffset.UTC);
         Year test = Year.now(clock);
-        assertEquals(test.getValue(), 2010);
+        assertEquals(2010, test.getValue());
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_Clock_nullClock() {
-        Year.now((Clock) null);
+        Assertions.assertThrows(NullPointerException.class, () -> Year.now((Clock) null));
     }
 
     //-----------------------------------------------------------------------
@@ -211,41 +215,40 @@ public class TCKYear extends AbstractDateTimeTest {
     public void test_factory_int_singleton() {
         for (int i = -4; i <= 2104; i++) {
             Year test = Year.of(i);
-            assertEquals(test.getValue(), i);
-            assertEquals(Year.of(i), test);
+            assertEquals(i, test.getValue());
+            assertEquals(test, Year.of(i));
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_tooLow() {
-        Year.of(Year.MIN_VALUE - 1);
+        Assertions.assertThrows(DateTimeException.class, () -> Year.of(Year.MIN_VALUE - 1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_tooHigh() {
-        Year.of(Year.MAX_VALUE + 1);
+        Assertions.assertThrows(DateTimeException.class, () -> Year.of(Year.MAX_VALUE + 1));
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_from_TemporalAccessor() {
-        assertEquals(Year.from(LocalDate.of(2007, 7, 15)), Year.of(2007));
+        assertEquals(Year.of(2007), Year.from(LocalDate.of(2007, 7, 15)));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_from_TemporalAccessor_invalid_noDerive() {
-        Year.from(LocalTime.of(12, 30));
+        Assertions.assertThrows(DateTimeException.class, () -> Year.from(LocalTime.of(12, 30)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_from_TemporalAccessor_null() {
-        Year.from((TemporalAccessor) null);
+        Assertions.assertThrows(NullPointerException.class, () -> Year.from((TemporalAccessor) null));
     }
 
     //-----------------------------------------------------------------------
     // parse()
     //-----------------------------------------------------------------------
-    @DataProvider(name="goodParseData")
     Object[][] provider_goodParseData() {
         return new Object[][] {
                 {"9999", Year.of(9999)},
@@ -284,13 +287,13 @@ public class TCKYear extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="goodParseData")
+    @ParameterizedTest
+    @MethodSource("provider_goodParseData")
     public void factory_parse_success(String text, Year expected) {
         Year year = Year.parse(text);
-        assertEquals(year, expected);
+        assertEquals(expected, year);
     }
 
-    @DataProvider(name="badParseData")
     Object[][] provider_badParseData() {
         return new Object[][] {
                 {"", 0},
@@ -309,21 +312,24 @@ public class TCKYear extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="badParseData", expectedExceptions=DateTimeParseException.class)
+    @ParameterizedTest
+    @MethodSource("provider_badParseData")
     public void factory_parse_fail(String text, int pos) {
-        try {
-            Year.parse(text);
-            fail(String.format("Parse should have failed for %s at position %d", text, pos));
-        } catch (DateTimeParseException ex) {
-            assertEquals(ex.getParsedString(), text);
-            assertEquals(ex.getErrorIndex(), pos);
-            throw ex;
-        }
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            try {
+                Year.parse(text);
+                fail(String.format("Parse should have failed for %s at position %d", text, pos));
+            } catch (DateTimeParseException ex) {
+                assertEquals(text, ex.getParsedString());
+                assertEquals(pos, ex.getErrorIndex());
+                throw ex;
+            }
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_nullText() {
-        Year.parse(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Year.parse(null));
     }
 
     //-----------------------------------------------------------------------
@@ -333,18 +339,20 @@ public class TCKYear extends AbstractDateTimeTest {
     public void factory_parse_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("y");
         Year test = Year.parse("2010", f);
-        assertEquals(test, Year.of(2010));
+        assertEquals(Year.of(2010), test);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullText() {
-        DateTimeFormatter f = DateTimeFormatter.ofPattern("y");
-        Year.parse((String) null, f);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter f = DateTimeFormatter.ofPattern("y");
+            Year.parse((String) null, f);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullFormatter() {
-        Year.parse("ANY", null);
+        Assertions.assertThrows(NullPointerException.class, () -> Year.parse("ANY", null));
     }
 
     //-----------------------------------------------------------------------
@@ -352,37 +360,37 @@ public class TCKYear extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalField() {
-        assertEquals(TEST_2008.isSupported((TemporalField) null), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.NANO_OF_SECOND), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.NANO_OF_DAY), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.MICRO_OF_SECOND), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.MICRO_OF_DAY), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.MILLI_OF_SECOND), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.MILLI_OF_DAY), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.SECOND_OF_MINUTE), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.SECOND_OF_DAY), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.MINUTE_OF_HOUR), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.MINUTE_OF_DAY), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.HOUR_OF_AMPM), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.HOUR_OF_DAY), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.AMPM_OF_DAY), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.DAY_OF_WEEK), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.DAY_OF_MONTH), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.DAY_OF_YEAR), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.EPOCH_DAY), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.MONTH_OF_YEAR), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.PROLEPTIC_MONTH), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.YEAR), true);
-        assertEquals(TEST_2008.isSupported(ChronoField.YEAR_OF_ERA), true);
-        assertEquals(TEST_2008.isSupported(ChronoField.ERA), true);
-        assertEquals(TEST_2008.isSupported(ChronoField.INSTANT_SECONDS), false);
-        assertEquals(TEST_2008.isSupported(ChronoField.OFFSET_SECONDS), false);
+        assertEquals(false, TEST_2008.isSupported((TemporalField) null));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.NANO_OF_SECOND));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.NANO_OF_DAY));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.MICRO_OF_SECOND));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.MICRO_OF_DAY));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.MILLI_OF_SECOND));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.MILLI_OF_DAY));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.SECOND_OF_DAY));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.MINUTE_OF_DAY));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.HOUR_OF_AMPM));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.HOUR_OF_DAY));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.CLOCK_HOUR_OF_DAY));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.AMPM_OF_DAY));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.DAY_OF_WEEK));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.DAY_OF_MONTH));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.DAY_OF_YEAR));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.EPOCH_DAY));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.MONTH_OF_YEAR));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.PROLEPTIC_MONTH));
+        assertEquals(true, TEST_2008.isSupported(ChronoField.YEAR));
+        assertEquals(true, TEST_2008.isSupported(ChronoField.YEAR_OF_ERA));
+        assertEquals(true, TEST_2008.isSupported(ChronoField.ERA));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.INSTANT_SECONDS));
+        assertEquals(false, TEST_2008.isSupported(ChronoField.OFFSET_SECONDS));
     }
 
     //-----------------------------------------------------------------------
@@ -390,23 +398,23 @@ public class TCKYear extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalUnit() {
-        assertEquals(TEST_2008.isSupported((TemporalUnit) null), false);
-        assertEquals(TEST_2008.isSupported(ChronoUnit.NANOS), false);
-        assertEquals(TEST_2008.isSupported(ChronoUnit.MICROS), false);
-        assertEquals(TEST_2008.isSupported(ChronoUnit.MILLIS), false);
-        assertEquals(TEST_2008.isSupported(ChronoUnit.SECONDS), false);
-        assertEquals(TEST_2008.isSupported(ChronoUnit.MINUTES), false);
-        assertEquals(TEST_2008.isSupported(ChronoUnit.HOURS), false);
-        assertEquals(TEST_2008.isSupported(ChronoUnit.HALF_DAYS), false);
-        assertEquals(TEST_2008.isSupported(ChronoUnit.DAYS), false);
-        assertEquals(TEST_2008.isSupported(ChronoUnit.WEEKS), false);
-        assertEquals(TEST_2008.isSupported(ChronoUnit.MONTHS), false);
-        assertEquals(TEST_2008.isSupported(ChronoUnit.YEARS), true);
-        assertEquals(TEST_2008.isSupported(ChronoUnit.DECADES), true);
-        assertEquals(TEST_2008.isSupported(ChronoUnit.CENTURIES), true);
-        assertEquals(TEST_2008.isSupported(ChronoUnit.MILLENNIA), true);
-        assertEquals(TEST_2008.isSupported(ChronoUnit.ERAS), true);
-        assertEquals(TEST_2008.isSupported(ChronoUnit.FOREVER), false);
+        assertEquals(false, TEST_2008.isSupported((TemporalUnit) null));
+        assertEquals(false, TEST_2008.isSupported(ChronoUnit.NANOS));
+        assertEquals(false, TEST_2008.isSupported(ChronoUnit.MICROS));
+        assertEquals(false, TEST_2008.isSupported(ChronoUnit.MILLIS));
+        assertEquals(false, TEST_2008.isSupported(ChronoUnit.SECONDS));
+        assertEquals(false, TEST_2008.isSupported(ChronoUnit.MINUTES));
+        assertEquals(false, TEST_2008.isSupported(ChronoUnit.HOURS));
+        assertEquals(false, TEST_2008.isSupported(ChronoUnit.HALF_DAYS));
+        assertEquals(false, TEST_2008.isSupported(ChronoUnit.DAYS));
+        assertEquals(false, TEST_2008.isSupported(ChronoUnit.WEEKS));
+        assertEquals(false, TEST_2008.isSupported(ChronoUnit.MONTHS));
+        assertEquals(true, TEST_2008.isSupported(ChronoUnit.YEARS));
+        assertEquals(true, TEST_2008.isSupported(ChronoUnit.DECADES));
+        assertEquals(true, TEST_2008.isSupported(ChronoUnit.CENTURIES));
+        assertEquals(true, TEST_2008.isSupported(ChronoUnit.MILLENNIA));
+        assertEquals(true, TEST_2008.isSupported(ChronoUnit.ERAS));
+        assertEquals(false, TEST_2008.isSupported(ChronoUnit.FOREVER));
     }
 
     //-----------------------------------------------------------------------
@@ -414,22 +422,21 @@ public class TCKYear extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_get_TemporalField() {
-        assertEquals(TEST_2008.get(ChronoField.YEAR), 2008);
-        assertEquals(TEST_2008.get(ChronoField.YEAR_OF_ERA), 2008);
-        assertEquals(TEST_2008.get(ChronoField.ERA), 1);
+        assertEquals(2008, TEST_2008.get(ChronoField.YEAR));
+        assertEquals(2008, TEST_2008.get(ChronoField.YEAR_OF_ERA));
+        assertEquals(1, TEST_2008.get(ChronoField.ERA));
     }
 
     @Test
     public void test_getLong_TemporalField() {
-        assertEquals(TEST_2008.getLong(ChronoField.YEAR), 2008);
-        assertEquals(TEST_2008.getLong(ChronoField.YEAR_OF_ERA), 2008);
-        assertEquals(TEST_2008.getLong(ChronoField.ERA), 1);
+        assertEquals(2008, TEST_2008.getLong(ChronoField.YEAR));
+        assertEquals(2008, TEST_2008.getLong(ChronoField.YEAR_OF_ERA));
+        assertEquals(1, TEST_2008.getLong(ChronoField.ERA));
     }
 
     //-----------------------------------------------------------------------
     // query(TemporalQuery)
     //-----------------------------------------------------------------------
-    @DataProvider(name="query")
     Object[][] data_query() {
         return new Object[][] {
                 {TEST_2008, TemporalQueries.chronology(), IsoChronology.INSTANCE},
@@ -442,19 +449,21 @@ public class TCKYear extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_query(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(temporal.query(query), expected);
+        assertEquals(expected, temporal.query(query));
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_queryFrom(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(query.queryFrom(temporal), expected);
+        assertEquals(expected, query.queryFrom(temporal));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_query_null() {
-        TEST_2008.query(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008.query(null));
     }
 
     //-----------------------------------------------------------------------
@@ -462,46 +471,45 @@ public class TCKYear extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isLeap() {
-        assertEquals(Year.of(1999).isLeap(), false);
-        assertEquals(Year.of(2000).isLeap(), true);
-        assertEquals(Year.of(2001).isLeap(), false);
+        assertEquals(false, Year.of(1999).isLeap());
+        assertEquals(true, Year.of(2000).isLeap());
+        assertEquals(false, Year.of(2001).isLeap());
 
-        assertEquals(Year.of(2007).isLeap(), false);
-        assertEquals(Year.of(2008).isLeap(), true);
-        assertEquals(Year.of(2009).isLeap(), false);
-        assertEquals(Year.of(2010).isLeap(), false);
-        assertEquals(Year.of(2011).isLeap(), false);
-        assertEquals(Year.of(2012).isLeap(), true);
+        assertEquals(false, Year.of(2007).isLeap());
+        assertEquals(true, Year.of(2008).isLeap());
+        assertEquals(false, Year.of(2009).isLeap());
+        assertEquals(false, Year.of(2010).isLeap());
+        assertEquals(false, Year.of(2011).isLeap());
+        assertEquals(true, Year.of(2012).isLeap());
 
-        assertEquals(Year.of(2095).isLeap(), false);
-        assertEquals(Year.of(2096).isLeap(), true);
-        assertEquals(Year.of(2097).isLeap(), false);
-        assertEquals(Year.of(2098).isLeap(), false);
-        assertEquals(Year.of(2099).isLeap(), false);
-        assertEquals(Year.of(2100).isLeap(), false);
-        assertEquals(Year.of(2101).isLeap(), false);
-        assertEquals(Year.of(2102).isLeap(), false);
-        assertEquals(Year.of(2103).isLeap(), false);
-        assertEquals(Year.of(2104).isLeap(), true);
-        assertEquals(Year.of(2105).isLeap(), false);
+        assertEquals(false, Year.of(2095).isLeap());
+        assertEquals(true, Year.of(2096).isLeap());
+        assertEquals(false, Year.of(2097).isLeap());
+        assertEquals(false, Year.of(2098).isLeap());
+        assertEquals(false, Year.of(2099).isLeap());
+        assertEquals(false, Year.of(2100).isLeap());
+        assertEquals(false, Year.of(2101).isLeap());
+        assertEquals(false, Year.of(2102).isLeap());
+        assertEquals(false, Year.of(2103).isLeap());
+        assertEquals(true, Year.of(2104).isLeap());
+        assertEquals(false, Year.of(2105).isLeap());
 
-        assertEquals(Year.of(-500).isLeap(), false);
-        assertEquals(Year.of(-400).isLeap(), true);
-        assertEquals(Year.of(-300).isLeap(), false);
-        assertEquals(Year.of(-200).isLeap(), false);
-        assertEquals(Year.of(-100).isLeap(), false);
-        assertEquals(Year.of(0).isLeap(), true);
-        assertEquals(Year.of(100).isLeap(), false);
-        assertEquals(Year.of(200).isLeap(), false);
-        assertEquals(Year.of(300).isLeap(), false);
-        assertEquals(Year.of(400).isLeap(), true);
-        assertEquals(Year.of(500).isLeap(), false);
+        assertEquals(false, Year.of(-500).isLeap());
+        assertEquals(true, Year.of(-400).isLeap());
+        assertEquals(false, Year.of(-300).isLeap());
+        assertEquals(false, Year.of(-200).isLeap());
+        assertEquals(false, Year.of(-100).isLeap());
+        assertEquals(true, Year.of(0).isLeap());
+        assertEquals(false, Year.of(100).isLeap());
+        assertEquals(false, Year.of(200).isLeap());
+        assertEquals(false, Year.of(300).isLeap());
+        assertEquals(true, Year.of(400).isLeap());
+        assertEquals(false, Year.of(500).isLeap());
     }
 
     //-----------------------------------------------------------------------
     // plus(Period)
     //-----------------------------------------------------------------------
-    @DataProvider(name="plusValid")
     Object[][] data_plusValid() {
         return new Object[][] {
                 {2012, Period.ofYears(0), 2012},
@@ -511,12 +519,12 @@ public class TCKYear extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="plusValid")
+    @ParameterizedTest
+    @MethodSource("data_plusValid")
     public void test_plusValid(int year, TemporalAmount amount, int expected) {
-        assertEquals(Year.of(year).plus(amount), Year.of(expected));
+        assertEquals(Year.of(expected), Year.of(year).plus(amount));
     }
 
-    @DataProvider(name="plusInvalidUnit")
     Object[][] data_plusInvalidUnit() {
         return new Object[][] {
                 {Period.of(0, 1, 0)},
@@ -530,14 +538,15 @@ public class TCKYear extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="plusInvalidUnit", expectedExceptions=UnsupportedTemporalTypeException.class)
+    @ParameterizedTest
+    @MethodSource("data_plusInvalidUnit")
     public void test_plusInvalidUnit(TemporalAmount amount) {
-        TEST_2008.plus(amount);
+        Assertions.assertThrows(UnsupportedTemporalTypeException.class, () -> TEST_2008.plus(amount));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_plus_null() {
-        TEST_2008.plus(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008.plus(null));
     }
 
     //-----------------------------------------------------------------------
@@ -545,54 +554,53 @@ public class TCKYear extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_plusYears() {
-        assertEquals(Year.of(2007).plusYears(-1), Year.of(2006));
-        assertEquals(Year.of(2007).plusYears(0), Year.of(2007));
-        assertEquals(Year.of(2007).plusYears(1), Year.of(2008));
-        assertEquals(Year.of(2007).plusYears(2), Year.of(2009));
+        assertEquals(Year.of(2006), Year.of(2007).plusYears(-1));
+        assertEquals(Year.of(2007), Year.of(2007).plusYears(0));
+        assertEquals(Year.of(2008), Year.of(2007).plusYears(1));
+        assertEquals(Year.of(2009), Year.of(2007).plusYears(2));
 
-        assertEquals(Year.of(Year.MAX_VALUE - 1).plusYears(1), Year.of(Year.MAX_VALUE));
-        assertEquals(Year.of(Year.MAX_VALUE).plusYears(0), Year.of(Year.MAX_VALUE));
+        assertEquals(Year.of(Year.MAX_VALUE), Year.of(Year.MAX_VALUE - 1).plusYears(1));
+        assertEquals(Year.of(Year.MAX_VALUE), Year.of(Year.MAX_VALUE).plusYears(0));
 
-        assertEquals(Year.of(Year.MIN_VALUE + 1).plusYears(-1), Year.of(Year.MIN_VALUE));
-        assertEquals(Year.of(Year.MIN_VALUE).plusYears(0), Year.of(Year.MIN_VALUE));
+        assertEquals(Year.of(Year.MIN_VALUE), Year.of(Year.MIN_VALUE + 1).plusYears(-1));
+        assertEquals(Year.of(Year.MIN_VALUE), Year.of(Year.MIN_VALUE).plusYears(0));
     }
 
     @Test
     public void test_plusYear_zero_equals() {
         Year base = Year.of(2007);
-        assertEquals(base.plusYears(0), base);
+        assertEquals(base, base.plusYears(0));
     }
 
     @Test
     public void test_plusYears_big() {
         long years = 20L + Year.MAX_VALUE;
-        assertEquals(Year.of(-40).plusYears(years), Year.of((int) (-40L + years)));
+        assertEquals(Year.of((int) (-40L + years)), Year.of(-40).plusYears(years));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusYears_max() {
-        Year.of(Year.MAX_VALUE).plusYears(1);
+        Assertions.assertThrows(DateTimeException.class, () -> Year.of(Year.MAX_VALUE).plusYears(1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusYears_maxLots() {
-        Year.of(Year.MAX_VALUE).plusYears(1000);
+        Assertions.assertThrows(DateTimeException.class, () -> Year.of(Year.MAX_VALUE).plusYears(1000));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusYears_min() {
-        Year.of(Year.MIN_VALUE).plusYears(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> Year.of(Year.MIN_VALUE).plusYears(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusYears_minLots() {
-        Year.of(Year.MIN_VALUE).plusYears(-1000);
+        Assertions.assertThrows(DateTimeException.class, () -> Year.of(Year.MIN_VALUE).plusYears(-1000));
     }
 
     //-----------------------------------------------------------------------
     // plus(long, TemporalUnit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="plus_long_TemporalUnit")
     Object[][] data_plus_long_TemporalUnit() {
         return new Object[][] {
             {Year.of(1), 1, ChronoUnit.YEARS, Year.of(2), null},
@@ -616,10 +624,11 @@ public class TCKYear extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="plus_long_TemporalUnit")
+    @ParameterizedTest
+    @MethodSource("data_plus_long_TemporalUnit")
     public void test_plus_long_TemporalUnit(Year base, long amount, TemporalUnit unit, Year expectedYear, Class<?> expectedEx) {
         if (expectedEx == null) {
-            assertEquals(base.plus(amount, unit), expectedYear);
+            assertEquals(expectedYear, base.plus(amount, unit));
         } else {
             try {
                 base.plus(amount, unit);
@@ -633,7 +642,6 @@ public class TCKYear extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // minus(Period)
     //-----------------------------------------------------------------------
-    @DataProvider(name="minusValid")
     Object[][] data_minusValid() {
         return new Object[][] {
                 {2012, Period.ofYears(0), 2012},
@@ -643,12 +651,12 @@ public class TCKYear extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="minusValid")
+    @ParameterizedTest
+    @MethodSource("data_minusValid")
     public void test_minusValid(int year, TemporalAmount amount, int expected) {
-        assertEquals(Year.of(year).minus(amount), Year.of(expected));
+        assertEquals(Year.of(expected), Year.of(year).minus(amount));
     }
 
-    @DataProvider(name="minusInvalidUnit")
     Object[][] data_minusInvalidUnit() {
         return new Object[][] {
                 {Period.of(0, 1, 0)},
@@ -662,14 +670,15 @@ public class TCKYear extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="minusInvalidUnit", expectedExceptions=UnsupportedTemporalTypeException.class)
+    @ParameterizedTest
+    @MethodSource("data_minusInvalidUnit")
     public void test_minusInvalidUnit(TemporalAmount amount) {
-        TEST_2008.minus(amount);
+        Assertions.assertThrows(UnsupportedTemporalTypeException.class, () -> TEST_2008.minus(amount));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_minus_null() {
-        TEST_2008.minus(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008.minus(null));
     }
 
     //-----------------------------------------------------------------------
@@ -677,54 +686,53 @@ public class TCKYear extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_minusYears() {
-        assertEquals(Year.of(2007).minusYears(-1), Year.of(2008));
-        assertEquals(Year.of(2007).minusYears(0), Year.of(2007));
-        assertEquals(Year.of(2007).minusYears(1), Year.of(2006));
-        assertEquals(Year.of(2007).minusYears(2), Year.of(2005));
+        assertEquals(Year.of(2008), Year.of(2007).minusYears(-1));
+        assertEquals(Year.of(2007), Year.of(2007).minusYears(0));
+        assertEquals(Year.of(2006), Year.of(2007).minusYears(1));
+        assertEquals(Year.of(2005), Year.of(2007).minusYears(2));
 
-        assertEquals(Year.of(Year.MAX_VALUE - 1).minusYears(-1), Year.of(Year.MAX_VALUE));
-        assertEquals(Year.of(Year.MAX_VALUE).minusYears(0), Year.of(Year.MAX_VALUE));
+        assertEquals(Year.of(Year.MAX_VALUE), Year.of(Year.MAX_VALUE - 1).minusYears(-1));
+        assertEquals(Year.of(Year.MAX_VALUE), Year.of(Year.MAX_VALUE).minusYears(0));
 
-        assertEquals(Year.of(Year.MIN_VALUE + 1).minusYears(1), Year.of(Year.MIN_VALUE));
-        assertEquals(Year.of(Year.MIN_VALUE).minusYears(0), Year.of(Year.MIN_VALUE));
+        assertEquals(Year.of(Year.MIN_VALUE), Year.of(Year.MIN_VALUE + 1).minusYears(1));
+        assertEquals(Year.of(Year.MIN_VALUE), Year.of(Year.MIN_VALUE).minusYears(0));
     }
 
     @Test
     public void test_minusYear_zero_equals() {
         Year base = Year.of(2007);
-        assertEquals(base.minusYears(0), base);
+        assertEquals(base, base.minusYears(0));
     }
 
     @Test
     public void test_minusYears_big() {
         long years = 20L + Year.MAX_VALUE;
-        assertEquals(Year.of(40).minusYears(years), Year.of((int) (40L - years)));
+        assertEquals(Year.of((int) (40L - years)), Year.of(40).minusYears(years));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusYears_max() {
-        Year.of(Year.MAX_VALUE).minusYears(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> Year.of(Year.MAX_VALUE).minusYears(-1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusYears_maxLots() {
-        Year.of(Year.MAX_VALUE).minusYears(-1000);
+        Assertions.assertThrows(DateTimeException.class, () -> Year.of(Year.MAX_VALUE).minusYears(-1000));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusYears_min() {
-        Year.of(Year.MIN_VALUE).minusYears(1);
+        Assertions.assertThrows(DateTimeException.class, () -> Year.of(Year.MIN_VALUE).minusYears(1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusYears_minLots() {
-        Year.of(Year.MIN_VALUE).minusYears(1000);
+        Assertions.assertThrows(DateTimeException.class, () -> Year.of(Year.MIN_VALUE).minusYears(1000));
     }
 
     //-----------------------------------------------------------------------
     // minus(long, TemporalUnit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="minus_long_TemporalUnit")
     Object[][] data_minus_long_TemporalUnit() {
         return new Object[][] {
             {Year.of(1), 1, ChronoUnit.YEARS, Year.of(0), null},
@@ -748,10 +756,11 @@ public class TCKYear extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="minus_long_TemporalUnit")
+    @ParameterizedTest
+    @MethodSource("data_minus_long_TemporalUnit")
     public void test_minus_long_TemporalUnit(Year base, long amount, TemporalUnit unit, Year expectedYear, Class<?> expectedEx) {
         if (expectedEx == null) {
-            assertEquals(base.minus(amount, unit), expectedYear);
+            assertEquals(expectedYear, base.minus(amount, unit));
         } else {
             try {
                 Year result = base.minus(amount, unit);
@@ -770,20 +779,22 @@ public class TCKYear extends AbstractDateTimeTest {
         LocalDate base = LocalDate.of(2007, 2, 12);
         for (int i = -4; i <= 2104; i++) {
             Temporal result = Year.of(i).adjustInto(base);
-            assertEquals(result, LocalDate.of(i, 2, 12));
+            assertEquals(LocalDate.of(i, 2, 12), result);
         }
     }
 
     @Test
     public void test_adjustDate_resolve() {
         Year test = Year.of(2011);
-        assertEquals(test.adjustInto(LocalDate.of(2012, 2, 29)), LocalDate.of(2011, 2, 28));
+        assertEquals(LocalDate.of(2011, 2, 28), test.adjustInto(LocalDate.of(2012, 2, 29)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_adjustDate_nullLocalDate() {
-        Year test = Year.of(1);
-        test.adjustInto((LocalDate) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            Year test = Year.of(1);
+            test.adjustInto((LocalDate) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -794,14 +805,16 @@ public class TCKYear extends AbstractDateTimeTest {
         Year base = Year.of(-10);
         for (int i = -4; i <= 2104; i++) {
             Temporal result = base.with(Year.of(i));
-            assertEquals(result, Year.of(i));
+            assertEquals(Year.of(i), result);
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_with_BadTemporalAdjuster() {
-        Year test = Year.of(1);
-        test.with(LocalTime.of(18, 1, 2));
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Year test = Year.of(1);
+            test.with(LocalTime.of(18, 1, 2));
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -811,22 +824,22 @@ public class TCKYear extends AbstractDateTimeTest {
     public void test_with() {
         Year base = Year.of(5);
         Year result = base.with(ChronoField.ERA, 0);
-        assertEquals(result, base.with(IsoEra.of(0)));
+        assertEquals(base.with(IsoEra.of(0)), result);
 
         int prolepticYear = IsoChronology.INSTANCE.prolepticYear(IsoEra.of(0), 5);
-        assertEquals(result.get(ChronoField.ERA), 0);
-        assertEquals(result.get(ChronoField.YEAR), prolepticYear);
-        assertEquals(result.get(ChronoField.YEAR_OF_ERA), 5);
+        assertEquals(0, result.get(ChronoField.ERA));
+        assertEquals(prolepticYear, result.get(ChronoField.YEAR));
+        assertEquals(5, result.get(ChronoField.YEAR_OF_ERA));
 
         result = base.with(ChronoField.YEAR, 10);
-        assertEquals(result.get(ChronoField.ERA), base.get(ChronoField.ERA));
-        assertEquals(result.get(ChronoField.YEAR), 10);
-        assertEquals(result.get(ChronoField.YEAR_OF_ERA), 10);
+        assertEquals(base.get(ChronoField.ERA), result.get(ChronoField.ERA));
+        assertEquals(10, result.get(ChronoField.YEAR));
+        assertEquals(10, result.get(ChronoField.YEAR_OF_ERA));
 
         result = base.with(ChronoField.YEAR_OF_ERA, 20);
-        assertEquals(result.get(ChronoField.ERA), base.get(ChronoField.ERA));
-        assertEquals(result.get(ChronoField.YEAR), 20);
-        assertEquals(result.get(ChronoField.YEAR_OF_ERA), 20);
+        assertEquals(base.get(ChronoField.ERA), result.get(ChronoField.ERA));
+        assertEquals(20, result.get(ChronoField.YEAR));
+        assertEquals(20, result.get(ChronoField.YEAR_OF_ERA));
     }
 
     //-----------------------------------------------------------------------
@@ -834,46 +847,45 @@ public class TCKYear extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_length() {
-        assertEquals(Year.of(1999).length(), 365);
-        assertEquals(Year.of(2000).length(), 366);
-        assertEquals(Year.of(2001).length(), 365);
+        assertEquals(365, Year.of(1999).length());
+        assertEquals(366, Year.of(2000).length());
+        assertEquals(365, Year.of(2001).length());
 
-        assertEquals(Year.of(2007).length(), 365);
-        assertEquals(Year.of(2008).length(), 366);
-        assertEquals(Year.of(2009).length(), 365);
-        assertEquals(Year.of(2010).length(), 365);
-        assertEquals(Year.of(2011).length(), 365);
-        assertEquals(Year.of(2012).length(), 366);
+        assertEquals(365, Year.of(2007).length());
+        assertEquals(366, Year.of(2008).length());
+        assertEquals(365, Year.of(2009).length());
+        assertEquals(365, Year.of(2010).length());
+        assertEquals(365, Year.of(2011).length());
+        assertEquals(366, Year.of(2012).length());
 
-        assertEquals(Year.of(2095).length(), 365);
-        assertEquals(Year.of(2096).length(), 366);
-        assertEquals(Year.of(2097).length(), 365);
-        assertEquals(Year.of(2098).length(), 365);
-        assertEquals(Year.of(2099).length(), 365);
-        assertEquals(Year.of(2100).length(), 365);
-        assertEquals(Year.of(2101).length(), 365);
-        assertEquals(Year.of(2102).length(), 365);
-        assertEquals(Year.of(2103).length(), 365);
-        assertEquals(Year.of(2104).length(), 366);
-        assertEquals(Year.of(2105).length(), 365);
+        assertEquals(365, Year.of(2095).length());
+        assertEquals(366, Year.of(2096).length());
+        assertEquals(365, Year.of(2097).length());
+        assertEquals(365, Year.of(2098).length());
+        assertEquals(365, Year.of(2099).length());
+        assertEquals(365, Year.of(2100).length());
+        assertEquals(365, Year.of(2101).length());
+        assertEquals(365, Year.of(2102).length());
+        assertEquals(365, Year.of(2103).length());
+        assertEquals(366, Year.of(2104).length());
+        assertEquals(365, Year.of(2105).length());
 
-        assertEquals(Year.of(-500).length(), 365);
-        assertEquals(Year.of(-400).length(), 366);
-        assertEquals(Year.of(-300).length(), 365);
-        assertEquals(Year.of(-200).length(), 365);
-        assertEquals(Year.of(-100).length(), 365);
-        assertEquals(Year.of(0).length(), 366);
-        assertEquals(Year.of(100).length(), 365);
-        assertEquals(Year.of(200).length(), 365);
-        assertEquals(Year.of(300).length(), 365);
-        assertEquals(Year.of(400).length(), 366);
-        assertEquals(Year.of(500).length(), 365);
+        assertEquals(365, Year.of(-500).length());
+        assertEquals(366, Year.of(-400).length());
+        assertEquals(365, Year.of(-300).length());
+        assertEquals(365, Year.of(-200).length());
+        assertEquals(365, Year.of(-100).length());
+        assertEquals(366, Year.of(0).length());
+        assertEquals(365, Year.of(100).length());
+        assertEquals(365, Year.of(200).length());
+        assertEquals(365, Year.of(300).length());
+        assertEquals(366, Year.of(400).length());
+        assertEquals(365, Year.of(500).length());
     }
 
     //-----------------------------------------------------------------------
     // isValidMonthDay(MonthDay)
     //-----------------------------------------------------------------------
-    @DataProvider(name="isValidMonthDay")
     Object[][] data_isValidMonthDay() {
         return new Object[][] {
                 {Year.of(2007), MonthDay.of(6, 30), true},
@@ -885,15 +897,15 @@ public class TCKYear extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="isValidMonthDay")
+    @ParameterizedTest
+    @MethodSource("data_isValidMonthDay")
     public void test_isValidMonthDay(Year year, MonthDay monthDay, boolean expected) {
-        assertEquals(year.isValidMonthDay(monthDay), expected);
+        assertEquals(expected, year.isValidMonthDay(monthDay));
     }
 
     //-----------------------------------------------------------------------
     // until(Temporal, TemporalUnit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="periodUntilUnit")
     Object[][] data_periodUntilUnit() {
         return new Object[][] {
                 {Year.of(2000), Year.of(-1), YEARS, -2001},
@@ -941,50 +953,55 @@ public class TCKYear extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit(Year year1, Year year2, TemporalUnit unit, long expected) {
         long amount = year1.until(year2, unit);
-        assertEquals(amount, expected);
+        assertEquals(expected, amount);
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit_negated(Year year1, Year year2, TemporalUnit unit, long expected) {
         long amount = year2.until(year1, unit);
-        assertEquals(amount, -expected);
+        assertEquals(-expected, amount);
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit_between(Year year1, Year year2, TemporalUnit unit, long expected) {
         long amount = unit.between(year1, year2);
-        assertEquals(amount, expected);
+        assertEquals(expected, amount);
     }
 
     @Test
     public void test_until_convertedType() {
         Year start = Year.of(2010);
         YearMonth end = start.plusYears(2).atMonth(Month.APRIL);
-        assertEquals(start.until(end, YEARS), 2);
+        assertEquals(2, start.until(end, YEARS));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_until_invalidType() {
-        Year start = Year.of(2010);
-        start.until(LocalTime.of(11, 30), YEARS);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Year start = Year.of(2010);
+            start.until(LocalTime.of(11, 30), YEARS);
+        });
     }
 
-    @Test(expectedExceptions = UnsupportedTemporalTypeException.class)
+    @Test
     public void test_until_TemporalUnit_unsupportedUnit() {
-        TEST_2008.until(TEST_2008, MONTHS);
+        Assertions.assertThrows(UnsupportedTemporalTypeException.class, () -> TEST_2008.until(TEST_2008, MONTHS));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_until_TemporalUnit_nullEnd() {
-        TEST_2008.until(null, DAYS);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008.until(null, DAYS));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_until_TemporalUnit_nullUnit() {
-        TEST_2008.until(TEST_2008, null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008.until(TEST_2008, null));
     }
 
     //-----------------------------------------------------------------------
@@ -994,12 +1011,12 @@ public class TCKYear extends AbstractDateTimeTest {
     public void test_format_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("y");
         String t = Year.of(2010).format(f);
-        assertEquals(t, "2010");
+        assertEquals("2010", t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_format_formatter_null() {
-        Year.of(2010).format(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Year.of(2010).format(null));
     }
 
     //-----------------------------------------------------------------------
@@ -1008,13 +1025,15 @@ public class TCKYear extends AbstractDateTimeTest {
     @Test
     public void test_atMonth() {
         Year test = Year.of(2008);
-        assertEquals(test.atMonth(Month.JUNE), YearMonth.of(2008, 6));
+        assertEquals(YearMonth.of(2008, 6), test.atMonth(Month.JUNE));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_atMonth_nullMonth() {
-        Year test = Year.of(2008);
-        test.atMonth((Month) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            Year test = Year.of(2008);
+            test.atMonth((Month) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1023,19 +1042,20 @@ public class TCKYear extends AbstractDateTimeTest {
     @Test
     public void test_atMonth_int() {
         Year test = Year.of(2008);
-        assertEquals(test.atMonth(6), YearMonth.of(2008, 6));
+        assertEquals(YearMonth.of(2008, 6), test.atMonth(6));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atMonth_int_invalidMonth() {
-        Year test = Year.of(2008);
-        test.atMonth(13);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Year test = Year.of(2008);
+            test.atMonth(13);
+        });
     }
 
     //-----------------------------------------------------------------------
     // atMonthDay(MonthDay)
     //-----------------------------------------------------------------------
-    @DataProvider(name="atMonthDay")
     Object[][] data_atMonthDay() {
         return new Object[][] {
                 {Year.of(2008), MonthDay.of(6, 30), LocalDate.of(2008, 6, 30)},
@@ -1044,15 +1064,18 @@ public class TCKYear extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="atMonthDay")
+    @ParameterizedTest
+    @MethodSource("data_atMonthDay")
     public void test_atMonthDay(Year year, MonthDay monthDay, LocalDate expected) {
-        assertEquals(year.atMonthDay(monthDay), expected);
+        assertEquals(expected, year.atMonthDay(monthDay));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_atMonthDay_nullMonthDay() {
-        Year test = Year.of(2008);
-        test.atMonthDay((MonthDay) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            Year test = Year.of(2008);
+            test.atMonthDay((MonthDay) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1063,15 +1086,17 @@ public class TCKYear extends AbstractDateTimeTest {
         Year test = Year.of(2007);
         LocalDate expected = LocalDate.of(2007, 1, 1);
         for (int i = 1; i <= 365; i++) {
-            assertEquals(test.atDay(i), expected);
+            assertEquals(expected, test.atDay(i));
             expected = expected.plusDays(1);
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atDay_notLeapYear_day366() {
-        Year test = Year.of(2007);
-        test.atDay(366);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Year test = Year.of(2007);
+            test.atDay(366);
+        });
     }
 
     @Test
@@ -1079,21 +1104,25 @@ public class TCKYear extends AbstractDateTimeTest {
         Year test = Year.of(2008);
         LocalDate expected = LocalDate.of(2008, 1, 1);
         for (int i = 1; i <= 366; i++) {
-            assertEquals(test.atDay(i), expected);
+            assertEquals(expected, test.atDay(i));
             expected = expected.plusDays(1);
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atDay_day0() {
-        Year test = Year.of(2007);
-        test.atDay(0);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Year test = Year.of(2007);
+            test.atDay(0);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_atDay_day367() {
-        Year test = Year.of(2007);
-        test.atDay(367);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Year test = Year.of(2007);
+            test.atDay(367);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1106,36 +1135,38 @@ public class TCKYear extends AbstractDateTimeTest {
             for (int j = -4; j <= 2104; j++) {
                 Year b = Year.of(j);
                 if (i < j) {
-                    assertEquals(a.compareTo(b) < 0, true);
-                    assertEquals(b.compareTo(a) > 0, true);
-                    assertEquals(a.isAfter(b), false);
-                    assertEquals(a.isBefore(b), true);
-                    assertEquals(b.isAfter(a), true);
-                    assertEquals(b.isBefore(a), false);
+                    assertEquals(true, a.compareTo(b) < 0);
+                    assertEquals(true, b.compareTo(a) > 0);
+                    assertEquals(false, a.isAfter(b));
+                    assertEquals(true, a.isBefore(b));
+                    assertEquals(true, b.isAfter(a));
+                    assertEquals(false, b.isBefore(a));
                 } else if (i > j) {
-                    assertEquals(a.compareTo(b) > 0, true);
-                    assertEquals(b.compareTo(a) < 0, true);
-                    assertEquals(a.isAfter(b), true);
-                    assertEquals(a.isBefore(b), false);
-                    assertEquals(b.isAfter(a), false);
-                    assertEquals(b.isBefore(a), true);
+                    assertEquals(true, a.compareTo(b) > 0);
+                    assertEquals(true, b.compareTo(a) < 0);
+                    assertEquals(true, a.isAfter(b));
+                    assertEquals(false, a.isBefore(b));
+                    assertEquals(false, b.isAfter(a));
+                    assertEquals(true, b.isBefore(a));
                 } else {
-                    assertEquals(a.compareTo(b), 0);
-                    assertEquals(b.compareTo(a), 0);
-                    assertEquals(a.isAfter(b), false);
-                    assertEquals(a.isBefore(b), false);
-                    assertEquals(b.isAfter(a), false);
-                    assertEquals(b.isBefore(a), false);
+                    assertEquals(0, a.compareTo(b));
+                    assertEquals(0, b.compareTo(a));
+                    assertEquals(false, a.isAfter(b));
+                    assertEquals(false, a.isBefore(b));
+                    assertEquals(false, b.isAfter(a));
+                    assertEquals(false, b.isBefore(a));
                 }
             }
         }
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_compareTo_nullYear() {
-        Year doy = null;
-        Year test = Year.of(1);
-        test.compareTo(doy);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            Year doy = null;
+            Year test = Year.of(1);
+            test.compareTo(doy);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1147,8 +1178,8 @@ public class TCKYear extends AbstractDateTimeTest {
             Year a = Year.of(i);
             for (int j = -4; j <= 2104; j++) {
                 Year b = Year.of(j);
-                assertEquals(a.equals(b), i == j);
-                assertEquals(a.hashCode() == b.hashCode(), i == j);
+                assertEquals(i == j, a.equals(b));
+                assertEquals(i == j, a.hashCode() == b.hashCode());
             }
         }
     }
@@ -1156,20 +1187,20 @@ public class TCKYear extends AbstractDateTimeTest {
     @Test
     public void test_equals_same() {
         Year test = Year.of(2011);
-        assertEquals(test.equals(test), true);
+        assertEquals(true, test.equals(test));
     }
 
     @Test
     public void test_equals_nullYear() {
         Year doy = null;
         Year test = Year.of(1);
-        assertEquals(test.equals(doy), false);
+        assertEquals(false, test.equals(doy));
     }
 
     @Test
     public void test_equals_incorrectType() {
         Year test = Year.of(1);
-        assertEquals(test.equals("Incorrect type"), false);
+        assertEquals(false, test.equals("Incorrect type"));
     }
 
     //-----------------------------------------------------------------------
@@ -1179,7 +1210,7 @@ public class TCKYear extends AbstractDateTimeTest {
     public void test_toString() {
         for (int i = -4; i <= 2104; i++) {
             Year a = Year.of(i);
-            assertEquals(a.toString(), "" + i);
+            assertEquals("" + i, a.toString());
         }
     }
 
diff --git a/test/jdk/java/time/tck/java/time/TCKYearMonth.java b/test/jdk/java/time/tck/java/time/TCKYearMonth.java
index e922f72323f..3f4fda2a924 100644
--- a/test/jdk/java/time/tck/java/time/TCKYearMonth.java
+++ b/test/jdk/java/time/tck/java/time/TCKYearMonth.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,9 +71,10 @@ import static java.time.temporal.ChronoUnit.HOURS;
 import static java.time.temporal.ChronoUnit.MILLENNIA;
 import static java.time.temporal.ChronoUnit.MONTHS;
 import static java.time.temporal.ChronoUnit.YEARS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -110,19 +111,22 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test YearMonth.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKYearMonth extends AbstractDateTimeTest {
 
     private YearMonth TEST_2008_06;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_2008_06 = YearMonth.of(2008, 6);
     }
@@ -158,8 +162,8 @@ public class TCKYearMonth extends AbstractDateTimeTest {
 
     //-----------------------------------------------------------------------
     void check(YearMonth test, int y, int m) {
-        assertEquals(test.getYear(), y);
-        assertEquals(test.getMonth().getValue(), m);
+        assertEquals(y, test.getYear());
+        assertEquals(m, test.getMonth().getValue());
     }
 
     //-----------------------------------------------------------------------
@@ -176,15 +180,15 @@ public class TCKYearMonth extends AbstractDateTimeTest {
             expected = YearMonth.now(Clock.systemDefaultZone());
             test = YearMonth.now();
         }
-        assertEquals(test, expected);
+        assertEquals(expected, test);
     }
 
     //-----------------------------------------------------------------------
     // now(ZoneId)
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_ZoneId_nullZoneId() {
-        YearMonth.now((ZoneId) null);
+        Assertions.assertThrows(NullPointerException.class, () -> YearMonth.now((ZoneId) null));
     }
 
     @Test
@@ -199,7 +203,7 @@ public class TCKYearMonth extends AbstractDateTimeTest {
             expected = YearMonth.now(Clock.system(zone));
             test = YearMonth.now(zone);
         }
-        assertEquals(test, expected);
+        assertEquals(expected, test);
     }
 
     //-----------------------------------------------------------------------
@@ -210,13 +214,13 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         Instant instant = LocalDateTime.of(2010, 12, 31, 0, 0).toInstant(ZoneOffset.UTC);
         Clock clock = Clock.fixed(instant, ZoneOffset.UTC);
         YearMonth test = YearMonth.now(clock);
-        assertEquals(test.getYear(), 2010);
-        assertEquals(test.getMonth(), Month.DECEMBER);
+        assertEquals(2010, test.getYear());
+        assertEquals(Month.DECEMBER, test.getMonth());
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_Clock_nullClock() {
-        YearMonth.now((Clock) null);
+        Assertions.assertThrows(NullPointerException.class, () -> YearMonth.now((Clock) null));
     }
 
     //-----------------------------------------------------------------------
@@ -226,19 +230,19 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         check(test, 2008, 2);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_intsMonth_yearTooLow() {
-        YearMonth.of(Year.MIN_VALUE - 1, Month.JANUARY);
+        Assertions.assertThrows(DateTimeException.class, () -> YearMonth.of(Year.MIN_VALUE - 1, Month.JANUARY));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_intsMonth_dayTooHigh() {
-        YearMonth.of(Year.MAX_VALUE + 1, Month.JANUARY);
+        Assertions.assertThrows(DateTimeException.class, () -> YearMonth.of(Year.MAX_VALUE + 1, Month.JANUARY));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_intsMonth_nullMonth() {
-        YearMonth.of(2008, null);
+        Assertions.assertThrows(NullPointerException.class, () -> YearMonth.of(2008, null));
     }
 
     //-----------------------------------------------------------------------
@@ -248,46 +252,45 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         check(test, 2008, 2);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_ints_yearTooLow() {
-        YearMonth.of(Year.MIN_VALUE - 1, 2);
+        Assertions.assertThrows(DateTimeException.class, () -> YearMonth.of(Year.MIN_VALUE - 1, 2));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_ints_dayTooHigh() {
-        YearMonth.of(Year.MAX_VALUE + 1, 2);
+        Assertions.assertThrows(DateTimeException.class, () -> YearMonth.of(Year.MAX_VALUE + 1, 2));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_ints_monthTooLow() {
-        YearMonth.of(2008, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> YearMonth.of(2008, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_ints_monthTooHigh() {
-        YearMonth.of(2008, 13);
+        Assertions.assertThrows(DateTimeException.class, () -> YearMonth.of(2008, 13));
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_from_TemporalAccessor() {
-        assertEquals(YearMonth.from(LocalDate.of(2007, 7, 15)), YearMonth.of(2007, 7));
+        assertEquals(YearMonth.of(2007, 7), YearMonth.from(LocalDate.of(2007, 7, 15)));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_from_TemporalAccessor_invalid_noDerive() {
-        YearMonth.from(LocalTime.of(12, 30));
+        Assertions.assertThrows(DateTimeException.class, () -> YearMonth.from(LocalTime.of(12, 30)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_from_TemporalAccessor_null() {
-        YearMonth.from((TemporalAccessor) null);
+        Assertions.assertThrows(NullPointerException.class, () -> YearMonth.from((TemporalAccessor) null));
     }
 
     //-----------------------------------------------------------------------
     // parse()
     //-----------------------------------------------------------------------
-    @DataProvider(name="goodParseData")
     Object[][] provider_goodParseData() {
         return new Object[][] {
                 {"0000-01", YearMonth.of(0, 1)},
@@ -317,14 +320,14 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="goodParseData")
+    @ParameterizedTest
+    @MethodSource("provider_goodParseData")
     public void factory_parse_success(String text, YearMonth expected) {
         YearMonth yearMonth = YearMonth.parse(text);
-        assertEquals(yearMonth, expected);
+        assertEquals(expected, yearMonth);
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="badParseData")
     Object[][] provider_badParseData() {
         return new Object[][] {
                 {"", 0},
@@ -345,27 +348,30 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="badParseData", expectedExceptions=DateTimeParseException.class)
+    @ParameterizedTest
+    @MethodSource("provider_badParseData")
     public void factory_parse_fail(String text, int pos) {
-        try {
-            YearMonth.parse(text);
-            fail(String.format("Parse should have failed for %s at position %d", text, pos));
-        } catch (DateTimeParseException ex) {
-            assertEquals(ex.getParsedString(), text);
-            assertEquals(ex.getErrorIndex(), pos);
-            throw ex;
-        }
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            try {
+                YearMonth.parse(text);
+                fail(String.format("Parse should have failed for %s at position %d", text, pos));
+            } catch (DateTimeParseException ex) {
+                assertEquals(text, ex.getParsedString());
+                assertEquals(pos, ex.getErrorIndex());
+                throw ex;
+            }
+        });
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_illegalValue_Month() {
-        YearMonth.parse("2008-13");
+        Assertions.assertThrows(DateTimeParseException.class, () -> YearMonth.parse("2008-13"));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_nullText() {
-        YearMonth.parse(null);
+        Assertions.assertThrows(NullPointerException.class, () -> YearMonth.parse(null));
     }
 
     //-----------------------------------------------------------------------
@@ -375,18 +381,20 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     public void factory_parse_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("y M");
         YearMonth test = YearMonth.parse("2010 12", f);
-        assertEquals(test, YearMonth.of(2010, 12));
+        assertEquals(YearMonth.of(2010, 12), test);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullText() {
-        DateTimeFormatter f = DateTimeFormatter.ofPattern("y M");
-        YearMonth.parse((String) null, f);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter f = DateTimeFormatter.ofPattern("y M");
+            YearMonth.parse((String) null, f);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullFormatter() {
-        YearMonth.parse("ANY", null);
+        Assertions.assertThrows(NullPointerException.class, () -> YearMonth.parse("ANY", null));
     }
 
     //-----------------------------------------------------------------------
@@ -394,37 +402,37 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalField() {
-        assertEquals(TEST_2008_06.isSupported((TemporalField) null), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.NANO_OF_SECOND), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.NANO_OF_DAY), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.MICRO_OF_SECOND), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.MICRO_OF_DAY), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.MILLI_OF_SECOND), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.MILLI_OF_DAY), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.SECOND_OF_MINUTE), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.SECOND_OF_DAY), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.MINUTE_OF_HOUR), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.MINUTE_OF_DAY), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.HOUR_OF_AMPM), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.HOUR_OF_DAY), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.AMPM_OF_DAY), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.DAY_OF_WEEK), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.DAY_OF_MONTH), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.DAY_OF_YEAR), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.EPOCH_DAY), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.MONTH_OF_YEAR), true);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.PROLEPTIC_MONTH), true);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.YEAR), true);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.YEAR_OF_ERA), true);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.ERA), true);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.INSTANT_SECONDS), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoField.OFFSET_SECONDS), false);
+        assertEquals(false, TEST_2008_06.isSupported((TemporalField) null));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.NANO_OF_SECOND));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.NANO_OF_DAY));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.MICRO_OF_SECOND));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.MICRO_OF_DAY));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.MILLI_OF_SECOND));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.MILLI_OF_DAY));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.SECOND_OF_DAY));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.MINUTE_OF_DAY));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.HOUR_OF_AMPM));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.HOUR_OF_DAY));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.CLOCK_HOUR_OF_DAY));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.AMPM_OF_DAY));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.DAY_OF_WEEK));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.DAY_OF_MONTH));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.DAY_OF_YEAR));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.EPOCH_DAY));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR));
+        assertEquals(true, TEST_2008_06.isSupported(ChronoField.MONTH_OF_YEAR));
+        assertEquals(true, TEST_2008_06.isSupported(ChronoField.PROLEPTIC_MONTH));
+        assertEquals(true, TEST_2008_06.isSupported(ChronoField.YEAR));
+        assertEquals(true, TEST_2008_06.isSupported(ChronoField.YEAR_OF_ERA));
+        assertEquals(true, TEST_2008_06.isSupported(ChronoField.ERA));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.INSTANT_SECONDS));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoField.OFFSET_SECONDS));
     }
 
     //-----------------------------------------------------------------------
@@ -432,23 +440,23 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalUnit() {
-        assertEquals(TEST_2008_06.isSupported((TemporalUnit) null), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoUnit.NANOS), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoUnit.MICROS), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoUnit.MILLIS), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoUnit.SECONDS), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoUnit.MINUTES), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoUnit.HOURS), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoUnit.HALF_DAYS), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoUnit.DAYS), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoUnit.WEEKS), false);
-        assertEquals(TEST_2008_06.isSupported(ChronoUnit.MONTHS), true);
-        assertEquals(TEST_2008_06.isSupported(ChronoUnit.YEARS), true);
-        assertEquals(TEST_2008_06.isSupported(ChronoUnit.DECADES), true);
-        assertEquals(TEST_2008_06.isSupported(ChronoUnit.CENTURIES), true);
-        assertEquals(TEST_2008_06.isSupported(ChronoUnit.MILLENNIA), true);
-        assertEquals(TEST_2008_06.isSupported(ChronoUnit.ERAS), true);
-        assertEquals(TEST_2008_06.isSupported(ChronoUnit.FOREVER), false);
+        assertEquals(false, TEST_2008_06.isSupported((TemporalUnit) null));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoUnit.NANOS));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoUnit.MICROS));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoUnit.MILLIS));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoUnit.SECONDS));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoUnit.MINUTES));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoUnit.HOURS));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoUnit.HALF_DAYS));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoUnit.DAYS));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoUnit.WEEKS));
+        assertEquals(true, TEST_2008_06.isSupported(ChronoUnit.MONTHS));
+        assertEquals(true, TEST_2008_06.isSupported(ChronoUnit.YEARS));
+        assertEquals(true, TEST_2008_06.isSupported(ChronoUnit.DECADES));
+        assertEquals(true, TEST_2008_06.isSupported(ChronoUnit.CENTURIES));
+        assertEquals(true, TEST_2008_06.isSupported(ChronoUnit.MILLENNIA));
+        assertEquals(true, TEST_2008_06.isSupported(ChronoUnit.ERAS));
+        assertEquals(false, TEST_2008_06.isSupported(ChronoUnit.FOREVER));
     }
 
     //-----------------------------------------------------------------------
@@ -456,25 +464,24 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_get_TemporalField() {
-        assertEquals(TEST_2008_06.get(YEAR), 2008);
-        assertEquals(TEST_2008_06.get(MONTH_OF_YEAR), 6);
-        assertEquals(TEST_2008_06.get(YEAR_OF_ERA), 2008);
-        assertEquals(TEST_2008_06.get(ERA), 1);
+        assertEquals(2008, TEST_2008_06.get(YEAR));
+        assertEquals(6, TEST_2008_06.get(MONTH_OF_YEAR));
+        assertEquals(2008, TEST_2008_06.get(YEAR_OF_ERA));
+        assertEquals(1, TEST_2008_06.get(ERA));
     }
 
     @Test
     public void test_getLong_TemporalField() {
-        assertEquals(TEST_2008_06.getLong(YEAR), 2008);
-        assertEquals(TEST_2008_06.getLong(MONTH_OF_YEAR), 6);
-        assertEquals(TEST_2008_06.getLong(YEAR_OF_ERA), 2008);
-        assertEquals(TEST_2008_06.getLong(ERA), 1);
-        assertEquals(TEST_2008_06.getLong(PROLEPTIC_MONTH), 2008 * 12 + 6 - 1);
+        assertEquals(2008, TEST_2008_06.getLong(YEAR));
+        assertEquals(6, TEST_2008_06.getLong(MONTH_OF_YEAR));
+        assertEquals(2008, TEST_2008_06.getLong(YEAR_OF_ERA));
+        assertEquals(1, TEST_2008_06.getLong(ERA));
+        assertEquals(2008 * 12 + 6 - 1, TEST_2008_06.getLong(PROLEPTIC_MONTH));
     }
 
     //-----------------------------------------------------------------------
     // query(TemporalQuery)
     //-----------------------------------------------------------------------
-    @DataProvider(name="query")
     Object[][] data_query() {
         return new Object[][] {
                 {TEST_2008_06, TemporalQueries.chronology(), IsoChronology.INSTANCE},
@@ -487,25 +494,26 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_query(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(temporal.query(query), expected);
+        assertEquals(expected, temporal.query(query));
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_queryFrom(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(query.queryFrom(temporal), expected);
+        assertEquals(expected, query.queryFrom(temporal));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_query_null() {
-        TEST_2008_06.query(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008_06.query(null));
     }
 
     //-----------------------------------------------------------------------
     // get*()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleDates")
     Object[][] provider_sampleDates() {
         return new Object[][] {
             {2008, 1},
@@ -515,12 +523,13 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleDates")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDates")
     public void test_get(int y, int m) {
         YearMonth a = YearMonth.of(y, m);
-        assertEquals(a.getYear(), y);
-        assertEquals(a.getMonth(), Month.of(m));
-        assertEquals(a.getMonthValue(), m);
+        assertEquals(y, a.getYear());
+        assertEquals(Month.of(m), a.getMonth());
+        assertEquals(m, a.getMonthValue());
     }
 
     //-----------------------------------------------------------------------
@@ -529,19 +538,21 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     @Test
     public void test_with_Year() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.with(Year.of(2000)), YearMonth.of(2000, 6));
+        assertEquals(YearMonth.of(2000, 6), test.with(Year.of(2000)));
     }
 
     @Test
     public void test_with_Year_noChange_equal() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.with(Year.of(2008)), test);
+        assertEquals(test, test.with(Year.of(2008)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_with_Year_null() {
-        YearMonth test = YearMonth.of(2008, 6);
-        test.with((Year) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            YearMonth test = YearMonth.of(2008, 6);
+            test.with((Year) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -550,19 +561,21 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     @Test
     public void test_with_Month() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.with(Month.JANUARY), YearMonth.of(2008, 1));
+        assertEquals(YearMonth.of(2008, 1), test.with(Month.JANUARY));
     }
 
     @Test
     public void test_with_Month_noChange_equal() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.with(Month.JUNE), test);
+        assertEquals(test, test.with(Month.JUNE));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_with_Month_null() {
-        YearMonth test = YearMonth.of(2008, 6);
-        test.with((Month) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            YearMonth test = YearMonth.of(2008, 6);
+            test.with((Month) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -571,25 +584,29 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     @Test
     public void test_withYear() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.withYear(1999), YearMonth.of(1999, 6));
+        assertEquals(YearMonth.of(1999, 6), test.withYear(1999));
     }
 
     @Test
     public void test_withYear_int_noChange_equal() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.withYear(2008), test);
+        assertEquals(test, test.withYear(2008));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withYear_tooLow() {
-        YearMonth test = YearMonth.of(2008, 6);
-        test.withYear(Year.MIN_VALUE - 1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(2008, 6);
+            test.withYear(Year.MIN_VALUE - 1);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withYear_tooHigh() {
-        YearMonth test = YearMonth.of(2008, 6);
-        test.withYear(Year.MAX_VALUE + 1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(2008, 6);
+            test.withYear(Year.MAX_VALUE + 1);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -598,25 +615,29 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     @Test
     public void test_withMonth() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.withMonth(1), YearMonth.of(2008, 1));
+        assertEquals(YearMonth.of(2008, 1), test.withMonth(1));
     }
 
     @Test
     public void test_withMonth_int_noChange_equal() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.withMonth(6), test);
+        assertEquals(test, test.withMonth(6));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withMonth_tooLow() {
-        YearMonth test = YearMonth.of(2008, 6);
-        test.withMonth(0);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(2008, 6);
+            test.withMonth(0);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withMonth_tooHigh() {
-        YearMonth test = YearMonth.of(2008, 6);
-        test.withMonth(13);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(2008, 6);
+            test.withMonth(13);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -625,49 +646,57 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     @Test
     public void test_plusYears_long() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.plusYears(1), YearMonth.of(2009, 6));
+        assertEquals(YearMonth.of(2009, 6), test.plusYears(1));
     }
 
     @Test
     public void test_plusYears_long_noChange_equal() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.plusYears(0), test);
+        assertEquals(test, test.plusYears(0));
     }
 
     @Test
     public void test_plusYears_long_negative() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.plusYears(-1), YearMonth.of(2007, 6));
+        assertEquals(YearMonth.of(2007, 6), test.plusYears(-1));
     }
 
     @Test
     public void test_plusYears_long_big() {
         YearMonth test = YearMonth.of(-40, 6);
-        assertEquals(test.plusYears(20L + Year.MAX_VALUE), YearMonth.of((int) (-40L + 20L + Year.MAX_VALUE), 6));
+        assertEquals(YearMonth.of((int) (-40L + 20L + Year.MAX_VALUE), 6), test.plusYears(20L + Year.MAX_VALUE));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusYears_long_invalidTooLarge() {
-        YearMonth test = YearMonth.of(Year.MAX_VALUE, 6);
-        test.plusYears(1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(Year.MAX_VALUE, 6);
+            test.plusYears(1);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusYears_long_invalidTooLargeMaxAddMax() {
-        YearMonth test = YearMonth.of(Year.MAX_VALUE, 12);
-        test.plusYears(Long.MAX_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(Year.MAX_VALUE, 12);
+            test.plusYears(Long.MAX_VALUE);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusYears_long_invalidTooLargeMaxAddMin() {
-        YearMonth test = YearMonth.of(Year.MAX_VALUE, 12);
-        test.plusYears(Long.MIN_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(Year.MAX_VALUE, 12);
+            test.plusYears(Long.MIN_VALUE);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusYears_long_invalidTooSmall() {
-        YearMonth test = YearMonth.of(Year.MIN_VALUE, 6);
-        test.plusYears(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(Year.MIN_VALUE, 6);
+            test.plusYears(-1);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -676,68 +705,75 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     @Test
     public void test_plusMonths_long() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.plusMonths(1), YearMonth.of(2008, 7));
+        assertEquals(YearMonth.of(2008, 7), test.plusMonths(1));
     }
 
     @Test
     public void test_plusMonths_long_noChange_equal() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.plusMonths(0), test);
+        assertEquals(test, test.plusMonths(0));
     }
 
     @Test
     public void test_plusMonths_long_overYears() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.plusMonths(7), YearMonth.of(2009, 1));
+        assertEquals(YearMonth.of(2009, 1), test.plusMonths(7));
     }
 
     @Test
     public void test_plusMonths_long_negative() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.plusMonths(-1), YearMonth.of(2008, 5));
+        assertEquals(YearMonth.of(2008, 5), test.plusMonths(-1));
     }
 
     @Test
     public void test_plusMonths_long_negativeOverYear() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.plusMonths(-6), YearMonth.of(2007, 12));
+        assertEquals(YearMonth.of(2007, 12), test.plusMonths(-6));
     }
 
     @Test
     public void test_plusMonths_long_big() {
         YearMonth test = YearMonth.of(-40, 6);
         long months = 20L + Integer.MAX_VALUE;
-        assertEquals(test.plusMonths(months), YearMonth.of((int) (-40L + months / 12), 6 + (int) (months % 12)));
+        assertEquals(YearMonth.of((int) (-40L + months / 12), 6 + (int) (months % 12)), test.plusMonths(months));
     }
 
-    @Test(expectedExceptions={DateTimeException.class})
+    @Test
     public void test_plusMonths_long_invalidTooLarge() {
-        YearMonth test = YearMonth.of(Year.MAX_VALUE, 12);
-        test.plusMonths(1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(Year.MAX_VALUE, 12);
+            test.plusMonths(1);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusMonths_long_invalidTooLargeMaxAddMax() {
-        YearMonth test = YearMonth.of(Year.MAX_VALUE, 12);
-        test.plusMonths(Long.MAX_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(Year.MAX_VALUE, 12);
+            test.plusMonths(Long.MAX_VALUE);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_plusMonths_long_invalidTooLargeMaxAddMin() {
-        YearMonth test = YearMonth.of(Year.MAX_VALUE, 12);
-        test.plusMonths(Long.MIN_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(Year.MAX_VALUE, 12);
+            test.plusMonths(Long.MIN_VALUE);
+        });
     }
 
-    @Test(expectedExceptions={DateTimeException.class})
+    @Test
     public void test_plusMonths_long_invalidTooSmall() {
-        YearMonth test = YearMonth.of(Year.MIN_VALUE, 1);
-        test.plusMonths(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(Year.MIN_VALUE, 1);
+            test.plusMonths(-1);
+        });
     }
 
     //-----------------------------------------------------------------------
     // plus(long, TemporalUnit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="plus_long_TemporalUnit")
     Object[][] data_plus_long_TemporalUnit() {
         return new Object[][] {
             {YearMonth.of(1, 10), 1, ChronoUnit.YEARS, YearMonth.of(2, 10), null},
@@ -768,10 +804,11 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="plus_long_TemporalUnit")
+    @ParameterizedTest
+    @MethodSource("data_plus_long_TemporalUnit")
     public void test_plus_long_TemporalUnit(YearMonth base, long amount, TemporalUnit unit, YearMonth expectedYearMonth, Class<?> expectedEx) {
         if (expectedEx == null) {
-            assertEquals(base.plus(amount, unit), expectedYearMonth);
+            assertEquals(expectedYearMonth, base.plus(amount, unit));
         } else {
             try {
                 YearMonth result = base.plus(amount, unit);
@@ -785,7 +822,6 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // plus(TemporalAmount)
     //-----------------------------------------------------------------------
-    @DataProvider(name="plus_TemporalAmount")
     Object[][] data_plus_TemporalAmount() {
         return new Object[][] {
             {YearMonth.of(1, 1), Period.ofYears(1), YearMonth.of(2, 1), null},
@@ -820,10 +856,11 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="plus_TemporalAmount")
+    @ParameterizedTest
+    @MethodSource("data_plus_TemporalAmount")
     public void test_plus_TemporalAmount(YearMonth base, TemporalAmount temporalAmount, YearMonth expectedYearMonth, Class<?> expectedEx) {
         if (expectedEx == null) {
-            assertEquals(base.plus(temporalAmount), expectedYearMonth);
+            assertEquals(expectedYearMonth, base.plus(temporalAmount));
         } else {
             try {
                 YearMonth result = base.plus(temporalAmount);
@@ -840,49 +877,57 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     @Test
     public void test_minusYears_long() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.minusYears(1), YearMonth.of(2007, 6));
+        assertEquals(YearMonth.of(2007, 6), test.minusYears(1));
     }
 
     @Test
     public void test_minusYears_long_noChange_equal() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.minusYears(0), test);
+        assertEquals(test, test.minusYears(0));
     }
 
     @Test
     public void test_minusYears_long_negative() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.minusYears(-1), YearMonth.of(2009, 6));
+        assertEquals(YearMonth.of(2009, 6), test.minusYears(-1));
     }
 
     @Test
     public void test_minusYears_long_big() {
         YearMonth test = YearMonth.of(40, 6);
-        assertEquals(test.minusYears(20L + Year.MAX_VALUE), YearMonth.of((int) (40L - 20L - Year.MAX_VALUE), 6));
+        assertEquals(YearMonth.of((int) (40L - 20L - Year.MAX_VALUE), 6), test.minusYears(20L + Year.MAX_VALUE));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusYears_long_invalidTooLarge() {
-        YearMonth test = YearMonth.of(Year.MAX_VALUE, 6);
-        test.minusYears(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(Year.MAX_VALUE, 6);
+            test.minusYears(-1);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusYears_long_invalidTooLargeMaxSubtractMax() {
-        YearMonth test = YearMonth.of(Year.MIN_VALUE, 12);
-        test.minusYears(Long.MAX_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(Year.MIN_VALUE, 12);
+            test.minusYears(Long.MAX_VALUE);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusYears_long_invalidTooLargeMaxSubtractMin() {
-        YearMonth test = YearMonth.of(Year.MIN_VALUE, 12);
-        test.minusYears(Long.MIN_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(Year.MIN_VALUE, 12);
+            test.minusYears(Long.MIN_VALUE);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusYears_long_invalidTooSmall() {
-        YearMonth test = YearMonth.of(Year.MIN_VALUE, 6);
-        test.minusYears(1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(Year.MIN_VALUE, 6);
+            test.minusYears(1);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -891,68 +936,75 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     @Test
     public void test_minusMonths_long() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.minusMonths(1), YearMonth.of(2008, 5));
+        assertEquals(YearMonth.of(2008, 5), test.minusMonths(1));
     }
 
     @Test
     public void test_minusMonths_long_noChange_equal() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.minusMonths(0), test);
+        assertEquals(test, test.minusMonths(0));
     }
 
     @Test
     public void test_minusMonths_long_overYears() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.minusMonths(6), YearMonth.of(2007, 12));
+        assertEquals(YearMonth.of(2007, 12), test.minusMonths(6));
     }
 
     @Test
     public void test_minusMonths_long_negative() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.minusMonths(-1), YearMonth.of(2008, 7));
+        assertEquals(YearMonth.of(2008, 7), test.minusMonths(-1));
     }
 
     @Test
     public void test_minusMonths_long_negativeOverYear() {
         YearMonth test = YearMonth.of(2008, 6);
-        assertEquals(test.minusMonths(-7), YearMonth.of(2009, 1));
+        assertEquals(YearMonth.of(2009, 1), test.minusMonths(-7));
     }
 
     @Test
     public void test_minusMonths_long_big() {
         YearMonth test = YearMonth.of(40, 6);
         long months = 20L + Integer.MAX_VALUE;
-        assertEquals(test.minusMonths(months), YearMonth.of((int) (40L - months / 12), 6 - (int) (months % 12)));
+        assertEquals(YearMonth.of((int) (40L - months / 12), 6 - (int) (months % 12)), test.minusMonths(months));
     }
 
-    @Test(expectedExceptions={DateTimeException.class})
+    @Test
     public void test_minusMonths_long_invalidTooLarge() {
-        YearMonth test = YearMonth.of(Year.MAX_VALUE, 12);
-        test.minusMonths(-1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(Year.MAX_VALUE, 12);
+            test.minusMonths(-1);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusMonths_long_invalidTooLargeMaxSubtractMax() {
-        YearMonth test = YearMonth.of(Year.MAX_VALUE, 12);
-        test.minusMonths(Long.MAX_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(Year.MAX_VALUE, 12);
+            test.minusMonths(Long.MAX_VALUE);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_minusMonths_long_invalidTooLargeMaxSubtractMin() {
-        YearMonth test = YearMonth.of(Year.MAX_VALUE, 12);
-        test.minusMonths(Long.MIN_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(Year.MAX_VALUE, 12);
+            test.minusMonths(Long.MIN_VALUE);
+        });
     }
 
-    @Test(expectedExceptions={DateTimeException.class})
+    @Test
     public void test_minusMonths_long_invalidTooSmall() {
-        YearMonth test = YearMonth.of(Year.MIN_VALUE, 1);
-        test.minusMonths(1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth test = YearMonth.of(Year.MIN_VALUE, 1);
+            test.minusMonths(1);
+        });
     }
 
     //-----------------------------------------------------------------------
     // minus(long, TemporalUnit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="minus_long_TemporalUnit")
     Object[][] data_minus_long_TemporalUnit() {
         return new Object[][] {
             {YearMonth.of(1, 10), 1, ChronoUnit.YEARS, YearMonth.of(0, 10), null},
@@ -983,10 +1035,11 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="minus_long_TemporalUnit")
+    @ParameterizedTest
+    @MethodSource("data_minus_long_TemporalUnit")
     public void test_minus_long_TemporalUnit(YearMonth base, long amount, TemporalUnit unit, YearMonth expectedYearMonth, Class<?> expectedEx) {
         if (expectedEx == null) {
-            assertEquals(base.minus(amount, unit), expectedYearMonth);
+            assertEquals(expectedYearMonth, base.minus(amount, unit));
         } else {
             try {
                 YearMonth result = base.minus(amount, unit);
@@ -1000,7 +1053,6 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // minus(TemporalAmount)
     //-----------------------------------------------------------------------
-    @DataProvider(name="minus_TemporalAmount")
     Object[][] data_minus_TemporalAmount() {
         return new Object[][] {
             {YearMonth.of(1, 1), Period.ofYears(1), YearMonth.of(0, 1), null},
@@ -1035,10 +1087,11 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="minus_TemporalAmount")
+    @ParameterizedTest
+    @MethodSource("data_minus_TemporalAmount")
     public void test_minus_TemporalAmount(YearMonth base, TemporalAmount temporalAmount, YearMonth expectedYearMonth, Class<?> expectedEx) {
         if (expectedEx == null) {
-            assertEquals(base.minus(temporalAmount), expectedYearMonth);
+            assertEquals(expectedYearMonth, base.minus(temporalAmount));
         } else {
             try {
                 YearMonth result = base.minus(temporalAmount);
@@ -1056,33 +1109,33 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     public void test_adjustDate() {
         YearMonth test = YearMonth.of(2008, 6);
         LocalDate date = LocalDate.of(2007, 1, 1);
-        assertEquals(test.adjustInto(date), LocalDate.of(2008, 6, 1));
+        assertEquals(LocalDate.of(2008, 6, 1), test.adjustInto(date));
     }
 
     @Test
     public void test_adjustDate_preserveDoM() {
         YearMonth test = YearMonth.of(2011, 3);
         LocalDate date = LocalDate.of(2008, 2, 29);
-        assertEquals(test.adjustInto(date), LocalDate.of(2011, 3, 29));
+        assertEquals(LocalDate.of(2011, 3, 29), test.adjustInto(date));
     }
 
     @Test
     public void test_adjustDate_resolve() {
         YearMonth test = YearMonth.of(2007, 2);
         LocalDate date = LocalDate.of(2008, 3, 31);
-        assertEquals(test.adjustInto(date), LocalDate.of(2007, 2, 28));
+        assertEquals(LocalDate.of(2007, 2, 28), test.adjustInto(date));
     }
 
     @Test
     public void test_adjustDate_equal() {
         YearMonth test = YearMonth.of(2008, 6);
         LocalDate date = LocalDate.of(2008, 6, 30);
-        assertEquals(test.adjustInto(date), date);
+        assertEquals(date, test.adjustInto(date));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_adjustDate_null() {
-        TEST_2008_06.adjustInto((LocalDate) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008_06.adjustInto((LocalDate) null));
     }
 
     //-----------------------------------------------------------------------
@@ -1090,8 +1143,8 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isLeapYear() {
-        assertEquals(YearMonth.of(2007, 6).isLeapYear(), false);
-        assertEquals(YearMonth.of(2008, 6).isLeapYear(), true);
+        assertEquals(false, YearMonth.of(2007, 6).isLeapYear());
+        assertEquals(true, YearMonth.of(2008, 6).isLeapYear());
     }
 
     //-----------------------------------------------------------------------
@@ -1100,19 +1153,19 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     @Test
     public void test_lengthOfMonth_june() {
         YearMonth test = YearMonth.of(2007, 6);
-        assertEquals(test.lengthOfMonth(), 30);
+        assertEquals(30, test.lengthOfMonth());
     }
 
     @Test
     public void test_lengthOfMonth_febNonLeap() {
         YearMonth test = YearMonth.of(2007, 2);
-        assertEquals(test.lengthOfMonth(), 28);
+        assertEquals(28, test.lengthOfMonth());
     }
 
     @Test
     public void test_lengthOfMonth_febLeap() {
         YearMonth test = YearMonth.of(2008, 2);
-        assertEquals(test.lengthOfMonth(), 29);
+        assertEquals(29, test.lengthOfMonth());
     }
 
     //-----------------------------------------------------------------------
@@ -1120,8 +1173,8 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_lengthOfYear() {
-        assertEquals(YearMonth.of(2007, 6).lengthOfYear(), 365);
-        assertEquals(YearMonth.of(2008, 6).lengthOfYear(), 366);
+        assertEquals(365, YearMonth.of(2007, 6).lengthOfYear());
+        assertEquals(366, YearMonth.of(2008, 6).lengthOfYear());
     }
 
     //-----------------------------------------------------------------------
@@ -1130,43 +1183,42 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     @Test
     public void test_isValidDay_int_june() {
         YearMonth test = YearMonth.of(2007, 6);
-        assertEquals(test.isValidDay(1), true);
-        assertEquals(test.isValidDay(30), true);
+        assertEquals(true, test.isValidDay(1));
+        assertEquals(true, test.isValidDay(30));
 
-        assertEquals(test.isValidDay(-1), false);
-        assertEquals(test.isValidDay(0), false);
-        assertEquals(test.isValidDay(31), false);
-        assertEquals(test.isValidDay(32), false);
+        assertEquals(false, test.isValidDay(-1));
+        assertEquals(false, test.isValidDay(0));
+        assertEquals(false, test.isValidDay(31));
+        assertEquals(false, test.isValidDay(32));
     }
 
     @Test
     public void test_isValidDay_int_febNonLeap() {
         YearMonth test = YearMonth.of(2007, 2);
-        assertEquals(test.isValidDay(1), true);
-        assertEquals(test.isValidDay(28), true);
+        assertEquals(true, test.isValidDay(1));
+        assertEquals(true, test.isValidDay(28));
 
-        assertEquals(test.isValidDay(-1), false);
-        assertEquals(test.isValidDay(0), false);
-        assertEquals(test.isValidDay(29), false);
-        assertEquals(test.isValidDay(32), false);
+        assertEquals(false, test.isValidDay(-1));
+        assertEquals(false, test.isValidDay(0));
+        assertEquals(false, test.isValidDay(29));
+        assertEquals(false, test.isValidDay(32));
     }
 
     @Test
     public void test_isValidDay_int_febLeap() {
         YearMonth test = YearMonth.of(2008, 2);
-        assertEquals(test.isValidDay(1), true);
-        assertEquals(test.isValidDay(29), true);
+        assertEquals(true, test.isValidDay(1));
+        assertEquals(true, test.isValidDay(29));
 
-        assertEquals(test.isValidDay(-1), false);
-        assertEquals(test.isValidDay(0), false);
-        assertEquals(test.isValidDay(30), false);
-        assertEquals(test.isValidDay(32), false);
+        assertEquals(false, test.isValidDay(-1));
+        assertEquals(false, test.isValidDay(0));
+        assertEquals(false, test.isValidDay(30));
+        assertEquals(false, test.isValidDay(32));
     }
 
     //-----------------------------------------------------------------------
     // until(Temporal, TemporalUnit)
     //-----------------------------------------------------------------------
-    @DataProvider(name="periodUntilUnit")
     Object[][] data_periodUntilUnit() {
         return new Object[][] {
                 {ym(2000, 1), ym(-1, 12), MONTHS, -2000 * 12 - 1},
@@ -1242,50 +1294,55 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit(YearMonth ym1, YearMonth ym2, TemporalUnit unit, long expected) {
         long amount = ym1.until(ym2, unit);
-        assertEquals(amount, expected);
+        assertEquals(expected, amount);
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit_negated(YearMonth ym1, YearMonth ym2, TemporalUnit unit, long expected) {
         long amount = ym2.until(ym1, unit);
-        assertEquals(amount, -expected);
+        assertEquals(-expected, amount);
     }
 
-    @Test(dataProvider="periodUntilUnit")
+    @ParameterizedTest
+    @MethodSource("data_periodUntilUnit")
     public void test_until_TemporalUnit_between(YearMonth ym1, YearMonth ym2, TemporalUnit unit, long expected) {
         long amount = unit.between(ym1, ym2);
-        assertEquals(amount, expected);
+        assertEquals(expected, amount);
     }
 
     @Test
     public void test_until_convertedType() {
         YearMonth start = YearMonth.of(2010, 6);
         LocalDate end = start.plusMonths(2).atDay(12);
-        assertEquals(start.until(end, MONTHS), 2);
+        assertEquals(2, start.until(end, MONTHS));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_until_invalidType() {
-        YearMonth start = YearMonth.of(2010, 6);
-        start.until(LocalTime.of(11, 30), MONTHS);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            YearMonth start = YearMonth.of(2010, 6);
+            start.until(LocalTime.of(11, 30), MONTHS);
+        });
     }
 
-    @Test(expectedExceptions = UnsupportedTemporalTypeException.class)
+    @Test
     public void test_until_TemporalUnit_unsupportedUnit() {
-        TEST_2008_06.until(TEST_2008_06, HOURS);
+        Assertions.assertThrows(UnsupportedTemporalTypeException.class, () -> TEST_2008_06.until(TEST_2008_06, HOURS));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_until_TemporalUnit_nullEnd() {
-        TEST_2008_06.until(null, DAYS);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008_06.until(null, DAYS));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_until_TemporalUnit_nullUnit() {
-        TEST_2008_06.until(TEST_2008_06, null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008_06.until(TEST_2008_06, null));
     }
 
     //-----------------------------------------------------------------------
@@ -1295,18 +1352,17 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     public void test_format_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("y M");
         String t = YearMonth.of(2010, 12).format(f);
-        assertEquals(t, "2010 12");
+        assertEquals("2010 12", t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_format_formatter_null() {
-        YearMonth.of(2010, 12).format(null);
+        Assertions.assertThrows(NullPointerException.class, () -> YearMonth.of(2010, 12).format(null));
     }
 
     //-----------------------------------------------------------------------
     // atDay(int)
     //-----------------------------------------------------------------------
-    @DataProvider(name="atDay")
     Object[][] data_atDay() {
         return new Object[][] {
                 {YearMonth.of(2008, 6), 8, LocalDate.of(2008, 6, 8)},
@@ -1325,10 +1381,11 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="atDay")
+    @ParameterizedTest
+    @MethodSource("data_atDay")
     public void test_atDay(YearMonth test, int day, LocalDate expected) {
         if (expected != null) {
-            assertEquals(test.atDay(day), expected);
+            assertEquals(expected, test.atDay(day));
         } else {
             try {
                 test.atDay(day);
@@ -1342,7 +1399,6 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // atEndOfMonth()
     //-----------------------------------------------------------------------
-    @DataProvider(name="atEndOfMonth")
     Object[][] data_atEndOfMonth() {
         return new Object[][] {
                 {YearMonth.of(2008, 1), LocalDate.of(2008, 1, 31)},
@@ -1363,9 +1419,10 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="atEndOfMonth")
+    @ParameterizedTest
+    @MethodSource("data_atEndOfMonth")
     public void test_atEndOfMonth(YearMonth test, LocalDate expected) {
-        assertEquals(test.atEndOfMonth(), expected);
+        assertEquals(expected, test.atEndOfMonth());
     }
 
     //-----------------------------------------------------------------------
@@ -1393,37 +1450,37 @@ public class TCKYearMonth extends AbstractDateTimeTest {
                 YearMonth b = localDates[j];
                 if (i < j) {
                     assertTrue(a.compareTo(b) < 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), true, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(true, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else if (i > j) {
                     assertTrue(a.compareTo(b) > 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), true, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(true, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else {
-                    assertEquals(a.compareTo(b), 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), true, a + " <=> " + b);
+                    assertEquals(0, a.compareTo(b), a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(true, a.equals(b), a + " <=> " + b);
                 }
             }
         }
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_compareTo_ObjectNull() {
-        TEST_2008_06.compareTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008_06.compareTo(null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isBefore_ObjectNull() {
-        TEST_2008_06.isBefore(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008_06.isBefore(null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isAfter_ObjectNull() {
-        TEST_2008_06.isAfter(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_2008_06.isAfter(null));
     }
 
     //-----------------------------------------------------------------------
@@ -1436,51 +1493,52 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         YearMonth c = YearMonth.of(2007, 6);
         YearMonth d = YearMonth.of(2008, 5);
 
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), true);
-        assertEquals(a.equals(c), false);
-        assertEquals(a.equals(d), false);
+        assertEquals(true, a.equals(a));
+        assertEquals(true, a.equals(b));
+        assertEquals(false, a.equals(c));
+        assertEquals(false, a.equals(d));
 
-        assertEquals(b.equals(a), true);
-        assertEquals(b.equals(b), true);
-        assertEquals(b.equals(c), false);
-        assertEquals(b.equals(d), false);
+        assertEquals(true, b.equals(a));
+        assertEquals(true, b.equals(b));
+        assertEquals(false, b.equals(c));
+        assertEquals(false, b.equals(d));
 
-        assertEquals(c.equals(a), false);
-        assertEquals(c.equals(b), false);
-        assertEquals(c.equals(c), true);
-        assertEquals(c.equals(d), false);
+        assertEquals(false, c.equals(a));
+        assertEquals(false, c.equals(b));
+        assertEquals(true, c.equals(c));
+        assertEquals(false, c.equals(d));
 
-        assertEquals(d.equals(a), false);
-        assertEquals(d.equals(b), false);
-        assertEquals(d.equals(c), false);
-        assertEquals(d.equals(d), true);
+        assertEquals(false, d.equals(a));
+        assertEquals(false, d.equals(b));
+        assertEquals(false, d.equals(c));
+        assertEquals(true, d.equals(d));
     }
 
     @Test
     public void test_equals_itself_true() {
-        assertEquals(TEST_2008_06.equals(TEST_2008_06), true);
+        assertEquals(true, TEST_2008_06.equals(TEST_2008_06));
     }
 
     @Test
     public void test_equals_string_false() {
-        assertEquals(TEST_2008_06.equals("2007-07-15"), false);
+        assertEquals(false, TEST_2008_06.equals("2007-07-15"));
     }
 
     @Test
     public void test_equals_null_false() {
-        assertEquals(TEST_2008_06.equals(null), false);
+        assertEquals(false, TEST_2008_06.equals(null));
     }
 
     //-----------------------------------------------------------------------
     // hashCode()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleDates")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDates")
     public void test_hashCode(int y, int m) {
         YearMonth a = YearMonth.of(y, m);
         assertEquals(a.hashCode(), a.hashCode());
         YearMonth b = YearMonth.of(y, m);
-        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(b.hashCode(), a.hashCode());
     }
 
     @Test
@@ -1496,7 +1554,6 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleToString")
     Object[][] provider_sampleToString() {
         return new Object[][] {
             {2008, 1, "2008-01"},
@@ -1507,11 +1564,12 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleToString")
+    @ParameterizedTest
+    @MethodSource("provider_sampleToString")
     public void test_toString(int y, int m, String expected) {
         YearMonth test = YearMonth.of(y, m);
         String str = test.toString();
-        assertEquals(str, expected);
+        assertEquals(expected, str);
     }
 
     private YearMonth ym(int year, int month) {
diff --git a/test/jdk/java/time/tck/java/time/TCKZoneId.java b/test/jdk/java/time/tck/java/time/TCKZoneId.java
index 1e2d3872451..4958a45dccf 100644
--- a/test/jdk/java/time/tck/java/time/TCKZoneId.java
+++ b/test/jdk/java/time/tck/java/time/TCKZoneId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,8 @@
  */
 package tck.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -84,13 +84,16 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test ZoneId.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKZoneId extends AbstractTCKTest {
 
     //-----------------------------------------------------------------------
@@ -99,40 +102,42 @@ public class TCKZoneId extends AbstractTCKTest {
     @Test
     public void test_constant_OLD_IDS_POST_2024b() {
         Map<String, String> ids = ZoneId.SHORT_IDS;
-        assertEquals(ids.get("EST"), "America/Panama");
-        assertEquals(ids.get("MST"), "America/Phoenix");
-        assertEquals(ids.get("HST"), "Pacific/Honolulu");
-        assertEquals(ids.get("ACT"), "Australia/Darwin");
-        assertEquals(ids.get("AET"), "Australia/Sydney");
-        assertEquals(ids.get("AGT"), "America/Argentina/Buenos_Aires");
-        assertEquals(ids.get("ART"), "Africa/Cairo");
-        assertEquals(ids.get("AST"), "America/Anchorage");
-        assertEquals(ids.get("BET"), "America/Sao_Paulo");
-        assertEquals(ids.get("BST"), "Asia/Dhaka");
-        assertEquals(ids.get("CAT"), "Africa/Harare");
-        assertEquals(ids.get("CNT"), "America/St_Johns");
-        assertEquals(ids.get("CST"), "America/Chicago");
-        assertEquals(ids.get("CTT"), "Asia/Shanghai");
-        assertEquals(ids.get("EAT"), "Africa/Addis_Ababa");
-        assertEquals(ids.get("ECT"), "Europe/Paris");
-        assertEquals(ids.get("IET"), "America/Indiana/Indianapolis");
-        assertEquals(ids.get("IST"), "Asia/Kolkata");
-        assertEquals(ids.get("JST"), "Asia/Tokyo");
-        assertEquals(ids.get("MIT"), "Pacific/Apia");
-        assertEquals(ids.get("NET"), "Asia/Yerevan");
-        assertEquals(ids.get("NST"), "Pacific/Auckland");
-        assertEquals(ids.get("PLT"), "Asia/Karachi");
-        assertEquals(ids.get("PNT"), "America/Phoenix");
-        assertEquals(ids.get("PRT"), "America/Puerto_Rico");
-        assertEquals(ids.get("PST"), "America/Los_Angeles");
-        assertEquals(ids.get("SST"), "Pacific/Guadalcanal");
-        assertEquals(ids.get("VST"), "Asia/Ho_Chi_Minh");
+        assertEquals("America/Panama", ids.get("EST"));
+        assertEquals("America/Phoenix", ids.get("MST"));
+        assertEquals("Pacific/Honolulu", ids.get("HST"));
+        assertEquals("Australia/Darwin", ids.get("ACT"));
+        assertEquals("Australia/Sydney", ids.get("AET"));
+        assertEquals("America/Argentina/Buenos_Aires", ids.get("AGT"));
+        assertEquals("Africa/Cairo", ids.get("ART"));
+        assertEquals("America/Anchorage", ids.get("AST"));
+        assertEquals("America/Sao_Paulo", ids.get("BET"));
+        assertEquals("Asia/Dhaka", ids.get("BST"));
+        assertEquals("Africa/Harare", ids.get("CAT"));
+        assertEquals("America/St_Johns", ids.get("CNT"));
+        assertEquals("America/Chicago", ids.get("CST"));
+        assertEquals("Asia/Shanghai", ids.get("CTT"));
+        assertEquals("Africa/Addis_Ababa", ids.get("EAT"));
+        assertEquals("Europe/Paris", ids.get("ECT"));
+        assertEquals("America/Indiana/Indianapolis", ids.get("IET"));
+        assertEquals("Asia/Kolkata", ids.get("IST"));
+        assertEquals("Asia/Tokyo", ids.get("JST"));
+        assertEquals("Pacific/Apia", ids.get("MIT"));
+        assertEquals("Asia/Yerevan", ids.get("NET"));
+        assertEquals("Pacific/Auckland", ids.get("NST"));
+        assertEquals("Asia/Karachi", ids.get("PLT"));
+        assertEquals("America/Phoenix", ids.get("PNT"));
+        assertEquals("America/Puerto_Rico", ids.get("PRT"));
+        assertEquals("America/Los_Angeles", ids.get("PST"));
+        assertEquals("Pacific/Guadalcanal", ids.get("SST"));
+        assertEquals("Asia/Ho_Chi_Minh", ids.get("VST"));
     }
 
-    @Test(expectedExceptions=UnsupportedOperationException.class)
+    @Test
     public void test_constant_OLD_IDS_POST_2024b_immutable() {
-        Map<String, String> ids = ZoneId.SHORT_IDS;
-        ids.clear();
+        Assertions.assertThrows(UnsupportedOperationException.class, () -> {
+            Map<String, String> ids = ZoneId.SHORT_IDS;
+            ids.clear();
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -141,11 +146,11 @@ public class TCKZoneId extends AbstractTCKTest {
     @Test
     public void test_getAvailableGroupIds() {
         Set<String> zoneIds = ZoneId.getAvailableZoneIds();
-        assertEquals(zoneIds.contains("Europe/London"), true);
+        assertEquals(true, zoneIds.contains("Europe/London"));
         zoneIds.clear();
-        assertEquals(zoneIds.size(), 0);
+        assertEquals(0, zoneIds.size());
         Set<String> zoneIds2 = ZoneId.getAvailableZoneIds();
-        assertEquals(zoneIds2.contains("Europe/London"), true);
+        assertEquals(true, zoneIds2.contains("Europe/London"));
     }
 
     //-----------------------------------------------------------------------
@@ -157,7 +162,7 @@ public class TCKZoneId extends AbstractTCKTest {
         map.put("LONDON", "Europe/London");
         map.put("PARIS", "Europe/Paris");
         ZoneId test = ZoneId.of("LONDON", map);
-        assertEquals(test.getId(), "Europe/London");
+        assertEquals("Europe/London", test.getId());
     }
 
     @Test
@@ -166,32 +171,35 @@ public class TCKZoneId extends AbstractTCKTest {
         map.put("LONDON", "Europe/London");
         map.put("PARIS", "Europe/Paris");
         ZoneId test = ZoneId.of("Europe/Madrid", map);
-        assertEquals(test.getId(), "Europe/Madrid");
+        assertEquals("Europe/Madrid", test.getId());
     }
 
     @Test
     public void test_of_string_Map_emptyMap() {
         Map<String, String> map = new HashMap<>();
         ZoneId test = ZoneId.of("Europe/Madrid", map);
-        assertEquals(test.getId(), "Europe/Madrid");
+        assertEquals("Europe/Madrid", test.getId());
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_of_string_Map_badFormat() {
-        Map<String, String> map = new HashMap<>();
-        ZoneId.of("Not known", map);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Map<String, String> map = new HashMap<>();
+            ZoneId.of("Not known", map);
+        });
     }
 
-    @Test(expectedExceptions=ZoneRulesException.class)
+    @Test
     public void test_of_string_Map_unknown() {
-        Map<String, String> map = new HashMap<>();
-        ZoneId.of("Unknown", map);
+        Assertions.assertThrows(ZoneRulesException.class, () -> {
+            Map<String, String> map = new HashMap<>();
+            ZoneId.of("Unknown", map);
+        });
     }
 
     //-----------------------------------------------------------------------
     // regular factory and .normalized()
     //-----------------------------------------------------------------------
-    @DataProvider(name="offsetBasedValid")
     Object[][] data_offsetBasedValid() {
         return new Object[][] {
                 {"Z", "Z"},
@@ -227,19 +235,19 @@ public class TCKZoneId extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="offsetBasedValid")
+    @ParameterizedTest
+    @MethodSource("data_offsetBasedValid")
     public void factory_of_String_offsetBasedValid_noPrefix(String input, String id) {
         ZoneId test = ZoneId.of(input);
-        assertEquals(test.getId(), id);
-        assertEquals(test, ZoneOffset.of(id));
-        assertEquals(test.normalized(), ZoneOffset.of(id));
-        assertEquals(test.getDisplayName(TextStyle.FULL, Locale.UK), id);
-        assertEquals(test.getRules().isFixedOffset(), true);
-        assertEquals(test.getRules().getOffset(Instant.EPOCH), ZoneOffset.of(id));
+        assertEquals(id, test.getId());
+        assertEquals(ZoneOffset.of(id), test);
+        assertEquals(ZoneOffset.of(id), test.normalized());
+        assertEquals(id, test.getDisplayName(TextStyle.FULL, Locale.UK));
+        assertEquals(true, test.getRules().isFixedOffset());
+        assertEquals(ZoneOffset.of(id), test.getRules().getOffset(Instant.EPOCH));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="offsetBasedValidPrefix")
     Object[][] data_offsetBasedValidPrefix() {
         return new Object[][] {
                 {"", "", "Z"},
@@ -275,37 +283,40 @@ public class TCKZoneId extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="offsetBasedValidPrefix")
+    @ParameterizedTest
+    @MethodSource("data_offsetBasedValidPrefix")
     public void factory_of_String_offsetBasedValid_prefixUTC(String input, String id, String offsetId) {
         ZoneId test = ZoneId.of("UTC" + input);
-        assertEquals(test.getId(), "UTC" + id);
-        assertEquals(test.getRules(), ZoneOffset.of(offsetId).getRules());
-        assertEquals(test.normalized(), ZoneOffset.of(offsetId));
-        assertEquals(test.getDisplayName(TextStyle.FULL, Locale.UK), displayName("UTC" + id));
-        assertEquals(test.getRules().isFixedOffset(), true);
-        assertEquals(test.getRules().getOffset(Instant.EPOCH), ZoneOffset.of(offsetId));
+        assertEquals("UTC" + id, test.getId());
+        assertEquals(ZoneOffset.of(offsetId).getRules(), test.getRules());
+        assertEquals(ZoneOffset.of(offsetId), test.normalized());
+        assertEquals(displayName("UTC" + id), test.getDisplayName(TextStyle.FULL, Locale.UK));
+        assertEquals(true, test.getRules().isFixedOffset());
+        assertEquals(ZoneOffset.of(offsetId), test.getRules().getOffset(Instant.EPOCH));
     }
 
-    @Test(dataProvider="offsetBasedValidPrefix")
+    @ParameterizedTest
+    @MethodSource("data_offsetBasedValidPrefix")
     public void factory_of_String_offsetBasedValid_prefixGMT(String input, String id, String offsetId) {
         ZoneId test = ZoneId.of("GMT" + input);
-        assertEquals(test.getId(), "GMT" + id);
-        assertEquals(test.getRules(), ZoneOffset.of(offsetId).getRules());
-        assertEquals(test.normalized(), ZoneOffset.of(offsetId));
-        assertEquals(test.getDisplayName(TextStyle.FULL, Locale.UK), displayName("GMT" + id));
-        assertEquals(test.getRules().isFixedOffset(), true);
-        assertEquals(test.getRules().getOffset(Instant.EPOCH), ZoneOffset.of(offsetId));
+        assertEquals("GMT" + id, test.getId());
+        assertEquals(ZoneOffset.of(offsetId).getRules(), test.getRules());
+        assertEquals(ZoneOffset.of(offsetId), test.normalized());
+        assertEquals(displayName("GMT" + id), test.getDisplayName(TextStyle.FULL, Locale.UK));
+        assertEquals(true, test.getRules().isFixedOffset());
+        assertEquals(ZoneOffset.of(offsetId), test.getRules().getOffset(Instant.EPOCH));
     }
 
-    @Test(dataProvider="offsetBasedValidPrefix")
+    @ParameterizedTest
+    @MethodSource("data_offsetBasedValidPrefix")
     public void factory_of_String_offsetBasedValid_prefixUT(String input, String id, String offsetId) {
         ZoneId test = ZoneId.of("UT" + input);
-        assertEquals(test.getId(), "UT" + id);
-        assertEquals(test.getRules(), ZoneOffset.of(offsetId).getRules());
-        assertEquals(test.normalized(), ZoneOffset.of(offsetId));
-        assertEquals(test.getDisplayName(TextStyle.FULL, Locale.UK), displayName("UT" + id));
-        assertEquals(test.getRules().isFixedOffset(), true);
-        assertEquals(test.getRules().getOffset(Instant.EPOCH), ZoneOffset.of(offsetId));
+        assertEquals("UT" + id, test.getId());
+        assertEquals(ZoneOffset.of(offsetId).getRules(), test.getRules());
+        assertEquals(ZoneOffset.of(offsetId), test.normalized());
+        assertEquals(displayName("UT" + id), test.getDisplayName(TextStyle.FULL, Locale.UK));
+        assertEquals(true, test.getRules().isFixedOffset());
+        assertEquals(ZoneOffset.of(offsetId), test.getRules().getOffset(Instant.EPOCH));
     }
 
     private String displayName(String id) {
@@ -322,7 +333,6 @@ public class TCKZoneId extends AbstractTCKTest {
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="prefixValid")
     Object[][] data_prefixValid() {
         return new Object[][] {
                 {"GMT", "+01:00"},
@@ -332,16 +342,16 @@ public class TCKZoneId extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="prefixValid")
+    @ParameterizedTest
+    @MethodSource("data_prefixValid")
     public void test_prefixOfOffset(String prefix, String offset) {
         ZoneOffset zoff = ZoneOffset.of(offset);
         ZoneId zoneId = ZoneId.ofOffset(prefix, zoff);
-        assertEquals(zoneId.getId(), prefix + zoff.getId(), "in correct id for : " + prefix + ", zoff: " + zoff);
+        assertEquals(prefix + zoff.getId(), zoneId.getId(), "in correct id for : " + prefix + ", zoff: " + zoff);
 
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="prefixInvalid")
     Object[][] data_prefixInvalid() {
         return new Object[][] {
                 {"GM", "+01:00"},
@@ -351,25 +361,27 @@ public class TCKZoneId extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="prefixInvalid", expectedExceptions=java.lang.IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("data_prefixInvalid")
     public void test_invalidPrefixOfOffset(String prefix, String offset) {
-        ZoneOffset zoff = ZoneOffset.of(offset);
-        ZoneId zoneId = ZoneId.ofOffset(prefix, zoff);
-        fail("should have thrown an exception for prefix: " + prefix);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            ZoneOffset zoff = ZoneOffset.of(offset);
+            ZoneId zoneId = ZoneId.ofOffset(prefix, zoff);
+            fail("should have thrown an exception for prefix: " + prefix);
+        });
     }
 
-    @Test(expectedExceptions=java.lang.NullPointerException.class)
+    @Test
     public void test_nullPrefixOfOffset() {
-        ZoneId.ofOffset(null, ZoneOffset.ofTotalSeconds(1));
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneId.ofOffset(null, ZoneOffset.ofTotalSeconds(1)));
     }
 
-    @Test(expectedExceptions=java.lang.NullPointerException.class)
+    @Test
     public void test_nullOffsetOfOffset() {
-        ZoneId.ofOffset("GMT", null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneId.ofOffset("GMT", null));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="offsetBasedValidOther")
     Object[][] data_offsetBasedValidOther() {
         return new Object[][] {
                 {"GMT", "Z"},
@@ -393,16 +405,16 @@ public class TCKZoneId extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="offsetBasedValidOther")
+    @ParameterizedTest
+    @MethodSource("data_offsetBasedValidOther")
     public void factory_of_String_offsetBasedValidOther(String input, String offsetId) {
         ZoneId test = ZoneId.of(input);
-        assertEquals(test.getId(), input);
-        assertEquals(test.getRules(), ZoneOffset.of(offsetId).getRules());
-        assertEquals(test.normalized(), ZoneOffset.of(offsetId));
+        assertEquals(input, test.getId());
+        assertEquals(ZoneOffset.of(offsetId).getRules(), test.getRules());
+        assertEquals(ZoneOffset.of(offsetId), test.normalized());
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="offsetBasedInvalid")
     Object[][] data_offsetBasedInvalid() {
         return new Object[][] {
                 {"A"}, {"B"}, {"C"}, {"D"}, {"E"}, {"F"}, {"G"}, {"H"}, {"I"}, {"J"}, {"K"}, {"L"}, {"M"},
@@ -427,37 +439,46 @@ public class TCKZoneId extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="offsetBasedInvalid", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_offsetBasedInvalid")
     public void factory_of_String_offsetBasedInvalid_noPrefix(String id) {
-        if (id.equals("Z")) {
-            throw new DateTimeException("Fake exception: Z alone is valid, not invalid");
-        }
-        ZoneId.of(id);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            if (id.equals("Z")) {
+                throw new DateTimeException("Fake exception: Z alone is valid, not invalid");
+            }
+            ZoneId.of(id);
+        });
     }
 
-    @Test(dataProvider="offsetBasedInvalid", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_offsetBasedInvalid")
     public void factory_of_String_offsetBasedInvalid_prefixUTC(String id) {
-        ZoneId.of("UTC" + id);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneId.of("UTC" + id));
     }
 
-    @Test(dataProvider="offsetBasedInvalid", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_offsetBasedInvalid")
     public void factory_of_String_offsetBasedInvalid_prefixGMT(String id) {
-        if (id.equals("0")) {
-            throw new DateTimeException("Fake exception: GMT0 is valid, not invalid");
-        }
-        ZoneId.of("GMT" + id);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            if (id.equals("0")) {
+                throw new DateTimeException("Fake exception: GMT0 is valid, not invalid");
+            }
+            ZoneId.of("GMT" + id);
+        });
     }
 
-    @Test(dataProvider="offsetBasedInvalid", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_offsetBasedInvalid")
     public void factory_of_String_offsetBasedInvalid_prefixUT(String id) {
-        if (id.equals("C")) {
-            throw new DateTimeException("Fake exception: UT + C = UTC, thus it is valid, not invalid");
-        }
-        ZoneId.of("UT" + id);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            if (id.equals("C")) {
+                throw new DateTimeException("Fake exception: UT + C = UTC, thus it is valid, not invalid");
+            }
+            ZoneId.of("UT" + id);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="regionBasedInvalid")
     Object[][] data_regionBasedInvalid() {
         // \u00ef is a random unicode character
         return new Object[][] {
@@ -473,34 +494,35 @@ public class TCKZoneId extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="regionBasedInvalid", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_regionBasedInvalid")
     public void factory_of_String_regionBasedInvalid(String id) {
-        ZoneId.of(id);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneId.of(id));
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void factory_of_String_region_EuropeLondon() {
         ZoneId test = ZoneId.of("Europe/London");
-        assertEquals(test.getId(), "Europe/London");
-        assertEquals(test.getRules().isFixedOffset(), false);
-        assertEquals(test.normalized(), test);
+        assertEquals("Europe/London", test.getId());
+        assertEquals(false, test.getRules().isFixedOffset());
+        assertEquals(test, test.normalized());
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_String_null() {
-        ZoneId.of(null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneId.of(null));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_of_String_badFormat() {
-        ZoneId.of("Unknown rule");
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneId.of("Unknown rule"));
     }
 
-    @Test(expectedExceptions=ZoneRulesException.class)
+    @Test
     public void factory_of_String_unknown() {
-        ZoneId.of("Unknown");
+        Assertions.assertThrows(ZoneRulesException.class, () -> ZoneId.of("Unknown"));
     }
 
     //-----------------------------------------------------------------------
@@ -526,23 +548,23 @@ public class TCKZoneId extends AbstractTCKTest {
                 return TemporalAccessor.super.query(query);
             }
         };
-        assertEquals(ZoneId.from(mock),  ZoneId.of("Europe/Paris"));
+        assertEquals(ZoneId.of("Europe/Paris"), ZoneId.from(mock));
     }
 
     @Test
     public void factory_from_TemporalAccessor_offset() {
         ZoneOffset offset = ZoneOffset.ofHours(1);
-        assertEquals(ZoneId.from(offset), offset);
+        assertEquals(offset, ZoneId.from(offset));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_from_TemporalAccessor_invalid_noDerive() {
-        ZoneId.from(LocalTime.of(12, 30));
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneId.from(LocalTime.of(12, 30)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_from_TemporalAccessor_null() {
-        ZoneId.from(null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneId.from(null));
     }
 
     //-----------------------------------------------------------------------
@@ -553,32 +575,31 @@ public class TCKZoneId extends AbstractTCKTest {
         ZoneId test1 = ZoneId.of("Europe/London");
         ZoneId test2 = ZoneId.of("Europe/Paris");
         ZoneId test2b = ZoneId.of("Europe/Paris");
-        assertEquals(test1.equals(test2), false);
-        assertEquals(test2.equals(test1), false);
+        assertEquals(false, test1.equals(test2));
+        assertEquals(false, test2.equals(test1));
 
-        assertEquals(test1.equals(test1), true);
-        assertEquals(test2.equals(test2), true);
-        assertEquals(test2.equals(test2b), true);
+        assertEquals(true, test1.equals(test1));
+        assertEquals(true, test2.equals(test2));
+        assertEquals(true, test2.equals(test2b));
 
-        assertEquals(test1.hashCode() == test1.hashCode(), true);
-        assertEquals(test2.hashCode() == test2.hashCode(), true);
-        assertEquals(test2.hashCode() == test2b.hashCode(), true);
+        assertEquals(true, test1.hashCode() == test1.hashCode());
+        assertEquals(true, test2.hashCode() == test2.hashCode());
+        assertEquals(true, test2.hashCode() == test2b.hashCode());
     }
 
     @Test
     public void test_equals_null() {
-        assertEquals(ZoneId.of("Europe/London").equals(null), false);
+        assertEquals(false, ZoneId.of("Europe/London").equals(null));
     }
 
     @Test
     public void test_equals_notEqualWrongType() {
-        assertEquals(ZoneId.of("Europe/London").equals("Europe/London"), false);
+        assertEquals(false, ZoneId.of("Europe/London").equals("Europe/London"));
     }
 
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
-    @DataProvider(name="toString")
     Object[][] data_toString() {
         return new Object[][] {
                 {"Europe/London", "Europe/London"},
@@ -591,10 +612,11 @@ public class TCKZoneId extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="toString")
+    @ParameterizedTest
+    @MethodSource("data_toString")
     public void test_toString(String id, String expected) {
         ZoneId test = ZoneId.of(id);
-        assertEquals(test.toString(), expected);
+        assertEquals(expected, test.toString());
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/TCKZoneOffset.java b/test/jdk/java/time/tck/java/time/TCKZoneOffset.java
index 76466431033..d8a8376fa80 100644
--- a/test/jdk/java/time/tck/java/time/TCKZoneOffset.java
+++ b/test/jdk/java/time/tck/java/time/TCKZoneOffset.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,10 +60,11 @@
 package tck.java.time;
 
 import static java.time.temporal.ChronoField.OFFSET_SECONDS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -87,13 +88,16 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test ZoneOffset.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKZoneOffset extends AbstractDateTimeTest {
 
     //-----------------------------------------------------------------------
@@ -185,9 +189,9 @@ public class TCKZoneOffset extends AbstractDateTimeTest {
         }
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_factory_string_null() {
-        ZoneOffset.of((String) null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneOffset.of((String) null));
     }
 
     //-----------------------------------------------------------------------
@@ -302,14 +306,14 @@ public class TCKZoneOffset extends AbstractDateTimeTest {
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_tooBig() {
-        ZoneOffset.ofHours(19);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHours(19));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_tooSmall() {
-        ZoneOffset.ofHours(-19);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHours(-19));
     }
 
     //-----------------------------------------------------------------------
@@ -329,14 +333,14 @@ public class TCKZoneOffset extends AbstractDateTimeTest {
         doTestOffset(test2, 18, 0, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_tooBig() {
-        ZoneOffset.ofHoursMinutes(19, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutes(19, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_tooSmall() {
-        ZoneOffset.ofHoursMinutes(-19, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutes(-19, 0));
     }
 
     //-----------------------------------------------------------------------
@@ -359,102 +363,102 @@ public class TCKZoneOffset extends AbstractDateTimeTest {
         doTestOffset(test2, 18, 0, 0);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_seconds_plusHoursMinusMinutes() {
-        ZoneOffset.ofHoursMinutesSeconds(1, -1, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutesSeconds(1, -1, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_seconds_plusHoursMinusSeconds() {
-        ZoneOffset.ofHoursMinutesSeconds(1, 0, -1);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutesSeconds(1, 0, -1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_seconds_minusHoursPlusMinutes() {
-        ZoneOffset.ofHoursMinutesSeconds(-1, 1, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutesSeconds(-1, 1, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_seconds_minusHoursPlusSeconds() {
-        ZoneOffset.ofHoursMinutesSeconds(-1, 0, 1);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutesSeconds(-1, 0, 1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_seconds_zeroHoursMinusMinutesPlusSeconds() {
-        ZoneOffset.ofHoursMinutesSeconds(0, -1, 1);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutesSeconds(0, -1, 1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_seconds_zeroHoursPlusMinutesMinusSeconds() {
-        ZoneOffset.ofHoursMinutesSeconds(0, 1, -1);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutesSeconds(0, 1, -1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_seconds_minutesTooLarge() {
-        ZoneOffset.ofHoursMinutesSeconds(0, 60, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutesSeconds(0, 60, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_seconds_minutesTooSmall() {
-        ZoneOffset.ofHoursMinutesSeconds(0, -60, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutesSeconds(0, -60, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_seconds_secondsTooLarge() {
-        ZoneOffset.ofHoursMinutesSeconds(0, 0, 60);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutesSeconds(0, 0, 60));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_seconds_secondsTooSmall() {
-        ZoneOffset.ofHoursMinutesSeconds(0, 0, 60);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutesSeconds(0, 0, 60));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_seconds_hoursTooBig() {
-        ZoneOffset.ofHoursMinutesSeconds(19, 0, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutesSeconds(19, 0, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_seconds_hoursTooSmall() {
-        ZoneOffset.ofHoursMinutesSeconds(-19, 0, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutesSeconds(-19, 0, 0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_seconds_minutesMinValue() {
-        ZoneOffset.ofHoursMinutesSeconds(0, Integer.MIN_VALUE, -1);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutesSeconds(0, Integer.MIN_VALUE, -1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_seconds_secondsMinValue() {
-        ZoneOffset.ofHoursMinutesSeconds(0, 0, Integer.MIN_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutesSeconds(0, 0, Integer.MIN_VALUE));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_int_hours_minutes_seconds_minutesAndSecondsMinValue() {
-        ZoneOffset.ofHoursMinutesSeconds(0, Integer.MIN_VALUE, Integer.MIN_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofHoursMinutesSeconds(0, Integer.MIN_VALUE, Integer.MIN_VALUE));
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_factory_ofTotalSeconds() {
-        assertEquals(ZoneOffset.ofTotalSeconds(60 * 60 + 1), ZoneOffset.ofHoursMinutesSeconds(1, 0, 1));
-        assertEquals(ZoneOffset.ofTotalSeconds(18 * 60 * 60), ZoneOffset.ofHours(18));
-        assertEquals(ZoneOffset.ofTotalSeconds(-18 * 60 * 60), ZoneOffset.ofHours(-18));
+        assertEquals(ZoneOffset.ofHoursMinutesSeconds(1, 0, 1), ZoneOffset.ofTotalSeconds(60 * 60 + 1));
+        assertEquals(ZoneOffset.ofHours(18), ZoneOffset.ofTotalSeconds(18 * 60 * 60));
+        assertEquals(ZoneOffset.ofHours(-18), ZoneOffset.ofTotalSeconds(-18 * 60 * 60));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_ofTotalSeconds_tooLarge() {
-        ZoneOffset.ofTotalSeconds(18 * 60 * 60 + 1);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofTotalSeconds(18 * 60 * 60 + 1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_ofTotalSeconds_tooSmall() {
-        ZoneOffset.ofTotalSeconds(-18 * 60 * 60 - 1);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofTotalSeconds(-18 * 60 * 60 - 1));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_ofTotalSeconds_minValue() {
-        ZoneOffset.ofTotalSeconds(Integer.MIN_VALUE);
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.ofTotalSeconds(Integer.MIN_VALUE));
     }
 
     //-----------------------------------------------------------------------
@@ -462,18 +466,18 @@ public class TCKZoneOffset extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_factory_CalendricalObject() {
-        assertEquals(ZoneOffset.from(ZonedDateTime.of(LocalDateTime.of(LocalDate.of(2007, 7, 15),
-                LocalTime.of(17, 30)), ZoneOffset.ofHours(2))), ZoneOffset.ofHours(2));
+        assertEquals(ZoneOffset.ofHours(2), ZoneOffset.from(ZonedDateTime.of(LocalDateTime.of(LocalDate.of(2007, 7, 15),
+                LocalTime.of(17, 30)), ZoneOffset.ofHours(2))));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_factory_CalendricalObject_invalid_noDerive() {
-        ZoneOffset.from(LocalTime.of(12, 30));
+        Assertions.assertThrows(DateTimeException.class, () -> ZoneOffset.from(LocalTime.of(12, 30)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_factory_CalendricalObject_null() {
-        ZoneOffset.from((TemporalAccessor) null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneOffset.from((TemporalAccessor) null));
     }
 
     //-----------------------------------------------------------------------
@@ -482,7 +486,7 @@ public class TCKZoneOffset extends AbstractDateTimeTest {
     @Test
     public void test_getTotalSeconds() {
         ZoneOffset offset = ZoneOffset.ofTotalSeconds(60 * 60 + 1);
-        assertEquals(offset.getTotalSeconds(), 60 * 60 + 1);
+        assertEquals(60 * 60 + 1, offset.getTotalSeconds());
     }
 
     //-----------------------------------------------------------------------
@@ -491,11 +495,11 @@ public class TCKZoneOffset extends AbstractDateTimeTest {
     @Test
     public void test_getId() {
         ZoneOffset offset = ZoneOffset.ofHoursMinutesSeconds(1, 0, 0);
-        assertEquals(offset.getId(), "+01:00");
+        assertEquals("+01:00", offset.getId());
         offset = ZoneOffset.ofHoursMinutesSeconds(1, 2, 3);
-        assertEquals(offset.getId(), "+01:02:03");
+        assertEquals("+01:02:03", offset.getId());
         offset = ZoneOffset.UTC;
-        assertEquals(offset.getId(), "Z");
+        assertEquals("Z", offset.getId());
     }
 
     //-----------------------------------------------------------------------
@@ -504,21 +508,21 @@ public class TCKZoneOffset extends AbstractDateTimeTest {
     @Test
     public void test_getRules() {
         ZoneOffset offset = ZoneOffset.ofHoursMinutesSeconds(1, 2, 3);
-        assertEquals(offset.getRules().isFixedOffset(), true);
-        assertEquals(offset.getRules().getOffset((Instant) null), offset);
-        assertEquals(offset.getRules().getDaylightSavings((Instant) null), Duration.ZERO);
-        assertEquals(offset.getRules().getStandardOffset((Instant) null), offset);
-        assertEquals(offset.getRules().nextTransition((Instant) null), null);
-        assertEquals(offset.getRules().previousTransition((Instant) null), null);
+        assertEquals(true, offset.getRules().isFixedOffset());
+        assertEquals(offset, offset.getRules().getOffset((Instant) null));
+        assertEquals(Duration.ZERO, offset.getRules().getDaylightSavings((Instant) null));
+        assertEquals(offset, offset.getRules().getStandardOffset((Instant) null));
+        assertEquals(null, offset.getRules().nextTransition((Instant) null));
+        assertEquals(null, offset.getRules().previousTransition((Instant) null));
 
-        assertEquals(offset.getRules().isValidOffset((LocalDateTime) null, offset), true);
-        assertEquals(offset.getRules().isValidOffset((LocalDateTime) null, ZoneOffset.UTC), false);
-        assertEquals(offset.getRules().isValidOffset((LocalDateTime) null, null), false);
-        assertEquals(offset.getRules().getOffset((LocalDateTime) null), offset);
-        assertEquals(offset.getRules().getValidOffsets((LocalDateTime) null), Arrays.asList(offset));
-        assertEquals(offset.getRules().getTransition((LocalDateTime) null), null);
-        assertEquals(offset.getRules().getTransitions().size(), 0);
-        assertEquals(offset.getRules().getTransitionRules().size(), 0);
+        assertEquals(true, offset.getRules().isValidOffset((LocalDateTime) null, offset));
+        assertEquals(false, offset.getRules().isValidOffset((LocalDateTime) null, ZoneOffset.UTC));
+        assertEquals(false, offset.getRules().isValidOffset((LocalDateTime) null, null));
+        assertEquals(offset, offset.getRules().getOffset((LocalDateTime) null));
+        assertEquals(Arrays.asList(offset), offset.getRules().getValidOffsets((LocalDateTime) null));
+        assertEquals(null, offset.getRules().getTransition((LocalDateTime) null));
+        assertEquals(0, offset.getRules().getTransitions().size());
+        assertEquals(0, offset.getRules().getTransitionRules().size());
     }
 
     //-----------------------------------------------------------------------
@@ -526,22 +530,21 @@ public class TCKZoneOffset extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_get_TemporalField() {
-        assertEquals(ZoneOffset.UTC.get(OFFSET_SECONDS), 0);
-        assertEquals(ZoneOffset.ofHours(-2).get(OFFSET_SECONDS), -7200);
-        assertEquals(ZoneOffset.ofHoursMinutesSeconds(0, 1, 5).get(OFFSET_SECONDS), 65);
+        assertEquals(0, ZoneOffset.UTC.get(OFFSET_SECONDS));
+        assertEquals(-7200, ZoneOffset.ofHours(-2).get(OFFSET_SECONDS));
+        assertEquals(65, ZoneOffset.ofHoursMinutesSeconds(0, 1, 5).get(OFFSET_SECONDS));
     }
 
     @Test
     public void test_getLong_TemporalField() {
-        assertEquals(ZoneOffset.UTC.getLong(OFFSET_SECONDS), 0);
-        assertEquals(ZoneOffset.ofHours(-2).getLong(OFFSET_SECONDS), -7200);
-        assertEquals(ZoneOffset.ofHoursMinutesSeconds(0, 1, 5).getLong(OFFSET_SECONDS), 65);
+        assertEquals(0, ZoneOffset.UTC.getLong(OFFSET_SECONDS));
+        assertEquals(-7200, ZoneOffset.ofHours(-2).getLong(OFFSET_SECONDS));
+        assertEquals(65, ZoneOffset.ofHoursMinutesSeconds(0, 1, 5).getLong(OFFSET_SECONDS));
     }
 
     //-----------------------------------------------------------------------
     // query(TemporalQuery)
     //-----------------------------------------------------------------------
-    @DataProvider(name="query")
     Object[][] data_query() {
         return new Object[][] {
                 {ZoneOffset.UTC, TemporalQueries.chronology(), null},
@@ -554,19 +557,21 @@ public class TCKZoneOffset extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_query(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(temporal.query(query), expected);
+        assertEquals(expected, temporal.query(query));
     }
 
-    @Test(dataProvider="query")
+    @ParameterizedTest
+    @MethodSource("data_query")
     public <T> void test_queryFrom(TemporalAccessor temporal, TemporalQuery<T> query, T expected) {
-        assertEquals(query.queryFrom(temporal), expected);
+        assertEquals(expected, query.queryFrom(temporal));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_query_null() {
-        ZoneOffset.UTC.query(null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneOffset.UTC.query(null));
     }
 
     //-----------------------------------------------------------------------
@@ -590,16 +595,16 @@ public class TCKZoneOffset extends AbstractDateTimeTest {
         ZoneOffset offset1 = ZoneOffset.ofHoursMinutesSeconds(1, 2, 3);
         ZoneOffset offset2 = ZoneOffset.ofHoursMinutesSeconds(2, 3, 4);
         ZoneOffset offset2b = ZoneOffset.ofHoursMinutesSeconds(2, 3, 4);
-        assertEquals(offset1.equals(offset2), false);
-        assertEquals(offset2.equals(offset1), false);
+        assertEquals(false, offset1.equals(offset2));
+        assertEquals(false, offset2.equals(offset1));
 
-        assertEquals(offset1.equals(offset1), true);
-        assertEquals(offset2.equals(offset2), true);
-        assertEquals(offset2.equals(offset2b), true);
+        assertEquals(true, offset1.equals(offset1));
+        assertEquals(true, offset2.equals(offset2));
+        assertEquals(true, offset2.equals(offset2b));
 
-        assertEquals(offset1.hashCode() == offset1.hashCode(), true);
-        assertEquals(offset2.hashCode() == offset2.hashCode(), true);
-        assertEquals(offset2.hashCode() == offset2b.hashCode(), true);
+        assertEquals(true, offset1.hashCode() == offset1.hashCode());
+        assertEquals(true, offset2.hashCode() == offset2.hashCode());
+        assertEquals(true, offset2.hashCode() == offset2b.hashCode());
     }
 
     //-----------------------------------------------------------------------
@@ -612,11 +617,11 @@ public class TCKZoneOffset extends AbstractDateTimeTest {
             //Do not change offset of ZonedDateTime after adjustInto()
             ZonedDateTime zonedDateTime_target = ZonedDateTime.of(LocalDate.of(1909, 2, 2), LocalTime.of(10, 10, 10), ZoneId.of(zoneId));
             ZonedDateTime zonedDateTime_result = (ZonedDateTime)(base.adjustInto(zonedDateTime_target));
-            assertEquals(zonedDateTime_target.getOffset(), zonedDateTime_result.getOffset());
+            assertEquals(zonedDateTime_result.getOffset(), zonedDateTime_target.getOffset());
 
             OffsetDateTime offsetDateTime_target = zonedDateTime_target.toOffsetDateTime();
             OffsetDateTime offsetDateTime_result = (OffsetDateTime)(base.adjustInto(offsetDateTime_target));
-            assertEquals(base, offsetDateTime_result.getOffset());
+            assertEquals(offsetDateTime_result.getOffset(), base);
         }
     }
 
@@ -626,19 +631,21 @@ public class TCKZoneOffset extends AbstractDateTimeTest {
         for (int i=-18; i<=18; i++) {
             OffsetDateTime offsetDateTime_target = OffsetDateTime.of(LocalDate.of(1909, 2, 2), LocalTime.of(10, 10, 10), ZoneOffset.ofHours(i));
             OffsetDateTime offsetDateTime_result = (OffsetDateTime)base.adjustInto(offsetDateTime_target);
-            assertEquals(base, offsetDateTime_result.getOffset());
+            assertEquals(offsetDateTime_result.getOffset(), base);
 
             //Do not change offset of ZonedDateTime after adjustInto()
             ZonedDateTime zonedDateTime_target = offsetDateTime_target.toZonedDateTime();
             ZonedDateTime zonedDateTime_result = (ZonedDateTime)(base.adjustInto(zonedDateTime_target));
-            assertEquals(zonedDateTime_target.getOffset(), zonedDateTime_result.getOffset());
+            assertEquals(zonedDateTime_result.getOffset(), zonedDateTime_target.getOffset());
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_adjustInto_dateOnly() {
-        ZoneOffset base = ZoneOffset.ofHoursMinutesSeconds(1, 1, 1);
-        base.adjustInto((LocalDate.of(1909, 2, 2)));
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            ZoneOffset base = ZoneOffset.ofHoursMinutesSeconds(1, 1, 1);
+            base.adjustInto((LocalDate.of(1909, 2, 2)));
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -647,18 +654,18 @@ public class TCKZoneOffset extends AbstractDateTimeTest {
     @Test
     public void test_toString() {
         ZoneOffset offset = ZoneOffset.ofHoursMinutesSeconds(1, 0, 0);
-        assertEquals(offset.toString(), "+01:00");
+        assertEquals("+01:00", offset.toString());
         offset = ZoneOffset.ofHoursMinutesSeconds(1, 2, 3);
-        assertEquals(offset.toString(), "+01:02:03");
+        assertEquals("+01:02:03", offset.toString());
         offset = ZoneOffset.UTC;
-        assertEquals(offset.toString(), "Z");
+        assertEquals("Z", offset.toString());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     private void doTestOffset(ZoneOffset offset, int hours, int minutes, int seconds) {
-        assertEquals(offset.getTotalSeconds(), hours * 60 * 60 + minutes * 60 + seconds);
+        assertEquals(hours * 60 * 60 + minutes * 60 + seconds, offset.getTotalSeconds());
         final String id;
         if (hours == 0 && minutes == 0 && seconds == 0) {
             id = "Z";
@@ -673,16 +680,16 @@ public class TCKZoneOffset extends AbstractDateTimeTest {
             }
             id = str;
         }
-        assertEquals(offset.getId(), id);
-        assertEquals(offset, ZoneOffset.ofHoursMinutesSeconds(hours, minutes, seconds));
+        assertEquals(id, offset.getId());
+        assertEquals(ZoneOffset.ofHoursMinutesSeconds(hours, minutes, seconds), offset);
         if (seconds == 0) {
-            assertEquals(offset, ZoneOffset.ofHoursMinutes(hours, minutes));
+            assertEquals(ZoneOffset.ofHoursMinutes(hours, minutes), offset);
             if (minutes == 0) {
-                assertEquals(offset, ZoneOffset.ofHours(hours));
+                assertEquals(ZoneOffset.ofHours(hours), offset);
             }
         }
-        assertEquals(ZoneOffset.of(id), offset);
-        assertEquals(offset.toString(), id);
+        assertEquals(offset, ZoneOffset.of(id));
+        assertEquals(id, offset.toString());
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/TCKZonedDateTime.java b/test/jdk/java/time/tck/java/time/TCKZonedDateTime.java
index 8ca935c04e5..847035f121a 100644
--- a/test/jdk/java/time/tck/java/time/TCKZonedDateTime.java
+++ b/test/jdk/java/time/tck/java/time/TCKZonedDateTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -95,8 +95,9 @@ import static java.time.temporal.ChronoUnit.HOURS;
 import static java.time.temporal.ChronoUnit.MINUTES;
 import static java.time.temporal.ChronoUnit.NANOS;
 import static java.time.temporal.ChronoUnit.SECONDS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -133,14 +134,17 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test ZonedDateTime.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKZonedDateTime extends AbstractDateTimeTest {
 
     private static final ZoneOffset OFFSET_0100 = ZoneOffset.ofHours(1);
@@ -160,7 +164,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     private ZonedDateTime TEST_DATE_TIME;
     private ZonedDateTime TEST_DATE_TIME_PARIS;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_LOCAL_2008_06_30_11_30_59_500 = LocalDateTime.of(2008, 6, 30, 11, 30, 59, 500);
         TEST_DATE_TIME = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
@@ -243,9 +247,9 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // now(ZoneId)
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_ZoneId_nullZoneId() {
-        ZonedDateTime.now((ZoneId) null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZonedDateTime.now((ZoneId) null));
     }
 
     @Test
@@ -253,16 +257,15 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         ZoneId zone = ZoneId.of("UTC+01:02:03");
         ZonedDateTime expected = ZonedDateTime.now(Clock.system(zone));
         ZonedDateTime test = ZonedDateTime.now(zone);
-        assertEquals(Duration.between(expected, test).truncatedTo(ChronoUnit.SECONDS),
-                Duration.ZERO);
+        assertEquals(Duration.ZERO, Duration.between(expected, test).truncatedTo(ChronoUnit.SECONDS));
     }
 
     //-----------------------------------------------------------------------
     // now(Clock)
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void now_Clock_nullClock() {
-        ZonedDateTime.now((Clock) null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZonedDateTime.now((Clock) null));
     }
 
     @Test
@@ -271,15 +274,15 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
             Instant instant = Instant.ofEpochSecond(i).plusNanos(123456789L);
             Clock clock = Clock.fixed(instant, ZoneOffset.UTC);
             ZonedDateTime test = ZonedDateTime.now(clock);
-            assertEquals(test.getYear(), 1970);
-            assertEquals(test.getMonth(), Month.JANUARY);
-            assertEquals(test.getDayOfMonth(), (i < 24 * 60 * 60 ? 1 : 2));
-            assertEquals(test.getHour(), (i / (60 * 60)) % 24);
-            assertEquals(test.getMinute(), (i / 60) % 60);
-            assertEquals(test.getSecond(), i % 60);
-            assertEquals(test.getNano(), 123456789);
-            assertEquals(test.getOffset(), ZoneOffset.UTC);
-            assertEquals(test.getZone(), ZoneOffset.UTC);
+            assertEquals(1970, test.getYear());
+            assertEquals(Month.JANUARY, test.getMonth());
+            assertEquals((i < 24 * 60 * 60 ? 1 : 2), test.getDayOfMonth());
+            assertEquals((i / (60 * 60)) % 24, test.getHour());
+            assertEquals((i / 60) % 60, test.getMinute());
+            assertEquals(i % 60, test.getSecond());
+            assertEquals(123456789, test.getNano());
+            assertEquals(ZoneOffset.UTC, test.getOffset());
+            assertEquals(ZoneOffset.UTC, test.getZone());
         }
     }
 
@@ -291,7 +294,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
             ZonedDateTime expected = ZonedDateTime.ofInstant(instant, zone);
             Clock clock = Clock.fixed(expected.toInstant(), zone);
             ZonedDateTime test = ZonedDateTime.now(clock);
-            assertEquals(test, expected);
+            assertEquals(expected, test);
         }
     }
 
@@ -302,13 +305,13 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
             Instant instant = Instant.ofEpochSecond(i).plusNanos(123456789L);
             Clock clock = Clock.fixed(instant, ZoneOffset.UTC);
             ZonedDateTime test = ZonedDateTime.now(clock);
-            assertEquals(test.getYear(), 1969);
-            assertEquals(test.getMonth(), Month.DECEMBER);
-            assertEquals(test.getDayOfMonth(), 31);
+            assertEquals(1969, test.getYear());
+            assertEquals(Month.DECEMBER, test.getMonth());
+            assertEquals(31, test.getDayOfMonth());
             expected = expected.minusSeconds(1);
-            assertEquals(test.toLocalTime(), expected);
-            assertEquals(test.getOffset(), ZoneOffset.UTC);
-            assertEquals(test.getZone(), ZoneOffset.UTC);
+            assertEquals(expected, test.toLocalTime());
+            assertEquals(ZoneOffset.UTC, test.getOffset());
+            assertEquals(ZoneOffset.UTC, test.getZone());
         }
     }
 
@@ -319,12 +322,12 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
             ZoneOffset offset = ZoneOffset.ofHours(i);
             Clock clock = Clock.fixed(base.toInstant(), offset);
             ZonedDateTime test = ZonedDateTime.now(clock);
-            assertEquals(test.getHour(), (12 + i) % 24);
-            assertEquals(test.getMinute(), 0);
-            assertEquals(test.getSecond(), 0);
-            assertEquals(test.getNano(), 0);
-            assertEquals(test.getOffset(), offset);
-            assertEquals(test.getZone(), offset);
+            assertEquals((12 + i) % 24, test.getHour());
+            assertEquals(0, test.getMinute());
+            assertEquals(0, test.getSecond());
+            assertEquals(0, test.getNano());
+            assertEquals(offset, test.getOffset());
+            assertEquals(offset, test.getZone());
         }
     }
 
@@ -332,15 +335,15 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     // dateTime factories
     //-----------------------------------------------------------------------
     void check(ZonedDateTime test, int y, int m, int d, int h, int min, int s, int n, ZoneOffset offset, ZoneId zone) {
-        assertEquals(test.getYear(), y);
-        assertEquals(test.getMonth().getValue(), m);
-        assertEquals(test.getDayOfMonth(), d);
-        assertEquals(test.getHour(), h);
-        assertEquals(test.getMinute(), min);
-        assertEquals(test.getSecond(), s);
-        assertEquals(test.getNano(), n);
-        assertEquals(test.getOffset(), offset);
-        assertEquals(test.getZone(), zone);
+        assertEquals(y, test.getYear());
+        assertEquals(m, test.getMonth().getValue());
+        assertEquals(d, test.getDayOfMonth());
+        assertEquals(h, test.getHour());
+        assertEquals(min, test.getMinute());
+        assertEquals(s, test.getSecond());
+        assertEquals(n, test.getNano());
+        assertEquals(offset, test.getOffset());
+        assertEquals(zone, test.getZone());
     }
 
     //-----------------------------------------------------------------------
@@ -364,19 +367,19 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         check(test, 2008, 10, 26, 2, 30, 0, 0, OFFSET_0200, ZONE_PARIS);  // same time in summer offset
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_LocalDateLocalTime_nullDate() {
-        ZonedDateTime.of((LocalDate) null, LocalTime.of(11, 30, 10, 500), ZONE_PARIS);
+        Assertions.assertThrows(NullPointerException.class, () -> ZonedDateTime.of((LocalDate) null, LocalTime.of(11, 30, 10, 500), ZONE_PARIS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_LocalDateLocalTime_nullTime() {
-        ZonedDateTime.of(LocalDate.of(2008, 6, 30), (LocalTime) null, ZONE_PARIS);
+        Assertions.assertThrows(NullPointerException.class, () -> ZonedDateTime.of(LocalDate.of(2008, 6, 30), (LocalTime) null, ZONE_PARIS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_LocalDateLocalTime_nullZone() {
-        ZonedDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 10, 500), null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZonedDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 10, 500), null));
     }
 
     //-----------------------------------------------------------------------
@@ -401,15 +404,17 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         check(test, 2008, 10, 26, 2, 30, 0, 0, OFFSET_0200, ZONE_PARIS);  // same time in summer offset
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_LocalDateTime_nullDateTime() {
-        ZonedDateTime.of((LocalDateTime) null, ZONE_PARIS);
+        Assertions.assertThrows(NullPointerException.class, () -> ZonedDateTime.of((LocalDateTime) null, ZONE_PARIS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_of_LocalDateTime_nullZone() {
-        LocalDateTime base = LocalDateTime.of(2008, 6, 30, 11, 30, 10, 500);
-        ZonedDateTime.of(base, null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            LocalDateTime base = LocalDateTime.of(2008, 6, 30, 11, 30, 10, 500);
+            ZonedDateTime.of(base, null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -471,12 +476,12 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         for (int i = 0; i < (24 * 60 * 60); i++) {
             Instant instant = Instant.ofEpochSecond(i);
             ZonedDateTime test = ZonedDateTime.ofInstant(instant, OFFSET_0100);
-            assertEquals(test.getYear(), 1970);
-            assertEquals(test.getMonth(), Month.JANUARY);
-            assertEquals(test.getDayOfMonth(), 1 + (i >= 23 * 60 * 60 ? 1 : 0));
-            assertEquals(test.getHour(), ((i / (60 * 60)) + 1) % 24);
-            assertEquals(test.getMinute(), (i / 60) % 60);
-            assertEquals(test.getSecond(), i % 60);
+            assertEquals(1970, test.getYear());
+            assertEquals(Month.JANUARY, test.getMonth());
+            assertEquals(1 + (i >= 23 * 60 * 60 ? 1 : 0), test.getDayOfMonth());
+            assertEquals(((i / (60 * 60)) + 1) % 24, test.getHour());
+            assertEquals((i / 60) % 60, test.getMinute());
+            assertEquals(i % 60, test.getSecond());
         }
     }
 
@@ -487,7 +492,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         for (long i = 0; i < 146097; i++) {
             Instant instant = Instant.ofEpochSecond(i * 24L * 60L * 60L);
             ZonedDateTime test = ZonedDateTime.ofInstant(instant, ZoneOffset.UTC);
-            assertEquals(test, expected);
+            assertEquals(expected, test);
             expected = expected.plusDays(1);
         }
     }
@@ -499,14 +504,14 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         long days = (year * 365L + (year / 4 - year / 100 + year / 400)) - days_0000_to_1970;
         Instant instant = Instant.ofEpochSecond(days * 24L * 60L * 60L - OFFSET_MIN.getTotalSeconds());
         ZonedDateTime test = ZonedDateTime.ofInstant(instant, OFFSET_MIN);
-        assertEquals(test.getYear(), Year.MIN_VALUE);
-        assertEquals(test.getMonth().getValue(), 1);
-        assertEquals(test.getDayOfMonth(), 1);
-        assertEquals(test.getOffset(), OFFSET_MIN);
-        assertEquals(test.getHour(), 0);
-        assertEquals(test.getMinute(), 0);
-        assertEquals(test.getSecond(), 0);
-        assertEquals(test.getNano(), 0);
+        assertEquals(Year.MIN_VALUE, test.getYear());
+        assertEquals(1, test.getMonth().getValue());
+        assertEquals(1, test.getDayOfMonth());
+        assertEquals(OFFSET_MIN, test.getOffset());
+        assertEquals(0, test.getHour());
+        assertEquals(0, test.getMinute());
+        assertEquals(0, test.getSecond());
+        assertEquals(0, test.getNano());
     }
 
     @Test
@@ -516,14 +521,14 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         long days = (year * 365L + (year / 4 - year / 100 + year / 400)) - days_0000_to_1970;
         Instant instant = Instant.ofEpochSecond(days * 24L * 60L * 60L - OFFSET_MAX.getTotalSeconds());
         ZonedDateTime test = ZonedDateTime.ofInstant(instant, OFFSET_MAX);
-        assertEquals(test.getYear(), Year.MIN_VALUE);
-        assertEquals(test.getMonth().getValue(), 1);
-        assertEquals(test.getDayOfMonth(), 1);
-        assertEquals(test.getOffset(), OFFSET_MAX);
-        assertEquals(test.getHour(), 0);
-        assertEquals(test.getMinute(), 0);
-        assertEquals(test.getSecond(), 0);
-        assertEquals(test.getNano(), 0);
+        assertEquals(Year.MIN_VALUE, test.getYear());
+        assertEquals(1, test.getMonth().getValue());
+        assertEquals(1, test.getDayOfMonth());
+        assertEquals(OFFSET_MAX, test.getOffset());
+        assertEquals(0, test.getHour());
+        assertEquals(0, test.getMinute());
+        assertEquals(0, test.getSecond());
+        assertEquals(0, test.getNano());
     }
 
     @Test
@@ -533,14 +538,14 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         long days = (year * 365L + (year / 4 - year / 100 + year / 400)) + 365 - days_0000_to_1970;
         Instant instant = Instant.ofEpochSecond((days + 1) * 24L * 60L * 60L - 1 - OFFSET_MIN.getTotalSeconds());
         ZonedDateTime test = ZonedDateTime.ofInstant(instant, OFFSET_MIN);
-        assertEquals(test.getYear(), Year.MAX_VALUE);
-        assertEquals(test.getMonth().getValue(), 12);
-        assertEquals(test.getDayOfMonth(), 31);
-        assertEquals(test.getOffset(), OFFSET_MIN);
-        assertEquals(test.getHour(), 23);
-        assertEquals(test.getMinute(), 59);
-        assertEquals(test.getSecond(), 59);
-        assertEquals(test.getNano(), 0);
+        assertEquals(Year.MAX_VALUE, test.getYear());
+        assertEquals(12, test.getMonth().getValue());
+        assertEquals(31, test.getDayOfMonth());
+        assertEquals(OFFSET_MIN, test.getOffset());
+        assertEquals(23, test.getHour());
+        assertEquals(59, test.getMinute());
+        assertEquals(59, test.getSecond());
+        assertEquals(0, test.getNano());
     }
 
     @Test
@@ -550,55 +555,63 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         long days = (year * 365L + (year / 4 - year / 100 + year / 400)) + 365 - days_0000_to_1970;
         Instant instant = Instant.ofEpochSecond((days + 1) * 24L * 60L * 60L - 1 - OFFSET_MAX.getTotalSeconds());
         ZonedDateTime test = ZonedDateTime.ofInstant(instant, OFFSET_MAX);
-        assertEquals(test.getYear(), Year.MAX_VALUE);
-        assertEquals(test.getMonth().getValue(), 12);
-        assertEquals(test.getDayOfMonth(), 31);
-        assertEquals(test.getOffset(), OFFSET_MAX);
-        assertEquals(test.getHour(), 23);
-        assertEquals(test.getMinute(), 59);
-        assertEquals(test.getSecond(), 59);
-        assertEquals(test.getNano(), 0);
+        assertEquals(Year.MAX_VALUE, test.getYear());
+        assertEquals(12, test.getMonth().getValue());
+        assertEquals(31, test.getDayOfMonth());
+        assertEquals(OFFSET_MAX, test.getOffset());
+        assertEquals(23, test.getHour());
+        assertEquals(59, test.getMinute());
+        assertEquals(59, test.getSecond());
+        assertEquals(0, test.getNano());
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofInstant_maxInstantWithMaxOffset() {
-        Instant instant = Instant.ofEpochSecond(Long.MAX_VALUE);
-        ZonedDateTime.ofInstant(instant, OFFSET_MAX);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant instant = Instant.ofEpochSecond(Long.MAX_VALUE);
+            ZonedDateTime.ofInstant(instant, OFFSET_MAX);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofInstant_maxInstantWithMinOffset() {
-        Instant instant = Instant.ofEpochSecond(Long.MAX_VALUE);
-        ZonedDateTime.ofInstant(instant, OFFSET_MIN);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant instant = Instant.ofEpochSecond(Long.MAX_VALUE);
+            ZonedDateTime.ofInstant(instant, OFFSET_MIN);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofInstant_tooBig() {
-        long days_0000_to_1970 = (146097 * 5) - (30 * 365 + 7);
-        long year = Year.MAX_VALUE + 1L;
-        long days = (year * 365L + (year / 4 - year / 100 + year / 400)) - days_0000_to_1970;
-        Instant instant = Instant.ofEpochSecond(days * 24L * 60L * 60L);
-        ZonedDateTime.ofInstant(instant, ZoneOffset.UTC);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            long days_0000_to_1970 = (146097 * 5) - (30 * 365 + 7);
+            long year = Year.MAX_VALUE + 1L;
+            long days = (year * 365L + (year / 4 - year / 100 + year / 400)) - days_0000_to_1970;
+            Instant instant = Instant.ofEpochSecond(days * 24L * 60L * 60L);
+            ZonedDateTime.ofInstant(instant, ZoneOffset.UTC);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofInstant_tooLow() {
-        long days_0000_to_1970 = (146097 * 5) - (30 * 365 + 7);
-        int year = Year.MIN_VALUE - 1;
-        long days = (year * 365L + (year / 4 - year / 100 + year / 400)) - days_0000_to_1970;
-        Instant instant = Instant.ofEpochSecond(days * 24L * 60L * 60L);
-        ZonedDateTime.ofInstant(instant, ZoneOffset.UTC);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            long days_0000_to_1970 = (146097 * 5) - (30 * 365 + 7);
+            int year = Year.MIN_VALUE - 1;
+            long days = (year * 365L + (year / 4 - year / 100 + year / 400)) - days_0000_to_1970;
+            Instant instant = Instant.ofEpochSecond(days * 24L * 60L * 60L);
+            ZonedDateTime.ofInstant(instant, ZoneOffset.UTC);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_ofInstant_Instant_nullInstant() {
-        ZonedDateTime.ofInstant((Instant) null, ZONE_0100);
+        Assertions.assertThrows(NullPointerException.class, () -> ZonedDateTime.ofInstant((Instant) null, ZONE_0100));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_ofInstant_Instant_nullZone() {
-        ZonedDateTime.ofInstant(Instant.EPOCH, null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZonedDateTime.ofInstant(Instant.EPOCH, null));
     }
 
     //-----------------------------------------------------------------------
@@ -611,49 +624,55 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         check(test, 2008, 6, 30, 11, 30, 10, 500, OFFSET_0200, ZONE_PARIS);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofStrict_LDT_ZI_ZO_inGap() {
-        try {
-            ZonedDateTime.ofStrict(TEST_PARIS_GAP_2008_03_30_02_30, OFFSET_0100, ZONE_PARIS);
-        } catch (DateTimeException ex) {
-            assertEquals(ex.getMessage().contains(" gap"), true);
-            throw ex;
-        }
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            try {
+                ZonedDateTime.ofStrict(TEST_PARIS_GAP_2008_03_30_02_30, OFFSET_0100, ZONE_PARIS);
+            } catch (DateTimeException ex) {
+                assertEquals(true, ex.getMessage().contains(" gap"));
+                throw ex;
+            }
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofStrict_LDT_ZI_ZO_inOverlap_invalidOfset() {
-        try {
-            ZonedDateTime.ofStrict(TEST_PARIS_OVERLAP_2008_10_26_02_30, OFFSET_0130, ZONE_PARIS);
-        } catch (DateTimeException ex) {
-            assertEquals(ex.getMessage().contains(" is not valid for "), true);
-            throw ex;
-        }
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            try {
+                ZonedDateTime.ofStrict(TEST_PARIS_OVERLAP_2008_10_26_02_30, OFFSET_0130, ZONE_PARIS);
+            } catch (DateTimeException ex) {
+                assertEquals(true, ex.getMessage().contains(" is not valid for "));
+                throw ex;
+            }
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofStrict_LDT_ZI_ZO_invalidOffset() {
-        try {
-            ZonedDateTime.ofStrict(TEST_LOCAL_2008_06_30_11_30_59_500, OFFSET_0130, ZONE_PARIS);
-        } catch (DateTimeException ex) {
-            assertEquals(ex.getMessage().contains(" is not valid for "), true);
-            throw ex;
-        }
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            try {
+                ZonedDateTime.ofStrict(TEST_LOCAL_2008_06_30_11_30_59_500, OFFSET_0130, ZONE_PARIS);
+            } catch (DateTimeException ex) {
+                assertEquals(true, ex.getMessage().contains(" is not valid for "));
+                throw ex;
+            }
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_ofStrict_LDT_ZI_ZO_nullLDT() {
-        ZonedDateTime.ofStrict((LocalDateTime) null, OFFSET_0100, ZONE_PARIS);
+        Assertions.assertThrows(NullPointerException.class, () -> ZonedDateTime.ofStrict((LocalDateTime) null, OFFSET_0100, ZONE_PARIS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_ofStrict_LDT_ZI_ZO_nullZO() {
-        ZonedDateTime.ofStrict(TEST_LOCAL_2008_06_30_11_30_59_500, null, ZONE_PARIS);
+        Assertions.assertThrows(NullPointerException.class, () -> ZonedDateTime.ofStrict(TEST_LOCAL_2008_06_30_11_30_59_500, null, ZONE_PARIS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_ofStrict_LDT_ZI_ZO_nullZI() {
-        ZonedDateTime.ofStrict(TEST_LOCAL_2008_06_30_11_30_59_500, OFFSET_0100, null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZonedDateTime.ofStrict(TEST_LOCAL_2008_06_30_11_30_59_500, OFFSET_0100, null));
     }
 
     //-----------------------------------------------------------------------
@@ -661,12 +680,12 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void factory_from_TemporalAccessor_ZDT() {
-        assertEquals(ZonedDateTime.from(TEST_DATE_TIME_PARIS), TEST_DATE_TIME_PARIS);
+        assertEquals(TEST_DATE_TIME_PARIS, ZonedDateTime.from(TEST_DATE_TIME_PARIS));
     }
 
     @Test
     public void factory_from_TemporalAccessor_LDT_ZoneId() {
-        assertEquals(ZonedDateTime.from(new TemporalAccessor() {
+        assertEquals(TEST_DATE_TIME_PARIS, ZonedDateTime.from(new TemporalAccessor() {
             @Override
             public boolean isSupported(TemporalField field) {
                 return TEST_DATE_TIME_PARIS.toLocalDateTime().isSupported(field);
@@ -685,12 +704,12 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
                 }
                 return TemporalAccessor.super.query(query);
             }
-        }), TEST_DATE_TIME_PARIS);
+        }));
     }
 
     @Test
     public void factory_from_TemporalAccessor_Instant_ZoneId() {
-        assertEquals(ZonedDateTime.from(new TemporalAccessor() {
+        assertEquals(TEST_DATE_TIME_PARIS, ZonedDateTime.from(new TemporalAccessor() {
             @Override
             public boolean isSupported(TemporalField field) {
                 return field == INSTANT_SECONDS || field == NANO_OF_SECOND;
@@ -709,36 +728,36 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
                 }
                 return TemporalAccessor.super.query(query);
             }
-        }), TEST_DATE_TIME_PARIS);
+        }));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_from_TemporalAccessor_invalid_noDerive() {
-        ZonedDateTime.from(LocalTime.of(12, 30));
+        Assertions.assertThrows(DateTimeException.class, () -> ZonedDateTime.from(LocalTime.of(12, 30)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_from_TemporalAccessor_null() {
-        ZonedDateTime.from((TemporalAccessor) null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZonedDateTime.from((TemporalAccessor) null));
     }
 
     //-----------------------------------------------------------------------
     // parse()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleToString")
+    @ParameterizedTest
+    @MethodSource("provider_sampleToString")
     public void test_parse(int y, int month, int d, int h, int m, int s, int n, String zoneId, String text) {
         ZonedDateTime t = ZonedDateTime.parse(text);
-        assertEquals(t.getYear(), y);
-        assertEquals(t.getMonth().getValue(), month);
-        assertEquals(t.getDayOfMonth(), d);
-        assertEquals(t.getHour(), h);
-        assertEquals(t.getMinute(), m);
-        assertEquals(t.getSecond(), s);
-        assertEquals(t.getNano(), n);
-        assertEquals(t.getZone().getId(), zoneId);
+        assertEquals(y, t.getYear());
+        assertEquals(month, t.getMonth().getValue());
+        assertEquals(d, t.getDayOfMonth());
+        assertEquals(h, t.getHour());
+        assertEquals(m, t.getMinute());
+        assertEquals(s, t.getSecond());
+        assertEquals(n, t.getNano());
+        assertEquals(zoneId, t.getZone().getId());
     }
 
-    @DataProvider(name="parseAdditional")
     Object[][] data_parseAdditional() {
         return new Object[][] {
                 {"2012-06-30T12:30:40Z[GMT]", 2012, 6, 30, 12, 30, 40, 0, "GMT"},
@@ -758,32 +777,33 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="parseAdditional")
+    @ParameterizedTest
+    @MethodSource("data_parseAdditional")
     public void test_parseAdditional(String text, int y, int month, int d, int h, int m, int s, int n, String zoneId) {
         ZonedDateTime t = ZonedDateTime.parse(text);
-        assertEquals(t.getYear(), y);
-        assertEquals(t.getMonth().getValue(), month);
-        assertEquals(t.getDayOfMonth(), d);
-        assertEquals(t.getHour(), h);
-        assertEquals(t.getMinute(), m);
-        assertEquals(t.getSecond(), s);
-        assertEquals(t.getNano(), n);
-        assertEquals(t.getZone().getId(), zoneId);
+        assertEquals(y, t.getYear());
+        assertEquals(month, t.getMonth().getValue());
+        assertEquals(d, t.getDayOfMonth());
+        assertEquals(h, t.getHour());
+        assertEquals(m, t.getMinute());
+        assertEquals(s, t.getSecond());
+        assertEquals(n, t.getNano());
+        assertEquals(zoneId, t.getZone().getId());
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_illegalValue() {
-        ZonedDateTime.parse("2008-06-32T11:15+01:00[Europe/Paris]");
+        Assertions.assertThrows(DateTimeParseException.class, () -> ZonedDateTime.parse("2008-06-32T11:15+01:00[Europe/Paris]"));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void factory_parse_invalidValue() {
-        ZonedDateTime.parse("2008-06-31T11:15+01:00[Europe/Paris]");
+        Assertions.assertThrows(DateTimeParseException.class, () -> ZonedDateTime.parse("2008-06-31T11:15+01:00[Europe/Paris]"));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_nullText() {
-        ZonedDateTime.parse((String) null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZonedDateTime.parse((String) null));
     }
 
     //-----------------------------------------------------------------------
@@ -793,24 +813,25 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     public void factory_parse_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d H m s VV");
         ZonedDateTime test = ZonedDateTime.parse("2010 12 3 11 30 0 Europe/London", f);
-        assertEquals(test, ZonedDateTime.of(LocalDateTime.of(2010, 12, 3, 11, 30), ZoneId.of("Europe/London")));
+        assertEquals(ZonedDateTime.of(LocalDateTime.of(2010, 12, 3, 11, 30), ZoneId.of("Europe/London")), test);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullText() {
-        DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d H m s");
-        ZonedDateTime.parse((String) null, f);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d H m s");
+            ZonedDateTime.parse((String) null, f);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_parse_formatter_nullFormatter() {
-        ZonedDateTime.parse("ANY", null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZonedDateTime.parse("ANY", null));
     }
 
     //-----------------------------------------------------------------------
     // basics
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleTimes")
     Object[][] provider_sampleTimes() {
         return new Object[][] {
             {2008, 6, 30, 11, 30, 20, 500, ZONE_0100},
@@ -822,7 +843,8 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_get(int y, int o, int d, int h, int m, int s, int n, ZoneId zone) {
         LocalDate localDate = LocalDate.of(y, o, d);
         LocalTime localTime = LocalTime.of(h, m, s, n);
@@ -830,24 +852,24 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         ZoneOffset offset = zone.getRules().getOffset(localDateTime);
         ZonedDateTime a = ZonedDateTime.of(localDateTime, zone);
 
-        assertEquals(a.getYear(), localDate.getYear());
-        assertEquals(a.getMonth(), localDate.getMonth());
-        assertEquals(a.getDayOfMonth(), localDate.getDayOfMonth());
-        assertEquals(a.getDayOfYear(), localDate.getDayOfYear());
-        assertEquals(a.getDayOfWeek(), localDate.getDayOfWeek());
+        assertEquals(localDate.getYear(), a.getYear());
+        assertEquals(localDate.getMonth(), a.getMonth());
+        assertEquals(localDate.getDayOfMonth(), a.getDayOfMonth());
+        assertEquals(localDate.getDayOfYear(), a.getDayOfYear());
+        assertEquals(localDate.getDayOfWeek(), a.getDayOfWeek());
 
-        assertEquals(a.getHour(), localTime.getHour());
-        assertEquals(a.getMinute(), localTime.getMinute());
-        assertEquals(a.getSecond(), localTime.getSecond());
-        assertEquals(a.getNano(), localTime.getNano());
+        assertEquals(localTime.getHour(), a.getHour());
+        assertEquals(localTime.getMinute(), a.getMinute());
+        assertEquals(localTime.getSecond(), a.getSecond());
+        assertEquals(localTime.getNano(), a.getNano());
 
-        assertEquals(a.toLocalDate(), localDate);
-        assertEquals(a.toLocalTime(), localTime);
-        assertEquals(a.toLocalDateTime(), localDateTime);
+        assertEquals(localDate, a.toLocalDate());
+        assertEquals(localTime, a.toLocalTime());
+        assertEquals(localDateTime, a.toLocalDateTime());
         if (zone instanceof ZoneOffset) {
-            assertEquals(a.toString(), localDateTime.toString() + offset.toString());
+            assertEquals(localDateTime.toString() + offset.toString(), a.toString());
         } else {
-            assertEquals(a.toString(), localDateTime.toString() + offset.toString() + "[" + zone.toString() + "]");
+            assertEquals(localDateTime.toString() + offset.toString() + "[" + zone.toString() + "]", a.toString());
         }
     }
 
@@ -856,37 +878,37 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalField() {
-        assertEquals(TEST_DATE_TIME.isSupported((TemporalField) null), false);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.NANO_OF_SECOND), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.NANO_OF_DAY), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.MICRO_OF_SECOND), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.MICRO_OF_DAY), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.MILLI_OF_SECOND), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.MILLI_OF_DAY), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.SECOND_OF_MINUTE), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.SECOND_OF_DAY), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.MINUTE_OF_HOUR), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.MINUTE_OF_DAY), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.HOUR_OF_AMPM), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.HOUR_OF_DAY), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.AMPM_OF_DAY), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.DAY_OF_WEEK), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.DAY_OF_MONTH), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.DAY_OF_YEAR), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.EPOCH_DAY), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.MONTH_OF_YEAR), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.PROLEPTIC_MONTH), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.YEAR), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.YEAR_OF_ERA), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.ERA), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.INSTANT_SECONDS), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.OFFSET_SECONDS), true);
+        assertEquals(false, TEST_DATE_TIME.isSupported((TemporalField) null));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.NANO_OF_SECOND));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.NANO_OF_DAY));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.MICRO_OF_SECOND));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.MICRO_OF_DAY));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.MILLI_OF_SECOND));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.MILLI_OF_DAY));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.SECOND_OF_DAY));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.MINUTE_OF_DAY));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.HOUR_OF_AMPM));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.HOUR_OF_DAY));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.CLOCK_HOUR_OF_DAY));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.AMPM_OF_DAY));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.DAY_OF_WEEK));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.DAY_OF_MONTH));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.DAY_OF_YEAR));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.EPOCH_DAY));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.MONTH_OF_YEAR));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.PROLEPTIC_MONTH));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.YEAR));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.YEAR_OF_ERA));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.ERA));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.INSTANT_SECONDS));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoField.OFFSET_SECONDS));
     }
 
     //-----------------------------------------------------------------------
@@ -894,23 +916,23 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_isSupported_TemporalUnit() {
-        assertEquals(TEST_DATE_TIME.isSupported((TemporalUnit) null), false);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.NANOS), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.MICROS), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.MILLIS), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.SECONDS), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.MINUTES), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.HOURS), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.HALF_DAYS), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.DAYS), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.WEEKS), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.MONTHS), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.YEARS), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.DECADES), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.CENTURIES), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.MILLENNIA), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.ERAS), true);
-        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.FOREVER), false);
+        assertEquals(false, TEST_DATE_TIME.isSupported((TemporalUnit) null));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoUnit.NANOS));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoUnit.MICROS));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoUnit.MILLIS));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoUnit.SECONDS));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoUnit.MINUTES));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoUnit.HOURS));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoUnit.HALF_DAYS));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoUnit.DAYS));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoUnit.WEEKS));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoUnit.MONTHS));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoUnit.YEARS));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoUnit.DECADES));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoUnit.CENTURIES));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoUnit.MILLENNIA));
+        assertEquals(true, TEST_DATE_TIME.isSupported(ChronoUnit.ERAS));
+        assertEquals(false, TEST_DATE_TIME.isSupported(ChronoUnit.FOREVER));
     }
 
     //-----------------------------------------------------------------------
@@ -919,40 +941,40 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     @Test
     public void test_get_TemporalField() {
         ZonedDateTime test = ZonedDateTime.of(LocalDateTime.of(2008, 6, 30, 12, 30, 40, 987654321), ZONE_0100);
-        assertEquals(test.get(ChronoField.YEAR), 2008);
-        assertEquals(test.get(ChronoField.MONTH_OF_YEAR), 6);
-        assertEquals(test.get(ChronoField.DAY_OF_MONTH), 30);
-        assertEquals(test.get(ChronoField.DAY_OF_WEEK), 1);
-        assertEquals(test.get(ChronoField.DAY_OF_YEAR), 182);
+        assertEquals(2008, test.get(ChronoField.YEAR));
+        assertEquals(6, test.get(ChronoField.MONTH_OF_YEAR));
+        assertEquals(30, test.get(ChronoField.DAY_OF_MONTH));
+        assertEquals(1, test.get(ChronoField.DAY_OF_WEEK));
+        assertEquals(182, test.get(ChronoField.DAY_OF_YEAR));
 
-        assertEquals(test.get(ChronoField.HOUR_OF_DAY), 12);
-        assertEquals(test.get(ChronoField.MINUTE_OF_HOUR), 30);
-        assertEquals(test.get(ChronoField.SECOND_OF_MINUTE), 40);
-        assertEquals(test.get(ChronoField.NANO_OF_SECOND), 987654321);
-        assertEquals(test.get(ChronoField.HOUR_OF_AMPM), 0);
-        assertEquals(test.get(ChronoField.AMPM_OF_DAY), 1);
+        assertEquals(12, test.get(ChronoField.HOUR_OF_DAY));
+        assertEquals(30, test.get(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(40, test.get(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(987654321, test.get(ChronoField.NANO_OF_SECOND));
+        assertEquals(0, test.get(ChronoField.HOUR_OF_AMPM));
+        assertEquals(1, test.get(ChronoField.AMPM_OF_DAY));
 
-        assertEquals(test.get(ChronoField.OFFSET_SECONDS), 3600);
+        assertEquals(3600, test.get(ChronoField.OFFSET_SECONDS));
     }
 
     @Test
     public void test_getLong_TemporalField() {
         ZonedDateTime test = ZonedDateTime.of(LocalDateTime.of(2008, 6, 30, 12, 30, 40, 987654321), ZONE_0100);
-        assertEquals(test.getLong(ChronoField.YEAR), 2008);
-        assertEquals(test.getLong(ChronoField.MONTH_OF_YEAR), 6);
-        assertEquals(test.getLong(ChronoField.DAY_OF_MONTH), 30);
-        assertEquals(test.getLong(ChronoField.DAY_OF_WEEK), 1);
-        assertEquals(test.getLong(ChronoField.DAY_OF_YEAR), 182);
+        assertEquals(2008, test.getLong(ChronoField.YEAR));
+        assertEquals(6, test.getLong(ChronoField.MONTH_OF_YEAR));
+        assertEquals(30, test.getLong(ChronoField.DAY_OF_MONTH));
+        assertEquals(1, test.getLong(ChronoField.DAY_OF_WEEK));
+        assertEquals(182, test.getLong(ChronoField.DAY_OF_YEAR));
 
-        assertEquals(test.getLong(ChronoField.HOUR_OF_DAY), 12);
-        assertEquals(test.getLong(ChronoField.MINUTE_OF_HOUR), 30);
-        assertEquals(test.getLong(ChronoField.SECOND_OF_MINUTE), 40);
-        assertEquals(test.getLong(ChronoField.NANO_OF_SECOND), 987654321);
-        assertEquals(test.getLong(ChronoField.HOUR_OF_AMPM), 0);
-        assertEquals(test.getLong(ChronoField.AMPM_OF_DAY), 1);
+        assertEquals(12, test.getLong(ChronoField.HOUR_OF_DAY));
+        assertEquals(30, test.getLong(ChronoField.MINUTE_OF_HOUR));
+        assertEquals(40, test.getLong(ChronoField.SECOND_OF_MINUTE));
+        assertEquals(987654321, test.getLong(ChronoField.NANO_OF_SECOND));
+        assertEquals(0, test.getLong(ChronoField.HOUR_OF_AMPM));
+        assertEquals(1, test.getLong(ChronoField.AMPM_OF_DAY));
 
-        assertEquals(test.getLong(ChronoField.OFFSET_SECONDS), 3600);
-        assertEquals(test.getLong(ChronoField.INSTANT_SECONDS), test.toEpochSecond());
+        assertEquals(3600, test.getLong(ChronoField.OFFSET_SECONDS));
+        assertEquals(test.toEpochSecond(), test.getLong(ChronoField.INSTANT_SECONDS));
     }
 
     //-----------------------------------------------------------------------
@@ -960,37 +982,37 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_query_chrono() {
-        assertEquals(TEST_DATE_TIME.query(TemporalQueries.chronology()), IsoChronology.INSTANCE);
-        assertEquals(TemporalQueries.chronology().queryFrom(TEST_DATE_TIME), IsoChronology.INSTANCE);
+        assertEquals(IsoChronology.INSTANCE, TEST_DATE_TIME.query(TemporalQueries.chronology()));
+        assertEquals(IsoChronology.INSTANCE, TemporalQueries.chronology().queryFrom(TEST_DATE_TIME));
     }
 
     @Test
     public void test_query_zoneId() {
-        assertEquals(TEST_DATE_TIME.query(TemporalQueries.zoneId()), TEST_DATE_TIME.getZone());
-        assertEquals(TemporalQueries.zoneId().queryFrom(TEST_DATE_TIME), TEST_DATE_TIME.getZone());
+        assertEquals(TEST_DATE_TIME.getZone(), TEST_DATE_TIME.query(TemporalQueries.zoneId()));
+        assertEquals(TEST_DATE_TIME.getZone(), TemporalQueries.zoneId().queryFrom(TEST_DATE_TIME));
     }
 
     @Test
     public void test_query_precision() {
-        assertEquals(TEST_DATE_TIME.query(TemporalQueries.precision()), NANOS);
-        assertEquals(TemporalQueries.precision().queryFrom(TEST_DATE_TIME), NANOS);
+        assertEquals(NANOS, TEST_DATE_TIME.query(TemporalQueries.precision()));
+        assertEquals(NANOS, TemporalQueries.precision().queryFrom(TEST_DATE_TIME));
     }
 
     @Test
     public void test_query_offset() {
-        assertEquals(TEST_DATE_TIME.query(TemporalQueries.offset()), TEST_DATE_TIME.getOffset());
-        assertEquals(TemporalQueries.offset().queryFrom(TEST_DATE_TIME), TEST_DATE_TIME.getOffset());
+        assertEquals(TEST_DATE_TIME.getOffset(), TEST_DATE_TIME.query(TemporalQueries.offset()));
+        assertEquals(TEST_DATE_TIME.getOffset(), TemporalQueries.offset().queryFrom(TEST_DATE_TIME));
     }
 
     @Test
     public void test_query_zone() {
-        assertEquals(TEST_DATE_TIME.query(TemporalQueries.zone()), TEST_DATE_TIME.getZone());
-        assertEquals(TemporalQueries.zone().queryFrom(TEST_DATE_TIME), TEST_DATE_TIME.getZone());
+        assertEquals(TEST_DATE_TIME.getZone(), TEST_DATE_TIME.query(TemporalQueries.zone()));
+        assertEquals(TEST_DATE_TIME.getZone(), TemporalQueries.zone().queryFrom(TEST_DATE_TIME));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_query_null() {
-        TEST_DATE_TIME.query(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_DATE_TIME.query(null));
     }
 
     //-----------------------------------------------------------------------
@@ -1000,22 +1022,22 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     public void test_withEarlierOffsetAtOverlap_notAtOverlap() {
         ZonedDateTime base = ZonedDateTime.ofStrict(TEST_LOCAL_2008_06_30_11_30_59_500, OFFSET_0200, ZONE_PARIS);
         ZonedDateTime test = base.withEarlierOffsetAtOverlap();
-        assertEquals(test, base);  // not changed
+        assertEquals(base, test);  // not changed
     }
 
     @Test
     public void test_withEarlierOffsetAtOverlap_atOverlap() {
         ZonedDateTime base = ZonedDateTime.ofStrict(TEST_PARIS_OVERLAP_2008_10_26_02_30, OFFSET_0100, ZONE_PARIS);
         ZonedDateTime test = base.withEarlierOffsetAtOverlap();
-        assertEquals(test.getOffset(), OFFSET_0200);  // offset changed to earlier
-        assertEquals(test.toLocalDateTime(), base.toLocalDateTime());  // date-time not changed
+        assertEquals(OFFSET_0200, test.getOffset());  // offset changed to earlier
+        assertEquals(base.toLocalDateTime(), test.toLocalDateTime());  // date-time not changed
     }
 
     @Test
     public void test_withEarlierOffsetAtOverlap_atOverlap_noChange() {
         ZonedDateTime base = ZonedDateTime.ofStrict(TEST_PARIS_OVERLAP_2008_10_26_02_30, OFFSET_0200, ZONE_PARIS);
         ZonedDateTime test = base.withEarlierOffsetAtOverlap();
-        assertEquals(test, base);  // not changed
+        assertEquals(base, test);  // not changed
     }
 
     //-----------------------------------------------------------------------
@@ -1025,22 +1047,22 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     public void test_withLaterOffsetAtOverlap_notAtOverlap() {
         ZonedDateTime base = ZonedDateTime.ofStrict(TEST_LOCAL_2008_06_30_11_30_59_500, OFFSET_0200, ZONE_PARIS);
         ZonedDateTime test = base.withLaterOffsetAtOverlap();
-        assertEquals(test, base);  // not changed
+        assertEquals(base, test);  // not changed
     }
 
     @Test
     public void test_withLaterOffsetAtOverlap_atOverlap() {
         ZonedDateTime base = ZonedDateTime.ofStrict(TEST_PARIS_OVERLAP_2008_10_26_02_30, OFFSET_0200, ZONE_PARIS);
         ZonedDateTime test = base.withLaterOffsetAtOverlap();
-        assertEquals(test.getOffset(), OFFSET_0100);  // offset changed to later
-        assertEquals(test.toLocalDateTime(), base.toLocalDateTime());  // date-time not changed
+        assertEquals(OFFSET_0100, test.getOffset());  // offset changed to later
+        assertEquals(base.toLocalDateTime(), test.toLocalDateTime());  // date-time not changed
     }
 
     @Test
     public void test_withLaterOffsetAtOverlap_atOverlap_noChange() {
         ZonedDateTime base = ZonedDateTime.ofStrict(TEST_PARIS_OVERLAP_2008_10_26_02_30, OFFSET_0100, ZONE_PARIS);
         ZonedDateTime test = base.withLaterOffsetAtOverlap();
-        assertEquals(test, base);  // not changed
+        assertEquals(base, test);  // not changed
     }
 
     //-----------------------------------------------------------------------
@@ -1051,7 +1073,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.withZoneSameLocal(ZONE_0200);
-        assertEquals(test.toLocalDateTime(), base.toLocalDateTime());
+        assertEquals(base.toLocalDateTime(), test.toLocalDateTime());
     }
 
     @Test
@@ -1059,7 +1081,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.withZoneSameLocal(ZONE_0100);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     @Test
@@ -1067,8 +1089,8 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 11, 2, 1, 30, 59, 0);  // overlap
         ZonedDateTime base = ZonedDateTime.of(ldt, ZoneId.of("UTC-04:00") );
         ZonedDateTime test = base.withZoneSameLocal(ZoneId.of("America/New_York"));
-        assertEquals(base.getOffset(), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(), ZoneOffset.ofHours(-4));
+        assertEquals(ZoneOffset.ofHours(-4), base.getOffset());
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset());
     }
 
     @Test
@@ -1076,15 +1098,17 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 11, 2, 1, 30, 59, 0);  // overlap
         ZonedDateTime base = ZonedDateTime.of(ldt, ZoneId.of("UTC-05:00") );
         ZonedDateTime test = base.withZoneSameLocal(ZoneId.of("America/New_York"));
-        assertEquals(base.getOffset(), ZoneOffset.ofHours(-5));
-        assertEquals(test.getOffset(), ZoneOffset.ofHours(-5));
+        assertEquals(ZoneOffset.ofHours(-5), base.getOffset());
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset());
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_withZoneSameLocal_null() {
-        LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
-        ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
-        base.withZoneSameLocal(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
+            ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
+            base.withZoneSameLocal(null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1095,20 +1119,22 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withZoneSameInstant(ZONE_0200);
         ZonedDateTime expected = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.plusHours(1), ZONE_0200);
-        assertEquals(test, expected);
+        assertEquals(expected, test);
     }
 
     @Test
     public void test_withZoneSameInstant_noChange() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withZoneSameInstant(ZONE_0100);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_withZoneSameInstant_null() {
-        ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
-        base.withZoneSameInstant(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
+            base.withZoneSameInstant(null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1119,7 +1145,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_PARIS);
         ZonedDateTime test = base.withFixedOffsetZone();
         ZonedDateTime expected = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0200);
-        assertEquals(test, expected);
+        assertEquals(expected, test);
     }
 
     //-----------------------------------------------------------------------
@@ -1158,7 +1184,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.with(Year.of(2007));
-        assertEquals(test, ZonedDateTime.of(ldt.withYear(2007), ZONE_0100));
+        assertEquals(ZonedDateTime.of(ldt.withYear(2007), ZONE_0100), test);
     }
 
     @Test
@@ -1187,9 +1213,9 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         ZoneId newYork = ZoneId.of("America/New_York");
         LocalDateTime ldt = LocalDateTime.of(2008, 11, 1, 1, 30);
         ZonedDateTime base = ZonedDateTime.of(ldt, newYork);
-        assertEquals(base.getOffset(), ZoneOffset.ofHours(-4));
+        assertEquals(ZoneOffset.ofHours(-4), base.getOffset());
         ZonedDateTime test = base.with(LocalDate.of(2008, 11, 2));
-        assertEquals(test.getOffset(), ZoneOffset.ofHours(-4));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset());
     }
 
     @Test
@@ -1197,9 +1223,9 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         ZoneId newYork = ZoneId.of("America/New_York");
         LocalDateTime ldt = LocalDateTime.of(2008, 11, 3, 1, 30);
         ZonedDateTime base = ZonedDateTime.of(ldt, newYork);
-        assertEquals(base.getOffset(), ZoneOffset.ofHours(-5));
+        assertEquals(ZoneOffset.ofHours(-5), base.getOffset());
         ZonedDateTime test = base.with(LocalDate.of(2008, 11, 2));
-        assertEquals(test.getOffset(), ZoneOffset.ofHours(-5));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset());
     }
 
     @Test
@@ -1208,7 +1234,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         OffsetDateTime odt = TEST_LOCAL_2008_06_30_11_30_59_500.atOffset(OFFSET_0200);
         ZonedDateTime zdt = TEST_PARIS_OVERLAP_2008_10_26_02_30.atZone(ZONE_PARIS);
         ZonedDateTime test = zdt.with(odt);
-        assertEquals(test.toOffsetDateTime(), odt);
+        assertEquals(odt, test.toOffsetDateTime());
     }
 
     @Test
@@ -1217,8 +1243,8 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         OffsetDateTime odt = TEST_LOCAL_2008_06_30_11_30_59_500.atOffset(OFFSET_0130);
         ZonedDateTime zdt = TEST_PARIS_OVERLAP_2008_10_26_02_30.atZone(ZONE_PARIS);
         ZonedDateTime test = zdt.with(odt);
-        assertEquals(test.toLocalDateTime(), TEST_LOCAL_2008_06_30_11_30_59_500);
-        assertEquals(test.getOffset(), zdt.getOffset());
+        assertEquals(TEST_LOCAL_2008_06_30_11_30_59_500, test.toLocalDateTime());
+        assertEquals(zdt.getOffset(), test.getOffset());
     }
 
     @Test
@@ -1227,7 +1253,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         OffsetDateTime odt = TEST_PARIS_OVERLAP_2008_10_26_02_30.atOffset(OFFSET_0100);
         ZonedDateTime zdt = TEST_LOCAL_2008_06_30_11_30_59_500.atZone(ZONE_PARIS);
         ZonedDateTime test = zdt.with(odt);
-        assertEquals(test.toOffsetDateTime(), odt);
+        assertEquals(odt, test.toOffsetDateTime());
     }
 
     @Test
@@ -1236,7 +1262,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         OffsetDateTime odt = TEST_PARIS_OVERLAP_2008_10_26_02_30.atOffset(OFFSET_0200);
         ZonedDateTime zdt = TEST_LOCAL_2008_06_30_11_30_59_500.atZone(ZONE_PARIS);
         ZonedDateTime test = zdt.with(odt);
-        assertEquals(test.toOffsetDateTime(), odt);
+        assertEquals(odt, test.toOffsetDateTime());
     }
 
     @Test
@@ -1245,8 +1271,8 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         OffsetTime ot = OffsetTime.of(15, 50, 30, 40, OFFSET_0100);
         ZonedDateTime zdt = TEST_PARIS_OVERLAP_2008_10_26_02_30.atZone(ZONE_PARIS);
         ZonedDateTime test = zdt.with(ot);
-        assertEquals(test.toLocalDateTime(), dateTime(2008, 10, 26, 15, 50, 30, 40));
-        assertEquals(test.getOffset(), OFFSET_0100);
+        assertEquals(dateTime(2008, 10, 26, 15, 50, 30, 40), test.toLocalDateTime());
+        assertEquals(OFFSET_0100, test.getOffset());
     }
 
     @Test
@@ -1255,8 +1281,8 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         OffsetTime ot = OffsetTime.of(0, 50, 30, 40, OFFSET_0130);
         ZonedDateTime zdt = dateTime(2008, 10, 26, 2, 30, 0, 0, OFFSET_0200, ZONE_PARIS);  // earlier part of overlap
         ZonedDateTime test = zdt.with(ot);
-        assertEquals(test.toLocalDateTime(), dateTime(2008, 10, 26, 0, 50, 30, 40));
-        assertEquals(test.getOffset(), OFFSET_0200);  // offset not adjusted
+        assertEquals(dateTime(2008, 10, 26, 0, 50, 30, 40), test.toLocalDateTime());
+        assertEquals(OFFSET_0200, test.getOffset());  // offset not adjusted
     }
 
     @Test
@@ -1265,8 +1291,8 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         OffsetTime ot = OffsetTime.of(15, 50, 30, 40, OFFSET_0130);
         ZonedDateTime zdt = dateTime(2008, 10, 26, 2, 30, 0, 0, OFFSET_0200, ZONE_PARIS);  // earlier part of overlap
         ZonedDateTime test = zdt.with(ot);
-        assertEquals(test.toLocalDateTime(), dateTime(2008, 10, 26, 15, 50, 30, 40));
-        assertEquals(test.getOffset(), OFFSET_0100);  // offset adjusted because of time change
+        assertEquals(dateTime(2008, 10, 26, 15, 50, 30, 40), test.toLocalDateTime());
+        assertEquals(OFFSET_0100, test.getOffset());  // offset adjusted because of time change
     }
 
     @Test
@@ -1275,8 +1301,8 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         OffsetTime ot = OffsetTime.of(2, 30, 30, 40, OFFSET_0100);  // valid offset in overlap
         ZonedDateTime zdt = dateTime(2008, 10, 26, 0, 0, 0, 0, OFFSET_0200, ZONE_PARIS);  // just before overlap
         ZonedDateTime test = zdt.with(ot);
-        assertEquals(test.toLocalDateTime(), dateTime(2008, 10, 26, 2, 30, 30, 40));
-        assertEquals(test.getOffset(), OFFSET_0100);
+        assertEquals(dateTime(2008, 10, 26, 2, 30, 30, 40), test.toLocalDateTime());
+        assertEquals(OFFSET_0100, test.getOffset());
     }
 
     @Test
@@ -1285,20 +1311,21 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         OffsetTime ot = OffsetTime.of(2, 30, 30, 40, OFFSET_0200);  // valid offset in overlap
         ZonedDateTime zdt = dateTime(2008, 10, 26, 0, 0, 0, 0, OFFSET_0200, ZONE_PARIS);  // just before overlap
         ZonedDateTime test = zdt.with(ot);
-        assertEquals(test.toLocalDateTime(), dateTime(2008, 10, 26, 2, 30, 30, 40));
-        assertEquals(test.getOffset(), OFFSET_0200);
+        assertEquals(dateTime(2008, 10, 26, 2, 30, 30, 40), test.toLocalDateTime());
+        assertEquals(OFFSET_0200, test.getOffset());
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_with_adjuster_null() {
-        ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
-        base.with((TemporalAdjuster) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
+            base.with((TemporalAdjuster) null);
+        });
     }
 
     //-----------------------------------------------------------------------
     // with(long,TemporalUnit)
     //-----------------------------------------------------------------------
-    @DataProvider(name = "withFieldLong")
     Object[][] data_withFieldLong() {
         return new Object[][] {
                 // set simple fields
@@ -1341,23 +1368,26 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         };
     };
 
-    @Test(dataProvider = "withFieldLong")
+    @ParameterizedTest
+    @MethodSource("data_withFieldLong")
     public void test_with_fieldLong(ZonedDateTime base, TemporalField setField, int setValue, ZonedDateTime expected) {
-        assertEquals(base.with(setField, setValue), expected);
+        assertEquals(expected, base.with(setField, setValue));
     }
 
-    @Test(dataProvider = "withFieldLong")
+    @ParameterizedTest
+    @MethodSource("data_withFieldLong")
     public void test_with_adjuster_ensureZoneOffsetConsistent(ZonedDateTime base, TemporalField setField, int setValue, ZonedDateTime expected) {
         if (setField == OFFSET_SECONDS) {
-            assertEquals(base.with(ZoneOffset.ofTotalSeconds(setValue)), expected);
+            assertEquals(expected, base.with(ZoneOffset.ofTotalSeconds(setValue)));
         }
     }
 
-    @Test(dataProvider = "withFieldLong")
+    @ParameterizedTest
+    @MethodSource("data_withFieldLong")
     public void test_with_adjuster_ensureOffsetDateTimeConsistent(ZonedDateTime base, TemporalField setField, int setValue, ZonedDateTime expected) {
         if (setField == OFFSET_SECONDS) {
             OffsetDateTime odt = base.toOffsetDateTime().with(setField, setValue);
-            assertEquals(base.with(odt), expected);
+            assertEquals(expected, base.with(odt));
         }
     }
 
@@ -1368,14 +1398,14 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     public void test_withYear_normal() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withYear(2007);
-        assertEquals(test, ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withYear(2007), ZONE_0100));
+        assertEquals(ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withYear(2007), ZONE_0100), test);
     }
 
     @Test
     public void test_withYear_noChange() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withYear(2008);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -1385,13 +1415,15 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     public void test_withMonth_Month_normal() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.with(JANUARY);
-        assertEquals(test, ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withMonth(1), ZONE_0100));
+        assertEquals(ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withMonth(1), ZONE_0100), test);
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_withMonth_Month_null() {
-        ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
-        base.with((Month) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
+            base.with((Month) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1401,24 +1433,24 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     public void test_withMonth_normal() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withMonth(1);
-        assertEquals(test, ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withMonth(1), ZONE_0100));
+        assertEquals(ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withMonth(1), ZONE_0100), test);
     }
 
     @Test
     public void test_withMonth_noChange() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withMonth(6);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withMonth_tooBig() {
-        TEST_DATE_TIME.withMonth(13);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_DATE_TIME.withMonth(13));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withMonth_tooSmall() {
-        TEST_DATE_TIME.withMonth(0);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_DATE_TIME.withMonth(0));
     }
 
     //-----------------------------------------------------------------------
@@ -1428,29 +1460,29 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     public void test_withDayOfMonth_normal() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withDayOfMonth(15);
-        assertEquals(test, ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withDayOfMonth(15), ZONE_0100));
+        assertEquals(ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withDayOfMonth(15), ZONE_0100), test);
     }
 
     @Test
     public void test_withDayOfMonth_noChange() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withDayOfMonth(30);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfMonth_tooBig() {
-        LocalDateTime.of(2007, 7, 2, 11, 30).atZone(ZONE_PARIS).withDayOfMonth(32);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 7, 2, 11, 30).atZone(ZONE_PARIS).withDayOfMonth(32));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfMonth_tooSmall() {
-        TEST_DATE_TIME.withDayOfMonth(0);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_DATE_TIME.withDayOfMonth(0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfMonth_invalid31() {
-        LocalDateTime.of(2007, 6, 2, 11, 30).atZone(ZONE_PARIS).withDayOfMonth(31);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 6, 2, 11, 30).atZone(ZONE_PARIS).withDayOfMonth(31));
     }
 
     //-----------------------------------------------------------------------
@@ -1460,7 +1492,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     public void test_withDayOfYear_normal() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withDayOfYear(33);
-        assertEquals(test, ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withDayOfYear(33), ZONE_0100));
+        assertEquals(ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withDayOfYear(33), ZONE_0100), test);
     }
 
     @Test
@@ -1468,22 +1500,22 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 2, 5, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.withDayOfYear(36);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfYear_tooBig() {
-        TEST_DATE_TIME.withDayOfYear(367);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_DATE_TIME.withDayOfYear(367));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfYear_tooSmall() {
-        TEST_DATE_TIME.withDayOfYear(0);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_DATE_TIME.withDayOfYear(0));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_withDayOfYear_invalid366() {
-        LocalDateTime.of(2007, 2, 2, 11, 30).atZone(ZONE_PARIS).withDayOfYear(366);
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDateTime.of(2007, 2, 2, 11, 30).atZone(ZONE_PARIS).withDayOfYear(366));
     }
 
     //-----------------------------------------------------------------------
@@ -1493,14 +1525,14 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     public void test_withHour_normal() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withHour(15);
-        assertEquals(test, ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withHour(15), ZONE_0100));
+        assertEquals(ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withHour(15), ZONE_0100), test);
     }
 
     @Test
     public void test_withHour_noChange() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withHour(11);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -1510,14 +1542,14 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     public void test_withMinute_normal() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withMinute(15);
-        assertEquals(test, ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withMinute(15), ZONE_0100));
+        assertEquals(ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withMinute(15), ZONE_0100), test);
     }
 
     @Test
     public void test_withMinute_noChange() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withMinute(30);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -1527,14 +1559,14 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     public void test_withSecond_normal() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withSecond(12);
-        assertEquals(test, ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withSecond(12), ZONE_0100));
+        assertEquals(ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withSecond(12), ZONE_0100), test);
     }
 
     @Test
     public void test_withSecond_noChange() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withSecond(59);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -1544,14 +1576,14 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     public void test_withNanoOfSecond_normal() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withNano(15);
-        assertEquals(test, ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withNano(15), ZONE_0100));
+        assertEquals(ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500.withNano(15), ZONE_0100), test);
     }
 
     @Test
     public void test_withNanoOfSecond_noChange() {
         ZonedDateTime base = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
         ZonedDateTime test = base.withNano(500);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -1559,20 +1591,19 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_truncatedTo_normal() {
-        assertEquals(TEST_DATE_TIME.truncatedTo(NANOS), TEST_DATE_TIME);
-        assertEquals(TEST_DATE_TIME.truncatedTo(SECONDS), TEST_DATE_TIME.withNano(0));
-        assertEquals(TEST_DATE_TIME.truncatedTo(DAYS), TEST_DATE_TIME.with(LocalTime.MIDNIGHT));
+        assertEquals(TEST_DATE_TIME, TEST_DATE_TIME.truncatedTo(NANOS));
+        assertEquals(TEST_DATE_TIME.withNano(0), TEST_DATE_TIME.truncatedTo(SECONDS));
+        assertEquals(TEST_DATE_TIME.with(LocalTime.MIDNIGHT), TEST_DATE_TIME.truncatedTo(DAYS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_truncatedTo_null() {
-        TEST_DATE_TIME.truncatedTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_DATE_TIME.truncatedTo(null));
     }
 
     //-----------------------------------------------------------------------
     // plus/minus
     //-----------------------------------------------------------------------
-    @DataProvider(name="plusDays")
     Object[][] data_plusDays() {
         return new Object[][] {
             // normal
@@ -1594,7 +1625,6 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @DataProvider(name="plusTime")
     Object[][] data_plusTime() {
         return new Object[][] {
             // normal
@@ -1616,19 +1646,22 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     // plus(TemporalAmount)
     //-----------------------------------------------------------------------
-    @Test(dataProvider="plusDays")
+    @ParameterizedTest
+    @MethodSource("data_plusDays")
     public void test_plus_TemporalAmount_Period_days(ZonedDateTime base, int amount, ZonedDateTime expected) {
-        assertEquals(base.plus(Period.ofDays(amount)), expected);
+        assertEquals(expected, base.plus(Period.ofDays(amount)));
     }
 
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_plus_TemporalAmount_Period_hours(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.plus(MockSimplePeriod.of(amount, HOURS)), expected);
+        assertEquals(expected, base.plus(MockSimplePeriod.of(amount, HOURS)));
     }
 
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_plus_TemporalAmount_Duration_hours(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.plus(Duration.ofHours(amount)), expected);
+        assertEquals(expected, base.plus(Duration.ofHours(amount)));
     }
 
     @Test
@@ -1636,7 +1669,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         MockSimplePeriod period = MockSimplePeriod.of(7, ChronoUnit.MONTHS);
         ZonedDateTime t = ZonedDateTime.of(LocalDateTime.of(2008, 6, 1, 12, 30, 59, 500), ZONE_0100);
         ZonedDateTime expected = ZonedDateTime.of(LocalDateTime.of(2009, 1, 1, 12, 30, 59, 500), ZONE_0100);
-        assertEquals(t.plus(period), expected);
+        assertEquals(expected, t.plus(period));
     }
 
     @Test
@@ -1644,57 +1677,62 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         Duration duration = Duration.ofSeconds(4L * 60 * 60 + 5L * 60 + 6L);
         ZonedDateTime t = ZonedDateTime.of(LocalDateTime.of(2008, 6, 1, 12, 30, 59, 500), ZONE_0100);
         ZonedDateTime expected = ZonedDateTime.of(LocalDateTime.of(2008, 6, 1, 16, 36, 5, 500), ZONE_0100);
-        assertEquals(t.plus(duration), expected);
+        assertEquals(expected, t.plus(duration));
     }
 
     @Test
     public void test_plus_TemporalAmount_Period_zero() {
         ZonedDateTime t = TEST_DATE_TIME.plus(MockSimplePeriod.ZERO_DAYS);
-        assertEquals(t, TEST_DATE_TIME);
+        assertEquals(TEST_DATE_TIME, t);
     }
 
     @Test
     public void test_plus_TemporalAmount_Duration_zero() {
         ZonedDateTime t = TEST_DATE_TIME.plus(Duration.ZERO);
-        assertEquals(t, TEST_DATE_TIME);
+        assertEquals(TEST_DATE_TIME, t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_plus_TemporalAmount_null() {
-        TEST_DATE_TIME.plus((TemporalAmount) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_DATE_TIME.plus((TemporalAmount) null));
     }
 
     //-----------------------------------------------------------------------
     // plus(long,TemporalUnit)
     //-----------------------------------------------------------------------
-    @Test(dataProvider="plusDays")
+    @ParameterizedTest
+    @MethodSource("data_plusDays")
     public void test_plus_longUnit_days(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.plus(amount, DAYS), expected);
+        assertEquals(expected, base.plus(amount, DAYS));
     }
 
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_plus_longUnit_hours(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.plus(amount, HOURS), expected);
+        assertEquals(expected, base.plus(amount, HOURS));
     }
 
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_plus_longUnit_minutes(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.plus(amount * 60, MINUTES), expected);
+        assertEquals(expected, base.plus(amount * 60, MINUTES));
     }
 
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_plus_longUnit_seconds(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.plus(amount * 3600, SECONDS), expected);
+        assertEquals(expected, base.plus(amount * 3600, SECONDS));
     }
 
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_plus_longUnit_nanos(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.plus(amount * 3600_000_000_000L, NANOS), expected);
+        assertEquals(expected, base.plus(amount * 3600_000_000_000L, NANOS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_plus_longUnit_null() {
-        TEST_DATE_TIME_PARIS.plus(0, null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_DATE_TIME_PARIS.plus(0, null));
     }
 
     //-----------------------------------------------------------------------
@@ -1705,7 +1743,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.plusYears(1);
-        assertEquals(test, ZonedDateTime.of(ldt.plusYears(1), ZONE_0100));
+        assertEquals(ZonedDateTime.of(ldt.plusYears(1), ZONE_0100), test);
     }
 
     @Test
@@ -1713,7 +1751,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.plusYears(0);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -1724,7 +1762,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.plusMonths(1);
-        assertEquals(test, ZonedDateTime.of(ldt.plusMonths(1), ZONE_0100));
+        assertEquals(ZonedDateTime.of(ldt.plusMonths(1), ZONE_0100), test);
     }
 
     @Test
@@ -1732,7 +1770,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.plusMonths(0);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -1743,7 +1781,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.plusWeeks(1);
-        assertEquals(test, ZonedDateTime.of(ldt.plusWeeks(1), ZONE_0100));
+        assertEquals(ZonedDateTime.of(ldt.plusWeeks(1), ZONE_0100), test);
     }
 
     @Test
@@ -1751,31 +1789,34 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.plusWeeks(0);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
     // plusDays()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="plusDays")
+    @ParameterizedTest
+    @MethodSource("data_plusDays")
     public void test_plusDays(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.plusDays(amount), expected);
+        assertEquals(expected, base.plusDays(amount));
     }
 
     //-----------------------------------------------------------------------
     // plusHours()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_plusHours(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.plusHours(amount), expected);
+        assertEquals(expected, base.plusHours(amount));
     }
 
     //-----------------------------------------------------------------------
     // plusMinutes()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_plusMinutes(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.plusMinutes(amount * 60), expected);
+        assertEquals(expected, base.plusMinutes(amount * 60));
     }
 
     @Test
@@ -1783,15 +1824,16 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.plusMinutes(30);
-        assertEquals(test, ZonedDateTime.of(ldt.plusMinutes(30), ZONE_0100));
+        assertEquals(ZonedDateTime.of(ldt.plusMinutes(30), ZONE_0100), test);
     }
 
     //-----------------------------------------------------------------------
     // plusSeconds()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_plusSeconds(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.plusSeconds(amount * 3600), expected);
+        assertEquals(expected, base.plusSeconds(amount * 3600));
     }
 
     @Test
@@ -1799,15 +1841,16 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.plusSeconds(1);
-        assertEquals(test, ZonedDateTime.of(ldt.plusSeconds(1), ZONE_0100));
+        assertEquals(ZonedDateTime.of(ldt.plusSeconds(1), ZONE_0100), test);
     }
 
     //-----------------------------------------------------------------------
     // plusNanos()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_plusNanos(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.plusNanos(amount * 3600_000_000_000L), expected);
+        assertEquals(expected, base.plusNanos(amount * 3600_000_000_000L));
     }
 
     @Test
@@ -1815,25 +1858,28 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.plusNanos(1);
-        assertEquals(test, ZonedDateTime.of(ldt.plusNanos(1), ZONE_0100));
+        assertEquals(ZonedDateTime.of(ldt.plusNanos(1), ZONE_0100), test);
     }
 
     //-----------------------------------------------------------------------
     // minus(TemporalAmount)
     //-----------------------------------------------------------------------
-    @Test(dataProvider="plusDays")
+    @ParameterizedTest
+    @MethodSource("data_plusDays")
     public void test_minus_TemporalAmount_Period_days(ZonedDateTime base, int amount, ZonedDateTime expected) {
-        assertEquals(base.minus(Period.ofDays(-amount)), expected);
+        assertEquals(expected, base.minus(Period.ofDays(-amount)));
     }
 
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_minus_TemporalAmount_Period_hours(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.minus(MockSimplePeriod.of(-amount, HOURS)), expected);
+        assertEquals(expected, base.minus(MockSimplePeriod.of(-amount, HOURS)));
     }
 
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_minus_TemporalAmount_Duration_hours(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.minus(Duration.ofHours(-amount)), expected);
+        assertEquals(expected, base.minus(Duration.ofHours(-amount)));
     }
 
     @Test
@@ -1841,7 +1887,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         MockSimplePeriod period = MockSimplePeriod.of(7, ChronoUnit.MONTHS);
         ZonedDateTime t = ZonedDateTime.of(LocalDateTime.of(2008, 6, 1, 12, 30, 59, 500), ZONE_0100);
         ZonedDateTime expected = ZonedDateTime.of(LocalDateTime.of(2007, 11, 1, 12, 30, 59, 500), ZONE_0100);
-        assertEquals(t.minus(period), expected);
+        assertEquals(expected, t.minus(period));
     }
 
     @Test
@@ -1849,24 +1895,24 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         Duration duration = Duration.ofSeconds(4L * 60 * 60 + 5L * 60 + 6L);
         ZonedDateTime t = ZonedDateTime.of(LocalDateTime.of(2008, 6, 1, 12, 30, 59, 500), ZONE_0100);
         ZonedDateTime expected = ZonedDateTime.of(LocalDateTime.of(2008, 6, 1, 8, 25, 53, 500), ZONE_0100);
-        assertEquals(t.minus(duration), expected);
+        assertEquals(expected, t.minus(duration));
     }
 
     @Test
     public void test_minus_TemporalAmount_Period_zero() {
         ZonedDateTime t = TEST_DATE_TIME.minus(MockSimplePeriod.ZERO_DAYS);
-        assertEquals(t, TEST_DATE_TIME);
+        assertEquals(TEST_DATE_TIME, t);
     }
 
     @Test
     public void test_minus_TemporalAmount_Duration_zero() {
         ZonedDateTime t = TEST_DATE_TIME.minus(Duration.ZERO);
-        assertEquals(t, TEST_DATE_TIME);
+        assertEquals(TEST_DATE_TIME, t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_minus_TemporalAmount_null() {
-        TEST_DATE_TIME.minus((TemporalAmount) null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_DATE_TIME.minus((TemporalAmount) null));
     }
 
     //-----------------------------------------------------------------------
@@ -1877,7 +1923,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.minusYears(1);
-        assertEquals(test, ZonedDateTime.of(ldt.minusYears(1), ZONE_0100));
+        assertEquals(ZonedDateTime.of(ldt.minusYears(1), ZONE_0100), test);
     }
 
     @Test
@@ -1885,7 +1931,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.minusYears(0);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -1896,7 +1942,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.minusMonths(1);
-        assertEquals(test, ZonedDateTime.of(ldt.minusMonths(1), ZONE_0100));
+        assertEquals(ZonedDateTime.of(ldt.minusMonths(1), ZONE_0100), test);
     }
 
     @Test
@@ -1904,7 +1950,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.minusMonths(0);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
@@ -1915,7 +1961,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.minusWeeks(1);
-        assertEquals(test, ZonedDateTime.of(ldt.minusWeeks(1), ZONE_0100));
+        assertEquals(ZonedDateTime.of(ldt.minusWeeks(1), ZONE_0100), test);
     }
 
     @Test
@@ -1923,31 +1969,34 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.minusWeeks(0);
-        assertEquals(test, base);
+        assertEquals(base, test);
     }
 
     //-----------------------------------------------------------------------
     // minusDays()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="plusDays")
+    @ParameterizedTest
+    @MethodSource("data_plusDays")
     public void test_minusDays(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.minusDays(-amount), expected);
+        assertEquals(expected, base.minusDays(-amount));
     }
 
     //-----------------------------------------------------------------------
     // minusHours()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_minusHours(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.minusHours(-amount), expected);
+        assertEquals(expected, base.minusHours(-amount));
     }
 
     //-----------------------------------------------------------------------
     // minusMinutes()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_minusMinutes(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.minusMinutes(-amount * 60), expected);
+        assertEquals(expected, base.minusMinutes(-amount * 60));
     }
 
     @Test
@@ -1955,15 +2004,16 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.minusMinutes(30);
-        assertEquals(test, ZonedDateTime.of(ldt.minusMinutes(30), ZONE_0100));
+        assertEquals(ZonedDateTime.of(ldt.minusMinutes(30), ZONE_0100), test);
     }
 
     //-----------------------------------------------------------------------
     // minusSeconds()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_minusSeconds(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.minusSeconds(-amount * 3600), expected);
+        assertEquals(expected, base.minusSeconds(-amount * 3600));
     }
 
     @Test
@@ -1971,15 +2021,16 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.minusSeconds(1);
-        assertEquals(test, ZonedDateTime.of(ldt.minusSeconds(1), ZONE_0100));
+        assertEquals(ZonedDateTime.of(ldt.minusSeconds(1), ZONE_0100), test);
     }
 
     //-----------------------------------------------------------------------
     // minusNanos()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_minusNanos(ZonedDateTime base, long amount, ZonedDateTime expected) {
-        assertEquals(base.minusNanos(-amount * 3600_000_000_000L), expected);
+        assertEquals(expected, base.minusNanos(-amount * 3600_000_000_000L));
     }
 
     @Test
@@ -1987,7 +2038,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(2008, 6, 30, 23, 30, 59, 0);
         ZonedDateTime base = ZonedDateTime.of(ldt, ZONE_0100);
         ZonedDateTime test = base.minusNanos(1);
-        assertEquals(test, ZonedDateTime.of(ldt.minusNanos(1), ZONE_0100));
+        assertEquals(ZonedDateTime.of(ldt.minusNanos(1), ZONE_0100), test);
     }
 
     //-----------------------------------------------------------------------
@@ -1996,32 +2047,37 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     // TODO: more tests for period between two different zones
     // compare results to OffsetDateTime.until, especially wrt dates
 
-    @Test(dataProvider="plusDays")
+    @ParameterizedTest
+    @MethodSource("data_plusDays")
     public void test_until_days(ZonedDateTime base, long expected, ZonedDateTime end) {
         if (base.toLocalTime().equals(end.toLocalTime()) == false) {
             return;  // avoid DST gap input values
         }
-        assertEquals(base.until(end, DAYS), expected);
+        assertEquals(expected, base.until(end, DAYS));
     }
 
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_until_hours(ZonedDateTime base, long expected, ZonedDateTime end) {
-        assertEquals(base.until(end, HOURS), expected);
+        assertEquals(expected, base.until(end, HOURS));
     }
 
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_until_minutes(ZonedDateTime base, long expected, ZonedDateTime end) {
-        assertEquals(base.until(end, MINUTES), expected * 60);
+        assertEquals(expected * 60, base.until(end, MINUTES));
     }
 
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_until_seconds(ZonedDateTime base, long expected, ZonedDateTime end) {
-        assertEquals(base.until(end, SECONDS), expected * 3600);
+        assertEquals(expected * 3600, base.until(end, SECONDS));
     }
 
-    @Test(dataProvider="plusTime")
+    @ParameterizedTest
+    @MethodSource("data_plusTime")
     public void test_until_nanos(ZonedDateTime base, long expected, ZonedDateTime end) {
-        assertEquals(base.until(end, NANOS), expected * 3600_000_000_000L);
+        assertEquals(expected * 3600_000_000_000L, base.until(end, NANOS));
     }
 
     @Test
@@ -2031,13 +2087,13 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         ZonedDateTime oneAm1 = LocalDateTime.of(2012, 6, 29, 1, 0).atZone(ZONE_PARIS);
         ZonedDateTime midnightParis2 = LocalDate.of(2012, 6, 30).atStartOfDay(ZONE_PARIS);
 
-        assertEquals(midnightLondon.until(midnightParis1, HOURS), 23);
-        assertEquals(midnightLondon.until(oneAm1, HOURS), 24);
-        assertEquals(midnightLondon.until(midnightParis2, HOURS), 23 + 24);
+        assertEquals(23, midnightLondon.until(midnightParis1, HOURS));
+        assertEquals(24, midnightLondon.until(oneAm1, HOURS));
+        assertEquals(23 + 24, midnightLondon.until(midnightParis2, HOURS));
 
-        assertEquals(midnightLondon.until(midnightParis1, DAYS), 0);
-        assertEquals(midnightLondon.until(oneAm1, DAYS), 1);
-        assertEquals(midnightLondon.until(midnightParis2, DAYS), 1);
+        assertEquals(0, midnightLondon.until(midnightParis1, DAYS));
+        assertEquals(1, midnightLondon.until(oneAm1, DAYS));
+        assertEquals(1, midnightLondon.until(midnightParis2, DAYS));
     }
 
     @Test
@@ -2045,8 +2101,8 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         ZonedDateTime before = TEST_PARIS_GAP_2008_03_30_02_30.withHour(0).withMinute(0).atZone(ZONE_PARIS);
         ZonedDateTime after = TEST_PARIS_GAP_2008_03_30_02_30.withHour(0).withMinute(0).plusDays(1).atZone(ZONE_PARIS);
 
-        assertEquals(before.until(after, HOURS), 23);
-        assertEquals(before.until(after, DAYS), 1);
+        assertEquals(23, before.until(after, HOURS));
+        assertEquals(1, before.until(after, DAYS));
     }
 
     @Test
@@ -2054,23 +2110,23 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         ZonedDateTime before = TEST_PARIS_OVERLAP_2008_10_26_02_30.withHour(0).withMinute(0).atZone(ZONE_PARIS);
         ZonedDateTime after = TEST_PARIS_OVERLAP_2008_10_26_02_30.withHour(0).withMinute(0).plusDays(1).atZone(ZONE_PARIS);
 
-        assertEquals(before.until(after, HOURS), 25);
-        assertEquals(before.until(after, DAYS), 1);
+        assertEquals(25, before.until(after, HOURS));
+        assertEquals(1, before.until(after, DAYS));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_until_differentType() {
-        TEST_DATE_TIME_PARIS.until(TEST_LOCAL_2008_06_30_11_30_59_500, DAYS);
+        Assertions.assertThrows(DateTimeException.class, () -> TEST_DATE_TIME_PARIS.until(TEST_LOCAL_2008_06_30_11_30_59_500, DAYS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_until_nullTemporal() {
-        TEST_DATE_TIME_PARIS.until(null, DAYS);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_DATE_TIME_PARIS.until(null, DAYS));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_until_nullUnit() {
-        TEST_DATE_TIME_PARIS.until(TEST_DATE_TIME_PARIS, null);
+        Assertions.assertThrows(NullPointerException.class, () -> TEST_DATE_TIME_PARIS.until(TEST_DATE_TIME_PARIS, null));
     }
 
     //-----------------------------------------------------------------------
@@ -2080,12 +2136,12 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     public void test_format_formatter() {
         DateTimeFormatter f = DateTimeFormatter.ofPattern("y M d H m s");
         String t = ZonedDateTime.of(dateTime(2010, 12, 3, 11, 30), ZONE_PARIS).format(f);
-        assertEquals(t, "2010 12 3 11 30 0");
+        assertEquals("2010 12 3 11 30 0", t);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_format_formatter_null() {
-        ZonedDateTime.of(dateTime(2010, 12, 3, 11, 30), ZONE_PARIS).format(null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZonedDateTime.of(dateTime(2010, 12, 3, 11, 30), ZONE_PARIS).format(null));
     }
 
     //-----------------------------------------------------------------------
@@ -2093,13 +2149,12 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     //-----------------------------------------------------------------------
     @Test
     public void test_toOffsetDateTime() {
-        assertEquals(TEST_DATE_TIME.toOffsetDateTime(), OffsetDateTime.of(TEST_DATE_TIME.toLocalDateTime(), TEST_DATE_TIME.getOffset()));
+        assertEquals(OffsetDateTime.of(TEST_DATE_TIME.toLocalDateTime(), TEST_DATE_TIME.getOffset()), TEST_DATE_TIME.toOffsetDateTime());
     }
 
     //-----------------------------------------------------------------------
     // toInstant()
     //-----------------------------------------------------------------------
-    @DataProvider(name="toInstant")
     Object[][] data_toInstant() {
         return new Object[][] {
             {LocalDateTime.of(1970, 1, 1, 0, 0, 0, 0), 0L, 0},
@@ -2113,28 +2168,31 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="toInstant")
+    @ParameterizedTest
+    @MethodSource("data_toInstant")
     public void test_toInstant_UTC(LocalDateTime ldt, long expectedEpSec, int expectedNos) {
         ZonedDateTime dt = ldt.atZone(ZoneOffset.UTC);
         Instant test = dt.toInstant();
-        assertEquals(test.getEpochSecond(), expectedEpSec);
-        assertEquals(test.getNano(), expectedNos);
+        assertEquals(expectedEpSec, test.getEpochSecond());
+        assertEquals(expectedNos, test.getNano());
     }
 
-    @Test(dataProvider="toInstant")
+    @ParameterizedTest
+    @MethodSource("data_toInstant")
     public void test_toInstant_P0100(LocalDateTime ldt, long expectedEpSec, int expectedNos) {
         ZonedDateTime dt = ldt.atZone(ZONE_0100);
         Instant test = dt.toInstant();
-        assertEquals(test.getEpochSecond(), expectedEpSec - 3600);
-        assertEquals(test.getNano(), expectedNos);
+        assertEquals(expectedEpSec - 3600, test.getEpochSecond());
+        assertEquals(expectedNos, test.getNano());
     }
 
-    @Test(dataProvider="toInstant")
+    @ParameterizedTest
+    @MethodSource("data_toInstant")
     public void test_toInstant_M0100(LocalDateTime ldt, long expectedEpSec, int expectedNos) {
         ZonedDateTime dt = ldt.atZone(ZONE_M0100);
         Instant test = dt.toInstant();
-        assertEquals(test.getEpochSecond(), expectedEpSec + 3600);
-        assertEquals(test.getNano(), expectedNos);
+        assertEquals(expectedEpSec + 3600, test.getEpochSecond());
+        assertEquals(expectedNos, test.getNano());
     }
 
     //-----------------------------------------------------------------------
@@ -2145,7 +2203,7 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(1970, 1, 1, 0, 0).plusHours(1);
         for (int i = 0; i < 100000; i++) {
             ZonedDateTime a = ZonedDateTime.of(ldt, ZONE_PARIS);
-            assertEquals(a.toEpochSecond(), i);
+            assertEquals(i, a.toEpochSecond());
             ldt = ldt.plusSeconds(1);
         }
     }
@@ -2155,27 +2213,30 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         LocalDateTime ldt = LocalDateTime.of(1970, 1, 1, 0, 0).plusHours(1);
         for (int i = 0; i < 100000; i++) {
             ZonedDateTime a = ZonedDateTime.of(ldt, ZONE_PARIS);
-            assertEquals(a.toEpochSecond(), -i);
+            assertEquals(-i, a.toEpochSecond());
             ldt = ldt.minusSeconds(1);
         }
     }
 
-    @Test(dataProvider="toInstant")
+    @ParameterizedTest
+    @MethodSource("data_toInstant")
     public void test_toEpochSecond_UTC(LocalDateTime ldt, long expectedEpSec, int expectedNos) {
         ZonedDateTime dt = ldt.atZone(ZoneOffset.UTC);
-        assertEquals(dt.toEpochSecond(), expectedEpSec);
+        assertEquals(expectedEpSec, dt.toEpochSecond());
     }
 
-    @Test(dataProvider="toInstant")
+    @ParameterizedTest
+    @MethodSource("data_toInstant")
     public void test_toEpochSecond_P0100(LocalDateTime ldt, long expectedEpSec, int expectedNos) {
         ZonedDateTime dt = ldt.atZone(ZONE_0100);
-        assertEquals(dt.toEpochSecond(), expectedEpSec - 3600);
+        assertEquals(expectedEpSec - 3600, dt.toEpochSecond());
     }
 
-    @Test(dataProvider="toInstant")
+    @ParameterizedTest
+    @MethodSource("data_toInstant")
     public void test_toEpochSecond_M0100(LocalDateTime ldt, long expectedEpSec, int expectedNos) {
         ZonedDateTime dt = ldt.atZone(ZONE_M0100);
-        assertEquals(dt.toEpochSecond(), expectedEpSec + 3600);
+        assertEquals(expectedEpSec + 3600, dt.toEpochSecond());
     }
 
     //-----------------------------------------------------------------------
@@ -2185,82 +2246,83 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     public void test_compareTo_time1() {
         ZonedDateTime a = ZonedDateTime.of(2008, 6, 30, 11, 30, 39, 0, ZONE_0100);
         ZonedDateTime b = ZonedDateTime.of(2008, 6, 30, 11, 30, 41, 0, ZONE_0100);  // a is before b due to time
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
     }
 
     @Test
     public void test_compareTo_time2() {
         ZonedDateTime a = ZonedDateTime.of(2008, 6, 30, 11, 30, 40, 4, ZONE_0100);
         ZonedDateTime b = ZonedDateTime.of(2008, 6, 30, 11, 30, 40, 5, ZONE_0100);  // a is before b due to time
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
     }
 
     @Test
     public void test_compareTo_offset1() {
         ZonedDateTime a = ZonedDateTime.of(2008, 6, 30, 11, 30, 41, 0, ZONE_0200);
         ZonedDateTime b = ZonedDateTime.of(2008, 6, 30, 11, 30, 39, 0, ZONE_0100);  // a is before b due to offset
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
     }
 
     @Test
     public void test_compareTo_offset2() {
         ZonedDateTime a = ZonedDateTime.of(2008, 6, 30, 11, 30, 40, 5, ZoneId.of("UTC+01:01"));
         ZonedDateTime b = ZonedDateTime.of(2008, 6, 30, 11, 30, 40, 4, ZONE_0100);  // a is before b due to offset
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
     }
 
     @Test
     public void test_compareTo_both() {
         ZonedDateTime a = ZonedDateTime.of(2008, 6, 30, 11, 50, 0, 0, ZONE_0200);
         ZonedDateTime b = ZonedDateTime.of(2008, 6, 30, 11, 20, 0, 0, ZONE_0100);  // a is before b on instant scale
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
     }
 
     @Test
     public void test_compareTo_bothNanos() {
         ZonedDateTime a = ZonedDateTime.of(2008, 6, 30, 11, 20, 40, 5, ZONE_0200);
         ZonedDateTime b = ZonedDateTime.of(2008, 6, 30, 10, 20, 40, 6, ZONE_0100);  // a is before b on instant scale
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
     }
 
     @Test
     public void test_compareTo_hourDifference() {
         ZonedDateTime a = ZonedDateTime.of(2008, 6, 30, 10, 0, 0, 0, ZONE_0100);
         ZonedDateTime b = ZonedDateTime.of(2008, 6, 30, 11, 0, 0, 0, ZONE_0200);  // a is before b despite being same time-line time
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_compareTo_null() {
-        ZonedDateTime a = ZonedDateTime.of(2008, 6, 30, 23, 30, 59, 0, ZONE_0100);
-        a.compareTo(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            ZonedDateTime a = ZonedDateTime.of(2008, 6, 30, 23, 30, 59, 0, ZONE_0100);
+            a.compareTo(null);
+        });
     }
 
     //-----------------------------------------------------------------------
     // isBefore()
     //-----------------------------------------------------------------------
-    @DataProvider(name="IsBefore")
     Object[][] data_isBefore() {
         return new Object[][] {
             {11, 30, ZONE_0100, 11, 31, ZONE_0100, true}, // a is before b due to time
@@ -2269,26 +2331,28 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="IsBefore")
+    @ParameterizedTest
+    @MethodSource("data_isBefore")
     public void test_isBefore(int hour1, int minute1, ZoneId zone1, int hour2, int minute2, ZoneId zone2, boolean expected) {
         ZonedDateTime a = ZonedDateTime.of(2008, 6, 30, hour1, minute1, 0, 0, zone1);
         ZonedDateTime b = ZonedDateTime.of(2008, 6, 30, hour2, minute2, 0, 0, zone2);
-        assertEquals(a.isBefore(b), expected);
-        assertEquals(b.isBefore(a), false);
-        assertEquals(a.isBefore(a), false);
-        assertEquals(b.isBefore(b), false);
+        assertEquals(expected, a.isBefore(b));
+        assertEquals(false, b.isBefore(a));
+        assertEquals(false, a.isBefore(a));
+        assertEquals(false, b.isBefore(b));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isBefore_null() {
-        ZonedDateTime a = ZonedDateTime.of(2008, 6, 30, 23, 30, 59, 0, ZONE_0100);
-        a.isBefore(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            ZonedDateTime a = ZonedDateTime.of(2008, 6, 30, 23, 30, 59, 0, ZONE_0100);
+            a.isBefore(null);
+        });
     }
 
     //-----------------------------------------------------------------------
     // isAfter()
     //-----------------------------------------------------------------------
-    @DataProvider(name="IsAfter")
     Object[][] data_isAfter() {
         return new Object[][] {
             {11, 31, ZONE_0100, 11, 30, ZONE_0100, true}, // a is after b due to time
@@ -2297,87 +2361,96 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="IsAfter")
+    @ParameterizedTest
+    @MethodSource("data_isAfter")
     public void test_isAfter(int hour1, int minute1, ZoneId zone1, int hour2, int minute2, ZoneId zone2, boolean expected) {
         ZonedDateTime a = ZonedDateTime.of(2008, 6, 30, hour1, minute1, 0, 0, zone1);
         ZonedDateTime b = ZonedDateTime.of(2008, 6, 30, hour2, minute2, 0, 0, zone2);
-        assertEquals(a.isAfter(b), expected);
-        assertEquals(b.isAfter(a), false);
-        assertEquals(a.isAfter(a), false);
-        assertEquals(b.isAfter(b), false);
+        assertEquals(expected, a.isAfter(b));
+        assertEquals(false, b.isAfter(a));
+        assertEquals(false, a.isAfter(a));
+        assertEquals(false, b.isAfter(b));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_isAfter_null() {
-        ZonedDateTime a = ZonedDateTime.of(2008, 6, 30, 23, 30, 59, 0, ZONE_0100);
-        a.isAfter(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            ZonedDateTime a = ZonedDateTime.of(2008, 6, 30, 23, 30, 59, 0, ZONE_0100);
+            a.isAfter(null);
+        });
     }
 
     //-----------------------------------------------------------------------
     // equals() / hashCode()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_true(int y, int o, int d, int h, int m, int s, int n, ZoneId ignored) {
         ZonedDateTime a = ZonedDateTime.of(dateTime(y, o, d, h, m, s, n), ZONE_0100);
         ZonedDateTime b = ZonedDateTime.of(dateTime(y, o, d, h, m, s, n), ZONE_0100);
-        assertEquals(a.equals(b), true);
-        assertEquals(a.hashCode() == b.hashCode(), true);
+        assertEquals(true, a.equals(b));
+        assertEquals(true, a.hashCode() == b.hashCode());
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_year_differs(int y, int o, int d, int h, int m, int s, int n, ZoneId ignored) {
         ZonedDateTime a = ZonedDateTime.of(dateTime(y, o, d, h, m, s, n), ZONE_0100);
         ZonedDateTime b = ZonedDateTime.of(dateTime(y + 1, o, d, h, m, s, n), ZONE_0100);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_hour_differs(int y, int o, int d, int h, int m, int s, int n, ZoneId ignored) {
         h = (h == 23 ? 22 : h);
         ZonedDateTime a = ZonedDateTime.of(dateTime(y, o, d, h, m, s, n), ZONE_0100);
         ZonedDateTime b = ZonedDateTime.of(dateTime(y, o, d, h + 1, m, s, n), ZONE_0100);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_minute_differs(int y, int o, int d, int h, int m, int s, int n, ZoneId ignored) {
         m = (m == 59 ? 58 : m);
         ZonedDateTime a = ZonedDateTime.of(dateTime(y, o, d, h, m, s, n), ZONE_0100);
         ZonedDateTime b = ZonedDateTime.of(dateTime(y, o, d, h, m + 1, s, n), ZONE_0100);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_second_differs(int y, int o, int d, int h, int m, int s, int n, ZoneId ignored) {
         s = (s == 59 ? 58 : s);
         ZonedDateTime a = ZonedDateTime.of(dateTime(y, o, d, h, m, s, n), ZONE_0100);
         ZonedDateTime b = ZonedDateTime.of(dateTime(y, o, d, h, m, s + 1, n), ZONE_0100);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_nano_differs(int y, int o, int d, int h, int m, int s, int n, ZoneId ignored) {
         n = (n == 999999999 ? 999999998 : n);
         ZonedDateTime a = ZonedDateTime.of(dateTime(y, o, d, h, m, s, n), ZONE_0100);
         ZonedDateTime b = ZonedDateTime.of(dateTime(y, o, d, h, m, s, n + 1), ZONE_0100);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_equals_false_offset_differs(int y, int o, int d, int h, int m, int s, int n, ZoneId ignored) {
         ZonedDateTime a = ZonedDateTime.of(dateTime(y, o, d, h, m, s, n), ZONE_0100);
         ZonedDateTime b = ZonedDateTime.of(dateTime(y, o, d, h, m, s, n), ZONE_0200);
-        assertEquals(a.equals(b), false);
+        assertEquals(false, a.equals(b));
     }
 
     @Test
     public void test_equals_itself_true() {
-        assertEquals(TEST_DATE_TIME.equals(TEST_DATE_TIME), true);
+        assertEquals(true, TEST_DATE_TIME.equals(TEST_DATE_TIME));
     }
 
     @Test
     public void test_equals_string_false() {
-        assertEquals(TEST_DATE_TIME.equals("2007-07-15"), false);
+        assertEquals(false, TEST_DATE_TIME.equals("2007-07-15"));
     }
 
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleToString")
     Object[][] provider_sampleToString() {
         return new Object[][] {
             {2008, 6, 30, 11, 30, 59, 0, "Z", "2008-06-30T11:30:59Z"},
@@ -2394,11 +2467,12 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="sampleToString")
+    @ParameterizedTest
+    @MethodSource("provider_sampleToString")
     public void test_toString(int y, int o, int d, int h, int m, int s, int n, String zoneId, String expected) {
         ZonedDateTime t = ZonedDateTime.of(dateTime(y, o, d, h, m, s, n), ZoneId.of(zoneId));
         String str = t.toString();
-        assertEquals(str, expected);
+        assertEquals(expected, str);
     }
 
     //-------------------------------------------------------------------------
diff --git a/test/jdk/java/time/tck/java/time/TestIsoChronology.java b/test/jdk/java/time/tck/java/time/TestIsoChronology.java
index 5b1a5c67cf3..cac5a67bd09 100644
--- a/test/jdk/java/time/tck/java/time/TestIsoChronology.java
+++ b/test/jdk/java/time/tck/java/time/TestIsoChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,10 +64,11 @@ import static java.time.chrono.IsoEra.CE;
 import static java.time.temporal.ChronoField.ERA;
 import static java.time.temporal.ChronoField.YEAR;
 import static java.time.temporal.ChronoField.YEAR_OF_ERA;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.DateTimeException;
 import java.time.LocalDate;
@@ -82,14 +83,16 @@ import java.time.chrono.IsoEra;
 import java.time.temporal.ChronoField;
 import java.time.temporal.TemporalAdjusters;
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestIsoChronology {
 
     //-----------------------------------------------------------------------
@@ -99,10 +102,10 @@ public class TestIsoChronology {
     public void test_chrono_byName() {
         Chronology c = IsoChronology.INSTANCE;
         Chronology test = Chronology.of("ISO");
-        Assert.assertNotNull(test, "The ISO calendar could not be found byName");
-        Assert.assertEquals(test.getId(), "ISO", "ID mismatch");
-        Assert.assertEquals(test.getCalendarType(), "iso8601", "Type mismatch");
-        Assert.assertEquals(test, c);
+        assertNotNull(test, "The ISO calendar could not be found byName");
+        assertEquals("ISO", test.getId(), "ID mismatch");
+        assertEquals("iso8601", test.getCalendarType(), "Type mismatch");
+        assertEquals(c, test);
     }
 
     //-----------------------------------------------------------------------
@@ -118,14 +121,13 @@ public class TestIsoChronology {
     //-----------------------------------------------------------------------
     @Test
     public void test_eraOf() {
-        assertEquals(IsoChronology.INSTANCE.eraOf(0), BCE);
-        assertEquals(IsoChronology.INSTANCE.eraOf(1), CE);
+        assertEquals(BCE, IsoChronology.INSTANCE.eraOf(0));
+        assertEquals(CE, IsoChronology.INSTANCE.eraOf(1));
     }
 
     //-----------------------------------------------------------------------
     // creation, toLocalDate()
     //-----------------------------------------------------------------------
-    @DataProvider(name="samples")
     Object[][] data_samples() {
         return new Object[][] {
             {IsoChronology.INSTANCE.date(1, 7, 8), LocalDate.of(1, 7, 8)},
@@ -145,17 +147,18 @@ public class TestIsoChronology {
         };
     }
 
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_toLocalDate(LocalDate isoDate, LocalDate iso) {
-        assertEquals(LocalDate.from(isoDate), iso);
+        assertEquals(iso, LocalDate.from(isoDate));
     }
 
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_fromCalendrical(LocalDate isoDate, LocalDate iso) {
-        assertEquals(IsoChronology.INSTANCE.date(iso), isoDate);
+        assertEquals(isoDate, IsoChronology.INSTANCE.date(iso));
     }
 
-    @DataProvider(name="badDates")
     Object[][] data_badDates() {
         return new Object[][] {
             {2012, 0, 0},
@@ -175,9 +178,10 @@ public class TestIsoChronology {
         };
     }
 
-    @Test(dataProvider="badDates", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_badDates")
     public void test_badDates(int year, int month, int dom) {
-        IsoChronology.INSTANCE.date(year, month, dom);
+        Assertions.assertThrows(DateTimeException.class, () -> IsoChronology.INSTANCE.date(year, month, dom));
     }
 
     @Test
@@ -186,20 +190,20 @@ public class TestIsoChronology {
         int month = 5;
         int dayOfMonth = 5;
         LocalDate test = IsoChronology.INSTANCE.date(IsoEra.BCE, year, month, dayOfMonth);
-        assertEquals(test.getEra(), IsoEra.BCE);
-        assertEquals(test.get(ChronoField.YEAR_OF_ERA), year);
-        assertEquals(test.get(ChronoField.MONTH_OF_YEAR), month);
-        assertEquals(test.get(ChronoField.DAY_OF_MONTH), dayOfMonth);
+        assertEquals(IsoEra.BCE, test.getEra());
+        assertEquals(year, test.get(ChronoField.YEAR_OF_ERA));
+        assertEquals(month, test.get(ChronoField.MONTH_OF_YEAR));
+        assertEquals(dayOfMonth, test.get(ChronoField.DAY_OF_MONTH));
 
-        assertEquals(test.get(YEAR), 1 + (-1 * year));
-        assertEquals(test.get(ERA), 0);
-        assertEquals(test.get(YEAR_OF_ERA), year);
+        assertEquals(1 + (-1 * year), test.get(YEAR));
+        assertEquals(0, test.get(ERA));
+        assertEquals(year, test.get(YEAR_OF_ERA));
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    @Test(expectedExceptions=ClassCastException.class)
+    @Test
     public void test_date_withEra_withWrongEra() {
-        IsoChronology.INSTANCE.date((Era) HijrahEra.AH, 1, 1, 1);
+        Assertions.assertThrows(ClassCastException.class, () -> IsoChronology.INSTANCE.date((Era) HijrahEra.AH, 1, 1, 1));
     }
 
     //-----------------------------------------------------------------------
@@ -209,14 +213,14 @@ public class TestIsoChronology {
     public void test_adjust1() {
         LocalDate base = IsoChronology.INSTANCE.date(1728, 10, 28);
         LocalDate test = base.with(TemporalAdjusters.lastDayOfMonth());
-        assertEquals(test, IsoChronology.INSTANCE.date(1728, 10, 31));
+        assertEquals(IsoChronology.INSTANCE.date(1728, 10, 31), test);
     }
 
     @Test
     public void test_adjust2() {
         LocalDate base = IsoChronology.INSTANCE.date(1728, 12, 2);
         LocalDate test = base.with(TemporalAdjusters.lastDayOfMonth());
-        assertEquals(test, IsoChronology.INSTANCE.date(1728, 12, 31));
+        assertEquals(IsoChronology.INSTANCE.date(1728, 12, 31), test);
     }
 
     //-----------------------------------------------------------------------
@@ -226,13 +230,13 @@ public class TestIsoChronology {
     public void test_adjust_toLocalDate() {
         LocalDate isoDate = IsoChronology.INSTANCE.date(1726, 1, 4);
         LocalDate test = isoDate.with(LocalDate.of(2012, 7, 6));
-        assertEquals(test, IsoChronology.INSTANCE.date(2012, 7, 6));
+        assertEquals(IsoChronology.INSTANCE.date(2012, 7, 6), test);
     }
 
     @Test
     public void test_adjust_toMonth() {
         LocalDate isoDate = IsoChronology.INSTANCE.date(1726, 1, 4);
-        assertEquals(IsoChronology.INSTANCE.date(1726, 4, 4), isoDate.with(Month.APRIL));
+        assertEquals(isoDate.with(Month.APRIL), IsoChronology.INSTANCE.date(1726, 4, 4));
     }
 
     //-----------------------------------------------------------------------
@@ -242,20 +246,19 @@ public class TestIsoChronology {
     public void test_LocalDate_adjustToISODate() {
         LocalDate isoDate = IsoChronology.INSTANCE.date(1728, 10, 29);
         LocalDate test = LocalDate.MIN.with(isoDate);
-        assertEquals(test, LocalDate.of(1728, 10, 29));
+        assertEquals(LocalDate.of(1728, 10, 29), test);
     }
 
     @Test
     public void test_LocalDateTime_adjustToISODate() {
         LocalDate isoDate = IsoChronology.INSTANCE.date(1728, 10, 29);
         LocalDateTime test = LocalDateTime.MIN.with(isoDate);
-        assertEquals(test, LocalDateTime.of(1728, 10, 29, 0, 0));
+        assertEquals(LocalDateTime.of(1728, 10, 29, 0, 0), test);
     }
 
     //-----------------------------------------------------------------------
     // isLeapYear()
     //-----------------------------------------------------------------------
-    @DataProvider(name="leapYears")
     Object[][] leapYearInformation() {
         return new Object[][] {
                 {2000, true},
@@ -267,9 +270,10 @@ public class TestIsoChronology {
         };
     }
 
-    @Test(dataProvider="leapYears")
+    @ParameterizedTest
+    @MethodSource("leapYearInformation")
     public void test_isLeapYear(int year, boolean isLeapYear) {
-        assertEquals(IsoChronology.INSTANCE.isLeapYear(year), isLeapYear);
+        assertEquals(isLeapYear, IsoChronology.INSTANCE.isLeapYear(year));
     }
 
     //-----------------------------------------------------------------------
@@ -277,13 +281,12 @@ public class TestIsoChronology {
     //-----------------------------------------------------------------------
     @Test
     public void test_now() {
-        assertEquals(LocalDate.from(IsoChronology.INSTANCE.dateNow()), LocalDate.now());
+        assertEquals(LocalDate.now(), LocalDate.from(IsoChronology.INSTANCE.dateNow()));
     }
 
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
-    @DataProvider(name="toString")
     Object[][] data_toString() {
         return new Object[][] {
             {IsoChronology.INSTANCE.date(1, 1, 1), "0001-01-01"},
@@ -294,9 +297,10 @@ public class TestIsoChronology {
         };
     }
 
-    @Test(dataProvider="toString")
+    @ParameterizedTest
+    @MethodSource("data_toString")
     public void test_toString(LocalDate isoDate, String expected) {
-        assertEquals(isoDate.toString(), expected);
+        assertEquals(expected, isoDate.toString());
     }
 
     //-----------------------------------------------------------------------
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKChronoLocalDate.java b/test/jdk/java/time/tck/java/time/chrono/TCKChronoLocalDate.java
index eb1ccebc0c2..b4c488d2e11 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKChronoLocalDate.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKChronoLocalDate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,8 +54,8 @@
  */
 package tck.java.time.chrono;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -85,20 +85,21 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test assertions that must be true for all built-in chronologies.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKChronoLocalDate {
 
     //-----------------------------------------------------------------------
     // regular data factory for names and descriptions of available calendars
     //-----------------------------------------------------------------------
-    @DataProvider(name = "calendars")
     Chronology[][] data_of_calendars() {
         return new Chronology[][]{
                     {HijrahChronology.INSTANCE},
@@ -108,7 +109,8 @@ public class TCKChronoLocalDate {
                     {ThaiBuddhistChronology.INSTANCE}};
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badWithAdjusterChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoLocalDate date = chrono.date(refDate);
@@ -119,19 +121,20 @@ public class TCKChronoLocalDate {
             if (chrono != chrono2) {
                 try {
                     date.with(adjuster);
-                    Assert.fail("WithAdjuster should have thrown a ClassCastException");
+                    Assertions.fail("WithAdjuster should have thrown a ClassCastException");
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
                 }
             } else {
                 // Same chronology,
                 ChronoLocalDate result = date.with(adjuster);
-                assertEquals(result, date2, "WithAdjuster failed to replace date");
+                assertEquals(date2, result, "WithAdjuster failed to replace date");
             }
         }
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badPlusAdjusterChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoLocalDate date = chrono.date(refDate);
@@ -142,19 +145,20 @@ public class TCKChronoLocalDate {
             if (chrono != chrono2) {
                 try {
                     date.plus(adjuster);
-                    Assert.fail("WithAdjuster should have thrown a ClassCastException");
+                    Assertions.fail("WithAdjuster should have thrown a ClassCastException");
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
                 }
             } else {
                 // Same chronology,
                 ChronoLocalDate result = date.plus(adjuster);
-                assertEquals(result, date2, "WithAdjuster failed to replace date");
+                assertEquals(date2, result, "WithAdjuster failed to replace date");
             }
         }
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badMinusAdjusterChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoLocalDate date = chrono.date(refDate);
@@ -165,19 +169,20 @@ public class TCKChronoLocalDate {
             if (chrono != chrono2) {
                 try {
                     date.minus(adjuster);
-                    Assert.fail("WithAdjuster should have thrown a ClassCastException");
+                    Assertions.fail("WithAdjuster should have thrown a ClassCastException");
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
                 }
             } else {
                 // Same chronology,
                 ChronoLocalDate result = date.minus(adjuster);
-                assertEquals(result, date2, "WithAdjuster failed to replace date");
+                assertEquals(date2, result, "WithAdjuster failed to replace date");
             }
         }
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badPlusTemporalUnitChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoLocalDate date = chrono.date(refDate);
@@ -188,7 +193,7 @@ public class TCKChronoLocalDate {
             if (chrono != chrono2) {
                 try {
                     date.plus(1, adjuster);
-                    Assert.fail("TemporalUnit.doAdd plus should have thrown a ClassCastException" + date.getClass()
+                    Assertions.fail("TemporalUnit.doAdd plus should have thrown a ClassCastException" + date.getClass()
                             + ", can not be cast to " + date2.getClass());
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
@@ -196,12 +201,13 @@ public class TCKChronoLocalDate {
             } else {
                 // Same chronology,
                 ChronoLocalDate result = date.plus(1, adjuster);
-                assertEquals(result, date2, "WithAdjuster failed to replace date");
+                assertEquals(date2, result, "WithAdjuster failed to replace date");
             }
         }
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badMinusTemporalUnitChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoLocalDate date = chrono.date(refDate);
@@ -212,7 +218,7 @@ public class TCKChronoLocalDate {
             if (chrono != chrono2) {
                 try {
                     date.minus(1, adjuster);
-                    Assert.fail("TemporalUnit.doAdd minus should have thrown a ClassCastException" + date.getClass()
+                    Assertions.fail("TemporalUnit.doAdd minus should have thrown a ClassCastException" + date.getClass()
                             + ", can not be cast to " + date2.getClass());
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
@@ -220,12 +226,13 @@ public class TCKChronoLocalDate {
             } else {
                 // Same chronology,
                 ChronoLocalDate result = date.minus(1, adjuster);
-                assertEquals(result, date2, "WithAdjuster failed to replace date");
+                assertEquals(date2, result, "WithAdjuster failed to replace date");
             }
         }
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badTemporalFieldChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoLocalDate date = chrono.date(refDate);
@@ -236,7 +243,7 @@ public class TCKChronoLocalDate {
             if (chrono != chrono2) {
                 try {
                     date.with(adjuster, 1);
-                    Assert.fail("TemporalField doSet should have thrown a ClassCastException" + date.getClass()
+                    Assertions.fail("TemporalField doSet should have thrown a ClassCastException" + date.getClass()
                             + ", can not be cast to " + date2.getClass());
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
@@ -244,7 +251,7 @@ public class TCKChronoLocalDate {
             } else {
                 // Same chronology,
                 ChronoLocalDate result = date.with(adjuster, 1);
-                assertEquals(result, date2, "TemporalField doSet failed to replace date");
+                assertEquals(date2, result, "TemporalField doSet failed to replace date");
             }
         }
     }
@@ -252,7 +259,8 @@ public class TCKChronoLocalDate {
     //-----------------------------------------------------------------------
     // isBefore, isAfter, isEqual, DATE_COMPARATOR
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_date_comparisons(Chronology chrono) {
         List<ChronoLocalDate> dates = new ArrayList<>();
 
@@ -285,19 +293,19 @@ public class TCKChronoLocalDate {
                     int cmp = ChronoLocalDate.timeLineOrder().compare(a, b);
                     if (i < j) {
                         assertTrue(cmp < 0, a + " compare " + b);
-                        assertEquals(a.isBefore(b), true, a + " isBefore " + b);
-                        assertEquals(a.isAfter(b), false, a + " isAfter " + b);
-                        assertEquals(a.isEqual(b), false, a + " isEqual " + b);
+                        assertEquals(true, a.isBefore(b), a + " isBefore " + b);
+                        assertEquals(false, a.isAfter(b), a + " isAfter " + b);
+                        assertEquals(false, a.isEqual(b), a + " isEqual " + b);
                     } else if (i > j) {
                         assertTrue(cmp > 0, a + " compare " + b);
-                        assertEquals(a.isBefore(b), false, a + " isBefore " + b);
-                        assertEquals(a.isAfter(b), true, a + " isAfter " + b);
-                        assertEquals(a.isEqual(b), false, a + " isEqual " + b);
+                        assertEquals(false, a.isBefore(b), a + " isBefore " + b);
+                        assertEquals(true, a.isAfter(b), a + " isAfter " + b);
+                        assertEquals(false, a.isEqual(b), a + " isEqual " + b);
                     } else {
                         assertTrue(cmp == 0, a + " compare " + b);
-                        assertEquals(a.isBefore(b), false, a + " isBefore " + b);
-                        assertEquals(a.isAfter(b), false, a + " isAfter " + b);
-                        assertEquals(a.isEqual(b), true, a + " isEqual " + b);
+                        assertEquals(false, a.isBefore(b), a + " isBefore " + b);
+                        assertEquals(false, a.isAfter(b), a + " isAfter " + b);
+                        assertEquals(true, a.isEqual(b), a + " isEqual " + b);
                     }
                 }
             }
@@ -306,26 +314,27 @@ public class TCKChronoLocalDate {
 
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_from_TemporalAccessor(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoLocalDate date = chrono.date(refDate);
         ChronoLocalDate test1 = ChronoLocalDate.from(date);
-        assertEquals(test1, date);
+        assertEquals(date, test1);
         ChronoLocalDate test2 = ChronoLocalDate.from(date.atTime(LocalTime.of(12, 30)));
-        assertEquals(test2, date);
+        assertEquals(date, test2);
         ChronoLocalDate test3 = ChronoLocalDate.from(date.atTime(LocalTime.of(12, 30)).atZone(ZoneOffset.UTC));
-        assertEquals(test3, date);
+        assertEquals(date, test3);
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_from_TemporalAccessor_timeOnly() {
-        ChronoLocalDate.from(LocalTime.of(12, 30));
+        Assertions.assertThrows(DateTimeException.class, () -> ChronoLocalDate.from(LocalTime.of(12, 30)));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_from_TemporalAccessor_null() {
-        ChronoLocalDate.from(null);
+        Assertions.assertThrows(NullPointerException.class, () -> ChronoLocalDate.from(null));
     }
 
     //-----------------------------------------------------------------------
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKChronoLocalDateTime.java b/test/jdk/java/time/tck/java/time/chrono/TCKChronoLocalDateTime.java
index 6a3c6a62e08..32cd7e5ab52 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKChronoLocalDateTime.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKChronoLocalDateTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,8 +54,8 @@
  */
 package tck.java.time.chrono;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -85,20 +85,21 @@ import java.time.temporal.ValueRange;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test assertions that must be true for all built-in chronologies.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKChronoLocalDateTime {
 
     //-----------------------------------------------------------------------
     // regular data factory for names and descriptions of available calendars
     //-----------------------------------------------------------------------
-    @DataProvider(name = "calendars")
     Chronology[][] data_of_calendars() {
         return new Chronology[][]{
                     {HijrahChronology.INSTANCE},
@@ -108,7 +109,8 @@ public class TCKChronoLocalDateTime {
                     {ThaiBuddhistChronology.INSTANCE}};
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badWithAdjusterChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoLocalDateTime<?> cdt = chrono.date(refDate).atTime(LocalTime.NOON);
@@ -119,7 +121,7 @@ public class TCKChronoLocalDateTime {
             if (chrono != chrono2) {
                 try {
                     cdt.with(adjuster);
-                    Assert.fail("WithAdjuster should have thrown a ClassCastException, "
+                    Assertions.fail("WithAdjuster should have thrown a ClassCastException, "
                             + "required: " + cdt + ", supplied: " + cdt2);
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
@@ -127,12 +129,13 @@ public class TCKChronoLocalDateTime {
             } else {
                 // Same chronology,
                 ChronoLocalDateTime<?> result = cdt.with(adjuster);
-                assertEquals(result, cdt2, "WithAdjuster failed to replace date");
+                assertEquals(cdt2, result, "WithAdjuster failed to replace date");
             }
         }
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badPlusAdjusterChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoLocalDateTime<?> cdt = chrono.date(refDate).atTime(LocalTime.NOON);
@@ -143,7 +146,7 @@ public class TCKChronoLocalDateTime {
             if (chrono != chrono2) {
                 try {
                     cdt.plus(adjuster);
-                    Assert.fail("WithAdjuster should have thrown a ClassCastException, "
+                    Assertions.fail("WithAdjuster should have thrown a ClassCastException, "
                             + "required: " + cdt + ", supplied: " + cdt2);
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
@@ -151,12 +154,13 @@ public class TCKChronoLocalDateTime {
             } else {
                 // Same chronology,
                 ChronoLocalDateTime<?> result = cdt.plus(adjuster);
-                assertEquals(result, cdt2, "WithAdjuster failed to replace date time");
+                assertEquals(cdt2, result, "WithAdjuster failed to replace date time");
             }
         }
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badMinusAdjusterChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoLocalDateTime<?> cdt = chrono.date(refDate).atTime(LocalTime.NOON);
@@ -167,7 +171,7 @@ public class TCKChronoLocalDateTime {
             if (chrono != chrono2) {
                 try {
                     cdt.minus(adjuster);
-                    Assert.fail("WithAdjuster should have thrown a ClassCastException, "
+                    Assertions.fail("WithAdjuster should have thrown a ClassCastException, "
                             + "required: " + cdt + ", supplied: " + cdt2);
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
@@ -175,12 +179,13 @@ public class TCKChronoLocalDateTime {
             } else {
                 // Same chronology,
                 ChronoLocalDateTime<?> result = cdt.minus(adjuster);
-                assertEquals(result, cdt2, "WithAdjuster failed to replace date");
+                assertEquals(cdt2, result, "WithAdjuster failed to replace date");
             }
         }
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badPlusTemporalUnitChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoLocalDateTime<?> cdt = chrono.date(refDate).atTime(LocalTime.NOON);
@@ -191,7 +196,7 @@ public class TCKChronoLocalDateTime {
             if (chrono != chrono2) {
                 try {
                     cdt.plus(1, adjuster);
-                    Assert.fail("TemporalUnit.doPlus plus should have thrown a ClassCastException" + cdt
+                    Assertions.fail("TemporalUnit.doPlus plus should have thrown a ClassCastException" + cdt
                             + ", can not be cast to " + cdt2);
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
@@ -199,12 +204,13 @@ public class TCKChronoLocalDateTime {
             } else {
                 // Same chronology,
                 ChronoLocalDateTime<?> result = cdt.plus(1, adjuster);
-                assertEquals(result, cdt2, "WithAdjuster failed to replace date");
+                assertEquals(cdt2, result, "WithAdjuster failed to replace date");
             }
         }
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badMinusTemporalUnitChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoLocalDateTime<?> cdt = chrono.date(refDate).atTime(LocalTime.NOON);
@@ -215,7 +221,7 @@ public class TCKChronoLocalDateTime {
             if (chrono != chrono2) {
                 try {
                     cdt.minus(1, adjuster);
-                    Assert.fail("TemporalUnit.doPlus minus should have thrown a ClassCastException" + cdt.getClass()
+                    Assertions.fail("TemporalUnit.doPlus minus should have thrown a ClassCastException" + cdt.getClass()
                             + ", can not be cast to " + cdt2.getClass());
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
@@ -223,12 +229,13 @@ public class TCKChronoLocalDateTime {
             } else {
                 // Same chronology,
                 ChronoLocalDateTime<?> result = cdt.minus(1, adjuster);
-                assertEquals(result, cdt2, "WithAdjuster failed to replace date");
+                assertEquals(cdt2, result, "WithAdjuster failed to replace date");
             }
         }
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badTemporalFieldChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoLocalDateTime<?> cdt = chrono.date(refDate).atTime(LocalTime.NOON);
@@ -239,7 +246,7 @@ public class TCKChronoLocalDateTime {
             if (chrono != chrono2) {
                 try {
                     cdt.with(adjuster, 1);
-                    Assert.fail("TemporalField doWith() should have thrown a ClassCastException" + cdt.getClass()
+                    Assertions.fail("TemporalField doWith() should have thrown a ClassCastException" + cdt.getClass()
                             + ", can not be cast to " + cdt2.getClass());
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
@@ -247,7 +254,7 @@ public class TCKChronoLocalDateTime {
             } else {
                 // Same chronology,
                 ChronoLocalDateTime<?> result = cdt.with(adjuster, 1);
-                assertEquals(result, cdt2, "TemporalField doWith() failed to replace date");
+                assertEquals(cdt2, result, "TemporalField doWith() failed to replace date");
             }
         }
     }
@@ -255,7 +262,8 @@ public class TCKChronoLocalDateTime {
     //-----------------------------------------------------------------------
     // isBefore, isAfter, isEqual
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_datetime_comparisons(Chronology chrono) {
         List<ChronoLocalDateTime<?>> dates = new ArrayList<>();
 
@@ -296,19 +304,19 @@ public class TCKChronoLocalDateTime {
                     int cmp = ChronoLocalDateTime.timeLineOrder().compare(a, b);
                     if (i < j) {
                         assertTrue(cmp < 0, a + " compare " + b);
-                        assertEquals(a.isBefore(b), true, a + " isBefore " + b);
-                        assertEquals(a.isAfter(b), false, a + " isAfter " + b);
-                        assertEquals(a.isEqual(b), false, a + " isEqual " + b);
+                        assertEquals(true, a.isBefore(b), a + " isBefore " + b);
+                        assertEquals(false, a.isAfter(b), a + " isAfter " + b);
+                        assertEquals(false, a.isEqual(b), a + " isEqual " + b);
                     } else if (i > j) {
                         assertTrue(cmp > 0, a + " compare " + b);
-                        assertEquals(a.isBefore(b), false, a + " isBefore " + b);
-                        assertEquals(a.isAfter(b), true, a + " isAfter " + b);
-                        assertEquals(a.isEqual(b), false, a + " isEqual " + b);
+                        assertEquals(false, a.isBefore(b), a + " isBefore " + b);
+                        assertEquals(true, a.isAfter(b), a + " isAfter " + b);
+                        assertEquals(false, a.isEqual(b), a + " isEqual " + b);
                     } else {
                         assertTrue(cmp == 0, a + " compare " + b);
-                        assertEquals(a.isBefore(b), false, a + " isBefore " + b);
-                        assertEquals(a.isAfter(b), false, a + " isAfter " + b);
-                        assertEquals(a.isEqual(b), true, a + " isEqual " + b);
+                        assertEquals(false, a.isBefore(b), a + " isBefore " + b);
+                        assertEquals(false, a.isAfter(b), a + " isAfter " + b);
+                        assertEquals(true, a.isEqual(b), a + " isEqual " + b);
                     }
                 }
             }
@@ -316,36 +324,38 @@ public class TCKChronoLocalDateTime {
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_from_TemporalAccessor(Chronology chrono) {
         LocalDateTime refDateTime = LocalDateTime.of(2013, 1, 1, 12, 30);
         ChronoLocalDateTime<?> dateTime = chrono.localDateTime(refDateTime);
         ChronoLocalDateTime<?> test1 = ChronoLocalDateTime.from(dateTime);
-        assertEquals(test1, dateTime);
+        assertEquals(dateTime, test1);
         ChronoLocalDateTime<?> test2 = ChronoLocalDateTime.from(dateTime.atZone(ZoneOffset.UTC));
-        assertEquals(test2, dateTime);
+        assertEquals(dateTime, test2);
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_from_TemporalAccessor_dateOnly() {
-        ChronoLocalDateTime.from(LocalDate.of(2013, 1, 1));
+        Assertions.assertThrows(DateTimeException.class, () -> ChronoLocalDateTime.from(LocalDate.of(2013, 1, 1)));
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_from_TemporalAccessor_timeOnly() {
-        ChronoLocalDateTime.from(LocalTime.of(12, 30));
+        Assertions.assertThrows(DateTimeException.class, () -> ChronoLocalDateTime.from(LocalTime.of(12, 30)));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_from_TemporalAccessor_null() {
-        ChronoLocalDateTime.from(null);
+        Assertions.assertThrows(NullPointerException.class, () -> ChronoLocalDateTime.from(null));
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_getChronology(Chronology chrono) {
         ChronoLocalDateTime<?> test = chrono.localDateTime(LocalDateTime.of(2010, 6, 30, 11, 30));
-        assertEquals(test.getChronology(), chrono);
+        assertEquals(chrono, test.getChronology());
     }
 
     //-----------------------------------------------------------------------
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKChronoPeriod.java b/test/jdk/java/time/tck/java/time/chrono/TCKChronoPeriod.java
index 3fbc4d02bee..e54d669c8ff 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKChronoPeriod.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKChronoPeriod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,8 @@ import static java.time.temporal.ChronoUnit.DAYS;
 import static java.time.temporal.ChronoUnit.HOURS;
 import static java.time.temporal.ChronoUnit.MONTHS;
 import static java.time.temporal.ChronoUnit.YEARS;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -78,16 +79,17 @@ import java.time.chrono.ThaiBuddhistChronology;
 import java.time.temporal.Temporal;
 import java.time.temporal.UnsupportedTemporalTypeException;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKChronoPeriod {
 
     //-----------------------------------------------------------------------
     // regular data factory for names and descriptions of available calendars
     //-----------------------------------------------------------------------
-    @DataProvider(name = "calendars")
     Chronology[][] data_of_calendars() {
         return new Chronology[][]{
                     {HijrahChronology.INSTANCE},
@@ -100,7 +102,8 @@ public class TCKChronoPeriod {
     //-----------------------------------------------------------------------
     // Test Serialization of Calendars
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_serialization(Chronology chrono) throws Exception {
         ChronoPeriod period = chrono.period(1, 2, 3);
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -111,167 +114,195 @@ public class TCKChronoPeriod {
 
         ObjectInputStream in = new ObjectInputStream(bais);
         ChronoPeriod ser = (ChronoPeriod) in.readObject();
-        assertEquals(ser, period, "deserialized ChronoPeriod is wrong");
+        assertEquals(period, ser, "deserialized ChronoPeriod is wrong");
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_get(Chronology chrono) {
         ChronoPeriod period = chrono.period(1, 2, 3);
-        assertEquals(period.get(YEARS), 1);
-        assertEquals(period.get(MONTHS), 2);
-        assertEquals(period.get(DAYS), 3);
+        assertEquals(1, period.get(YEARS));
+        assertEquals(2, period.get(MONTHS));
+        assertEquals(3, period.get(DAYS));
     }
 
-    @Test(dataProvider="calendars", expectedExceptions=UnsupportedTemporalTypeException.class)
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_get_unsupported(Chronology chrono) {
-        ChronoPeriod period = chrono.period(1, 2, 3);
-        period.get(HOURS);
+        Assertions.assertThrows(UnsupportedTemporalTypeException.class, () -> {
+            ChronoPeriod period = chrono.period(1, 2, 3);
+            period.get(HOURS);
+        });
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_getUnits(Chronology chrono) {
         ChronoPeriod period = chrono.period(1, 2, 3);
-        assertEquals(period.getUnits().size(), 3);
-        assertEquals(period.getUnits().get(0), YEARS);
-        assertEquals(period.getUnits().get(1), MONTHS);
-        assertEquals(period.getUnits().get(2), DAYS);
+        assertEquals(3, period.getUnits().size());
+        assertEquals(YEARS, period.getUnits().get(0));
+        assertEquals(MONTHS, period.getUnits().get(1));
+        assertEquals(DAYS, period.getUnits().get(2));
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_getChronology(Chronology chrono) {
         ChronoPeriod period = chrono.period(1, 2, 3);
-        assertEquals(period.getChronology(), chrono);
+        assertEquals(chrono, period.getChronology());
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_isZero_isNegative(Chronology chrono) {
         ChronoPeriod periodPositive = chrono.period(1, 2, 3);
-        assertEquals(periodPositive.isZero(), false);
-        assertEquals(periodPositive.isNegative(), false);
+        assertEquals(false, periodPositive.isZero());
+        assertEquals(false, periodPositive.isNegative());
 
         ChronoPeriod periodZero = chrono.period(0, 0, 0);
-        assertEquals(periodZero.isZero(), true);
-        assertEquals(periodZero.isNegative(), false);
+        assertEquals(true, periodZero.isZero());
+        assertEquals(false, periodZero.isNegative());
 
         ChronoPeriod periodNegative = chrono.period(-1, 0, 0);
-        assertEquals(periodNegative.isZero(), false);
-        assertEquals(periodNegative.isNegative(), true);
+        assertEquals(false, periodNegative.isZero());
+        assertEquals(true, periodNegative.isNegative());
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_plus(Chronology chrono) {
         ChronoPeriod period = chrono.period(1, 2, 3);
         ChronoPeriod period2 = chrono.period(2, 3, 4);
         ChronoPeriod result = period.plus(period2);
-        assertEquals(result, chrono.period(3, 5, 7));
+        assertEquals(chrono.period(3, 5, 7), result);
     }
 
-    @Test(dataProvider="calendars", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_plus_wrongChrono(Chronology chrono) {
-        ChronoPeriod period = chrono.period(1, 2, 3);
-        ChronoPeriod isoPeriod = Period.of(2, 3, 4);
-        ChronoPeriod thaiPeriod = ThaiBuddhistChronology.INSTANCE.period(2, 3, 4);
-        // one of these two will fail
-        period.plus(isoPeriod);
-        period.plus(thaiPeriod);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            ChronoPeriod period = chrono.period(1, 2, 3);
+            ChronoPeriod isoPeriod = Period.of(2, 3, 4);
+            ChronoPeriod thaiPeriod = ThaiBuddhistChronology.INSTANCE.period(2, 3, 4);
+            // one of these two will fail
+            period.plus(isoPeriod);
+            period.plus(thaiPeriod);
+        });
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_minus(Chronology chrono) {
         ChronoPeriod period = chrono.period(1, 2, 3);
         ChronoPeriod period2 = chrono.period(2, 3, 4);
         ChronoPeriod result = period.minus(period2);
-        assertEquals(result, chrono.period(-1, -1, -1));
+        assertEquals(chrono.period(-1, -1, -1), result);
     }
 
-    @Test(dataProvider="calendars", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_minus_wrongChrono(Chronology chrono) {
-        ChronoPeriod period = chrono.period(1, 2, 3);
-        ChronoPeriod isoPeriod = Period.of(2, 3, 4);
-        ChronoPeriod thaiPeriod = ThaiBuddhistChronology.INSTANCE.period(2, 3, 4);
-        // one of these two will fail
-        period.minus(isoPeriod);
-        period.minus(thaiPeriod);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            ChronoPeriod period = chrono.period(1, 2, 3);
+            ChronoPeriod isoPeriod = Period.of(2, 3, 4);
+            ChronoPeriod thaiPeriod = ThaiBuddhistChronology.INSTANCE.period(2, 3, 4);
+            // one of these two will fail
+            period.minus(isoPeriod);
+            period.minus(thaiPeriod);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_addTo(Chronology chrono) {
         ChronoPeriod period = chrono.period(1, 2, 3);
         ChronoLocalDate date = chrono.dateNow();
         Temporal result = period.addTo(date);
-        assertEquals(result, date.plus(14, MONTHS).plus(3, DAYS));
+        assertEquals(date.plus(14, MONTHS).plus(3, DAYS), result);
     }
 
-    @Test(dataProvider="calendars", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_addTo_wrongChrono(Chronology chrono) {
-        ChronoPeriod period = chrono.period(1, 2, 3);
-        ChronoLocalDate isoDate = LocalDate.of(2000, 1, 1);
-        ChronoLocalDate thaiDate = ThaiBuddhistChronology.INSTANCE.date(2000, 1, 1);
-        // one of these two will fail
-        period.addTo(isoDate);
-        period.addTo(thaiDate);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            ChronoPeriod period = chrono.period(1, 2, 3);
+            ChronoLocalDate isoDate = LocalDate.of(2000, 1, 1);
+            ChronoLocalDate thaiDate = ThaiBuddhistChronology.INSTANCE.date(2000, 1, 1);
+            // one of these two will fail
+            period.addTo(isoDate);
+            period.addTo(thaiDate);
+        });
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_subtractFrom(Chronology chrono) {
         ChronoPeriod period = chrono.period(1, 2, 3);
         ChronoLocalDate date = chrono.dateNow();
         Temporal result = period.subtractFrom(date);
-        assertEquals(result, date.minus(14, MONTHS).minus(3, DAYS));
+        assertEquals(date.minus(14, MONTHS).minus(3, DAYS), result);
     }
 
-    @Test(dataProvider="calendars", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_subtractFrom_wrongChrono(Chronology chrono) {
-        ChronoPeriod period = chrono.period(1, 2, 3);
-        ChronoLocalDate isoDate = LocalDate.of(2000, 1, 1);
-        ChronoLocalDate thaiDate = ThaiBuddhistChronology.INSTANCE.date(2000, 1, 1);
-        // one of these two will fail
-        period.subtractFrom(isoDate);
-        period.subtractFrom(thaiDate);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            ChronoPeriod period = chrono.period(1, 2, 3);
+            ChronoLocalDate isoDate = LocalDate.of(2000, 1, 1);
+            ChronoLocalDate thaiDate = ThaiBuddhistChronology.INSTANCE.date(2000, 1, 1);
+            // one of these two will fail
+            period.subtractFrom(isoDate);
+            period.subtractFrom(thaiDate);
+        });
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_negated(Chronology chrono) {
         ChronoPeriod period = chrono.period(1, 2, 3);
-        assertEquals(period.negated(), chrono.period(-1, -2, -3));
+        assertEquals(chrono.period(-1, -2, -3), period.negated());
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_multipliedBy(Chronology chrono) {
         ChronoPeriod period = chrono.period(1, 2, 3);
-        assertEquals(period.multipliedBy(3), chrono.period(3, 6, 9));
+        assertEquals(chrono.period(3, 6, 9), period.multipliedBy(3));
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_equals_equal(Chronology chrono) {
         ChronoPeriod a1 = chrono.period(1, 2, 3);
         ChronoPeriod a2 = chrono.period(1, 2, 3);
         assertEquals(a1, a1);
-        assertEquals(a1, a2);
         assertEquals(a2, a1);
+        assertEquals(a1, a2);
         assertEquals(a2, a2);
-        assertEquals(a1.hashCode(), a2.hashCode());
+        assertEquals(a2.hashCode(), a1.hashCode());
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_equals_notEqual(Chronology chrono) {
         ChronoPeriod a = chrono.period(1, 2, 3);
         ChronoPeriod b = chrono.period(2, 2, 3);
-        assertEquals(a.equals(b), false);
-        assertEquals(b.equals(a), false);
-        assertEquals(a.equals(""), false);
-        assertEquals(a.equals(null), false);
+        assertEquals(false, a.equals(b));
+        assertEquals(false, b.equals(a));
+        assertEquals(false, a.equals(""));
+        assertEquals(false, a.equals(null));
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_toString(Chronology chrono) {
         ChronoPeriod period = chrono.period(1, 2, 3);
         if (period instanceof Period == false) {
-            assertEquals(period.toString(), chrono.getId() + " P1Y2M3D");
+            assertEquals(chrono.getId() + " P1Y2M3D", period.toString());
         }
     }
 
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKChronoZonedDateTime.java b/test/jdk/java/time/tck/java/time/chrono/TCKChronoZonedDateTime.java
index be2f9fb1ac9..be1ce445498 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKChronoZonedDateTime.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKChronoZonedDateTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,8 +54,8 @@
  */
 package tck.java.time.chrono;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -86,20 +86,21 @@ import java.time.temporal.ValueRange;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test assertions that must be true for all built-in chronologies.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKChronoZonedDateTime {
 
     //-----------------------------------------------------------------------
     // regular data factory for names and descriptions of available calendars
     //-----------------------------------------------------------------------
-    @DataProvider(name = "calendars")
     Chronology[][] data_of_calendars() {
         return new Chronology[][]{
                     {HijrahChronology.INSTANCE},
@@ -110,7 +111,8 @@ public class TCKChronoZonedDateTime {
         };
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badWithAdjusterChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoZonedDateTime<?> czdt = chrono.date(refDate).atTime(LocalTime.NOON).atZone(ZoneOffset.UTC);
@@ -121,19 +123,20 @@ public class TCKChronoZonedDateTime {
             if (chrono != chrono2) {
                 try {
                     czdt.with(adjuster);
-                    Assert.fail("WithAdjuster should have thrown a ClassCastException, "
+                    Assertions.fail("WithAdjuster should have thrown a ClassCastException, "
                             + "required: " + czdt + ", supplied: " + czdt2);
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
                 }
             } else {
                 ChronoZonedDateTime<?> result = czdt.with(adjuster);
-                assertEquals(result, czdt2, "WithAdjuster failed to replace date");
+                assertEquals(czdt2, result, "WithAdjuster failed to replace date");
             }
         }
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badPlusAdjusterChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoZonedDateTime<?> czdt = chrono.date(refDate).atTime(LocalTime.NOON).atZone(ZoneOffset.UTC);
@@ -144,7 +147,7 @@ public class TCKChronoZonedDateTime {
             if (chrono != chrono2) {
                 try {
                     czdt.plus(adjuster);
-                    Assert.fail("WithAdjuster should have thrown a ClassCastException, "
+                    Assertions.fail("WithAdjuster should have thrown a ClassCastException, "
                             + "required: " + czdt + ", supplied: " + czdt2);
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
@@ -152,12 +155,13 @@ public class TCKChronoZonedDateTime {
             } else {
                 // Same chronology,
                 ChronoZonedDateTime<?> result = czdt.plus(adjuster);
-                assertEquals(result, czdt2, "WithAdjuster failed to replace date time");
+                assertEquals(czdt2, result, "WithAdjuster failed to replace date time");
             }
         }
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badMinusAdjusterChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoZonedDateTime<?> czdt = chrono.date(refDate).atTime(LocalTime.NOON).atZone(ZoneOffset.UTC);
@@ -168,7 +172,7 @@ public class TCKChronoZonedDateTime {
             if (chrono != chrono2) {
                 try {
                     czdt.minus(adjuster);
-                    Assert.fail("WithAdjuster should have thrown a ClassCastException, "
+                    Assertions.fail("WithAdjuster should have thrown a ClassCastException, "
                             + "required: " + czdt + ", supplied: " + czdt2);
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
@@ -176,12 +180,13 @@ public class TCKChronoZonedDateTime {
             } else {
                 // Same chronology,
                 ChronoZonedDateTime<?> result = czdt.minus(adjuster);
-                assertEquals(result, czdt2, "WithAdjuster failed to replace date");
+                assertEquals(czdt2, result, "WithAdjuster failed to replace date");
             }
         }
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badPlusTemporalUnitChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoZonedDateTime<?> czdt = chrono.date(refDate).atTime(LocalTime.NOON).atZone(ZoneOffset.UTC);
@@ -192,7 +197,7 @@ public class TCKChronoZonedDateTime {
             if (chrono != chrono2) {
                 try {
                     czdt.plus(1, adjuster);
-                    Assert.fail("TemporalUnit.doPlus plus should have thrown a ClassCastException, " + czdt
+                    Assertions.fail("TemporalUnit.doPlus plus should have thrown a ClassCastException, " + czdt
                             + " can not be cast to " + czdt2);
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
@@ -200,12 +205,13 @@ public class TCKChronoZonedDateTime {
             } else {
                 // Same chronology,
                 ChronoZonedDateTime<?> result = czdt.plus(1, adjuster);
-                assertEquals(result, czdt2, "WithAdjuster failed to replace date");
+                assertEquals(czdt2, result, "WithAdjuster failed to replace date");
             }
         }
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badMinusTemporalUnitChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoZonedDateTime<?> czdt = chrono.date(refDate).atTime(LocalTime.NOON).atZone(ZoneOffset.UTC);
@@ -216,7 +222,7 @@ public class TCKChronoZonedDateTime {
             if (chrono != chrono2) {
                 try {
                     czdt.minus(1, adjuster);
-                    Assert.fail("TemporalUnit.doPlus minus should have thrown a ClassCastException, " + czdt.getClass()
+                    Assertions.fail("TemporalUnit.doPlus minus should have thrown a ClassCastException, " + czdt.getClass()
                             + " can not be cast to " + czdt2.getClass());
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
@@ -224,12 +230,13 @@ public class TCKChronoZonedDateTime {
             } else {
                 // Same chronology,
                 ChronoZonedDateTime<?> result = czdt.minus(1, adjuster);
-                assertEquals(result, czdt2, "WithAdjuster failed to replace date");
+                assertEquals(czdt2, result, "WithAdjuster failed to replace date");
             }
         }
     }
 
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_badTemporalFieldChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
         ChronoZonedDateTime<?> czdt = chrono.date(refDate).atTime(LocalTime.NOON).atZone(ZoneOffset.UTC);
@@ -240,7 +247,7 @@ public class TCKChronoZonedDateTime {
             if (chrono != chrono2) {
                 try {
                     czdt.with(adjuster, 1);
-                    Assert.fail("TemporalField doWith() should have thrown a ClassCastException, " + czdt.getClass()
+                    Assertions.fail("TemporalField doWith() should have thrown a ClassCastException, " + czdt.getClass()
                             + " can not be cast to " + czdt2.getClass());
                 } catch (ClassCastException cce) {
                     // Expected exception; not an error
@@ -248,7 +255,7 @@ public class TCKChronoZonedDateTime {
             } else {
                 // Same chronology,
                 ChronoZonedDateTime<?> result = czdt.with(adjuster, 1);
-                assertEquals(result, czdt2, "TemporalField doWith() failed to replace date");
+                assertEquals(czdt2, result, "TemporalField doWith() failed to replace date");
             }
         }
     }
@@ -256,7 +263,8 @@ public class TCKChronoZonedDateTime {
     //-----------------------------------------------------------------------
     // isBefore, isAfter, isEqual, timeLineOrder()  test a Chronology against the other Chronos
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_zonedDateTime_comparisons(Chronology chrono) {
         List<ChronoZonedDateTime<?>> dates = new ArrayList<>();
 
@@ -299,19 +307,19 @@ public class TCKChronoZonedDateTime {
                     int cmp = ChronoZonedDateTime.timeLineOrder().compare(a, b);
                     if (i < j) {
                         assertTrue(cmp < 0, a + " compare " + b);
-                        assertEquals(a.isBefore(b), true, a + " isBefore " + b);
-                        assertEquals(a.isAfter(b), false, a + " ifAfter " + b);
-                        assertEquals(a.isEqual(b), false, a + " isEqual " + b);
+                        assertEquals(true, a.isBefore(b), a + " isBefore " + b);
+                        assertEquals(false, a.isAfter(b), a + " ifAfter " + b);
+                        assertEquals(false, a.isEqual(b), a + " isEqual " + b);
                     } else if (i > j) {
                         assertTrue(cmp > 0, a + " compare " + b);
-                        assertEquals(a.isBefore(b), false, a + " isBefore " + b);
-                        assertEquals(a.isAfter(b), true, a + " ifAfter " + b);
-                        assertEquals(a.isEqual(b), false, a + " isEqual " + b);
+                        assertEquals(false, a.isBefore(b), a + " isBefore " + b);
+                        assertEquals(true, a.isAfter(b), a + " ifAfter " + b);
+                        assertEquals(false, a.isEqual(b), a + " isEqual " + b);
                     } else {
                         assertTrue(cmp == 0, a + " compare " + b);
-                        assertEquals(a.isBefore(b), false, a + " isBefore " + b);
-                        assertEquals(a.isAfter(b), false, a + " ifAfter " + b);
-                        assertEquals(a.isEqual(b), true, a + " isEqual " + b);
+                        assertEquals(false, a.isBefore(b), a + " isBefore " + b);
+                        assertEquals(false, a.isAfter(b), a + " ifAfter " + b);
+                        assertEquals(true, a.isEqual(b), a + " isEqual " + b);
                     }
                 }
             }
@@ -319,34 +327,36 @@ public class TCKChronoZonedDateTime {
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_from_TemporalAccessor(Chronology chrono) {
         ZonedDateTime refDateTime = ZonedDateTime.of(2013, 1, 1, 12, 30, 0, 0, ZoneId.of("Europe/Paris"));
         ChronoZonedDateTime<?> dateTime = chrono.zonedDateTime(refDateTime);
         ChronoZonedDateTime<?> test1 = ChronoZonedDateTime.from(dateTime);
-        assertEquals(test1, dateTime);
+        assertEquals(dateTime, test1);
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_from_TemporalAccessor_dateOnly() {
-        ChronoZonedDateTime.from(LocalDate.of(2013, 1, 1));
+        Assertions.assertThrows(DateTimeException.class, () -> ChronoZonedDateTime.from(LocalDate.of(2013, 1, 1)));
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_from_TemporalAccessor_timeOnly() {
-        ChronoZonedDateTime.from(LocalTime.of(12, 30));
+        Assertions.assertThrows(DateTimeException.class, () -> ChronoZonedDateTime.from(LocalTime.of(12, 30)));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_from_TemporalAccessor_null() {
-        ChronoZonedDateTime.from(null);
+        Assertions.assertThrows(NullPointerException.class, () -> ChronoZonedDateTime.from(null));
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_getChronology(Chronology chrono) {
         ChronoZonedDateTime<?> test = chrono.zonedDateTime(ZonedDateTime.of(2010, 6, 30, 11, 30, 0, 0, ZoneOffset.UTC));
-        assertEquals(test.getChronology(), chrono);
+        assertEquals(chrono, test.getChronology());
     }
 
     //-----------------------------------------------------------------------
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKChronology.java b/test/jdk/java/time/tck/java/time/chrono/TCKChronology.java
index b73ff23dbfe..58313001faf 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKChronology.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,10 +59,9 @@
  */
 package tck.java.time.chrono;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.Clock;
 import java.time.DateTimeException;
@@ -89,13 +88,16 @@ import java.time.temporal.ChronoField;
 import java.util.Locale;
 import java.util.Set;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test Chronology class.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKChronology {
 
     private static final ZoneOffset OFFSET_P0100 = ZoneOffset.ofHours(1);
@@ -109,7 +111,6 @@ public class TCKChronology {
     //-----------------------------------------------------------------------
     // regular data factory for ID and calendarType of available calendars
     //-----------------------------------------------------------------------
-    @DataProvider(name = "calendarNameAndType")
     Object[][] data_of_calendars() {
         return new Object[][] {
                     {"Hijrah-umalqura", "islamic-umalqura"},
@@ -120,15 +121,17 @@ public class TCKChronology {
                 };
     }
 
-    @Test(dataProvider = "calendarNameAndType")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_getters(String chronoId, String calendarSystemType) {
         Chronology chrono = Chronology.of(chronoId);
         assertNotNull(chrono, "Required calendar not found by ID: " + chronoId);
-        assertEquals(chrono.getId(), chronoId);
-        assertEquals(chrono.getCalendarType(), calendarSystemType);
+        assertEquals(chronoId, chrono.getId());
+        assertEquals(calendarSystemType, chrono.getCalendarType());
     }
 
-    @Test(dataProvider = "calendarNameAndType")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_required_calendars(String chronoId, String calendarSystemType) {
         Chronology chrono = Chronology.of(chronoId);
         assertNotNull(chrono, "Required calendar not found by ID: " + chronoId);
@@ -146,14 +149,13 @@ public class TCKChronology {
             Chronology lookup = Chronology.of(chrono.getId());
             assertNotNull(lookup, "Required calendar not found: " + chrono);
         }
-        assertEquals(chronos.size() >= data_of_calendars().length, true, "Chronology.getAvailableChronologies().size = " + chronos.size()
+        assertEquals(true, chronos.size() >= data_of_calendars().length, "Chronology.getAvailableChronologies().size = " + chronos.size()
                 + ", expected >= " + data_of_calendars().length);
     }
 
     //-----------------------------------------------------------------------
     // getDisplayName()
     //-----------------------------------------------------------------------
-    @DataProvider(name = "calendarDisplayName")
     Object[][] data_of_calendarDisplayNames() {
         return new Object[][] {
                     {"Hijrah", "Hijri Calendar (Umm al-Qura)"},
@@ -164,39 +166,41 @@ public class TCKChronology {
                 };
     }
 
-    @Test(dataProvider = "calendarDisplayName")
+    @ParameterizedTest
+    @MethodSource("data_of_calendarDisplayNames")
     public void test_getDisplayName(String chronoId, String calendarDisplayName) {
         Chronology chrono = Chronology.of(chronoId);
-        assertEquals(chrono.getDisplayName(TextStyle.FULL, Locale.ENGLISH), calendarDisplayName);
+        assertEquals(calendarDisplayName, chrono.getDisplayName(TextStyle.FULL, Locale.ENGLISH));
     }
 
     /**
      * Compute the number of days from the Epoch and compute the date from the number of days.
      */
-    @Test(dataProvider = "calendarNameAndType")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_epoch(String name, String alias) {
         Chronology chrono = Chronology.of(name); // a chronology. In practice this is rarely hardcoded
         ChronoLocalDate date1 = chrono.dateNow();
         long epoch1 = date1.getLong(ChronoField.EPOCH_DAY);
         ChronoLocalDate date2 = date1.with(ChronoField.EPOCH_DAY, epoch1);
-        assertEquals(date1, date2, "Date from epoch day is not same date: " + date1 + " != " + date2);
+        assertEquals(date2, date1, "Date from epoch day is not same date: " + date1 + " != " + date2);
         long epoch2 = date1.getLong(ChronoField.EPOCH_DAY);
-        assertEquals(epoch1, epoch2, "Epoch day not the same: " + epoch1 + " != " + epoch2);
+        assertEquals(epoch2, epoch1, "Epoch day not the same: " + epoch1 + " != " + epoch2);
     }
 
-    @Test(dataProvider = "calendarNameAndType")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_dateEpochDay(String name, String alias) {
         Chronology chrono = Chronology.of(name);
         ChronoLocalDate date = chrono.dateNow();
         long epochDay = date.getLong(ChronoField.EPOCH_DAY);
         ChronoLocalDate test = chrono.dateEpochDay(epochDay);
-        assertEquals(test, date);
+        assertEquals(date, test);
     }
 
     //-----------------------------------------------------------------------
     // locale based lookup
     //-----------------------------------------------------------------------
-    @DataProvider(name = "calendarsystemtype")
     Object[][] data_CalendarType() {
         return new Object[][] {
             {HijrahChronology.INSTANCE, "islamic-umalqura"},
@@ -207,18 +211,20 @@ public class TCKChronology {
         };
     }
 
-    @Test(dataProvider = "calendarsystemtype")
+    @ParameterizedTest
+    @MethodSource("data_CalendarType")
     public void test_getCalendarType(Chronology chrono, String calendarType) {
         String type = calendarType;
-        assertEquals(chrono.getCalendarType(), type);
+        assertEquals(type, chrono.getCalendarType());
     }
 
-    @Test(dataProvider = "calendarsystemtype")
+    @ParameterizedTest
+    @MethodSource("data_CalendarType")
     public void test_lookupLocale(Chronology chrono, String calendarType) {
         Locale.Builder builder = new Locale.Builder().setLanguage("en").setRegion("CA");
         builder.setUnicodeLocaleKeyword("ca", calendarType);
         Locale locale = builder.build();
-        assertEquals(Chronology.ofLocale(locale), chrono);
+        assertEquals(chrono, Chronology.ofLocale(locale));
     }
 
     //-----------------------------------------------------------------------
@@ -230,9 +236,9 @@ public class TCKChronology {
         Clock clock = Clock.system(zoneId_paris);
 
         Chronology chrono = Chronology.of("Minguo");
-        assertEquals(chrono.dateNow(), MinguoChronology.INSTANCE.dateNow());
-        assertEquals(chrono.dateNow(zoneId_paris), MinguoChronology.INSTANCE.dateNow(zoneId_paris));
-        assertEquals(chrono.dateNow(clock), MinguoChronology.INSTANCE.dateNow(clock));
+        assertEquals(MinguoChronology.INSTANCE.dateNow(), chrono.dateNow());
+        assertEquals(MinguoChronology.INSTANCE.dateNow(zoneId_paris), chrono.dateNow(zoneId_paris));
+        assertEquals(MinguoChronology.INSTANCE.dateNow(clock), chrono.dateNow(clock));
     }
 
     @Test
@@ -241,9 +247,9 @@ public class TCKChronology {
         Clock clock = Clock.system(zoneId_paris);
 
         Chronology chrono = Chronology.of("ISO");
-        assertEquals(chrono.dateNow(), IsoChronology.INSTANCE.dateNow());
-        assertEquals(chrono.dateNow(zoneId_paris), IsoChronology.INSTANCE.dateNow(zoneId_paris));
-        assertEquals(chrono.dateNow(clock), IsoChronology.INSTANCE.dateNow(clock));
+        assertEquals(IsoChronology.INSTANCE.dateNow(), chrono.dateNow());
+        assertEquals(IsoChronology.INSTANCE.dateNow(zoneId_paris), chrono.dateNow(zoneId_paris));
+        assertEquals(IsoChronology.INSTANCE.dateNow(clock), chrono.dateNow(clock));
     }
 
     @Test
@@ -252,9 +258,9 @@ public class TCKChronology {
         Clock clock = Clock.system(zoneId_paris);
 
         Chronology chrono = Chronology.of("Japanese");
-        assertEquals(chrono.dateNow(), JapaneseChronology.INSTANCE.dateNow());
-        assertEquals(chrono.dateNow(zoneId_paris), JapaneseChronology.INSTANCE.dateNow(zoneId_paris));
-        assertEquals(chrono.dateNow(clock), JapaneseChronology.INSTANCE.dateNow(clock));
+        assertEquals(JapaneseChronology.INSTANCE.dateNow(), chrono.dateNow());
+        assertEquals(JapaneseChronology.INSTANCE.dateNow(zoneId_paris), chrono.dateNow(zoneId_paris));
+        assertEquals(JapaneseChronology.INSTANCE.dateNow(clock), chrono.dateNow(clock));
     }
 
     @Test
@@ -263,9 +269,9 @@ public class TCKChronology {
         Clock clock = Clock.system(zoneId_paris);
 
         Chronology chrono = Chronology.of("ThaiBuddhist");
-        assertEquals(chrono.dateNow(), ThaiBuddhistChronology.INSTANCE.dateNow());
-        assertEquals(chrono.dateNow(zoneId_paris), ThaiBuddhistChronology.INSTANCE.dateNow(zoneId_paris));
-        assertEquals(chrono.dateNow(clock), ThaiBuddhistChronology.INSTANCE.dateNow(clock));
+        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(), chrono.dateNow());
+        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(zoneId_paris), chrono.dateNow(zoneId_paris));
+        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(clock), chrono.dateNow(clock));
     }
 
     //-----------------------------------------------------------------------
@@ -276,8 +282,8 @@ public class TCKChronology {
         Chronology chrono = Chronology.of("Hijrah");
         ChronoLocalDate date1 = chrono.dateYearDay(HijrahEra.AH, 1434, 178);
         ChronoLocalDate date2 = chrono.date(HijrahEra.AH, 1434, 7, 1);
-        assertEquals(date1, HijrahChronology.INSTANCE.dateYearDay(HijrahEra.AH, 1434, 178));
-        assertEquals(date2, HijrahChronology.INSTANCE.dateYearDay(HijrahEra.AH, 1434, 178));
+        assertEquals(HijrahChronology.INSTANCE.dateYearDay(HijrahEra.AH, 1434, 178), date1);
+        assertEquals(HijrahChronology.INSTANCE.dateYearDay(HijrahEra.AH, 1434, 178), date2);
     }
 
     @Test
@@ -285,8 +291,8 @@ public class TCKChronology {
         Chronology chrono = Chronology.of("Minguo");
         ChronoLocalDate date1 = chrono.dateYearDay(MinguoEra.ROC, 5, 60);
         ChronoLocalDate date2 = chrono.date(MinguoEra.ROC, 5, 2, 29);
-        assertEquals(date1, MinguoChronology.INSTANCE.dateYearDay(MinguoEra.ROC, 5, 60));
-        assertEquals(date2, MinguoChronology.INSTANCE.dateYearDay(MinguoEra.ROC, 5, 60));
+        assertEquals(MinguoChronology.INSTANCE.dateYearDay(MinguoEra.ROC, 5, 60), date1);
+        assertEquals(MinguoChronology.INSTANCE.dateYearDay(MinguoEra.ROC, 5, 60), date2);
     }
 
     @Test
@@ -294,8 +300,8 @@ public class TCKChronology {
         Chronology chrono = Chronology.of("ISO");
         ChronoLocalDate date1 = chrono.dateYearDay(IsoEra.CE, 5, 60);
         ChronoLocalDate date2 = chrono.date(IsoEra.CE, 5, 3, 1);
-        assertEquals(date1, IsoChronology.INSTANCE.dateYearDay(IsoEra.CE, 5, 60));
-        assertEquals(date2, IsoChronology.INSTANCE.dateYearDay(IsoEra.CE, 5, 60));
+        assertEquals(IsoChronology.INSTANCE.dateYearDay(IsoEra.CE, 5, 60), date1);
+        assertEquals(IsoChronology.INSTANCE.dateYearDay(IsoEra.CE, 5, 60), date2);
     }
 
     @Test
@@ -303,8 +309,8 @@ public class TCKChronology {
         Chronology chrono = Chronology.of("Japanese");
         ChronoLocalDate date1 = chrono.dateYearDay(JapaneseEra.HEISEI, 8, 60);
         ChronoLocalDate date2 = chrono.date(JapaneseEra.HEISEI, 8, 2, 29);
-        assertEquals(date1, JapaneseChronology.INSTANCE.dateYearDay(JapaneseEra.HEISEI, 8, 60));
-        assertEquals(date2, JapaneseChronology.INSTANCE.dateYearDay(JapaneseEra.HEISEI, 8, 60));
+        assertEquals(JapaneseChronology.INSTANCE.dateYearDay(JapaneseEra.HEISEI, 8, 60), date1);
+        assertEquals(JapaneseChronology.INSTANCE.dateYearDay(JapaneseEra.HEISEI, 8, 60), date2);
     }
 
     @Test
@@ -312,8 +318,8 @@ public class TCKChronology {
         Chronology chrono = Chronology.of("ThaiBuddhist");
         ChronoLocalDate date1 = chrono.dateYearDay(ThaiBuddhistEra.BE, 2459, 60);
         ChronoLocalDate date2 = chrono.date(ThaiBuddhistEra.BE, 2459, 2, 29);
-        assertEquals(date1, ThaiBuddhistChronology.INSTANCE.dateYearDay(ThaiBuddhistEra.BE, 2459, 60));
-        assertEquals(date2, ThaiBuddhistChronology.INSTANCE.dateYearDay(ThaiBuddhistEra.BE, 2459, 60));
+        assertEquals(ThaiBuddhistChronology.INSTANCE.dateYearDay(ThaiBuddhistEra.BE, 2459, 60), date1);
+        assertEquals(ThaiBuddhistChronology.INSTANCE.dateYearDay(ThaiBuddhistEra.BE, 2459, 60), date2);
     }
 
     /**
@@ -328,25 +334,28 @@ public class TCKChronology {
             Locale.Builder builder = new Locale.Builder().setLanguage("en").setRegion("CA");
             builder.setUnicodeLocaleKeyword("ca", chrono.getCalendarType());
             Locale locale = builder.build();
-            assertEquals(Chronology.ofLocale(locale), chrono, "Lookup by type");
+            assertEquals(chrono, Chronology.ofLocale(locale), "Lookup by type");
         }
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_lookupLocale() {
-        Locale.Builder builder = new Locale.Builder().setLanguage("en").setRegion("CA");
-        builder.setUnicodeLocaleKeyword("ca", "xxx");
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Locale.Builder builder = new Locale.Builder().setLanguage("en").setRegion("CA");
+            builder.setUnicodeLocaleKeyword("ca", "xxx");
 
-        Locale locale = builder.build();
-        Chronology.ofLocale(locale);
+            Locale locale = builder.build();
+            Chronology.ofLocale(locale);
+        });
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_noChrono() {
-        Chronology chrono = Chronology.of("FooFoo");
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Chronology chrono = Chronology.of("FooFoo");
+        });
     }
 
-    @DataProvider(name = "epochSecond_dataProvider")
     Object[][]  data_epochSecond() {
         return new Object[][] {
                 {JapaneseChronology.INSTANCE, 1873, 9, 7, 1, 2, 2, OFFSET_P0100},
@@ -366,15 +375,14 @@ public class TCKChronology {
         };
     }
 
-    @Test(dataProvider = "epochSecond_dataProvider")
+    @ParameterizedTest
+    @MethodSource("data_epochSecond")
     public void test_epochSecond(Chronology chrono, int y, int m, int d, int h, int min, int s, ZoneOffset offset) {
         ChronoLocalDate chronoLd = chrono.date(y, m, d);
-        assertEquals(chrono.epochSecond(y, m, d, h, min, s, offset),
-                     OffsetDateTime.of(LocalDate.from(chronoLd), LocalTime.of(h, min, s), offset)
-                                   .toEpochSecond());
+        assertEquals(OffsetDateTime.of(LocalDate.from(chronoLd), LocalTime.of(h, min, s), offset)
+                                   .toEpochSecond(), chrono.epochSecond(y, m, d, h, min, s, offset));
     }
 
-    @DataProvider(name = "era_epochSecond_dataProvider")
     Object[][]  data_era_epochSecond() {
         return new Object[][] {
                 {JapaneseChronology.INSTANCE, JapaneseEra.MEIJI, 1873 - YDIFF_MEIJI, 9, 7, 1, 2, 2, OFFSET_P0100},
@@ -394,15 +402,14 @@ public class TCKChronology {
         };
     }
 
-    @Test(dataProvider = "era_epochSecond_dataProvider")
+    @ParameterizedTest
+    @MethodSource("data_era_epochSecond")
     public void test_epochSecond(Chronology chrono, Era era, int y, int m, int d, int h, int min, int s, ZoneOffset offset) {
         ChronoLocalDate chronoLd = chrono.date(era, y, m, d);
-        assertEquals(chrono.epochSecond(era, y, m, d, h, min, s, offset),
-                     OffsetDateTime.of(LocalDate.from(chronoLd), LocalTime.of(h, min, s), offset)
-                                   .toEpochSecond());
+        assertEquals(OffsetDateTime.of(LocalDate.from(chronoLd), LocalTime.of(h, min, s), offset)
+                                   .toEpochSecond(), chrono.epochSecond(era, y, m, d, h, min, s, offset));
     }
 
-    @DataProvider(name = "bad_epochSecond_dataProvider")
     Object[][]  bad_data_epochSecond() {
         return new Object[][] {
                 {JapaneseChronology.INSTANCE, 1873, 13, 7, 1, 2, 2, OFFSET_P0100},
@@ -415,12 +422,12 @@ public class TCKChronology {
         };
     }
 
-    @Test(dataProvider = "bad_epochSecond_dataProvider", expectedExceptions = DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("bad_data_epochSecond")
     public void test_bad_epochSecond(Chronology chrono, int y, int m, int d, int h, int min, int s, ZoneOffset offset) {
-        chrono.epochSecond(y, m, d, h, min, s, offset);
+        Assertions.assertThrows(DateTimeException.class, () -> chrono.epochSecond(y, m, d, h, min, s, offset));
     }
 
-    @DataProvider
     Object[][]  data_isIsoBased() {
         return new Object[][] {
                 {IsoChronology.INSTANCE, true},
@@ -434,8 +441,9 @@ public class TCKChronology {
     //-----------------------------------------------------------------------
     // isIsoBased()
     //-----------------------------------------------------------------------
-    @Test(dataProvider = "data_isIsoBased")
+    @ParameterizedTest
+    @MethodSource("data_isIsoBased")
     public void test_isIsoBased(Chronology chrono, boolean expected) {
-        assertEquals(chrono.isIsoBased(), expected);
+        assertEquals(expected, chrono.isIsoBased());
     }
 }
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKHijrahChronology.java b/test/jdk/java/time/tck/java/time/chrono/TCKHijrahChronology.java
index 7301ff67dca..7ada7b38aff 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKHijrahChronology.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKHijrahChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,10 +55,11 @@
 package tck.java.time.chrono;
 
 import java.time.Clock;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.DateTimeException;
 import java.time.ZoneId;
@@ -77,14 +78,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKHijrahChronology {
 
     //-----------------------------------------------------------------------
@@ -94,35 +97,34 @@ public class TCKHijrahChronology {
     public void test_chrono_byName() {
         Chronology c = HijrahChronology.INSTANCE;
         Chronology test = Chronology.of("Hijrah-umalqura");
-        Assert.assertNotNull(test, "The Hijrah-umalqura calendar could not be found by name");
-        Assert.assertEquals(test.getId(), "Hijrah-umalqura", "ID mismatch");
-        Assert.assertEquals(test.getCalendarType(), "islamic-umalqura", "Type mismatch");
-        Assert.assertEquals(test, c);
+        Assertions.assertNotNull(test, "The Hijrah-umalqura calendar could not be found by name");
+        assertEquals("Hijrah-umalqura", test.getId(), "ID mismatch");
+        assertEquals("islamic-umalqura", test.getCalendarType(), "Type mismatch");
+        assertEquals(c, test);
     }
 
     // Tests for dateNow() method
     @Test
     public void test_dateNow(){
-        assertEquals(HijrahChronology.INSTANCE.dateNow(), HijrahDate.now()) ;
-        assertEquals(HijrahChronology.INSTANCE.dateNow(), HijrahDate.now(ZoneId.systemDefault())) ;
-        assertEquals(HijrahChronology.INSTANCE.dateNow(), HijrahDate.now(Clock.systemDefaultZone())) ;
-        assertEquals(HijrahChronology.INSTANCE.dateNow(), HijrahDate.now(Clock.systemDefaultZone().getZone())) ;
+        assertEquals(HijrahDate.now(), HijrahChronology.INSTANCE.dateNow()) ;
+        assertEquals(HijrahDate.now(ZoneId.systemDefault()), HijrahChronology.INSTANCE.dateNow()) ;
+        assertEquals(HijrahDate.now(Clock.systemDefaultZone()), HijrahChronology.INSTANCE.dateNow()) ;
+        assertEquals(HijrahDate.now(Clock.systemDefaultZone().getZone()), HijrahChronology.INSTANCE.dateNow()) ;
 
-        assertEquals(HijrahChronology.INSTANCE.dateNow(), HijrahChronology.INSTANCE.dateNow(ZoneId.systemDefault())) ;
-        assertEquals(HijrahChronology.INSTANCE.dateNow(), HijrahChronology.INSTANCE.dateNow(Clock.systemDefaultZone())) ;
-        assertEquals(HijrahChronology.INSTANCE.dateNow(), HijrahChronology.INSTANCE.dateNow(Clock.systemDefaultZone().getZone())) ;
+        assertEquals(HijrahChronology.INSTANCE.dateNow(ZoneId.systemDefault()), HijrahChronology.INSTANCE.dateNow()) ;
+        assertEquals(HijrahChronology.INSTANCE.dateNow(Clock.systemDefaultZone()), HijrahChronology.INSTANCE.dateNow()) ;
+        assertEquals(HijrahChronology.INSTANCE.dateNow(Clock.systemDefaultZone().getZone()), HijrahChronology.INSTANCE.dateNow()) ;
 
         ZoneId zoneId = ZoneId.of("Europe/Paris");
-        assertEquals(HijrahChronology.INSTANCE.dateNow(zoneId), HijrahChronology.INSTANCE.dateNow(Clock.system(zoneId))) ;
-        assertEquals(HijrahChronology.INSTANCE.dateNow(zoneId), HijrahChronology.INSTANCE.dateNow(Clock.system(zoneId).getZone())) ;
-        assertEquals(HijrahChronology.INSTANCE.dateNow(zoneId), HijrahDate.now(Clock.system(zoneId))) ;
-        assertEquals(HijrahChronology.INSTANCE.dateNow(zoneId), HijrahDate.now(Clock.system(zoneId).getZone())) ;
+        assertEquals(HijrahChronology.INSTANCE.dateNow(Clock.system(zoneId)), HijrahChronology.INSTANCE.dateNow(zoneId)) ;
+        assertEquals(HijrahChronology.INSTANCE.dateNow(Clock.system(zoneId).getZone()), HijrahChronology.INSTANCE.dateNow(zoneId)) ;
+        assertEquals(HijrahDate.now(Clock.system(zoneId)), HijrahChronology.INSTANCE.dateNow(zoneId)) ;
+        assertEquals(HijrahDate.now(Clock.system(zoneId).getZone()), HijrahChronology.INSTANCE.dateNow(zoneId)) ;
 
-        assertEquals(HijrahChronology.INSTANCE.dateNow(ZoneId.of(ZoneOffset.UTC.getId())), HijrahChronology.INSTANCE.dateNow(Clock.systemUTC())) ;
+        assertEquals(HijrahChronology.INSTANCE.dateNow(Clock.systemUTC()), HijrahChronology.INSTANCE.dateNow(ZoneId.of(ZoneOffset.UTC.getId()))) ;
     }
 
     // Sample invalid dates
-    @DataProvider(name="badDates")
     Object[][] data_badDates() {
         return new Object[][] {
             {1299, 12, 29},
@@ -143,17 +145,20 @@ public class TCKHijrahChronology {
     }
 
     // This is a negative test to verify if the API throws exception if an invalid date is provided
-    @Test(dataProvider="badDates", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_badDates")
     public void test_badDates(int year, int month, int dom) {
-        HijrahChronology.INSTANCE.date(year, month, dom);
+        Assertions.assertThrows(DateTimeException.class, () -> HijrahChronology.INSTANCE.date(year, month, dom));
     }
 
     // Negative test or dateYearDay with day too large
-    @Test(expectedExceptions=java.time.DateTimeException.class)
+    @Test
     public void test_ofYearDayTooLarge() {
-        int year = 1435;
-        int lengthOfYear = HijrahChronology.INSTANCE.dateYearDay(year, 1).lengthOfYear();
-        HijrahDate hd = HijrahChronology.INSTANCE.dateYearDay(year, lengthOfYear + 1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            int year = 1435;
+            int lengthOfYear = HijrahChronology.INSTANCE.dateYearDay(year, 1).lengthOfYear();
+            HijrahDate hd = HijrahChronology.INSTANCE.dateYearDay(year, lengthOfYear + 1);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -198,7 +203,6 @@ public class TCKHijrahChronology {
     //-----------------------------------------------------------------------
     // Tests for HijrahChronology resolve
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_styleByEra")
     Object[][] data_resolve_styleByEra() {
         Object[][] result = new Object[ResolverStyle.values().length * HijrahEra.values().length][];
         int i = 0;
@@ -210,42 +214,44 @@ public class TCKHijrahChronology {
         return result;
     }
 
-    @Test(dataProvider = "resolve_styleByEra")
+    @ParameterizedTest
+    @MethodSource("data_resolve_styleByEra")
     public void test_resolve_yearOfEra_eraOnly_valid(ResolverStyle style, HijrahEra era) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.ERA, (long) era.getValue());
         HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, style);
-        assertEquals(date, null);
-        assertEquals(fieldValues.get(ChronoField.ERA), (Long) (long) era.getValue());
-        assertEquals(fieldValues.size(), 1);
+        assertEquals(null, date);
+        assertEquals((Long) (long) era.getValue(), fieldValues.get(ChronoField.ERA));
+        assertEquals(1, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_styleByEra")
+    @ParameterizedTest
+    @MethodSource("data_resolve_styleByEra")
     public void test_resolve_yearOfEra_eraAndYearOfEraOnly_valid(ResolverStyle style, HijrahEra era) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.ERA, (long) era.getValue());
         fieldValues.put(ChronoField.YEAR_OF_ERA, 1343L);
         HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, style);
-        assertEquals(date, null);
-        assertEquals(fieldValues.get(ChronoField.ERA), null);
-        assertEquals(fieldValues.get(ChronoField.YEAR_OF_ERA), null);
-        assertEquals(fieldValues.get(ChronoField.YEAR), (Long) 1343L);
-        assertEquals(fieldValues.size(), 1);
+        assertEquals(null, date);
+        assertEquals(null, fieldValues.get(ChronoField.ERA));
+        assertEquals(null, fieldValues.get(ChronoField.YEAR_OF_ERA));
+        assertEquals((Long) 1343L, fieldValues.get(ChronoField.YEAR));
+        assertEquals(1, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_styleByEra")
+    @ParameterizedTest
+    @MethodSource("data_resolve_styleByEra")
     public void test_resolve_yearOfEra_eraAndYearOnly_valid(ResolverStyle style, HijrahEra era) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.ERA, (long) era.getValue());
         fieldValues.put(ChronoField.YEAR, 1343L);
         HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, style);
-        assertEquals(date, null);
-        assertEquals(fieldValues.get(ChronoField.ERA), (Long) (long) era.getValue());
-        assertEquals(fieldValues.get(ChronoField.YEAR), (Long) 1343L);
-        assertEquals(fieldValues.size(), 2);
+        assertEquals(null, date);
+        assertEquals((Long) (long) era.getValue(), fieldValues.get(ChronoField.ERA));
+        assertEquals((Long) 1343L, fieldValues.get(ChronoField.YEAR));
+        assertEquals(2, fieldValues.size());
     }
 
-    @DataProvider(name = "resolve_styles")
     Object[][] data_resolve_styles() {
         Object[][] result = new Object[ResolverStyle.values().length][];
         int i = 0;
@@ -255,27 +261,29 @@ public class TCKHijrahChronology {
         return result;
     }
 
-    @Test(dataProvider = "resolve_styles")
+    @ParameterizedTest
+    @MethodSource("data_resolve_styles")
     public void test_resolve_yearOfEra_yearOfEraOnly_valid(ResolverStyle style) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR_OF_ERA, 1343L);
         HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, style);
-        assertEquals(date, null);
-        assertEquals(fieldValues.get(ChronoField.YEAR_OF_ERA), (style != ResolverStyle.STRICT) ? null : (Long) 1343L);
-        assertEquals(fieldValues.get(ChronoField.YEAR), (style == ResolverStyle.STRICT) ? null : (Long) 1343L);
-        assertEquals(fieldValues.size(), 1);
+        assertEquals(null, date);
+        assertEquals((style != ResolverStyle.STRICT) ? null : (Long) 1343L, fieldValues.get(ChronoField.YEAR_OF_ERA));
+        assertEquals((style == ResolverStyle.STRICT) ? null : (Long) 1343L, fieldValues.get(ChronoField.YEAR));
+        assertEquals(1, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_styles")
+    @ParameterizedTest
+    @MethodSource("data_resolve_styles")
     public void test_resolve_yearOfEra_yearOfEraAndYearOnly_valid(ResolverStyle style) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR_OF_ERA, 1343L);
         fieldValues.put(ChronoField.YEAR, 1343L);
         HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, style);
-        assertEquals(date, null);
-        assertEquals(fieldValues.get(ChronoField.YEAR_OF_ERA), null);
-        assertEquals(fieldValues.get(ChronoField.YEAR), (Long) 1343L);
-        assertEquals(fieldValues.size(), 1);
+        assertEquals(null, date);
+        assertEquals(null, fieldValues.get(ChronoField.YEAR_OF_ERA));
+        assertEquals((Long) 1343L, fieldValues.get(ChronoField.YEAR));
+        assertEquals(1, fieldValues.size());
     }
 
     //-----------------------------------------------------------------------
@@ -285,7 +293,6 @@ public class TCKHijrahChronology {
     // 1434=29 30 29 30 29 30 30 29 30 30 29 29  total = 354
     // 1435=30 29 30 29 30 29 30 29 30 30 29 30  total = 355
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_ymd")
     Object[][] data_resolve_ymd() {
         // Compute the number of days in various month and years so that test cases
         // are not dependent on specific calendar data
@@ -364,7 +371,8 @@ public class TCKHijrahChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_ymd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymd")
     public void test_resolve_ymd_lenient(int y, int m, int d, HijrahDate expected, Object smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -373,8 +381,8 @@ public class TCKHijrahChronology {
 
         if (expected != null) {
             HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
@@ -385,7 +393,8 @@ public class TCKHijrahChronology {
         }
     }
 
-    @Test(dataProvider = "resolve_ymd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymd")
     public void test_resolve_ymd_smart(int y, int m, int d, HijrahDate expected, Object smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -393,11 +402,11 @@ public class TCKHijrahChronology {
         fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
         if (Boolean.TRUE.equals(smart)) {
             HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else if (smart instanceof HijrahDate) {
             HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, smart);
+            assertEquals(smart, date);
         } else {
             try {
                 HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
@@ -408,7 +417,8 @@ public class TCKHijrahChronology {
         }
     }
 
-    @Test(dataProvider = "resolve_ymd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymd")
     public void test_resolve_ymd_strict(int y, int m, int d, HijrahDate expected, Object smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -416,8 +426,8 @@ public class TCKHijrahChronology {
         fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
         if (strict) {
             HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
-            assertEquals(date, expected, "Resolved to incorrect date");
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date, "Resolved to incorrect date");
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
@@ -429,7 +439,6 @@ public class TCKHijrahChronology {
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_yd")
     Object[][] data_resolve_yd() {
         // Compute the number of days in various month and years so that test cases
         // are not dependent on specific calendar data
@@ -478,25 +487,27 @@ public class TCKHijrahChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_yd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yd")
     public void test_resolve_yd_lenient(int y, int d, HijrahDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
         HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
-        assertEquals(date, expected);
-        assertEquals(fieldValues.size(), 0);
+        assertEquals(expected, date);
+        assertEquals(0, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_yd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yd")
     public void test_resolve_yd_smart(int y, int d, HijrahDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
         if (smart) {
             HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
@@ -507,15 +518,16 @@ public class TCKHijrahChronology {
         }
     }
 
-    @Test(dataProvider = "resolve_yd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yd")
     public void test_resolve_yd_strict(int y, int d, HijrahDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
         if (strict) {
             HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKHijrahEra.java b/test/jdk/java/time/tck/java/time/chrono/TCKHijrahEra.java
index e5a1cd5e1af..0b7a0333b01 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKHijrahEra.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKHijrahEra.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,8 +55,9 @@
 package tck.java.time.chrono;
 
 import static java.time.temporal.ChronoField.ERA;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.chrono.Era;
 import java.time.chrono.HijrahChronology;
@@ -64,29 +65,31 @@ import java.time.chrono.HijrahEra;
 import java.time.temporal.ValueRange;
 import java.util.List;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKHijrahEra {
 
-    @DataProvider(name = "HijrahEras")
     Object[][] data_of_eras() {
         return new Object[][] {
                     {HijrahEra.AH, "AH", 1},
        };
     }
 
-    @Test(dataProvider="HijrahEras")
+    @ParameterizedTest
+    @MethodSource("data_of_eras")
     public void test_valueOf(HijrahEra era , String eraName, int eraValue) {
-        assertEquals(era.getValue(), eraValue);
+        assertEquals(eraValue, era.getValue());
 
-        assertEquals(HijrahChronology.INSTANCE.eraOf(eraValue), era);
-        assertEquals(HijrahEra.of(eraValue), era);
-        assertEquals(HijrahEra.valueOf(eraName), era);
+        assertEquals(era, HijrahChronology.INSTANCE.eraOf(eraValue));
+        assertEquals(era, HijrahEra.of(eraValue));
+        assertEquals(era, HijrahEra.valueOf(eraName));
     }
 
     //-----------------------------------------------------------------------
@@ -96,7 +99,7 @@ public class TCKHijrahEra {
     public void test_values() {
         List<Era> eraList = HijrahChronology.INSTANCE.eras();
         HijrahEra[] eras = HijrahEra.values();
-        assertEquals(eraList.size(), eras.length);
+        assertEquals(eras.length, eraList.size());
         for (HijrahEra era : eras) {
             assertTrue(eraList.contains(era));
         }
@@ -108,7 +111,7 @@ public class TCKHijrahEra {
     @Test
     public void test_range() {
         for (HijrahEra era : HijrahEra.values()) {
-            assertEquals(era.range(ERA), ValueRange.of(1, 1));
+            assertEquals(ValueRange.of(1, 1), era.range(ERA));
         }
     }
 
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKIsoChronology.java b/test/jdk/java/time/tck/java/time/chrono/TCKIsoChronology.java
index d47c58d72b7..4c4e428ad31 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKIsoChronology.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKIsoChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,8 +54,8 @@
  */
 package tck.java.time.chrono;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.DateTimeException;
 import java.time.LocalDate;
@@ -81,13 +81,16 @@ import java.time.temporal.TemporalQuery;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKIsoChronology {
     // Can only work with IsoChronology here
     // others may be in separate module
@@ -96,12 +99,12 @@ public class TCKIsoChronology {
 
     @Test
     public void factory_from_TemporalAccessor_dateWithChronlogy() {
-        assertEquals(Chronology.from(LocalDate.of(2012, 6, 30)), IsoChronology.INSTANCE);
+        assertEquals(IsoChronology.INSTANCE, Chronology.from(LocalDate.of(2012, 6, 30)));
     }
 
     @Test
     public void factory_from_TemporalAccessor_chronology() {
-        assertEquals(Chronology.from(new TemporalAccessor() {
+        assertEquals(IsoChronology.INSTANCE, Chronology.from(new TemporalAccessor() {
             @Override
             public boolean isSupported(TemporalField field) {
                 throw new UnsupportedOperationException();
@@ -120,12 +123,12 @@ public class TCKIsoChronology {
                 }
                 throw new UnsupportedOperationException();
             }
-        }), IsoChronology.INSTANCE);
+        }));
     }
 
     @Test
     public void factory_from_TemporalAccessor_noChronology() {
-        assertEquals(Chronology.from(new TemporalAccessor() {
+        assertEquals(IsoChronology.INSTANCE, Chronology.from(new TemporalAccessor() {
             @Override
             public boolean isSupported(TemporalField field) {
                 throw new UnsupportedOperationException();
@@ -143,18 +146,18 @@ public class TCKIsoChronology {
                 }
                 throw new UnsupportedOperationException();
             }
-        }), IsoChronology.INSTANCE);
+        }));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_from_TemporalAccessor_null() {
-        Chronology.from(null);
+        Assertions.assertThrows(NullPointerException.class, () -> Chronology.from(null));
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_date_TemporalAccessor() {
-        assertEquals(IsoChronology.INSTANCE.date(new TemporalAccessor() {
+        assertEquals(LocalDate.of(2012, 6, 30), IsoChronology.INSTANCE.date(new TemporalAccessor() {
             @Override
             public boolean isSupported(TemporalField field) {
                 if (field == ChronoField.EPOCH_DAY) {
@@ -179,18 +182,18 @@ public class TCKIsoChronology {
                 }
                 throw new UnsupportedOperationException();
             }
-        }), LocalDate.of(2012, 6, 30));
+        }));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_date_TemporalAccessor_null() {
-        IsoChronology.INSTANCE.date(null);
+        Assertions.assertThrows(NullPointerException.class, () -> IsoChronology.INSTANCE.date(null));
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_localDateTime_TemporalAccessor() {
-        assertEquals(IsoChronology.INSTANCE.localDateTime(new TemporalAccessor() {
+        assertEquals(LocalDateTime.of(2012, 6, 30, 12, 30, 40), IsoChronology.INSTANCE.localDateTime(new TemporalAccessor() {
             @Override
             public boolean isSupported(TemporalField field) {
                 if (field == ChronoField.EPOCH_DAY || field == ChronoField.NANO_OF_DAY) {
@@ -221,18 +224,18 @@ public class TCKIsoChronology {
                 }
                 throw new UnsupportedOperationException();
             }
-        }), LocalDateTime.of(2012, 6, 30, 12, 30, 40));
+        }));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_localDateTime_TemporalAccessor_null() {
-        IsoChronology.INSTANCE.localDateTime(null);
+        Assertions.assertThrows(NullPointerException.class, () -> IsoChronology.INSTANCE.localDateTime(null));
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_zonedDateTime_TemporalAccessor() {
-        assertEquals(IsoChronology.INSTANCE.zonedDateTime(new TemporalAccessor() {
+        assertEquals(ZonedDateTime.of(2012, 6, 30, 12, 30, 40, 0, ZoneId.of("Europe/London")), IsoChronology.INSTANCE.zonedDateTime(new TemporalAccessor() {
             @Override
             public boolean isSupported(TemporalField field) {
                 if (field == ChronoField.EPOCH_DAY || field == ChronoField.NANO_OF_DAY ||
@@ -273,17 +276,16 @@ public class TCKIsoChronology {
                 }
                 throw new UnsupportedOperationException();
             }
-        }), ZonedDateTime.of(2012, 6, 30, 12, 30, 40, 0, ZoneId.of("Europe/London")));
+        }));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_zonedDateTime_TemporalAccessor_null() {
-        IsoChronology.INSTANCE.zonedDateTime(null);
+        Assertions.assertThrows(NullPointerException.class, () -> IsoChronology.INSTANCE.zonedDateTime(null));
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_yearOfEra")
     Object[][] data_resolve_yearOfEra() {
         return new Object[][] {
                 // era only
@@ -348,7 +350,8 @@ public class TCKIsoChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_yearOfEra")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yearOfEra")
     public void test_resolve_yearOfEra(ResolverStyle style, Integer e, Integer yoe, Integer y, ChronoField field, Integer expected) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         if (e != null) {
@@ -362,9 +365,9 @@ public class TCKIsoChronology {
         }
         if (field != null) {
             LocalDate date = IsoChronology.INSTANCE.resolveDate(fieldValues, style);
-            assertEquals(date, null);
-            assertEquals(fieldValues.get(field), (Long) expected.longValue());
-            assertEquals(fieldValues.size(), 1);
+            assertEquals(null, date);
+            assertEquals((Long) expected.longValue(), fieldValues.get(field));
+            assertEquals(1, fieldValues.size());
         } else {
             try {
                 IsoChronology.INSTANCE.resolveDate(fieldValues, style);
@@ -377,7 +380,6 @@ public class TCKIsoChronology {
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_ymd")
     Object[][] data_resolve_ymd() {
         return new Object[][] {
                 {2012, 1, -365, date(2010, 12, 31), false, false},
@@ -436,18 +438,20 @@ public class TCKIsoChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_ymd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymd")
     public void test_resolve_ymd_lenient(int y, int m, int d, LocalDate expected, Object smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
         fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
         LocalDate date = IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
-        assertEquals(date, expected);
-        assertEquals(fieldValues.size(), 0);
+        assertEquals(expected, date);
+        assertEquals(0, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_ymd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymd")
     public void test_resolve_ymd_smart(int y, int m, int d, LocalDate expected, Object smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -455,11 +459,11 @@ public class TCKIsoChronology {
         fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
         if (Boolean.TRUE.equals(smart)) {
             LocalDate date = IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else if (smart instanceof LocalDate) {
             LocalDate date = IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, smart);
+            assertEquals(smart, date);
         } else {
             try {
                 IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
@@ -470,7 +474,8 @@ public class TCKIsoChronology {
         }
     }
 
-    @Test(dataProvider = "resolve_ymd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymd")
     public void test_resolve_ymd_strict(int y, int m, int d, LocalDate expected, Object smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -478,8 +483,8 @@ public class TCKIsoChronology {
         fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
         if (strict) {
             LocalDate date = IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
@@ -492,7 +497,6 @@ public class TCKIsoChronology {
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_yd")
     Object[][] data_resolve_yd() {
         return new Object[][] {
                 {2012, -365, date(2010, 12, 31), false, false},
@@ -520,25 +524,27 @@ public class TCKIsoChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_yd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yd")
     public void test_resolve_yd_lenient(int y, int d, LocalDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
         LocalDate date = IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
-        assertEquals(date, expected);
-        assertEquals(fieldValues.size(), 0);
+        assertEquals(expected, date);
+        assertEquals(0, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_yd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yd")
     public void test_resolve_yd_smart(int y, int d, LocalDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
         if (smart) {
             LocalDate date = IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
@@ -549,15 +555,16 @@ public class TCKIsoChronology {
         }
     }
 
-    @Test(dataProvider = "resolve_yd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yd")
     public void test_resolve_yd_strict(int y, int d, LocalDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
         if (strict) {
             LocalDate date = IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
@@ -570,7 +577,6 @@ public class TCKIsoChronology {
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_ymaa")
     Object[][] data_resolve_ymaa() {
         return new Object[][] {
                 {2012, 1, 1, -365, date(2010, 12, 31), false, false},
@@ -627,7 +633,8 @@ public class TCKIsoChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_ymaa")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymaa")
     public void test_resolve_ymaa_lenient(int y, int m, int w, int d, LocalDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -635,11 +642,12 @@ public class TCKIsoChronology {
         fieldValues.put(ChronoField.ALIGNED_WEEK_OF_MONTH, (long) w);
         fieldValues.put(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH, (long) d);
         LocalDate date = IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
-        assertEquals(date, expected);
-        assertEquals(fieldValues.size(), 0);
+        assertEquals(expected, date);
+        assertEquals(0, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_ymaa")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymaa")
     public void test_resolve_ymaa_smart(int y, int m, int w, int d, LocalDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -648,8 +656,8 @@ public class TCKIsoChronology {
         fieldValues.put(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH, (long) d);
         if (smart) {
             LocalDate date = IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
@@ -660,7 +668,8 @@ public class TCKIsoChronology {
         }
     }
 
-    @Test(dataProvider = "resolve_ymaa")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymaa")
     public void test_resolve_ymaa_strict(int y, int m, int w, int d, LocalDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -669,8 +678,8 @@ public class TCKIsoChronology {
         fieldValues.put(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH, (long) d);
         if (strict) {
             LocalDate date = IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
@@ -681,7 +690,6 @@ public class TCKIsoChronology {
         }
     }
 
-    @DataProvider(name = "epochSecond_dataProvider")
     Object[][] data_epochSecond() {
         return new Object[][] {
                 {2008, 3, 3, 1, 2, 2, OFFSET_P0100},
@@ -703,33 +711,28 @@ public class TCKIsoChronology {
         };
     }
 
-    @Test(dataProvider = "epochSecond_dataProvider")
+    @ParameterizedTest
+    @MethodSource("data_epochSecond")
     public void test_epochSecond_1(int y, int m, int d, int h , int min, int s, ZoneOffset offset) {
-        assertEquals(IsoChronology.INSTANCE.epochSecond(y, m, d, h, min, s, offset),
-                     OffsetDateTime.of(y, m, d, h, min, s, 0, offset).toEpochSecond());
+        assertEquals(OffsetDateTime.of(y, m, d, h, min, s, 0, offset).toEpochSecond(), IsoChronology.INSTANCE.epochSecond(y, m, d, h, min, s, offset));
     }
 
     @Test
     public void test_epochSecond_2() {
-        assertEquals(IsoChronology.INSTANCE.epochSecond(2008, 3, 3, 1, 2, 2, OFFSET_P0100),
-                     ZonedDateTime.of(2008, 3, 3, 1, 2, 2, 0, ZoneId.of("+01:00")).toEpochSecond());
-        assertEquals(IsoChronology.INSTANCE.epochSecond(1969, 3, 3, 1, 2, 2, OFFSET_P0100),
-                     ZonedDateTime.of(1969, 3, 3, 1, 2, 2, 0, ZoneId.of("+01:00")).toEpochSecond());
+        assertEquals(ZonedDateTime.of(2008, 3, 3, 1, 2, 2, 0, ZoneId.of("+01:00")).toEpochSecond(), IsoChronology.INSTANCE.epochSecond(2008, 3, 3, 1, 2, 2, OFFSET_P0100));
+        assertEquals(ZonedDateTime.of(1969, 3, 3, 1, 2, 2, 0, ZoneId.of("+01:00")).toEpochSecond(), IsoChronology.INSTANCE.epochSecond(1969, 3, 3, 1, 2, 2, OFFSET_P0100));
     }
 
     @Test
     public void test_epochSecond_max() {
-        assertEquals(IsoChronology.INSTANCE.epochSecond(Year.MAX_VALUE, 12, 31, 23, 59, 59, ZoneOffset.MIN),
-                     OffsetDateTime.of(Year.MAX_VALUE, 12, 31, 23, 59, 59, 0, ZoneOffset.MIN).toEpochSecond());
+        assertEquals(OffsetDateTime.of(Year.MAX_VALUE, 12, 31, 23, 59, 59, 0, ZoneOffset.MIN).toEpochSecond(), IsoChronology.INSTANCE.epochSecond(Year.MAX_VALUE, 12, 31, 23, 59, 59, ZoneOffset.MIN));
     }
 
     @Test
     public void test_epochSecond_min() {
-        assertEquals(IsoChronology.INSTANCE.epochSecond(Year.MIN_VALUE, 1, 1, 0, 0, 0, ZoneOffset.MAX),
-                     OffsetDateTime.of(Year.MIN_VALUE, 1, 1, 0, 0, 0, 0, ZoneOffset.MAX).toEpochSecond());
+        assertEquals(OffsetDateTime.of(Year.MIN_VALUE, 1, 1, 0, 0, 0, 0, ZoneOffset.MAX).toEpochSecond(), IsoChronology.INSTANCE.epochSecond(Year.MIN_VALUE, 1, 1, 0, 0, 0, ZoneOffset.MAX));
     }
 
-    @DataProvider(name = "bad_epochSecond_dataProvider")
     Object[][]  bad_data_epochSecond() {
         return new Object[][] {
             {2009, 13, 1, 1, 1, 1, OFFSET_P0100},
@@ -739,12 +742,12 @@ public class TCKIsoChronology {
             {2009, 1, 1, 1, 1, -11, OFFSET_P0100},
         };
     }
-    @Test(dataProvider = "bad_epochSecond_dataProvider", expectedExceptions = DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("bad_data_epochSecond")
     public void test_epochSecond_bad(int y, int m, int d, int h , int min, int s, ZoneOffset offset) {
-        IsoChronology.INSTANCE.epochSecond(y, m, d, h, min, s, offset);
+        Assertions.assertThrows(DateTimeException.class, () -> IsoChronology.INSTANCE.epochSecond(y, m, d, h, min, s, offset));
     }
 
-    @DataProvider(name = "era_epochSecond_dataProvider")
     Object[][] data_era_epochSecond() {
         return new Object[][] {
                 {IsoEra.CE, 2008, 3, 3, 1, 2, 2, OFFSET_P0100},
@@ -766,24 +769,22 @@ public class TCKIsoChronology {
         };
     }
 
-    @Test(dataProvider = "era_epochSecond_dataProvider")
+    @ParameterizedTest
+    @MethodSource("data_era_epochSecond")
     public void test_era_epochSecond_1(Era era, int y, int m, int d, int h , int min, int s, ZoneOffset offset) {
-        assertEquals(IsoChronology.INSTANCE.epochSecond(era, y, m, d, h, min, s, offset),
-                     OffsetDateTime.of(IsoChronology.INSTANCE.date(era, y, m, d), LocalTime.of(h, min, s), offset)
-                                   .toEpochSecond());
+        assertEquals(OffsetDateTime.of(IsoChronology.INSTANCE.date(era, y, m, d), LocalTime.of(h, min, s), offset)
+                                   .toEpochSecond(), IsoChronology.INSTANCE.epochSecond(era, y, m, d, h, min, s, offset));
     }
 
     @Test
     public void test_era_epochSecond_2() {
-        assertEquals(IsoChronology.INSTANCE.epochSecond(IsoEra.CE, 2008, 3, 3, 1, 2, 2, OFFSET_P0100),
-                     ZonedDateTime.of(2008, 3, 3, 1, 2, 2, 0, ZoneId.of("+01:00")).toEpochSecond());
-        assertEquals(IsoChronology.INSTANCE.epochSecond(IsoEra.CE, 1969, 3, 3, 1, 2, 2, OFFSET_P0100),
-                     ZonedDateTime.of(1969, 3, 3, 1, 2, 2, 0, ZoneId.of("+01:00")).toEpochSecond());
+        assertEquals(ZonedDateTime.of(2008, 3, 3, 1, 2, 2, 0, ZoneId.of("+01:00")).toEpochSecond(), IsoChronology.INSTANCE.epochSecond(IsoEra.CE, 2008, 3, 3, 1, 2, 2, OFFSET_P0100));
+        assertEquals(ZonedDateTime.of(1969, 3, 3, 1, 2, 2, 0, ZoneId.of("+01:00")).toEpochSecond(), IsoChronology.INSTANCE.epochSecond(IsoEra.CE, 1969, 3, 3, 1, 2, 2, OFFSET_P0100));
     }
 
-    @Test(expectedExceptions = ClassCastException.class)
+    @Test
     public void test_era_epochSecond_bad() {
-        IsoChronology.INSTANCE.epochSecond(HijrahEra.AH, 2009, 2, 29, 1, 2, 2, OFFSET_P0100);
+        Assertions.assertThrows(ClassCastException.class, () -> IsoChronology.INSTANCE.epochSecond(HijrahEra.AH, 2009, 2, 29, 1, 2, 2, OFFSET_P0100));
     }
 
 
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKIsoEra.java b/test/jdk/java/time/tck/java/time/chrono/TCKIsoEra.java
index 223a5a2b92f..0bb08453303 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKIsoEra.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKIsoEra.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,8 +55,9 @@
 package tck.java.time.chrono;
 
 import static java.time.temporal.ChronoField.ERA;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.chrono.Era;
 import java.time.chrono.IsoChronology;
@@ -64,16 +65,17 @@ import java.time.chrono.IsoEra;
 import java.time.temporal.ValueRange;
 import java.util.List;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKIsoEra {
 
-    @DataProvider(name = "IsoEras")
     Object[][] data_of_eras() {
         return new Object[][] {
                     {IsoEra.BCE, "BCE", 0},
@@ -81,11 +83,12 @@ public class TCKIsoEra {
         };
     }
 
-    @Test(dataProvider="IsoEras")
+    @ParameterizedTest
+    @MethodSource("data_of_eras")
     public void test_valueOf(IsoEra era , String eraName, int eraValue) {
-        assertEquals(era.getValue(), eraValue);
-        assertEquals(IsoEra.of(eraValue), era);
-        assertEquals(IsoEra.valueOf(eraName), era);
+        assertEquals(eraValue, era.getValue());
+        assertEquals(era, IsoEra.of(eraValue));
+        assertEquals(era, IsoEra.valueOf(eraName));
     }
 
     //-----------------------------------------------------------------------
@@ -95,7 +98,7 @@ public class TCKIsoEra {
     public void test_values() {
         List<Era> eraList = IsoChronology.INSTANCE.eras();
         IsoEra[] eras = IsoEra.values();
-        assertEquals(eraList.size(), eras.length);
+        assertEquals(eras.length, eraList.size());
         for (IsoEra era : eras) {
             assertTrue(eraList.contains(era));
         }
@@ -107,7 +110,7 @@ public class TCKIsoEra {
     @Test
     public void test_range() {
         for (IsoEra era : IsoEra.values()) {
-            assertEquals(era.range(ERA), ValueRange.of(0, 1));
+            assertEquals(ValueRange.of(0, 1), era.range(ERA));
         }
     }
 
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseChronology.java b/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseChronology.java
index 19bb26ed40f..6847d89b1a0 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseChronology.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseChronology.java
@@ -1,5 +1,5 @@
 /*
- o Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ o Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,18 +61,17 @@ import static java.time.temporal.ChronoField.ERA;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoField.YEAR;
 import static java.time.temporal.ChronoField.YEAR_OF_ERA;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.Clock;
 import java.time.DateTimeException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.Month;
-import java.time.Period;
 import java.time.Year;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
@@ -86,7 +85,6 @@ import java.time.chrono.JapaneseDate;
 import java.time.chrono.JapaneseEra;
 import java.time.chrono.MinguoChronology;
 import java.time.chrono.MinguoDate;
-import java.time.chrono.ThaiBuddhistChronology;
 import java.time.format.ResolverStyle;
 import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
@@ -100,14 +98,16 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKJapaneseChronology {
 
     // Year differences from Gregorian years.
@@ -124,10 +124,10 @@ public class TCKJapaneseChronology {
     public void test_chrono_byName() {
         Chronology c = JapaneseChronology.INSTANCE;
         Chronology test = Chronology.of("Japanese");
-        Assert.assertNotNull(test, "The Japanese calendar could not be found byName");
-        Assert.assertEquals(test.getId(), "Japanese", "ID mismatch");
-        Assert.assertEquals(test.getCalendarType(), "japanese", "Type mismatch");
-        Assert.assertEquals(test, c);
+        Assertions.assertNotNull(test, "The Japanese calendar could not be found byName");
+        assertEquals("Japanese", test.getId(), "ID mismatch");
+        assertEquals("japanese", test.getCalendarType(), "Type mismatch");
+        assertEquals(c, test);
     }
 
     //-----------------------------------------------------------------------
@@ -136,42 +136,41 @@ public class TCKJapaneseChronology {
     @Test
     public void test_chrono_byLocale_fullTag_japaneseCalendarFromJapan() {
         Chronology test = Chronology.ofLocale(Locale.forLanguageTag("ja-JP-u-ca-japanese"));
-        Assert.assertEquals(test.getId(), "Japanese");
-        Assert.assertEquals(test, JapaneseChronology.INSTANCE);
+        assertEquals("Japanese", test.getId());
+        assertEquals(JapaneseChronology.INSTANCE, test);
     }
 
     @Test
     public void test_chrono_byLocale_fullTag_japaneseCalendarFromElsewhere() {
         Chronology test = Chronology.ofLocale(Locale.forLanguageTag("en-US-u-ca-japanese"));
-        Assert.assertEquals(test.getId(), "Japanese");
-        Assert.assertEquals(test, JapaneseChronology.INSTANCE);
+        assertEquals("Japanese", test.getId());
+        assertEquals(JapaneseChronology.INSTANCE, test);
     }
 
     @Test
     public void test_chrono_byLocale_oldJP_noVariant() {
         Chronology test = Chronology.ofLocale(Locale.JAPAN);
-        Assert.assertEquals(test.getId(), "ISO");
-        Assert.assertEquals(test, IsoChronology.INSTANCE);
+        assertEquals("ISO", test.getId());
+        assertEquals(IsoChronology.INSTANCE, test);
     }
 
     @Test
     public void test_chrono_byLocale_oldJP_variant() {
         Chronology test = Chronology.ofLocale(Locale.of("ja", "JP", "JP"));
-        Assert.assertEquals(test.getId(), "Japanese");
-        Assert.assertEquals(test, JapaneseChronology.INSTANCE);
+        assertEquals("Japanese", test.getId());
+        assertEquals(JapaneseChronology.INSTANCE, test);
     }
 
     @Test
     public void test_chrono_byLocale_iso() {
-        Assert.assertEquals(Chronology.ofLocale(Locale.JAPAN).getId(), "ISO");
-        Assert.assertEquals(Chronology.ofLocale(Locale.forLanguageTag("ja-JP")).getId(), "ISO");
-        Assert.assertEquals(Chronology.ofLocale(Locale.forLanguageTag("ja-JP-JP")).getId(), "ISO");
+        assertEquals("ISO", Chronology.ofLocale(Locale.JAPAN).getId());
+        assertEquals("ISO", Chronology.ofLocale(Locale.forLanguageTag("ja-JP")).getId());
+        assertEquals("ISO", Chronology.ofLocale(Locale.forLanguageTag("ja-JP-JP")).getId());
     }
 
     //-----------------------------------------------------------------------
     // creation and cross-checks
     //-----------------------------------------------------------------------
-    @DataProvider(name="createByEra")
     Object[][] data_createByEra() {
         return new Object[][] {
                 {JapaneseEra.REIWA, 2020 - YDIFF_REIWA, 2, 29, 60, LocalDate.of(2020, 2, 29)},
@@ -190,58 +189,64 @@ public class TCKJapaneseChronology {
         };
     }
 
-    @Test(dataProvider="createByEra")
+    @ParameterizedTest
+    @MethodSource("data_createByEra")
     public void test_createEymd(JapaneseEra era, int yoe, int moy, int dom, int doy, LocalDate iso) {
         JapaneseDate dateByChronoFactory = JapaneseChronology.INSTANCE.date(era, yoe, moy, dom);
         JapaneseDate dateByDateFactory = JapaneseDate.of(era, yoe, moy, dom);
-        assertEquals(dateByChronoFactory, dateByDateFactory);
-        assertEquals(dateByChronoFactory.hashCode(), dateByDateFactory.hashCode());
+        assertEquals(dateByDateFactory, dateByChronoFactory);
+        assertEquals(dateByDateFactory.hashCode(), dateByChronoFactory.hashCode());
     }
 
-    @Test(dataProvider="createByEra")
+    @ParameterizedTest
+    @MethodSource("data_createByEra")
     public void test_createEyd(JapaneseEra era, int yoe, int moy, int dom, int doy, LocalDate iso) {
         JapaneseDate dateByChronoFactory = JapaneseChronology.INSTANCE.dateYearDay(era, yoe, doy);
         JapaneseDate dateByDateFactory = JapaneseDate.of(era, yoe, moy, dom);
-        assertEquals(dateByChronoFactory, dateByDateFactory);
-        assertEquals(dateByChronoFactory.hashCode(), dateByDateFactory.hashCode());
+        assertEquals(dateByDateFactory, dateByChronoFactory);
+        assertEquals(dateByDateFactory.hashCode(), dateByChronoFactory.hashCode());
     }
 
-    @Test(dataProvider="createByEra")
+    @ParameterizedTest
+    @MethodSource("data_createByEra")
     public void test_createByEra_isEqual(JapaneseEra era, int yoe, int moy, int dom, int doy, LocalDate iso) {
         JapaneseDate test = JapaneseDate.of(era, yoe, moy, dom);
-        assertEquals(test.isEqual(iso), true);
-        assertEquals(iso.isEqual(test), true);
+        assertEquals(true, test.isEqual(iso));
+        assertEquals(true, iso.isEqual(test));
     }
 
-    @Test(dataProvider="createByEra")
+    @ParameterizedTest
+    @MethodSource("data_createByEra")
     public void test_createByEra_chronologyTemporalFactory(JapaneseEra era, int yoe, int moy, int dom, int doy, LocalDate iso) {
         JapaneseDate test = JapaneseDate.of(era, yoe, moy, dom);
-        assertEquals(IsoChronology.INSTANCE.date(test), iso);
-        assertEquals(JapaneseChronology.INSTANCE.date(iso), test);
+        assertEquals(iso, IsoChronology.INSTANCE.date(test));
+        assertEquals(test, JapaneseChronology.INSTANCE.date(iso));
     }
 
-    @Test(dataProvider="createByEra")
+    @ParameterizedTest
+    @MethodSource("data_createByEra")
     public void test_createByEra_dateFrom(JapaneseEra era, int yoe, int moy, int dom, int doy, LocalDate iso) {
         JapaneseDate test = JapaneseDate.of(era, yoe, moy, dom);
-        assertEquals(LocalDate.from(test), iso);
-        assertEquals(JapaneseDate.from(iso), test);
+        assertEquals(iso, LocalDate.from(test));
+        assertEquals(test, JapaneseDate.from(iso));
     }
 
-    @Test(dataProvider="createByEra")
+    @ParameterizedTest
+    @MethodSource("data_createByEra")
     public void test_createByEra_query(JapaneseEra era, int yoe, int moy, int dom, int doy, LocalDate iso) {
         JapaneseDate test = JapaneseDate.of(era, yoe, moy, dom);
-        assertEquals(test.query(TemporalQueries.localDate()), iso);
+        assertEquals(iso, test.query(TemporalQueries.localDate()));
     }
 
-    @Test(dataProvider="createByEra")
+    @ParameterizedTest
+    @MethodSource("data_createByEra")
     public void test_createByEra_epochDay(JapaneseEra era, int yoe, int moy, int dom, int doy, LocalDate iso) {
         JapaneseDate test = JapaneseDate.of(era, yoe, moy, dom);
-        assertEquals(test.getLong(EPOCH_DAY), iso.getLong(EPOCH_DAY));
-        assertEquals(test.toEpochDay(), iso.toEpochDay());
+        assertEquals(iso.getLong(EPOCH_DAY), test.getLong(EPOCH_DAY));
+        assertEquals(iso.toEpochDay(), test.toEpochDay());
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="createByProleptic")
     Object[][] data_createByProleptic() {
         return new Object[][] {
                 {1928, 2, 28, 59, LocalDate.of(1928, 2, 28)},
@@ -258,79 +263,85 @@ public class TCKJapaneseChronology {
         };
     }
 
-    @Test(dataProvider="createByProleptic")
+    @ParameterizedTest
+    @MethodSource("data_createByProleptic")
     public void test_createYmd(int y, int moy, int dom, int doy, LocalDate iso) {
         JapaneseDate dateByChronoFactory = JapaneseChronology.INSTANCE.date(y, moy, dom);
         JapaneseDate dateByDateFactory = JapaneseDate.of(y, moy, dom);
-        assertEquals(dateByChronoFactory, dateByDateFactory);
-        assertEquals(dateByChronoFactory.hashCode(), dateByDateFactory.hashCode());
+        assertEquals(dateByDateFactory, dateByChronoFactory);
+        assertEquals(dateByDateFactory.hashCode(), dateByChronoFactory.hashCode());
     }
 
-    @Test(dataProvider="createByProleptic")
+    @ParameterizedTest
+    @MethodSource("data_createByProleptic")
     public void test_createYd(int y, int moy, int dom, int doy, LocalDate iso) {
         JapaneseDate dateByChronoFactory = JapaneseChronology.INSTANCE.dateYearDay(y, doy);
         JapaneseDate dateByDateFactory = JapaneseDate.of(y, moy, dom);
-        assertEquals(dateByChronoFactory, dateByDateFactory);
-        assertEquals(dateByChronoFactory.hashCode(), dateByDateFactory.hashCode());
+        assertEquals(dateByDateFactory, dateByChronoFactory);
+        assertEquals(dateByDateFactory.hashCode(), dateByChronoFactory.hashCode());
     }
 
-    @Test(dataProvider="createByProleptic")
+    @ParameterizedTest
+    @MethodSource("data_createByProleptic")
     public void test_createByProleptic_isEqual(int y, int moy, int dom, int doy, LocalDate iso) {
         JapaneseDate test = JapaneseDate.of(y, moy, dom);
-        assertEquals(test.isEqual(iso), true);
-        assertEquals(iso.isEqual(test), true);
+        assertEquals(true, test.isEqual(iso));
+        assertEquals(true, iso.isEqual(test));
     }
 
-    @Test(dataProvider="createByProleptic")
+    @ParameterizedTest
+    @MethodSource("data_createByProleptic")
     public void test_createByProleptic_chronologyTemporalFactory(int y, int moy, int dom, int doy, LocalDate iso) {
         JapaneseDate test = JapaneseDate.of(y, moy, dom);
-        assertEquals(IsoChronology.INSTANCE.date(test), iso);
-        assertEquals(JapaneseChronology.INSTANCE.date(iso), test);
+        assertEquals(iso, IsoChronology.INSTANCE.date(test));
+        assertEquals(test, JapaneseChronology.INSTANCE.date(iso));
     }
 
-    @Test(dataProvider="createByProleptic")
+    @ParameterizedTest
+    @MethodSource("data_createByProleptic")
     public void test_createByProleptic_dateFrom(int y, int moy, int dom, int doy, LocalDate iso) {
         JapaneseDate test = JapaneseDate.of(y, moy, dom);
-        assertEquals(LocalDate.from(test), iso);
-        assertEquals(JapaneseDate.from(iso), test);
+        assertEquals(iso, LocalDate.from(test));
+        assertEquals(test, JapaneseDate.from(iso));
     }
 
-    @Test(dataProvider="createByProleptic")
+    @ParameterizedTest
+    @MethodSource("data_createByProleptic")
     public void test_createByProleptic_query(int y, int moy, int dom, int doy, LocalDate iso) {
         JapaneseDate test = JapaneseDate.of(y, moy, dom);
-        assertEquals(test.query(TemporalQueries.localDate()), iso);
+        assertEquals(iso, test.query(TemporalQueries.localDate()));
     }
 
-    @Test(dataProvider="createByProleptic")
+    @ParameterizedTest
+    @MethodSource("data_createByProleptic")
     public void test_createByProleptic_epochDay(int y, int moy, int dom, int doy, LocalDate iso) {
         JapaneseDate test = JapaneseDate.of(y, moy, dom);
-        assertEquals(test.getLong(EPOCH_DAY), iso.getLong(EPOCH_DAY));
-        assertEquals(test.toEpochDay(), iso.toEpochDay());
+        assertEquals(iso.getLong(EPOCH_DAY), test.getLong(EPOCH_DAY));
+        assertEquals(iso.toEpochDay(), test.toEpochDay());
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_dateNow(){
-        assertEquals(JapaneseChronology.INSTANCE.dateNow(), JapaneseDate.now()) ;
-        assertEquals(JapaneseChronology.INSTANCE.dateNow(), JapaneseDate.now(ZoneId.systemDefault())) ;
-        assertEquals(JapaneseChronology.INSTANCE.dateNow(), JapaneseDate.now(Clock.systemDefaultZone())) ;
-        assertEquals(JapaneseChronology.INSTANCE.dateNow(), JapaneseDate.now(Clock.systemDefaultZone().getZone())) ;
+        assertEquals(JapaneseDate.now(), JapaneseChronology.INSTANCE.dateNow()) ;
+        assertEquals(JapaneseDate.now(ZoneId.systemDefault()), JapaneseChronology.INSTANCE.dateNow()) ;
+        assertEquals(JapaneseDate.now(Clock.systemDefaultZone()), JapaneseChronology.INSTANCE.dateNow()) ;
+        assertEquals(JapaneseDate.now(Clock.systemDefaultZone().getZone()), JapaneseChronology.INSTANCE.dateNow()) ;
 
-        assertEquals(JapaneseChronology.INSTANCE.dateNow(), JapaneseChronology.INSTANCE.dateNow(ZoneId.systemDefault())) ;
-        assertEquals(JapaneseChronology.INSTANCE.dateNow(), JapaneseChronology.INSTANCE.dateNow(Clock.systemDefaultZone())) ;
-        assertEquals(JapaneseChronology.INSTANCE.dateNow(), JapaneseChronology.INSTANCE.dateNow(Clock.systemDefaultZone().getZone())) ;
+        assertEquals(JapaneseChronology.INSTANCE.dateNow(ZoneId.systemDefault()), JapaneseChronology.INSTANCE.dateNow()) ;
+        assertEquals(JapaneseChronology.INSTANCE.dateNow(Clock.systemDefaultZone()), JapaneseChronology.INSTANCE.dateNow()) ;
+        assertEquals(JapaneseChronology.INSTANCE.dateNow(Clock.systemDefaultZone().getZone()), JapaneseChronology.INSTANCE.dateNow()) ;
 
         ZoneId zoneId = ZoneId.of("Europe/Paris");
-        assertEquals(JapaneseChronology.INSTANCE.dateNow(zoneId), JapaneseChronology.INSTANCE.dateNow(Clock.system(zoneId))) ;
-        assertEquals(JapaneseChronology.INSTANCE.dateNow(zoneId), JapaneseChronology.INSTANCE.dateNow(Clock.system(zoneId).getZone())) ;
-        assertEquals(JapaneseChronology.INSTANCE.dateNow(zoneId), JapaneseDate.now(Clock.system(zoneId))) ;
-        assertEquals(JapaneseChronology.INSTANCE.dateNow(zoneId), JapaneseDate.now(Clock.system(zoneId).getZone())) ;
+        assertEquals(JapaneseChronology.INSTANCE.dateNow(Clock.system(zoneId)), JapaneseChronology.INSTANCE.dateNow(zoneId)) ;
+        assertEquals(JapaneseChronology.INSTANCE.dateNow(Clock.system(zoneId).getZone()), JapaneseChronology.INSTANCE.dateNow(zoneId)) ;
+        assertEquals(JapaneseDate.now(Clock.system(zoneId)), JapaneseChronology.INSTANCE.dateNow(zoneId)) ;
+        assertEquals(JapaneseDate.now(Clock.system(zoneId).getZone()), JapaneseChronology.INSTANCE.dateNow(zoneId)) ;
 
-        assertEquals(JapaneseChronology.INSTANCE.dateNow(ZoneId.of(ZoneOffset.UTC.getId())), JapaneseChronology.INSTANCE.dateNow(Clock.systemUTC())) ;
+        assertEquals(JapaneseChronology.INSTANCE.dateNow(Clock.systemUTC()), JapaneseChronology.INSTANCE.dateNow(ZoneId.of(ZoneOffset.UTC.getId()))) ;
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="badDates")
     Object[][] data_badDates() {
         return new Object[][] {
             {1928, 0, 0},
@@ -356,15 +367,15 @@ public class TCKJapaneseChronology {
         };
     }
 
-    @Test(dataProvider="badDates", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_badDates")
     public void test_badDates(int year, int month, int dom) {
-        JapaneseChronology.INSTANCE.date(year, month, dom);
+        Assertions.assertThrows(DateTimeException.class, () -> JapaneseChronology.INSTANCE.date(year, month, dom));
     }
 
     //-----------------------------------------------------------------------
     // prolepticYear() and is LeapYear()
     //-----------------------------------------------------------------------
-    @DataProvider(name="prolepticYear")
     Object[][] data_prolepticYear() {
         return new Object[][] {
                 {3, JapaneseEra.REIWA, 1, 1 + YDIFF_REIWA, false},
@@ -384,29 +395,30 @@ public class TCKJapaneseChronology {
         };
     }
 
-    @Test(dataProvider="prolepticYear")
+    @ParameterizedTest
+    @MethodSource("data_prolepticYear")
     public void test_prolepticYear(int eraValue, Era  era, int yearOfEra, int expectedProlepticYear, boolean isLeapYear) {
         Era eraObj = JapaneseChronology.INSTANCE.eraOf(eraValue);
         assertTrue(JapaneseChronology.INSTANCE.eras().contains(eraObj));
-        assertEquals(eraObj, era);
-        assertEquals(JapaneseChronology.INSTANCE.prolepticYear(era, yearOfEra), expectedProlepticYear);
+        assertEquals(era, eraObj);
+        assertEquals(expectedProlepticYear, JapaneseChronology.INSTANCE.prolepticYear(era, yearOfEra));
     }
 
-    @Test(dataProvider="prolepticYear")
+    @ParameterizedTest
+    @MethodSource("data_prolepticYear")
     public void test_isLeapYear(int eraValue, Era  era, int yearOfEra, int expectedProlepticYear, boolean isLeapYear) {
-        assertEquals(JapaneseChronology.INSTANCE.isLeapYear(expectedProlepticYear), isLeapYear);
-        assertEquals(JapaneseChronology.INSTANCE.isLeapYear(expectedProlepticYear), Year.of(expectedProlepticYear).isLeap());
+        assertEquals(isLeapYear, JapaneseChronology.INSTANCE.isLeapYear(expectedProlepticYear));
+        assertEquals(Year.of(expectedProlepticYear).isLeap(), JapaneseChronology.INSTANCE.isLeapYear(expectedProlepticYear));
 
         JapaneseDate jdate = JapaneseDate.now();
         jdate = jdate.with(ChronoField.YEAR, expectedProlepticYear).with(ChronoField.MONTH_OF_YEAR, 2);
         if (isLeapYear) {
-            assertEquals(jdate.lengthOfMonth(), 29);
+            assertEquals(29, jdate.lengthOfMonth());
         } else {
-            assertEquals(jdate.lengthOfMonth(), 28);
+            assertEquals(28, jdate.lengthOfMonth());
         }
     }
 
-    @DataProvider(name="prolepticYearError")
     Object[][] data_prolepticYearError() {
         return new Object[][] {
                 {JapaneseEra.MEIJI, 100},
@@ -423,9 +435,10 @@ public class TCKJapaneseChronology {
         };
     }
 
-    @Test(dataProvider="prolepticYearError", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_prolepticYearError")
     public void test_prolepticYearError(Era era, int yearOfEra) {
-        JapaneseChronology.INSTANCE.prolepticYear(era, yearOfEra);
+        Assertions.assertThrows(DateTimeException.class, () -> JapaneseChronology.INSTANCE.prolepticYear(era, yearOfEra));
     }
 
     //-----------------------------------------------------------------------
@@ -464,11 +477,11 @@ public class TCKJapaneseChronology {
     @Test
     public void test_getLong() {
         JapaneseDate base = JapaneseChronology.INSTANCE.date(JapaneseEra.SHOWA, 63, 6, 30);
-        assertEquals(base.getLong(ERA), JapaneseEra.SHOWA.getValue());
-        assertEquals(base.getLong(YEAR), 1988L);
-        assertEquals(base.getLong(YEAR_OF_ERA), 63L);
-        assertEquals(base.getLong(MONTH_OF_YEAR), 6L);
-        assertEquals(base.getLong(DAY_OF_MONTH), 30L);
+        assertEquals(JapaneseEra.SHOWA.getValue(), base.getLong(ERA));
+        assertEquals(1988L, base.getLong(YEAR));
+        assertEquals(63L, base.getLong(YEAR_OF_ERA));
+        assertEquals(6L, base.getLong(MONTH_OF_YEAR));
+        assertEquals(30L, base.getLong(DAY_OF_MONTH));
     }
 
     //-----------------------------------------------------------------------
@@ -478,19 +491,19 @@ public class TCKJapaneseChronology {
     public void test_with_TemporalField_long() {
         JapaneseDate base = JapaneseChronology.INSTANCE.date(JapaneseEra.SHOWA, 63, 6, 30);
         JapaneseDate test = base.with(YEAR, 1987);
-        assertEquals(test, JapaneseChronology.INSTANCE.date(JapaneseEra.SHOWA, 62, 6, 30));
+        assertEquals(JapaneseChronology.INSTANCE.date(JapaneseEra.SHOWA, 62, 6, 30), test);
 
         test = test.with(YEAR_OF_ERA, 2);
-        assertEquals(test, JapaneseChronology.INSTANCE.date(JapaneseEra.SHOWA, 2, 6, 30));
+        assertEquals(JapaneseChronology.INSTANCE.date(JapaneseEra.SHOWA, 2, 6, 30), test);
 
         test = test.with(ERA, JapaneseEra.HEISEI.getValue());
-        assertEquals(test, JapaneseChronology.INSTANCE.date(JapaneseEra.HEISEI, 2, 6, 30));
+        assertEquals(JapaneseChronology.INSTANCE.date(JapaneseEra.HEISEI, 2, 6, 30), test);
 
         test = test.with(MONTH_OF_YEAR, 3);
-        assertEquals(test, JapaneseChronology.INSTANCE.date(JapaneseEra.HEISEI, 2, 3, 30));
+        assertEquals(JapaneseChronology.INSTANCE.date(JapaneseEra.HEISEI, 2, 3, 30), test);
 
         test = test.with(DAY_OF_MONTH, 4);
-        assertEquals(test, JapaneseChronology.INSTANCE.date(JapaneseEra.HEISEI, 2, 3, 4));
+        assertEquals(JapaneseChronology.INSTANCE.date(JapaneseEra.HEISEI, 2, 3, 4), test);
     }
 
     //-----------------------------------------------------------------------
@@ -500,14 +513,14 @@ public class TCKJapaneseChronology {
     public void test_adjust1() {
         JapaneseDate base = JapaneseChronology.INSTANCE.date(1928, 10, 29);
         JapaneseDate test = base.with(TemporalAdjusters.lastDayOfMonth());
-        assertEquals(test, JapaneseChronology.INSTANCE.date(1928, 10, 31));
+        assertEquals(JapaneseChronology.INSTANCE.date(1928, 10, 31), test);
     }
 
     @Test
     public void test_adjust2() {
         JapaneseDate base = JapaneseChronology.INSTANCE.date(1928, 12, 2);
         JapaneseDate test = base.with(TemporalAdjusters.lastDayOfMonth());
-        assertEquals(test, JapaneseChronology.INSTANCE.date(1928, 12, 31));
+        assertEquals(JapaneseChronology.INSTANCE.date(1928, 12, 31), test);
     }
 
     //-----------------------------------------------------------------------
@@ -517,13 +530,15 @@ public class TCKJapaneseChronology {
     public void test_adjust_toLocalDate() {
         JapaneseDate jdate = JapaneseChronology.INSTANCE.date(1926, 1, 4);
         JapaneseDate test = jdate.with(LocalDate.of(2012, 7, 6));
-        assertEquals(test, JapaneseChronology.INSTANCE.date(2012, 7, 6));
+        assertEquals(JapaneseChronology.INSTANCE.date(2012, 7, 6), test);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_adjust_toMonth() {
-        JapaneseDate jdate = JapaneseChronology.INSTANCE.date(1926, 1, 4);
-        jdate.with(Month.APRIL);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            JapaneseDate jdate = JapaneseChronology.INSTANCE.date(1926, 1, 4);
+            jdate.with(Month.APRIL);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -533,20 +548,19 @@ public class TCKJapaneseChronology {
     public void test_LocalDate_adjustToJapaneseDate() {
         JapaneseDate jdate = JapaneseChronology.INSTANCE.date(1928, 10, 29);
         LocalDate test = LocalDate.MIN.with(jdate);
-        assertEquals(test, LocalDate.of(1928, 10, 29));
+        assertEquals(LocalDate.of(1928, 10, 29), test);
     }
 
     @Test
     public void test_LocalDateTime_adjustToJapaneseDate() {
         JapaneseDate jdate = JapaneseChronology.INSTANCE.date(1928, 10, 29);
         LocalDateTime test = LocalDateTime.MIN.with(jdate);
-        assertEquals(test, LocalDateTime.of(1928, 10, 29, 0, 0));
+        assertEquals(LocalDateTime.of(1928, 10, 29, 0, 0), test);
     }
 
     //-----------------------------------------------------------------------
     // Check Japanese Eras
     //-----------------------------------------------------------------------
-    @DataProvider(name="japaneseEras")
     Object[][] data_japanseseEras() {
         return new Object[][] {
             { JapaneseEra.MEIJI, -1, "Meiji"},
@@ -557,11 +571,12 @@ public class TCKJapaneseChronology {
         };
     }
 
-    @Test(dataProvider="japaneseEras")
+    @ParameterizedTest
+    @MethodSource("data_japanseseEras")
     public void test_Japanese_Eras(Era era, int eraValue, String name) {
-        assertEquals(era.getValue(), eraValue, "EraValue");
-        assertEquals(era.toString(), name, "Era Name");
-        assertEquals(era, JapaneseChronology.INSTANCE.eraOf(eraValue), "JapaneseChronology.eraOf()");
+        assertEquals(eraValue, era.getValue(), "EraValue");
+        assertEquals(name, era.toString(), "Era Name");
+        assertEquals(JapaneseChronology.INSTANCE.eraOf(eraValue), era, "JapaneseChronology.eraOf()");
         List<Era> eras = JapaneseChronology.INSTANCE.eras();
         assertTrue(eras.contains(era), "Era is not present in JapaneseChronology.INSTANCE.eras()");
     }
@@ -579,27 +594,28 @@ public class TCKJapaneseChronology {
         }
     }
 
-    @Test(dataProvider="japaneseEras")
+    @ParameterizedTest
+    @MethodSource("data_japanseseEras")
     public void test_JapaneseEra_singletons(Era expectedEra, int eraValue, String name) {
         JapaneseEra actualEra = JapaneseEra.valueOf(name);
-        assertEquals(actualEra, expectedEra, "JapaneseEra.valueOf(name)");
+        assertEquals(expectedEra, actualEra, "JapaneseEra.valueOf(name)");
 
         actualEra = JapaneseEra.of(eraValue);
-        assertEquals(actualEra, expectedEra, "JapaneseEra.of(value)");
+        assertEquals(expectedEra, actualEra, "JapaneseEra.of(value)");
 
         String string = actualEra.toString();
-        assertEquals(string, name, "JapaneseEra.toString()");
+        assertEquals(name, string, "JapaneseEra.toString()");
     }
 
     @Test
     public void test_JapaneseEra_values() {
         JapaneseEra[] actualEras = JapaneseEra.values();
         Object[][] erasInfo = data_japanseseEras();
-        assertEquals(actualEras.length, erasInfo.length, "Wrong number of Eras");
+        assertEquals(erasInfo.length, actualEras.length, "Wrong number of Eras");
 
         for (int i = 0; i < erasInfo.length; i++) {
             Object[] eraInfo = erasInfo[i];
-            assertEquals(actualEras[i], eraInfo[0], "Singleton mismatch");
+            assertEquals(eraInfo[0], actualEras[i], "Singleton mismatch");
         }
     }
 
@@ -607,11 +623,11 @@ public class TCKJapaneseChronology {
     public void test_JapaneseChronology_eras() {
         List<Era> actualEras = JapaneseChronology.INSTANCE.eras();
         Object[][] erasInfo = data_japanseseEras();
-        assertEquals(actualEras.size(), erasInfo.length, "Wrong number of Eras");
+        assertEquals(erasInfo.length, actualEras.size(), "Wrong number of Eras");
 
         for (int i = 0; i < erasInfo.length; i++) {
             Object[] eraInfo = erasInfo[i];
-            assertEquals(actualEras.get(i), eraInfo[0], "Singleton mismatch");
+            assertEquals(eraInfo[0], actualEras.get(i), "Singleton mismatch");
         }
     }
 
@@ -623,7 +639,7 @@ public class TCKJapaneseChronology {
         JapaneseDate mdate1 = JapaneseDate.of(1970, 1, 1);
         JapaneseDate mdate2 = JapaneseDate.of(1971, 2, 2);
         ChronoPeriod period = mdate1.until(mdate2);
-        assertEquals(period, JapaneseChronology.INSTANCE.period(1, 1, 1));
+        assertEquals(JapaneseChronology.INSTANCE.period(1, 1, 1), period);
     }
 
     @Test
@@ -631,7 +647,7 @@ public class TCKJapaneseChronology {
         JapaneseDate mdate1 = JapaneseDate.of(1970, 1, 1);
         JapaneseDate mdate2 = JapaneseDate.of(1971, 2, 2);
         long months = mdate1.until(mdate2, ChronoUnit.MONTHS);
-        assertEquals(months, 13);
+        assertEquals(13, months);
     }
 
     @Test
@@ -640,7 +656,7 @@ public class TCKJapaneseChronology {
         JapaneseDate mdate2 = JapaneseDate.of(1971, 2, 2);
         MinguoDate ldate2 = MinguoChronology.INSTANCE.date(mdate2);
         ChronoPeriod period = mdate1.until(ldate2);
-        assertEquals(period, JapaneseChronology.INSTANCE.period(1, 1, 1));
+        assertEquals(JapaneseChronology.INSTANCE.period(1, 1, 1), period);
     }
 
     //-----------------------------------------------------------------------
@@ -653,12 +669,12 @@ public class TCKJapaneseChronology {
             int firstYear = (era == JapaneseEra.MEIJI) ? 6 : 1;  // Until Era supports range(YEAR_OF_ERA)
             JapaneseDate hd1 = JapaneseChronology.INSTANCE.dateYearDay(era, firstYear, 1);
             ValueRange range = hd1.range(DAY_OF_YEAR);
-            assertEquals(range.getMaximum(), hd1.lengthOfYear(), "lengthOfYear should match range.getMaximum()");
+            assertEquals(hd1.lengthOfYear(), range.getMaximum(), "lengthOfYear should match range.getMaximum()");
 
             for (int i = 1; i <= hd1.lengthOfYear(); i++) {
                 JapaneseDate hd = JapaneseChronology.INSTANCE.dateYearDay(era, firstYear, i);
                 int doy = hd.get(DAY_OF_YEAR);
-                assertEquals(doy, i, "get(DAY_OF_YEAR) incorrect for " + i + ", of date: " + hd);
+                assertEquals(i, doy, "get(DAY_OF_YEAR) incorrect for " + i + ", of date: " + hd);
             }
         }
     }
@@ -669,14 +685,13 @@ public class TCKJapaneseChronology {
         for (int i = 1; i <= hd.lengthOfYear(); i++) {
             JapaneseDate hd2 = hd.with(DAY_OF_YEAR, i);
             int doy = hd2.get(DAY_OF_YEAR);
-            assertEquals(doy, i, "with(DAY_OF_YEAR) incorrect for " + i + " " + hd2);
+            assertEquals(i, doy, "with(DAY_OF_YEAR) incorrect for " + i + " " + hd2);
         }
     }
 
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
-    @DataProvider(name="toString")
     Object[][] data_toString() {
         return new Object[][] {
             {JapaneseChronology.INSTANCE.date(1873, 12,  5), "Japanese Meiji 6-12-05"},
@@ -693,9 +708,10 @@ public class TCKJapaneseChronology {
         };
     }
 
-    @Test(dataProvider="toString")
+    @ParameterizedTest
+    @MethodSource("data_toString")
     public void test_toString(JapaneseDate jdate, String expected) {
-        assertEquals(jdate.toString(), expected);
+        assertEquals(expected, jdate.toString());
     }
 
     //-----------------------------------------------------------------------
@@ -713,7 +729,6 @@ public class TCKJapaneseChronology {
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_styleByEra")
     Object[][] data_resolve_styleByEra() {
         Object[][] result = new Object[ResolverStyle.values().length * JapaneseEra.values().length][];
         int i = 0;
@@ -725,41 +740,43 @@ public class TCKJapaneseChronology {
         return result;
     }
 
-    @Test(dataProvider = "resolve_styleByEra")
+    @ParameterizedTest
+    @MethodSource("data_resolve_styleByEra")
     public void test_resolve_yearOfEra_eraOnly_valid(ResolverStyle style, JapaneseEra era) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.ERA, (long) era.getValue());
         JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, style);
-        assertEquals(date, null);
-        assertEquals(fieldValues.get(ChronoField.ERA), (Long) (long) era.getValue());
-        assertEquals(fieldValues.size(), 1);
+        assertEquals(null, date);
+        assertEquals((Long) (long) era.getValue(), fieldValues.get(ChronoField.ERA));
+        assertEquals(1, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_styleByEra")
+    @ParameterizedTest
+    @MethodSource("data_resolve_styleByEra")
     public void test_resolve_yearOfEra_eraAndYearOfEraOnly_valid(ResolverStyle style, JapaneseEra era) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.ERA, (long) era.getValue());
         fieldValues.put(ChronoField.YEAR_OF_ERA, 1L);
         JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, style);
-        assertEquals(date, null);
-        assertEquals(fieldValues.get(ChronoField.ERA), (Long) (long) era.getValue());
-        assertEquals(fieldValues.get(ChronoField.YEAR_OF_ERA), (Long) 1L);
-        assertEquals(fieldValues.size(), 2);
+        assertEquals(null, date);
+        assertEquals((Long) (long) era.getValue(), fieldValues.get(ChronoField.ERA));
+        assertEquals((Long) 1L, fieldValues.get(ChronoField.YEAR_OF_ERA));
+        assertEquals(2, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_styleByEra")
+    @ParameterizedTest
+    @MethodSource("data_resolve_styleByEra")
     public void test_resolve_yearOfEra_eraAndYearOnly_valid(ResolverStyle style, JapaneseEra era) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.ERA, (long) era.getValue());
         fieldValues.put(ChronoField.YEAR, 1L);
         JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, style);
-        assertEquals(date, null);
-        assertEquals(fieldValues.get(ChronoField.ERA), (Long) (long) era.getValue());
-        assertEquals(fieldValues.get(ChronoField.YEAR), (Long) 1L);
-        assertEquals(fieldValues.size(), 2);
+        assertEquals(null, date);
+        assertEquals((Long) (long) era.getValue(), fieldValues.get(ChronoField.ERA));
+        assertEquals((Long) 1L, fieldValues.get(ChronoField.YEAR));
+        assertEquals(2, fieldValues.size());
     }
 
-    @DataProvider(name = "resolve_styles")
     Object[][] data_resolve_styles() {
         Object[][] result = new Object[ResolverStyle.values().length][];
         int i = 0;
@@ -769,28 +786,31 @@ public class TCKJapaneseChronology {
         return result;
     }
 
-    @Test(dataProvider = "resolve_styles")
+    @ParameterizedTest
+    @MethodSource("data_resolve_styles")
     public void test_resolve_yearOfEra_yearOfEraOnly_valid(ResolverStyle style) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR_OF_ERA, 1L);
         JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, style);
-        assertEquals(date, null);
-        assertEquals(fieldValues.get(ChronoField.YEAR_OF_ERA), (Long) 1L);
-        assertEquals(fieldValues.size(), 1);
+        assertEquals(null, date);
+        assertEquals((Long) 1L, fieldValues.get(ChronoField.YEAR_OF_ERA));
+        assertEquals(1, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_styles")
+    @ParameterizedTest
+    @MethodSource("data_resolve_styles")
     public void test_resolve_yearOfEra_yearOfEraAndYearOnly_valid(ResolverStyle style) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR_OF_ERA, 1L);
         fieldValues.put(ChronoField.YEAR, 2012L);
         JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, style);
-        assertEquals(date, null);
-        assertEquals(fieldValues.get(ChronoField.YEAR_OF_ERA), (Long) 1L);
-        assertEquals(fieldValues.get(ChronoField.YEAR), (Long) 2012L);
-        assertEquals(fieldValues.size(), 2);
+        assertEquals(null, date);
+        assertEquals((Long) 1L, fieldValues.get(ChronoField.YEAR_OF_ERA));
+        assertEquals((Long) 2012L, fieldValues.get(ChronoField.YEAR));
+        assertEquals(2, fieldValues.size());
     }
 
+    @Test
     public void test_resolve_yearOfEra_eraOnly_invalidTooSmall() {
         for (ResolverStyle style : ResolverStyle.values()) {
             Map<TemporalField, Long> fieldValues = new HashMap<>();
@@ -804,6 +824,7 @@ public class TCKJapaneseChronology {
         }
     }
 
+    @Test
     public void test_resolve_yearOfEra_eraOnly_invalidTooLarge() {
         for (ResolverStyle style : ResolverStyle.values()) {
             Map<TemporalField, Long> fieldValues = new HashMap<>();
@@ -819,7 +840,6 @@ public class TCKJapaneseChronology {
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_ymd")
     Object[][] data_resolve_ymd() {
         return new Object[][] {
                 {2012, 1, -365, date(2010, 12, 31), false, false},
@@ -873,18 +893,20 @@ public class TCKJapaneseChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_ymd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymd")
     public void test_resolve_ymd_lenient(int y, int m, int d, JapaneseDate expected, Object smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
         fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
         JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
-        assertEquals(date, expected);
-        assertEquals(fieldValues.size(), 0);
+        assertEquals(expected, date);
+        assertEquals(0, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_ymd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymd")
     public void test_resolve_ymd_smart(int y, int m, int d, JapaneseDate expected, Object smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -892,11 +914,11 @@ public class TCKJapaneseChronology {
         fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
         if (Boolean.TRUE.equals(smart)) {
             JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else if (smart instanceof JapaneseDate) {
             JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, smart);
+            assertEquals(smart, date);
         } else {
             try {
                 JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
@@ -907,7 +929,8 @@ public class TCKJapaneseChronology {
         }
     }
 
-    @Test(dataProvider = "resolve_ymd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymd")
     public void test_resolve_ymd_strict(int y, int m, int d, JapaneseDate expected, Object smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -915,8 +938,8 @@ public class TCKJapaneseChronology {
         fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
         if (strict) {
             JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
@@ -929,7 +952,6 @@ public class TCKJapaneseChronology {
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_yd")
     Object[][] data_resolve_yd() {
         return new Object[][] {
                 {2012, -365, date(2010, 12, 31), false, false},
@@ -957,25 +979,27 @@ public class TCKJapaneseChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_yd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yd")
     public void test_resolve_yd_lenient(int y, int d, JapaneseDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
         JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
-        assertEquals(date, expected);
-        assertEquals(fieldValues.size(), 0);
+        assertEquals(expected, date);
+        assertEquals(0, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_yd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yd")
     public void test_resolve_yd_smart(int y, int d, JapaneseDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
         if (smart) {
             JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
@@ -986,15 +1010,16 @@ public class TCKJapaneseChronology {
         }
     }
 
-    @Test(dataProvider = "resolve_yd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yd")
     public void test_resolve_yd_strict(int y, int d, JapaneseDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
         if (strict) {
             JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
@@ -1007,7 +1032,6 @@ public class TCKJapaneseChronology {
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_eymd")
     Object[][] data_resolve_eymd() {
         return new Object[][] {
                 // lenient
@@ -1157,7 +1181,8 @@ public class TCKJapaneseChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_eymd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_eymd")
     public void test_resolve_eymd(ResolverStyle style, JapaneseEra era, int yoe, int m, int d, JapaneseDate expected) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.ERA, (long) era.getValue());
@@ -1166,8 +1191,8 @@ public class TCKJapaneseChronology {
         fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
         if (expected != null) {
             JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, style);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 JapaneseChronology.INSTANCE.resolveDate(fieldValues, style);
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseEra.java b/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseEra.java
index edd3374b06b..f7f461716d2 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseEra.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKJapaneseEra.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,27 +54,30 @@
  */
 package tck.java.time.chrono;
 
+import java.time.DateTimeException;
 import static java.time.temporal.ChronoField.ERA;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.chrono.Era;
 import java.time.chrono.JapaneseChronology;
 import java.time.chrono.JapaneseEra;
 import java.util.List;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Tests for JapaneseEra
  * @bug 8068278
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKJapaneseEra {
 
-    @DataProvider(name = "JapaneseEras")
     Object[][] data_of_eras() {
         return new Object[][] {
                     {JapaneseEra.REIWA, "Reiwa", 3},
@@ -85,7 +88,6 @@ public class TCKJapaneseEra {
         };
     }
 
-    @DataProvider(name = "InvalidJapaneseEras")
     Object[][] data_of_invalid_eras() {
         return new Object[][] {
                 {-2},
@@ -99,11 +101,12 @@ public class TCKJapaneseEra {
     //-----------------------------------------------------------------------
     // JapaneseEra value test
     //-----------------------------------------------------------------------
-    @Test(dataProvider="JapaneseEras")
+    @ParameterizedTest
+    @MethodSource("data_of_eras")
     public void test_valueOf(JapaneseEra era , String eraName, int eraValue) {
-        assertEquals(era.getValue(), eraValue);
-        assertEquals(JapaneseEra.of(eraValue), era);
-        assertEquals(JapaneseEra.valueOf(eraName), era);
+        assertEquals(eraValue, era.getValue());
+        assertEquals(era, JapaneseEra.of(eraValue));
+        assertEquals(era, JapaneseEra.valueOf(eraName));
     }
 
     //-----------------------------------------------------------------------
@@ -113,7 +116,7 @@ public class TCKJapaneseEra {
     public void test_values() {
         List<Era> eraList = JapaneseChronology.INSTANCE.eras();
         JapaneseEra[] eras = JapaneseEra.values();
-        assertEquals(eraList.size(), eras.length);
+        assertEquals(eras.length, eraList.size());
         for (JapaneseEra era : eras) {
             assertTrue(eraList.contains(era));
         }
@@ -126,18 +129,19 @@ public class TCKJapaneseEra {
     public void test_range() {
         // eras may be added after release
         for (JapaneseEra era : JapaneseEra.values()) {
-            assertEquals(era.range(ERA).getMinimum(), -1);
-            assertEquals(era.range(ERA).getLargestMinimum(), -1);
-            assertEquals(era.range(ERA).getSmallestMaximum(), era.range(ERA).getMaximum());
-            assertEquals(era.range(ERA).getMaximum() >= 2, true);
+            assertEquals(-1, era.range(ERA).getMinimum());
+            assertEquals(-1, era.range(ERA).getLargestMinimum());
+            assertEquals(era.range(ERA).getMaximum(), era.range(ERA).getSmallestMaximum());
+            assertEquals(true, era.range(ERA).getMaximum() >= 2);
         }
     }
 
     //-----------------------------------------------------------------------
     // JapaneseChronology.INSTANCE.eraOf invalid era test
     //-----------------------------------------------------------------------
-    @Test(dataProvider="InvalidJapaneseEras", expectedExceptions=java.time.DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_of_invalid_eras")
     public void test_outofrange(int era) {
-        JapaneseChronology.INSTANCE.eraOf(era);
+        Assertions.assertThrows(DateTimeException.class, () -> JapaneseChronology.INSTANCE.eraOf(era));
     }
 }
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKMinguoChronology.java b/test/jdk/java/time/tck/java/time/chrono/TCKMinguoChronology.java
index 523a267104f..85bc8f2b4a0 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKMinguoChronology.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKMinguoChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,11 +54,11 @@
  */
 package tck.java.time.chrono;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.Clock;
 import java.time.DateTimeException;
@@ -94,14 +94,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKMinguoChronology {
 
     private static final ZoneOffset OFFSET_PTWO = ZoneOffset.ofHours(2);
@@ -114,16 +116,15 @@ public class TCKMinguoChronology {
     public void test_chrono_byName() {
         Chronology c = MinguoChronology.INSTANCE;
         Chronology test = Chronology.of("Minguo");
-        Assert.assertNotNull(test, "The Minguo calendar could not be found byName");
-        Assert.assertEquals(test.getId(), "Minguo", "ID mismatch");
-        Assert.assertEquals(test.getCalendarType(), "roc", "Type mismatch");
-        Assert.assertEquals(test, c);
+        Assertions.assertNotNull(test, "The Minguo calendar could not be found byName");
+        assertEquals("Minguo", test.getId(), "ID mismatch");
+        assertEquals("roc", test.getCalendarType(), "Type mismatch");
+        assertEquals(c, test);
     }
 
     //-----------------------------------------------------------------------
     // creation, toLocalDate()
     //-----------------------------------------------------------------------
-    @DataProvider(name="samples")
     Object[][] data_samples() {
         return new Object[][] {
             {MinguoChronology.INSTANCE.date(1, 1, 1), LocalDate.of(1 + YDIFF, 1, 1)},
@@ -158,50 +159,55 @@ public class TCKMinguoChronology {
         };
     }
 
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_toLocalDate(MinguoDate minguo, LocalDate iso) {
-        assertEquals(LocalDate.from(minguo), iso);
+        assertEquals(iso, LocalDate.from(minguo));
     }
 
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_fromCalendrical(MinguoDate minguo, LocalDate iso) {
-        assertEquals(MinguoChronology.INSTANCE.date(iso), minguo);
-        assertEquals(MinguoDate.from(iso), minguo);
+        assertEquals(minguo, MinguoChronology.INSTANCE.date(iso));
+        assertEquals(minguo, MinguoDate.from(iso));
     }
 
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_isEqual(MinguoDate minguo, LocalDate iso) {
         assertTrue(minguo.isEqual(iso));
     }
 
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_date_equals(MinguoDate minguo, LocalDate iso) {
         assertFalse(minguo.equals(iso));
-        assertNotEquals(minguo.hashCode(), iso.hashCode());
+        assertNotEquals(iso.hashCode(), minguo.hashCode());
     }
 
     @Test
     public void test_dateNow(){
-        assertEquals(MinguoChronology.INSTANCE.dateNow(), MinguoDate.now()) ;
-        assertEquals(MinguoChronology.INSTANCE.dateNow(), MinguoDate.now(ZoneId.systemDefault())) ;
-        assertEquals(MinguoChronology.INSTANCE.dateNow(), MinguoDate.now(Clock.systemDefaultZone())) ;
-        assertEquals(MinguoChronology.INSTANCE.dateNow(), MinguoDate.now(Clock.systemDefaultZone().getZone())) ;
+        assertEquals(MinguoDate.now(), MinguoChronology.INSTANCE.dateNow()) ;
+        assertEquals(MinguoDate.now(ZoneId.systemDefault()), MinguoChronology.INSTANCE.dateNow()) ;
+        assertEquals(MinguoDate.now(Clock.systemDefaultZone()), MinguoChronology.INSTANCE.dateNow()) ;
+        assertEquals(MinguoDate.now(Clock.systemDefaultZone().getZone()), MinguoChronology.INSTANCE.dateNow()) ;
 
-        assertEquals(MinguoChronology.INSTANCE.dateNow(), MinguoChronology.INSTANCE.dateNow(ZoneId.systemDefault())) ;
-        assertEquals(MinguoChronology.INSTANCE.dateNow(), MinguoChronology.INSTANCE.dateNow(Clock.systemDefaultZone())) ;
-        assertEquals(MinguoChronology.INSTANCE.dateNow(), MinguoChronology.INSTANCE.dateNow(Clock.systemDefaultZone().getZone())) ;
+        assertEquals(MinguoChronology.INSTANCE.dateNow(ZoneId.systemDefault()), MinguoChronology.INSTANCE.dateNow()) ;
+        assertEquals(MinguoChronology.INSTANCE.dateNow(Clock.systemDefaultZone()), MinguoChronology.INSTANCE.dateNow()) ;
+        assertEquals(MinguoChronology.INSTANCE.dateNow(Clock.systemDefaultZone().getZone()), MinguoChronology.INSTANCE.dateNow()) ;
 
         ZoneId zoneId = ZoneId.of("Europe/Paris");
-        assertEquals(MinguoChronology.INSTANCE.dateNow(zoneId), MinguoChronology.INSTANCE.dateNow(Clock.system(zoneId))) ;
-        assertEquals(MinguoChronology.INSTANCE.dateNow(zoneId), MinguoChronology.INSTANCE.dateNow(Clock.system(zoneId).getZone())) ;
-        assertEquals(MinguoChronology.INSTANCE.dateNow(zoneId), MinguoDate.now(Clock.system(zoneId))) ;
-        assertEquals(MinguoChronology.INSTANCE.dateNow(zoneId), MinguoDate.now(Clock.system(zoneId).getZone())) ;
+        assertEquals(MinguoChronology.INSTANCE.dateNow(Clock.system(zoneId)), MinguoChronology.INSTANCE.dateNow(zoneId)) ;
+        assertEquals(MinguoChronology.INSTANCE.dateNow(Clock.system(zoneId).getZone()), MinguoChronology.INSTANCE.dateNow(zoneId)) ;
+        assertEquals(MinguoDate.now(Clock.system(zoneId)), MinguoChronology.INSTANCE.dateNow(zoneId)) ;
+        assertEquals(MinguoDate.now(Clock.system(zoneId).getZone()), MinguoChronology.INSTANCE.dateNow(zoneId)) ;
 
-        assertEquals(MinguoChronology.INSTANCE.dateNow(ZoneId.of(ZoneOffset.UTC.getId())), MinguoChronology.INSTANCE.dateNow(Clock.systemUTC())) ;
+        assertEquals(MinguoChronology.INSTANCE.dateNow(Clock.systemUTC()), MinguoChronology.INSTANCE.dateNow(ZoneId.of(ZoneOffset.UTC.getId()))) ;
     }
 
     @SuppressWarnings("unused")
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_MinguoDate(MinguoDate minguoDate, LocalDate iso) {
         MinguoDate hd = minguoDate;
         ChronoLocalDateTime<MinguoDate> hdt = hd.atTime(LocalTime.NOON);
@@ -229,7 +235,6 @@ public class TCKMinguoChronology {
         ChronoZonedDateTime<MinguoDate> h4 = h3.atZone(ZoneOffset.UTC);
     }
 
-    @DataProvider(name="badDates")
     Object[][] data_badDates() {
         return new Object[][] {
             {1912, 0, 0},
@@ -256,15 +261,15 @@ public class TCKMinguoChronology {
             };
     }
 
-    @Test(dataProvider="badDates", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_badDates")
     public void test_badDates(int year, int month, int dom) {
-        MinguoChronology.INSTANCE.date(year, month, dom);
+        Assertions.assertThrows(DateTimeException.class, () -> MinguoChronology.INSTANCE.date(year, month, dom));
     }
 
     //-----------------------------------------------------------------------
     // prolepticYear() and is LeapYear()
     //-----------------------------------------------------------------------
-    @DataProvider(name="prolepticYear")
     Object[][] data_prolepticYear() {
         return new Object[][] {
             {1, MinguoEra.ROC, 1912 - YDIFF, 1912 - YDIFF, true},
@@ -290,25 +295,27 @@ public class TCKMinguoChronology {
         };
     }
 
-    @Test(dataProvider="prolepticYear")
+    @ParameterizedTest
+    @MethodSource("data_prolepticYear")
     public void test_prolepticYear(int eraValue, Era  era, int yearOfEra, int expectedProlepticYear, boolean isLeapYear) {
         Era eraObj = MinguoChronology.INSTANCE.eraOf(eraValue);
         assertTrue(MinguoChronology.INSTANCE.eras().contains(eraObj));
-        assertEquals(eraObj, era);
-        assertEquals(MinguoChronology.INSTANCE.prolepticYear(era, yearOfEra), expectedProlepticYear);
+        assertEquals(era, eraObj);
+        assertEquals(expectedProlepticYear, MinguoChronology.INSTANCE.prolepticYear(era, yearOfEra));
     }
 
-    @Test(dataProvider="prolepticYear")
+    @ParameterizedTest
+    @MethodSource("data_prolepticYear")
     public void test_isLeapYear(int eraValue, Era  era, int yearOfEra, int expectedProlepticYear, boolean isLeapYear) {
-        assertEquals(MinguoChronology.INSTANCE.isLeapYear(expectedProlepticYear), isLeapYear);
-        assertEquals(MinguoChronology.INSTANCE.isLeapYear(expectedProlepticYear), Year.of(expectedProlepticYear + YDIFF).isLeap());
+        assertEquals(isLeapYear, MinguoChronology.INSTANCE.isLeapYear(expectedProlepticYear));
+        assertEquals(Year.of(expectedProlepticYear + YDIFF).isLeap(), MinguoChronology.INSTANCE.isLeapYear(expectedProlepticYear));
 
         MinguoDate minguo = MinguoDate.now();
         minguo = minguo.with(ChronoField.YEAR, expectedProlepticYear).with(ChronoField.MONTH_OF_YEAR, 2);
         if (isLeapYear) {
-            assertEquals(minguo.lengthOfMonth(), 29);
+            assertEquals(29, minguo.lengthOfMonth());
         } else {
-            assertEquals(minguo.lengthOfMonth(), 28);
+            assertEquals(28, minguo.lengthOfMonth());
         }
     }
 
@@ -359,14 +366,14 @@ public class TCKMinguoChronology {
     public void test_adjust1() {
         MinguoDate base = MinguoChronology.INSTANCE.date(2012, 10, 29);
         MinguoDate test = base.with(TemporalAdjusters.lastDayOfMonth());
-        assertEquals(test, MinguoChronology.INSTANCE.date(2012, 10, 31));
+        assertEquals(MinguoChronology.INSTANCE.date(2012, 10, 31), test);
     }
 
     @Test
     public void test_adjust2() {
         MinguoDate base = MinguoChronology.INSTANCE.date(1728, 12, 2);
         MinguoDate test = base.with(TemporalAdjusters.lastDayOfMonth());
-        assertEquals(test, MinguoChronology.INSTANCE.date(1728, 12, 31));
+        assertEquals(MinguoChronology.INSTANCE.date(1728, 12, 31), test);
     }
 
     //-----------------------------------------------------------------------
@@ -376,13 +383,15 @@ public class TCKMinguoChronology {
     public void test_adjust_toLocalDate() {
         MinguoDate minguo = MinguoChronology.INSTANCE.date(99, 1, 4);
         MinguoDate test = minguo.with(LocalDate.of(2012, 7, 6));
-        assertEquals(test, MinguoChronology.INSTANCE.date(101, 7, 6));
+        assertEquals(MinguoChronology.INSTANCE.date(101, 7, 6), test);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_adjust_toMonth() {
-        MinguoDate minguo = MinguoChronology.INSTANCE.date(1726, 1, 4);
-        minguo.with(Month.APRIL);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            MinguoDate minguo = MinguoChronology.INSTANCE.date(1726, 1, 4);
+            minguo.with(Month.APRIL);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -392,20 +401,19 @@ public class TCKMinguoChronology {
     public void test_LocalDate_adjustToMinguoDate() {
         MinguoDate minguo = MinguoChronology.INSTANCE.date(101, 10, 29);
         LocalDate test = LocalDate.MIN.with(minguo);
-        assertEquals(test, LocalDate.of(2012, 10, 29));
+        assertEquals(LocalDate.of(2012, 10, 29), test);
     }
 
     @Test
     public void test_LocalDateTime_adjustToMinguoDate() {
         MinguoDate minguo = MinguoChronology.INSTANCE.date(101, 10, 29);
         LocalDateTime test = LocalDateTime.MIN.with(minguo);
-        assertEquals(test, LocalDateTime.of(2012, 10, 29, 0, 0));
+        assertEquals(LocalDateTime.of(2012, 10, 29, 0, 0), test);
     }
 
     //-----------------------------------------------------------------------
     // localDateTime()
     //-----------------------------------------------------------------------
-    @DataProvider(name="localDateTime")
     Object[][] data_localDateTime() {
         return new Object[][] {
             {LocalDateTime.of(2012, 2, 29, 2, 7), MinguoChronology.INSTANCE.date(MinguoEra.ROC, 2012 - YDIFF, 2, 29), LocalTime.of(2, 7), null},
@@ -419,13 +427,14 @@ public class TCKMinguoChronology {
         };
     }
 
-    @Test(dataProvider="localDateTime")
+    @ParameterizedTest
+    @MethodSource("data_localDateTime")
     public void test_localDateTime(TemporalAccessor accessor,  MinguoDate expectedDate, LocalTime expectedTime, Class<?> expectedEx) {
         if (expectedEx == null) {
             ChronoLocalDateTime<MinguoDate> result = MinguoChronology.INSTANCE.localDateTime(accessor);
-            assertEquals(result.toLocalDate(), expectedDate);
-            assertEquals(MinguoDate.from(accessor), expectedDate);
-            assertEquals(result.toLocalTime(), expectedTime);
+            assertEquals(expectedDate, result.toLocalDate());
+            assertEquals(expectedDate, MinguoDate.from(accessor));
+            assertEquals(expectedTime, result.toLocalTime());
         } else {
             try {
                 ChronoLocalDateTime<MinguoDate> result = MinguoChronology.INSTANCE.localDateTime(accessor);
@@ -439,7 +448,6 @@ public class TCKMinguoChronology {
     //-----------------------------------------------------------------------
     // zonedDateTime(TemporalAccessor)
     //-----------------------------------------------------------------------
-    @DataProvider(name="zonedDateTime")
     Object[][] data_zonedDateTime() {
         return new Object[][] {
             {ZonedDateTime.of(2012, 2, 29, 2, 7, 1, 1, ZONE_PARIS), MinguoChronology.INSTANCE.date(MinguoEra.ROC, 2012 - YDIFF, 2, 29), LocalTime.of(2, 7, 1, 1), null},
@@ -453,13 +461,14 @@ public class TCKMinguoChronology {
         };
     }
 
-    @Test(dataProvider="zonedDateTime")
+    @ParameterizedTest
+    @MethodSource("data_zonedDateTime")
     public void test_zonedDateTime(TemporalAccessor accessor,  MinguoDate expectedDate, LocalTime expectedTime, Class<?> expectedEx) {
         if (expectedEx == null) {
             ChronoZonedDateTime<MinguoDate> result = MinguoChronology.INSTANCE.zonedDateTime(accessor);
-            assertEquals(result.toLocalDate(), expectedDate);
-            assertEquals(MinguoDate.from(accessor), expectedDate);
-            assertEquals(result.toLocalTime(), expectedTime);
+            assertEquals(expectedDate, result.toLocalDate());
+            assertEquals(expectedDate, MinguoDate.from(accessor));
+            assertEquals(expectedTime, result.toLocalTime());
 
         } else {
             try {
@@ -480,12 +489,12 @@ public class TCKMinguoChronology {
         ZonedDateTime zonedDateTime = ZonedDateTime.of(2012, 2, 29, 2, 7, 1, 1, ZONE_PARIS);
 
         ChronoZonedDateTime<MinguoDate> result = MinguoChronology.INSTANCE.zonedDateTime(offsetDateTime.toInstant(), offsetDateTime.getOffset());
-        assertEquals(result.toLocalDate(), MinguoChronology.INSTANCE.date(MinguoEra.ROC, 2012 - YDIFF, 2, 29));
-        assertEquals(result.toLocalTime(), LocalTime.of(2, 7, 1, 1));
+        assertEquals(MinguoChronology.INSTANCE.date(MinguoEra.ROC, 2012 - YDIFF, 2, 29), result.toLocalDate());
+        assertEquals(LocalTime.of(2, 7, 1, 1), result.toLocalTime());
 
         result = MinguoChronology.INSTANCE.zonedDateTime(zonedDateTime.toInstant(), zonedDateTime.getOffset());
-        assertEquals(result.toLocalDate(), MinguoChronology.INSTANCE.date(MinguoEra.ROC, 2012 - YDIFF, 2, 29));
-        assertEquals(result.toLocalTime(), LocalTime.of(2, 7, 1, 1));
+        assertEquals(MinguoChronology.INSTANCE.date(MinguoEra.ROC, 2012 - YDIFF, 2, 29), result.toLocalDate());
+        assertEquals(LocalTime.of(2, 7, 1, 1), result.toLocalTime());
     }
 
     //-----------------------------------------------------------------------
@@ -496,7 +505,7 @@ public class TCKMinguoChronology {
         MinguoDate mdate1 = MinguoDate.of(1970, 1, 1);
         MinguoDate mdate2 = MinguoDate.of(1971, 2, 2);
         ChronoPeriod period = mdate1.until(mdate2);
-        assertEquals(period, MinguoChronology.INSTANCE.period(1, 1, 1));
+        assertEquals(MinguoChronology.INSTANCE.period(1, 1, 1), period);
     }
 
     @Test
@@ -504,7 +513,7 @@ public class TCKMinguoChronology {
         MinguoDate mdate1 = MinguoDate.of(1970, 1, 1);
         MinguoDate mdate2 = MinguoDate.of(1971, 2, 2);
         long months = mdate1.until(mdate2, ChronoUnit.MONTHS);
-        assertEquals(months, 13);
+        assertEquals(13, months);
     }
 
     @Test
@@ -513,13 +522,12 @@ public class TCKMinguoChronology {
         MinguoDate mdate2 = MinguoDate.of(1971, 2, 2);
         ThaiBuddhistDate ldate2 = ThaiBuddhistChronology.INSTANCE.date(mdate2);
         ChronoPeriod period = mdate1.until(ldate2);
-        assertEquals(period, MinguoChronology.INSTANCE.period(1, 1, 1));
+        assertEquals(MinguoChronology.INSTANCE.period(1, 1, 1), period);
     }
 
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
-    @DataProvider(name="toString")
     Object[][] data_toString() {
         return new Object[][] {
             {MinguoChronology.INSTANCE.date(1, 1, 1), "Minguo ROC 1-01-01"},
@@ -530,9 +538,10 @@ public class TCKMinguoChronology {
         };
     }
 
-    @Test(dataProvider="toString")
+    @ParameterizedTest
+    @MethodSource("data_toString")
     public void test_toString(MinguoDate minguo, String expected) {
-        assertEquals(minguo.toString(), expected);
+        assertEquals(expected, minguo.toString());
     }
 
     //-----------------------------------------------------------------------
@@ -550,7 +559,6 @@ public class TCKMinguoChronology {
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_yearOfEra")
     Object[][] data_resolve_yearOfEra() {
         return new Object[][] {
                 // era only
@@ -615,7 +623,8 @@ public class TCKMinguoChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_yearOfEra")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yearOfEra")
     public void test_resolve_yearOfEra(ResolverStyle style, Integer e, Integer yoe, Integer y, ChronoField field, Integer expected) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         if (e != null) {
@@ -629,9 +638,9 @@ public class TCKMinguoChronology {
         }
         if (field != null) {
             MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, style);
-            assertEquals(date, null);
-            assertEquals(fieldValues.get(field), (Long) expected.longValue());
-            assertEquals(fieldValues.size(), 1);
+            assertEquals(null, date);
+            assertEquals((Long) expected.longValue(), fieldValues.get(field));
+            assertEquals(1, fieldValues.size());
         } else {
             try {
                 MinguoChronology.INSTANCE.resolveDate(fieldValues, style);
@@ -644,7 +653,6 @@ public class TCKMinguoChronology {
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_ymd")
     Object[][] data_resolve_ymd() {
         return new Object[][] {
                 {2012 - YDIFF, 1, -365, date(2010 - YDIFF, 12, 31), false, false},
@@ -703,18 +711,20 @@ public class TCKMinguoChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_ymd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymd")
     public void test_resolve_ymd_lenient(int y, int m, int d, MinguoDate expected, Object smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
         fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
         MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
-        assertEquals(date, expected);
-        assertEquals(fieldValues.size(), 0);
+        assertEquals(expected, date);
+        assertEquals(0, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_ymd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymd")
     public void test_resolve_ymd_smart(int y, int m, int d, MinguoDate expected, Object smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -722,11 +732,11 @@ public class TCKMinguoChronology {
         fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
         if (Boolean.TRUE.equals(smart)) {
             MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else if (smart instanceof MinguoDate) {
             MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, smart);
+            assertEquals(smart, date);
         } else {
             try {
                 MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
@@ -737,7 +747,8 @@ public class TCKMinguoChronology {
         }
     }
 
-    @Test(dataProvider = "resolve_ymd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymd")
     public void test_resolve_ymd_strict(int y, int m, int d, MinguoDate expected, Object smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -745,8 +756,8 @@ public class TCKMinguoChronology {
         fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
         if (strict) {
             MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
@@ -759,7 +770,6 @@ public class TCKMinguoChronology {
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_yd")
     Object[][] data_resolve_yd() {
         return new Object[][] {
                 {2012 - YDIFF, -365, date(2010 - YDIFF, 12, 31), false, false},
@@ -787,25 +797,27 @@ public class TCKMinguoChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_yd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yd")
     public void test_resolve_yd_lenient(int y, int d, MinguoDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
         MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
-        assertEquals(date, expected);
-        assertEquals(fieldValues.size(), 0);
+        assertEquals(expected, date);
+        assertEquals(0, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_yd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yd")
     public void test_resolve_yd_smart(int y, int d, MinguoDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
         if (smart) {
             MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
@@ -816,15 +828,16 @@ public class TCKMinguoChronology {
         }
     }
 
-    @Test(dataProvider = "resolve_yd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yd")
     public void test_resolve_yd_strict(int y, int d, MinguoDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
         if (strict) {
             MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
@@ -837,7 +850,6 @@ public class TCKMinguoChronology {
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_ymaa")
     Object[][] data_resolve_ymaa() {
         return new Object[][] {
                 {2012 - YDIFF, 1, 1, -365, date(2010 - YDIFF, 12, 31), false, false},
@@ -894,7 +906,8 @@ public class TCKMinguoChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_ymaa")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymaa")
     public void test_resolve_ymaa_lenient(int y, int m, int w, int d, MinguoDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -902,11 +915,12 @@ public class TCKMinguoChronology {
         fieldValues.put(ChronoField.ALIGNED_WEEK_OF_MONTH, (long) w);
         fieldValues.put(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH, (long) d);
         MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
-        assertEquals(date, expected);
-        assertEquals(fieldValues.size(), 0);
+        assertEquals(expected, date);
+        assertEquals(0, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_ymaa")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymaa")
     public void test_resolve_ymaa_smart(int y, int m, int w, int d, MinguoDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -915,8 +929,8 @@ public class TCKMinguoChronology {
         fieldValues.put(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH, (long) d);
         if (smart) {
             MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
@@ -927,7 +941,8 @@ public class TCKMinguoChronology {
         }
     }
 
-    @Test(dataProvider = "resolve_ymaa")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymaa")
     public void test_resolve_ymaa_strict(int y, int m, int w, int d, MinguoDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -936,8 +951,8 @@ public class TCKMinguoChronology {
         fieldValues.put(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH, (long) d);
         if (strict) {
             MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKMinguoEra.java b/test/jdk/java/time/tck/java/time/chrono/TCKMinguoEra.java
index 9b7d5bcb535..3a48002c141 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKMinguoEra.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKMinguoEra.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,8 +56,9 @@ package tck.java.time.chrono;
 
 
 import static java.time.temporal.ChronoField.ERA;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.chrono.Era;
 import java.time.chrono.MinguoChronology;
@@ -65,16 +66,17 @@ import java.time.chrono.MinguoEra;
 import java.time.temporal.ValueRange;
 import java.util.List;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKMinguoEra {
 
-    @DataProvider(name = "MinguoEras")
     Object[][] data_of_eras() {
         return new Object[][] {
                     {MinguoEra.BEFORE_ROC, "BEFORE_ROC", 0},
@@ -85,11 +87,12 @@ public class TCKMinguoEra {
     //-----------------------------------------------------------------------
     // valueOf()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="MinguoEras")
+    @ParameterizedTest
+    @MethodSource("data_of_eras")
     public void test_valueOf(MinguoEra era , String eraName, int eraValue) {
-        assertEquals(era.getValue(), eraValue);
-        assertEquals(MinguoEra.of(eraValue), era);
-        assertEquals(MinguoEra.valueOf(eraName), era);
+        assertEquals(eraValue, era.getValue());
+        assertEquals(era, MinguoEra.of(eraValue));
+        assertEquals(era, MinguoEra.valueOf(eraName));
     }
 
 
@@ -100,7 +103,7 @@ public class TCKMinguoEra {
     public void test_values() {
         List<Era> eraList = MinguoChronology.INSTANCE.eras();
         MinguoEra[] eras = MinguoEra.values() ;
-        assertEquals(eraList.size(), eras.length);
+        assertEquals(eras.length, eraList.size());
         for (MinguoEra era : eras) {
             assertTrue(eraList.contains(era));
         }
@@ -112,7 +115,7 @@ public class TCKMinguoEra {
     @Test
     public void test_range() {
         for (MinguoEra era : MinguoEra.values()) {
-            assertEquals(era.range(ERA), ValueRange.of(0, 1));
+            assertEquals(ValueRange.of(0, 1), era.range(ERA));
         }
     }
 
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKTestServiceLoader.java b/test/jdk/java/time/tck/java/time/chrono/TCKTestServiceLoader.java
index aa3aeef31a5..824b8dae70f 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKTestServiceLoader.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKTestServiceLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,19 +59,18 @@
  */
 package tck.java.time.chrono;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.LocalDate;
 import java.time.chrono.ChronoLocalDate;
 import java.time.chrono.Chronology;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests that a custom Chronology is available via the ServiceLoader.
  * The CopticChronology is configured via META-INF/services/java.time.chrono.Chronology.
  */
-@Test
 public class TCKTestServiceLoader {
 
      @Test
@@ -79,8 +78,8 @@ public class TCKTestServiceLoader {
         Chronology chrono = Chronology.of("Coptic");
         ChronoLocalDate copticDate = chrono.date(1729, 4, 27);
         LocalDate ld = LocalDate.from(copticDate);
-        assertEquals(ld, LocalDate.of(2013, 1, 5), "CopticDate does not match LocalDate");
-        assertEquals(chrono.isIsoBased(), false);
+        assertEquals(LocalDate.of(2013, 1, 5), ld, "CopticDate does not match LocalDate");
+        assertEquals(false, chrono.isIsoBased());
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKThaiBuddhistChronology.java b/test/jdk/java/time/tck/java/time/chrono/TCKThaiBuddhistChronology.java
index e54ecf9dc23..739515aa278 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKThaiBuddhistChronology.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKThaiBuddhistChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,11 +59,12 @@ import static java.time.temporal.ChronoField.DAY_OF_YEAR;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoField.YEAR;
 import static java.time.temporal.ChronoField.YEAR_OF_ERA;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.Clock;
 import java.time.DateTimeException;
@@ -94,14 +95,16 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKThaiBuddhistChronology {
 
     private static final int YDIFF = 543;
@@ -113,10 +116,10 @@ public class TCKThaiBuddhistChronology {
     public void test_chrono_byName() {
         Chronology c = ThaiBuddhistChronology.INSTANCE;
         Chronology test = Chronology.of("ThaiBuddhist");
-        Assert.assertNotNull(test, "The ThaiBuddhist calendar could not be found byName");
-        Assert.assertEquals(test.getId(), "ThaiBuddhist", "ID mismatch");
-        Assert.assertEquals(test.getCalendarType(), "buddhist", "Type mismatch");
-        Assert.assertEquals(test, c);
+        Assertions.assertNotNull(test, "The ThaiBuddhist calendar could not be found byName");
+        assertEquals("ThaiBuddhist", test.getId(), "ID mismatch");
+        assertEquals("buddhist", test.getCalendarType(), "Type mismatch");
+        assertEquals(c, test);
     }
 
     //-----------------------------------------------------------------------
@@ -125,42 +128,41 @@ public class TCKThaiBuddhistChronology {
     @Test
     public void test_chrono_byLocale_fullTag_thaiCalendarFromThai() {
         Chronology test = Chronology.ofLocale(Locale.forLanguageTag("th-TH-u-ca-buddhist"));
-        Assert.assertEquals(test.getId(), "ThaiBuddhist");
-        Assert.assertEquals(test, ThaiBuddhistChronology.INSTANCE);
+        assertEquals("ThaiBuddhist", test.getId());
+        assertEquals(ThaiBuddhistChronology.INSTANCE, test);
     }
 
     @Test
     public void test_chrono_byLocale_fullTag_thaiCalendarFromElsewhere() {
         Chronology test = Chronology.ofLocale(Locale.forLanguageTag("en-US-u-ca-buddhist"));
-        Assert.assertEquals(test.getId(), "ThaiBuddhist");
-        Assert.assertEquals(test, ThaiBuddhistChronology.INSTANCE);
+        assertEquals("ThaiBuddhist", test.getId());
+        assertEquals(ThaiBuddhistChronology.INSTANCE, test);
     }
 
     @Test
     public void test_chrono_byLocale_oldTH_noVariant() {  // deliberately different to Calendar
         Chronology test = Chronology.ofLocale(Locale.of("th", "TH"));
-        Assert.assertEquals(test.getId(), "ISO");
-        Assert.assertEquals(test, IsoChronology.INSTANCE);
+        assertEquals("ISO", test.getId());
+        assertEquals(IsoChronology.INSTANCE, test);
     }
 
     @Test
     public void test_chrono_byLocale_oldTH_variant() {
         Chronology test = Chronology.ofLocale(Locale.of("th", "TH", "TH"));
-        Assert.assertEquals(test.getId(), "ISO");
-        Assert.assertEquals(test, IsoChronology.INSTANCE);
+        assertEquals("ISO", test.getId());
+        assertEquals(IsoChronology.INSTANCE, test);
     }
 
     @Test
     public void test_chrono_byLocale_iso() {
-        Assert.assertEquals(Chronology.ofLocale(Locale.of("th", "TH")).getId(), "ISO");
-        Assert.assertEquals(Chronology.ofLocale(Locale.forLanguageTag("th-TH")).getId(), "ISO");
-        Assert.assertEquals(Chronology.ofLocale(Locale.forLanguageTag("th-TH-TH")).getId(), "ISO");
+        assertEquals("ISO", Chronology.ofLocale(Locale.of("th", "TH")).getId());
+        assertEquals("ISO", Chronology.ofLocale(Locale.forLanguageTag("th-TH")).getId());
+        assertEquals("ISO", Chronology.ofLocale(Locale.forLanguageTag("th-TH-TH")).getId());
     }
 
     //-----------------------------------------------------------------------
     // creation, toLocalDate()
     //-----------------------------------------------------------------------
-    @DataProvider(name="samples")
     Object[][] data_samples() {
         return new Object[][] {
             {ThaiBuddhistChronology.INSTANCE.date(1 + YDIFF, 1, 1), LocalDate.of(1, 1, 1)},
@@ -195,49 +197,52 @@ public class TCKThaiBuddhistChronology {
         };
     }
 
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_toLocalDate(ThaiBuddhistDate jdate, LocalDate iso) {
-        assertEquals(LocalDate.from(jdate), iso);
+        assertEquals(iso, LocalDate.from(jdate));
     }
 
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_fromCalendrical(ThaiBuddhistDate jdate, LocalDate iso) {
-        assertEquals(ThaiBuddhistChronology.INSTANCE.date(iso), jdate);
-        assertEquals(ThaiBuddhistDate.from(iso), jdate);
+        assertEquals(jdate, ThaiBuddhistChronology.INSTANCE.date(iso));
+        assertEquals(jdate, ThaiBuddhistDate.from(iso));
     }
 
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_isEqual(ThaiBuddhistDate jdate, LocalDate iso) {
         assertTrue(jdate.isEqual(iso));
     }
 
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_date_equals(ThaiBuddhistDate jdate, LocalDate iso) {
         assertFalse(jdate.equals(iso));
-        assertNotEquals(jdate.hashCode(), iso.hashCode());
+        assertNotEquals(iso.hashCode(), jdate.hashCode());
     }
 
     @Test
     public void test_dateNow(){
-        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(), ThaiBuddhistDate.now()) ;
-        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(), ThaiBuddhistDate.now(ZoneId.systemDefault())) ;
-        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(), ThaiBuddhistDate.now(Clock.systemDefaultZone())) ;
-        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(), ThaiBuddhistDate.now(Clock.systemDefaultZone().getZone())) ;
+        assertEquals(ThaiBuddhistDate.now(), ThaiBuddhistChronology.INSTANCE.dateNow()) ;
+        assertEquals(ThaiBuddhistDate.now(ZoneId.systemDefault()), ThaiBuddhistChronology.INSTANCE.dateNow()) ;
+        assertEquals(ThaiBuddhistDate.now(Clock.systemDefaultZone()), ThaiBuddhistChronology.INSTANCE.dateNow()) ;
+        assertEquals(ThaiBuddhistDate.now(Clock.systemDefaultZone().getZone()), ThaiBuddhistChronology.INSTANCE.dateNow()) ;
 
-        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(), ThaiBuddhistChronology.INSTANCE.dateNow(ZoneId.systemDefault())) ;
-        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(), ThaiBuddhistChronology.INSTANCE.dateNow(Clock.systemDefaultZone())) ;
-        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(), ThaiBuddhistChronology.INSTANCE.dateNow(Clock.systemDefaultZone().getZone())) ;
+        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(ZoneId.systemDefault()), ThaiBuddhistChronology.INSTANCE.dateNow()) ;
+        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(Clock.systemDefaultZone()), ThaiBuddhistChronology.INSTANCE.dateNow()) ;
+        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(Clock.systemDefaultZone().getZone()), ThaiBuddhistChronology.INSTANCE.dateNow()) ;
 
         ZoneId zoneId = ZoneId.of("Europe/Paris");
-        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(zoneId), ThaiBuddhistChronology.INSTANCE.dateNow(Clock.system(zoneId))) ;
-        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(zoneId), ThaiBuddhistChronology.INSTANCE.dateNow(Clock.system(zoneId).getZone())) ;
-        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(zoneId), ThaiBuddhistDate.now(Clock.system(zoneId))) ;
-        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(zoneId), ThaiBuddhistDate.now(Clock.system(zoneId).getZone())) ;
+        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(Clock.system(zoneId)), ThaiBuddhistChronology.INSTANCE.dateNow(zoneId)) ;
+        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(Clock.system(zoneId).getZone()), ThaiBuddhistChronology.INSTANCE.dateNow(zoneId)) ;
+        assertEquals(ThaiBuddhistDate.now(Clock.system(zoneId)), ThaiBuddhistChronology.INSTANCE.dateNow(zoneId)) ;
+        assertEquals(ThaiBuddhistDate.now(Clock.system(zoneId).getZone()), ThaiBuddhistChronology.INSTANCE.dateNow(zoneId)) ;
 
-        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(ZoneId.of(ZoneOffset.UTC.getId())), ThaiBuddhistChronology.INSTANCE.dateNow(Clock.systemUTC())) ;
+        assertEquals(ThaiBuddhistChronology.INSTANCE.dateNow(Clock.systemUTC()), ThaiBuddhistChronology.INSTANCE.dateNow(ZoneId.of(ZoneOffset.UTC.getId()))) ;
     }
 
-    @DataProvider(name="badDates")
     Object[][] data_badDates() {
         return new Object[][] {
             {1728, 0, 0},
@@ -261,15 +266,15 @@ public class TCKThaiBuddhistChronology {
         };
     }
 
-    @Test(dataProvider="badDates", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_badDates")
     public void test_badDates(int year, int month, int dom) {
-        ThaiBuddhistChronology.INSTANCE.date(year, month, dom);
+        Assertions.assertThrows(DateTimeException.class, () -> ThaiBuddhistChronology.INSTANCE.date(year, month, dom));
     }
 
     //-----------------------------------------------------------------------
     // prolepticYear() and is LeapYear()
     //-----------------------------------------------------------------------
-    @DataProvider(name="prolepticYear")
     Object[][] data_prolepticYear() {
         return new Object[][] {
             {1, ThaiBuddhistEra.BE, 4 + YDIFF, 4 + YDIFF, true},
@@ -297,25 +302,27 @@ public class TCKThaiBuddhistChronology {
         };
     }
 
-    @Test(dataProvider="prolepticYear")
+    @ParameterizedTest
+    @MethodSource("data_prolepticYear")
     public void test_prolepticYear(int eraValue, Era  era, int yearOfEra, int expectedProlepticYear, boolean isLeapYear) {
         Era eraObj = ThaiBuddhistChronology.INSTANCE.eraOf(eraValue);
         assertTrue(ThaiBuddhistChronology.INSTANCE.eras().contains(eraObj));
-        assertEquals(eraObj, era);
-        assertEquals(ThaiBuddhistChronology.INSTANCE.prolepticYear(era, yearOfEra), expectedProlepticYear);
+        assertEquals(era, eraObj);
+        assertEquals(expectedProlepticYear, ThaiBuddhistChronology.INSTANCE.prolepticYear(era, yearOfEra));
     }
 
-    @Test(dataProvider="prolepticYear")
+    @ParameterizedTest
+    @MethodSource("data_prolepticYear")
     public void test_isLeapYear(int eraValue, Era  era, int yearOfEra, int expectedProlepticYear, boolean isLeapYear) {
-        assertEquals(ThaiBuddhistChronology.INSTANCE.isLeapYear(expectedProlepticYear), isLeapYear) ;
-        assertEquals(ThaiBuddhistChronology.INSTANCE.isLeapYear(expectedProlepticYear), Year.of(expectedProlepticYear - YDIFF).isLeap());
+        assertEquals(isLeapYear, ThaiBuddhistChronology.INSTANCE.isLeapYear(expectedProlepticYear)) ;
+        assertEquals(Year.of(expectedProlepticYear - YDIFF).isLeap(), ThaiBuddhistChronology.INSTANCE.isLeapYear(expectedProlepticYear));
 
         ThaiBuddhistDate jdate = ThaiBuddhistDate.now();
         jdate = jdate.with(ChronoField.YEAR, expectedProlepticYear).with(ChronoField.MONTH_OF_YEAR, 2);
         if (isLeapYear) {
-            assertEquals(jdate.lengthOfMonth(), 29);
+            assertEquals(29, jdate.lengthOfMonth());
         } else {
-            assertEquals(jdate.lengthOfMonth(), 28);
+            assertEquals(28, jdate.lengthOfMonth());
         }
     }
 
@@ -365,14 +372,14 @@ public class TCKThaiBuddhistChronology {
     public void test_adjust1() {
         ThaiBuddhistDate base = ThaiBuddhistChronology.INSTANCE.date(1728, 10, 29);
         ThaiBuddhistDate test = base.with(TemporalAdjusters.lastDayOfMonth());
-        assertEquals(test, ThaiBuddhistChronology.INSTANCE.date(1728, 10, 31));
+        assertEquals(ThaiBuddhistChronology.INSTANCE.date(1728, 10, 31), test);
     }
 
     @Test
     public void test_adjust2() {
         ThaiBuddhistDate base = ThaiBuddhistChronology.INSTANCE.date(1728, 12, 2);
         ThaiBuddhistDate test = base.with(TemporalAdjusters.lastDayOfMonth());
-        assertEquals(test, ThaiBuddhistChronology.INSTANCE.date(1728, 12, 31));
+        assertEquals(ThaiBuddhistChronology.INSTANCE.date(1728, 12, 31), test);
     }
 
     //-----------------------------------------------------------------------
@@ -382,14 +389,14 @@ public class TCKThaiBuddhistChronology {
     public void test_withYear_BE() {
         ThaiBuddhistDate base = ThaiBuddhistChronology.INSTANCE.date(2555, 8, 29);
         ThaiBuddhistDate test = base.with(YEAR, 2554);
-        assertEquals(test, ThaiBuddhistChronology.INSTANCE.date(2554, 8, 29));
+        assertEquals(ThaiBuddhistChronology.INSTANCE.date(2554, 8, 29), test);
     }
 
     @Test
     public void test_withYear_BBE() {
         ThaiBuddhistDate base = ThaiBuddhistChronology.INSTANCE.date(-2554, 8, 29);
         ThaiBuddhistDate test = base.with(YEAR_OF_ERA, 2554);
-        assertEquals(test, ThaiBuddhistChronology.INSTANCE.date(-2553, 8, 29));
+        assertEquals(ThaiBuddhistChronology.INSTANCE.date(-2553, 8, 29), test);
     }
 
     //-----------------------------------------------------------------------
@@ -399,21 +406,21 @@ public class TCKThaiBuddhistChronology {
     public void test_withEra_BE() {
         ThaiBuddhistDate base = ThaiBuddhistChronology.INSTANCE.date(2555, 8, 29);
         ThaiBuddhistDate test = base.with(ChronoField.ERA, ThaiBuddhistEra.BE.getValue());
-        assertEquals(test, ThaiBuddhistChronology.INSTANCE.date(2555, 8, 29));
+        assertEquals(ThaiBuddhistChronology.INSTANCE.date(2555, 8, 29), test);
     }
 
     @Test
     public void test_withEra_BBE() {
         ThaiBuddhistDate base = ThaiBuddhistChronology.INSTANCE.date(-2554, 8, 29);
         ThaiBuddhistDate test = base.with(ChronoField.ERA, ThaiBuddhistEra.BEFORE_BE.getValue());
-        assertEquals(test, ThaiBuddhistChronology.INSTANCE.date(-2554, 8, 29));
+        assertEquals(ThaiBuddhistChronology.INSTANCE.date(-2554, 8, 29), test);
     }
 
     @Test
     public void test_withEra_swap() {
         ThaiBuddhistDate base = ThaiBuddhistChronology.INSTANCE.date(-2554, 8, 29);
         ThaiBuddhistDate test = base.with(ChronoField.ERA, ThaiBuddhistEra.BE.getValue());
-        assertEquals(test, ThaiBuddhistChronology.INSTANCE.date(2555, 8, 29));
+        assertEquals(ThaiBuddhistChronology.INSTANCE.date(2555, 8, 29), test);
     }
 
     //-----------------------------------------------------------------------
@@ -423,13 +430,15 @@ public class TCKThaiBuddhistChronology {
     public void test_adjust_toLocalDate() {
         ThaiBuddhistDate jdate = ThaiBuddhistChronology.INSTANCE.date(1726, 1, 4);
         ThaiBuddhistDate test = jdate.with(LocalDate.of(2012, 7, 6));
-        assertEquals(test, ThaiBuddhistChronology.INSTANCE.date(2555, 7, 6));
+        assertEquals(ThaiBuddhistChronology.INSTANCE.date(2555, 7, 6), test);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_adjust_toMonth() {
-        ThaiBuddhistDate jdate = ThaiBuddhistChronology.INSTANCE.date(1726, 1, 4);
-        jdate.with(Month.APRIL);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            ThaiBuddhistDate jdate = ThaiBuddhistChronology.INSTANCE.date(1726, 1, 4);
+            jdate.with(Month.APRIL);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -439,14 +448,14 @@ public class TCKThaiBuddhistChronology {
     public void test_LocalDate_adjustToBuddhistDate() {
         ThaiBuddhistDate jdate = ThaiBuddhistChronology.INSTANCE.date(2555, 10, 29);
         LocalDate test = LocalDate.MIN.with(jdate);
-        assertEquals(test, LocalDate.of(2012, 10, 29));
+        assertEquals(LocalDate.of(2012, 10, 29), test);
     }
 
     @Test
     public void test_LocalDateTime_adjustToBuddhistDate() {
         ThaiBuddhistDate jdate = ThaiBuddhistChronology.INSTANCE.date(2555, 10, 29);
         LocalDateTime test = LocalDateTime.MIN.with(jdate);
-        assertEquals(test, LocalDateTime.of(2012, 10, 29, 0, 0));
+        assertEquals(LocalDateTime.of(2012, 10, 29, 0, 0), test);
     }
 
     //-----------------------------------------------------------------------
@@ -457,7 +466,7 @@ public class TCKThaiBuddhistChronology {
         ThaiBuddhistDate mdate1 = ThaiBuddhistDate.of(1, 1, 1);
         ThaiBuddhistDate mdate2 = ThaiBuddhistDate.of(2, 2, 2);
         ChronoPeriod period = mdate1.until(mdate2);
-        assertEquals(period, ThaiBuddhistChronology.INSTANCE.period(1, 1, 1));
+        assertEquals(ThaiBuddhistChronology.INSTANCE.period(1, 1, 1), period);
     }
 
     @Test
@@ -465,7 +474,7 @@ public class TCKThaiBuddhistChronology {
         ThaiBuddhistDate mdate1 = ThaiBuddhistDate.of(1, 1, 1);
         ThaiBuddhistDate mdate2 = ThaiBuddhistDate.of(2, 2, 2);
         long months = mdate1.until(mdate2, ChronoUnit.MONTHS);
-        assertEquals(months, 13);
+        assertEquals(13, months);
     }
 
     @Test
@@ -474,13 +483,12 @@ public class TCKThaiBuddhistChronology {
         ThaiBuddhistDate mdate2 = ThaiBuddhistDate.of(2, 2, 2);
         MinguoDate ldate2 = MinguoChronology.INSTANCE.date(mdate2);
         ChronoPeriod period = mdate1.until(ldate2);
-        assertEquals(period, ThaiBuddhistChronology.INSTANCE.period(1, 1, 1));
+        assertEquals(ThaiBuddhistChronology.INSTANCE.period(1, 1, 1), period);
     }
 
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
-    @DataProvider(name="toString")
     Object[][] data_toString() {
         return new Object[][] {
             {ThaiBuddhistChronology.INSTANCE.date(544, 1, 1), "ThaiBuddhist BE 544-01-01"},
@@ -491,9 +499,10 @@ public class TCKThaiBuddhistChronology {
         };
     }
 
-    @Test(dataProvider="toString")
+    @ParameterizedTest
+    @MethodSource("data_toString")
     public void test_toString(ThaiBuddhistDate jdate, String expected) {
-        assertEquals(jdate.toString(), expected);
+        assertEquals(expected, jdate.toString());
     }
 
     //-----------------------------------------------------------------------
@@ -503,12 +512,12 @@ public class TCKThaiBuddhistChronology {
     public void test_Chrono_range() {
         long minYear = LocalDate.MIN.getYear() + YDIFF;
         long maxYear = LocalDate.MAX.getYear() + YDIFF;
-        assertEquals(ThaiBuddhistChronology.INSTANCE.range(YEAR), ValueRange.of(minYear, maxYear));
-        assertEquals(ThaiBuddhistChronology.INSTANCE.range(YEAR_OF_ERA), ValueRange.of(1, -minYear + 1, maxYear));
+        assertEquals(ValueRange.of(minYear, maxYear), ThaiBuddhistChronology.INSTANCE.range(YEAR));
+        assertEquals(ValueRange.of(1, -minYear + 1, maxYear), ThaiBuddhistChronology.INSTANCE.range(YEAR_OF_ERA));
 
-        assertEquals(ThaiBuddhistChronology.INSTANCE.range(DAY_OF_MONTH), DAY_OF_MONTH.range());
-        assertEquals(ThaiBuddhistChronology.INSTANCE.range(DAY_OF_YEAR), DAY_OF_YEAR.range());
-        assertEquals(ThaiBuddhistChronology.INSTANCE.range(MONTH_OF_YEAR), MONTH_OF_YEAR.range());
+        assertEquals(DAY_OF_MONTH.range(), ThaiBuddhistChronology.INSTANCE.range(DAY_OF_MONTH));
+        assertEquals(DAY_OF_YEAR.range(), ThaiBuddhistChronology.INSTANCE.range(DAY_OF_YEAR));
+        assertEquals(MONTH_OF_YEAR.range(), ThaiBuddhistChronology.INSTANCE.range(MONTH_OF_YEAR));
     }
 
     //-----------------------------------------------------------------------
@@ -526,7 +535,6 @@ public class TCKThaiBuddhistChronology {
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_yearOfEra")
     Object[][] data_resolve_yearOfEra() {
         return new Object[][] {
                 // era only
@@ -591,7 +599,8 @@ public class TCKThaiBuddhistChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_yearOfEra")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yearOfEra")
     public void test_resolve_yearOfEra(ResolverStyle style, Integer e, Integer yoe, Integer y, ChronoField field, Integer expected) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         if (e != null) {
@@ -605,9 +614,9 @@ public class TCKThaiBuddhistChronology {
         }
         if (field != null) {
             ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, style);
-            assertEquals(date, null);
-            assertEquals(fieldValues.get(field), (Long) expected.longValue());
-            assertEquals(fieldValues.size(), 1);
+            assertEquals(null, date);
+            assertEquals((Long) expected.longValue(), fieldValues.get(field));
+            assertEquals(1, fieldValues.size());
         } else {
             try {
                 ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, style);
@@ -620,7 +629,6 @@ public class TCKThaiBuddhistChronology {
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_ymd")
     Object[][] data_resolve_ymd() {
         return new Object[][] {
                 {YDIFF + 2012, 1, -365, date(YDIFF + 2010, 12, 31), false, false},
@@ -679,18 +687,20 @@ public class TCKThaiBuddhistChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_ymd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymd")
     public void test_resolve_ymd_lenient(int y, int m, int d, ThaiBuddhistDate expected, Object smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
         fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
         ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
-        assertEquals(date, expected);
-        assertEquals(fieldValues.size(), 0);
+        assertEquals(expected, date);
+        assertEquals(0, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_ymd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymd")
     public void test_resolve_ymd_smart(int y, int m, int d, ThaiBuddhistDate expected, Object smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -698,11 +708,11 @@ public class TCKThaiBuddhistChronology {
         fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
         if (Boolean.TRUE.equals(smart)) {
             ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else if (smart instanceof ThaiBuddhistDate) {
             ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, smart);
+            assertEquals(smart, date);
         } else {
             try {
                 ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
@@ -713,7 +723,8 @@ public class TCKThaiBuddhistChronology {
         }
     }
 
-    @Test(dataProvider = "resolve_ymd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymd")
     public void test_resolve_ymd_strict(int y, int m, int d, ThaiBuddhistDate expected, Object smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -721,8 +732,8 @@ public class TCKThaiBuddhistChronology {
         fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
         if (strict) {
             ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
@@ -735,7 +746,6 @@ public class TCKThaiBuddhistChronology {
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_yd")
     Object[][] data_resolve_yd() {
         return new Object[][] {
                 {YDIFF + 2012, -365, date(YDIFF + 2010, 12, 31), false, false},
@@ -763,25 +773,27 @@ public class TCKThaiBuddhistChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_yd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yd")
     public void test_resolve_yd_lenient(int y, int d, ThaiBuddhistDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
         ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
-        assertEquals(date, expected);
-        assertEquals(fieldValues.size(), 0);
+        assertEquals(expected, date);
+        assertEquals(0, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_yd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yd")
     public void test_resolve_yd_smart(int y, int d, ThaiBuddhistDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
         if (smart) {
             ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
@@ -792,15 +804,16 @@ public class TCKThaiBuddhistChronology {
         }
     }
 
-    @Test(dataProvider = "resolve_yd")
+    @ParameterizedTest
+    @MethodSource("data_resolve_yd")
     public void test_resolve_yd_strict(int y, int d, ThaiBuddhistDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
         fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
         if (strict) {
             ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
@@ -813,7 +826,6 @@ public class TCKThaiBuddhistChronology {
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "resolve_ymaa")
     Object[][] data_resolve_ymaa() {
         return new Object[][] {
                 {YDIFF + 2012, 1, 1, -365, date(YDIFF + 2010, 12, 31), false, false},
@@ -870,7 +882,8 @@ public class TCKThaiBuddhistChronology {
         };
     }
 
-    @Test(dataProvider = "resolve_ymaa")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymaa")
     public void test_resolve_ymaa_lenient(int y, int m, int w, int d, ThaiBuddhistDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -878,11 +891,12 @@ public class TCKThaiBuddhistChronology {
         fieldValues.put(ChronoField.ALIGNED_WEEK_OF_MONTH, (long) w);
         fieldValues.put(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH, (long) d);
         ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
-        assertEquals(date, expected);
-        assertEquals(fieldValues.size(), 0);
+        assertEquals(expected, date);
+        assertEquals(0, fieldValues.size());
     }
 
-    @Test(dataProvider = "resolve_ymaa")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymaa")
     public void test_resolve_ymaa_smart(int y, int m, int w, int d, ThaiBuddhistDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -891,8 +905,8 @@ public class TCKThaiBuddhistChronology {
         fieldValues.put(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH, (long) d);
         if (smart) {
             ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
@@ -903,7 +917,8 @@ public class TCKThaiBuddhistChronology {
         }
     }
 
-    @Test(dataProvider = "resolve_ymaa")
+    @ParameterizedTest
+    @MethodSource("data_resolve_ymaa")
     public void test_resolve_ymaa_strict(int y, int m, int w, int d, ThaiBuddhistDate expected, boolean smart, boolean strict) {
         Map<TemporalField, Long> fieldValues = new HashMap<>();
         fieldValues.put(ChronoField.YEAR, (long) y);
@@ -912,8 +927,8 @@ public class TCKThaiBuddhistChronology {
         fieldValues.put(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH, (long) d);
         if (strict) {
             ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
-            assertEquals(date, expected);
-            assertEquals(fieldValues.size(), 0);
+            assertEquals(expected, date);
+            assertEquals(0, fieldValues.size());
         } else {
             try {
                 ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
diff --git a/test/jdk/java/time/tck/java/time/chrono/TCKThaiBuddhistEra.java b/test/jdk/java/time/tck/java/time/chrono/TCKThaiBuddhistEra.java
index c4db30ccd72..d6585de716e 100644
--- a/test/jdk/java/time/tck/java/time/chrono/TCKThaiBuddhistEra.java
+++ b/test/jdk/java/time/tck/java/time/chrono/TCKThaiBuddhistEra.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,8 +55,9 @@
 package tck.java.time.chrono;
 
 import static java.time.temporal.ChronoField.ERA;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.chrono.Era;
 import java.time.chrono.ThaiBuddhistChronology;
@@ -64,16 +65,17 @@ import java.time.chrono.ThaiBuddhistEra;
 import java.time.temporal.ValueRange;
 import java.util.List;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKThaiBuddhistEra {
 
-    @DataProvider(name = "ThaiBuddhistEras")
     Object[][] data_of_eras() {
         return new Object[][] {
                     {ThaiBuddhistEra.BEFORE_BE, "BEFORE_BE", 0},
@@ -85,11 +87,12 @@ public class TCKThaiBuddhistEra {
     //-----------------------------------------------------------------------
     // valueOf()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="ThaiBuddhistEras")
+    @ParameterizedTest
+    @MethodSource("data_of_eras")
     public void test_valueOf(ThaiBuddhistEra era , String eraName, int eraValue) {
-        assertEquals(era.getValue(), eraValue);
-        assertEquals(ThaiBuddhistEra.of(eraValue), era);
-        assertEquals(ThaiBuddhistEra.valueOf(eraName), era);
+        assertEquals(eraValue, era.getValue());
+        assertEquals(era, ThaiBuddhistEra.of(eraValue));
+        assertEquals(era, ThaiBuddhistEra.valueOf(eraName));
     }
 
     //-----------------------------------------------------------------------
@@ -99,7 +102,7 @@ public class TCKThaiBuddhistEra {
     public void test_values() {
         List<Era> eraList = ThaiBuddhistChronology.INSTANCE.eras();
         ThaiBuddhistEra[] eras = ThaiBuddhistEra.values();
-        assertEquals(eraList.size(), eras.length);
+        assertEquals(eras.length, eraList.size());
         for (ThaiBuddhistEra era : eras) {
             assertTrue(eraList.contains(era));
         }
@@ -111,7 +114,7 @@ public class TCKThaiBuddhistEra {
     @Test
     public void test_range() {
         for (ThaiBuddhistEra era : ThaiBuddhistEra.values()) {
-            assertEquals(era.range(ERA), ValueRange.of(0, 1));
+            assertEquals(ValueRange.of(0, 1), era.range(ERA));
         }
     }
 
diff --git a/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoLocalDateSerialization.java b/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoLocalDateSerialization.java
index 8364d0137d8..42234f23f92 100644
--- a/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoLocalDateSerialization.java
+++ b/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoLocalDateSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,17 +69,17 @@ import java.time.chrono.JapaneseEra;
 import java.time.chrono.MinguoDate;
 import java.time.chrono.ThaiBuddhistDate;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import tck.java.time.AbstractTCKTest;
 
 /**
  * Test serialization of built-in chronologies.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKChronoLocalDateSerialization extends AbstractTCKTest {
 
     static final int CHRONO_TYPE = 1;            // java.time.chrono.Ser.CHRONO_TYPE
@@ -91,7 +91,6 @@ public class TCKChronoLocalDateSerialization extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     // Regular data factory for names and descriptions of available calendars
     //-----------------------------------------------------------------------
-    @DataProvider(name = "calendars")
     Object[][] data_of_calendars() {
         return new Object[][]{
             {JapaneseDate.of(JapaneseEra.HEISEI, 25, 01, 05), JAPANESE_DATE_TYPE},
@@ -104,7 +103,8 @@ public class TCKChronoLocalDateSerialization extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     // Test Serialization of Calendars
     //-----------------------------------------------------------------------
-    @Test( dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_ChronoSerialization(ChronoLocalDate date, int dateType) throws Exception {
         assertSerializable(date);
     }
@@ -112,8 +112,9 @@ public class TCKChronoLocalDateSerialization extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     // Test that serialization produces exact sequence of bytes
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
-    private void test_serialization_format(ChronoLocalDate date, int dateType) throws Exception {
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
+    void test_serialization_format(ChronoLocalDate date, int dateType) throws Exception {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         try (DataOutputStream dos = new DataOutputStream(baos) ) {
             dos.writeByte(dateType);
@@ -164,7 +165,6 @@ public class TCKChronoLocalDateSerialization extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     // Regular data factory for names and descriptions of available calendars
     //-----------------------------------------------------------------------
-    @DataProvider(name = "invalidSerialformClasses")
     Object[][] invalid_serial_classes() {
         return new Object[][]{
             {JapaneseEra.class},
@@ -175,7 +175,8 @@ public class TCKChronoLocalDateSerialization extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="invalidSerialformClasses")
+    @ParameterizedTest
+    @MethodSource("invalid_serial_classes")
     public void test_invalid_serialform(Class<?> clazz) throws Exception {
         assertNotSerializable(clazz);
     }
diff --git a/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoLocalDateTimeSerialization.java b/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoLocalDateTimeSerialization.java
index eb4e2cb6554..b3b987699c0 100644
--- a/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoLocalDateTimeSerialization.java
+++ b/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoLocalDateTimeSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,8 +54,6 @@
  */
 package tck.java.time.chrono.serial;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -67,18 +65,21 @@ import java.time.chrono.JapaneseChronology;
 import java.time.chrono.MinguoChronology;
 import java.time.chrono.ThaiBuddhistChronology;
 
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import tck.java.time.AbstractTCKTest;
 
 /**
  * Test serialization of ChronoLocalDateTime for all built-in chronologies.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKChronoLocalDateTimeSerialization extends AbstractTCKTest {
 
     //-----------------------------------------------------------------------
     // regular data factory for available calendars
     //-----------------------------------------------------------------------
-    @DataProvider(name = "calendars")
     Chronology[][] data_of_calendars() {
         return new Chronology[][]{
                     {HijrahChronology.INSTANCE},
@@ -91,7 +92,8 @@ public class TCKChronoLocalDateTimeSerialization extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     // Test Serialization of ChronoLocalDateTime
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_ChronoLocalDateTimeSerialization(Chronology chrono) throws Exception {
         LocalDateTime ref = LocalDate.of(2013, 1, 5).atTime(12, 1, 2, 3);
         ChronoLocalDateTime<?> original = chrono.date(ref).atTime(ref.toLocalTime());
diff --git a/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoZonedDateTimeSerialization.java b/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoZonedDateTimeSerialization.java
index bb76aa8e381..0c41e893f15 100644
--- a/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoZonedDateTimeSerialization.java
+++ b/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronoZonedDateTimeSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,20 +64,22 @@ import java.time.chrono.IsoChronology;
 import java.time.chrono.JapaneseChronology;
 import java.time.chrono.MinguoChronology;
 import java.time.chrono.ThaiBuddhistChronology;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import tck.java.time.AbstractTCKTest;
 
 /**
  * Test assertions that must be true for all built-in chronologies.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKChronoZonedDateTimeSerialization extends AbstractTCKTest {
 
     //-----------------------------------------------------------------------
     // regular data factory for names and descriptions of available calendars
     //-----------------------------------------------------------------------
-    @DataProvider(name = "calendars")
     Chronology[][] data_of_calendars() {
         return new Chronology[][]{
                     {HijrahChronology.INSTANCE},
@@ -91,7 +93,8 @@ public class TCKChronoZonedDateTimeSerialization extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     // Test Serialization of ISO via chrono API
     //-----------------------------------------------------------------------
-    @Test( dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_ChronoZonedDateTimeSerialization(Chronology chrono) throws Exception {
         ZonedDateTime ref = LocalDate.of(2013, 1, 5).atTime(12, 1, 2, 3).atZone(ZoneId.of("GMT+01:23"));
         ChronoZonedDateTime<?> original = chrono.date(ref).atTime(ref.toLocalTime()).atZone(ref.getZone());
diff --git a/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronologySerialization.java b/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronologySerialization.java
index 950c371c620..b615bcf3423 100644
--- a/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronologySerialization.java
+++ b/test/jdk/java/time/tck/java/time/chrono/serial/TCKChronologySerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,12 +64,13 @@ import java.time.chrono.JapaneseChronology;
 import java.time.chrono.MinguoChronology;
 import java.time.chrono.ThaiBuddhistChronology;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import tck.java.time.AbstractTCKTest;
 
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKChronologySerialization extends AbstractTCKTest {
 
     static final int CHRONO_TYPE = 1;            // java.time.chrono.Ser.CHRONO_TYPE
@@ -77,7 +78,6 @@ public class TCKChronologySerialization extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     // Regular data factory for available calendars
     //-----------------------------------------------------------------------
-    @DataProvider(name = "calendars")
     Chronology[][] data_of_calendars() {
         return new Chronology[][]{
                     {HijrahChronology.INSTANCE},
@@ -90,7 +90,8 @@ public class TCKChronologySerialization extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     // Test Serialization of Calendars
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_chronoSerialization(Chronology chrono) throws Exception {
         assertSerializable(chrono);
     }
@@ -98,8 +99,9 @@ public class TCKChronologySerialization extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     // Test that serialization produces exact sequence of bytes
     //-----------------------------------------------------------------------
-    @Test(dataProvider="calendars")
-    private void test_serializationBytes(Chronology chrono) throws Exception {
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
+    void test_serializationBytes(Chronology chrono) throws Exception {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         try (DataOutputStream dos = new DataOutputStream(baos) ) {
             dos.writeByte(CHRONO_TYPE);
@@ -113,7 +115,6 @@ public class TCKChronologySerialization extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     // Regular data factory for names and descriptions of available calendars
     //-----------------------------------------------------------------------
-    @DataProvider(name = "invalidSerialformClasses")
     Object[][] invalid_serial_classes() {
         return new Object[][]{
             {IsoChronology.class},
@@ -124,7 +125,8 @@ public class TCKChronologySerialization extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="invalidSerialformClasses")
+    @ParameterizedTest
+    @MethodSource("invalid_serial_classes")
     public void test_invalid_serialform(Class<?> clazz) throws Exception {
         assertNotSerializable(clazz);
     }
diff --git a/test/jdk/java/time/tck/java/time/chrono/serial/TCKCopticSerialization.java b/test/jdk/java/time/tck/java/time/chrono/serial/TCKCopticSerialization.java
index 0fc489ee27c..10fc8e970ad 100644
--- a/test/jdk/java/time/tck/java/time/chrono/serial/TCKCopticSerialization.java
+++ b/test/jdk/java/time/tck/java/time/chrono/serial/TCKCopticSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,13 +63,13 @@ import java.io.IOException;
 import java.time.chrono.ChronoLocalDate;
 import java.time.chrono.Chronology;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+
 import tck.java.time.AbstractTCKTest;
 
 /**
  * Tests the serialization of ChronoLocalDate using a CopticDate.
  */
-@Test
 public class TCKCopticSerialization extends AbstractTCKTest {
 
     @Test
diff --git a/test/jdk/java/time/tck/java/time/chrono/serial/TCKEraSerialization.java b/test/jdk/java/time/tck/java/time/chrono/serial/TCKEraSerialization.java
index 8df56baa8ef..55aa1d69667 100644
--- a/test/jdk/java/time/tck/java/time/chrono/serial/TCKEraSerialization.java
+++ b/test/jdk/java/time/tck/java/time/chrono/serial/TCKEraSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,8 +75,10 @@ import java.time.chrono.JapaneseEra;
 import java.time.chrono.MinguoEra;
 import java.time.chrono.ThaiBuddhistEra;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import tck.java.time.AbstractTCKTest;
 
@@ -87,7 +89,7 @@ import tck.java.time.AbstractTCKTest;
  * The serialized form of these types are not tested, only that they are
  * serializable.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKEraSerialization extends AbstractTCKTest {
 
     static final int JAPANESE_ERA_TYPE = 5;     // java.time.chrono.Ser.JAPANESE_ERA
@@ -96,7 +98,6 @@ public class TCKEraSerialization extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     // Regular data factory for the available Eras
     //-----------------------------------------------------------------------
-    @DataProvider(name = "Eras")
     Era[][] data_of_calendars() {
         return new Era[][] {
                     {HijrahEra.AH},
@@ -109,7 +110,8 @@ public class TCKEraSerialization extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider="Eras")
+    @ParameterizedTest
+    @MethodSource("data_of_calendars")
     public void test_eraSerialization(Era era) throws IOException, ClassNotFoundException {
         assertSerializableSame(era);
     }
@@ -118,7 +120,7 @@ public class TCKEraSerialization extends AbstractTCKTest {
     // Test JapaneseEra serialization produces exact sequence of bytes
     //-----------------------------------------------------------------------
     @Test
-    private void test_JapaneseErasSerialization() throws Exception {
+    void test_JapaneseErasSerialization() throws Exception {
         for (JapaneseEra era : JapaneseEra.values()) {
             assertSerializableSame(era);
 
diff --git a/test/jdk/java/time/tck/java/time/format/TCKChronoPrinterParser.java b/test/jdk/java/time/tck/java/time/format/TCKChronoPrinterParser.java
index 882bf9ccd44..427055fb8a1 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKChronoPrinterParser.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKChronoPrinterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@
  */
 package tck.java.time.format;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.text.ParsePosition;
 import java.time.chrono.Chronology;
@@ -72,39 +72,41 @@ import java.time.temporal.TemporalQueries;
 import java.time.temporal.TemporalQuery;
 import java.util.Locale;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test formatter chrono.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKChronoPrinterParser {
     // this test assumes ISO, ThaiBuddhist and Japanese are available
 
     private DateTimeFormatterBuilder builder;
     private ParsePosition pos;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         builder = new DateTimeFormatterBuilder();
         pos = new ParsePosition(0);
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=IndexOutOfBoundsException.class)
+    @Test
     public void test_parse_negativePosition() {
-        builder.appendChronologyId().toFormatter().parseUnresolved("ISO", new ParsePosition(-1));
+        Assertions.assertThrows(IndexOutOfBoundsException.class, () -> builder.appendChronologyId().toFormatter().parseUnresolved("ISO", new ParsePosition(-1)));
     }
 
-    @Test(expectedExceptions=IndexOutOfBoundsException.class)
+    @Test
     public void test_parse_offEndPosition() {
-        builder.appendChronologyId().toFormatter().parseUnresolved("ISO", new ParsePosition(4));
+        Assertions.assertThrows(IndexOutOfBoundsException.class, () -> builder.appendChronologyId().toFormatter().parseUnresolved("ISO", new ParsePosition(4)));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseValid")
     Object[][] data_parseValid() {
         return new Object[][] {
                 {"ISO", IsoChronology.INSTANCE},
@@ -117,35 +119,37 @@ public class TCKChronoPrinterParser {
         };
     }
 
-    @Test(dataProvider="parseValid")
+    @ParameterizedTest
+    @MethodSource("data_parseValid")
     public void test_parseValid_caseSensitive(String text, Chronology expected) {
         builder.appendChronologyId();
         TemporalAccessor parsed = builder.toFormatter().parseUnresolved(text, pos);
-        assertEquals(pos.getIndex(), expected.getId().length());
-        assertEquals(pos.getErrorIndex(), -1);
-        assertEquals(parsed.query(TemporalQueries.chronology()), expected);
+        assertEquals(expected.getId().length(), pos.getIndex());
+        assertEquals(-1, pos.getErrorIndex());
+        assertEquals(expected, parsed.query(TemporalQueries.chronology()));
     }
 
-    @Test(dataProvider="parseValid")
+    @ParameterizedTest
+    @MethodSource("data_parseValid")
     public void test_parseValid_caseSensitive_lowercaseRejected(String text, Chronology expected) {
         builder.appendChronologyId();
         TemporalAccessor parsed = builder.toFormatter().parseUnresolved(text.toLowerCase(Locale.ENGLISH), pos);
-        assertEquals(pos.getIndex(), 0);
-        assertEquals(pos.getErrorIndex(), 0);
-        assertEquals(parsed, null);
+        assertEquals(0, pos.getIndex());
+        assertEquals(0, pos.getErrorIndex());
+        assertEquals(null, parsed);
     }
 
-    @Test(dataProvider="parseValid")
+    @ParameterizedTest
+    @MethodSource("data_parseValid")
     public void test_parseValid_caseInsensitive(String text, Chronology expected) {
         builder.parseCaseInsensitive().appendChronologyId();
         TemporalAccessor parsed = builder.toFormatter().parseUnresolved(text.toLowerCase(Locale.ENGLISH), pos);
-        assertEquals(pos.getIndex(), expected.getId().length());
-        assertEquals(pos.getErrorIndex(), -1);
-        assertEquals(parsed.query(TemporalQueries.chronology()), expected);
+        assertEquals(expected.getId().length(), pos.getIndex());
+        assertEquals(-1, pos.getErrorIndex());
+        assertEquals(expected, parsed.query(TemporalQueries.chronology()));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseInvalid")
     Object[][] data_parseInvalid() {
         return new Object[][] {
                 {"Rubbish"},
@@ -155,13 +159,14 @@ public class TCKChronoPrinterParser {
         };
     }
 
-    @Test(dataProvider="parseInvalid")
+    @ParameterizedTest
+    @MethodSource("data_parseInvalid")
     public void test_parseInvalid(String text) {
         builder.appendChronologyId();
         TemporalAccessor parsed = builder.toFormatter().parseUnresolved(text, pos);
-        assertEquals(pos.getIndex(), 0);
-        assertEquals(pos.getErrorIndex(), 0);
-        assertEquals(parsed, null);
+        assertEquals(0, pos.getIndex());
+        assertEquals(0, pos.getErrorIndex());
+        assertEquals(null, parsed);
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/format/TCKDTFParsedInstant.java b/test/jdk/java/time/tck/java/time/format/TCKDTFParsedInstant.java
index ec60f0f586d..d4d6a813a1e 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKDTFParsedInstant.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKDTFParsedInstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  */
 package tck.java.time.format;
 
-import static org.testng.AssertJUnit.assertEquals;
 
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
@@ -32,9 +31,11 @@ import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Testing DateTimeFormatter Parsing with 4 different test conditions:
@@ -44,7 +45,7 @@ import org.testng.annotations.Test;
  * 4. When Zone is not provided and Offset is provided
  */
 
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKDTFParsedInstant {
 
     private static final ZoneId EUROPE_BERLIN = ZoneId.of("Europe/Berlin");
@@ -55,12 +56,11 @@ public class TCKDTFParsedInstant {
     private LocalDateTime ldt1;
     private OffsetDateTime odt1;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() throws Exception {
         dtFormatter = DateTimeFormatter.ISO_ZONED_DATE_TIME;
     }
 
-    @DataProvider(name="parseWithoutZoneWithoutOffset")
     Object[][] data_parse_WithoutOffset_WithoutZone() {
         return new Object[][] {
             {"1966-12-31T00:01:10", LocalDateTime.of(1966, 12, 31, 0, 1, 10)},
@@ -70,14 +70,14 @@ public class TCKDTFParsedInstant {
         };
     }
 
-    @Test(dataProvider="parseWithoutZoneWithoutOffset")
+    @ParameterizedTest
+    @MethodSource("data_parse_WithoutOffset_WithoutZone")
     public void testWithoutZoneWithoutOffset(String ldtString, LocalDateTime expectedLDT) {
         dtFormatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
         ldt1 = LocalDateTime.parse(ldtString, dtFormatter);
-        assertEquals(expectedLDT, ldt1);
+        Assertions.assertEquals(expectedLDT, ldt1);
     }
 
-    @DataProvider(name="parseWithZoneWithOffset")
     Object[][] data_parse_WithZone_WithOffset() {
         return new Object[][] {
             {"2012-10-28T01:45:00-02:30[Europe/Berlin]",
@@ -168,15 +168,15 @@ public class TCKDTFParsedInstant {
         };
     }
 
-    @Test(dataProvider="parseWithZoneWithOffset")
+    @ParameterizedTest
+    @MethodSource("data_parse_WithZone_WithOffset")
     public void testWithZoneWithOffset(String zdtString, LocalDateTime ldt, ZoneOffset offset, ZoneId zone) {
         dtFormatter = DateTimeFormatter.ISO_ZONED_DATE_TIME;
         zdt1 = ZonedDateTime.ofInstant(ldt, offset, zone);
         zdt2 = ZonedDateTime.parse(zdtString, dtFormatter);
-        assertEquals(zdt1, zdt2);
+        Assertions.assertEquals(zdt1, zdt2);
     }
 
-    @DataProvider(name="parseWithZoneWithoutOffset")
     Object[][] data_parse_WithZone_WithoutOffset() {
         return new Object[][] {
             {"28 Oct 00:45:00 2012 Europe/Berlin", ZonedDateTime.of(2012, 10, 28, 0, 45, 0, 0, EUROPE_BERLIN)},
@@ -193,14 +193,14 @@ public class TCKDTFParsedInstant {
         };
     }
 
-    @Test(dataProvider="parseWithZoneWithoutOffset")
+    @ParameterizedTest
+    @MethodSource("data_parse_WithZone_WithoutOffset")
     public void testWithZoneWithoutOffset(String withZoneWithoutOffset, ZonedDateTime expectedZDT) {
         dtFormatter = DateTimeFormatter.ofPattern("d MMM HH:mm:ss uuuu VV").withLocale(Locale.ENGLISH);
         zdt1 = ZonedDateTime.parse(withZoneWithoutOffset, dtFormatter);
-        assertEquals(expectedZDT, zdt1);
+        Assertions.assertEquals(expectedZDT, zdt1);
     }
 
-    @DataProvider(name="parseWithOffsetWithoutZone")
     Object[][] data_parse_WithOffset_WithoutZone() {
         return new Object[][] {
             {"2015-12-14T00:45:00-11:30", OffsetDateTime.of(2015, 12, 14, 0, 45, 0, 0, ZoneOffset.of("-11:30"))},
@@ -212,10 +212,11 @@ public class TCKDTFParsedInstant {
         };
     }
 
-    @Test(dataProvider="parseWithOffsetWithoutZone")
+    @ParameterizedTest
+    @MethodSource("data_parse_WithOffset_WithoutZone")
     public void testWithOffsetWithoutZone(String odtString, OffsetDateTime expectedOTD) {
         dtFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
         odt1 = OffsetDateTime.parse(odtString, dtFormatter);
-        assertEquals(expectedOTD, odt1);
+        Assertions.assertEquals(expectedOTD, odt1);
     }
 }
diff --git a/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatter.java b/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatter.java
index 9c0a783ec53..c8a04c21154 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatter.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,10 +65,11 @@ import static java.time.temporal.ChronoField.DAY_OF_YEAR;
 import static java.time.temporal.ChronoField.HOUR_OF_DAY;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoField.YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.text.Format;
 import java.text.ParseException;
@@ -105,14 +106,17 @@ import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test DateTimeFormatter.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKDateTimeFormatter {
 
     private static final ZoneOffset OFFSET_PONE = ZoneOffset.ofHours(1);
@@ -124,7 +128,7 @@ public class TCKDateTimeFormatter {
 
     private DateTimeFormatter fmt;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         fmt = new DateTimeFormatterBuilder().appendLiteral("ONE")
                                             .appendValue(DAY_OF_MONTH, 1, 2, SignStyle.NOT_NEGATIVE)
@@ -136,37 +140,39 @@ public class TCKDateTimeFormatter {
     public void test_withLocale() {
         DateTimeFormatter base = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
         DateTimeFormatter test = base.withLocale(Locale.GERMAN);
-        assertEquals(test.getLocale(), Locale.GERMAN);
+        assertEquals(Locale.GERMAN, test.getLocale());
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_withLocale_null() {
-        DateTimeFormatter base = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        base.withLocale((Locale) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter base = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            base.withLocale((Locale) null);
+        });
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_withChronology() {
         DateTimeFormatter test = fmt;
-        assertEquals(test.getChronology(), null);
+        assertEquals(null, test.getChronology());
         test = test.withChronology(IsoChronology.INSTANCE);
-        assertEquals(test.getChronology(), IsoChronology.INSTANCE);
+        assertEquals(IsoChronology.INSTANCE, test.getChronology());
         test = test.withChronology(null);
-        assertEquals(test.getChronology(), null);
+        assertEquals(null, test.getChronology());
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_withZone() {
         DateTimeFormatter test = fmt;
-        assertEquals(test.getZone(), null);
+        assertEquals(null, test.getZone());
         test = test.withZone(ZoneId.of("Europe/Paris"));
-        assertEquals(test.getZone(), ZoneId.of("Europe/Paris"));
+        assertEquals(ZoneId.of("Europe/Paris"), test.getZone());
         test = test.withZone(ZoneOffset.UTC);
-        assertEquals(test.getZone(), ZoneOffset.UTC);
+        assertEquals(ZoneOffset.UTC, test.getZone());
         test = test.withZone(null);
-        assertEquals(test.getZone(), null);
+        assertEquals(null, test.getZone());
     }
 
     //-----------------------------------------------------------------------
@@ -183,7 +189,7 @@ public class TCKDateTimeFormatter {
             // expected, fails as it produces two different dates
         }
         LocalDate parsed = f.parse("2012-6-30-321", LocalDate::from);  // ignored day-of-year
-        assertEquals(parsed, LocalDate.of(2012, 6, 30));
+        assertEquals(LocalDate.of(2012, 6, 30), parsed);
     }
 
     @Test
@@ -193,8 +199,7 @@ public class TCKDateTimeFormatter {
                 .appendValue(DAY_OF_MONTH).appendLiteral('-').appendValue(DAY_OF_YEAR).toFormatter();
         DateTimeFormatter f = base.withResolverFields(YEAR, DAY_OF_YEAR);
         Set<TemporalField> expected = new HashSet<>(Arrays.asList(YEAR, DAY_OF_YEAR));
-        // Use set.equals();  testNG comparison of Collections is ordered
-        assertTrue(f.getResolverFields().equals(expected), "ResolveFields: " + f.getResolverFields());
+        assertEquals(expected, f.getResolverFields(), "ResolveFields: " + f.getResolverFields());
         try {
             base.parse("2012-6-30-321", LocalDate::from);  // wrong month/day-of-month
             fail();
@@ -202,7 +207,7 @@ public class TCKDateTimeFormatter {
             // expected, fails as it produces two different dates
         }
         LocalDate parsed = f.parse("2012-6-30-321", LocalDate::from);  // ignored month/day-of-month
-        assertEquals(parsed, LocalDate.of(2012, 11, 16));
+        assertEquals(LocalDate.of(2012, 11, 16), parsed);
     }
 
     @Test
@@ -218,7 +223,7 @@ public class TCKDateTimeFormatter {
             // expected, should fail in cross-check of day-of-week
         }
         LocalDate parsed = f.parse("2012-321-1", LocalDate::from);  // ignored wrong day-of-week
-        assertEquals(parsed, LocalDate.of(2012, 11, 16));
+        assertEquals(LocalDate.of(2012, 11, 16), parsed);
     }
 
     @Test
@@ -226,7 +231,7 @@ public class TCKDateTimeFormatter {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
                 .appendValue(YEAR).toFormatter().withResolverFields();
         TemporalAccessor parsed = f.parse("2012");
-        assertEquals(parsed.isSupported(YEAR), false);  // not in the list of resolverFields
+        assertEquals(false, parsed.isSupported(YEAR));  // not in the list of resolverFields
     }
 
     @Test
@@ -234,7 +239,7 @@ public class TCKDateTimeFormatter {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
                 .appendValue(YEAR).toFormatter().withResolverFields(YEAR);
         TemporalAccessor parsed = f.parse("2012");
-        assertEquals(parsed.isSupported(YEAR), true);
+        assertEquals(true, parsed.isSupported(YEAR));
     }
 
     @Test
@@ -242,8 +247,8 @@ public class TCKDateTimeFormatter {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
                 .appendValue(YEAR).toFormatter().withResolverFields(MONTH_OF_YEAR);
         TemporalAccessor parsed = f.parse("2012");
-        assertEquals(parsed.isSupported(YEAR), false);  // not in the list of resolverFields
-        assertEquals(parsed.isSupported(MONTH_OF_YEAR), false);
+        assertEquals(false, parsed.isSupported(YEAR));  // not in the list of resolverFields
+        assertEquals(false, parsed.isSupported(MONTH_OF_YEAR));
     }
 
     @Test
@@ -251,29 +256,28 @@ public class TCKDateTimeFormatter {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
                 .appendValue(YEAR).toFormatter().withResolverFields((TemporalField) null);
         TemporalAccessor parsed = f.parse("2012");
-        assertEquals(parsed.isSupported(YEAR), false);  // not in the list of resolverFields
+        assertEquals(false, parsed.isSupported(YEAR));  // not in the list of resolverFields
     }
 
     @Test
     public void test_resolverFields_Array_null() throws Exception {
         DateTimeFormatter f = DateTimeFormatter.ISO_DATE.withResolverFields(MONTH_OF_YEAR);
-        assertEquals(f.getResolverFields().size(), 1);
+        assertEquals(1, f.getResolverFields().size());
         f = f.withResolverFields((TemporalField[]) null);
-        assertEquals(f.getResolverFields(), null);
+        assertEquals(null, f.getResolverFields());
     }
 
     @Test
     public void test_resolverFields_Set_null() throws Exception {
         DateTimeFormatter f = DateTimeFormatter.ISO_DATE.withResolverFields(MONTH_OF_YEAR);
-        assertEquals(f.getResolverFields().size(), 1);
+        assertEquals(1, f.getResolverFields().size());
         f = f.withResolverFields((Set<TemporalField>) null);
-        assertEquals(f.getResolverFields(), null);
+        assertEquals(null, f.getResolverFields());
     }
 
     //-----------------------------------------------------------------------
     // format
     //-----------------------------------------------------------------------
-    @DataProvider(name="formatWithZoneWithChronology")
     Object[][] data_format_withZone_withChronology() {
         YearMonth ym = YearMonth.of(2008, 6);
         LocalDate ld = LocalDate.of(2008, 6, 30);
@@ -351,7 +355,8 @@ public class TCKDateTimeFormatter {
         };
     }
 
-    @Test(dataProvider="formatWithZoneWithChronology")
+    @ParameterizedTest
+    @MethodSource("data_format_withZone_withChronology")
     public void test_format_withZone_withChronology(Chronology overrideChrono, ZoneId overrideZone, TemporalAccessor temporal, String expected) {
         DateTimeFormatter test = new DateTimeFormatterBuilder()
                 .optionalStart().appendValue(YEAR, 4).optionalEnd()
@@ -363,7 +368,7 @@ public class TCKDateTimeFormatter {
                 .withChronology(overrideChrono).withZone(overrideZone);
         if (expected != null) {
             String result = test.format(temporal);
-            assertEquals(result, expected);
+            assertEquals(expected, result);
         } else {
             try {
                 test.format(temporal);
@@ -394,7 +399,7 @@ public class TCKDateTimeFormatter {
                 .toFormatter(Locale.ENGLISH)
                 .withChronology(IsoChronology.INSTANCE);
         String result = test.format(temporal);
-        assertEquals(result, "2345");
+        assertEquals("2345", result);
     }
 
     //-----------------------------------------------------------------------
@@ -402,19 +407,23 @@ public class TCKDateTimeFormatter {
     public void test_format_TemporalAccessor_simple() {
         DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
         String result = test.format(LocalDate.of(2008, 6, 30));
-        assertEquals(result, "ONE30");
+        assertEquals("ONE30", result);
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_format_TemporalAccessor_noSuchField() {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        test.format(LocalTime.of(11, 30));
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            test.format(LocalTime.of(11, 30));
+        });
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_format_TemporalAccessor_null() {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        test.format((TemporalAccessor) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            test.format((TemporalAccessor) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -423,27 +432,33 @@ public class TCKDateTimeFormatter {
         DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
         StringBuilder buf = new StringBuilder();
         test.formatTo(LocalDate.of(2008, 6, 30), buf);
-        assertEquals(buf.toString(), "ONE30");
+        assertEquals("ONE30", buf.toString());
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_print_TemporalAppendable_noSuchField() throws Exception {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        StringBuilder buf = new StringBuilder();
-        test.formatTo(LocalTime.of(11, 30), buf);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            StringBuilder buf = new StringBuilder();
+            test.formatTo(LocalTime.of(11, 30), buf);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_print_TemporalAppendable_nullTemporal() throws Exception {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        StringBuilder buf = new StringBuilder();
-        test.formatTo((TemporalAccessor) null, buf);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            StringBuilder buf = new StringBuilder();
+            test.formatTo((TemporalAccessor) null, buf);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_print_TemporalAppendable_nullAppendable() throws Exception {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        test.formatTo(LocalDate.of(2008, 6, 30), (Appendable) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            test.formatTo(LocalDate.of(2008, 6, 30), (Appendable) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -453,29 +468,31 @@ public class TCKDateTimeFormatter {
     public void test_parse_CharSequence() {
         DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
         TemporalAccessor result = test.parse("ONE30");
-        assertEquals(result.isSupported(DAY_OF_MONTH), true);
-        assertEquals(result.getLong(DAY_OF_MONTH), 30L);
-        assertEquals(result.isSupported(HOUR_OF_DAY), false);
+        assertEquals(true, result.isSupported(DAY_OF_MONTH));
+        assertEquals(30L, result.getLong(DAY_OF_MONTH));
+        assertEquals(false, result.isSupported(HOUR_OF_DAY));
     }
 
     @Test
     public void test_parse_CharSequence_resolved() {
         DateTimeFormatter test = DateTimeFormatter.ISO_DATE;
         TemporalAccessor result = test.parse("2012-06-30");
-        assertEquals(result.isSupported(YEAR), true);
-        assertEquals(result.isSupported(MONTH_OF_YEAR), true);
-        assertEquals(result.isSupported(DAY_OF_MONTH), true);
-        assertEquals(result.isSupported(HOUR_OF_DAY), false);
-        assertEquals(result.getLong(YEAR), 2012L);
-        assertEquals(result.getLong(MONTH_OF_YEAR), 6L);
-        assertEquals(result.getLong(DAY_OF_MONTH), 30L);
-        assertEquals(result.query(LocalDate::from), LocalDate.of(2012, 6, 30));
+        assertEquals(true, result.isSupported(YEAR));
+        assertEquals(true, result.isSupported(MONTH_OF_YEAR));
+        assertEquals(true, result.isSupported(DAY_OF_MONTH));
+        assertEquals(false, result.isSupported(HOUR_OF_DAY));
+        assertEquals(2012L, result.getLong(YEAR));
+        assertEquals(6L, result.getLong(MONTH_OF_YEAR));
+        assertEquals(30L, result.getLong(DAY_OF_MONTH));
+        assertEquals(LocalDate.of(2012, 6, 30), result.query(LocalDate::from));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_parse_CharSequence_null() {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        test.parse((String) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            test.parse((String) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -486,11 +503,11 @@ public class TCKDateTimeFormatter {
         DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
         ParsePosition pos = new ParsePosition(3);
         TemporalAccessor result = test.parse("XXXONE30XXX", pos);
-        assertEquals(pos.getIndex(), 8);
-        assertEquals(pos.getErrorIndex(), -1);
-        assertEquals(result.isSupported(DAY_OF_MONTH), true);
-        assertEquals(result.getLong(DAY_OF_MONTH), 30L);
-        assertEquals(result.isSupported(HOUR_OF_DAY), false);
+        assertEquals(8, pos.getIndex());
+        assertEquals(-1, pos.getErrorIndex());
+        assertEquals(true, result.isSupported(DAY_OF_MONTH));
+        assertEquals(30L, result.getLong(DAY_OF_MONTH));
+        assertEquals(false, result.isSupported(HOUR_OF_DAY));
     }
 
     @Test
@@ -498,47 +515,55 @@ public class TCKDateTimeFormatter {
         DateTimeFormatter test = DateTimeFormatter.ISO_DATE;
         ParsePosition pos = new ParsePosition(3);
         TemporalAccessor result = test.parse("XXX2012-06-30XXX", pos);
-        assertEquals(pos.getIndex(), 13);
-        assertEquals(pos.getErrorIndex(), -1);
-        assertEquals(result.isSupported(YEAR), true);
-        assertEquals(result.isSupported(MONTH_OF_YEAR), true);
-        assertEquals(result.isSupported(DAY_OF_MONTH), true);
-        assertEquals(result.isSupported(HOUR_OF_DAY), false);
-        assertEquals(result.getLong(YEAR), 2012L);
-        assertEquals(result.getLong(MONTH_OF_YEAR), 6L);
-        assertEquals(result.getLong(DAY_OF_MONTH), 30L);
-        assertEquals(result.query(LocalDate::from), LocalDate.of(2012, 6, 30));
+        assertEquals(13, pos.getIndex());
+        assertEquals(-1, pos.getErrorIndex());
+        assertEquals(true, result.isSupported(YEAR));
+        assertEquals(true, result.isSupported(MONTH_OF_YEAR));
+        assertEquals(true, result.isSupported(DAY_OF_MONTH));
+        assertEquals(false, result.isSupported(HOUR_OF_DAY));
+        assertEquals(2012L, result.getLong(YEAR));
+        assertEquals(6L, result.getLong(MONTH_OF_YEAR));
+        assertEquals(30L, result.getLong(DAY_OF_MONTH));
+        assertEquals(LocalDate.of(2012, 6, 30), result.query(LocalDate::from));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void test_parse_CharSequence_ParsePosition_parseError() {
-        DateTimeFormatter test = DateTimeFormatter.ISO_DATE;
-        ParsePosition pos = new ParsePosition(3);
-        try {
-            test.parse("XXX2012XXX", pos);
-            fail();
-        } catch (DateTimeParseException ex) {
-            assertEquals(ex.getErrorIndex(), 7);
-            throw ex;
-        }
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            DateTimeFormatter test = DateTimeFormatter.ISO_DATE;
+            ParsePosition pos = new ParsePosition(3);
+            try {
+                test.parse("XXX2012XXX", pos);
+                fail();
+            } catch (DateTimeParseException ex) {
+                assertEquals(7, ex.getErrorIndex());
+                throw ex;
+            }
+        });
     }
 
-    @Test(expectedExceptions=IndexOutOfBoundsException.class)
+    @Test
     public void test_parse_CharSequence_ParsePosition_indexTooBig() {
-        DateTimeFormatter test = DateTimeFormatter.ISO_DATE;
-        test.parse("Text", new ParsePosition(5));
+        Assertions.assertThrows(IndexOutOfBoundsException.class, () -> {
+            DateTimeFormatter test = DateTimeFormatter.ISO_DATE;
+            test.parse("Text", new ParsePosition(5));
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_parse_CharSequence_ParsePosition_nullText() {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        test.parse((CharSequence) null, new ParsePosition(0));
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            test.parse((CharSequence) null, new ParsePosition(0));
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_parse_CharSequence_ParsePosition_nullParsePosition() {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        test.parse("Text", (ParsePosition) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            test.parse("Text", (ParsePosition) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -547,63 +572,71 @@ public class TCKDateTimeFormatter {
     @Test
     public void test_parse_Query_String() throws Exception {
         LocalDate result = DATE_FORMATTER.parse("ONE2012 07 27", LocalDate::from);
-        assertEquals(result, LocalDate.of(2012, 7, 27));
+        assertEquals(LocalDate.of(2012, 7, 27), result);
     }
 
     @Test
     public void test_parse_Query_CharSequence() throws Exception {
         LocalDate result = DATE_FORMATTER.parse(new StringBuilder("ONE2012 07 27"), LocalDate::from);
-        assertEquals(result, LocalDate.of(2012, 7, 27));
+        assertEquals(LocalDate.of(2012, 7, 27), result);
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void test_parse_Query_String_parseError() throws Exception {
-        try {
-            DATE_FORMATTER.parse("ONE2012 07 XX", LocalDate::from);
-        } catch (DateTimeParseException ex) {
-            assertEquals(ex.getMessage().contains("could not be parsed"), true);
-            assertEquals(ex.getMessage().contains("ONE2012 07 XX"), true);
-            assertEquals(ex.getParsedString(), "ONE2012 07 XX");
-            assertEquals(ex.getErrorIndex(), 11);
-            throw ex;
-        }
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            try {
+                DATE_FORMATTER.parse("ONE2012 07 XX", LocalDate::from);
+            } catch (DateTimeParseException ex) {
+                assertEquals(true, ex.getMessage().contains("could not be parsed"));
+                assertEquals(true, ex.getMessage().contains("ONE2012 07 XX"));
+                assertEquals("ONE2012 07 XX", ex.getParsedString());
+                assertEquals(11, ex.getErrorIndex());
+                throw ex;
+            }
+        });
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void test_parse_Query_String_parseErrorLongText() throws Exception {
-        try {
-            DATE_FORMATTER.parse("ONEXXX67890123456789012345678901234567890123456789012345678901234567890123456789", LocalDate::from);
-        } catch (DateTimeParseException ex) {
-            assertEquals(ex.getMessage().contains("could not be parsed"), true);
-            assertEquals(ex.getMessage().contains("ONEXXX6789012345678901234567890123456789012345678901234567890123..."), true);
-            assertEquals(ex.getParsedString(), "ONEXXX67890123456789012345678901234567890123456789012345678901234567890123456789");
-            assertEquals(ex.getErrorIndex(), 3);
-            throw ex;
-        }
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            try {
+                DATE_FORMATTER.parse("ONEXXX67890123456789012345678901234567890123456789012345678901234567890123456789", LocalDate::from);
+            } catch (DateTimeParseException ex) {
+                assertEquals(true, ex.getMessage().contains("could not be parsed"));
+                assertEquals(true, ex.getMessage().contains("ONEXXX6789012345678901234567890123456789012345678901234567890123..."));
+                assertEquals("ONEXXX67890123456789012345678901234567890123456789012345678901234567890123456789", ex.getParsedString());
+                assertEquals(3, ex.getErrorIndex());
+                throw ex;
+            }
+        });
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void test_parse_Query_String_parseIncomplete() throws Exception {
-        try {
-            DATE_FORMATTER.parse("ONE2012 07 27SomethingElse", LocalDate::from);
-        } catch (DateTimeParseException ex) {
-            assertEquals(ex.getMessage().contains("could not be parsed"), true);
-            assertEquals(ex.getMessage().contains("ONE2012 07 27SomethingElse"), true);
-            assertEquals(ex.getParsedString(), "ONE2012 07 27SomethingElse");
-            assertEquals(ex.getErrorIndex(), 13);
-            throw ex;
-        }
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            try {
+                DATE_FORMATTER.parse("ONE2012 07 27SomethingElse", LocalDate::from);
+            } catch (DateTimeParseException ex) {
+                assertEquals(true, ex.getMessage().contains("could not be parsed"));
+                assertEquals(true, ex.getMessage().contains("ONE2012 07 27SomethingElse"));
+                assertEquals("ONE2012 07 27SomethingElse", ex.getParsedString());
+                assertEquals(13, ex.getErrorIndex());
+                throw ex;
+            }
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_parse_Query_String_nullText() throws Exception {
-        DATE_FORMATTER.parse((String) null, LocalDate::from);
+        Assertions.assertThrows(NullPointerException.class, () -> DATE_FORMATTER.parse((String) null, LocalDate::from));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_parse_Query_String_nullRule() throws Exception {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        test.parse("30", (TemporalQuery<?>) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            test.parse("30", (TemporalQuery<?>) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -612,80 +645,94 @@ public class TCKDateTimeFormatter {
         DateTimeFormatter test = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm[XXX]");
         TemporalAccessor result = test.parseBest("2011-06-30 12:30+03:00", ZonedDateTime::from, LocalDateTime::from);
         LocalDateTime ldt = LocalDateTime.of(2011, 6, 30, 12, 30);
-        assertEquals(result, ZonedDateTime.of(ldt, ZoneOffset.ofHours(3)));
+        assertEquals(ZonedDateTime.of(ldt, ZoneOffset.ofHours(3)), result);
     }
 
     @Test
     public void test_parseBest_secondOption() throws Exception {
         DateTimeFormatter test = DateTimeFormatter.ofPattern("yyyy-MM-dd[ HH:mm[XXX]]");
         TemporalAccessor result = test.parseBest("2011-06-30", ZonedDateTime::from, LocalDate::from);
-        assertEquals(result, LocalDate.of(2011, 6, 30));
+        assertEquals(LocalDate.of(2011, 6, 30), result);
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void test_parseBest_String_parseError() throws Exception {
-        DateTimeFormatter test = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm[XXX]");
-        try {
-            test.parseBest("2011-06-XX", ZonedDateTime::from, LocalDateTime::from);
-        } catch (DateTimeParseException ex) {
-            assertEquals(ex.getMessage().contains("could not be parsed"), true);
-            assertEquals(ex.getMessage().contains("XX"), true);
-            assertEquals(ex.getParsedString(), "2011-06-XX");
-            assertEquals(ex.getErrorIndex(), 8);
-            throw ex;
-        }
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            DateTimeFormatter test = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm[XXX]");
+            try {
+                test.parseBest("2011-06-XX", ZonedDateTime::from, LocalDateTime::from);
+            } catch (DateTimeParseException ex) {
+                assertEquals(true, ex.getMessage().contains("could not be parsed"));
+                assertEquals(true, ex.getMessage().contains("XX"));
+                assertEquals("2011-06-XX", ex.getParsedString());
+                assertEquals(8, ex.getErrorIndex());
+                throw ex;
+            }
+        });
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void test_parseBest_String_parseErrorLongText() throws Exception {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        try {
-            test.parseBest("ONEXXX67890123456789012345678901234567890123456789012345678901234567890123456789", ZonedDateTime::from, LocalDate::from);
-        } catch (DateTimeParseException ex) {
-            assertEquals(ex.getMessage().contains("could not be parsed"), true);
-            assertEquals(ex.getMessage().contains("ONEXXX6789012345678901234567890123456789012345678901234567890123..."), true);
-            assertEquals(ex.getParsedString(), "ONEXXX67890123456789012345678901234567890123456789012345678901234567890123456789");
-            assertEquals(ex.getErrorIndex(), 3);
-            throw ex;
-        }
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            try {
+                test.parseBest("ONEXXX67890123456789012345678901234567890123456789012345678901234567890123456789", ZonedDateTime::from, LocalDate::from);
+            } catch (DateTimeParseException ex) {
+                assertEquals(true, ex.getMessage().contains("could not be parsed"));
+                assertEquals(true, ex.getMessage().contains("ONEXXX6789012345678901234567890123456789012345678901234567890123..."));
+                assertEquals("ONEXXX67890123456789012345678901234567890123456789012345678901234567890123456789", ex.getParsedString());
+                assertEquals(3, ex.getErrorIndex());
+                throw ex;
+            }
+        });
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void test_parseBest_String_parseIncomplete() throws Exception {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        try {
-            test.parseBest("ONE30SomethingElse", ZonedDateTime::from, LocalDate::from);
-        } catch (DateTimeParseException ex) {
-            assertEquals(ex.getMessage().contains("could not be parsed"), true);
-            assertEquals(ex.getMessage().contains("ONE30SomethingElse"), true);
-            assertEquals(ex.getParsedString(), "ONE30SomethingElse");
-            assertEquals(ex.getErrorIndex(), 5);
-            throw ex;
-        }
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            try {
+                test.parseBest("ONE30SomethingElse", ZonedDateTime::from, LocalDate::from);
+            } catch (DateTimeParseException ex) {
+                assertEquals(true, ex.getMessage().contains("could not be parsed"));
+                assertEquals(true, ex.getMessage().contains("ONE30SomethingElse"));
+                assertEquals("ONE30SomethingElse", ex.getParsedString());
+                assertEquals(5, ex.getErrorIndex());
+                throw ex;
+            }
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_parseBest_String_nullText() throws Exception {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        test.parseBest((String) null, ZonedDateTime::from, LocalDate::from);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            test.parseBest((String) null, ZonedDateTime::from, LocalDate::from);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_parseBest_String_nullRules() throws Exception {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        test.parseBest("30", (TemporalQuery<?>[]) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            test.parseBest("30", (TemporalQuery<?>[]) null);
+        });
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_parseBest_String_zeroRules() throws Exception {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        test.parseBest("30", new TemporalQuery<?>[0]);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            test.parseBest("30", new TemporalQuery<?>[0]);
+        });
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_parseBest_String_oneRule() throws Exception {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        test.parseBest("30", LocalDate::from);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            test.parseBest("30", LocalDate::from);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -694,9 +741,9 @@ public class TCKDateTimeFormatter {
         DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor result = test.parseUnresolved("ONE30XXX", pos);
-        assertEquals(pos.getIndex(), 5);
-        assertEquals(pos.getErrorIndex(), -1);
-        assertEquals(result.getLong(DAY_OF_MONTH), 30L);
+        assertEquals(5, pos.getIndex());
+        assertEquals(-1, pos.getErrorIndex());
+        assertEquals(30L, result.getLong(DAY_OF_MONTH));
     }
 
     @Test
@@ -704,9 +751,9 @@ public class TCKDateTimeFormatter {
         DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor result = test.parseUnresolved("ONEXXX", pos);
-        assertEquals(pos.getIndex(), 0);
-        assertEquals(pos.getErrorIndex(), 3);
-        assertEquals(result, null);
+        assertEquals(0, pos.getIndex());
+        assertEquals(3, pos.getErrorIndex());
+        assertEquals(null, result);
     }
 
     @Test
@@ -715,9 +762,9 @@ public class TCKDateTimeFormatter {
                 .appendValue(MONTH_OF_YEAR).appendLiteral('-').appendValue(MONTH_OF_YEAR).toFormatter();
         ParsePosition pos = new ParsePosition(3);
         TemporalAccessor result = test.parseUnresolved("XXX6-6", pos);
-        assertEquals(pos.getIndex(), 6);
-        assertEquals(pos.getErrorIndex(), -1);
-        assertEquals(result.getLong(MONTH_OF_YEAR), 6);
+        assertEquals(6, pos.getIndex());
+        assertEquals(-1, pos.getErrorIndex());
+        assertEquals(6, result.getLong(MONTH_OF_YEAR));
     }
 
     @Test
@@ -726,29 +773,35 @@ public class TCKDateTimeFormatter {
                 .appendValue(MONTH_OF_YEAR).appendLiteral('-').appendValue(MONTH_OF_YEAR).toFormatter();
         ParsePosition pos = new ParsePosition(3);
         TemporalAccessor result = test.parseUnresolved("XXX6-7", pos);
-        assertEquals(pos.getIndex(), 3);
-        assertEquals(pos.getErrorIndex(), 5);
-        assertEquals(result, null);
+        assertEquals(3, pos.getIndex());
+        assertEquals(5, pos.getErrorIndex());
+        assertEquals(null, result);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_parseUnresolved_StringParsePosition_nullString() {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        ParsePosition pos = new ParsePosition(0);
-        test.parseUnresolved((String) null, pos);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            ParsePosition pos = new ParsePosition(0);
+            test.parseUnresolved((String) null, pos);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_parseUnresolved_StringParsePosition_nullParsePosition() {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        test.parseUnresolved("ONE30", (ParsePosition) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            test.parseUnresolved("ONE30", (ParsePosition) null);
+        });
     }
 
-    @Test(expectedExceptions=IndexOutOfBoundsException.class)
+    @Test
     public void test_parseUnresolved_StringParsePosition_invalidPosition() {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        ParsePosition pos = new ParsePosition(6);
-        test.parseUnresolved("ONE30", pos);
+        Assertions.assertThrows(IndexOutOfBoundsException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            ParsePosition pos = new ParsePosition(6);
+            test.parseUnresolved("ONE30", pos);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -758,21 +811,25 @@ public class TCKDateTimeFormatter {
         DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
         Format format = test.toFormat();
         String result = format.format(LocalDate.of(2008, 6, 30));
-        assertEquals(result, "ONE30");
+        assertEquals("ONE30", result);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_toFormat_format_null() throws Exception {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        Format format = test.toFormat();
-        format.format(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            Format format = test.toFormat();
+            format.format(null);
+        });
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_toFormat_format_notTemporal() throws Exception {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        Format format = test.toFormat();
-        format.format("Not a Temporal");
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            Format format = test.toFormat();
+            format.format("Not a Temporal");
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -781,42 +838,48 @@ public class TCKDateTimeFormatter {
         DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
         Format format = test.toFormat();
         TemporalAccessor result = (TemporalAccessor) format.parseObject("ONE30");
-        assertEquals(result.isSupported(DAY_OF_MONTH), true);
-        assertEquals(result.getLong(DAY_OF_MONTH), 30L);
+        assertEquals(true, result.isSupported(DAY_OF_MONTH));
+        assertEquals(30L, result.getLong(DAY_OF_MONTH));
     }
 
-    @Test(expectedExceptions=ParseException.class)
+    @Test
     public void test_toFormat_parseObject_String_parseError() throws Exception {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        Format format = test.toFormat();
-        try {
-            format.parseObject("ONEXXX");
-        } catch (ParseException ex) {
-            assertEquals(ex.getMessage().contains("ONEXXX"), true);
-            assertEquals(ex.getErrorOffset(), 3);
-            throw ex;
-        }
+        Assertions.assertThrows(ParseException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            Format format = test.toFormat();
+            try {
+                format.parseObject("ONEXXX");
+            } catch (ParseException ex) {
+                assertEquals(true, ex.getMessage().contains("ONEXXX"));
+                assertEquals(3, ex.getErrorOffset());
+                throw ex;
+            }
+        });
     }
 
-    @Test(expectedExceptions=ParseException.class)
+    @Test
     public void test_toFormat_parseObject_String_parseErrorLongText() throws Exception {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        Format format = test.toFormat();
-        try {
-            format.parseObject("ONEXXX67890123456789012345678901234567890123456789012345678901234567890123456789");
-        } catch (DateTimeParseException ex) {
-            assertEquals(ex.getMessage().contains("ONEXXX6789012345678901234567890123456789012345678901234567890123..."), true);
-            assertEquals(ex.getParsedString(), "ONEXXX67890123456789012345678901234567890123456789012345678901234567890123456789");
-            assertEquals(ex.getErrorIndex(), 3);
-            throw ex;
-        }
+        Assertions.assertThrows(ParseException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            Format format = test.toFormat();
+            try {
+                format.parseObject("ONEXXX67890123456789012345678901234567890123456789012345678901234567890123456789");
+            } catch (DateTimeParseException ex) {
+                assertEquals(true, ex.getMessage().contains("ONEXXX6789012345678901234567890123456789012345678901234567890123..."));
+                assertEquals("ONEXXX67890123456789012345678901234567890123456789012345678901234567890123456789", ex.getParsedString());
+                assertEquals(3, ex.getErrorIndex());
+                throw ex;
+            }
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_toFormat_parseObject_String_null() throws Exception {
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        Format format = test.toFormat();
-        format.parseObject((String) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            Format format = test.toFormat();
+            format.parseObject((String) null);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -826,10 +889,10 @@ public class TCKDateTimeFormatter {
         Format format = test.toFormat();
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor result = (TemporalAccessor) format.parseObject("ONE30XXX", pos);
-        assertEquals(pos.getIndex(), 5);
-        assertEquals(pos.getErrorIndex(), -1);
-        assertEquals(result.isSupported(DAY_OF_MONTH), true);
-        assertEquals(result.getLong(DAY_OF_MONTH), 30L);
+        assertEquals(5, pos.getIndex());
+        assertEquals(-1, pos.getErrorIndex());
+        assertEquals(true, result.isSupported(DAY_OF_MONTH));
+        assertEquals(30L, result.getLong(DAY_OF_MONTH));
     }
 
     @Test
@@ -838,26 +901,30 @@ public class TCKDateTimeFormatter {
         Format format = test.toFormat();
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor result = (TemporalAccessor) format.parseObject("ONEXXX", pos);
-        assertEquals(pos.getIndex(), 0);  // TODO: is this right?
-        assertEquals(pos.getErrorIndex(), 3);
-        assertEquals(result, null);
+        assertEquals(0, pos.getIndex());  // TODO: is this right?
+        assertEquals(3, pos.getErrorIndex());
+        assertEquals(null, result);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_toFormat_parseObject_StringParsePosition_nullString() throws Exception {
-        // SimpleDateFormat has this behavior
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        Format format = test.toFormat();
-        ParsePosition pos = new ParsePosition(0);
-        format.parseObject((String) null, pos);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            // SimpleDateFormat has this behavior
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            Format format = test.toFormat();
+            ParsePosition pos = new ParsePosition(0);
+            format.parseObject((String) null, pos);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_toFormat_parseObject_StringParsePosition_nullParsePosition() throws Exception {
-        // SimpleDateFormat has this behavior
-        DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
-        Format format = test.toFormat();
-        format.parseObject("ONE30", (ParsePosition) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            // SimpleDateFormat has this behavior
+            DateTimeFormatter test = fmt.withLocale(Locale.ENGLISH).withDecimalStyle(DecimalStyle.STANDARD);
+            Format format = test.toFormat();
+            format.parseObject("ONE30", (ParsePosition) null);
+        });
     }
 
     @Test
@@ -885,25 +952,27 @@ public class TCKDateTimeFormatter {
     public void test_toFormat_Query_format() throws Exception {
         Format format = BASIC_FORMATTER.toFormat();
         String result = format.format(LocalDate.of(2008, 6, 30));
-        assertEquals(result, "ONE30");
+        assertEquals("ONE30", result);
     }
 
     @Test
     public void test_toFormat_Query_parseObject_String() throws Exception {
         Format format = DATE_FORMATTER.toFormat(LocalDate::from);
         LocalDate result = (LocalDate) format.parseObject("ONE2012 07 27");
-        assertEquals(result, LocalDate.of(2012, 7, 27));
+        assertEquals(LocalDate.of(2012, 7, 27), result);
     }
 
-    @Test(expectedExceptions=ParseException.class)
+    @Test
     public void test_toFormat_parseObject_StringParsePosition_dateTimeError() throws Exception {
-        Format format = DATE_FORMATTER.toFormat(LocalDate::from);
-        format.parseObject("ONE2012 07 32");
+        Assertions.assertThrows(ParseException.class, () -> {
+            Format format = DATE_FORMATTER.toFormat(LocalDate::from);
+            format.parseObject("ONE2012 07 32");
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_toFormat_Query() throws Exception {
-        BASIC_FORMATTER.toFormat(null);
+        Assertions.assertThrows(NullPointerException.class, () -> BASIC_FORMATTER.toFormat(null));
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java b/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java
index b02cc8c0134..2c18d1fb5c2 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,8 @@ import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoField.NANO_OF_SECOND;
 import static java.time.temporal.ChronoField.OFFSET_SECONDS;
 import static java.time.temporal.ChronoField.YEAR;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.text.ParsePosition;
 import java.time.LocalDate;
@@ -89,19 +90,22 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test DateTimeFormatterBuilder.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKDateTimeFormatterBuilder {
 
     private DateTimeFormatterBuilder builder;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         builder = new DateTimeFormatterBuilder();
     }
@@ -110,7 +114,7 @@ public class TCKDateTimeFormatterBuilder {
     @Test
     public void test_toFormatter_empty() throws Exception {
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.format(LocalDate.of(2012, 6, 30)), "");
+        assertEquals("", f.format(LocalDate.of(2012, 6, 30)));
     }
 
     //-----------------------------------------------------------------------
@@ -120,7 +124,7 @@ public class TCKDateTimeFormatterBuilder {
             .parseDefaulting(YEAR, 2012).parseDefaulting(MONTH_OF_YEAR, 6)
             .parseDefaulting(DAY_OF_MONTH, 30).toFormatter();
         LocalDate parsed = f.parse("", LocalDate::from);  // blank string can be parsed
-        assertEquals(parsed, LocalDate.of(2012, 6, 30));
+        assertEquals(LocalDate.of(2012, 6, 30), parsed);
     }
 
     @Test
@@ -132,213 +136,212 @@ public class TCKDateTimeFormatterBuilder {
                 .optionalEnd().optionalEnd()
                 .parseDefaulting(MONTH_OF_YEAR, 1)
                 .parseDefaulting(DAY_OF_MONTH, 1).toFormatter();
-        assertEquals(f.parse("2012", LocalDate::from), LocalDate.of(2012, 1, 1));
-        assertEquals(f.parse("2012-6", LocalDate::from), LocalDate.of(2012, 6, 1));
-        assertEquals(f.parse("2012-6-30", LocalDate::from), LocalDate.of(2012, 6, 30));
+        assertEquals(LocalDate.of(2012, 1, 1), f.parse("2012", LocalDate::from));
+        assertEquals(LocalDate.of(2012, 6, 1), f.parse("2012-6", LocalDate::from));
+        assertEquals(LocalDate.of(2012, 6, 30), f.parse("2012-6-30", LocalDate::from));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test_parseDefaulting_null() {
-        builder.parseDefaulting(null, 1);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.parseDefaulting(null, 1));
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendValue_1arg_null() throws Exception {
-        builder.appendValue(null);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendValue(null));
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendValue_2arg_null() throws Exception {
-        builder.appendValue(null, 3);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendValue(null, 3));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValue_2arg_widthTooSmall() throws Exception {
-        builder.appendValue(DAY_OF_MONTH, 0);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValue(DAY_OF_MONTH, 0));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValue_2arg_widthTooBig() throws Exception {
-        builder.appendValue(DAY_OF_MONTH, 20);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValue(DAY_OF_MONTH, 20));
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendValue_3arg_nullField() throws Exception {
-        builder.appendValue(null, 2, 3, SignStyle.NORMAL);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendValue(null, 2, 3, SignStyle.NORMAL));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValue_3arg_minWidthTooSmall() throws Exception {
-        builder.appendValue(DAY_OF_MONTH, 0, 2, SignStyle.NORMAL);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValue(DAY_OF_MONTH, 0, 2, SignStyle.NORMAL));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValue_3arg_minWidthTooBig() throws Exception {
-        builder.appendValue(DAY_OF_MONTH, 20, 2, SignStyle.NORMAL);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValue(DAY_OF_MONTH, 20, 2, SignStyle.NORMAL));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValue_3arg_maxWidthTooSmall() throws Exception {
-        builder.appendValue(DAY_OF_MONTH, 2, 0, SignStyle.NORMAL);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValue(DAY_OF_MONTH, 2, 0, SignStyle.NORMAL));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValue_3arg_maxWidthTooBig() throws Exception {
-        builder.appendValue(DAY_OF_MONTH, 2, 20, SignStyle.NORMAL);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValue(DAY_OF_MONTH, 2, 20, SignStyle.NORMAL));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValue_3arg_maxWidthMinWidth() throws Exception {
-        builder.appendValue(DAY_OF_MONTH, 4, 2, SignStyle.NORMAL);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValue(DAY_OF_MONTH, 4, 2, SignStyle.NORMAL));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendValue_3arg_nullSignStyle() throws Exception {
-        builder.appendValue(DAY_OF_MONTH, 2, 3, null);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendValue(DAY_OF_MONTH, 2, 3, null));
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendValueReduced_int_nullField() throws Exception {
-        builder.appendValueReduced(null, 2, 2, 2000);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendValueReduced(null, 2, 2, 2000));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValueReduced_int_minWidthTooSmall() throws Exception {
-        builder.appendValueReduced(YEAR, 0, 2, 2000);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValueReduced(YEAR, 0, 2, 2000));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValueReduced_int_minWidthTooBig() throws Exception {
-        builder.appendValueReduced(YEAR, 11, 2, 2000);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValueReduced(YEAR, 11, 2, 2000));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValueReduced_int_maxWidthTooSmall() throws Exception {
-        builder.appendValueReduced(YEAR, 2, 0, 2000);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValueReduced(YEAR, 2, 0, 2000));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValueReduced_int_maxWidthTooBig() throws Exception {
-        builder.appendValueReduced(YEAR, 2, 11, 2000);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValueReduced(YEAR, 2, 11, 2000));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValueReduced_int_maxWidthLessThanMin() throws Exception {
-        builder.appendValueReduced(YEAR, 2, 1, 2000);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValueReduced(YEAR, 2, 1, 2000));
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendValueReduced_date_nullField() throws Exception {
-        builder.appendValueReduced(null, 2, 2, LocalDate.of(2000, 1, 1));
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendValueReduced(null, 2, 2, LocalDate.of(2000, 1, 1)));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendValueReduced_date_nullDate() throws Exception {
-        builder.appendValueReduced(YEAR, 2, 2, null);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendValueReduced(YEAR, 2, 2, null));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValueReduced_date_minWidthTooSmall() throws Exception {
-        builder.appendValueReduced(YEAR, 0, 2, LocalDate.of(2000, 1, 1));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValueReduced(YEAR, 0, 2, LocalDate.of(2000, 1, 1)));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValueReduced_date_minWidthTooBig() throws Exception {
-        builder.appendValueReduced(YEAR, 11, 2, LocalDate.of(2000, 1, 1));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValueReduced(YEAR, 11, 2, LocalDate.of(2000, 1, 1)));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValueReduced_date_maxWidthTooSmall() throws Exception {
-        builder.appendValueReduced(YEAR, 2, 0, LocalDate.of(2000, 1, 1));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValueReduced(YEAR, 2, 0, LocalDate.of(2000, 1, 1)));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValueReduced_date_maxWidthTooBig() throws Exception {
-        builder.appendValueReduced(YEAR, 2, 11, LocalDate.of(2000, 1, 1));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValueReduced(YEAR, 2, 11, LocalDate.of(2000, 1, 1)));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValueReduced_date_maxWidthLessThanMin() throws Exception {
-        builder.appendValueReduced(YEAR, 2, 1, LocalDate.of(2000, 1, 1));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValueReduced(YEAR, 2, 1, LocalDate.of(2000, 1, 1)));
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendFraction_4arg_nullRule() throws Exception {
-        builder.appendFraction(null, 1, 9, false);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendFraction(null, 1, 9, false));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendFraction_4arg_invalidRuleNotFixedSet() throws Exception {
-        builder.appendFraction(DAY_OF_MONTH, 1, 9, false);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendFraction(DAY_OF_MONTH, 1, 9, false));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendFraction_4arg_minTooSmall() throws Exception {
-        builder.appendFraction(MINUTE_OF_HOUR, -1, 9, false);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendFraction(MINUTE_OF_HOUR, -1, 9, false));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendFraction_4arg_minTooBig() throws Exception {
-        builder.appendFraction(MINUTE_OF_HOUR, 10, 9, false);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendFraction(MINUTE_OF_HOUR, 10, 9, false));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendFraction_4arg_maxTooSmall() throws Exception {
-        builder.appendFraction(MINUTE_OF_HOUR, 0, -1, false);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendFraction(MINUTE_OF_HOUR, 0, -1, false));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendFraction_4arg_maxTooBig() throws Exception {
-        builder.appendFraction(MINUTE_OF_HOUR, 1, 10, false);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendFraction(MINUTE_OF_HOUR, 1, 10, false));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendFraction_4arg_maxWidthMinWidth() throws Exception {
-        builder.appendFraction(MINUTE_OF_HOUR, 9, 3, false);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendFraction(MINUTE_OF_HOUR, 9, 3, false));
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendText_1arg_null() throws Exception {
-        builder.appendText(null);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendText(null));
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendText_2arg_nullRule() throws Exception {
-        builder.appendText(null, TextStyle.SHORT);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendText(null, TextStyle.SHORT));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendText_2arg_nullStyle() throws Exception {
-        builder.appendText(MONTH_OF_YEAR, (TextStyle) null);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendText(MONTH_OF_YEAR, (TextStyle) null));
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendTextMap_nullRule() throws Exception {
-        builder.appendText(null, new HashMap<>());
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendText(null, new HashMap<>()));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendTextMap_nullStyle() throws Exception {
-        builder.appendText(MONTH_OF_YEAR, (Map<Long, String>) null);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendText(MONTH_OF_YEAR, (Map<Long, String>) null));
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="offsetPatterns")
     Object[][] data_offsetPatterns() {
         return new Object[][] {
                 {"+HH", 2, 0, 0, "+02"},
@@ -532,23 +535,24 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="offsetPatterns")
+    @ParameterizedTest
+    @MethodSource("data_offsetPatterns")
     public void test_appendOffset_format(String pattern, int h, int m, int s, String expected) throws Exception {
         builder.appendOffset(pattern, "Z");
         DateTimeFormatter f = builder.toFormatter();
         ZoneOffset offset = ZoneOffset.ofHoursMinutesSeconds(h, m, s);
-        assertEquals(f.format(offset), expected);
+        assertEquals(expected, f.format(offset));
     }
 
-    @Test(dataProvider="offsetPatterns")
+    @ParameterizedTest
+    @MethodSource("data_offsetPatterns")
     public void test_appendOffset_parse(String pattern, int h, int m, int s, String expected) throws Exception {
         builder.appendOffset(pattern, "Z");
         DateTimeFormatter f = builder.toFormatter();
         ZoneOffset parsed = f.parse(expected, ZoneOffset::from);
-        assertEquals(f.format(parsed), expected);
+        assertEquals(expected, f.format(parsed));
     }
 
-    @DataProvider(name="badOffsetPatterns")
     Object[][] data_badOffsetPatterns() {
         return new Object[][] {
             {"HH"},
@@ -563,25 +567,25 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="badOffsetPatterns", expectedExceptions=IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("data_badOffsetPatterns")
     public void test_appendOffset_badPattern(String pattern) throws Exception {
-        builder.appendOffset(pattern, "Z");
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendOffset(pattern, "Z"));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendOffset_3arg_nullText() throws Exception {
-        builder.appendOffset("+HH:MM", null);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendOffset("+HH:MM", null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendOffset_3arg_nullPattern() throws Exception {
-        builder.appendOffset(null, "Z");
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendOffset(null, "Z"));
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name = "formatGenericTimeZonePatterns")
     Object[][] data_formatGenericNonLocationPatterns() {
         return new Object[][] {
                 {"v", "America/Los_Angeles", "PT"},
@@ -591,14 +595,14 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider = "formatGenericTimeZonePatterns")
+    @ParameterizedTest
+    @MethodSource("data_formatGenericNonLocationPatterns")
     public void test_appendZoneText_formatGenericTimeZonePatterns(String pattern, String input, String expected) {
         ZonedDateTime zdt = ZonedDateTime.of(LocalDateTime.now(), ZoneId.of(input));
         DateTimeFormatter df = DateTimeFormatter.ofPattern(pattern, Locale.US);
-        assertEquals(zdt.format(df), expected);
+        assertEquals(expected, zdt.format(df));
     }
 
-    @DataProvider(name = "parseGenericTimeZonePatterns")
     Object[][]  data_parseGenericTimeZonePatterns() {
         return new Object[][] {
                 {"yyyy DDD HH mm v", LocalDateTime.of(2015, Month.MARCH, 10, 12, 13), ZoneId.of("America/Los_Angeles"),
@@ -612,15 +616,15 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider = "parseGenericTimeZonePatterns")
+    @ParameterizedTest
+    @MethodSource("data_parseGenericTimeZonePatterns")
     public void test_appendZoneText_parseGenericTimeZonePatterns(String pattern, LocalDateTime ldt, ZoneId zId, String input) {
         DateTimeFormatter df = new DateTimeFormatterBuilder().appendPattern(pattern).toFormatter(Locale.US);
         ZonedDateTime expected = ZonedDateTime.parse(input, df);
         ZonedDateTime actual = ZonedDateTime.of(ldt, zId);
-        assertEquals(actual, expected);
+        assertEquals(expected, actual);
     }
 
-    @DataProvider(name = "formatNonGenericTimeZonePatterns_1")
     Object[][]  data_formatNonGenericTimeZonePatterns_1() {
         return new Object[][] {
                 {"yyyy-MM-dd HH:mm:ss z", LocalDateTime.of(2015, Month.NOVEMBER, 1, 0, 30),
@@ -638,16 +642,16 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider = "formatNonGenericTimeZonePatterns_1")
+    @ParameterizedTest
+    @MethodSource("data_formatNonGenericTimeZonePatterns_1")
     public void test_appendZoneText_parseNonGenricTimeZonePatterns_1(String pattern, LocalDateTime ldt, String expected) {
         ZoneId  zId = ZoneId.of("America/Los_Angeles");
         DateTimeFormatter df = new DateTimeFormatterBuilder().appendPattern(pattern).toFormatter(Locale.US);
         ZonedDateTime zdt = ZonedDateTime.of(ldt, zId);
         String actual = df.format(zdt);
-        assertEquals(actual, expected);
+        assertEquals(expected, actual);
     }
 
-    @DataProvider(name = "formatNonGenericTimeZonePatterns_2")
     Object[][]  data_formatNonGenericTimeZonePatterns_2() {
         return new Object[][] {
                 {"yyyy-MM-dd HH:mm:ss z", LocalDateTime.of(2015, Month.NOVEMBER, 1, 0, 30),
@@ -665,17 +669,18 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider = "formatNonGenericTimeZonePatterns_2")
+    @ParameterizedTest
+    @MethodSource("data_formatNonGenericTimeZonePatterns_2")
     public void test_appendZoneText_parseNonGenricTimeZonePatterns_2(String pattern, LocalDateTime ldt, String expected) {
         ZoneId  zId = ZoneId.of("America/Los_Angeles");
         DateTimeFormatter df = DateTimeFormatter.ofPattern(pattern, Locale.US).withZone(zId);
         String actual = df.format(ldt);
-        assertEquals(actual, expected);
+        assertEquals(expected, actual);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendZoneText_1arg_nullText() throws Exception {
-        builder.appendZoneText(null);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendZoneText(null));
     }
 
     //-----------------------------------------------------------------------
@@ -684,24 +689,24 @@ public class TCKDateTimeFormatterBuilder {
     @Test
     public void test_padNext_1arg() {
         builder.appendValue(MONTH_OF_YEAR).appendLiteral(':').padNext(2).appendValue(DAY_OF_MONTH);
-        assertEquals(builder.toFormatter().format(LocalDate.of(2013, 2, 1)), "2: 1");
+        assertEquals("2: 1", builder.toFormatter().format(LocalDate.of(2013, 2, 1)));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_padNext_1arg_invalidWidth() throws Exception {
-        builder.padNext(0);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.padNext(0));
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_padNext_2arg_dash() throws Exception {
         builder.appendValue(MONTH_OF_YEAR).appendLiteral(':').padNext(2, '-').appendValue(DAY_OF_MONTH);
-        assertEquals(builder.toFormatter().format(LocalDate.of(2013, 2, 1)), "2:-1");
+        assertEquals("2:-1", builder.toFormatter().format(LocalDate.of(2013, 2, 1)));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_padNext_2arg_invalidWidth() throws Exception {
-        builder.padNext(0, '-');
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.padNext(0, '-'));
     }
 
     //-----------------------------------------------------------------------
@@ -710,22 +715,21 @@ public class TCKDateTimeFormatterBuilder {
         builder.appendValue(MONTH_OF_YEAR).appendLiteral(':')
                 .padNext(5).optionalStart().appendValue(DAY_OF_MONTH).optionalEnd()
                 .appendLiteral(':').appendValue(YEAR);
-        assertEquals(builder.toFormatter().format(LocalDate.of(2013, 2, 1)), "2:    1:2013");
-        assertEquals(builder.toFormatter().format(YearMonth.of(2013, 2)), "2:     :2013");
+        assertEquals("2:    1:2013", builder.toFormatter().format(LocalDate.of(2013, 2, 1)));
+        assertEquals("2:     :2013", builder.toFormatter().format(YearMonth.of(2013, 2)));
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=IllegalStateException.class)
+    @Test
     public void test_optionalEnd_noStart() throws Exception {
-        builder.optionalEnd();
+        Assertions.assertThrows(IllegalStateException.class, () -> builder.optionalEnd());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="validPatterns")
     Object[][] dataValid() {
         return new Object[][] {
             {"'a'"},
@@ -882,13 +886,13 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="validPatterns")
+    @ParameterizedTest
+    @MethodSource("dataValid")
     public void test_appendPattern_valid(String input) throws Exception {
         builder.appendPattern(input);  // test is for no error here
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="invalidPatterns")
     Object[][] dataInvalid() {
         return new Object[][] {
             {"'"},
@@ -954,13 +958,15 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="invalidPatterns", expectedExceptions=IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("dataInvalid")
     public void test_appendPattern_invalid(String input) throws Exception {
-        builder.appendPattern(input);  // test is for error here
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            builder.appendPattern(input);  // test is for error here
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="patternPrint")
     Object[][] data_patternPrint() {
         return new Object[][] {
             {"Q", date(2012, 2, 10), "1"},
@@ -971,11 +977,12 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="patternPrint")
+    @ParameterizedTest
+    @MethodSource("data_patternPrint")
     public void test_appendPattern_patternPrint(String input, Temporal temporal, String expected) throws Exception {
         DateTimeFormatter f = builder.appendPattern(input).toFormatter(Locale.UK);
         String test = f.format(temporal);
-        assertEquals(test, expected);
+        assertEquals(expected, test);
     }
 
     private static Temporal date(int y, int m, int d) {
@@ -983,7 +990,6 @@ public class TCKDateTimeFormatterBuilder {
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="modJulianFieldPattern")
     Object[][] data_modJuilanFieldPattern() {
         return new Object[][] {
             {"g", "1"},
@@ -992,12 +998,12 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="modJulianFieldPattern")
+    @ParameterizedTest
+    @MethodSource("data_modJuilanFieldPattern")
     public void test_modJulianFieldPattern(String pattern, String input) throws Exception {
         DateTimeFormatter.ofPattern(pattern).parse(input);
     }
 
-    @DataProvider(name="modJulianFieldValues")
     Object[][] data_modJuilanFieldValues() {
         return new Object[][] {
             {1970, 1, 1, "40587"},
@@ -1006,13 +1012,13 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="modJulianFieldValues")
+    @ParameterizedTest
+    @MethodSource("data_modJuilanFieldValues")
     public void test_modJulianFieldValues(int y, int m, int d, String expected) throws Exception {
         DateTimeFormatter df = new DateTimeFormatterBuilder().appendPattern("g").toFormatter();
-         assertEquals(LocalDate.of(y, m, d).format(df), expected);
+         assertEquals(expected, LocalDate.of(y, m, d).format(df));
     }
     //----------------------------------------------------------------------
-    @DataProvider(name="dayOfYearFieldValues")
     Object[][] data_dayOfYearFieldValues() {
         return new Object[][] {
                 {2016, 1, 1, "D", "1"},
@@ -1026,13 +1032,13 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="dayOfYearFieldValues")
+    @ParameterizedTest
+    @MethodSource("data_dayOfYearFieldValues")
     public void test_dayOfYearFieldValues(int y, int m, int d, String pattern, String expected) throws Exception {
         DateTimeFormatter df = new DateTimeFormatterBuilder().appendPattern(pattern).toFormatter();
-        assertEquals(LocalDate.of(y, m, d).format(df), expected);
+        assertEquals(expected, LocalDate.of(y, m, d).format(df));
     }
 
-    @DataProvider(name="dayOfYearFieldAdjacentParsingValues")
     Object[][] data_dayOfYearFieldAdjacentParsingValues() {
         return new Object[][] {
             {"20160281015", LocalDateTime.of(2016, 1, 28, 10, 15)},
@@ -1040,26 +1046,28 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="dayOfYearFieldAdjacentParsingValues")
+    @ParameterizedTest
+    @MethodSource("data_dayOfYearFieldAdjacentParsingValues")
     public void test_dayOfYearFieldAdjacentValueParsing(String input, LocalDateTime expected) {
         DateTimeFormatter df = new DateTimeFormatterBuilder().appendPattern("yyyyDDDHHmm").toFormatter();
         LocalDateTime actual = LocalDateTime.parse(input, df);
-        assertEquals(actual, expected);
+        assertEquals(expected, actual);
     }
 
-    @Test(expectedExceptions = DateTimeParseException.class)
+    @Test
     public void test_dayOfYearFieldInvalidValue() {
-        DateTimeFormatter.ofPattern("DDD").parse("1234");
+        Assertions.assertThrows(DateTimeParseException.class, () -> DateTimeFormatter.ofPattern("DDD").parse("1234"));
     }
 
-    @Test(expectedExceptions = DateTimeParseException.class)
+    @Test
     public void test_dayOfYearFieldInvalidAdacentValueParsingPattern() {
-        // patterns D and DD will not take part in adjacent value parsing
-        DateTimeFormatter.ofPattern("yyyyDDHHmmss").parse("201610123456");
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            // patterns D and DD will not take part in adjacent value parsing
+            DateTimeFormatter.ofPattern("yyyyDDHHmmss").parse("201610123456");
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="secondsPattern")
     Object[][] data_secondsPattern() {
         return new Object[][] {
                 {"A", "1", LocalTime.ofNanoOfDay(1_000_000)},
@@ -1080,13 +1088,13 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="secondsPattern")
+    @ParameterizedTest
+    @MethodSource("data_secondsPattern")
     public void test_secondsPattern(String pattern, String input, LocalTime expected) throws Exception {
         DateTimeFormatter df = new DateTimeFormatterBuilder().appendPattern(pattern).toFormatter();
-        assertEquals(LocalTime.parse(input, df), expected);
+        assertEquals(expected, LocalTime.parse(input, df));
     }
 
-    @DataProvider(name="secondsValues")
     Object[][] data_secondsValues() {
         return new Object[][] {
                 {"A", 1, "1000"},
@@ -1095,16 +1103,19 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="secondsValues")
+    @ParameterizedTest
+    @MethodSource("data_secondsValues")
     public void test_secondsValues(String pattern, int seconds , String expected) throws Exception {
         DateTimeFormatter df = new DateTimeFormatterBuilder().appendPattern(pattern).toFormatter();
-        assertEquals(LocalTime.ofSecondOfDay(seconds).format(df), expected);
+        assertEquals(expected, LocalTime.ofSecondOfDay(seconds).format(df));
     }
 
-    @Test(expectedExceptions = DateTimeParseException.class)
+    @Test
     public void test_secondsPatternInvalidAdacentValueParsingPattern() {
-        // patterns A*, N*, n* will not take part in adjacent value parsing
-        DateTimeFormatter.ofPattern("yyyyAA").parse("201610");
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            // patterns A*, N*, n* will not take part in adjacent value parsing
+            DateTimeFormatter.ofPattern("yyyyAA").parse("201610");
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1114,10 +1125,10 @@ public class TCKDateTimeFormatterBuilder {
         DateTimeFormatter f = builder.appendValue(HOUR_OF_DAY, 2).appendValue(MINUTE_OF_HOUR, 2).appendLiteral('9').toFormatter(Locale.UK);
         ParsePosition pp = new ParsePosition(0);
         TemporalAccessor parsed = f.parseUnresolved("12309", pp);
-        assertEquals(pp.getErrorIndex(), -1);
-        assertEquals(pp.getIndex(), 5);
-        assertEquals(parsed.getLong(HOUR_OF_DAY), 12L);
-        assertEquals(parsed.getLong(MINUTE_OF_HOUR), 30L);
+        assertEquals(-1, pp.getErrorIndex());
+        assertEquals(5, pp.getIndex());
+        assertEquals(12L, parsed.getLong(HOUR_OF_DAY));
+        assertEquals(30L, parsed.getLong(MINUTE_OF_HOUR));
     }
 
     @Test
@@ -1126,10 +1137,10 @@ public class TCKDateTimeFormatterBuilder {
         DateTimeFormatter f = builder.appendValue(HOUR_OF_DAY).appendValue(MINUTE_OF_HOUR, 2).appendLiteral('Z').toFormatter(Locale.UK);
         ParsePosition pp = new ParsePosition(0);
         TemporalAccessor parsed = f.parseUnresolved("12309Z", pp);
-        assertEquals(pp.getErrorIndex(), -1);
-        assertEquals(pp.getIndex(), 6);
-        assertEquals(parsed.getLong(HOUR_OF_DAY), 123L);
-        assertEquals(parsed.getLong(MINUTE_OF_HOUR), 9L);
+        assertEquals(-1, pp.getErrorIndex());
+        assertEquals(6, pp.getIndex());
+        assertEquals(123L, parsed.getLong(HOUR_OF_DAY));
+        assertEquals(9L, parsed.getLong(MINUTE_OF_HOUR));
     }
 
     @Test
@@ -1138,8 +1149,8 @@ public class TCKDateTimeFormatterBuilder {
         DateTimeFormatter f = builder.appendValue(HOUR_OF_DAY).appendValue(MINUTE_OF_HOUR, 2).appendLiteral('9').toFormatter(Locale.UK);
         ParsePosition pp = new ParsePosition(0);
         TemporalAccessor parsed = f.parseUnresolved("12309", pp);
-        assertEquals(pp.getErrorIndex(), 5);
-        assertEquals(parsed, null);
+        assertEquals(5, pp.getErrorIndex());
+        assertEquals(null, parsed);
     }
 
     @Test
@@ -1148,10 +1159,10 @@ public class TCKDateTimeFormatterBuilder {
         DateTimeFormatter f = builder.parseLenient().appendValue(HOUR_OF_DAY, 2).appendValue(MINUTE_OF_HOUR, 2).appendLiteral('9').toFormatter(Locale.UK);
         ParsePosition pp = new ParsePosition(0);
         TemporalAccessor parsed = f.parseUnresolved("12309", pp);
-        assertEquals(pp.getErrorIndex(), -1);
-        assertEquals(pp.getIndex(), 5);
-        assertEquals(parsed.getLong(HOUR_OF_DAY), 12L);
-        assertEquals(parsed.getLong(MINUTE_OF_HOUR), 30L);
+        assertEquals(-1, pp.getErrorIndex());
+        assertEquals(5, pp.getIndex());
+        assertEquals(12L, parsed.getLong(HOUR_OF_DAY));
+        assertEquals(30L, parsed.getLong(MINUTE_OF_HOUR));
     }
 
     @Test
@@ -1160,10 +1171,10 @@ public class TCKDateTimeFormatterBuilder {
         DateTimeFormatter f = builder.parseLenient().appendValue(HOUR_OF_DAY).appendValue(MINUTE_OF_HOUR, 2).appendLiteral('Z').toFormatter(Locale.UK);
         ParsePosition pp = new ParsePosition(0);
         TemporalAccessor parsed = f.parseUnresolved("12309Z", pp);
-        assertEquals(pp.getErrorIndex(), -1);
-        assertEquals(pp.getIndex(), 6);
-        assertEquals(parsed.getLong(HOUR_OF_DAY), 123L);
-        assertEquals(parsed.getLong(MINUTE_OF_HOUR), 9L);
+        assertEquals(-1, pp.getErrorIndex());
+        assertEquals(6, pp.getIndex());
+        assertEquals(123L, parsed.getLong(HOUR_OF_DAY));
+        assertEquals(9L, parsed.getLong(MINUTE_OF_HOUR));
     }
 
     @Test
@@ -1172,8 +1183,8 @@ public class TCKDateTimeFormatterBuilder {
         DateTimeFormatter f = builder.parseLenient().appendValue(HOUR_OF_DAY).appendValue(MINUTE_OF_HOUR, 2).appendLiteral('9').toFormatter(Locale.UK);
         ParsePosition pp = new ParsePosition(0);
         TemporalAccessor parsed = f.parseUnresolved("12309", pp);
-        assertEquals(pp.getErrorIndex(), 5);
-        assertEquals(parsed, null);
+        assertEquals(5, pp.getErrorIndex());
+        assertEquals(null, parsed);
     }
 
     //-----------------------------------------------------------------------
@@ -1183,11 +1194,11 @@ public class TCKDateTimeFormatterBuilder {
         DateTimeFormatter f = builder.appendValue(HOUR_OF_DAY, 2).appendValue(MINUTE_OF_HOUR, 2).appendFraction(NANO_OF_SECOND, 0, 3, false).toFormatter(Locale.UK);
         ParsePosition pp = new ParsePosition(0);
         TemporalAccessor parsed = f.parseUnresolved("1230567", pp);
-        assertEquals(pp.getErrorIndex(), -1);
-        assertEquals(pp.getIndex(), 7);
-        assertEquals(parsed.getLong(HOUR_OF_DAY), 12L);
-        assertEquals(parsed.getLong(MINUTE_OF_HOUR), 30L);
-        assertEquals(parsed.getLong(NANO_OF_SECOND), 567_000_000L);
+        assertEquals(-1, pp.getErrorIndex());
+        assertEquals(7, pp.getIndex());
+        assertEquals(12L, parsed.getLong(HOUR_OF_DAY));
+        assertEquals(30L, parsed.getLong(MINUTE_OF_HOUR));
+        assertEquals(567_000_000L, parsed.getLong(NANO_OF_SECOND));
     }
 
     @Test
@@ -1196,11 +1207,11 @@ public class TCKDateTimeFormatterBuilder {
         DateTimeFormatter f = builder.appendValue(HOUR_OF_DAY, 2).appendValue(MINUTE_OF_HOUR, 2).appendFraction(NANO_OF_SECOND, 0, 3, false).toFormatter(Locale.UK);
         ParsePosition pp = new ParsePosition(0);
         TemporalAccessor parsed = f.parseUnresolved("123056", pp);
-        assertEquals(pp.getErrorIndex(), -1);
-        assertEquals(pp.getIndex(), 6);
-        assertEquals(parsed.getLong(HOUR_OF_DAY), 12L);
-        assertEquals(parsed.getLong(MINUTE_OF_HOUR), 30L);
-        assertEquals(parsed.getLong(NANO_OF_SECOND), 560_000_000L);
+        assertEquals(-1, pp.getErrorIndex());
+        assertEquals(6, pp.getIndex());
+        assertEquals(12L, parsed.getLong(HOUR_OF_DAY));
+        assertEquals(30L, parsed.getLong(MINUTE_OF_HOUR));
+        assertEquals(560_000_000L, parsed.getLong(NANO_OF_SECOND));
     }
 
     @Test
@@ -1209,10 +1220,10 @@ public class TCKDateTimeFormatterBuilder {
         DateTimeFormatter f = builder.appendValue(HOUR_OF_DAY, 2).appendValue(MINUTE_OF_HOUR, 2).appendFraction(NANO_OF_SECOND, 0, 3, false).toFormatter(Locale.UK);
         ParsePosition pp = new ParsePosition(0);
         TemporalAccessor parsed = f.parseUnresolved("1230", pp);
-        assertEquals(pp.getErrorIndex(), -1);
-        assertEquals(pp.getIndex(), 4);
-        assertEquals(parsed.getLong(HOUR_OF_DAY), 12L);
-        assertEquals(parsed.getLong(MINUTE_OF_HOUR), 30L);
+        assertEquals(-1, pp.getErrorIndex());
+        assertEquals(4, pp.getIndex());
+        assertEquals(12L, parsed.getLong(HOUR_OF_DAY));
+        assertEquals(30L, parsed.getLong(MINUTE_OF_HOUR));
     }
 
     @Test
@@ -1221,11 +1232,11 @@ public class TCKDateTimeFormatterBuilder {
         DateTimeFormatter f = builder.parseLenient().appendValue(HOUR_OF_DAY, 2).appendValue(MINUTE_OF_HOUR, 2).appendFraction(NANO_OF_SECOND, 3, 3, false).toFormatter(Locale.UK);
         ParsePosition pp = new ParsePosition(0);
         TemporalAccessor parsed = f.parseUnresolved("1230567", pp);
-        assertEquals(pp.getErrorIndex(), -1);
-        assertEquals(pp.getIndex(), 7);
-        assertEquals(parsed.getLong(HOUR_OF_DAY), 12L);
-        assertEquals(parsed.getLong(MINUTE_OF_HOUR), 30L);
-        assertEquals(parsed.getLong(NANO_OF_SECOND), 567_000_000L);
+        assertEquals(-1, pp.getErrorIndex());
+        assertEquals(7, pp.getIndex());
+        assertEquals(12L, parsed.getLong(HOUR_OF_DAY));
+        assertEquals(30L, parsed.getLong(MINUTE_OF_HOUR));
+        assertEquals(567_000_000L, parsed.getLong(NANO_OF_SECOND));
     }
 
     @Test
@@ -1234,11 +1245,11 @@ public class TCKDateTimeFormatterBuilder {
         DateTimeFormatter f = builder.parseLenient().appendValue(HOUR_OF_DAY, 2).appendValue(MINUTE_OF_HOUR, 2).appendFraction(NANO_OF_SECOND, 3, 3, false).toFormatter(Locale.UK);
         ParsePosition pp = new ParsePosition(0);
         TemporalAccessor parsed = f.parseUnresolved("123056", pp);
-        assertEquals(pp.getErrorIndex(), -1);
-        assertEquals(pp.getIndex(), 6);
-        assertEquals(parsed.getLong(HOUR_OF_DAY), 12L);
-        assertEquals(parsed.getLong(MINUTE_OF_HOUR), 30L);
-        assertEquals(parsed.getLong(NANO_OF_SECOND), 560_000_000L);
+        assertEquals(-1, pp.getErrorIndex());
+        assertEquals(6, pp.getIndex());
+        assertEquals(12L, parsed.getLong(HOUR_OF_DAY));
+        assertEquals(30L, parsed.getLong(MINUTE_OF_HOUR));
+        assertEquals(560_000_000L, parsed.getLong(NANO_OF_SECOND));
     }
 
     @Test
@@ -1247,13 +1258,12 @@ public class TCKDateTimeFormatterBuilder {
         DateTimeFormatter f = builder.parseLenient().appendValue(HOUR_OF_DAY, 2).appendValue(MINUTE_OF_HOUR, 2).appendFraction(NANO_OF_SECOND, 3, 3, false).toFormatter(Locale.UK);
         ParsePosition pp = new ParsePosition(0);
         TemporalAccessor parsed = f.parseUnresolved("1230", pp);
-        assertEquals(pp.getErrorIndex(), -1);
-        assertEquals(pp.getIndex(), 4);
-        assertEquals(parsed.getLong(HOUR_OF_DAY), 12L);
-        assertEquals(parsed.getLong(MINUTE_OF_HOUR), 30L);
+        assertEquals(-1, pp.getErrorIndex());
+        assertEquals(4, pp.getIndex());
+        assertEquals(12L, parsed.getLong(HOUR_OF_DAY));
+        assertEquals(30L, parsed.getLong(MINUTE_OF_HOUR));
     }
 
-    @DataProvider(name="adjacentFractionParseData")
     Object[][] data_adjacent_fraction_parse() {
         return new Object[][] {
             {"20130812214600025", "yyyyMMddHHmmssSSS", LocalDateTime.of(2013, 8, 12, 21, 46, 00, 25000000)},
@@ -1261,14 +1271,14 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider = "adjacentFractionParseData")
+    @ParameterizedTest
+    @MethodSource("data_adjacent_fraction_parse")
     public void test_adjacent_fraction(String input, String pattern, LocalDateTime expected) {
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern(pattern);
         LocalDateTime actual = LocalDateTime.parse(input, dtf);
-        assertEquals(actual, expected);
+        assertEquals(expected, actual);
     }
 
-    @DataProvider(name="lenientOffsetParseData")
     Object[][] data_lenient_offset_parse() {
         return new Object[][] {
             {"+HH", "+01", 3600},
@@ -1381,7 +1391,6 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @DataProvider(name="strictDoubleDigitHourOffsetParseData")
     Object[][] data_strictDoubleDigitHour_offset_parse() {
         return new Object[][] {
             {"+HH", "+01", 3600},
@@ -1406,7 +1415,6 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @DataProvider(name="strictSingleDigitHourOffsetParseData")
     Object[][] data_strictSingleDigitHour_offset_parse() {
         return new Object[][] {
             {"+H", "+01", 3600},
@@ -1450,43 +1458,45 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="lenientOffsetParseData")
+    @ParameterizedTest
+    @MethodSource("data_lenient_offset_parse")
     public void test_lenient_offset_parse_1(String pattern, String offset, int offsetSeconds) {
-        assertEquals(new DateTimeFormatterBuilder().parseLenient().appendOffset(pattern, "Z").toFormatter().parse(offset).get(OFFSET_SECONDS),
-                     offsetSeconds);
+        assertEquals(offsetSeconds, new DateTimeFormatterBuilder().parseLenient().appendOffset(pattern, "Z").toFormatter().parse(offset).get(OFFSET_SECONDS));
     }
 
     @Test
     public void test_lenient_offset_parse_2() {
-        assertEquals(new DateTimeFormatterBuilder().parseLenient().appendOffsetId().toFormatter().parse("+01").get(OFFSET_SECONDS),
-                     3600);
+        assertEquals(3600, new DateTimeFormatterBuilder().parseLenient().appendOffsetId().toFormatter().parse("+01").get(OFFSET_SECONDS));
     }
 
-    @Test(dataProvider="strictDoubleDigitHourOffsetParseData")
+    @ParameterizedTest
+    @MethodSource("data_strictDoubleDigitHour_offset_parse")
     public void test_strictDoubleDigitHour_offset_parse_1(String pattern, String offset, int offsetSeconds) {
-        assertEquals(new DateTimeFormatterBuilder().appendOffset(pattern, "Z").toFormatter()
-                .parse(offset).get(OFFSET_SECONDS), offsetSeconds);
+        assertEquals(offsetSeconds, new DateTimeFormatterBuilder().appendOffset(pattern, "Z").toFormatter()
+                .parse(offset).get(OFFSET_SECONDS));
     }
 
-    @Test(dataProvider="strictDoubleDigitHourOffsetParseData")
+    @ParameterizedTest
+    @MethodSource("data_strictDoubleDigitHour_offset_parse")
     public void test_strictDoubleDigitHour_offset_parse_2(String pattern, String offset, int offsetSeconds) {
-        assertEquals(new DateTimeFormatterBuilder().appendOffset(pattern, "Z")
-                .appendLiteral("text").toFormatter().parse(offset + "text").get(OFFSET_SECONDS), offsetSeconds);
+        assertEquals(offsetSeconds, new DateTimeFormatterBuilder().appendOffset(pattern, "Z")
+                .appendLiteral("text").toFormatter().parse(offset + "text").get(OFFSET_SECONDS));
     }
 
-    @Test(dataProvider="strictSingleDigitHourOffsetParseData")
+    @ParameterizedTest
+    @MethodSource("data_strictSingleDigitHour_offset_parse")
     public void test_strictSingleDigitHour_offset_parse_1(String pattern, String offset, int offsetSeconds) {
-        assertEquals(new DateTimeFormatterBuilder().appendOffset(pattern, "Z").toFormatter()
-                .parse(offset).get(OFFSET_SECONDS), offsetSeconds);
+        assertEquals(offsetSeconds, new DateTimeFormatterBuilder().appendOffset(pattern, "Z").toFormatter()
+                .parse(offset).get(OFFSET_SECONDS));
     }
 
-    @Test(dataProvider="strictSingleDigitHourOffsetParseData")
+    @ParameterizedTest
+    @MethodSource("data_strictSingleDigitHour_offset_parse")
     public void test_strictSingleDigitHour_offset_parse_2(String pattern, String offset, int offsetSeconds) {
-        assertEquals(new DateTimeFormatterBuilder().appendOffset(pattern, "Z")
-                .appendLiteral("text").toFormatter().parse(offset + "text").get(OFFSET_SECONDS), offsetSeconds);
+        assertEquals(offsetSeconds, new DateTimeFormatterBuilder().appendOffset(pattern, "Z")
+                .appendLiteral("text").toFormatter().parse(offset + "text").get(OFFSET_SECONDS));
     }
 
-    @DataProvider(name="strictOffsetAdjacentParseValidPatternData")
     Object[][] data_strict_offset_adjacentParse_validPattern() {
         return new Object[][] {
             {"+HH", "+01", 3600},
@@ -1530,15 +1540,15 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="strictOffsetAdjacentParseValidPatternData")
+    @ParameterizedTest
+    @MethodSource("data_strict_offset_adjacentParse_validPattern")
     public void test_strict_offset_adjacentValidPattern_parse(String pattern, String offset, int offsetSeconds) {
         TemporalAccessor tmp = new DateTimeFormatterBuilder().appendOffset(pattern, "Z")
                 .appendValue(HOUR_OF_DAY, 2).toFormatter().parse(offset + "12");
-        assertEquals(tmp.get(OFFSET_SECONDS), offsetSeconds);
-        assertEquals(tmp.get(HOUR_OF_DAY), 12);
+        assertEquals(offsetSeconds, tmp.get(OFFSET_SECONDS));
+        assertEquals(12, tmp.get(HOUR_OF_DAY));
     }
 
-    @DataProvider(name="strictOffsetAdjacentParseInvalidPatternData")
     Object[][] data_strict_offset_adjacentParse_invalidPattern() {
         return new Object[][] {
             {"+HHmm", "+01", 3600},
@@ -1564,13 +1574,13 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="strictOffsetAdjacentParseInvalidPatternData", expectedExceptions=DateTimeParseException.class)
+    @ParameterizedTest
+    @MethodSource("data_strict_offset_adjacentParse_invalidPattern")
     public void test_strict_offset_adjacentInvalidPattern_parse(String pattern, String offset, int offsetSeconds) {
-       new DateTimeFormatterBuilder().appendOffset(pattern, "Z").appendValue(HOUR_OF_DAY, 2)
-               .toFormatter().parse(offset + "12");
+        Assertions.assertThrows(DateTimeParseException.class, () -> new DateTimeFormatterBuilder().appendOffset(pattern, "Z").appendValue(HOUR_OF_DAY, 2)
+                .toFormatter().parse(offset + "12"));
     }
 
-    @DataProvider(name="lenientOffsetAdjacentParseValidPatternData")
     Object[][] data_lenient_offset_adjacentParse_validPattern() {
         return new Object[][] {
             {"+HH:mm", "+01", 3600},
@@ -1606,12 +1616,13 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="lenientOffsetAdjacentParseValidPatternData")
+    @ParameterizedTest
+    @MethodSource("data_lenient_offset_adjacentParse_validPattern")
     public void test_lenient_offset_adjacentValidPattern_parse(String pattern, String offset, int offsetSeconds) {
         TemporalAccessor tmp = new DateTimeFormatterBuilder().parseLenient()
                 .appendOffset(pattern, "Z").appendValue(HOUR_OF_DAY, 2).toFormatter().parse(offset + "12");
-        assertEquals(tmp.get(OFFSET_SECONDS), offsetSeconds);
-        assertEquals(tmp.get(HOUR_OF_DAY), 12);
+        assertEquals(offsetSeconds, tmp.get(OFFSET_SECONDS));
+        assertEquals(12, tmp.get(HOUR_OF_DAY));
     }
 
     @Test
@@ -1620,12 +1631,11 @@ public class TCKDateTimeFormatterBuilder {
                 .appendOffset("+HMMSS", "Z").appendValue(HOUR_OF_DAY, 2).toFormatter().parse("+10101" + "12");
         //Equivalent to +101011. In lenient mode, offset will parse upto 6 digit if possible.
         //It will take 1 digit from HOUR_OF_DAY.
-        assertEquals(tmp.get(OFFSET_SECONDS), 36611);
-        assertEquals(tmp.get(HOUR_OF_DAY), 2);
+        assertEquals(36611, tmp.get(OFFSET_SECONDS));
+        assertEquals(2, tmp.get(HOUR_OF_DAY));
     }
 
-  @DataProvider(name="lenientOffsetAdjacentParseInvalidPatternData")
-    Object[][] data_lenient_offset_adjacentParse_invalidPattern() {
+  Object[][] data_lenient_offset_adjacentParse_invalidPattern() {
         return new Object[][] {
             {"+HH", "+01", 3600},
             {"+HHmm", "+0101", 3660},
@@ -1636,13 +1646,13 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="lenientOffsetAdjacentParseInvalidPatternData", expectedExceptions=DateTimeParseException.class)
+    @ParameterizedTest
+    @MethodSource("data_lenient_offset_adjacentParse_invalidPattern")
     public void test_lenient_offset_adjacentInvalidPattern_parse(String pattern, String offset, int offsetSeconds) {
-       new DateTimeFormatterBuilder().parseLenient().appendOffset(pattern, "Z")
-               .appendValue(HOUR_OF_DAY, 2).toFormatter().parse(offset + "12");
+        Assertions.assertThrows(DateTimeParseException.class, () -> new DateTimeFormatterBuilder().parseLenient().appendOffset(pattern, "Z")
+                .appendValue(HOUR_OF_DAY, 2).toFormatter().parse(offset + "12"));
     }
 
-    @DataProvider(name="badValues")
     Object[][] data_badOffsetValues() {
         return new Object[][] {
             {"+HH", "+24"},
@@ -1654,40 +1664,41 @@ public class TCKDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="badValues", expectedExceptions=DateTimeParseException.class)
+    @ParameterizedTest
+    @MethodSource("data_badOffsetValues")
     public void test_badOffset_parse(String pattern, String offset) {
-        new DateTimeFormatterBuilder().appendOffset(pattern, "Z").toFormatter().parse(offset);
+        Assertions.assertThrows(DateTimeParseException.class, () -> new DateTimeFormatterBuilder().appendOffset(pattern, "Z").toFormatter().parse(offset));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void test_strict_appendOffsetId() {
-        new DateTimeFormatterBuilder().appendOffsetId().toFormatter().parse("+01");
+        Assertions.assertThrows(DateTimeParseException.class, () -> new DateTimeFormatterBuilder().appendOffsetId().toFormatter().parse("+01"));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void test_strict_appendOffset_1() {
-        new DateTimeFormatterBuilder().appendOffset("+HH:MM:ss", "Z").toFormatter().parse("+01");
+        Assertions.assertThrows(DateTimeParseException.class, () -> new DateTimeFormatterBuilder().appendOffset("+HH:MM:ss", "Z").toFormatter().parse("+01"));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void test_strict_appendOffset_2() {
-        new DateTimeFormatterBuilder().appendOffset("+HHMMss", "Z").toFormatter().parse("+01");
+        Assertions.assertThrows(DateTimeParseException.class, () -> new DateTimeFormatterBuilder().appendOffset("+HHMMss", "Z").toFormatter().parse("+01"));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void test_strict_appendOffset_3() {
-        new DateTimeFormatterBuilder().appendOffset("+H:MM:ss", "Z").toFormatter().parse("+1");
+        Assertions.assertThrows(DateTimeParseException.class, () -> new DateTimeFormatterBuilder().appendOffset("+H:MM:ss", "Z").toFormatter().parse("+1"));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void test_strict_appendOffset_4() {
-        new DateTimeFormatterBuilder().appendOffset("+HMMss", "Z").toFormatter().parse("+1");
+        Assertions.assertThrows(DateTimeParseException.class, () -> new DateTimeFormatterBuilder().appendOffset("+HMMss", "Z").toFormatter().parse("+1"));
     }
 
     @Test
     public void test_basic_iso_date() {
-        assertEquals(BASIC_ISO_DATE.parse("20021231+01").get(OFFSET_SECONDS), 3600);
-        assertEquals(BASIC_ISO_DATE.parse("20021231+0101").get(OFFSET_SECONDS), 3660);
+        assertEquals(3600, BASIC_ISO_DATE.parse("20021231+01").get(OFFSET_SECONDS));
+        assertEquals(3660, BASIC_ISO_DATE.parse("20021231+0101").get(OFFSET_SECONDS));
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatters.java b/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatters.java
index e370521b7f0..7171b225f44 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatters.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,9 +70,10 @@ import static java.time.temporal.ChronoField.NANO_OF_SECOND;
 import static java.time.temporal.ChronoField.OFFSET_SECONDS;
 import static java.time.temporal.ChronoField.SECOND_OF_MINUTE;
 import static java.time.temporal.ChronoField.YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.text.ParsePosition;
 import java.time.DateTimeException;
@@ -101,24 +102,27 @@ import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test DateTimeFormatter.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKDateTimeFormatters {
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_format_nullTemporalAccessor() {
-        DateTimeFormatter.ISO_DATE.format((TemporalAccessor) null);
+        Assertions.assertThrows(NullPointerException.class, () -> DateTimeFormatter.ISO_DATE.format((TemporalAccessor) null));
     }
 
     //-----------------------------------------------------------------------
@@ -128,19 +132,19 @@ public class TCKDateTimeFormatters {
     public void test_pattern_String() {
         DateTimeFormatter test = DateTimeFormatter.ofPattern("d MMM yyyy");
         Locale fmtLocale = Locale.getDefault(Locale.Category.FORMAT);
-        assertEquals(test.format(LocalDate.of(2012, 6, 30)), "30 " +
-                Month.JUNE.getDisplayName(TextStyle.SHORT, fmtLocale) + " 2012");
-        assertEquals(test.getLocale(), fmtLocale, "Locale.Category.FORMAT");
+        assertEquals("30 " +
+                Month.JUNE.getDisplayName(TextStyle.SHORT, fmtLocale) + " 2012", test.format(LocalDate.of(2012, 6, 30)));
+        assertEquals(fmtLocale, test.getLocale(), "Locale.Category.FORMAT");
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_pattern_String_invalid() {
-        DateTimeFormatter.ofPattern("p");
+        Assertions.assertThrows(IllegalArgumentException.class, () -> DateTimeFormatter.ofPattern("p"));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_pattern_String_null() {
-        DateTimeFormatter.ofPattern(null);
+        Assertions.assertThrows(NullPointerException.class, () -> DateTimeFormatter.ofPattern(null));
     }
 
     //-----------------------------------------------------------------------
@@ -149,23 +153,23 @@ public class TCKDateTimeFormatters {
     @Test
     public void test_pattern_StringLocale() {
         DateTimeFormatter test = DateTimeFormatter.ofPattern("d MMM yyyy", Locale.UK);
-        assertEquals(test.format(LocalDate.of(2012, 6, 30)), "30 Jun 2012");
-        assertEquals(test.getLocale(), Locale.UK);
+        assertEquals("30 Jun 2012", test.format(LocalDate.of(2012, 6, 30)));
+        assertEquals(Locale.UK, test.getLocale());
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_pattern_StringLocale_invalid() {
-        DateTimeFormatter.ofPattern("p", Locale.UK);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> DateTimeFormatter.ofPattern("p", Locale.UK));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_pattern_StringLocale_nullPattern() {
-        DateTimeFormatter.ofPattern(null, Locale.UK);
+        Assertions.assertThrows(NullPointerException.class, () -> DateTimeFormatter.ofPattern(null, Locale.UK));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_pattern_StringLocale_nullLocale() {
-        DateTimeFormatter.ofPattern("yyyy", null);
+        Assertions.assertThrows(NullPointerException.class, () -> DateTimeFormatter.ofPattern("yyyy", null));
     }
 
     //-----------------------------------------------------------------------
@@ -173,36 +177,35 @@ public class TCKDateTimeFormatters {
     //-----------------------------------------------------------------------
     @Test
     public void test_ofLocalizedDate_basics() {
-        assertEquals(DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL).getChronology(), IsoChronology.INSTANCE);
-        assertEquals(DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL).getZone(), null);
-        assertEquals(DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL).getResolverStyle(), ResolverStyle.SMART);
+        assertEquals(IsoChronology.INSTANCE, DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL).getChronology());
+        assertEquals(null, DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL).getZone());
+        assertEquals(ResolverStyle.SMART, DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL).getResolverStyle());
     }
 
     @Test
     public void test_ofLocalizedTime_basics() {
-        assertEquals(DateTimeFormatter.ofLocalizedTime(FormatStyle.FULL).getChronology(), IsoChronology.INSTANCE);
-        assertEquals(DateTimeFormatter.ofLocalizedTime(FormatStyle.FULL).getZone(), null);
-        assertEquals(DateTimeFormatter.ofLocalizedTime(FormatStyle.FULL).getResolverStyle(), ResolverStyle.SMART);
+        assertEquals(IsoChronology.INSTANCE, DateTimeFormatter.ofLocalizedTime(FormatStyle.FULL).getChronology());
+        assertEquals(null, DateTimeFormatter.ofLocalizedTime(FormatStyle.FULL).getZone());
+        assertEquals(ResolverStyle.SMART, DateTimeFormatter.ofLocalizedTime(FormatStyle.FULL).getResolverStyle());
     }
 
     @Test
     public void test_ofLocalizedDateTime1_basics() {
-        assertEquals(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL).getChronology(), IsoChronology.INSTANCE);
-        assertEquals(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL).getZone(), null);
-        assertEquals(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL).getResolverStyle(), ResolverStyle.SMART);
+        assertEquals(IsoChronology.INSTANCE, DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL).getChronology());
+        assertEquals(null, DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL).getZone());
+        assertEquals(ResolverStyle.SMART, DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL).getResolverStyle());
     }
 
     @Test
     public void test_ofLocalizedDateTime2_basics() {
-        assertEquals(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL, FormatStyle.MEDIUM).getChronology(), IsoChronology.INSTANCE);
-        assertEquals(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL, FormatStyle.MEDIUM).getZone(), null);
-        assertEquals(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL, FormatStyle.MEDIUM).getResolverStyle(), ResolverStyle.SMART);
+        assertEquals(IsoChronology.INSTANCE, DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL, FormatStyle.MEDIUM).getChronology());
+        assertEquals(null, DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL, FormatStyle.MEDIUM).getZone());
+        assertEquals(ResolverStyle.SMART, DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL, FormatStyle.MEDIUM).getResolverStyle());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="sample_isoLocalDate")
     Object[][] provider_sample_isoLocalDate() {
         return new Object[][]{
                 {2008, null, null, null, null, null, DateTimeException.class},
@@ -222,13 +225,14 @@ public class TCKDateTimeFormatters {
         };
     }
 
-    @Test(dataProvider="sample_isoLocalDate")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoLocalDate")
     public void test_print_isoLocalDate(
             Integer year, Integer month, Integer day, String offsetId, String zoneId,
             String expected, Class<?> expectedEx) {
         TemporalAccessor test = buildAccessor(year, month, day, null, null, null, null, offsetId, zoneId);
         if (expectedEx == null) {
-            assertEquals(DateTimeFormatter.ISO_LOCAL_DATE.format(test), expected);
+            assertEquals(expected, DateTimeFormatter.ISO_LOCAL_DATE.format(test));
         } else {
             try {
                 DateTimeFormatter.ISO_LOCAL_DATE.format(test);
@@ -239,7 +243,8 @@ public class TCKDateTimeFormatters {
         }
     }
 
-    @Test(dataProvider="sample_isoLocalDate")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoLocalDate")
     public void test_parse_isoLocalDate(
             Integer year, Integer month, Integer day, String offsetId, String zoneId,
             String input, Class<?> invalid) {
@@ -254,7 +259,7 @@ public class TCKDateTimeFormatters {
     public void test_parse_isoLocalDate_999999999() {
         Expected expected = createDate(999999999, 8, 6);
         assertParseMatch(DateTimeFormatter.ISO_LOCAL_DATE.parseUnresolved("+999999999-08-06", new ParsePosition(0)), expected);
-        assertEquals(LocalDate.parse("+999999999-08-06"), LocalDate.of(999999999, 8, 6));
+        assertEquals(LocalDate.of(999999999, 8, 6), LocalDate.parse("+999999999-08-06"));
     }
 
     @Test
@@ -263,16 +268,16 @@ public class TCKDateTimeFormatters {
         assertParseMatch(DateTimeFormatter.ISO_LOCAL_DATE.parseUnresolved("+1000000000-08-06", new ParsePosition(0)), expected);
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_parse_isoLocalDate_1000000000_failedCreate() {
-        LocalDate.parse("+1000000000-08-06");
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.parse("+1000000000-08-06"));
     }
 
     @Test
     public void test_parse_isoLocalDate_M999999999() {
         Expected expected = createDate(-999999999, 8, 6);
         assertParseMatch(DateTimeFormatter.ISO_LOCAL_DATE.parseUnresolved("-999999999-08-06", new ParsePosition(0)), expected);
-        assertEquals(LocalDate.parse("-999999999-08-06"), LocalDate.of(-999999999, 8, 6));
+        assertEquals(LocalDate.of(-999999999, 8, 6), LocalDate.parse("-999999999-08-06"));
     }
 
     @Test
@@ -281,22 +286,21 @@ public class TCKDateTimeFormatters {
         assertParseMatch(DateTimeFormatter.ISO_LOCAL_DATE.parseUnresolved("-1000000000-08-06", new ParsePosition(0)), expected);
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_parse_isoLocalDate_M1000000000_failedCreate() {
-        LocalDate.parse("-1000000000-08-06");
+        Assertions.assertThrows(DateTimeException.class, () -> LocalDate.parse("-1000000000-08-06"));
     }
 
     @Test
     public void test_isoLocalDate_basics() {
-        assertEquals(DateTimeFormatter.ISO_LOCAL_DATE.getChronology(), IsoChronology.INSTANCE);
-        assertEquals(DateTimeFormatter.ISO_LOCAL_DATE.getZone(), null);
-        assertEquals(DateTimeFormatter.ISO_LOCAL_DATE.getResolverStyle(), ResolverStyle.STRICT);
+        assertEquals(IsoChronology.INSTANCE, DateTimeFormatter.ISO_LOCAL_DATE.getChronology());
+        assertEquals(null, DateTimeFormatter.ISO_LOCAL_DATE.getZone());
+        assertEquals(ResolverStyle.STRICT, DateTimeFormatter.ISO_LOCAL_DATE.getResolverStyle());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="sample_isoOffsetDate")
     Object[][] provider_sample_isoOffsetDate() {
         return new Object[][]{
                 {2008, null, null, null, null, null, DateTimeException.class},
@@ -316,13 +320,14 @@ public class TCKDateTimeFormatters {
         };
     }
 
-    @Test(dataProvider="sample_isoOffsetDate")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoOffsetDate")
     public void test_print_isoOffsetDate(
             Integer year, Integer month, Integer day, String offsetId, String zoneId,
             String expected, Class<?> expectedEx) {
         TemporalAccessor test = buildAccessor(year, month, day, null, null, null, null, offsetId, zoneId);
         if (expectedEx == null) {
-            assertEquals(DateTimeFormatter.ISO_OFFSET_DATE.format(test), expected);
+            assertEquals(expected, DateTimeFormatter.ISO_OFFSET_DATE.format(test));
         } else {
             try {
                 DateTimeFormatter.ISO_OFFSET_DATE.format(test);
@@ -333,7 +338,8 @@ public class TCKDateTimeFormatters {
         }
     }
 
-    @Test(dataProvider="sample_isoOffsetDate")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoOffsetDate")
     public void test_parse_isoOffsetDate(
             Integer year, Integer month, Integer day, String offsetId, String zoneId,
             String input, Class<?> invalid) {
@@ -346,15 +352,14 @@ public class TCKDateTimeFormatters {
 
     @Test
     public void test_isoOffsetDate_basics() {
-        assertEquals(DateTimeFormatter.ISO_OFFSET_DATE.getChronology(), IsoChronology.INSTANCE);
-        assertEquals(DateTimeFormatter.ISO_OFFSET_DATE.getZone(), null);
-        assertEquals(DateTimeFormatter.ISO_OFFSET_DATE.getResolverStyle(), ResolverStyle.STRICT);
+        assertEquals(IsoChronology.INSTANCE, DateTimeFormatter.ISO_OFFSET_DATE.getChronology());
+        assertEquals(null, DateTimeFormatter.ISO_OFFSET_DATE.getZone());
+        assertEquals(ResolverStyle.STRICT, DateTimeFormatter.ISO_OFFSET_DATE.getResolverStyle());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="sample_isoDate")
     Object[][] provider_sample_isoDate() {
         return new Object[][]{
                 {2008, null, null, null, null, null, DateTimeException.class},
@@ -374,13 +379,14 @@ public class TCKDateTimeFormatters {
         };
     }
 
-    @Test(dataProvider="sample_isoDate")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoDate")
     public void test_print_isoDate(
             Integer year, Integer month, Integer day, String offsetId, String zoneId,
             String expected, Class<?> expectedEx) {
         TemporalAccessor test = buildAccessor(year, month, day, null, null, null, null, offsetId, zoneId);
         if (expectedEx == null) {
-            assertEquals(DateTimeFormatter.ISO_DATE.format(test), expected);
+            assertEquals(expected, DateTimeFormatter.ISO_DATE.format(test));
         } else {
             try {
                 DateTimeFormatter.ISO_DATE.format(test);
@@ -391,7 +397,8 @@ public class TCKDateTimeFormatters {
         }
     }
 
-    @Test(dataProvider="sample_isoDate")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoDate")
     public void test_parse_isoDate(
             Integer year, Integer month, Integer day, String offsetId, String zoneId,
             String input, Class<?> invalid) {
@@ -406,15 +413,14 @@ public class TCKDateTimeFormatters {
 
     @Test
     public void test_isoDate_basics() {
-        assertEquals(DateTimeFormatter.ISO_DATE.getChronology(), IsoChronology.INSTANCE);
-        assertEquals(DateTimeFormatter.ISO_DATE.getZone(), null);
-        assertEquals(DateTimeFormatter.ISO_DATE.getResolverStyle(), ResolverStyle.STRICT);
+        assertEquals(IsoChronology.INSTANCE, DateTimeFormatter.ISO_DATE.getChronology());
+        assertEquals(null, DateTimeFormatter.ISO_DATE.getZone());
+        assertEquals(ResolverStyle.STRICT, DateTimeFormatter.ISO_DATE.getResolverStyle());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="sample_isoLocalTime")
     Object[][] provider_sample_isoLocalTime() {
         return new Object[][]{
                 {11, null, null, null, null, null, null, DateTimeException.class},
@@ -446,13 +452,14 @@ public class TCKDateTimeFormatters {
         };
     }
 
-    @Test(dataProvider="sample_isoLocalTime")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoLocalTime")
     public void test_print_isoLocalTime(
             Integer hour, Integer min, Integer sec, Integer nano, String offsetId, String zoneId,
             String expected, Class<?> expectedEx) {
         TemporalAccessor test = buildAccessor(null, null, null, hour, min, sec, nano, offsetId, zoneId);
         if (expectedEx == null) {
-            assertEquals(DateTimeFormatter.ISO_LOCAL_TIME.format(test), expected);
+            assertEquals(expected, DateTimeFormatter.ISO_LOCAL_TIME.format(test));
         } else {
             try {
                 DateTimeFormatter.ISO_LOCAL_TIME.format(test);
@@ -463,7 +470,8 @@ public class TCKDateTimeFormatters {
         }
     }
 
-    @Test(dataProvider="sample_isoLocalTime")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoLocalTime")
     public void test_parse_isoLocalTime(
             Integer hour, Integer min, Integer sec, Integer nano, String offsetId, String zoneId,
             String input, Class<?> invalid) {
@@ -476,15 +484,14 @@ public class TCKDateTimeFormatters {
 
     @Test
     public void test_isoLocalTime_basics() {
-        assertEquals(DateTimeFormatter.ISO_LOCAL_TIME.getChronology(), null);
-        assertEquals(DateTimeFormatter.ISO_LOCAL_TIME.getZone(), null);
-        assertEquals(DateTimeFormatter.ISO_LOCAL_TIME.getResolverStyle(), ResolverStyle.STRICT);
+        assertEquals(null, DateTimeFormatter.ISO_LOCAL_TIME.getChronology());
+        assertEquals(null, DateTimeFormatter.ISO_LOCAL_TIME.getZone());
+        assertEquals(ResolverStyle.STRICT, DateTimeFormatter.ISO_LOCAL_TIME.getResolverStyle());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="sample_isoOffsetTime")
     Object[][] provider_sample_isoOffsetTime() {
         return new Object[][]{
                 {11, null, null, null, null, null, null, DateTimeException.class},
@@ -516,13 +523,14 @@ public class TCKDateTimeFormatters {
         };
     }
 
-    @Test(dataProvider="sample_isoOffsetTime")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoOffsetTime")
     public void test_print_isoOffsetTime(
             Integer hour, Integer min, Integer sec, Integer nano, String offsetId, String zoneId,
             String expected, Class<?> expectedEx) {
         TemporalAccessor test = buildAccessor(null, null, null, hour, min, sec, nano, offsetId, zoneId);
         if (expectedEx == null) {
-            assertEquals(DateTimeFormatter.ISO_OFFSET_TIME.format(test), expected);
+            assertEquals(expected, DateTimeFormatter.ISO_OFFSET_TIME.format(test));
         } else {
             try {
                 DateTimeFormatter.ISO_OFFSET_TIME.format(test);
@@ -533,7 +541,8 @@ public class TCKDateTimeFormatters {
         }
     }
 
-    @Test(dataProvider="sample_isoOffsetTime")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoOffsetTime")
     public void test_parse_isoOffsetTime(
             Integer hour, Integer min, Integer sec, Integer nano, String offsetId, String zoneId,
             String input, Class<?> invalid) {
@@ -546,15 +555,14 @@ public class TCKDateTimeFormatters {
 
     @Test
     public void test_isoOffsetTime_basics() {
-        assertEquals(DateTimeFormatter.ISO_OFFSET_TIME.getChronology(), null);
-        assertEquals(DateTimeFormatter.ISO_OFFSET_TIME.getZone(), null);
-        assertEquals(DateTimeFormatter.ISO_OFFSET_TIME.getResolverStyle(), ResolverStyle.STRICT);
+        assertEquals(null, DateTimeFormatter.ISO_OFFSET_TIME.getChronology());
+        assertEquals(null, DateTimeFormatter.ISO_OFFSET_TIME.getZone());
+        assertEquals(ResolverStyle.STRICT, DateTimeFormatter.ISO_OFFSET_TIME.getResolverStyle());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="sample_isoTime")
     Object[][] provider_sample_isoTime() {
         return new Object[][]{
                 {11, null, null, null, null, null, null, DateTimeException.class},
@@ -586,13 +594,14 @@ public class TCKDateTimeFormatters {
         };
     }
 
-    @Test(dataProvider="sample_isoTime")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoTime")
     public void test_print_isoTime(
             Integer hour, Integer min, Integer sec, Integer nano, String offsetId, String zoneId,
             String expected, Class<?> expectedEx) {
         TemporalAccessor test = buildAccessor(null, null, null, hour, min, sec, nano, offsetId, zoneId);
         if (expectedEx == null) {
-            assertEquals(DateTimeFormatter.ISO_TIME.format(test), expected);
+            assertEquals(expected, DateTimeFormatter.ISO_TIME.format(test));
         } else {
             try {
                 DateTimeFormatter.ISO_TIME.format(test);
@@ -603,7 +612,8 @@ public class TCKDateTimeFormatters {
         }
     }
 
-    @Test(dataProvider="sample_isoTime")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoTime")
     public void test_parse_isoTime(
             Integer hour, Integer min, Integer sec, Integer nano, String offsetId, String zoneId,
             String input, Class<?> invalid) {
@@ -618,15 +628,14 @@ public class TCKDateTimeFormatters {
 
     @Test
     public void test_isoTime_basics() {
-        assertEquals(DateTimeFormatter.ISO_TIME.getChronology(), null);
-        assertEquals(DateTimeFormatter.ISO_TIME.getZone(), null);
-        assertEquals(DateTimeFormatter.ISO_TIME.getResolverStyle(), ResolverStyle.STRICT);
+        assertEquals(null, DateTimeFormatter.ISO_TIME.getChronology());
+        assertEquals(null, DateTimeFormatter.ISO_TIME.getZone());
+        assertEquals(ResolverStyle.STRICT, DateTimeFormatter.ISO_TIME.getResolverStyle());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="sample_isoLocalDateTime")
     Object[][] provider_sample_isoLocalDateTime() {
         return new Object[][]{
                 {2008, null, null, null, null, null, null, null, null, null, DateTimeException.class},
@@ -666,14 +675,15 @@ public class TCKDateTimeFormatters {
         };
     }
 
-    @Test(dataProvider="sample_isoLocalDateTime")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoLocalDateTime")
     public void test_print_isoLocalDateTime(
             Integer year, Integer month, Integer day,
             Integer hour, Integer min, Integer sec, Integer nano, String offsetId, String zoneId,
             String expected, Class<?> expectedEx) {
         TemporalAccessor test = buildAccessor(year, month, day, hour, min, sec, nano, offsetId, zoneId);
         if (expectedEx == null) {
-            assertEquals(DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(test), expected);
+            assertEquals(expected, DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(test));
         } else {
             try {
                 DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(test);
@@ -684,7 +694,8 @@ public class TCKDateTimeFormatters {
         }
     }
 
-    @Test(dataProvider="sample_isoLocalDateTime")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoLocalDateTime")
     public void test_parse_isoLocalDateTime(
             Integer year, Integer month, Integer day,
             Integer hour, Integer min, Integer sec, Integer nano, String offsetId, String zoneId,
@@ -697,15 +708,14 @@ public class TCKDateTimeFormatters {
 
     @Test
     public void test_isoLocalDateTime_basics() {
-        assertEquals(DateTimeFormatter.ISO_LOCAL_DATE_TIME.getChronology(), IsoChronology.INSTANCE);
-        assertEquals(DateTimeFormatter.ISO_LOCAL_DATE_TIME.getZone(), null);
-        assertEquals(DateTimeFormatter.ISO_LOCAL_DATE_TIME.getResolverStyle(), ResolverStyle.STRICT);
+        assertEquals(IsoChronology.INSTANCE, DateTimeFormatter.ISO_LOCAL_DATE_TIME.getChronology());
+        assertEquals(null, DateTimeFormatter.ISO_LOCAL_DATE_TIME.getZone());
+        assertEquals(ResolverStyle.STRICT, DateTimeFormatter.ISO_LOCAL_DATE_TIME.getResolverStyle());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="sample_isoOffsetDateTime")
     Object[][] provider_sample_isoOffsetDateTime() {
         return new Object[][]{
                 {2008, null, null, null, null, null, null, null, null, null, DateTimeException.class},
@@ -745,14 +755,15 @@ public class TCKDateTimeFormatters {
         };
     }
 
-    @Test(dataProvider="sample_isoOffsetDateTime")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoOffsetDateTime")
     public void test_print_isoOffsetDateTime(
             Integer year, Integer month, Integer day,
             Integer hour, Integer min, Integer sec, Integer nano, String offsetId, String zoneId,
             String expected, Class<?> expectedEx) {
         TemporalAccessor test = buildAccessor(year, month, day, hour, min, sec, nano, offsetId, zoneId);
         if (expectedEx == null) {
-            assertEquals(DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(test), expected);
+            assertEquals(expected, DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(test));
         } else {
             try {
                 DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(test);
@@ -763,7 +774,8 @@ public class TCKDateTimeFormatters {
         }
     }
 
-    @Test(dataProvider="sample_isoOffsetDateTime")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoOffsetDateTime")
     public void test_parse_isoOffsetDateTime(
             Integer year, Integer month, Integer day,
             Integer hour, Integer min, Integer sec, Integer nano, String offsetId, String zoneId,
@@ -777,15 +789,14 @@ public class TCKDateTimeFormatters {
 
     @Test
     public void test_isoOffsetDateTime_basics() {
-        assertEquals(DateTimeFormatter.ISO_OFFSET_DATE_TIME.getChronology(), IsoChronology.INSTANCE);
-        assertEquals(DateTimeFormatter.ISO_OFFSET_DATE_TIME.getZone(), null);
-        assertEquals(DateTimeFormatter.ISO_OFFSET_DATE_TIME.getResolverStyle(), ResolverStyle.STRICT);
+        assertEquals(IsoChronology.INSTANCE, DateTimeFormatter.ISO_OFFSET_DATE_TIME.getChronology());
+        assertEquals(null, DateTimeFormatter.ISO_OFFSET_DATE_TIME.getZone());
+        assertEquals(ResolverStyle.STRICT, DateTimeFormatter.ISO_OFFSET_DATE_TIME.getResolverStyle());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="sample_isoZonedDateTime")
     Object[][] provider_sample_isoZonedDateTime() {
         return new Object[][]{
                 {2008, null, null, null, null, null, null, null, null, null, DateTimeException.class},
@@ -834,14 +845,15 @@ public class TCKDateTimeFormatters {
         };
     }
 
-    @Test(dataProvider="sample_isoZonedDateTime")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoZonedDateTime")
     public void test_print_isoZonedDateTime(
             Integer year, Integer month, Integer day,
             Integer hour, Integer min, Integer sec, Integer nano, String offsetId, String zoneId,
             String expected, Class<?> expectedEx) {
         TemporalAccessor test = buildAccessor(year, month, day, hour, min, sec, nano, offsetId, zoneId);
         if (expectedEx == null) {
-            assertEquals(DateTimeFormatter.ISO_ZONED_DATE_TIME.format(test), expected);
+            assertEquals(expected, DateTimeFormatter.ISO_ZONED_DATE_TIME.format(test));
         } else {
             try {
                 DateTimeFormatter.ISO_ZONED_DATE_TIME.format(test);
@@ -852,7 +864,8 @@ public class TCKDateTimeFormatters {
         }
     }
 
-    @Test(dataProvider="sample_isoZonedDateTime")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoZonedDateTime")
     public void test_parse_isoZonedDateTime(
             Integer year, Integer month, Integer day,
             Integer hour, Integer min, Integer sec, Integer nano, String offsetId, String zoneId,
@@ -870,15 +883,14 @@ public class TCKDateTimeFormatters {
 
     @Test
     public void test_isoZonedDateTime_basics() {
-        assertEquals(DateTimeFormatter.ISO_ZONED_DATE_TIME.getChronology(), IsoChronology.INSTANCE);
-        assertEquals(DateTimeFormatter.ISO_ZONED_DATE_TIME.getZone(), null);
-        assertEquals(DateTimeFormatter.ISO_ZONED_DATE_TIME.getResolverStyle(), ResolverStyle.STRICT);
+        assertEquals(IsoChronology.INSTANCE, DateTimeFormatter.ISO_ZONED_DATE_TIME.getChronology());
+        assertEquals(null, DateTimeFormatter.ISO_ZONED_DATE_TIME.getZone());
+        assertEquals(ResolverStyle.STRICT, DateTimeFormatter.ISO_ZONED_DATE_TIME.getResolverStyle());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="sample_isoDateTime")
     Object[][] provider_sample_isoDateTime() {
         return new Object[][]{
                 {2008, null, null, null, null, null, null, null, null, null, DateTimeException.class},
@@ -918,14 +930,15 @@ public class TCKDateTimeFormatters {
         };
     }
 
-    @Test(dataProvider="sample_isoDateTime")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoDateTime")
     public void test_print_isoDateTime(
             Integer year, Integer month, Integer day,
             Integer hour, Integer min, Integer sec, Integer nano, String offsetId, String zoneId,
             String expected, Class<?> expectedEx) {
         TemporalAccessor test = buildAccessor(year, month, day, hour, min, sec, nano, offsetId, zoneId);
         if (expectedEx == null) {
-            assertEquals(DateTimeFormatter.ISO_DATE_TIME.format(test), expected);
+            assertEquals(expected, DateTimeFormatter.ISO_DATE_TIME.format(test));
         } else {
             try {
                 DateTimeFormatter.ISO_DATE_TIME.format(test);
@@ -936,7 +949,8 @@ public class TCKDateTimeFormatters {
         }
     }
 
-    @Test(dataProvider="sample_isoDateTime")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoDateTime")
     public void test_parse_isoDateTime(
             Integer year, Integer month, Integer day,
             Integer hour, Integer min, Integer sec, Integer nano, String offsetId, String zoneId,
@@ -955,9 +969,9 @@ public class TCKDateTimeFormatters {
 
     @Test
     public void test_isoDateTime_basics() {
-        assertEquals(DateTimeFormatter.ISO_DATE_TIME.getChronology(), IsoChronology.INSTANCE);
-        assertEquals(DateTimeFormatter.ISO_DATE_TIME.getZone(), null);
-        assertEquals(DateTimeFormatter.ISO_DATE_TIME.getResolverStyle(), ResolverStyle.STRICT);
+        assertEquals(IsoChronology.INSTANCE, DateTimeFormatter.ISO_DATE_TIME.getChronology());
+        assertEquals(null, DateTimeFormatter.ISO_DATE_TIME.getZone());
+        assertEquals(ResolverStyle.STRICT, DateTimeFormatter.ISO_DATE_TIME.getResolverStyle());
     }
 
     //-----------------------------------------------------------------------
@@ -966,25 +980,25 @@ public class TCKDateTimeFormatters {
     @Test
     public void test_print_isoOrdinalDate() {
         TemporalAccessor test = buildAccessor(LocalDateTime.of(2008, 6, 3, 11, 5, 30), null, null);
-        assertEquals(DateTimeFormatter.ISO_ORDINAL_DATE.format(test), "2008-155");
+        assertEquals("2008-155", DateTimeFormatter.ISO_ORDINAL_DATE.format(test));
     }
 
     @Test
     public void test_print_isoOrdinalDate_offset() {
         TemporalAccessor test = buildAccessor(LocalDateTime.of(2008, 6, 3, 11, 5, 30), "Z", null);
-        assertEquals(DateTimeFormatter.ISO_ORDINAL_DATE.format(test), "2008-155Z");
+        assertEquals("2008-155Z", DateTimeFormatter.ISO_ORDINAL_DATE.format(test));
     }
 
     @Test
     public void test_print_isoOrdinalDate_zoned() {
         TemporalAccessor test = buildAccessor(LocalDateTime.of(2008, 6, 3, 11, 5, 30), "+02:00", "Europe/Paris");
-        assertEquals(DateTimeFormatter.ISO_ORDINAL_DATE.format(test), "2008-155+02:00");
+        assertEquals("2008-155+02:00", DateTimeFormatter.ISO_ORDINAL_DATE.format(test));
     }
 
     @Test
     public void test_print_isoOrdinalDate_zoned_largeYear() {
         TemporalAccessor test = buildAccessor(LocalDateTime.of(123456, 6, 3, 11, 5, 30), "Z", null);
-        assertEquals(DateTimeFormatter.ISO_ORDINAL_DATE.format(test), "+123456-155Z");
+        assertEquals("+123456-155Z", DateTimeFormatter.ISO_ORDINAL_DATE.format(test));
     }
 
     @Test
@@ -1006,13 +1020,15 @@ public class TCKDateTimeFormatters {
                 throw new DateTimeException("Unsupported");
             }
         };
-        assertEquals(DateTimeFormatter.ISO_ORDINAL_DATE.format(test), "2008-231");
+        assertEquals("2008-231", DateTimeFormatter.ISO_ORDINAL_DATE.format(test));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_print_isoOrdinalDate_missingField() {
-        TemporalAccessor test = Year.of(2008);
-        DateTimeFormatter.ISO_ORDINAL_DATE.format(test);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            TemporalAccessor test = Year.of(2008);
+            DateTimeFormatter.ISO_ORDINAL_DATE.format(test);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1030,9 +1046,9 @@ public class TCKDateTimeFormatters {
 
     @Test
     public void test_isoOrdinalDate_basics() {
-        assertEquals(DateTimeFormatter.ISO_ORDINAL_DATE.getChronology(), IsoChronology.INSTANCE);
-        assertEquals(DateTimeFormatter.ISO_ORDINAL_DATE.getZone(), null);
-        assertEquals(DateTimeFormatter.ISO_ORDINAL_DATE.getResolverStyle(), ResolverStyle.STRICT);
+        assertEquals(IsoChronology.INSTANCE, DateTimeFormatter.ISO_ORDINAL_DATE.getChronology());
+        assertEquals(null, DateTimeFormatter.ISO_ORDINAL_DATE.getZone());
+        assertEquals(ResolverStyle.STRICT, DateTimeFormatter.ISO_ORDINAL_DATE.getResolverStyle());
     }
 
     //-----------------------------------------------------------------------
@@ -1041,69 +1057,74 @@ public class TCKDateTimeFormatters {
     @Test
     public void test_print_basicIsoDate() {
         TemporalAccessor test = buildAccessor(LocalDateTime.of(2008, 6, 3, 11, 5, 30), null, null);
-        assertEquals(DateTimeFormatter.BASIC_ISO_DATE.format(test), "20080603");
+        assertEquals("20080603", DateTimeFormatter.BASIC_ISO_DATE.format(test));
     }
 
     @Test
     public void test_print_basicIsoDate_offset() {
         TemporalAccessor test = buildAccessor(LocalDateTime.of(2008, 6, 3, 11, 5, 30), "Z", null);
-        assertEquals(DateTimeFormatter.BASIC_ISO_DATE.format(test), "20080603Z");
+        assertEquals("20080603Z", DateTimeFormatter.BASIC_ISO_DATE.format(test));
     }
 
     @Test
     public void test_print_basicIsoDate_zoned() {
         TemporalAccessor test = buildAccessor(LocalDateTime.of(2008, 6, 3, 11, 5, 30), "+02:00", "Europe/Paris");
-        assertEquals(DateTimeFormatter.BASIC_ISO_DATE.format(test), "20080603+0200");
+        assertEquals("20080603+0200", DateTimeFormatter.BASIC_ISO_DATE.format(test));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_print_basicIsoDate_largeYear() {
-        TemporalAccessor test = buildAccessor(LocalDateTime.of(123456, 6, 3, 11, 5, 30), "Z", null);
-        DateTimeFormatter.BASIC_ISO_DATE.format(test);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            TemporalAccessor test = buildAccessor(LocalDateTime.of(123456, 6, 3, 11, 5, 30), "Z", null);
+            DateTimeFormatter.BASIC_ISO_DATE.format(test);
+        });
     }
 
     @Test
     public void test_print_basicIsoDate_fields() {
         TemporalAccessor test = buildAccessor(LocalDate.of(2008, 6, 3), null, null);
-        assertEquals(DateTimeFormatter.BASIC_ISO_DATE.format(test), "20080603");
+        assertEquals("20080603", DateTimeFormatter.BASIC_ISO_DATE.format(test));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_print_basicIsoDate_missingField() {
-        TemporalAccessor test = YearMonth.of(2008, 6);
-        DateTimeFormatter.BASIC_ISO_DATE.format(test);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            TemporalAccessor test = YearMonth.of(2008, 6);
+            DateTimeFormatter.BASIC_ISO_DATE.format(test);
+        });
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_parse_basicIsoDate() {
         LocalDate expected = LocalDate.of(2008, 6, 3);
-        assertEquals(DateTimeFormatter.BASIC_ISO_DATE.parse("20080603", LocalDate::from), expected);
+        assertEquals(expected, DateTimeFormatter.BASIC_ISO_DATE.parse("20080603", LocalDate::from));
     }
 
-    @Test(expectedExceptions=DateTimeParseException.class)
+    @Test
     public void test_parse_basicIsoDate_largeYear() {
-        try {
-            LocalDate expected = LocalDate.of(123456, 6, 3);
-            assertEquals(DateTimeFormatter.BASIC_ISO_DATE.parse("+1234560603", LocalDate::from), expected);
-        } catch (DateTimeParseException ex) {
-            assertEquals(ex.getErrorIndex(), 0);
-            assertEquals(ex.getParsedString(), "+1234560603");
-            throw ex;
-        }
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            try {
+                LocalDate expected = LocalDate.of(123456, 6, 3);
+                assertEquals(expected, DateTimeFormatter.BASIC_ISO_DATE.parse("+1234560603", LocalDate::from));
+            } catch (DateTimeParseException ex) {
+                assertEquals(0, ex.getErrorIndex());
+                assertEquals("+1234560603", ex.getParsedString());
+                throw ex;
+            }
+        });
     }
 
     @Test
     public void test_basicIsoDate_basics() {
-        assertEquals(DateTimeFormatter.BASIC_ISO_DATE.getChronology(), IsoChronology.INSTANCE);
-        assertEquals(DateTimeFormatter.BASIC_ISO_DATE.getZone(), null);
-        assertEquals(DateTimeFormatter.BASIC_ISO_DATE.getResolverStyle(), ResolverStyle.STRICT);
+        assertEquals(IsoChronology.INSTANCE, DateTimeFormatter.BASIC_ISO_DATE.getChronology());
+        assertEquals(null, DateTimeFormatter.BASIC_ISO_DATE.getZone());
+        assertEquals(ResolverStyle.STRICT, DateTimeFormatter.BASIC_ISO_DATE.getResolverStyle());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="weekDate")
     Iterator<Object[]> weekDate() {
         return new Iterator<Object[]>() {
             private ZonedDateTime date = ZonedDateTime.of(LocalDateTime.of(2003, 12, 29, 11, 5, 30), ZoneId.of("Europe/Paris"));
@@ -1135,55 +1156,57 @@ public class TCKDateTimeFormatters {
         };
     }
 
-    @Test(dataProvider="weekDate")
+    @ParameterizedTest
+    @MethodSource("weekDate")
     public void test_print_isoWeekDate(TemporalAccessor test, String expected) {
-        assertEquals(DateTimeFormatter.ISO_WEEK_DATE.format(test), expected);
+        assertEquals(expected, DateTimeFormatter.ISO_WEEK_DATE.format(test));
     }
 
     @Test
     public void test_print_isoWeekDate_zoned_largeYear() {
         TemporalAccessor test = buildAccessor(LocalDateTime.of(123456, 6, 3, 11, 5, 30), "Z", null);
-        assertEquals(DateTimeFormatter.ISO_WEEK_DATE.format(test), "+123456-W23-2Z");
+        assertEquals("+123456-W23-2Z", DateTimeFormatter.ISO_WEEK_DATE.format(test));
     }
 
     @Test
     public void test_print_isoWeekDate_fields() {
         TemporalAccessor test = buildAccessor(LocalDate.of(2004, 1, 27), null, null);
-        assertEquals(DateTimeFormatter.ISO_WEEK_DATE.format(test), "2004-W05-2");
+        assertEquals("2004-W05-2", DateTimeFormatter.ISO_WEEK_DATE.format(test));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_print_isoWeekDate_missingField() {
-        TemporalAccessor test = YearMonth.of(2008, 6);
-        DateTimeFormatter.ISO_WEEK_DATE.format(test);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            TemporalAccessor test = YearMonth.of(2008, 6);
+            DateTimeFormatter.ISO_WEEK_DATE.format(test);
+        });
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_parse_weekDate() {
         LocalDate expected = LocalDate.of(2004, 1, 28);
-        assertEquals(DateTimeFormatter.ISO_WEEK_DATE.parse("2004-W05-3", LocalDate::from), expected);
+        assertEquals(expected, DateTimeFormatter.ISO_WEEK_DATE.parse("2004-W05-3", LocalDate::from));
     }
 
     @Test
     public void test_parse_weekDate_largeYear() {
         TemporalAccessor parsed = DateTimeFormatter.ISO_WEEK_DATE.parseUnresolved("+123456-W04-5", new ParsePosition(0));
-        assertEquals(parsed.getLong(IsoFields.WEEK_BASED_YEAR), 123456L);
-        assertEquals(parsed.getLong(IsoFields.WEEK_OF_WEEK_BASED_YEAR), 4L);
-        assertEquals(parsed.getLong(DAY_OF_WEEK), 5L);
+        assertEquals(123456L, parsed.getLong(IsoFields.WEEK_BASED_YEAR));
+        assertEquals(4L, parsed.getLong(IsoFields.WEEK_OF_WEEK_BASED_YEAR));
+        assertEquals(5L, parsed.getLong(DAY_OF_WEEK));
     }
 
     @Test
     public void test_isoWeekDate_basics() {
-        assertEquals(DateTimeFormatter.ISO_WEEK_DATE.getChronology(), IsoChronology.INSTANCE);
-        assertEquals(DateTimeFormatter.ISO_WEEK_DATE.getZone(), null);
-        assertEquals(DateTimeFormatter.ISO_WEEK_DATE.getResolverStyle(), ResolverStyle.STRICT);
+        assertEquals(IsoChronology.INSTANCE, DateTimeFormatter.ISO_WEEK_DATE.getChronology());
+        assertEquals(null, DateTimeFormatter.ISO_WEEK_DATE.getZone());
+        assertEquals(ResolverStyle.STRICT, DateTimeFormatter.ISO_WEEK_DATE.getResolverStyle());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="sample_isoInstant")
     Object[][] provider_sample_isoInstant() {
         return new Object[][]{
                 {0, 0, "1970-01-01T00:00:00Z", null},
@@ -1203,12 +1226,13 @@ public class TCKDateTimeFormatters {
         };
     }
 
-    @Test(dataProvider="sample_isoInstant")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoInstant")
     public void test_print_isoInstant(
             long instantSecs, Integer nano, String expected, Class<?> expectedEx) {
         TemporalAccessor test = buildAccessorInstant(instantSecs, nano);
         if (expectedEx == null) {
-            assertEquals(DateTimeFormatter.ISO_INSTANT.format(test), expected);
+            assertEquals(expected, DateTimeFormatter.ISO_INSTANT.format(test));
         } else {
             try {
                 DateTimeFormatter.ISO_INSTANT.format(test);
@@ -1219,27 +1243,27 @@ public class TCKDateTimeFormatters {
         }
     }
 
-    @Test(dataProvider="sample_isoInstant")
+    @ParameterizedTest
+    @MethodSource("provider_sample_isoInstant")
     public void test_parse_isoInstant(
             long instantSecs, Integer nano, String input, Class<?> invalid) {
         if (input != null) {
             TemporalAccessor parsed = DateTimeFormatter.ISO_INSTANT.parseUnresolved(input, new ParsePosition(0));
-            assertEquals(parsed.getLong(INSTANT_SECONDS), instantSecs);
-            assertEquals(parsed.getLong(NANO_OF_SECOND), (nano == null ? 0 : nano));
+            assertEquals(instantSecs, parsed.getLong(INSTANT_SECONDS));
+            assertEquals((nano == null ? 0 : nano), parsed.getLong(NANO_OF_SECOND));
         }
     }
 
     @Test
     public void test_isoInstant_basics() {
-        assertEquals(DateTimeFormatter.ISO_INSTANT.getChronology(), null);
-        assertEquals(DateTimeFormatter.ISO_INSTANT.getZone(), null);
-        assertEquals(DateTimeFormatter.ISO_INSTANT.getResolverStyle(), ResolverStyle.STRICT);
+        assertEquals(null, DateTimeFormatter.ISO_INSTANT.getChronology());
+        assertEquals(null, DateTimeFormatter.ISO_INSTANT.getZone());
+        assertEquals(ResolverStyle.STRICT, DateTimeFormatter.ISO_INSTANT.getResolverStyle());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="rfc")
     Object[][] data_rfc() {
         return new Object[][] {
             {LocalDateTime.of(2008, 6, 3, 11, 5, 30), "Z", "Tue, 3 Jun 2008 11:05:30 GMT"},
@@ -1249,29 +1273,33 @@ public class TCKDateTimeFormatters {
         };
     }
 
-    @Test(dataProvider="rfc")
+    @ParameterizedTest
+    @MethodSource("data_rfc")
     public void test_print_rfc1123(LocalDateTime base, String offsetId, String expected) {
         TemporalAccessor test = buildAccessor(base, offsetId, null);
-        assertEquals(DateTimeFormatter.RFC_1123_DATE_TIME.format(test), expected);
+        assertEquals(expected, DateTimeFormatter.RFC_1123_DATE_TIME.format(test));
     }
 
-    @Test(dataProvider="rfc")
+    @ParameterizedTest
+    @MethodSource("data_rfc")
     public void test_print_rfc1123_french(LocalDateTime base, String offsetId, String expected) {
         TemporalAccessor test = buildAccessor(base, offsetId, null);
-        assertEquals(DateTimeFormatter.RFC_1123_DATE_TIME.withLocale(Locale.FRENCH).format(test), expected);
+        assertEquals(expected, DateTimeFormatter.RFC_1123_DATE_TIME.withLocale(Locale.FRENCH).format(test));
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_print_rfc1123_missingField() {
-        TemporalAccessor test = YearMonth.of(2008, 6);
-        DateTimeFormatter.RFC_1123_DATE_TIME.format(test);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            TemporalAccessor test = YearMonth.of(2008, 6);
+            DateTimeFormatter.RFC_1123_DATE_TIME.format(test);
+        });
     }
 
     @Test
     public void test_rfc1123_basics() {
-        assertEquals(DateTimeFormatter.RFC_1123_DATE_TIME.getChronology(), IsoChronology.INSTANCE);
-        assertEquals(DateTimeFormatter.RFC_1123_DATE_TIME.getZone(), null);
-        assertEquals(DateTimeFormatter.RFC_1123_DATE_TIME.getResolverStyle(), ResolverStyle.SMART);
+        assertEquals(IsoChronology.INSTANCE, DateTimeFormatter.RFC_1123_DATE_TIME.getChronology());
+        assertEquals(null, DateTimeFormatter.RFC_1123_DATE_TIME.getZone());
+        assertEquals(ResolverStyle.SMART, DateTimeFormatter.RFC_1123_DATE_TIME.getResolverStyle());
     }
 
     //-----------------------------------------------------------------------
@@ -1403,11 +1431,11 @@ public class TCKDateTimeFormatters {
 
     private void assertParseMatch(TemporalAccessor parsed, Expected expected) {
         for (TemporalField field : expected.fieldValues.keySet()) {
-            assertEquals(parsed.isSupported(field), true);
+            assertEquals(true, parsed.isSupported(field));
             parsed.getLong(field);
         }
-        assertEquals(parsed.query(TemporalQueries.chronology()), expected.chrono);
-        assertEquals(parsed.query(TemporalQueries.zoneId()), expected.zone);
+        assertEquals(expected.chrono, parsed.query(TemporalQueries.chronology()));
+        assertEquals(expected.zone, parsed.query(TemporalQueries.zoneId()));
     }
 
     //-------------------------------------------------------------------------
diff --git a/test/jdk/java/time/tck/java/time/format/TCKDateTimeParseResolver.java b/test/jdk/java/time/tck/java/time/format/TCKDateTimeParseResolver.java
index 7a33064dfd8..ec473851b2e 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKDateTimeParseResolver.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKDateTimeParseResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -91,8 +91,9 @@ import static java.time.temporal.ChronoField.SECOND_OF_DAY;
 import static java.time.temporal.ChronoField.SECOND_OF_MINUTE;
 import static java.time.temporal.ChronoField.YEAR;
 import static java.time.temporal.ChronoField.YEAR_OF_ERA;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.Instant;
 import java.time.LocalDate;
@@ -122,13 +123,16 @@ import java.time.temporal.TemporalUnit;
 import java.time.temporal.ValueRange;
 import java.util.Map;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test parse resolving.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKDateTimeParseResolver {
     // TODO: tests with weird TenporalField implementations
     // TODO: tests with non-ISO chronologies
@@ -137,7 +141,6 @@ public class TCKDateTimeParseResolver {
     private static final ZoneId EUROPE_PARIS = ZoneId.of("Europe/Paris");
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveOneNoChange")
     Object[][] data_resolveOneNoChange() {
         return new Object[][]{
                 {YEAR, 2012},
@@ -148,20 +151,20 @@ public class TCKDateTimeParseResolver {
         };
     }
 
-    @Test(dataProvider="resolveOneNoChange")
+    @ParameterizedTest
+    @MethodSource("data_resolveOneNoChange")
     public void test_resolveOneNoChange(TemporalField field1, long value1) {
         String str = Long.toString(value1);
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(field1).toFormatter();
 
         TemporalAccessor accessor = f.parse(str);
-        assertEquals(accessor.query(TemporalQueries.localDate()), null);
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
-        assertEquals(accessor.isSupported(field1), true);
-        assertEquals(accessor.getLong(field1), value1);
+        assertEquals(null, accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
+        assertEquals(true, accessor.isSupported(field1));
+        assertEquals(value1, accessor.getLong(field1));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveTwoNoChange")
     Object[][] data_resolveTwoNoChange() {
         return new Object[][]{
                 {YEAR, 2012, MONTH_OF_YEAR, 5},
@@ -185,7 +188,8 @@ public class TCKDateTimeParseResolver {
         };
     }
 
-    @Test(dataProvider="resolveTwoNoChange")
+    @ParameterizedTest
+    @MethodSource("data_resolveTwoNoChange")
     public void test_resolveTwoNoChange(TemporalField field1, long value1, TemporalField field2, long value2) {
         String str = value1 + " " + value2;
         DateTimeFormatter f = new DateTimeFormatterBuilder()
@@ -193,16 +197,15 @@ public class TCKDateTimeParseResolver {
                 .appendValue(field2).toFormatter();
         TemporalAccessor accessor = f.parse(str);
 
-        assertEquals(accessor.query(TemporalQueries.localDate()), null);
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
-        assertEquals(accessor.isSupported(field1), true);
-        assertEquals(accessor.isSupported(field2), true);
-        assertEquals(accessor.getLong(field1), value1);
-        assertEquals(accessor.getLong(field2), value2);
+        assertEquals(null, accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
+        assertEquals(true, accessor.isSupported(field1));
+        assertEquals(true, accessor.isSupported(field2));
+        assertEquals(value1, accessor.getLong(field1));
+        assertEquals(value2, accessor.getLong(field2));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveThreeNoChange")
     Object[][] data_resolveThreeNoChange() {
         return new Object[][]{
                 {YEAR, 2012, MONTH_OF_YEAR, 5, DAY_OF_WEEK, 5},
@@ -216,7 +219,8 @@ public class TCKDateTimeParseResolver {
         };
     }
 
-    @Test(dataProvider="resolveThreeNoChange")
+    @ParameterizedTest
+    @MethodSource("data_resolveThreeNoChange")
     public void test_resolveThreeNoChange(TemporalField field1, long value1, TemporalField field2, long value2, TemporalField field3, long value3) {
         String str = value1 + " " + value2 + " " + value3;
         DateTimeFormatter f = new DateTimeFormatterBuilder()
@@ -225,20 +229,19 @@ public class TCKDateTimeParseResolver {
                 .appendValue(field3).toFormatter();
         TemporalAccessor accessor = f.parse(str);
 
-        assertEquals(accessor.query(TemporalQueries.localDate()), null);
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
-        assertEquals(accessor.isSupported(field1), true);
-        assertEquals(accessor.isSupported(field2), true);
-        assertEquals(accessor.isSupported(field3), true);
-        assertEquals(accessor.getLong(field1), value1);
-        assertEquals(accessor.getLong(field2), value2);
-        assertEquals(accessor.getLong(field3), value3);
+        assertEquals(null, accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
+        assertEquals(true, accessor.isSupported(field1));
+        assertEquals(true, accessor.isSupported(field2));
+        assertEquals(true, accessor.isSupported(field3));
+        assertEquals(value1, accessor.getLong(field1));
+        assertEquals(value2, accessor.getLong(field2));
+        assertEquals(value3, accessor.getLong(field3));
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveOneToField")
     Object[][] data_resolveOneToField() {
         return new Object[][]{
                 {YEAR_OF_ERA, 2012, YEAR, 2012L, null, null},
@@ -251,7 +254,8 @@ public class TCKDateTimeParseResolver {
         };
     }
 
-    @Test(dataProvider="resolveOneToField")
+    @ParameterizedTest
+    @MethodSource("data_resolveOneToField")
     public void test_resolveOneToField(TemporalField field1, long value1,
                                        TemporalField expectedField1, Long expectedValue1,
                                        TemporalField expectedField2, Long expectedValue2) {
@@ -259,38 +263,37 @@ public class TCKDateTimeParseResolver {
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(field1).toFormatter();
 
         TemporalAccessor accessor = f.parse(str);
-        assertEquals(accessor.query(TemporalQueries.localDate()), null);
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
+        assertEquals(null, accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
         if (expectedField1 != null) {
-            assertEquals(accessor.isSupported(expectedField1), true);
-            assertEquals(accessor.getLong(expectedField1), expectedValue1.longValue());
+            assertEquals(true, accessor.isSupported(expectedField1));
+            assertEquals(expectedValue1.longValue(), accessor.getLong(expectedField1));
         }
         if (expectedField2 != null) {
-            assertEquals(accessor.isSupported(expectedField2), true);
-            assertEquals(accessor.getLong(expectedField2), expectedValue2.longValue());
+            assertEquals(true, accessor.isSupported(expectedField2));
+            assertEquals(expectedValue2.longValue(), accessor.getLong(expectedField2));
         }
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveOneToDate")
     Object[][] data_resolveOneToDate() {
         return new Object[][]{
                 {EPOCH_DAY, 32, LocalDate.of(1970, 2, 2)},
         };
     }
 
-    @Test(dataProvider="resolveOneToDate")
+    @ParameterizedTest
+    @MethodSource("data_resolveOneToDate")
     public void test_resolveOneToDate(TemporalField field1, long value1, LocalDate expectedDate) {
         String str = Long.toString(value1);
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(field1).toFormatter();
 
         TemporalAccessor accessor = f.parse(str);
-        assertEquals(accessor.query(TemporalQueries.localDate()), expectedDate);
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
+        assertEquals(expectedDate, accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveOneToTime")
     Object[][] data_resolveOneToTime() {
         return new Object[][]{
                 {HOUR_OF_DAY, 8, LocalTime.of(8, 0)},
@@ -304,20 +307,20 @@ public class TCKDateTimeParseResolver {
         };
     }
 
-    @Test(dataProvider="resolveOneToTime")
+    @ParameterizedTest
+    @MethodSource("data_resolveOneToTime")
     public void test_resolveOneToTime(TemporalField field1, long value1, LocalTime expectedTime) {
         String str = Long.toString(value1);
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(field1).toFormatter();
 
         TemporalAccessor accessor = f.parse(str);
-        assertEquals(accessor.query(TemporalQueries.localDate()), null);
-        assertEquals(accessor.query(TemporalQueries.localTime()), expectedTime);
+        assertEquals(null, accessor.query(TemporalQueries.localDate()));
+        assertEquals(expectedTime, accessor.query(TemporalQueries.localTime()));
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveTwoToField")
     Object[][] data_resolveTwoToField() {
         return new Object[][]{
                 // cross-check
@@ -330,7 +333,8 @@ public class TCKDateTimeParseResolver {
         };
     }
 
-    @Test(dataProvider="resolveTwoToField")
+    @ParameterizedTest
+    @MethodSource("data_resolveTwoToField")
     public void test_resolveTwoToField(TemporalField field1, long value1,
                                        TemporalField field2, long value2,
                                        TemporalField expectedField1, Long expectedValue1,
@@ -341,20 +345,19 @@ public class TCKDateTimeParseResolver {
                 .appendValue(field2).toFormatter();
 
         TemporalAccessor accessor = f.parse(str);
-        assertEquals(accessor.query(TemporalQueries.localDate()), null);
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
+        assertEquals(null, accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
         if (expectedField1 != null) {
-            assertEquals(accessor.isSupported(expectedField1), true);
-            assertEquals(accessor.getLong(expectedField1), expectedValue1.longValue());
+            assertEquals(true, accessor.isSupported(expectedField1));
+            assertEquals(expectedValue1.longValue(), accessor.getLong(expectedField1));
         }
         if (expectedField2 != null) {
-            assertEquals(accessor.isSupported(expectedField2), true);
-            assertEquals(accessor.getLong(expectedField2), expectedValue2.longValue());
+            assertEquals(true, accessor.isSupported(expectedField2));
+            assertEquals(expectedValue2.longValue(), accessor.getLong(expectedField2));
         }
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveTwoToDate")
     Object[][] data_resolveTwoToDate() {
         return new Object[][]{
                 // merge
@@ -379,7 +382,8 @@ public class TCKDateTimeParseResolver {
         };
     }
 
-    @Test(dataProvider="resolveTwoToDate")
+    @ParameterizedTest
+    @MethodSource("data_resolveTwoToDate")
     public void test_resolveTwoToDate(TemporalField field1, long value1,
                                       TemporalField field2, long value2,
                                       LocalDate expectedDate) {
@@ -389,12 +393,11 @@ public class TCKDateTimeParseResolver {
                 .appendValue(field2).toFormatter();
 
         TemporalAccessor accessor = f.parse(str);
-        assertEquals(accessor.query(TemporalQueries.localDate()), expectedDate);
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
+        assertEquals(expectedDate, accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveTwoToTime")
     Object[][] data_resolveTwoToTime() {
         return new Object[][]{
                 // merge
@@ -466,7 +469,8 @@ public class TCKDateTimeParseResolver {
         };
     }
 
-    @Test(dataProvider="resolveTwoToTime")
+    @ParameterizedTest
+    @MethodSource("data_resolveTwoToTime")
     public void test_resolveTwoToTime(TemporalField field1, long value1,
                                 TemporalField field2, long value2,
                                 LocalTime expectedTime) {
@@ -476,12 +480,11 @@ public class TCKDateTimeParseResolver {
                 .appendValue(field2).toFormatter();
 
         TemporalAccessor accessor = f.parse(str);
-        assertEquals(accessor.query(TemporalQueries.localDate()), null);
-        assertEquals(accessor.query(TemporalQueries.localTime()), expectedTime);
+        assertEquals(null, accessor.query(TemporalQueries.localDate()));
+        assertEquals(expectedTime, accessor.query(TemporalQueries.localTime()));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveThreeToDate")
     Object[][] data_resolveThreeToDate() {
         return new Object[][]{
                 // merge
@@ -497,7 +500,8 @@ public class TCKDateTimeParseResolver {
         };
     }
 
-    @Test(dataProvider="resolveThreeToDate")
+    @ParameterizedTest
+    @MethodSource("data_resolveThreeToDate")
     public void test_resolveThreeToDate(TemporalField field1, long value1,
                                       TemporalField field2, long value2,
                                       TemporalField field3, long value3,
@@ -509,12 +513,11 @@ public class TCKDateTimeParseResolver {
                 .appendValue(field3).toFormatter();
 
         TemporalAccessor accessor = f.parse(str);
-        assertEquals(accessor.query(TemporalQueries.localDate()), expectedDate);
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
+        assertEquals(expectedDate, accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveFourToDate")
     Object[][] data_resolveFourToDate() {
         return new Object[][]{
                 // merge
@@ -528,7 +531,8 @@ public class TCKDateTimeParseResolver {
         };
     }
 
-    @Test(dataProvider="resolveFourToDate")
+    @ParameterizedTest
+    @MethodSource("data_resolveFourToDate")
     public void test_resolveFourToDate(TemporalField field1, long value1,
                                         TemporalField field2, long value2,
                                         TemporalField field3, long value3,
@@ -542,12 +546,11 @@ public class TCKDateTimeParseResolver {
                 .appendValue(field4).toFormatter();
 
         TemporalAccessor accessor = f.parse(str);
-        assertEquals(accessor.query(TemporalQueries.localDate()), expectedDate);
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
+        assertEquals(expectedDate, accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveFourToTime")
     Object[][] data_resolveFourToTime() {
         return new Object[][]{
                 // merge
@@ -597,7 +600,8 @@ public class TCKDateTimeParseResolver {
         };
     }
 
-    @Test(dataProvider="resolveFourToTime")
+    @ParameterizedTest
+    @MethodSource("data_resolveFourToTime")
     public void test_resolveFourToTime(ResolverStyle style,
                        long hour, long min, long sec, long nano, LocalTime expectedTime, Period excessPeriod) {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
@@ -610,9 +614,9 @@ public class TCKDateTimeParseResolver {
         for (ResolverStyle s : styles) {
             if (expectedTime != null) {
                 TemporalAccessor accessor = f.withResolverStyle(s).parse("");
-                assertEquals(accessor.query(TemporalQueries.localDate()), null, "ResolverStyle: " + s);
-                assertEquals(accessor.query(TemporalQueries.localTime()), expectedTime, "ResolverStyle: " + s);
-                assertEquals(accessor.query(DateTimeFormatter.parsedExcessDays()), excessPeriod, "ResolverStyle: " + s);
+                assertEquals(null, accessor.query(TemporalQueries.localDate()), "ResolverStyle: " + s);
+                assertEquals(expectedTime, accessor.query(TemporalQueries.localTime()), "ResolverStyle: " + s);
+                assertEquals(excessPeriod, accessor.query(DateTimeFormatter.parsedExcessDays()), "ResolverStyle: " + s);
             } else {
                 try {
                     f.withResolverStyle(style).parse("");
@@ -624,7 +628,8 @@ public class TCKDateTimeParseResolver {
         }
     }
 
-    @Test(dataProvider="resolveFourToTime")
+    @ParameterizedTest
+    @MethodSource("data_resolveFourToTime")
     public void test_resolveThreeToTime(ResolverStyle style,
                                        long hour, long min, long sec, long nano, LocalTime expectedTime, Period excessPeriod) {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
@@ -636,9 +641,9 @@ public class TCKDateTimeParseResolver {
         for (ResolverStyle s : styles) {
             if (expectedTime != null) {
                 TemporalAccessor accessor = f.withResolverStyle(s).parse("");
-                assertEquals(accessor.query(TemporalQueries.localDate()), null, "ResolverStyle: " + s);
-                assertEquals(accessor.query(TemporalQueries.localTime()), expectedTime.minusNanos(nano), "ResolverStyle: " + s);
-                assertEquals(accessor.query(DateTimeFormatter.parsedExcessDays()), excessPeriod, "ResolverStyle: " + s);
+                assertEquals(null, accessor.query(TemporalQueries.localDate()), "ResolverStyle: " + s);
+                assertEquals(expectedTime.minusNanos(nano), accessor.query(TemporalQueries.localTime()), "ResolverStyle: " + s);
+                assertEquals(excessPeriod, accessor.query(DateTimeFormatter.parsedExcessDays()), "ResolverStyle: " + s);
             } else {
                 try {
                     f.withResolverStyle(style).parse("");
@@ -650,7 +655,8 @@ public class TCKDateTimeParseResolver {
         }
     }
 
-    @Test(dataProvider="resolveFourToTime")
+    @ParameterizedTest
+    @MethodSource("data_resolveFourToTime")
     public void test_resolveFourToDateTime(ResolverStyle style,
                        long hour, long min, long sec, long nano, LocalTime expectedTime, Period excessPeriod) {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
@@ -665,15 +671,14 @@ public class TCKDateTimeParseResolver {
             LocalDate expectedDate = LocalDate.of(2012, 6, 30).plus(excessPeriod);
             for (ResolverStyle s : styles) {
                 TemporalAccessor accessor = f.withResolverStyle(s).parse("");
-                assertEquals(accessor.query(TemporalQueries.localDate()), expectedDate, "ResolverStyle: " + s);
-                assertEquals(accessor.query(TemporalQueries.localTime()), expectedTime, "ResolverStyle: " + s);
-                assertEquals(accessor.query(DateTimeFormatter.parsedExcessDays()), Period.ZERO, "ResolverStyle: " + s);
+                assertEquals(expectedDate, accessor.query(TemporalQueries.localDate()), "ResolverStyle: " + s);
+                assertEquals(expectedTime, accessor.query(TemporalQueries.localTime()), "ResolverStyle: " + s);
+                assertEquals(Period.ZERO, accessor.query(DateTimeFormatter.parsedExcessDays()), "ResolverStyle: " + s);
             }
         }
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveSecondOfDay")
     Object[][] data_resolveSecondOfDay() {
         return new Object[][]{
                 {STRICT, 0, 0, 0},
@@ -696,16 +701,17 @@ public class TCKDateTimeParseResolver {
         };
     }
 
-    @Test(dataProvider="resolveSecondOfDay")
+    @ParameterizedTest
+    @MethodSource("data_resolveSecondOfDay")
     public void test_resolveSecondOfDay(ResolverStyle style, long value, Integer expectedSecond, int expectedDays) {
         String str = Long.toString(value);
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(SECOND_OF_DAY).toFormatter();
 
         if (expectedSecond != null) {
             TemporalAccessor accessor = f.withResolverStyle(style).parse(str);
-            assertEquals(accessor.query(TemporalQueries.localDate()), null);
-            assertEquals(accessor.query(TemporalQueries.localTime()), LocalTime.ofSecondOfDay(expectedSecond));
-            assertEquals(accessor.query(DateTimeFormatter.parsedExcessDays()), Period.ofDays(expectedDays));
+            assertEquals(null, accessor.query(TemporalQueries.localDate()));
+            assertEquals(LocalTime.ofSecondOfDay(expectedSecond), accessor.query(TemporalQueries.localTime()));
+            assertEquals(Period.ofDays(expectedDays), accessor.query(DateTimeFormatter.parsedExcessDays()));
         } else {
             try {
                 f.withResolverStyle(style).parse(str);
@@ -717,7 +723,6 @@ public class TCKDateTimeParseResolver {
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveMinuteOfDay")
     Object[][] data_resolveMinuteOfDay() {
         return new Object[][]{
                 {STRICT, 0, 0, 0},
@@ -740,16 +745,17 @@ public class TCKDateTimeParseResolver {
         };
     }
 
-    @Test(dataProvider="resolveMinuteOfDay")
+    @ParameterizedTest
+    @MethodSource("data_resolveMinuteOfDay")
     public void test_resolveMinuteOfDay(ResolverStyle style, long value, Integer expectedMinute, int expectedDays) {
         String str = Long.toString(value);
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(MINUTE_OF_DAY).toFormatter();
 
         if (expectedMinute != null) {
             TemporalAccessor accessor = f.withResolverStyle(style).parse(str);
-            assertEquals(accessor.query(TemporalQueries.localDate()), null);
-            assertEquals(accessor.query(TemporalQueries.localTime()), LocalTime.ofSecondOfDay(expectedMinute * 60));
-            assertEquals(accessor.query(DateTimeFormatter.parsedExcessDays()), Period.ofDays(expectedDays));
+            assertEquals(null, accessor.query(TemporalQueries.localDate()));
+            assertEquals(LocalTime.ofSecondOfDay(expectedMinute * 60), accessor.query(TemporalQueries.localTime()));
+            assertEquals(Period.ofDays(expectedDays), accessor.query(DateTimeFormatter.parsedExcessDays()));
         } else {
             try {
                 f.withResolverStyle(style).parse(str);
@@ -761,7 +767,6 @@ public class TCKDateTimeParseResolver {
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveClockHourOfDay")
     Object[][] data_resolveClockHourOfDay() {
         return new Object[][]{
                 {STRICT, 1, 1, 0},
@@ -784,16 +789,17 @@ public class TCKDateTimeParseResolver {
         };
     }
 
-    @Test(dataProvider="resolveClockHourOfDay")
+    @ParameterizedTest
+    @MethodSource("data_resolveClockHourOfDay")
     public void test_resolveClockHourOfDay(ResolverStyle style, long value, Integer expectedHour, int expectedDays) {
         String str = Long.toString(value);
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(CLOCK_HOUR_OF_DAY).toFormatter();
 
         if (expectedHour != null) {
             TemporalAccessor accessor = f.withResolverStyle(style).parse(str);
-            assertEquals(accessor.query(TemporalQueries.localDate()), null);
-            assertEquals(accessor.query(TemporalQueries.localTime()), LocalTime.of(expectedHour, 0));
-            assertEquals(accessor.query(DateTimeFormatter.parsedExcessDays()), Period.ofDays(expectedDays));
+            assertEquals(null, accessor.query(TemporalQueries.localDate()));
+            assertEquals(LocalTime.of(expectedHour, 0), accessor.query(TemporalQueries.localTime()));
+            assertEquals(Period.ofDays(expectedDays), accessor.query(DateTimeFormatter.parsedExcessDays()));
         } else {
             try {
                 f.withResolverStyle(style).parse(str);
@@ -805,7 +811,6 @@ public class TCKDateTimeParseResolver {
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveClockHourOfAmPm")
     Object[][] data_resolveClockHourOfAmPm() {
         return new Object[][]{
                 {STRICT, 1, 1},
@@ -828,18 +833,19 @@ public class TCKDateTimeParseResolver {
         };
     }
 
-    @Test(dataProvider="resolveClockHourOfAmPm")
+    @ParameterizedTest
+    @MethodSource("data_resolveClockHourOfAmPm")
     public void test_resolveClockHourOfAmPm(ResolverStyle style, long value, Integer expectedValue) {
         String str = Long.toString(value);
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(CLOCK_HOUR_OF_AMPM).toFormatter();
 
         if (expectedValue != null) {
             TemporalAccessor accessor = f.withResolverStyle(style).parse(str);
-            assertEquals(accessor.query(TemporalQueries.localDate()), null);
-            assertEquals(accessor.query(TemporalQueries.localTime()), null);
-            assertEquals(accessor.isSupported(CLOCK_HOUR_OF_AMPM), false);
-            assertEquals(accessor.isSupported(HOUR_OF_AMPM), true);
-            assertEquals(accessor.getLong(HOUR_OF_AMPM), expectedValue.longValue());
+            assertEquals(null, accessor.query(TemporalQueries.localDate()));
+            assertEquals(null, accessor.query(TemporalQueries.localTime()));
+            assertEquals(false, accessor.isSupported(CLOCK_HOUR_OF_AMPM));
+            assertEquals(true, accessor.isSupported(HOUR_OF_AMPM));
+            assertEquals(expectedValue.longValue(), accessor.getLong(HOUR_OF_AMPM));
         } else {
             try {
                 f.withResolverStyle(style).parse(str);
@@ -851,7 +857,6 @@ public class TCKDateTimeParseResolver {
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="resolveAmPm")
     Object[][] data_resolveAmPm() {
         return new Object[][]{
                 {STRICT, 0, null, 0},
@@ -871,17 +876,18 @@ public class TCKDateTimeParseResolver {
         };
     }
 
-    @Test(dataProvider="resolveAmPm")
+    @ParameterizedTest
+    @MethodSource("data_resolveAmPm")
     public void test_resolveAmPm(ResolverStyle style, long value, LocalTime expectedTime, Integer expectedValue) {
         String str = Long.toString(value);
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(AMPM_OF_DAY).toFormatter();
 
         if (expectedValue != null) {
             TemporalAccessor accessor = f.withResolverStyle(style).parse(str);
-            assertEquals(accessor.query(TemporalQueries.localDate()), null);
-            assertEquals(accessor.query(TemporalQueries.localTime()), expectedTime);
-            assertEquals(accessor.isSupported(AMPM_OF_DAY), true);
-            assertEquals(accessor.getLong(AMPM_OF_DAY), expectedValue.longValue());
+            assertEquals(null, accessor.query(TemporalQueries.localDate()));
+            assertEquals(expectedTime, accessor.query(TemporalQueries.localTime()));
+            assertEquals(true, accessor.isSupported(AMPM_OF_DAY));
+            assertEquals(expectedValue.longValue(), accessor.getLong(AMPM_OF_DAY));
         } else {
             try {
                 f.withResolverStyle(style).parse(str);
@@ -898,9 +904,9 @@ public class TCKDateTimeParseResolver {
     public void test_withChronology_noOverride() {
         DateTimeFormatter f = new DateTimeFormatterBuilder().parseDefaulting(EPOCH_DAY, 2).toFormatter();
         TemporalAccessor accessor = f.parse("");
-        assertEquals(accessor.query(TemporalQueries.localDate()), LocalDate.of(1970, 1, 3));
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
-        assertEquals(accessor.query(TemporalQueries.chronology()), IsoChronology.INSTANCE);
+        assertEquals(LocalDate.of(1970, 1, 3), accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
+        assertEquals(IsoChronology.INSTANCE, accessor.query(TemporalQueries.chronology()));
     }
 
     @Test
@@ -908,18 +914,18 @@ public class TCKDateTimeParseResolver {
         DateTimeFormatter f = new DateTimeFormatterBuilder().parseDefaulting(EPOCH_DAY, 2).toFormatter();
         f = f.withChronology(MinguoChronology.INSTANCE);
         TemporalAccessor accessor = f.parse("");
-        assertEquals(accessor.query(TemporalQueries.localDate()), LocalDate.of(1970, 1, 3));
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
-        assertEquals(accessor.query(TemporalQueries.chronology()), MinguoChronology.INSTANCE);
+        assertEquals(LocalDate.of(1970, 1, 3), accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
+        assertEquals(MinguoChronology.INSTANCE, accessor.query(TemporalQueries.chronology()));
     }
 
     @Test
     public void test_withChronology_parsedChronology_noOverride() {
         DateTimeFormatter f = new DateTimeFormatterBuilder().parseDefaulting(EPOCH_DAY, 2).appendChronologyId().toFormatter();
         TemporalAccessor accessor = f.parse("ThaiBuddhist");
-        assertEquals(accessor.query(TemporalQueries.localDate()), LocalDate.of(1970, 1, 3));
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
-        assertEquals(accessor.query(TemporalQueries.chronology()), ThaiBuddhistChronology.INSTANCE);
+        assertEquals(LocalDate.of(1970, 1, 3), accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
+        assertEquals(ThaiBuddhistChronology.INSTANCE, accessor.query(TemporalQueries.chronology()));
     }
 
     @Test
@@ -927,9 +933,9 @@ public class TCKDateTimeParseResolver {
         DateTimeFormatter f = new DateTimeFormatterBuilder().parseDefaulting(EPOCH_DAY, 2).appendChronologyId().toFormatter();
         f = f.withChronology(MinguoChronology.INSTANCE);
         TemporalAccessor accessor = f.parse("ThaiBuddhist");
-        assertEquals(accessor.query(TemporalQueries.localDate()), LocalDate.of(1970, 1, 3));
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
-        assertEquals(accessor.query(TemporalQueries.chronology()), ThaiBuddhistChronology.INSTANCE);
+        assertEquals(LocalDate.of(1970, 1, 3), accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
+        assertEquals(ThaiBuddhistChronology.INSTANCE, accessor.query(TemporalQueries.chronology()));
     }
 
     //-----------------------------------------------------------------------
@@ -938,9 +944,9 @@ public class TCKDateTimeParseResolver {
     public void test_withZone_noOverride() {
         DateTimeFormatter f = new DateTimeFormatterBuilder().parseDefaulting(EPOCH_DAY, 2).toFormatter();
         TemporalAccessor accessor = f.parse("");
-        assertEquals(accessor.query(TemporalQueries.localDate()), LocalDate.of(1970, 1, 3));
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
-        assertEquals(accessor.query(TemporalQueries.zoneId()), null);
+        assertEquals(LocalDate.of(1970, 1, 3), accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
+        assertEquals(null, accessor.query(TemporalQueries.zoneId()));
     }
 
     @Test
@@ -948,18 +954,18 @@ public class TCKDateTimeParseResolver {
         DateTimeFormatter f = new DateTimeFormatterBuilder().parseDefaulting(EPOCH_DAY, 2).toFormatter();
         f = f.withZone(EUROPE_ATHENS);
         TemporalAccessor accessor = f.parse("");
-        assertEquals(accessor.query(TemporalQueries.localDate()), LocalDate.of(1970, 1, 3));
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
-        assertEquals(accessor.query(TemporalQueries.zoneId()), EUROPE_ATHENS);
+        assertEquals(LocalDate.of(1970, 1, 3), accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
+        assertEquals(EUROPE_ATHENS, accessor.query(TemporalQueries.zoneId()));
     }
 
     @Test
     public void test_withZone_parsedZone_noOverride() {
         DateTimeFormatter f = new DateTimeFormatterBuilder().parseDefaulting(EPOCH_DAY, 2).appendZoneId().toFormatter();
         TemporalAccessor accessor = f.parse("Europe/Paris");
-        assertEquals(accessor.query(TemporalQueries.localDate()), LocalDate.of(1970, 1, 3));
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
-        assertEquals(accessor.query(TemporalQueries.zoneId()), EUROPE_PARIS);
+        assertEquals(LocalDate.of(1970, 1, 3), accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
+        assertEquals(EUROPE_PARIS, accessor.query(TemporalQueries.zoneId()));
     }
 
     @Test
@@ -967,9 +973,9 @@ public class TCKDateTimeParseResolver {
         DateTimeFormatter f = new DateTimeFormatterBuilder().parseDefaulting(EPOCH_DAY, 2).appendZoneId().toFormatter();
         f = f.withZone(EUROPE_ATHENS);
         TemporalAccessor accessor = f.parse("Europe/Paris");
-        assertEquals(accessor.query(TemporalQueries.localDate()), LocalDate.of(1970, 1, 3));
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
-        assertEquals(accessor.query(TemporalQueries.zoneId()), EUROPE_PARIS);
+        assertEquals(LocalDate.of(1970, 1, 3), accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
+        assertEquals(EUROPE_PARIS, accessor.query(TemporalQueries.zoneId()));
     }
 
     //-----------------------------------------------------------------------
@@ -978,8 +984,8 @@ public class TCKDateTimeParseResolver {
         LocalTime lt = LocalTime.of(12, 30, 40);
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(lt)).toFormatter();
         TemporalAccessor accessor = f.parse("1234567890");
-        assertEquals(accessor.query(TemporalQueries.localDate()), null);
-        assertEquals(accessor.query(TemporalQueries.localTime()), lt);
+        assertEquals(null, accessor.query(TemporalQueries.localDate()));
+        assertEquals(lt, accessor.query(TemporalQueries.localTime()));
     }
 
     //-------------------------------------------------------------------------
@@ -988,9 +994,9 @@ public class TCKDateTimeParseResolver {
         LocalDate ldt = LocalDate.of(2010, 6, 30);
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(ldt)).toFormatter();
         TemporalAccessor accessor = f.parse("1234567890");
-        assertEquals(accessor.query(TemporalQueries.localDate()), LocalDate.of(2010, 6, 30));
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
-        assertEquals(accessor.query(TemporalQueries.chronology()), IsoChronology.INSTANCE);
+        assertEquals(LocalDate.of(2010, 6, 30), accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
+        assertEquals(IsoChronology.INSTANCE, accessor.query(TemporalQueries.chronology()));
     }
 
     @Test
@@ -999,24 +1005,28 @@ public class TCKDateTimeParseResolver {
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(mdt)).toFormatter();
         f = f.withChronology(MinguoChronology.INSTANCE);
         TemporalAccessor accessor = f.parse("1234567890");
-        assertEquals(accessor.query(TemporalQueries.localDate()), LocalDate.from(mdt));
-        assertEquals(accessor.query(TemporalQueries.localTime()), null);
-        assertEquals(accessor.query(TemporalQueries.chronology()), MinguoChronology.INSTANCE);
+        assertEquals(LocalDate.from(mdt), accessor.query(TemporalQueries.localDate()));
+        assertEquals(null, accessor.query(TemporalQueries.localTime()));
+        assertEquals(MinguoChronology.INSTANCE, accessor.query(TemporalQueries.chronology()));
     }
 
-    @Test(expectedExceptions = DateTimeParseException.class)
+    @Test
     public void test_fieldResolvesToChronoLocalDate_noOverrideChrono_wrongChrono() {
-        ChronoLocalDate cld = ThaiBuddhistChronology.INSTANCE.dateNow();
-        DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(cld)).toFormatter();
-        f.parse("1234567890");
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            ChronoLocalDate cld = ThaiBuddhistChronology.INSTANCE.dateNow();
+            DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(cld)).toFormatter();
+            f.parse("1234567890");
+        });
     }
 
-    @Test(expectedExceptions = DateTimeParseException.class)
+    @Test
     public void test_fieldResolvesToChronoLocalDate_overrideChrono_wrongChrono() {
-        ChronoLocalDate cld = ThaiBuddhistChronology.INSTANCE.dateNow();
-        DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(cld)).toFormatter();
-        f = f.withChronology(MinguoChronology.INSTANCE);
-        f.parse("1234567890");
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            ChronoLocalDate cld = ThaiBuddhistChronology.INSTANCE.dateNow();
+            DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(cld)).toFormatter();
+            f = f.withChronology(MinguoChronology.INSTANCE);
+            f.parse("1234567890");
+        });
     }
 
     //-------------------------------------------------------------------------
@@ -1025,9 +1035,9 @@ public class TCKDateTimeParseResolver {
         LocalDateTime ldt = LocalDateTime.of(2010, 6, 30, 12, 30);
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(ldt)).toFormatter();
         TemporalAccessor accessor = f.parse("1234567890");
-        assertEquals(accessor.query(TemporalQueries.localDate()), LocalDate.of(2010, 6, 30));
-        assertEquals(accessor.query(TemporalQueries.localTime()), LocalTime.of(12, 30));
-        assertEquals(accessor.query(TemporalQueries.chronology()), IsoChronology.INSTANCE);
+        assertEquals(LocalDate.of(2010, 6, 30), accessor.query(TemporalQueries.localDate()));
+        assertEquals(LocalTime.of(12, 30), accessor.query(TemporalQueries.localTime()));
+        assertEquals(IsoChronology.INSTANCE, accessor.query(TemporalQueries.chronology()));
     }
 
     @Test
@@ -1036,24 +1046,28 @@ public class TCKDateTimeParseResolver {
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(mdt.atTime(LocalTime.NOON))).toFormatter();
         f = f.withChronology(MinguoChronology.INSTANCE);
         TemporalAccessor accessor = f.parse("1234567890");
-        assertEquals(accessor.query(TemporalQueries.localDate()), LocalDate.from(mdt));
-        assertEquals(accessor.query(TemporalQueries.localTime()), LocalTime.NOON);
-        assertEquals(accessor.query(TemporalQueries.chronology()), MinguoChronology.INSTANCE);
+        assertEquals(LocalDate.from(mdt), accessor.query(TemporalQueries.localDate()));
+        assertEquals(LocalTime.NOON, accessor.query(TemporalQueries.localTime()));
+        assertEquals(MinguoChronology.INSTANCE, accessor.query(TemporalQueries.chronology()));
     }
 
-    @Test(expectedExceptions = DateTimeParseException.class)
+    @Test
     public void test_fieldResolvesToChronoLocalDateTime_noOverrideChrono_wrongChrono() {
-        ChronoLocalDateTime<?> cldt = ThaiBuddhistChronology.INSTANCE.dateNow().atTime(LocalTime.NOON);
-        DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(cldt)).toFormatter();
-        f.parse("1234567890");
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            ChronoLocalDateTime<?> cldt = ThaiBuddhistChronology.INSTANCE.dateNow().atTime(LocalTime.NOON);
+            DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(cldt)).toFormatter();
+            f.parse("1234567890");
+        });
     }
 
-    @Test(expectedExceptions = DateTimeParseException.class)
+    @Test
     public void test_fieldResolvesToChronoLocalDateTime_overrideChrono_wrongChrono() {
-        ChronoLocalDateTime<?> cldt = ThaiBuddhistChronology.INSTANCE.dateNow().atTime(LocalTime.NOON);
-        DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(cldt)).toFormatter();
-        f = f.withChronology(MinguoChronology.INSTANCE);
-        f.parse("1234567890");
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            ChronoLocalDateTime<?> cldt = ThaiBuddhistChronology.INSTANCE.dateNow().atTime(LocalTime.NOON);
+            DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(cldt)).toFormatter();
+            f = f.withChronology(MinguoChronology.INSTANCE);
+            f.parse("1234567890");
+        });
     }
 
     //-------------------------------------------------------------------------
@@ -1062,10 +1076,10 @@ public class TCKDateTimeParseResolver {
         ZonedDateTime zdt = ZonedDateTime.of(2010, 6, 30, 12, 30, 0, 0, EUROPE_PARIS);
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(zdt)).toFormatter();
         TemporalAccessor accessor = f.parse("1234567890");
-        assertEquals(accessor.query(TemporalQueries.localDate()), LocalDate.of(2010, 6, 30));
-        assertEquals(accessor.query(TemporalQueries.localTime()), LocalTime.of(12, 30));
-        assertEquals(accessor.query(TemporalQueries.chronology()), IsoChronology.INSTANCE);
-        assertEquals(accessor.query(TemporalQueries.zoneId()), EUROPE_PARIS);
+        assertEquals(LocalDate.of(2010, 6, 30), accessor.query(TemporalQueries.localDate()));
+        assertEquals(LocalTime.of(12, 30), accessor.query(TemporalQueries.localTime()));
+        assertEquals(IsoChronology.INSTANCE, accessor.query(TemporalQueries.chronology()));
+        assertEquals(EUROPE_PARIS, accessor.query(TemporalQueries.zoneId()));
     }
 
     @Test
@@ -1075,25 +1089,29 @@ public class TCKDateTimeParseResolver {
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(mzdt)).toFormatter();
         f = f.withChronology(MinguoChronology.INSTANCE);
         TemporalAccessor accessor = f.parse("1234567890");
-        assertEquals(accessor.query(TemporalQueries.localDate()), LocalDate.from(mdt));
-        assertEquals(accessor.query(TemporalQueries.localTime()), LocalTime.NOON);
-        assertEquals(accessor.query(TemporalQueries.chronology()), MinguoChronology.INSTANCE);
-        assertEquals(accessor.query(TemporalQueries.zoneId()), EUROPE_PARIS);
+        assertEquals(LocalDate.from(mdt), accessor.query(TemporalQueries.localDate()));
+        assertEquals(LocalTime.NOON, accessor.query(TemporalQueries.localTime()));
+        assertEquals(MinguoChronology.INSTANCE, accessor.query(TemporalQueries.chronology()));
+        assertEquals(EUROPE_PARIS, accessor.query(TemporalQueries.zoneId()));
     }
 
-    @Test(expectedExceptions = DateTimeParseException.class)
+    @Test
     public void test_fieldResolvesToChronoZonedDateTime_noOverrideChrono_wrongChrono() {
-        ChronoZonedDateTime<?> cldt = ThaiBuddhistChronology.INSTANCE.dateNow().atTime(LocalTime.NOON).atZone(EUROPE_PARIS);
-        DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(cldt)).toFormatter();
-        f.parse("1234567890");
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            ChronoZonedDateTime<?> cldt = ThaiBuddhistChronology.INSTANCE.dateNow().atTime(LocalTime.NOON).atZone(EUROPE_PARIS);
+            DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(cldt)).toFormatter();
+            f.parse("1234567890");
+        });
     }
 
-    @Test(expectedExceptions = DateTimeParseException.class)
+    @Test
     public void test_fieldResolvesToChronoZonedDateTime_overrideChrono_wrongChrono() {
-        ChronoZonedDateTime<?> cldt = ThaiBuddhistChronology.INSTANCE.dateNow().atTime(LocalTime.NOON).atZone(EUROPE_PARIS);
-        DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(cldt)).toFormatter();
-        f = f.withChronology(MinguoChronology.INSTANCE);
-        f.parse("1234567890");
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            ChronoZonedDateTime<?> cldt = ThaiBuddhistChronology.INSTANCE.dateNow().atTime(LocalTime.NOON).atZone(EUROPE_PARIS);
+            DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(cldt)).toFormatter();
+            f = f.withChronology(MinguoChronology.INSTANCE);
+            f.parse("1234567890");
+        });
     }
 
     @Test
@@ -1101,15 +1119,17 @@ public class TCKDateTimeParseResolver {
         ZonedDateTime zdt = ZonedDateTime.of(2010, 6, 30, 12, 30, 0, 0, EUROPE_PARIS);
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(zdt)).toFormatter();
         f = f.withZone(EUROPE_PARIS);
-        assertEquals(f.parse("1234567890", ZonedDateTime::from), zdt);
+        assertEquals(zdt, f.parse("1234567890", ZonedDateTime::from));
     }
 
-    @Test(expectedExceptions = DateTimeParseException.class)
+    @Test
     public void test_fieldResolvesToChronoZonedDateTime_overrideZone_wrongZone() {
-        ZonedDateTime zdt = ZonedDateTime.of(2010, 6, 30, 12, 30, 0, 0, EUROPE_PARIS);
-        DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(zdt)).toFormatter();
-        f = f.withZone(ZoneId.of("Europe/London"));
-        f.parse("1234567890");
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            ZonedDateTime zdt = ZonedDateTime.of(2010, 6, 30, 12, 30, 0, 0, EUROPE_PARIS);
+            DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(new ResolvingField(zdt)).toFormatter();
+            f = f.withZone(ZoneId.of("Europe/London"));
+            f.parse("1234567890");
+        });
     }
 
     //-------------------------------------------------------------------------
@@ -1170,15 +1190,15 @@ public class TCKDateTimeParseResolver {
             .appendValue(INSTANT_SECONDS).toFormatter();
         TemporalAccessor acc = fmt.parse("86402");
         Instant expected = Instant.ofEpochSecond(86402);
-        assertEquals(acc.isSupported(INSTANT_SECONDS), true);
-        assertEquals(acc.isSupported(NANO_OF_SECOND), true);
-        assertEquals(acc.isSupported(MICRO_OF_SECOND), true);
-        assertEquals(acc.isSupported(MILLI_OF_SECOND), true);
-        assertEquals(acc.getLong(INSTANT_SECONDS), 86402L);
-        assertEquals(acc.getLong(NANO_OF_SECOND), 0L);
-        assertEquals(acc.getLong(MICRO_OF_SECOND), 0L);
-        assertEquals(acc.getLong(MILLI_OF_SECOND), 0L);
-        assertEquals(Instant.from(acc), expected);
+        assertEquals(true, acc.isSupported(INSTANT_SECONDS));
+        assertEquals(true, acc.isSupported(NANO_OF_SECOND));
+        assertEquals(true, acc.isSupported(MICRO_OF_SECOND));
+        assertEquals(true, acc.isSupported(MILLI_OF_SECOND));
+        assertEquals(86402L, acc.getLong(INSTANT_SECONDS));
+        assertEquals(0L, acc.getLong(NANO_OF_SECOND));
+        assertEquals(0L, acc.getLong(MICRO_OF_SECOND));
+        assertEquals(0L, acc.getLong(MILLI_OF_SECOND));
+        assertEquals(expected, Instant.from(acc));
     }
 
     @Test
@@ -1187,15 +1207,15 @@ public class TCKDateTimeParseResolver {
             .appendValue(INSTANT_SECONDS).appendLiteral('.').appendValue(NANO_OF_SECOND).toFormatter();
         TemporalAccessor acc = fmt.parse("86402.123456789");
         Instant expected = Instant.ofEpochSecond(86402, 123456789);
-        assertEquals(acc.isSupported(INSTANT_SECONDS), true);
-        assertEquals(acc.isSupported(NANO_OF_SECOND), true);
-        assertEquals(acc.isSupported(MICRO_OF_SECOND), true);
-        assertEquals(acc.isSupported(MILLI_OF_SECOND), true);
-        assertEquals(acc.getLong(INSTANT_SECONDS), 86402L);
-        assertEquals(acc.getLong(NANO_OF_SECOND), 123456789L);
-        assertEquals(acc.getLong(MICRO_OF_SECOND), 123456L);
-        assertEquals(acc.getLong(MILLI_OF_SECOND), 123L);
-        assertEquals(Instant.from(acc), expected);
+        assertEquals(true, acc.isSupported(INSTANT_SECONDS));
+        assertEquals(true, acc.isSupported(NANO_OF_SECOND));
+        assertEquals(true, acc.isSupported(MICRO_OF_SECOND));
+        assertEquals(true, acc.isSupported(MILLI_OF_SECOND));
+        assertEquals(86402L, acc.getLong(INSTANT_SECONDS));
+        assertEquals(123456789L, acc.getLong(NANO_OF_SECOND));
+        assertEquals(123456L, acc.getLong(MICRO_OF_SECOND));
+        assertEquals(123L, acc.getLong(MILLI_OF_SECOND));
+        assertEquals(expected, Instant.from(acc));
     }
 
     // SPEC: ChronoField.SECOND_OF_DAY
@@ -1204,14 +1224,14 @@ public class TCKDateTimeParseResolver {
         DateTimeFormatter fmt = new DateTimeFormatterBuilder()
             .appendValue(SECOND_OF_DAY).toFormatter();
         TemporalAccessor acc = fmt.parse("864");
-        assertEquals(acc.isSupported(SECOND_OF_DAY), true);
-        assertEquals(acc.isSupported(NANO_OF_SECOND), true);
-        assertEquals(acc.isSupported(MICRO_OF_SECOND), true);
-        assertEquals(acc.isSupported(MILLI_OF_SECOND), true);
-        assertEquals(acc.getLong(SECOND_OF_DAY), 864L);
-        assertEquals(acc.getLong(NANO_OF_SECOND), 0L);
-        assertEquals(acc.getLong(MICRO_OF_SECOND), 0L);
-        assertEquals(acc.getLong(MILLI_OF_SECOND), 0L);
+        assertEquals(true, acc.isSupported(SECOND_OF_DAY));
+        assertEquals(true, acc.isSupported(NANO_OF_SECOND));
+        assertEquals(true, acc.isSupported(MICRO_OF_SECOND));
+        assertEquals(true, acc.isSupported(MILLI_OF_SECOND));
+        assertEquals(864L, acc.getLong(SECOND_OF_DAY));
+        assertEquals(0L, acc.getLong(NANO_OF_SECOND));
+        assertEquals(0L, acc.getLong(MICRO_OF_SECOND));
+        assertEquals(0L, acc.getLong(MILLI_OF_SECOND));
     }
 
     @Test
@@ -1219,14 +1239,14 @@ public class TCKDateTimeParseResolver {
         DateTimeFormatter fmt = new DateTimeFormatterBuilder()
             .appendValue(SECOND_OF_DAY).appendLiteral('.').appendValue(NANO_OF_SECOND).toFormatter();
         TemporalAccessor acc = fmt.parse("864.123456789");
-        assertEquals(acc.isSupported(SECOND_OF_DAY), true);
-        assertEquals(acc.isSupported(NANO_OF_SECOND), true);
-        assertEquals(acc.isSupported(MICRO_OF_SECOND), true);
-        assertEquals(acc.isSupported(MILLI_OF_SECOND), true);
-        assertEquals(acc.getLong(SECOND_OF_DAY), 864L);
-        assertEquals(acc.getLong(NANO_OF_SECOND), 123456789L);
-        assertEquals(acc.getLong(MICRO_OF_SECOND), 123456L);
-        assertEquals(acc.getLong(MILLI_OF_SECOND), 123L);
+        assertEquals(true, acc.isSupported(SECOND_OF_DAY));
+        assertEquals(true, acc.isSupported(NANO_OF_SECOND));
+        assertEquals(true, acc.isSupported(MICRO_OF_SECOND));
+        assertEquals(true, acc.isSupported(MILLI_OF_SECOND));
+        assertEquals(864L, acc.getLong(SECOND_OF_DAY));
+        assertEquals(123456789L, acc.getLong(NANO_OF_SECOND));
+        assertEquals(123456L, acc.getLong(MICRO_OF_SECOND));
+        assertEquals(123L, acc.getLong(MILLI_OF_SECOND));
     }
 
     // SPEC: ChronoField.SECOND_OF_MINUTE
@@ -1235,14 +1255,14 @@ public class TCKDateTimeParseResolver {
         DateTimeFormatter fmt = new DateTimeFormatterBuilder()
             .appendValue(SECOND_OF_MINUTE).toFormatter();
         TemporalAccessor acc = fmt.parse("32");
-        assertEquals(acc.isSupported(SECOND_OF_MINUTE), true);
-        assertEquals(acc.isSupported(NANO_OF_SECOND), true);
-        assertEquals(acc.isSupported(MICRO_OF_SECOND), true);
-        assertEquals(acc.isSupported(MILLI_OF_SECOND), true);
-        assertEquals(acc.getLong(SECOND_OF_MINUTE), 32L);
-        assertEquals(acc.getLong(NANO_OF_SECOND), 0L);
-        assertEquals(acc.getLong(MICRO_OF_SECOND), 0L);
-        assertEquals(acc.getLong(MILLI_OF_SECOND), 0L);
+        assertEquals(true, acc.isSupported(SECOND_OF_MINUTE));
+        assertEquals(true, acc.isSupported(NANO_OF_SECOND));
+        assertEquals(true, acc.isSupported(MICRO_OF_SECOND));
+        assertEquals(true, acc.isSupported(MILLI_OF_SECOND));
+        assertEquals(32L, acc.getLong(SECOND_OF_MINUTE));
+        assertEquals(0L, acc.getLong(NANO_OF_SECOND));
+        assertEquals(0L, acc.getLong(MICRO_OF_SECOND));
+        assertEquals(0L, acc.getLong(MILLI_OF_SECOND));
     }
 
     @Test
@@ -1250,14 +1270,14 @@ public class TCKDateTimeParseResolver {
         DateTimeFormatter fmt = new DateTimeFormatterBuilder()
             .appendValue(SECOND_OF_MINUTE).appendLiteral('.').appendValue(NANO_OF_SECOND).toFormatter();
         TemporalAccessor acc = fmt.parse("32.123456789");
-        assertEquals(acc.isSupported(SECOND_OF_MINUTE), true);
-        assertEquals(acc.isSupported(NANO_OF_SECOND), true);
-        assertEquals(acc.isSupported(MICRO_OF_SECOND), true);
-        assertEquals(acc.isSupported(MILLI_OF_SECOND), true);
-        assertEquals(acc.getLong(SECOND_OF_MINUTE), 32L);
-        assertEquals(acc.getLong(NANO_OF_SECOND), 123456789L);
-        assertEquals(acc.getLong(MICRO_OF_SECOND), 123456L);
-        assertEquals(acc.getLong(MILLI_OF_SECOND), 123L);
+        assertEquals(true, acc.isSupported(SECOND_OF_MINUTE));
+        assertEquals(true, acc.isSupported(NANO_OF_SECOND));
+        assertEquals(true, acc.isSupported(MICRO_OF_SECOND));
+        assertEquals(true, acc.isSupported(MILLI_OF_SECOND));
+        assertEquals(32L, acc.getLong(SECOND_OF_MINUTE));
+        assertEquals(123456789L, acc.getLong(NANO_OF_SECOND));
+        assertEquals(123456L, acc.getLong(MICRO_OF_SECOND));
+        assertEquals(123L, acc.getLong(MILLI_OF_SECOND));
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/format/TCKDateTimeTextPrinting.java b/test/jdk/java/time/tck/java/time/format/TCKDateTimeTextPrinting.java
index b547a837fb8..71d0ed69731 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKDateTimeTextPrinting.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKDateTimeTextPrinting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,8 @@ package tck.java.time.format;
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
 import static java.time.temporal.ChronoField.DAY_OF_WEEK;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.LocalDateTime;
 import java.time.Month;
@@ -74,25 +75,26 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test text printing.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKDateTimeTextPrinting {
 
     private DateTimeFormatterBuilder builder;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         builder = new DateTimeFormatterBuilder();
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="printText")
     Object[][] data_text() {
         return new Object[][] {
             {DAY_OF_WEEK, TextStyle.FULL, 1, "Monday"},
@@ -135,23 +137,25 @@ public class TCKDateTimeTextPrinting {
        };
     }
 
-    @Test(dataProvider="printText")
+    @ParameterizedTest
+    @MethodSource("data_text")
     public void test_appendText2arg_format(TemporalField field, TextStyle style, int value, String expected) throws Exception {
         DateTimeFormatter f = builder.appendText(field, style).toFormatter(Locale.ENGLISH);
         LocalDateTime dt = LocalDateTime.of(2010, 1, 1, 0, 0);
         dt = dt.with(field, value);
         String text = f.format(dt);
-        assertEquals(text, expected);
+        assertEquals(expected, text);
     }
 
-    @Test(dataProvider="printText")
+    @ParameterizedTest
+    @MethodSource("data_text")
     public void test_appendText1arg_format(TemporalField field, TextStyle style, int value, String expected) throws Exception {
         if (style == TextStyle.FULL) {
             DateTimeFormatter f = builder.appendText(field).toFormatter(Locale.ENGLISH);
             LocalDateTime dt = LocalDateTime.of(2010, 1, 1, 0, 0);
             dt = dt.with(field, value);
             String text = f.format(dt);
-            assertEquals(text, expected);
+            assertEquals(expected, text);
         }
     }
 
@@ -175,7 +179,7 @@ public class TCKDateTimeTextPrinting {
         DateTimeFormatter f = builder.toFormatter();
         LocalDateTime dt = LocalDateTime.of(2010, 1, 1, 0, 0);
         for (Month month : Month.values()) {
-            assertEquals(f.format(dt.with(month)), map.get((long) month.getValue()));
+            assertEquals(map.get((long) month.getValue()), f.format(dt.with(month)));
         }
     }
 
@@ -188,9 +192,9 @@ public class TCKDateTimeTextPrinting {
         builder.appendText(DAY_OF_MONTH, map);
         DateTimeFormatter f = builder.toFormatter();
         LocalDateTime dt = LocalDateTime.of(2010, 1, 1, 0, 0);
-        assertEquals(f.format(dt.withDayOfMonth(1)), "1st");
-        assertEquals(f.format(dt.withDayOfMonth(2)), "2nd");
-        assertEquals(f.format(dt.withDayOfMonth(3)), "3rd");
+        assertEquals("1st", f.format(dt.withDayOfMonth(1)));
+        assertEquals("2nd", f.format(dt.withDayOfMonth(2)));
+        assertEquals("3rd", f.format(dt.withDayOfMonth(3)));
     }
 
     @Test
@@ -200,7 +204,7 @@ public class TCKDateTimeTextPrinting {
         builder.appendText(MONTH_OF_YEAR, map);
         DateTimeFormatter f = builder.toFormatter();
         LocalDateTime dt = LocalDateTime.of(2010, 2, 1, 0, 0);
-        assertEquals(f.format(dt), "2");
+        assertEquals("2", f.format(dt));
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/format/TCKDecimalStyle.java b/test/jdk/java/time/tck/java/time/format/TCKDecimalStyle.java
index f5a4321ad24..bd45c9a6d79 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKDecimalStyle.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKDecimalStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,71 +59,70 @@
  */
 package tck.java.time.format;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.format.DecimalStyle;
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.Set;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test DecimalStyle.
  */
-@Test
 public class TCKDecimalStyle {
 
     @Test
     public void test_getAvailableLocales() {
         Set<Locale> locales = DecimalStyle.getAvailableLocales();
-        assertEquals(locales.size() > 0, true, "locales: " + locales);
-        assertEquals(locales.contains(Locale.US), true, "Locale.US not found in available Locales");
+        assertEquals(true, locales.size() > 0, "locales: " + locales);
+        assertEquals(true, locales.contains(Locale.US), "Locale.US not found in available Locales");
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_of_Locale() {
         DecimalStyle loc1 = DecimalStyle.of(Locale.CANADA);
-        assertEquals(loc1.getZeroDigit(), '0');
-        assertEquals(loc1.getPositiveSign(), '+');
-        assertEquals(loc1.getNegativeSign(), '-');
-        assertEquals(loc1.getDecimalSeparator(), '.');
+        assertEquals('0', loc1.getZeroDigit());
+        assertEquals('+', loc1.getPositiveSign());
+        assertEquals('-', loc1.getNegativeSign());
+        assertEquals('.', loc1.getDecimalSeparator());
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_STANDARD() {
         DecimalStyle loc1 = DecimalStyle.STANDARD;
-        assertEquals(loc1.getZeroDigit(), '0');
-        assertEquals(loc1.getPositiveSign(), '+');
-        assertEquals(loc1.getNegativeSign(), '-');
-        assertEquals(loc1.getDecimalSeparator(), '.');
+        assertEquals('0', loc1.getZeroDigit());
+        assertEquals('+', loc1.getPositiveSign());
+        assertEquals('-', loc1.getNegativeSign());
+        assertEquals('.', loc1.getDecimalSeparator());
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_zeroDigit() {
         DecimalStyle base = DecimalStyle.STANDARD;
-        assertEquals(base.withZeroDigit('A').getZeroDigit(), 'A');
+        assertEquals('A', base.withZeroDigit('A').getZeroDigit());
     }
 
     @Test
     public void test_positiveSign() {
         DecimalStyle base = DecimalStyle.STANDARD;
-        assertEquals(base.withPositiveSign('A').getPositiveSign(), 'A');
+        assertEquals('A', base.withPositiveSign('A').getPositiveSign());
     }
 
     @Test
     public void test_negativeSign() {
         DecimalStyle base = DecimalStyle.STANDARD;
-        assertEquals(base.withNegativeSign('A').getNegativeSign(), 'A');
+        assertEquals('A', base.withNegativeSign('A').getNegativeSign());
     }
 
     @Test
     public void test_decimalSeparator() {
         DecimalStyle base = DecimalStyle.STANDARD;
-        assertEquals(base.withDecimalSeparator('A').getDecimalSeparator(), 'A');
+        assertEquals('A', base.withDecimalSeparator('A').getDecimalSeparator());
     }
 
     //-----------------------------------------------------------------------
@@ -166,46 +165,46 @@ public class TCKDecimalStyle {
     public void test_equalsHashCode1() {
         DecimalStyle a = DecimalStyle.STANDARD;
         DecimalStyle b = DecimalStyle.STANDARD;
-        assertEquals(a.equals(b), true);
-        assertEquals(b.equals(a), true);
-        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(true, a.equals(b));
+        assertEquals(true, b.equals(a));
+        assertEquals(b.hashCode(), a.hashCode());
     }
 
     @Test
     public void test_equalsHashCode2() {
         DecimalStyle a = DecimalStyle.STANDARD.withZeroDigit('A');
         DecimalStyle b = DecimalStyle.STANDARD.withZeroDigit('A');
-        assertEquals(a.equals(b), true);
-        assertEquals(b.equals(a), true);
-        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(true, a.equals(b));
+        assertEquals(true, b.equals(a));
+        assertEquals(b.hashCode(), a.hashCode());
     }
 
     @Test
     public void test_equalsHashCode3() {
         DecimalStyle a = DecimalStyle.STANDARD.withZeroDigit('A');
         DecimalStyle b = DecimalStyle.STANDARD.withDecimalSeparator('A');
-        assertEquals(a.equals(b), false);
-        assertEquals(b.equals(a), false);
+        assertEquals(false, a.equals(b));
+        assertEquals(false, b.equals(a));
     }
 
     @Test
     public void test_equalsHashCode_bad() {
         DecimalStyle a = DecimalStyle.STANDARD;
-        assertEquals(a.equals(""), false);
-        assertEquals(a.equals(null), false);
+        assertEquals(false, a.equals(""));
+        assertEquals(false, a.equals(null));
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_toString_base() {
         DecimalStyle base = DecimalStyle.STANDARD;
-        assertEquals(base.toString(), "DecimalStyle[0+-.]");
+        assertEquals("DecimalStyle[0+-.]", base.toString());
     }
 
     @Test
     public void test_toString_altered() {
         DecimalStyle base = DecimalStyle.of(Locale.US).withZeroDigit('A').withDecimalSeparator('@');
-        assertEquals(base.toString(), "DecimalStyle[A+-@]");
+        assertEquals("DecimalStyle[A+-@]", base.toString());
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/format/TCKFormatStyle.java b/test/jdk/java/time/tck/java/time/format/TCKFormatStyle.java
index d8a754b0271..5c9beae4048 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKFormatStyle.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKFormatStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,15 +64,16 @@ import java.time.format.FormatStyle;
 import java.time.temporal.Temporal;
 import java.util.Locale;
 
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKFormatStyle {
 
     private static final ZoneId ZONEID_PARIS = ZoneId.of("Europe/Paris");
@@ -84,11 +85,10 @@ public class TCKFormatStyle {
     @Test
     public void test_valueOf() {
         for (FormatStyle style : FormatStyle.values()) {
-            assertEquals(FormatStyle.valueOf(style.name()), style);
+            assertEquals(style, FormatStyle.valueOf(style.name()));
         }
     }
 
-    @DataProvider(name="formatStyle")
     Object[][] data_formatStyle() {
         return new Object[][] {
                 {ZonedDateTime.of(LocalDateTime.of(2001, 10, 2, 1, 2, 3), ZONEID_PARIS), FormatStyle.FULL, "Tuesday, October 2, 2001, 1:02:03\u202fAM Central European Summer Time Europe/Paris"},
@@ -103,11 +103,12 @@ public class TCKFormatStyle {
         };
     }
 
-    @Test(dataProvider = "formatStyle")
+    @ParameterizedTest
+    @MethodSource("data_formatStyle")
     public void test_formatStyle(Temporal temporal, FormatStyle style, String formattedStr) {
         DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder();
         DateTimeFormatter formatter = builder.appendLocalized(style, style).appendLiteral(" ").appendZoneOrOffsetId().toFormatter();
         formatter = formatter.withLocale(Locale.US);
-        assertEquals(formatter.format(temporal), formattedStr);
+        assertEquals(formattedStr, formatter.format(temporal));
     }
 }
diff --git a/test/jdk/java/time/tck/java/time/format/TCKInstantPrinterParser.java b/test/jdk/java/time/tck/java/time/format/TCKInstantPrinterParser.java
index 49b772bf82b..56034337646 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKInstantPrinterParser.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKInstantPrinterParser.java
@@ -59,10 +59,8 @@
  */
 package tck.java.time.format;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.time.DateTimeException;
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.Period;
@@ -73,8 +71,11 @@ import java.time.format.DateTimeParseException;
 import java.time.format.ResolverStyle;
 import java.time.temporal.TemporalAccessor;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -84,10 +85,9 @@ import org.testng.annotations.Test;
 /**
  * Test DateTimeFormatterBuilder.appendInstant().
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKInstantPrinterParser {
 
-    @DataProvider(name="printGrouped")
     Object[][] data_printGrouped() {
         return new Object[][] {
                 {0, 0, "1970-01-01T00:00:00Z"},
@@ -113,15 +113,15 @@ public class TCKInstantPrinterParser {
         };
     }
 
-    @Test(dataProvider="printGrouped")
+    @ParameterizedTest
+    @MethodSource("data_printGrouped")
     public void test_print_grouped(long instantSecs, int nano, String expected) {
         Instant instant = Instant.ofEpochSecond(instantSecs, nano);
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendInstant().toFormatter();
-        assertEquals(f.format(instant), expected);
+        assertEquals(expected, f.format(instant));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="printDigits")
     Object[][] data_printDigits() {
         return new Object[][] {
                 {-1, 0, 0, "1970-01-01T00:00:00Z"},
@@ -191,15 +191,15 @@ public class TCKInstantPrinterParser {
         };
     }
 
-    @Test(dataProvider="printDigits")
+    @ParameterizedTest
+    @MethodSource("data_printDigits")
     public void test_print_digits(int fractionalDigits, long instantSecs, int nano, String expected) {
         Instant instant = Instant.ofEpochSecond(instantSecs, nano);
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendInstant(fractionalDigits).toFormatter();
-        assertEquals(f.format(instant), expected);
+        assertEquals(expected, f.format(instant));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseDigits")
     Object[][] data_parse_digits() {
         return new Object[][] {
                 {0, 0, "1970-01-01T00:00:00Z"},
@@ -236,16 +236,16 @@ public class TCKInstantPrinterParser {
         };
     }
 
-    @Test(dataProvider="parseDigits")
+    @ParameterizedTest
+    @MethodSource("data_parse_digits")
     public void test_parse_digitsMinusOne(long instantSecs, int nano, String input) {
         Instant expected = Instant.ofEpochSecond(instantSecs, nano);
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendInstant(-1).toFormatter();
-        assertEquals(f.parse(input, Instant::from), expected);
-        assertEquals(f.parse(input).query(DateTimeFormatter.parsedExcessDays()), Period.ZERO);
-        assertEquals(f.parse(input).query(DateTimeFormatter.parsedLeapSecond()), Boolean.FALSE);
+        assertEquals(expected, f.parse(input, Instant::from));
+        assertEquals(Period.ZERO, f.parse(input).query(DateTimeFormatter.parsedExcessDays()));
+        assertEquals(Boolean.FALSE, f.parse(input).query(DateTimeFormatter.parsedLeapSecond()));
     }
 
-    @DataProvider(name="parseNineDigits")
     Object[][] data_parse_ninedigits() {
         return new Object[][] {
                 {0, 0, "1970-01-01T00:00:00.000000000Z"},
@@ -264,16 +264,16 @@ public class TCKInstantPrinterParser {
         };
     }
 
-    @Test(dataProvider="parseNineDigits")
+    @ParameterizedTest
+    @MethodSource("data_parse_ninedigits")
     public void test_parse_digitsNine(long instantSecs, int nano, String input) {
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendInstant(9).toFormatter();
         Instant expected = Instant.ofEpochSecond(instantSecs, nano);
-        assertEquals(f.parse(input, Instant::from), expected);
-        assertEquals(f.parse(input).query(DateTimeFormatter.parsedExcessDays()), Period.ZERO);
-        assertEquals(f.parse(input).query(DateTimeFormatter.parsedLeapSecond()), Boolean.FALSE);
+        assertEquals(expected, f.parse(input, Instant::from));
+        assertEquals(Period.ZERO, f.parse(input).query(DateTimeFormatter.parsedExcessDays()));
+        assertEquals(Boolean.FALSE, f.parse(input).query(DateTimeFormatter.parsedLeapSecond()));
     }
 
-    @DataProvider(name="parseMaxMinInstant")
     Object[][] data_parse_MaxMinInstant() {
         return new Object[][] {
                 {"+1000000000-12-31T23:59:59.999999999-01:00"},
@@ -281,10 +281,13 @@ public class TCKInstantPrinterParser {
         };
     }
 
-    @Test(dataProvider="parseMaxMinInstant", expectedExceptions=DateTimeParseException.class)
+    @ParameterizedTest
+    @MethodSource("data_parse_MaxMinInstant")
     public void test_invalid_Instant(String input) {
-        DateTimeFormatter f = new DateTimeFormatterBuilder().appendInstant(-1).toFormatter();
-        f.parse(input, Instant::from);
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            DateTimeFormatter f = new DateTimeFormatterBuilder().appendInstant(-1).toFormatter();
+            f.parse(input, Instant::from);
+        });
     }
 
     @Test
@@ -293,9 +296,9 @@ public class TCKInstantPrinterParser {
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendInstant(-1).toFormatter();
         for (ResolverStyle style : ResolverStyle.values()) {
             TemporalAccessor parsed = f.withResolverStyle(style).parse("1970-02-03T24:00:00Z");
-            assertEquals(parsed.query(Instant::from), expected);
-            assertEquals(parsed.query(DateTimeFormatter.parsedExcessDays()), Period.ZERO);
-            assertEquals(parsed.query(DateTimeFormatter.parsedLeapSecond()), Boolean.FALSE);
+            assertEquals(expected, parsed.query(Instant::from));
+            assertEquals(Period.ZERO, parsed.query(DateTimeFormatter.parsedExcessDays()));
+            assertEquals(Boolean.FALSE, parsed.query(DateTimeFormatter.parsedLeapSecond()));
         }
     }
 
@@ -305,9 +308,9 @@ public class TCKInstantPrinterParser {
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendInstant(-1).toFormatter();
         for (ResolverStyle style : ResolverStyle.values()) {
             TemporalAccessor parsed = f.withResolverStyle(style).parse("1970-02-03T23:59:60.123456789Z");
-            assertEquals(parsed.query(Instant::from), expected);
-            assertEquals(parsed.query(DateTimeFormatter.parsedExcessDays()), Period.ZERO);
-            assertEquals(parsed.query(DateTimeFormatter.parsedLeapSecond()), Boolean.TRUE);
+            assertEquals(expected, parsed.query(Instant::from));
+            assertEquals(Period.ZERO, parsed.query(DateTimeFormatter.parsedExcessDays()));
+            assertEquals(Boolean.TRUE, parsed.query(DateTimeFormatter.parsedLeapSecond()));
         }
     }
 
@@ -464,14 +467,14 @@ public class TCKInstantPrinterParser {
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendInstant_tooSmall() {
-        new DateTimeFormatterBuilder().appendInstant(-2);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> new DateTimeFormatterBuilder().appendInstant(-2));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendInstant_tooBig() {
-        new DateTimeFormatterBuilder().appendInstant(10);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> new DateTimeFormatterBuilder().appendInstant(10));
     }
 
     //------------------------------------------------------------------------
@@ -479,7 +482,7 @@ public class TCKInstantPrinterParser {
     public void test_equality() {
         Instant instant1 = Instant.parse("2018-09-12T22:15:51+05:30");
         Instant instant2 = Instant.parse("2018-09-12T16:45:51Z");
-        assertEquals(instant2, instant1);
+        assertEquals(instant1, instant2);
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/format/TCKLocalizedFieldParser.java b/test/jdk/java/time/tck/java/time/format/TCKLocalizedFieldParser.java
index 6286a1dd321..af1e48107bf 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKLocalizedFieldParser.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKLocalizedFieldParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,8 @@
 package tck.java.time.format;
 
 import static java.time.temporal.ChronoField.YEAR_OF_ERA;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.text.ParsePosition;
 import java.time.LocalDate;
@@ -72,21 +73,24 @@ import java.time.temporal.TemporalField;
 import java.time.temporal.WeekFields;
 import java.util.Locale;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import test.java.time.format.AbstractTestPrinterParser;
 
 /**
  * Test TCKLocalizedFieldParser.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKLocalizedFieldParser extends AbstractTestPrinterParser {
     public static final WeekFields WEEKDEF = WeekFields.of(Locale.US);
     public static final TemporalField WEEK_BASED_YEAR = WEEKDEF.weekBasedYear();
     public static final TemporalField WEEK_OF_WEEK_BASED_YEAR = WEEKDEF.weekOfWeekBasedYear();
     public static final TemporalField DAY_OF_WEEK = WEEKDEF.dayOfWeek();
     //-----------------------------------------------------------------------
-    @DataProvider(name="FieldPatterns")
     Object[][] provider_fieldPatterns() {
         return new Object[][] {
             {"e", "6", 0, 1, 6},
@@ -101,7 +105,8 @@ public class TCKLocalizedFieldParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="FieldPatterns")
+    @ParameterizedTest
+    @MethodSource("provider_fieldPatterns")
     public void test_parse_textField(String pattern, String text, int pos, int expectedPos, long expectedValue) {
         WeekFields weekDef = WeekFields.of(locale);
         TemporalField field = null;
@@ -128,16 +133,15 @@ public class TCKLocalizedFieldParser extends AbstractTestPrinterParser {
         DateTimeFormatter dtf = b.toFormatter(locale);
         TemporalAccessor parsed = dtf.parseUnresolved(text, ppos);
         if (ppos.getErrorIndex() != -1) {
-            assertEquals(ppos.getErrorIndex(), expectedPos);
+            assertEquals(expectedPos, ppos.getErrorIndex());
         } else {
-            assertEquals(ppos.getIndex(), expectedPos, "Incorrect ending parse position");
+            assertEquals(expectedPos, ppos.getIndex(), "Incorrect ending parse position");
             long value = parsed.getLong(field);
-            assertEquals(value, expectedValue, "Value incorrect for " + field);
+            assertEquals(expectedValue, value, "Value incorrect for " + field);
         }
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="LocalWeekMonthYearPatterns")
     Object[][] provider_patternLocalDate() {
         return new Object[][] {
             {"e W M y",  "1 1 1 2012", 0, 10, LocalDate.of(2012, 1, 1)},
@@ -153,28 +157,28 @@ public class TCKLocalizedFieldParser extends AbstractTestPrinterParser {
         };
     }
 
-   @Test(dataProvider="LocalWeekMonthYearPatterns")
+   @ParameterizedTest
+    @MethodSource("provider_patternLocalDate")
     public void test_parse_textLocalDate(String pattern, String text, int pos, int expectedPos, LocalDate expectedValue) {
         ParsePosition ppos = new ParsePosition(pos);
         DateTimeFormatterBuilder b = new DateTimeFormatterBuilder().appendPattern(pattern);
         DateTimeFormatter dtf = b.toFormatter(locale);
         TemporalAccessor parsed = dtf.parseUnresolved(text, ppos);
         if (ppos.getErrorIndex() != -1) {
-            assertEquals(ppos.getErrorIndex(), expectedPos);
+            assertEquals(expectedPos, ppos.getErrorIndex());
         } else {
-            assertEquals(ppos.getIndex(), expectedPos, "Incorrect ending parse position");
-            assertEquals(parsed.isSupported(YEAR_OF_ERA), true);
-            assertEquals(parsed.isSupported(WeekFields.of(locale).dayOfWeek()), true);
-            assertEquals(parsed.isSupported(WeekFields.of(locale).weekOfMonth()) ||
-                    parsed.isSupported(WeekFields.of(locale).weekOfYear()), true);
+            assertEquals(expectedPos, ppos.getIndex(), "Incorrect ending parse position");
+            assertEquals(true, parsed.isSupported(YEAR_OF_ERA));
+            assertEquals(true, parsed.isSupported(WeekFields.of(locale).dayOfWeek()));
+            assertEquals(true, parsed.isSupported(WeekFields.of(locale).weekOfMonth()) ||
+                    parsed.isSupported(WeekFields.of(locale).weekOfYear()));
             // ensure combination resolves into a date
             LocalDate result = LocalDate.parse(text, dtf);
-            assertEquals(result, expectedValue, "LocalDate incorrect for " + pattern);
+            assertEquals(expectedValue, result, "LocalDate incorrect for " + pattern);
         }
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="LocalWeekBasedYearPatterns")
     Object[][] provider_patternLocalWeekBasedYearDate() {
         return new Object[][] {
             //{"w Y",  "29 2012", 0, 7, LocalDate.of(2012, 7, 20)},  // Default lenient dayOfWeek not supported
@@ -190,28 +194,28 @@ public class TCKLocalizedFieldParser extends AbstractTestPrinterParser {
        };
     }
 
-   @Test(dataProvider="LocalWeekBasedYearPatterns")
+   @ParameterizedTest
+    @MethodSource("provider_patternLocalWeekBasedYearDate")
     public void test_parse_WeekBasedYear(String pattern, String text, int pos, int expectedPos, LocalDate expectedValue) {
         ParsePosition ppos = new ParsePosition(pos);
         DateTimeFormatterBuilder b = new DateTimeFormatterBuilder().appendPattern(pattern);
         DateTimeFormatter dtf = b.toFormatter(locale);
         TemporalAccessor parsed = dtf.parseUnresolved(text, ppos);
         if (ppos.getErrorIndex() != -1) {
-            assertEquals(ppos.getErrorIndex(), expectedPos);
+            assertEquals(expectedPos, ppos.getErrorIndex());
         } else {
             WeekFields weekDef = WeekFields.of(locale);
-            assertEquals(ppos.getIndex(), expectedPos, "Incorrect ending parse position");
-            assertEquals(parsed.isSupported(weekDef.dayOfWeek()), pattern.indexOf('e') >= 0);
-            assertEquals(parsed.isSupported(weekDef.weekOfWeekBasedYear()), pattern.indexOf('w') >= 0);
-            assertEquals(parsed.isSupported(weekDef.weekBasedYear()), pattern.indexOf('Y') >= 0);
+            assertEquals(expectedPos, ppos.getIndex(), "Incorrect ending parse position");
+            assertEquals(pattern.indexOf('e') >= 0, parsed.isSupported(weekDef.dayOfWeek()));
+            assertEquals(pattern.indexOf('w') >= 0, parsed.isSupported(weekDef.weekOfWeekBasedYear()));
+            assertEquals(pattern.indexOf('Y') >= 0, parsed.isSupported(weekDef.weekBasedYear()));
             // ensure combination resolves into a date
             LocalDate result = LocalDate.parse(text, dtf);
-            assertEquals(result, expectedValue, "LocalDate incorrect for " + pattern + ", weekDef: " + weekDef);
+            assertEquals(expectedValue, result, "LocalDate incorrect for " + pattern + ", weekDef: " + weekDef);
         }
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name = "adjacentValuePatterns1")
     Object[][] provider_adjacentValuePatterns1() {
         return new Object[][] {
                 {"YYww", WEEK_BASED_YEAR, WEEK_OF_WEEK_BASED_YEAR, "1612", 2016, 12},
@@ -219,18 +223,18 @@ public class TCKLocalizedFieldParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider = "adjacentValuePatterns1")
+    @ParameterizedTest
+    @MethodSource("provider_adjacentValuePatterns1")
     public void test_adjacentValuePatterns1(String pattern, TemporalField field1, TemporalField field2,
             String text, int expected1, int expected2) {
         DateTimeFormatter df = new DateTimeFormatterBuilder()
                 .appendPattern(pattern).toFormatter(Locale.US);
         ParsePosition ppos = new ParsePosition(0);
         TemporalAccessor parsed = df.parseUnresolved(text, ppos);
-        assertEquals(parsed.get(field1), expected1);
-        assertEquals(parsed.get(field2), expected2);
+        assertEquals(expected1, parsed.get(field1));
+        assertEquals(expected2, parsed.get(field2));
     }
 
-    @DataProvider(name = "adjacentValuePatterns2")
     Object[][] provider_adjacentValuePatterns2() {
         return new Object[][] {
                 {"YYYYwwc", WEEK_BASED_YEAR, WEEK_OF_WEEK_BASED_YEAR, DAY_OF_WEEK,
@@ -242,16 +246,17 @@ public class TCKLocalizedFieldParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider = "adjacentValuePatterns2")
+    @ParameterizedTest
+    @MethodSource("provider_adjacentValuePatterns2")
     public void test_adjacentValuePatterns2(String pattern, TemporalField field1, TemporalField field2,
             TemporalField field3, String text, int expected1, int expected2, int expected3) {
         DateTimeFormatter df = new DateTimeFormatterBuilder()
                 .appendPattern(pattern).toFormatter(Locale.US);
         ParsePosition ppos = new ParsePosition(0);
         TemporalAccessor parsed = df.parseUnresolved(text, ppos);
-        assertEquals(parsed.get(field1), expected1);
-        assertEquals(parsed.get(field2), expected2);
-        assertEquals(parsed.get(field3), expected3);
+        assertEquals(expected1, parsed.get(field1));
+        assertEquals(expected2, parsed.get(field2));
+        assertEquals(expected3, parsed.get(field3));
     }
 
     @Test
@@ -262,14 +267,13 @@ public class TCKLocalizedFieldParser extends AbstractTestPrinterParser {
                 .appendPattern(pattern).toFormatter(Locale.US);
         ParsePosition ppos = new ParsePosition(0);
         TemporalAccessor parsed = df.parseUnresolved(text, ppos);
-        assertEquals(parsed.get(DAY_OF_WEEK), 6);
-        assertEquals(parsed.get(WEEK_OF_WEEK_BASED_YEAR), 29);
+        assertEquals(6, parsed.get(DAY_OF_WEEK));
+        assertEquals(29, parsed.get(WEEK_OF_WEEK_BASED_YEAR));
         LocalDate result = LocalDate.parse(text, df);
         LocalDate expectedValue = LocalDate.of(2012, 07, 20);
-        assertEquals(result, expectedValue, "LocalDate incorrect for " + pattern);
+        assertEquals(expectedValue, result, "LocalDate incorrect for " + pattern);
     }
 
-    @DataProvider(name = "invalidPatterns")
     Object[][] provider_invalidPatterns() {
         return new Object[][] {
             {"W", "01"},
@@ -279,8 +283,9 @@ public class TCKLocalizedFieldParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider = "invalidPatterns", expectedExceptions = DateTimeParseException.class)
+    @ParameterizedTest
+    @MethodSource("provider_invalidPatterns")
     public void test_invalidPatterns(String pattern, String value) {
-        DateTimeFormatter.ofPattern(pattern).parse(value);
+        Assertions.assertThrows(DateTimeParseException.class, () -> DateTimeFormatter.ofPattern(pattern).parse(value));
     }
 }
diff --git a/test/jdk/java/time/tck/java/time/format/TCKLocalizedFieldPrinter.java b/test/jdk/java/time/tck/java/time/format/TCKLocalizedFieldPrinter.java
index 2b7d0f82ce4..8f9126f20ea 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKLocalizedFieldPrinter.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKLocalizedFieldPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,26 +59,26 @@
  */
 package tck.java.time.format;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.WeekFields;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import test.java.time.format.AbstractTestPrinterParser;
 
 /**
  * Test LocalizedFieldPrinterParser.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKLocalizedFieldPrinter extends AbstractTestPrinterParser {
 
         //-----------------------------------------------------------------------
-    @DataProvider(name="Patterns")
     Object[][] provider_pad() {
         return new Object[][] {
             {"e",  "6"},
@@ -92,18 +92,18 @@ public class TCKLocalizedFieldPrinter extends AbstractTestPrinterParser {
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="Patterns")
+    @ParameterizedTest
+    @MethodSource("provider_pad")
     public void test_localizedDayOfWeek(String pattern, String expected) {
         DateTimeFormatterBuilder b
                 = new DateTimeFormatterBuilder().appendPattern(pattern);
         LocalDate date = LocalDate.of(2012, 7, 20);
 
         String result = b.toFormatter(locale).format(date);
-        assertEquals(result, expected, "Wrong output for pattern '" + pattern + "'.");
+        assertEquals(expected, result, "Wrong output for pattern '" + pattern + "'.");
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="LocalWeekBasedYearPatterns")
     Object[][] provider_patternLocalWeekBasedYearDate() {
         return new Object[][] {
             {"e w Y",  "6 29 2012", LocalDate.of(2012, 7, 20)},
@@ -119,11 +119,12 @@ public class TCKLocalizedFieldPrinter extends AbstractTestPrinterParser {
        };
     }
 
-    @Test(dataProvider = "LocalWeekBasedYearPatterns")
+    @ParameterizedTest
+    @MethodSource("provider_patternLocalWeekBasedYearDate")
     public void test_print_WeekBasedYear(String pattern, String expectedText, LocalDate date) {
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern(pattern, locale);
         String result = dtf.format(date);
         WeekFields weekDef = WeekFields.of(locale);
-        assertEquals(result, expectedText, "Incorrect formatting for " + pattern + ", weekDef: " + weekDef);
+        assertEquals(expectedText, result, "Incorrect formatting for " + pattern + ", weekDef: " + weekDef);
     }
 }
diff --git a/test/jdk/java/time/tck/java/time/format/TCKLocalizedOffsetIdPrinterParser.java b/test/jdk/java/time/tck/java/time/format/TCKLocalizedOffsetIdPrinterParser.java
index d0a1f189e92..7f06c564896 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKLocalizedOffsetIdPrinterParser.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKLocalizedOffsetIdPrinterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,11 @@ import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test localized behavior of formatter.
  */
-@Test
 public class TCKLocalizedOffsetIdPrinterParser {
     @Test
     public void test_localized_offset_parse() {
diff --git a/test/jdk/java/time/tck/java/time/format/TCKLocalizedPrinterParser.java b/test/jdk/java/time/tck/java/time/format/TCKLocalizedPrinterParser.java
index bd9c79ddcf9..a831b44deec 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKLocalizedPrinterParser.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKLocalizedPrinterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@
  */
 package tck.java.time.format;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.text.DateFormat;
 import java.text.ParsePosition;
@@ -72,33 +72,35 @@ import java.time.temporal.TemporalAccessor;
 import java.util.Date;
 import java.util.Locale;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test localized behavior of formatter.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKLocalizedPrinterParser {
 
     private DateTimeFormatterBuilder builder;
     private ParsePosition pos;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         builder = new DateTimeFormatterBuilder();
         pos = new ParsePosition(0);
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_parse_negativePosition() {
-        builder.appendLocalized(null, null);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendLocalized(null, null));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="date")
     Object[][] data_date() {
         return new Object[][] {
                 {LocalDate.of(2012, 6, 30), FormatStyle.SHORT, DateFormat.SHORT, Locale.UK},
@@ -124,7 +126,8 @@ public class TCKLocalizedPrinterParser {
     }
 
     @SuppressWarnings("deprecation")
-    @Test(dataProvider="date")
+    @ParameterizedTest
+    @MethodSource("data_date")
     public void test_date_print(LocalDate date, FormatStyle dateStyle, int dateStyleOld, Locale locale) {
         DateFormat old = DateFormat.getDateInstance(dateStyleOld, locale);
         Date oldDate = new Date(date.getYear() - 1900, date.getMonthValue() - 1, date.getDayOfMonth());
@@ -132,11 +135,12 @@ public class TCKLocalizedPrinterParser {
 
         DateTimeFormatter f = builder.appendLocalized(dateStyle, null).toFormatter(locale);
         String formatted = f.format(date);
-        assertEquals(formatted, text);
+        assertEquals(text, formatted);
     }
 
     @SuppressWarnings("deprecation")
-    @Test(dataProvider="date")
+    @ParameterizedTest
+    @MethodSource("data_date")
     public void test_date_parse(LocalDate date, FormatStyle dateStyle, int dateStyleOld, Locale locale) {
         DateFormat old = DateFormat.getDateInstance(dateStyleOld, locale);
         Date oldDate = new Date(date.getYear() - 1900, date.getMonthValue() - 1, date.getDayOfMonth());
@@ -144,13 +148,12 @@ public class TCKLocalizedPrinterParser {
 
         DateTimeFormatter f = builder.appendLocalized(dateStyle, null).toFormatter(locale);
         TemporalAccessor parsed = f.parse(text, pos);
-        assertEquals(pos.getIndex(), text.length());
-        assertEquals(pos.getErrorIndex(), -1);
-        assertEquals(LocalDate.from(parsed), date);
+        assertEquals(text.length(), pos.getIndex());
+        assertEquals(-1, pos.getErrorIndex());
+        assertEquals(date, LocalDate.from(parsed));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="time")
     Object[][] data_time() {
         return new Object[][] {
                 {LocalTime.of(11, 30), FormatStyle.SHORT, DateFormat.SHORT, Locale.UK},
@@ -177,7 +180,8 @@ public class TCKLocalizedPrinterParser {
     }
 
     @SuppressWarnings("deprecation")
-    @Test(dataProvider="time")
+    @ParameterizedTest
+    @MethodSource("data_time")
     public void test_time_print(LocalTime time, FormatStyle timeStyle, int timeStyleOld, Locale locale) {
         DateFormat old = DateFormat.getTimeInstance(timeStyleOld, locale);
         Date oldDate = new Date(1970 - 1900, 0, 0, time.getHour(), time.getMinute(), time.getSecond());
@@ -185,11 +189,12 @@ public class TCKLocalizedPrinterParser {
 
         DateTimeFormatter f = builder.appendLocalized(null, timeStyle).toFormatter(locale);
         String formatted = f.format(time);
-        assertEquals(formatted, text);
+        assertEquals(text, formatted);
     }
 
     @SuppressWarnings("deprecation")
-    @Test(dataProvider="time")
+    @ParameterizedTest
+    @MethodSource("data_time")
     public void test_time_parse(LocalTime time, FormatStyle timeStyle, int timeStyleOld, Locale locale) {
         DateFormat old = DateFormat.getTimeInstance(timeStyleOld, locale);
         Date oldDate = new Date(1970 - 1900, 0, 0, time.getHour(), time.getMinute(), time.getSecond());
@@ -197,9 +202,9 @@ public class TCKLocalizedPrinterParser {
 
         DateTimeFormatter f = builder.appendLocalized(null, timeStyle).toFormatter(locale);
         TemporalAccessor parsed = f.parse(text, pos);
-        assertEquals(pos.getIndex(), text.length());
-        assertEquals(pos.getErrorIndex(), -1);
-        assertEquals(LocalTime.from(parsed), time);
+        assertEquals(text.length(), pos.getIndex());
+        assertEquals(-1, pos.getErrorIndex());
+        assertEquals(time, LocalTime.from(parsed));
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/format/TCKOffsetPrinterParser.java b/test/jdk/java/time/tck/java/time/format/TCKOffsetPrinterParser.java
index 21d618a06c0..b817d23bb5f 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKOffsetPrinterParser.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKOffsetPrinterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@
  */
 package tck.java.time.format;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
@@ -71,14 +71,17 @@ import java.time.format.DateTimeFormatterBuilder;
 import java.time.format.TextStyle;
 import java.util.Locale;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test DateTimeFormatterBuilder.appendOffset().
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKOffsetPrinterParser {
 
     private static final ZoneOffset OFFSET_UTC = ZoneOffset.UTC;
@@ -104,13 +107,12 @@ public class TCKOffsetPrinterParser {
     private static final ZoneOffset OFFSET_M112345 = ZoneOffset.ofHoursMinutesSeconds(-11, -23, -45);
     private DateTimeFormatterBuilder builder;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         builder = new DateTimeFormatterBuilder();
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="print")
     Object[][] data_print() {
         return new Object[][] {
                 {"+HH", "Z", DT_2012_06_30_12_30_40, OFFSET_UTC, "Z"},
@@ -441,7 +443,6 @@ public class TCKOffsetPrinterParser {
         };
     }
 
-    @DataProvider(name="print_localized")
     Object[][] data_print_localized() {
         return new Object[][] {
                 {TextStyle.FULL, DT_2012_06_30_12_30_40, OFFSET_UTC, "GMT"},
@@ -469,16 +470,18 @@ public class TCKOffsetPrinterParser {
         };
     }
 
-    @Test(dataProvider="print")
+    @ParameterizedTest
+    @MethodSource("data_print")
     public void test_print(String offsetPattern, String noOffset, LocalDateTime ldt, ZoneId zone, String expected) {
         ZonedDateTime zdt = ldt.atZone(zone);
         builder.appendOffset(offsetPattern, noOffset);
         String output = builder.toFormatter().format(zdt);
-        assertEquals(output, expected);
+        assertEquals(expected, output);
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="print")
+    @ParameterizedTest
+    @MethodSource("data_print")
     public void test_print_pattern_X(String offsetPattern, String noOffset, LocalDateTime ldt, ZoneId zone, String expected) {
         String pattern = null;
         if (offsetPattern.equals("+HHmm") && noOffset.equals("Z")) {
@@ -496,11 +499,12 @@ public class TCKOffsetPrinterParser {
             ZonedDateTime zdt = ldt.atZone(zone);
             builder.appendPattern(pattern);
             String output = builder.toFormatter().format(zdt);
-            assertEquals(output, expected);
+            assertEquals(expected, output);
         }
     }
 
-    @Test(dataProvider="print")
+    @ParameterizedTest
+    @MethodSource("data_print")
     public void test_print_pattern_x(String offsetPattern, String noOffset, LocalDateTime ldt, ZoneId zone, String expected) {
         String pattern = null;
         String zero = null;
@@ -524,117 +528,119 @@ public class TCKOffsetPrinterParser {
             ZonedDateTime zdt = ldt.atZone(zone);
             builder.appendPattern(pattern);
             String output = builder.toFormatter().format(zdt);
-            assertEquals(output, (expected.equals("Z") ? zero : expected));
+            assertEquals((expected.equals("Z") ? zero : expected), output);
         }
     }
 
-    @Test(dataProvider="print")
+    @ParameterizedTest
+    @MethodSource("data_print")
     public void test_print_pattern_Z(String offsetPattern, String noOffset, LocalDateTime ldt, ZoneId zone, String expected) {
         String pattern = null;
         if (offsetPattern.equals("+HHMM") && noOffset.equals("Z")) {
             ZonedDateTime zdt = ldt.atZone(zone);
             DateTimeFormatter f1 = new DateTimeFormatterBuilder().appendPattern("Z").toFormatter();
             String output1 = f1.format(zdt);
-            assertEquals(output1, (expected.equals("Z") ? "+0000" : expected));
+            assertEquals((expected.equals("Z") ? "+0000" : expected), output1);
 
             DateTimeFormatter f2 = new DateTimeFormatterBuilder().appendPattern("ZZ").toFormatter();
             String output2 = f2.format(zdt);
-            assertEquals(output2, (expected.equals("Z") ? "+0000" : expected));
+            assertEquals((expected.equals("Z") ? "+0000" : expected), output2);
 
             DateTimeFormatter f3 = new DateTimeFormatterBuilder().appendPattern("ZZZ").toFormatter();
             String output3 = f3.format(zdt);
-            assertEquals(output3, (expected.equals("Z") ? "+0000" : expected));
+            assertEquals((expected.equals("Z") ? "+0000" : expected), output3);
         } else if (offsetPattern.equals("+HH:MM:ss") && noOffset.equals("Z")) {
             ZonedDateTime zdt = ldt.atZone(zone);
             DateTimeFormatter f = new DateTimeFormatterBuilder().appendPattern("ZZZZZ").toFormatter();
             String output = f.format(zdt);
-            assertEquals(output, expected);
+            assertEquals(expected, output);
         }
     }
 
-    @Test(dataProvider="print_localized")
+    @ParameterizedTest
+    @MethodSource("data_print_localized")
     public void test_print_localized(TextStyle style, LocalDateTime ldt, ZoneOffset offset, String expected) {
         OffsetDateTime odt = OffsetDateTime.of(ldt, offset);
         ZonedDateTime zdt = ldt.atZone(offset);
 
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendLocalizedOffset(style)
                                                             .toFormatter(Locale.US);
-        assertEquals(f.format(odt), expected);
-        assertEquals(f.format(zdt), expected);
-        assertEquals(f.parse(expected, ZoneOffset::from), offset);
+        assertEquals(expected, f.format(odt));
+        assertEquals(expected, f.format(zdt));
+        assertEquals(offset, f.parse(expected, ZoneOffset::from));
 
         if (style == TextStyle.FULL) {
             f = new DateTimeFormatterBuilder().appendPattern("ZZZZ")
                                               .toFormatter(Locale.US);
-            assertEquals(f.format(odt), expected);
-            assertEquals(f.format(zdt), expected);
-            assertEquals(f.parse(expected, ZoneOffset::from), offset);
+            assertEquals(expected, f.format(odt));
+            assertEquals(expected, f.format(zdt));
+            assertEquals(offset, f.parse(expected, ZoneOffset::from));
 
             f = new DateTimeFormatterBuilder().appendPattern("OOOO")
                                               .toFormatter(Locale.US);
-            assertEquals(f.format(odt), expected);
-            assertEquals(f.format(zdt), expected);
-            assertEquals(f.parse(expected, ZoneOffset::from), offset);
+            assertEquals(expected, f.format(odt));
+            assertEquals(expected, f.format(zdt));
+            assertEquals(offset, f.parse(expected, ZoneOffset::from));
         }
 
         if (style == TextStyle.SHORT) {
             f = new DateTimeFormatterBuilder().appendPattern("O")
                                               .toFormatter(Locale.US);
-            assertEquals(f.format(odt), expected);
-            assertEquals(f.format(zdt), expected);
-            assertEquals(f.parse(expected, ZoneOffset::from), offset);
+            assertEquals(expected, f.format(odt));
+            assertEquals(expected, f.format(zdt));
+            assertEquals(offset, f.parse(expected, ZoneOffset::from));
         }
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_print_pattern_X6rejected() {
-        builder.appendPattern("XXXXXX");
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendPattern("XXXXXX"));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_print_pattern_x6rejected() {
-        builder.appendPattern("xxxxxx");
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendPattern("xxxxxx"));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_print_pattern_Z6rejected() {
-        builder.appendPattern("ZZZZZZ");
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendPattern("ZZZZZZ"));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_print_pattern_O2rejected() {
-        builder.appendPattern("OO");
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendPattern("OO"));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_print_pattern_O3rejected() {
-        builder.appendPattern("OOO");
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendPattern("OOO"));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_print_pattern_O5rejected() {
-        builder.appendPattern("OOOOO");
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendPattern("OOOOO"));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_print_pattern_localzed_full_standline() {
-        builder.appendLocalizedOffset(TextStyle.FULL_STANDALONE);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendLocalizedOffset(TextStyle.FULL_STANDALONE));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_print_pattern_localzed_short_standalone() {
-        builder.appendLocalizedOffset(TextStyle.SHORT_STANDALONE);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendLocalizedOffset(TextStyle.SHORT_STANDALONE));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_print_pattern_localzed_narrow() {
-        builder.appendLocalizedOffset(TextStyle.NARROW);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendLocalizedOffset(TextStyle.NARROW));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_print_pattern_localzed_narrow_standalone() {
-        builder.appendLocalizedOffset(TextStyle.NARROW_STANDALONE);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendLocalizedOffset(TextStyle.NARROW_STANDALONE));
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/format/TCKPadPrinterParser.java b/test/jdk/java/time/tck/java/time/format/TCKPadPrinterParser.java
index d6641f65e63..c92cd5a4d43 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKPadPrinterParser.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKPadPrinterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,48 +61,55 @@ package tck.java.time.format;
 
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.text.ParsePosition;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.format.SignStyle;
 import java.time.temporal.TemporalAccessor;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test padding behavior of formatter.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKPadPrinterParser {
 
     private DateTimeFormatterBuilder builder;
     private ParsePosition pos;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         builder = new DateTimeFormatterBuilder();
         pos = new ParsePosition(0);
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=IndexOutOfBoundsException.class)
+    @Test
     public void test_parse_negativePosition() {
-        builder.padNext(3, '-').appendLiteral('Z');
-        builder.toFormatter().parseUnresolved("--Z", new ParsePosition(-1));
+        Assertions.assertThrows(IndexOutOfBoundsException.class, () -> {
+            builder.padNext(3, '-').appendLiteral('Z');
+            builder.toFormatter().parseUnresolved("--Z", new ParsePosition(-1));
+        });
     }
 
-    @Test(expectedExceptions=IndexOutOfBoundsException.class)
+    @Test
     public void test_parse_offEndPosition() {
-        builder.padNext(3, '-').appendLiteral('Z');
-        builder.toFormatter().parseUnresolved("--Z", new ParsePosition(4));
+        Assertions.assertThrows(IndexOutOfBoundsException.class, () -> {
+            builder.padNext(3, '-').appendLiteral('Z');
+            builder.toFormatter().parseUnresolved("--Z", new ParsePosition(4));
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseStrict")
     Object[][] data_parseStrict() {
         return new Object[][] {
                 {"222", 3, -1, 222},
@@ -126,22 +133,22 @@ public class TCKPadPrinterParser {
         };
     }
 
-    @Test(dataProvider="parseStrict")
+    @ParameterizedTest
+    @MethodSource("data_parseStrict")
     public void test_parseStrict(String text, int expectedIndex, int expectedErrorIndex, Number expectedMonth) {
         builder.padNext(3, '#').appendValue(MONTH_OF_YEAR, 1, 3, SignStyle.NORMAL);
         TemporalAccessor parsed = builder.toFormatter().parseUnresolved(text, pos);
-        assertEquals(pos.getIndex(), expectedIndex);
-        assertEquals(pos.getErrorIndex(), expectedErrorIndex);
+        assertEquals(expectedIndex, pos.getIndex());
+        assertEquals(expectedErrorIndex, pos.getErrorIndex());
         if (expectedMonth != null) {
-            assertEquals(parsed.isSupported(MONTH_OF_YEAR), true);
-            assertEquals(parsed.getLong(MONTH_OF_YEAR), expectedMonth.longValue());
+            assertEquals(true, parsed.isSupported(MONTH_OF_YEAR));
+            assertEquals(expectedMonth.longValue(), parsed.getLong(MONTH_OF_YEAR));
         } else {
-            assertEquals(parsed, null);
+            assertEquals(null, parsed);
         }
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseLenient")
     Object[][] data_parseLenient() {
         return new Object[][] {
                 {"222", 3, -1, 222},
@@ -167,17 +174,18 @@ public class TCKPadPrinterParser {
         };
     }
 
-    @Test(dataProvider="parseLenient")
+    @ParameterizedTest
+    @MethodSource("data_parseLenient")
     public void test_parseLenient(String text, int expectedIndex, int expectedErrorIndex, Number expectedMonth) {
         builder.parseLenient().padNext(3, '#').appendValue(MONTH_OF_YEAR, 1, 3, SignStyle.NORMAL);
         TemporalAccessor parsed = builder.toFormatter().parseUnresolved(text, pos);
-        assertEquals(pos.getIndex(), expectedIndex);
-        assertEquals(pos.getErrorIndex(), expectedErrorIndex);
+        assertEquals(expectedIndex, pos.getIndex());
+        assertEquals(expectedErrorIndex, pos.getErrorIndex());
         if (expectedMonth != null) {
-            assertEquals(parsed.isSupported(MONTH_OF_YEAR), true);
-            assertEquals(parsed.getLong(MONTH_OF_YEAR), expectedMonth.longValue());
+            assertEquals(true, parsed.isSupported(MONTH_OF_YEAR));
+            assertEquals(expectedMonth.longValue(), parsed.getLong(MONTH_OF_YEAR));
         } else {
-            assertEquals(parsed, null);
+            assertEquals(null, parsed);
         }
     }
 
@@ -186,19 +194,19 @@ public class TCKPadPrinterParser {
     public void test_parse_decoratedStartsWithPad() {
         builder.padNext(8, '-').appendLiteral("-HELLO-");
         TemporalAccessor parsed = builder.toFormatter().parseUnresolved("--HELLO-", pos);
-        assertEquals(pos.getIndex(), 0);
-        assertEquals(pos.getErrorIndex(), 2);
-        assertEquals(parsed, null);
+        assertEquals(0, pos.getIndex());
+        assertEquals(2, pos.getErrorIndex());
+        assertEquals(null, parsed);
     }
 
     @Test
     public void test_parse_decoratedStartsWithPad_number() {
         builder.padNext(3, '-').appendValue(MONTH_OF_YEAR, 1, 2, SignStyle.NORMAL);
         TemporalAccessor parsed = builder.toFormatter().parseUnresolved("--2", pos);
-        assertEquals(pos.getIndex(), 3);
-        assertEquals(pos.getErrorIndex(), -1);
-        assertEquals(parsed.isSupported(MONTH_OF_YEAR), true);
-        assertEquals(parsed.getLong(MONTH_OF_YEAR), 2L);  // +2, not -2
+        assertEquals(3, pos.getIndex());
+        assertEquals(-1, pos.getErrorIndex());
+        assertEquals(true, parsed.isSupported(MONTH_OF_YEAR));
+        assertEquals(2L, parsed.getLong(MONTH_OF_YEAR));  // +2, not -2
     }
 
     //-----------------------------------------------------------------------
@@ -206,8 +214,8 @@ public class TCKPadPrinterParser {
     public void test_parse_decoratedEmpty_strict() {
         builder.padNext(4, '-').optionalStart().appendValue(DAY_OF_MONTH).optionalEnd();
         TemporalAccessor parsed = builder.toFormatter().parseUnresolved("----", pos);
-        assertEquals(pos.getIndex(), 4);
-        assertEquals(pos.getErrorIndex(), -1);
+        assertEquals(4, pos.getIndex());
+        assertEquals(-1, pos.getErrorIndex());
         assertNotNull(parsed);
     }
 
@@ -215,8 +223,8 @@ public class TCKPadPrinterParser {
     public void test_parse_decoratedEmpty_lenient() {
         builder.parseLenient().padNext(4, '-').optionalStart().appendValue(DAY_OF_MONTH).optionalEnd();
         TemporalAccessor parsed = builder.toFormatter().parseUnresolved("----", pos);
-        assertEquals(pos.getIndex(), 4);
-        assertEquals(pos.getErrorIndex(), -1);
+        assertEquals(4, pos.getIndex());
+        assertEquals(-1, pos.getErrorIndex());
         assertNotNull(parsed);
     }
 
diff --git a/test/jdk/java/time/tck/java/time/format/TCKResolverStyle.java b/test/jdk/java/time/tck/java/time/format/TCKResolverStyle.java
index c2b2e6266c6..114ec073167 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKResolverStyle.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKResolverStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,17 +64,18 @@ import java.time.format.ResolverStyle;
 import java.time.temporal.ChronoField;
 import java.time.temporal.TemporalAccessor;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKResolverStyle {
 
     //-----------------------------------------------------------------------
@@ -83,11 +84,10 @@ public class TCKResolverStyle {
     @Test
     public void test_valueOf() {
         for (ResolverStyle style : ResolverStyle.values()) {
-            assertEquals(ResolverStyle.valueOf(style.name()), style);
+            assertEquals(style, ResolverStyle.valueOf(style.name()));
         }
     }
 
-    @DataProvider(name="resolverStyle")
     Object[][] data_resolverStyle() {
         return new Object[][] {
                 {"2000/15/30", ResolverStyle.LENIENT, null, 2001, 3, 30},
@@ -104,7 +104,8 @@ public class TCKResolverStyle {
         };
     }
 
-    @Test(dataProvider = "resolverStyle")
+    @ParameterizedTest
+    @MethodSource("data_resolverStyle")
     public void test_resolverStyle(String str, ResolverStyle style, Class<?> expectedEx, int year, int month, int day) {
         DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder();
         builder.appendValue(ChronoField.YEAR_OF_ERA);
@@ -122,9 +123,9 @@ public class TCKResolverStyle {
         formatter = formatter.withResolverStyle(style);
         if (expectedEx == null) {
             TemporalAccessor accessor = formatter.parse(str);
-            assertEquals(accessor.get(ChronoField.YEAR_OF_ERA), year);
-            assertEquals(accessor.get(ChronoField.MONTH_OF_YEAR), month);
-            assertEquals(accessor.get(ChronoField.DAY_OF_MONTH), day);
+            assertEquals(year, accessor.get(ChronoField.YEAR_OF_ERA));
+            assertEquals(month, accessor.get(ChronoField.MONTH_OF_YEAR));
+            assertEquals(day, accessor.get(ChronoField.DAY_OF_MONTH));
         } else {
             try {
                 formatter.parse(str);
diff --git a/test/jdk/java/time/tck/java/time/format/TCKSignStyle.java b/test/jdk/java/time/tck/java/time/format/TCKSignStyle.java
index 602e8f70d42..c649f8de7d0 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKSignStyle.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKSignStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,17 +62,18 @@ import java.time.format.DateTimeFormatterBuilder;
 import java.time.format.SignStyle;
 import java.time.temporal.ChronoField;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKSignStyle {
 
     //-----------------------------------------------------------------------
@@ -81,11 +82,10 @@ public class TCKSignStyle {
     @Test
     public void test_valueOf() {
         for (SignStyle style : SignStyle.values()) {
-            assertEquals(SignStyle.valueOf(style.name()), style);
+            assertEquals(style, SignStyle.valueOf(style.name()));
         }
     }
 
-    @DataProvider(name="signStyle")
     Object[][] data_signStyle() {
         return new Object[][] {
                 {LocalDate.of(0, 10, 2), SignStyle.ALWAYS, null, "+00"},
@@ -113,7 +113,8 @@ public class TCKSignStyle {
         };
     }
 
-    @Test(dataProvider = "signStyle")
+    @ParameterizedTest
+    @MethodSource("data_signStyle")
     public void test_signStyle(LocalDate localDate, SignStyle style, Class<?> expectedEx, String expectedStr) {
         DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder();
         DateTimeFormatter formatter = builder.appendValue(ChronoField.YEAR, 2, 4, style)
@@ -121,7 +122,7 @@ public class TCKSignStyle {
         formatter = formatter.withZone(ZoneOffset.UTC);
         if (expectedEx == null) {
             String output = formatter.format(localDate);
-            assertEquals(output, expectedStr);
+            assertEquals(expectedStr, output);
         } else {
             try {
                 formatter.format(localDate);
diff --git a/test/jdk/java/time/tck/java/time/format/TCKTextStyle.java b/test/jdk/java/time/tck/java/time/format/TCKTextStyle.java
index 68da619751a..e358f7b7a6f 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKTextStyle.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKTextStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,28 +59,27 @@
  */
 package tck.java.time.format;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.format.TextStyle;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test DecimalStyle.
  */
-@Test
 public class TCKTextStyle {
 
     @Test
     public void test_standaloneNormal() {
-        assertEquals(TextStyle.FULL, TextStyle.FULL_STANDALONE.asNormal());
-        assertEquals(TextStyle.SHORT, TextStyle.SHORT.asNormal());
-        assertEquals(TextStyle.NARROW, TextStyle.NARROW.asNormal());
+        assertEquals(TextStyle.FULL_STANDALONE.asNormal(), TextStyle.FULL);
+        assertEquals(TextStyle.SHORT.asNormal(), TextStyle.SHORT);
+        assertEquals(TextStyle.NARROW.asNormal(), TextStyle.NARROW);
 
-        assertEquals(TextStyle.FULL_STANDALONE, TextStyle.FULL_STANDALONE.asStandalone());
-        assertEquals(TextStyle.SHORT_STANDALONE, TextStyle.SHORT.asStandalone());
-        assertEquals(TextStyle.NARROW_STANDALONE, TextStyle.NARROW.asStandalone());
+        assertEquals(TextStyle.FULL_STANDALONE.asStandalone(), TextStyle.FULL_STANDALONE);
+        assertEquals(TextStyle.SHORT.asStandalone(), TextStyle.SHORT_STANDALONE);
+        assertEquals(TextStyle.NARROW.asStandalone(), TextStyle.NARROW_STANDALONE);
 
         assertTrue(TextStyle.FULL_STANDALONE.isStandalone());
         assertTrue(TextStyle.SHORT_STANDALONE.isStandalone());
@@ -97,7 +96,7 @@ public class TCKTextStyle {
     @Test
     public void test_valueOf() {
         for (TextStyle style : TextStyle.values()) {
-            assertEquals(TextStyle.valueOf(style.name()), style);
+            assertEquals(style, TextStyle.valueOf(style.name()));
         }
     }
 
diff --git a/test/jdk/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java b/test/jdk/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java
index c1656885c07..9c2690891ee 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,30 +59,29 @@
  */
 package tck.java.time.format;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.text.ParsePosition;
-import java.time.DateTimeException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalQueries;
 import java.util.Locale;
-import java.util.Objects;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test DateTimeFormatterBuilder.appendZoneId().
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKZoneIdPrinterParser {
 
     private static final ZoneOffset OFFSET_UTC = ZoneOffset.UTC;
@@ -94,14 +93,13 @@ public class TCKZoneIdPrinterParser {
     private DateTimeFormatterBuilder builder;
     private ParsePosition pos;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         builder = new DateTimeFormatterBuilder();
         pos = new ParsePosition(0);
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="print")
     Object[][] data_print() {
         return new Object[][] {
                 {DT_2012_06_30_12_30_40, EUROPE_PARIS, "Europe/Paris"},
@@ -111,45 +109,46 @@ public class TCKZoneIdPrinterParser {
         };
     }
 
-    @Test(dataProvider="print")
+    @ParameterizedTest
+    @MethodSource("data_print")
     public void test_print(LocalDateTime ldt, ZoneId zone, String expected) {
         ZonedDateTime zdt = ldt.atZone(zone);
         builder.appendZoneId();
         String output = builder.toFormatter().format(zdt);
-        assertEquals(output, expected);
+        assertEquals(expected, output);
     }
 
-    @Test(dataProvider="print")
+    @ParameterizedTest
+    @MethodSource("data_print")
     public void test_print_pattern_VV(LocalDateTime ldt, ZoneId zone, String expected) {
         ZonedDateTime zdt = ldt.atZone(zone);
         builder.appendPattern("VV");
         String output = builder.toFormatter().format(zdt);
-        assertEquals(output, expected);
+        assertEquals(expected, output);
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_print_pattern_V1rejected() {
-        builder.appendPattern("V");
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendPattern("V"));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_print_pattern_V3rejected() {
-        builder.appendPattern("VVV");
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendPattern("VVV"));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_print_pattern_V4rejected() {
-        builder.appendPattern("VVVV");
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendPattern("VVVV"));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_print_pattern_V5rejected() {
-        builder.appendPattern("VVVVV");
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendPattern("VVVVV"));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseSuccess")
     Object[][] data_parseSuccess() {
         return new Object[][] {
                 {"Z", 1, -1, ZoneId.of("Z"), true},
@@ -208,7 +207,8 @@ public class TCKZoneIdPrinterParser {
         };
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_parseSuccess")
     public void test_ZoneId_parseSuccess_plain(
         String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset)
     {
@@ -216,7 +216,8 @@ public class TCKZoneIdPrinterParser {
         test(text, expectedIndex, expectedErrorIndex, expected, isZoneOffset);
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_parseSuccess")
     public void test_ZoneId_parseSuccess_prefix(
         String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset)
     {
@@ -228,7 +229,8 @@ public class TCKZoneIdPrinterParser {
              expected, isZoneOffset);
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_parseSuccess")
     public void test_ZoneId_parseSuccess_suffix(
         String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset)
     {
@@ -236,7 +238,8 @@ public class TCKZoneIdPrinterParser {
         test(text + "XXX", expectedIndex, expectedErrorIndex, expected, isZoneOffset);
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_parseSuccess")
     public void test_ZoneId_parseSuccess_caseSensitive(
         String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset)
     {
@@ -245,15 +248,16 @@ public class TCKZoneIdPrinterParser {
         if (text.matches("[^A-Z]*[A-Z].*")) {  // if input has letters
             String lcText = text.toLowerCase(Locale.ENGLISH);
             TemporalAccessor parsed = builder.toFormatter().parseUnresolved(lcText, pos);
-            assertEquals(pos.getErrorIndex() >= 0, true);
-            assertEquals(pos.getIndex(), 0);
-            assertEquals(parsed, null);
+            assertEquals(true, pos.getErrorIndex() >= 0);
+            assertEquals(0, pos.getIndex());
+            assertEquals(null, parsed);
         } else {
             test(text.toLowerCase(Locale.ENGLISH), expectedIndex, expectedErrorIndex, expected, isZoneOffset);
         }
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_parseSuccess")
     public void test_ZoneId_parseSuccess_caseInsensitive(
         String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset)
     {
@@ -261,7 +265,8 @@ public class TCKZoneIdPrinterParser {
         test(text.toLowerCase(Locale.ENGLISH), expectedIndex, expectedErrorIndex, expected, isZoneOffset);
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_parseSuccess")
     public void test_ZoneOrOffsetId_parseSuccess_plain(
         String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset)
     {
@@ -269,7 +274,8 @@ public class TCKZoneIdPrinterParser {
         test(text, expectedIndex, expectedErrorIndex, expected, isZoneOffset);
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_parseSuccess")
     public void test_ZoneOrOffsetId_parseSuccess_prefix(
         String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset)
     {
@@ -281,7 +287,8 @@ public class TCKZoneIdPrinterParser {
              expected, isZoneOffset);
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_parseSuccess")
     public void test_ZoneOrOffsetId_parseSuccess_suffix(
         String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset)
     {
@@ -289,7 +296,8 @@ public class TCKZoneIdPrinterParser {
         test(text + "XXX", expectedIndex, expectedErrorIndex, expected, isZoneOffset);
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_parseSuccess")
     public void test_ZoneOrOffsetId_parseSuccess_caseSensitive(
         String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset)
     {
@@ -297,15 +305,16 @@ public class TCKZoneIdPrinterParser {
         if (text.matches("[^A-Z]*[A-Z].*")) {  // if input has letters
             String lcText = text.toLowerCase(Locale.ENGLISH);
             TemporalAccessor parsed = builder.toFormatter().parseUnresolved(lcText, pos);
-            assertEquals(pos.getErrorIndex() >= 0, true);
-            assertEquals(pos.getIndex(), 0);
-            assertEquals(parsed, null);
+            assertEquals(true, pos.getErrorIndex() >= 0);
+            assertEquals(0, pos.getIndex());
+            assertEquals(null, parsed);
         } else {
             test(text.toLowerCase(Locale.ENGLISH), expectedIndex, expectedErrorIndex, expected, isZoneOffset);
         }
     }
 
-    @Test(dataProvider="parseSuccess")
+    @ParameterizedTest
+    @MethodSource("data_parseSuccess")
     public void test_ZoneOrOffsetIdparseSuccess_caseInsensitive(
         String text, int expectedIndex, int expectedErrorIndex, ZoneId expected, boolean isZoneOffset)
     {
@@ -316,20 +325,17 @@ public class TCKZoneIdPrinterParser {
     private void test(String text, int expectedIndex, int expectedErrorIndex, ZoneId expected,
                       boolean isZoneOffset) {
         TemporalAccessor parsed = builder.toFormatter().parseUnresolved(text, pos);
-        assertEquals(pos.getErrorIndex(), expectedErrorIndex, "Incorrect error index parsing: " + text);
-        assertEquals(pos.getIndex(), expectedIndex, "Incorrect index parsing: " + text);
+        assertEquals(expectedErrorIndex, pos.getErrorIndex(), "Incorrect error index parsing: " + text);
+        assertEquals(expectedIndex, pos.getIndex(), "Incorrect index parsing: " + text);
         if (expected != null) {
-            assertEquals(parsed.query(TemporalQueries.zoneId()),
-                         expected,
+            assertEquals(expected, parsed.query(TemporalQueries.zoneId()),
                          "Incorrect zoneId parsing: " + text);
-            assertEquals(parsed.query(TemporalQueries.offset()),
-                         isZoneOffset ? expected : null,
+            assertEquals(isZoneOffset ? expected : null, parsed.query(TemporalQueries.offset()),
                          "Incorrect offset parsing: " + text);
-            assertEquals(parsed.query(TemporalQueries.zone()),
-                         expected,
+            assertEquals(expected, parsed.query(TemporalQueries.zone()),
                          "Incorrect zone parsing: " + text);
         } else {
-            assertEquals(parsed, null);
+            assertEquals(null, parsed);
         }
     }
 
diff --git a/test/jdk/java/time/tck/java/time/serial/TCKClockSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKClockSerialization.java
index d3ef560fb3f..6fcfe70478f 100644
--- a/test/jdk/java/time/tck/java/time/serial/TCKClockSerialization.java
+++ b/test/jdk/java/time/tck/java/time/serial/TCKClockSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,14 +69,13 @@ import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import tck.java.time.AbstractTCKTest;
 
 /**
  * Test system and offset clocks serialization.
  */
-@Test
 public class TCKClockSerialization extends AbstractTCKTest {
 
     private static final ZoneId MOSCOW = ZoneId.of("Europe/Moscow");
@@ -87,6 +86,7 @@ public class TCKClockSerialization extends AbstractTCKTest {
     private static final Instant INSTANT = ZDT.toInstant();
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_systemClockSerializable() throws IOException, ClassNotFoundException {
         assertSerializable(Clock.systemUTC());
         assertSerializable(Clock.systemDefaultZone());
@@ -94,11 +94,13 @@ public class TCKClockSerialization extends AbstractTCKTest {
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_offsetClockSerializable() throws IOException, ClassNotFoundException {
         assertSerializable(Clock.offset(Clock.system(PARIS), AMOUNT));
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_tickClockSerializable() throws IOException, ClassNotFoundException {
         assertSerializable(Clock.tickSeconds(PARIS));
         assertSerializable(Clock.tickMinutes(MOSCOW));
@@ -106,6 +108,7 @@ public class TCKClockSerialization extends AbstractTCKTest {
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_fixedClockSerializable() throws IOException, ClassNotFoundException {
         assertSerializable(Clock.fixed(INSTANT, ZoneOffset.UTC));
         assertSerializable(Clock.fixed(INSTANT, PARIS));
diff --git a/test/jdk/java/time/tck/java/time/serial/TCKDurationSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKDurationSerialization.java
index b2251181572..0c491d6558f 100644
--- a/test/jdk/java/time/tck/java/time/serial/TCKDurationSerialization.java
+++ b/test/jdk/java/time/tck/java/time/serial/TCKDurationSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,9 +59,8 @@
  */
 package tck.java.time.serial;
 
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.testng.annotations.Test;
 import tck.java.time.AbstractTCKTest;
 
 import java.io.ByteArrayOutputStream;
@@ -69,10 +68,11 @@ import java.io.DataOutputStream;
 import java.io.Serializable;
 import java.time.Duration;
 
+import org.junit.jupiter.api.Test;
+
 /**
  * Test Duration serialization.
  */
-@Test
 public class TCKDurationSerialization extends AbstractTCKTest {
 
     //-----------------------------------------------------------------------
diff --git a/test/jdk/java/time/tck/java/time/serial/TCKInstantSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKInstantSerialization.java
index bb4eb47c8dd..ef5da109afb 100644
--- a/test/jdk/java/time/tck/java/time/serial/TCKInstantSerialization.java
+++ b/test/jdk/java/time/tck/java/time/serial/TCKInstantSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,18 +59,17 @@
  */
 package tck.java.time.serial;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
 import tck.java.time.AbstractTCKTest;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.time.Instant;
 
+import org.junit.jupiter.api.Test;
+
 /**
  * Test Instant serialization.
  */
-@Test
 public class TCKInstantSerialization extends AbstractTCKTest {
 
     //-----------------------------------------------------------------------
diff --git a/test/jdk/java/time/tck/java/time/serial/TCKLocalDateSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKLocalDateSerialization.java
index 7a82822944b..cd2d9e1a924 100644
--- a/test/jdk/java/time/tck/java/time/serial/TCKLocalDateSerialization.java
+++ b/test/jdk/java/time/tck/java/time/serial/TCKLocalDateSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,23 +59,23 @@
  */
 package tck.java.time.serial;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
 import tck.java.time.AbstractTCKTest;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.time.LocalDate;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 /**
  * Test LocalDate serialization.
  */
-@Test
 public class TCKLocalDateSerialization extends AbstractTCKTest {
 
     private LocalDate TEST_2007_07_15;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_2007_07_15 = LocalDate.of(2007, 7, 15);
     }
diff --git a/test/jdk/java/time/tck/java/time/serial/TCKLocalDateTimeSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKLocalDateTimeSerialization.java
index c2078913808..88b1e4a40cc 100644
--- a/test/jdk/java/time/tck/java/time/serial/TCKLocalDateTimeSerialization.java
+++ b/test/jdk/java/time/tck/java/time/serial/TCKLocalDateTimeSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,17 +59,17 @@
  */
 package tck.java.time.serial;
 
-import org.testng.annotations.Test;
 import tck.java.time.AbstractTCKTest;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.time.LocalDateTime;
 
+import org.junit.jupiter.api.Test;
+
 /**
  * Test serialization of LocalDateTime.
  */
-@Test
 public class TCKLocalDateTimeSerialization extends AbstractTCKTest {
 
     private LocalDateTime TEST_2007_07_15_12_30_40_987654321 = LocalDateTime.of(2007, 7, 15, 12, 30, 40, 987654321);
diff --git a/test/jdk/java/time/tck/java/time/serial/TCKLocalTimeSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKLocalTimeSerialization.java
index f03eb070233..a62a41ab4a8 100644
--- a/test/jdk/java/time/tck/java/time/serial/TCKLocalTimeSerialization.java
+++ b/test/jdk/java/time/tck/java/time/serial/TCKLocalTimeSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,25 +59,25 @@
  */
 package tck.java.time.serial;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
 import tck.java.time.AbstractTCKTest;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.time.LocalTime;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 /**
  * Test LocalTime serialization.
  */
-@Test
 public class TCKLocalTimeSerialization extends AbstractTCKTest {
 
 
     private LocalTime TEST_12_30_40_987654321;
 
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_12_30_40_987654321 = LocalTime.of(12, 30, 40, 987654321);
     }
diff --git a/test/jdk/java/time/tck/java/time/serial/TCKMonthDaySerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKMonthDaySerialization.java
index fff7ff5afa3..74519b73889 100644
--- a/test/jdk/java/time/tck/java/time/serial/TCKMonthDaySerialization.java
+++ b/test/jdk/java/time/tck/java/time/serial/TCKMonthDaySerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,6 @@
  */
 package tck.java.time.serial;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
 import tck.java.time.AbstractTCKTest;
 
 import java.io.ByteArrayOutputStream;
@@ -68,15 +66,17 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.time.MonthDay;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 /**
  * Test MonthDay serialization.
  */
-@Test
 public class TCKMonthDaySerialization extends AbstractTCKTest {
 
     private MonthDay TEST_07_15;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_07_15 = MonthDay.of(7, 15);
     }
diff --git a/test/jdk/java/time/tck/java/time/serial/TCKOffsetDateTimeSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKOffsetDateTimeSerialization.java
index 1f08bd08fc0..4e9b61249dd 100644
--- a/test/jdk/java/time/tck/java/time/serial/TCKOffsetDateTimeSerialization.java
+++ b/test/jdk/java/time/tck/java/time/serial/TCKOffsetDateTimeSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,20 +66,20 @@ import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import tck.java.time.AbstractTCKTest;
 
 /**
  * Test OffsetDateTime serialization.
  */
-@Test
 public class TCKOffsetDateTimeSerialization extends AbstractTCKTest {
 
     private static final ZoneOffset OFFSET_PONE = ZoneOffset.ofHours(1);
     private OffsetDateTime TEST_2008_6_30_11_30_59_000000500;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_2008_6_30_11_30_59_000000500 = OffsetDateTime.of(2008, 6, 30, 11, 30, 59, 500, OFFSET_PONE);
     }
diff --git a/test/jdk/java/time/tck/java/time/serial/TCKOffsetTimeSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKOffsetTimeSerialization.java
index 2052da6ac2e..a4cacfd3ed4 100644
--- a/test/jdk/java/time/tck/java/time/serial/TCKOffsetTimeSerialization.java
+++ b/test/jdk/java/time/tck/java/time/serial/TCKOffsetTimeSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,6 @@
  */
 package tck.java.time.serial;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
 import tck.java.time.AbstractTCKTest;
 
 import java.io.ByteArrayOutputStream;
@@ -68,16 +66,18 @@ import java.io.DataOutputStream;
 import java.time.OffsetTime;
 import java.time.ZoneOffset;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 /**
  * Test OffsetTime serialization.
  */
-@Test
 public class TCKOffsetTimeSerialization extends AbstractTCKTest {
 
     private static final ZoneOffset OFFSET_PONE = ZoneOffset.ofHours(1);
     private OffsetTime TEST_11_30_59_500_PONE;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_11_30_59_500_PONE = OffsetTime.of(11, 30, 59, 500, OFFSET_PONE);
     }
diff --git a/test/jdk/java/time/tck/java/time/serial/TCKPeriodSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKPeriodSerialization.java
index df1c6785567..abb8634f944 100644
--- a/test/jdk/java/time/tck/java/time/serial/TCKPeriodSerialization.java
+++ b/test/jdk/java/time/tck/java/time/serial/TCKPeriodSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,15 +59,15 @@
  */
 package tck.java.time.serial;
 
-import org.testng.annotations.Test;
 import tck.java.time.AbstractTCKTest;
 
 import java.time.Period;
 
+import org.junit.jupiter.api.Test;
+
 /**
  * Test serialization of Period.
  */
-@Test
 public class TCKPeriodSerialization extends AbstractTCKTest {
 
     //-----------------------------------------------------------------------
diff --git a/test/jdk/java/time/tck/java/time/serial/TCKYearMonthSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKYearMonthSerialization.java
index 677aee4655f..e3bfb7aea05 100644
--- a/test/jdk/java/time/tck/java/time/serial/TCKYearMonthSerialization.java
+++ b/test/jdk/java/time/tck/java/time/serial/TCKYearMonthSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,6 @@
  */
 package tck.java.time.serial;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
 import tck.java.time.AbstractTCKTest;
 
 import java.io.ByteArrayOutputStream;
@@ -68,15 +66,17 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.time.YearMonth;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 /**
  * Test serialization of YearMonth.
  */
-@Test
 public class TCKYearMonthSerialization extends AbstractTCKTest {
 
     private YearMonth TEST_2008_06;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_2008_06 = YearMonth.of(2008, 6);
     }
diff --git a/test/jdk/java/time/tck/java/time/serial/TCKYearSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKYearSerialization.java
index 4167e35eb18..db7ea5b3e99 100644
--- a/test/jdk/java/time/tck/java/time/serial/TCKYearSerialization.java
+++ b/test/jdk/java/time/tck/java/time/serial/TCKYearSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,17 +59,17 @@
  */
 package tck.java.time.serial;
 
-import org.testng.annotations.Test;
 import tck.java.time.AbstractTCKTest;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.time.Year;
 
+import org.junit.jupiter.api.Test;
+
 /**
  * Test Year serialization.
  */
-@Test
 public class TCKYearSerialization extends AbstractTCKTest {
 
     //-----------------------------------------------------------------------
diff --git a/test/jdk/java/time/tck/java/time/serial/TCKZoneIdSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKZoneIdSerialization.java
index 34c79c396e1..3f3d2e8d80f 100644
--- a/test/jdk/java/time/tck/java/time/serial/TCKZoneIdSerialization.java
+++ b/test/jdk/java/time/tck/java/time/serial/TCKZoneIdSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,6 @@
  */
 package tck.java.time.serial;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import tck.java.time.AbstractTCKTest;
 
 import java.io.ByteArrayInputStream;
@@ -72,13 +70,18 @@ import java.time.DateTimeException;
 import java.time.ZoneId;
 import java.time.zone.ZoneRulesException;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test serialization of ZoneId.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKZoneIdSerialization extends AbstractTCKTest {
 
     //-----------------------------------------------------------------------
@@ -105,11 +108,11 @@ public class TCKZoneIdSerialization extends AbstractTCKTest {
         String id = "QWERTYUIOPASDFGHJKLZXCVBNM~/._+-";
         ZoneId deser = deserialize(id);
         // getId, equals, hashCode, toString and normalized are OK
-        assertEquals(deser.getId(), id);
-        assertEquals(deser.toString(), id);
+        assertEquals(id, deser.getId());
+        assertEquals(id, deser.toString());
         assertEquals(deser, deser);
         assertEquals(deser.hashCode(), deser.hashCode());
-        assertEquals(deser.normalized(), deser);
+        assertEquals(deser, deser.normalized());
         // getting the rules is not
         try {
             deser.getRules();
@@ -119,39 +122,45 @@ public class TCKZoneIdSerialization extends AbstractTCKTest {
         }
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_deserialization_lenient_badCharacters() throws Exception {
-        // an ID can be loaded without validation during deserialization
-        // but there is a check to ensure the ID format is valid
-        deserialize("|!?");
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            // an ID can be loaded without validation during deserialization
+            // but there is a check to ensure the ID format is valid
+            deserialize("|!?");
+        });
     }
 
-    @Test(dataProvider="offsetBasedValid")
+    @ParameterizedTest
+    @MethodSource("data_offsetBasedValid")
     public void test_deserialization_lenient_offsetNotAllowed_noPrefix(String input, String resolvedId) throws Exception {
         ZoneId deserialized = deserialize(input);
-        assertEquals(deserialized, ZoneId.of(input));
-        assertEquals(deserialized, ZoneId.of(resolvedId));
+        assertEquals(ZoneId.of(input), deserialized);
+        assertEquals(ZoneId.of(resolvedId), deserialized);
     }
 
-    @Test(dataProvider="offsetBasedValidPrefix")
+    @ParameterizedTest
+    @MethodSource("data_offsetBasedValidPrefix")
     public void test_deserialization_lenient_offsetNotAllowed_prefixUTC(String input, String resolvedId, String offsetId) throws Exception {
         ZoneId deserialized = deserialize("UTC" + input);
-        assertEquals(deserialized, ZoneId.of("UTC" + input));
-        assertEquals(deserialized, ZoneId.of("UTC" + resolvedId));
+        assertEquals(ZoneId.of("UTC" + input), deserialized);
+        assertEquals(ZoneId.of("UTC" + resolvedId), deserialized);
     }
 
-    @Test(dataProvider="offsetBasedValidPrefix")
+    @ParameterizedTest
+    @MethodSource("data_offsetBasedValidPrefix")
     public void test_deserialization_lenient_offsetNotAllowed_prefixGMT(String input, String resolvedId, String offsetId) throws Exception {
         ZoneId deserialized = deserialize("GMT" + input);
-        assertEquals(deserialized, ZoneId.of("GMT" + input));
-        assertEquals(deserialized, ZoneId.of("GMT" + resolvedId));
+        assertEquals(ZoneId.of("GMT" + input), deserialized);
+        assertEquals(ZoneId.of("GMT" + resolvedId), deserialized);
     }
 
-    @Test(dataProvider="offsetBasedValidPrefix")
+    @ParameterizedTest
+    @MethodSource("data_offsetBasedValidPrefix")
     public void test_deserialization_lenient_offsetNotAllowed_prefixUT(String input, String resolvedId, String offsetId) throws Exception {
         ZoneId deserialized = deserialize("UT" + input);
-        assertEquals(deserialized, ZoneId.of("UT" + input));
-        assertEquals(deserialized, ZoneId.of("UT" + resolvedId));
+        assertEquals(ZoneId.of("UT" + input), deserialized);
+        assertEquals(ZoneId.of("UT" + resolvedId), deserialized);
     }
 
     private ZoneId deserialize(String id) throws Exception {
@@ -186,7 +195,6 @@ public class TCKZoneIdSerialization extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     // regular factory and .normalized()
     //-----------------------------------------------------------------------
-    @DataProvider(name="offsetBasedValid")
     Object[][] data_offsetBasedValid() {
         return new Object[][] {
                 {"Z", "Z"},
@@ -223,7 +231,6 @@ public class TCKZoneIdSerialization extends AbstractTCKTest {
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="offsetBasedValidPrefix")
     Object[][] data_offsetBasedValidPrefix() {
         return new Object[][] {
                 {"", "", "Z"},
diff --git a/test/jdk/java/time/tck/java/time/serial/TCKZoneOffsetSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKZoneOffsetSerialization.java
index c2795c6b00b..2240d592284 100644
--- a/test/jdk/java/time/tck/java/time/serial/TCKZoneOffsetSerialization.java
+++ b/test/jdk/java/time/tck/java/time/serial/TCKZoneOffsetSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,17 +59,17 @@
  */
 package tck.java.time.serial;
 
-import org.testng.annotations.Test;
 import tck.java.time.AbstractTCKTest;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.time.ZoneOffset;
 
+import org.junit.jupiter.api.Test;
+
 /**
  * Test serialization of ZoneOffset.
  */
-@Test
 public class TCKZoneOffsetSerialization extends AbstractTCKTest {
 
 
diff --git a/test/jdk/java/time/tck/java/time/serial/TCKZonedDateTimeSerialization.java b/test/jdk/java/time/tck/java/time/serial/TCKZonedDateTimeSerialization.java
index 8200103cd62..f9a423fb653 100644
--- a/test/jdk/java/time/tck/java/time/serial/TCKZonedDateTimeSerialization.java
+++ b/test/jdk/java/time/tck/java/time/serial/TCKZonedDateTimeSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,6 @@
  */
 package tck.java.time.serial;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
 import tck.java.time.AbstractTCKTest;
 
 import java.io.ByteArrayOutputStream;
@@ -71,10 +69,12 @@ import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 /**
  * Test serialization of ZonedDateTime.
  */
-@Test
 public class TCKZonedDateTimeSerialization extends AbstractTCKTest {
 
     private static final ZoneOffset OFFSET_0100 = ZoneOffset.ofHours(1);
@@ -84,7 +84,7 @@ public class TCKZonedDateTimeSerialization extends AbstractTCKTest {
     private ZonedDateTime TEST_DATE_TIME;
 
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_LOCAL_2008_06_30_11_30_59_500 = LocalDateTime.of(2008, 6, 30, 11, 30, 59, 500);
         TEST_DATE_TIME = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, ZONE_0100);
diff --git a/test/jdk/java/time/tck/java/time/temporal/TCKChronoField.java b/test/jdk/java/time/tck/java/time/temporal/TCKChronoField.java
index efc63b192b6..e9d41dbf116 100644
--- a/test/jdk/java/time/tck/java/time/temporal/TCKChronoField.java
+++ b/test/jdk/java/time/tck/java/time/temporal/TCKChronoField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,9 +93,8 @@ import static java.time.temporal.ChronoUnit.NANOS;
 import static java.time.temporal.ChronoUnit.SECONDS;
 import static java.time.temporal.ChronoUnit.WEEKS;
 import static java.time.temporal.ChronoUnit.YEARS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.Instant;
 import java.time.LocalDate;
@@ -106,19 +105,20 @@ import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.ValueRange;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKChronoField {
 
     //-----------------------------------------------------------------------
     // getBaseUnit() and getRangeUnit()
     //-----------------------------------------------------------------------
-    @DataProvider(name="fieldUnit")
     Object[][] data_fieldUnit() {
         return new Object[][] {
                 {YEAR, YEARS, FOREVER},
@@ -141,16 +141,16 @@ public class TCKChronoField {
         };
     }
 
-    @Test(dataProvider = "fieldUnit")
+    @ParameterizedTest
+    @MethodSource("data_fieldUnit")
     public void test_getBaseUnit(ChronoField field, ChronoUnit baseUnit, ChronoUnit rangeUnit) {
-        assertEquals(field.getBaseUnit(), baseUnit);
-        assertEquals(field.getRangeUnit(), rangeUnit);
+        assertEquals(baseUnit, field.getBaseUnit());
+        assertEquals(rangeUnit, field.getRangeUnit());
     }
 
     //-----------------------------------------------------------------------
     // isDateBased() and isTimeBased()
     //-----------------------------------------------------------------------
-    @DataProvider(name="fieldBased")
     Object[][] data_fieldBased() {
         return new Object[][] {
                 {DAY_OF_WEEK, true, false},
@@ -185,16 +185,16 @@ public class TCKChronoField {
         };
     }
 
-    @Test(dataProvider = "fieldBased")
+    @ParameterizedTest
+    @MethodSource("data_fieldBased")
     public void test_isDateBased(ChronoField field, boolean isDateBased, boolean isTimeBased) {
-        assertEquals(field.isDateBased(), isDateBased);
-        assertEquals(field.isTimeBased(), isTimeBased);
+        assertEquals(isDateBased, field.isDateBased());
+        assertEquals(isTimeBased, field.isTimeBased());
     }
 
     //-----------------------------------------------------------------------
     // isSupportedBy(TemporalAccessor temporal) and getFrom(TemporalAccessor temporal)
     //-----------------------------------------------------------------------
-    @DataProvider(name="fieldAndAccessor")
     Object[][] data_fieldAndAccessor() {
         return new Object[][] {
                 {YEAR, LocalDate.of(2000, 2, 29), true, 2000},
@@ -235,11 +235,12 @@ public class TCKChronoField {
         };
     }
 
-    @Test(dataProvider = "fieldAndAccessor")
+    @ParameterizedTest
+    @MethodSource("data_fieldAndAccessor")
     public void test_supportedAccessor(ChronoField field, TemporalAccessor accessor, boolean isSupported, long value) {
-        assertEquals(field.isSupportedBy(accessor), isSupported);
+        assertEquals(isSupported, field.isSupportedBy(accessor));
         if (isSupported) {
-            assertEquals(field.getFrom(accessor), value);
+            assertEquals(value, field.getFrom(accessor));
         }
     }
 
@@ -248,11 +249,11 @@ public class TCKChronoField {
     //-----------------------------------------------------------------------
     @Test
     public void test_range() {
-        assertEquals(MONTH_OF_YEAR.range(), ValueRange.of(1, 12));
-        assertEquals(MONTH_OF_YEAR.rangeRefinedBy(LocalDate.of(2000, 2, 29)), ValueRange.of(1, 12));
+        assertEquals(ValueRange.of(1, 12), MONTH_OF_YEAR.range());
+        assertEquals(ValueRange.of(1, 12), MONTH_OF_YEAR.rangeRefinedBy(LocalDate.of(2000, 2, 29)));
 
-        assertEquals(DAY_OF_MONTH.range(), ValueRange.of(1, 28, 31));
-        assertEquals(DAY_OF_MONTH.rangeRefinedBy(LocalDate.of(2000, 2, 29)), ValueRange.of(1, 29));
+        assertEquals(ValueRange.of(1, 28, 31), DAY_OF_MONTH.range());
+        assertEquals(ValueRange.of(1, 29), DAY_OF_MONTH.rangeRefinedBy(LocalDate.of(2000, 2, 29)));
     }
 
     //-----------------------------------------------------------------------
@@ -261,7 +262,7 @@ public class TCKChronoField {
     @Test
     public void test_valueOf() {
         for (ChronoField field : ChronoField.values()) {
-            assertEquals(ChronoField.valueOf(field.name()), field);
+            assertEquals(field, ChronoField.valueOf(field.name()));
         }
     }
 
@@ -269,9 +270,7 @@ public class TCKChronoField {
     // matches the minimum and maximum supported epoch second by Instant.
     @Test
     public void testMinMaxInstantSeconds() {
-        assertEquals(ChronoField.INSTANT_SECONDS.range().getMinimum(),
-                Instant.MIN.getLong(ChronoField.INSTANT_SECONDS));
-        assertEquals(ChronoField.INSTANT_SECONDS.range().getMaximum(),
-                Instant.MAX.getLong(ChronoField.INSTANT_SECONDS));
+        assertEquals(Instant.MIN.getLong(ChronoField.INSTANT_SECONDS), ChronoField.INSTANT_SECONDS.range().getMinimum());
+        assertEquals(Instant.MAX.getLong(ChronoField.INSTANT_SECONDS), ChronoField.INSTANT_SECONDS.range().getMaximum());
     }
 }
diff --git a/test/jdk/java/time/tck/java/time/temporal/TCKChronoUnit.java b/test/jdk/java/time/tck/java/time/temporal/TCKChronoUnit.java
index 5e52e23bb00..604dbb8cd23 100644
--- a/test/jdk/java/time/tck/java/time/temporal/TCKChronoUnit.java
+++ b/test/jdk/java/time/tck/java/time/temporal/TCKChronoUnit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,30 +70,28 @@ import static java.time.temporal.ChronoUnit.NANOS;
 import static java.time.temporal.ChronoUnit.SECONDS;
 import static java.time.temporal.ChronoUnit.WEEKS;
 import static java.time.temporal.ChronoUnit.YEARS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.LocalDate;
 import java.time.LocalTime;
-import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.Temporal;
-import java.time.temporal.TemporalAccessor;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKChronoUnit {
 
     //-----------------------------------------------------------------------
     // isDateBased(), isTimeBased() and isDurationEstimated()
     //-----------------------------------------------------------------------
-    @DataProvider(name="chronoUnit")
     Object[][] data_chronoUnit() {
         return new Object[][] {
                 {FOREVER, false, false, true},
@@ -117,17 +115,17 @@ public class TCKChronoUnit {
         };
     }
 
-    @Test(dataProvider = "chronoUnit")
+    @ParameterizedTest
+    @MethodSource("data_chronoUnit")
     public void test_unitType(ChronoUnit unit, boolean isDateBased, boolean isTimeBased, boolean isDurationEstimated) {
-        assertEquals(unit.isDateBased(), isDateBased);
-        assertEquals(unit.isTimeBased(), isTimeBased);
-        assertEquals(unit.isDurationEstimated(), isDurationEstimated);
+        assertEquals(isDateBased, unit.isDateBased());
+        assertEquals(isTimeBased, unit.isTimeBased());
+        assertEquals(isDurationEstimated, unit.isDurationEstimated());
     }
 
     //-----------------------------------------------------------------------
     // isSupportedBy(), addTo() and between()
     //-----------------------------------------------------------------------
-    @DataProvider(name="unitAndTemporal")
     Object[][] data_unitAndTemporal() {
         return new Object[][] {
                 {CENTURIES, LocalDate.of(2000, 1, 10), true, 1, LocalDate.of(2100, 1, 10)},
@@ -163,13 +161,14 @@ public class TCKChronoUnit {
         };
     }
 
-    @Test(dataProvider = "unitAndTemporal")
+    @ParameterizedTest
+    @MethodSource("data_unitAndTemporal")
     public void test_unitAndTemporal(ChronoUnit unit, Temporal base, boolean isSupportedBy, long amount,  Temporal target) {
-        assertEquals(unit.isSupportedBy(base), isSupportedBy);
+        assertEquals(isSupportedBy, unit.isSupportedBy(base));
         if (isSupportedBy) {
             Temporal result = unit.addTo(base, amount);
-            assertEquals(result, target);
-            assertEquals(unit.between(base, result), amount);
+            assertEquals(target, result);
+            assertEquals(amount, unit.between(base, result));
         }
     }
 
@@ -179,7 +178,7 @@ public class TCKChronoUnit {
     @Test
     public void test_valueOf() {
         for (ChronoUnit unit : ChronoUnit.values()) {
-            assertEquals(ChronoUnit.valueOf(unit.name()), unit);
+            assertEquals(unit, ChronoUnit.valueOf(unit.name()));
         }
     }
 }
diff --git a/test/jdk/java/time/tck/java/time/temporal/TCKIsoFields.java b/test/jdk/java/time/tck/java/time/temporal/TCKIsoFields.java
index 386af016248..e1a5cfba496 100644
--- a/test/jdk/java/time/tck/java/time/temporal/TCKIsoFields.java
+++ b/test/jdk/java/time/tck/java/time/temporal/TCKIsoFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,8 +63,9 @@ import static java.time.DayOfWeek.TUESDAY;
 import static java.time.DayOfWeek.WEDNESDAY;
 import static java.time.temporal.ChronoField.DAY_OF_WEEK;
 import static java.time.temporal.ChronoField.YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
@@ -80,16 +81,18 @@ import java.time.temporal.TemporalField;
 import java.time.temporal.UnsupportedTemporalTypeException;
 import java.time.temporal.ValueRange;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKIsoFields {
 
-    @DataProvider(name="quarter")
     Object[][] data_quarter() {
         return new Object[][] {
                 {LocalDate.of(1969, 12, 29), 90, 4},
@@ -121,35 +124,40 @@ public class TCKIsoFields {
     //-----------------------------------------------------------------------
     // DAY_OF_QUARTER
     //-----------------------------------------------------------------------
-    @Test(dataProvider = "quarter")
+    @ParameterizedTest
+    @MethodSource("data_quarter")
     public void test_DOQ(LocalDate date, int doq, int qoy) {
-        assertEquals(IsoFields.DAY_OF_QUARTER.getFrom(date), doq);
-        assertEquals(date.get(IsoFields.DAY_OF_QUARTER), doq);
+        assertEquals(doq, IsoFields.DAY_OF_QUARTER.getFrom(date));
+        assertEquals(doq, date.get(IsoFields.DAY_OF_QUARTER));
     }
 
+    @Test
     public void test_DOQ_basics() {
-        assertEquals(IsoFields.DAY_OF_QUARTER.isDateBased(), true);
-        assertEquals(IsoFields.DAY_OF_QUARTER.isTimeBased(), false);
+        assertEquals(true, IsoFields.DAY_OF_QUARTER.isDateBased());
+        assertEquals(false, IsoFields.DAY_OF_QUARTER.isTimeBased());
     }
 
     //-----------------------------------------------------------------------
     // QUARTER_OF_YEAR
     //-----------------------------------------------------------------------
-    @Test(dataProvider = "quarter")
+    @ParameterizedTest
+    @MethodSource("data_quarter")
     public void test_QOY(LocalDate date, int doq, int qoy) {
-        assertEquals(IsoFields.QUARTER_OF_YEAR.getFrom(date), qoy);
-        assertEquals(date.get(IsoFields.QUARTER_OF_YEAR), qoy);
+        assertEquals(qoy, IsoFields.QUARTER_OF_YEAR.getFrom(date));
+        assertEquals(qoy, date.get(IsoFields.QUARTER_OF_YEAR));
     }
 
+    @Test
     public void test_QOY_basics() {
-        assertEquals(IsoFields.QUARTER_OF_YEAR.isDateBased(), true);
-        assertEquals(IsoFields.QUARTER_OF_YEAR.isTimeBased(), false);
+        assertEquals(true, IsoFields.QUARTER_OF_YEAR.isDateBased());
+        assertEquals(false, IsoFields.QUARTER_OF_YEAR.isTimeBased());
     }
 
     //-----------------------------------------------------------------------
     // parse quarters
     //-----------------------------------------------------------------------
-    @Test(dataProvider = "quarter")
+    @ParameterizedTest
+    @MethodSource("data_quarter")
     public void test_parse_quarters(LocalDate date, int doq, int qoy) {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
                 .appendValue(YEAR).appendLiteral('-')
@@ -157,10 +165,11 @@ public class TCKIsoFields {
                 .appendValue(IsoFields.DAY_OF_QUARTER)
                 .toFormatter().withResolverStyle(ResolverStyle.STRICT);
         LocalDate parsed = LocalDate.parse(date.getYear() + "-" + qoy + "-" + doq, f);
-        assertEquals(parsed, date);
+        assertEquals(date, parsed);
     }
 
-    @Test(dataProvider = "quarter")
+    @ParameterizedTest
+    @MethodSource("data_quarter")
     public void test_parse_quarters_SMART(LocalDate date, int doq, int qoy) {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
                 .appendValue(YEAR).appendLiteral('-')
@@ -168,10 +177,11 @@ public class TCKIsoFields {
                 .appendValue(IsoFields.DAY_OF_QUARTER)
                 .toFormatter().withResolverStyle(ResolverStyle.SMART);
         LocalDate parsed = LocalDate.parse(date.getYear() + "-" + qoy + "-" + doq, f);
-        assertEquals(parsed, date);
+        assertEquals(date, parsed);
     }
 
-    @Test(dataProvider = "quarter")
+    @ParameterizedTest
+    @MethodSource("data_quarter")
     public void test_parse_quarters_LENIENT(LocalDate date, int doq, int qoy) {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
                 .appendValue(YEAR).appendLiteral('-')
@@ -179,11 +189,10 @@ public class TCKIsoFields {
                 .appendValue(IsoFields.DAY_OF_QUARTER)
                 .toFormatter().withResolverStyle(ResolverStyle.LENIENT);
         LocalDate parsed = LocalDate.parse(date.getYear() + "-" + qoy + "-" + doq, f);
-        assertEquals(parsed, date);
+        assertEquals(date, parsed);
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseLenientQuarter")
     Object[][] data_parseLenientQuarter() {
         return new Object[][] {
                 {"2012:0:1", LocalDate.of(2011, 10, 1), false},
@@ -206,17 +215,21 @@ public class TCKIsoFields {
         };
     }
 
-    @Test(dataProvider = "parseLenientQuarter", expectedExceptions = DateTimeParseException.class)
+    @ParameterizedTest
+    @MethodSource("data_parseLenientQuarter")
     public void test_parse_parseLenientQuarter_STRICT(String str, LocalDate expected, boolean smart) {
-        DateTimeFormatter f = new DateTimeFormatterBuilder()
-                .appendValue(YEAR).appendLiteral(':')
-                .appendValue(IsoFields.QUARTER_OF_YEAR).appendLiteral(':')
-                .appendValue(IsoFields.DAY_OF_QUARTER)
-                .toFormatter().withResolverStyle(ResolverStyle.STRICT);
-        LocalDate.parse(str, f);
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            DateTimeFormatter f = new DateTimeFormatterBuilder()
+                    .appendValue(YEAR).appendLiteral(':')
+                    .appendValue(IsoFields.QUARTER_OF_YEAR).appendLiteral(':')
+                    .appendValue(IsoFields.DAY_OF_QUARTER)
+                    .toFormatter().withResolverStyle(ResolverStyle.STRICT);
+            LocalDate.parse(str, f);
+        });
     }
 
-    @Test(dataProvider = "parseLenientQuarter")
+    @ParameterizedTest
+    @MethodSource("data_parseLenientQuarter")
     public void test_parse_parseLenientQuarter_SMART(String str, LocalDate expected, boolean smart) {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
                 .appendValue(YEAR).appendLiteral(':')
@@ -225,7 +238,7 @@ public class TCKIsoFields {
                 .toFormatter().withResolverStyle(ResolverStyle.SMART);
         if (smart) {
             LocalDate parsed = LocalDate.parse(str, f);
-            assertEquals(parsed, expected);
+            assertEquals(expected, parsed);
         } else {
             try {
                 LocalDate.parse(str, f);
@@ -236,7 +249,8 @@ public class TCKIsoFields {
         }
     }
 
-    @Test(dataProvider = "parseLenientQuarter")
+    @ParameterizedTest
+    @MethodSource("data_parseLenientQuarter")
     public void test_parse_parseLenientQuarter_LENIENT(String str, LocalDate expected, boolean smart) {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
                 .appendValue(YEAR).appendLiteral(':')
@@ -244,13 +258,12 @@ public class TCKIsoFields {
                 .appendValue(IsoFields.DAY_OF_QUARTER)
                 .toFormatter().withResolverStyle(ResolverStyle.LENIENT);
         LocalDate parsed = LocalDate.parse(str, f);
-        assertEquals(parsed, expected);
+        assertEquals(expected, parsed);
     }
 
     //-----------------------------------------------------------------------
     // quarters between
     //-----------------------------------------------------------------------
-    @DataProvider(name="quartersBetween")
     Object[][] data_quartersBetween() {
         return new Object[][] {
                 {LocalDate.of(2000, 1, 1), LocalDate.of(2000, 1, 1), 0},
@@ -284,20 +297,21 @@ public class TCKIsoFields {
         };
     }
 
-    @Test(dataProvider="quartersBetween")
+    @ParameterizedTest
+    @MethodSource("data_quartersBetween")
     public void test_quarters_between(LocalDate start, Temporal end, long expected) {
-        assertEquals(IsoFields.QUARTER_YEARS.between(start, end), expected);
+        assertEquals(expected, IsoFields.QUARTER_YEARS.between(start, end));
     }
 
-    @Test(dataProvider="quartersBetween")
+    @ParameterizedTest
+    @MethodSource("data_quartersBetween")
     public void test_quarters_between_until(LocalDate start, Temporal end, long expected) {
-        assertEquals(start.until(end, IsoFields.QUARTER_YEARS), expected);
+        assertEquals(expected, start.until(end, IsoFields.QUARTER_YEARS));
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="week")
     Object[][] data_week() {
         return new Object[][] {
                 {LocalDate.of(1969, 12, 29), MONDAY, 1, 1970},
@@ -318,37 +332,42 @@ public class TCKIsoFields {
     //-----------------------------------------------------------------------
     // WEEK_OF_WEEK_BASED_YEAR
     //-----------------------------------------------------------------------
-    @Test(dataProvider="week")
+    @ParameterizedTest
+    @MethodSource("data_week")
     public void test_WOWBY(LocalDate date, DayOfWeek dow, int week, int wby) {
-        assertEquals(date.getDayOfWeek(), dow);
-        assertEquals(IsoFields.WEEK_OF_WEEK_BASED_YEAR.getFrom(date), week);
-        assertEquals(date.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR), week);
+        assertEquals(dow, date.getDayOfWeek());
+        assertEquals(week, IsoFields.WEEK_OF_WEEK_BASED_YEAR.getFrom(date));
+        assertEquals(week, date.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR));
     }
 
+    @Test
     public void test_WOWBY_basics() {
-        assertEquals(IsoFields.WEEK_OF_WEEK_BASED_YEAR.isDateBased(), true);
-        assertEquals(IsoFields.WEEK_OF_WEEK_BASED_YEAR.isTimeBased(), false);
+        assertEquals(true, IsoFields.WEEK_OF_WEEK_BASED_YEAR.isDateBased());
+        assertEquals(false, IsoFields.WEEK_OF_WEEK_BASED_YEAR.isTimeBased());
     }
 
     //-----------------------------------------------------------------------
     // WEEK_BASED_YEAR
     //-----------------------------------------------------------------------
-    @Test(dataProvider="week")
+    @ParameterizedTest
+    @MethodSource("data_week")
     public void test_WBY(LocalDate date, DayOfWeek dow, int week, int wby) {
-        assertEquals(date.getDayOfWeek(), dow);
-        assertEquals(IsoFields.WEEK_BASED_YEAR.getFrom(date), wby);
-        assertEquals(date.get(IsoFields.WEEK_BASED_YEAR), wby);
+        assertEquals(dow, date.getDayOfWeek());
+        assertEquals(wby, IsoFields.WEEK_BASED_YEAR.getFrom(date));
+        assertEquals(wby, date.get(IsoFields.WEEK_BASED_YEAR));
     }
 
+    @Test
     public void test_WBY_basics() {
-        assertEquals(IsoFields.WEEK_BASED_YEAR.isDateBased(), true);
-        assertEquals(IsoFields.WEEK_BASED_YEAR.isTimeBased(), false);
+        assertEquals(true, IsoFields.WEEK_BASED_YEAR.isDateBased());
+        assertEquals(false, IsoFields.WEEK_BASED_YEAR.isTimeBased());
     }
 
     //-----------------------------------------------------------------------
     // parse weeks
     //-----------------------------------------------------------------------
-    @Test(dataProvider="week")
+    @ParameterizedTest
+    @MethodSource("data_week")
     public void test_parse_weeks_STRICT(LocalDate date, DayOfWeek dow, int week, int wby) {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
                 .appendValue(IsoFields.WEEK_BASED_YEAR).appendLiteral('-')
@@ -356,10 +375,11 @@ public class TCKIsoFields {
                 .appendValue(DAY_OF_WEEK)
                 .toFormatter().withResolverStyle(ResolverStyle.STRICT);
         LocalDate parsed = LocalDate.parse(wby + "-" + week + "-" + dow.getValue(), f);
-        assertEquals(parsed, date);
+        assertEquals(date, parsed);
     }
 
-    @Test(dataProvider="week")
+    @ParameterizedTest
+    @MethodSource("data_week")
     public void test_parse_weeks_SMART(LocalDate date, DayOfWeek dow, int week, int wby) {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
                 .appendValue(IsoFields.WEEK_BASED_YEAR).appendLiteral('-')
@@ -367,10 +387,11 @@ public class TCKIsoFields {
                 .appendValue(DAY_OF_WEEK)
                 .toFormatter().withResolverStyle(ResolverStyle.SMART);
         LocalDate parsed = LocalDate.parse(wby + "-" + week + "-" + dow.getValue(), f);
-        assertEquals(parsed, date);
+        assertEquals(date, parsed);
     }
 
-    @Test(dataProvider="week")
+    @ParameterizedTest
+    @MethodSource("data_week")
     public void test_parse_weeks_LENIENT(LocalDate date, DayOfWeek dow, int week, int wby) {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
                 .appendValue(IsoFields.WEEK_BASED_YEAR).appendLiteral('-')
@@ -378,11 +399,10 @@ public class TCKIsoFields {
                 .appendValue(DAY_OF_WEEK)
                 .toFormatter().withResolverStyle(ResolverStyle.LENIENT);
         LocalDate parsed = LocalDate.parse(wby + "-" + week + "-" + dow.getValue(), f);
-        assertEquals(parsed, date);
+        assertEquals(date, parsed);
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseLenientWeek")
     Object[][] data_parseLenientWeek() {
         return new Object[][] {
                 {"2012:52:-1", LocalDate.of(2012, 12, 22), false},
@@ -398,17 +418,21 @@ public class TCKIsoFields {
         };
     }
 
-    @Test(dataProvider = "parseLenientWeek", expectedExceptions = DateTimeParseException.class)
+    @ParameterizedTest
+    @MethodSource("data_parseLenientWeek")
     public void test_parse_parseLenientWeek_STRICT(String str, LocalDate expected, boolean smart) {
-        DateTimeFormatter f = new DateTimeFormatterBuilder()
-                .appendValue(IsoFields.WEEK_BASED_YEAR).appendLiteral(':')
-                .appendValue(IsoFields.WEEK_OF_WEEK_BASED_YEAR).appendLiteral(':')
-                .appendValue(DAY_OF_WEEK)
-                .toFormatter().withResolverStyle(ResolverStyle.STRICT);
-        LocalDate.parse(str, f);
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            DateTimeFormatter f = new DateTimeFormatterBuilder()
+                    .appendValue(IsoFields.WEEK_BASED_YEAR).appendLiteral(':')
+                    .appendValue(IsoFields.WEEK_OF_WEEK_BASED_YEAR).appendLiteral(':')
+                    .appendValue(DAY_OF_WEEK)
+                    .toFormatter().withResolverStyle(ResolverStyle.STRICT);
+            LocalDate.parse(str, f);
+        });
     }
 
-    @Test(dataProvider = "parseLenientWeek")
+    @ParameterizedTest
+    @MethodSource("data_parseLenientWeek")
     public void test_parse_parseLenientWeek_SMART(String str, LocalDate expected, boolean smart) {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
                 .appendValue(IsoFields.WEEK_BASED_YEAR).appendLiteral(':')
@@ -417,7 +441,7 @@ public class TCKIsoFields {
                 .toFormatter().withResolverStyle(ResolverStyle.SMART);
         if (smart) {
             LocalDate parsed = LocalDate.parse(str, f);
-            assertEquals(parsed, expected);
+            assertEquals(expected, parsed);
         } else {
             try {
                 LocalDate.parse(str, f);
@@ -428,7 +452,8 @@ public class TCKIsoFields {
         }
     }
 
-    @Test(dataProvider = "parseLenientWeek")
+    @ParameterizedTest
+    @MethodSource("data_parseLenientWeek")
     public void test_parse_parseLenientWeek_LENIENT(String str, LocalDate expected, boolean smart) {
         DateTimeFormatter f = new DateTimeFormatterBuilder()
                 .appendValue(IsoFields.WEEK_BASED_YEAR).appendLiteral(':')
@@ -436,13 +461,12 @@ public class TCKIsoFields {
                 .appendValue(DAY_OF_WEEK)
                 .toFormatter().withResolverStyle(ResolverStyle.LENIENT);
         LocalDate parsed = LocalDate.parse(str, f);
-        assertEquals(parsed, expected);
+        assertEquals(expected, parsed);
     }
 
     //-----------------------------------------------------------------------
     // rangeRefinedBy
     //-----------------------------------------------------------------------
-    @DataProvider(name="isofields")
     Object[][] data_isofields() {
         return new Object[][] {
                {IsoFields.DAY_OF_QUARTER, 49, ValueRange.of(1, 91)},
@@ -453,32 +477,37 @@ public class TCKIsoFields {
         };
     }
 
-    @Test(dataProvider = "isofields")
+    @ParameterizedTest
+    @MethodSource("data_isofields")
     public void test_isofields_rangerefinedby(TemporalField field, int value, ValueRange valueRange) {
         LocalDate date = LocalDate.of(2016, 5, 19);
-        assertEquals(field.rangeRefinedBy(date), valueRange);
+        assertEquals(valueRange, field.rangeRefinedBy(date));
     }
 
-    @Test(dataProvider = "isofields", expectedExceptions = UnsupportedTemporalTypeException.class)
+    @ParameterizedTest
+    @MethodSource("data_isofields")
     public void test_nonisofields_rangerefinedby(TemporalField field, int value, ValueRange valueRange) {
-        field.rangeRefinedBy(HijrahDate.now());
+        Assertions.assertThrows(UnsupportedTemporalTypeException.class, () -> field.rangeRefinedBy(HijrahDate.now()));
     }
 
     //-----------------------------------------------------------------------
     // getFrom
     //-----------------------------------------------------------------------
-    @Test(dataProvider = "isofields")
+    @ParameterizedTest
+    @MethodSource("data_isofields")
     public void test_isofields_getFrom(TemporalField field, int value, ValueRange valueRange) {
         LocalDate date = LocalDate.of(2016, 5, 19);
-        assertEquals(field.getFrom(date), value);
+        assertEquals(value, field.getFrom(date));
     }
 
-    @Test(dataProvider = "isofields", expectedExceptions = UnsupportedTemporalTypeException.class)
+    @ParameterizedTest
+    @MethodSource("data_isofields")
     public void test_nonisofields_getFrom(TemporalField field, int value, ValueRange valueRange) {
-        field.getFrom(HijrahDate.now());
+        Assertions.assertThrows(UnsupportedTemporalTypeException.class, () -> field.getFrom(HijrahDate.now()));
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_loop() {
         // loop round at least one 400 year cycle, including before 1970
         LocalDate date = LocalDate.of(1960, 1, 5);  // Tuseday of week 1 1960
@@ -501,11 +530,11 @@ public class TCKIsoFields {
                     wby++;
                 }
             }
-            assertEquals(IsoFields.WEEK_OF_WEEK_BASED_YEAR.rangeRefinedBy(date), ValueRange.of(1, weekLen), "Failed on " + date + " " + date.getDayOfWeek());
-            assertEquals(IsoFields.WEEK_OF_WEEK_BASED_YEAR.getFrom(date), week, "Failed on " + date + " " + date.getDayOfWeek());
-            assertEquals(date.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR), week, "Failed on " + date + " " + date.getDayOfWeek());
-            assertEquals(IsoFields.WEEK_BASED_YEAR.getFrom(date), wby, "Failed on " + date + " " + date.getDayOfWeek());
-            assertEquals(date.get(IsoFields.WEEK_BASED_YEAR), wby, "Failed on " + date + " " + date.getDayOfWeek());
+            assertEquals(ValueRange.of(1, weekLen), IsoFields.WEEK_OF_WEEK_BASED_YEAR.rangeRefinedBy(date), "Failed on " + date + " " + date.getDayOfWeek());
+            assertEquals(week, IsoFields.WEEK_OF_WEEK_BASED_YEAR.getFrom(date), "Failed on " + date + " " + date.getDayOfWeek());
+            assertEquals(week, date.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR), "Failed on " + date + " " + date.getDayOfWeek());
+            assertEquals(wby, IsoFields.WEEK_BASED_YEAR.getFrom(date), "Failed on " + date + " " + date.getDayOfWeek());
+            assertEquals(wby, date.get(IsoFields.WEEK_BASED_YEAR), "Failed on " + date + " " + date.getDayOfWeek());
             date = date.plusDays(1);
         }
     }
diff --git a/test/jdk/java/time/tck/java/time/temporal/TCKJulianFields.java b/test/jdk/java/time/tck/java/time/temporal/TCKJulianFields.java
index a15c31dd2c7..546b8d11c7c 100644
--- a/test/jdk/java/time/tck/java/time/temporal/TCKJulianFields.java
+++ b/test/jdk/java/time/tck/java/time/temporal/TCKJulianFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@
  */
 package tck.java.time.temporal;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.time.LocalDate;
@@ -71,14 +71,17 @@ import java.time.temporal.IsoFields;
 import java.time.temporal.JulianFields;
 import java.time.temporal.TemporalField;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import tck.java.time.AbstractTCKTest;
 
 /**
  * Test Julian Fields.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKJulianFields extends AbstractTCKTest {
 
     private static final LocalDate JAN01_1970 = LocalDate.of(1970, 1, 1);
@@ -86,7 +89,6 @@ public class TCKJulianFields extends AbstractTCKTest {
     private static final LocalDate NOV12_1945 = LocalDate.of(1945, 11, 12);
     private static final LocalDate JAN01_0001 = LocalDate.of(1, 1, 1);
 
-    @DataProvider(name="samples")
     Object[][] data_samples() {
         return new Object[][] {
             {ChronoField.EPOCH_DAY, JAN01_1970, 0L},
@@ -112,55 +114,61 @@ public class TCKJulianFields extends AbstractTCKTest {
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_basics() {
-        assertEquals(JulianFields.JULIAN_DAY.isDateBased(), true);
-        assertEquals(JulianFields.JULIAN_DAY.isTimeBased(), false);
+        assertEquals(true, JulianFields.JULIAN_DAY.isDateBased());
+        assertEquals(false, JulianFields.JULIAN_DAY.isTimeBased());
 
-        assertEquals(JulianFields.MODIFIED_JULIAN_DAY.isDateBased(), true);
-        assertEquals(JulianFields.MODIFIED_JULIAN_DAY.isTimeBased(), false);
+        assertEquals(true, JulianFields.MODIFIED_JULIAN_DAY.isDateBased());
+        assertEquals(false, JulianFields.MODIFIED_JULIAN_DAY.isTimeBased());
 
-        assertEquals(JulianFields.RATA_DIE.isDateBased(), true);
-        assertEquals(JulianFields.RATA_DIE.isTimeBased(), false);
+        assertEquals(true, JulianFields.RATA_DIE.isDateBased());
+        assertEquals(false, JulianFields.RATA_DIE.isTimeBased());
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_samples_get(TemporalField field, LocalDate date, long expected) {
-        assertEquals(date.getLong(field), expected);
+        assertEquals(expected, date.getLong(field));
     }
 
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_samples_set(TemporalField field, LocalDate date, long value) {
-        assertEquals(field.adjustInto(LocalDate.MAX, value), date);
-        assertEquals(field.adjustInto(LocalDate.MIN, value), date);
-        assertEquals(field.adjustInto(JAN01_1970, value), date);
-        assertEquals(field.adjustInto(DEC31_1969, value), date);
-        assertEquals(field.adjustInto(NOV12_1945, value), date);
+        assertEquals(date, field.adjustInto(LocalDate.MAX, value));
+        assertEquals(date, field.adjustInto(LocalDate.MIN, value));
+        assertEquals(date, field.adjustInto(JAN01_1970, value));
+        assertEquals(date, field.adjustInto(DEC31_1969, value));
+        assertEquals(date, field.adjustInto(NOV12_1945, value));
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_samples_parse_STRICT(TemporalField field, LocalDate date, long value) {
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(field)
                 .toFormatter().withResolverStyle(ResolverStyle.STRICT);
         LocalDate parsed = LocalDate.parse(Long.toString(value), f);
-        assertEquals(parsed, date);
+        assertEquals(date, parsed);
     }
 
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_samples_parse_SMART(TemporalField field, LocalDate date, long value) {
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(field)
                 .toFormatter().withResolverStyle(ResolverStyle.SMART);
         LocalDate parsed = LocalDate.parse(Long.toString(value), f);
-        assertEquals(parsed, date);
+        assertEquals(date, parsed);
     }
 
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_samples_parse_LENIENT(TemporalField field, LocalDate date, long value) {
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendValue(field)
                 .toFormatter().withResolverStyle(ResolverStyle.LENIENT);
         LocalDate parsed = LocalDate.parse(Long.toString(value), f);
-        assertEquals(parsed, date);
+        assertEquals(date, parsed);
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/temporal/TCKTemporalAdjusters.java b/test/jdk/java/time/tck/java/time/temporal/TCKTemporalAdjusters.java
index b901125fc30..8f06b4060f0 100644
--- a/test/jdk/java/time/tck/java/time/temporal/TCKTemporalAdjusters.java
+++ b/test/jdk/java/time/tck/java/time/temporal/TCKTemporalAdjusters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,11 +63,12 @@ import static java.time.DayOfWeek.MONDAY;
 import static java.time.DayOfWeek.TUESDAY;
 import static java.time.Month.DECEMBER;
 import static java.time.Month.JANUARY;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
@@ -75,13 +76,16 @@ import java.time.Month;
 import java.time.temporal.TemporalAdjuster;
 import java.time.temporal.TemporalAdjusters;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test TemporalAdjusters.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKTemporalAdjusters {
 
     //-----------------------------------------------------------------------
@@ -90,12 +94,12 @@ public class TCKTemporalAdjusters {
     @Test
     public void factory_ofDateAdjuster() {
         TemporalAdjuster test = TemporalAdjusters.ofDateAdjuster(date -> date.plusDays(2));
-        assertEquals(LocalDate.of(2012, 6, 30).with(test), LocalDate.of(2012, 7, 2));
+        assertEquals(LocalDate.of(2012, 7, 2), LocalDate.of(2012, 6, 30).with(test));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void factory_ofDateAdjuster_null() {
-        TemporalAdjusters.ofDateAdjuster(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TemporalAdjusters.ofDateAdjuster(null));
     }
 
 
@@ -113,9 +117,9 @@ public class TCKTemporalAdjusters {
             for (int i = 1; i <= month.length(false); i++) {
                 LocalDate date = date(2007, month, i);
                 LocalDate test = (LocalDate) TemporalAdjusters.firstDayOfMonth().adjustInto(date);
-                assertEquals(test.getYear(), 2007);
-                assertEquals(test.getMonth(), month);
-                assertEquals(test.getDayOfMonth(), 1);
+                assertEquals(2007, test.getYear());
+                assertEquals(month, test.getMonth());
+                assertEquals(1, test.getDayOfMonth());
             }
         }
     }
@@ -126,9 +130,9 @@ public class TCKTemporalAdjusters {
             for (int i = 1; i <= month.length(true); i++) {
                 LocalDate date = date(2008, month, i);
                 LocalDate test = (LocalDate) TemporalAdjusters.firstDayOfMonth().adjustInto(date);
-                assertEquals(test.getYear(), 2008);
-                assertEquals(test.getMonth(), month);
-                assertEquals(test.getDayOfMonth(), 1);
+                assertEquals(2008, test.getYear());
+                assertEquals(month, test.getMonth());
+                assertEquals(1, test.getDayOfMonth());
             }
         }
     }
@@ -147,9 +151,9 @@ public class TCKTemporalAdjusters {
             for (int i = 1; i <= month.length(false); i++) {
                 LocalDate date = date(2007, month, i);
                 LocalDate test = (LocalDate) TemporalAdjusters.lastDayOfMonth().adjustInto(date);
-                assertEquals(test.getYear(), 2007);
-                assertEquals(test.getMonth(), month);
-                assertEquals(test.getDayOfMonth(), month.length(false));
+                assertEquals(2007, test.getYear());
+                assertEquals(month, test.getMonth());
+                assertEquals(month.length(false), test.getDayOfMonth());
             }
         }
     }
@@ -160,9 +164,9 @@ public class TCKTemporalAdjusters {
             for (int i = 1; i <= month.length(true); i++) {
                 LocalDate date = date(2008, month, i);
                 LocalDate test = (LocalDate) TemporalAdjusters.lastDayOfMonth().adjustInto(date);
-                assertEquals(test.getYear(), 2008);
-                assertEquals(test.getMonth(), month);
-                assertEquals(test.getDayOfMonth(), month.length(true));
+                assertEquals(2008, test.getYear());
+                assertEquals(month, test.getMonth());
+                assertEquals(month.length(true), test.getDayOfMonth());
             }
         }
     }
@@ -181,9 +185,9 @@ public class TCKTemporalAdjusters {
             for (int i = 1; i <= month.length(false); i++) {
                 LocalDate date = date(2007, month, i);
                 LocalDate test = (LocalDate) TemporalAdjusters.firstDayOfNextMonth().adjustInto(date);
-                assertEquals(test.getYear(), month == DECEMBER ? 2008 : 2007);
-                assertEquals(test.getMonth(), month.plus(1));
-                assertEquals(test.getDayOfMonth(), 1);
+                assertEquals(month == DECEMBER ? 2008 : 2007, test.getYear());
+                assertEquals(month.plus(1), test.getMonth());
+                assertEquals(1, test.getDayOfMonth());
             }
         }
     }
@@ -194,9 +198,9 @@ public class TCKTemporalAdjusters {
             for (int i = 1; i <= month.length(true); i++) {
                 LocalDate date = date(2008, month, i);
                 LocalDate test = (LocalDate) TemporalAdjusters.firstDayOfNextMonth().adjustInto(date);
-                assertEquals(test.getYear(), month == DECEMBER ? 2009 : 2008);
-                assertEquals(test.getMonth(), month.plus(1));
-                assertEquals(test.getDayOfMonth(), 1);
+                assertEquals(month == DECEMBER ? 2009 : 2008, test.getYear());
+                assertEquals(month.plus(1), test.getMonth());
+                assertEquals(1, test.getDayOfMonth());
             }
         }
     }
@@ -215,9 +219,9 @@ public class TCKTemporalAdjusters {
             for (int i = 1; i <= month.length(false); i++) {
                 LocalDate date = date(2007, month, i);
                 LocalDate test = (LocalDate) TemporalAdjusters.firstDayOfYear().adjustInto(date);
-                assertEquals(test.getYear(), 2007);
-                assertEquals(test.getMonth(), Month.JANUARY);
-                assertEquals(test.getDayOfMonth(), 1);
+                assertEquals(2007, test.getYear());
+                assertEquals(Month.JANUARY, test.getMonth());
+                assertEquals(1, test.getDayOfMonth());
             }
         }
     }
@@ -228,9 +232,9 @@ public class TCKTemporalAdjusters {
             for (int i = 1; i <= month.length(true); i++) {
                 LocalDate date = date(2008, month, i);
                 LocalDate test = (LocalDate) TemporalAdjusters.firstDayOfYear().adjustInto(date);
-                assertEquals(test.getYear(), 2008);
-                assertEquals(test.getMonth(), Month.JANUARY);
-                assertEquals(test.getDayOfMonth(), 1);
+                assertEquals(2008, test.getYear());
+                assertEquals(Month.JANUARY, test.getMonth());
+                assertEquals(1, test.getDayOfMonth());
             }
         }
     }
@@ -249,9 +253,9 @@ public class TCKTemporalAdjusters {
             for (int i = 1; i <= month.length(false); i++) {
                 LocalDate date = date(2007, month, i);
                 LocalDate test = (LocalDate) TemporalAdjusters.lastDayOfYear().adjustInto(date);
-                assertEquals(test.getYear(), 2007);
-                assertEquals(test.getMonth(), Month.DECEMBER);
-                assertEquals(test.getDayOfMonth(), 31);
+                assertEquals(2007, test.getYear());
+                assertEquals(Month.DECEMBER, test.getMonth());
+                assertEquals(31, test.getDayOfMonth());
             }
         }
     }
@@ -262,9 +266,9 @@ public class TCKTemporalAdjusters {
             for (int i = 1; i <= month.length(true); i++) {
                 LocalDate date = date(2008, month, i);
                 LocalDate test = (LocalDate) TemporalAdjusters.lastDayOfYear().adjustInto(date);
-                assertEquals(test.getYear(), 2008);
-                assertEquals(test.getMonth(), Month.DECEMBER);
-                assertEquals(test.getDayOfMonth(), 31);
+                assertEquals(2008, test.getYear());
+                assertEquals(Month.DECEMBER, test.getMonth());
+                assertEquals(31, test.getDayOfMonth());
             }
         }
     }
@@ -283,9 +287,9 @@ public class TCKTemporalAdjusters {
             for (int i = 1; i <= month.length(false); i++) {
                 LocalDate date = date(2007, month, i);
                 LocalDate test = (LocalDate) TemporalAdjusters.firstDayOfNextYear().adjustInto(date);
-                assertEquals(test.getYear(), 2008);
-                assertEquals(test.getMonth(), JANUARY);
-                assertEquals(test.getDayOfMonth(), 1);
+                assertEquals(2008, test.getYear());
+                assertEquals(JANUARY, test.getMonth());
+                assertEquals(1, test.getDayOfMonth());
             }
         }
     }
@@ -296,9 +300,9 @@ public class TCKTemporalAdjusters {
             for (int i = 1; i <= month.length(true); i++) {
                 LocalDate date = date(2008, month, i);
                 LocalDate test = (LocalDate) TemporalAdjusters.firstDayOfNextYear().adjustInto(date);
-                assertEquals(test.getYear(), 2009);
-                assertEquals(test.getMonth(), JANUARY);
-                assertEquals(test.getDayOfMonth(), 1);
+                assertEquals(2009, test.getYear());
+                assertEquals(JANUARY, test.getMonth());
+                assertEquals(1, test.getDayOfMonth());
             }
         }
     }
@@ -311,12 +315,11 @@ public class TCKTemporalAdjusters {
         assertNotNull(TemporalAdjusters.dayOfWeekInMonth(1, MONDAY));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_dayOfWeekInMonth_nullDayOfWeek() {
-        TemporalAdjusters.dayOfWeekInMonth(1, null);
+        Assertions.assertThrows(NullPointerException.class, () -> TemporalAdjusters.dayOfWeekInMonth(1, null));
     }
 
-    @DataProvider(name = "dayOfWeekInMonth_positive")
     Object[][] data_dayOfWeekInMonth_positive() {
         return new Object[][] {
             {2011, 1, TUESDAY, date(2011, 1, 4)},
@@ -334,18 +337,18 @@ public class TCKTemporalAdjusters {
         };
     }
 
-    @Test(dataProvider = "dayOfWeekInMonth_positive")
+    @ParameterizedTest
+    @MethodSource("data_dayOfWeekInMonth_positive")
     public void test_dayOfWeekInMonth_positive(int year, int month, DayOfWeek dow, LocalDate expected) {
         for (int ordinal = 1; ordinal <= 5; ordinal++) {
             for (int day = 1; day <= Month.of(month).length(false); day++) {
                 LocalDate date = date(year, month, day);
                 LocalDate test = (LocalDate) TemporalAdjusters.dayOfWeekInMonth(ordinal, dow).adjustInto(date);
-                assertEquals(test, expected.plusWeeks(ordinal - 1));
+                assertEquals(expected.plusWeeks(ordinal - 1), test);
             }
         }
     }
 
-    @DataProvider(name = "dayOfWeekInMonth_zero")
     Object[][] data_dayOfWeekInMonth_zero() {
         return new Object[][] {
             {2011, 1, TUESDAY, date(2010, 12, 28)},
@@ -363,16 +366,16 @@ public class TCKTemporalAdjusters {
         };
     }
 
-    @Test(dataProvider = "dayOfWeekInMonth_zero")
+    @ParameterizedTest
+    @MethodSource("data_dayOfWeekInMonth_zero")
     public void test_dayOfWeekInMonth_zero(int year, int month, DayOfWeek dow, LocalDate expected) {
         for (int day = 1; day <= Month.of(month).length(false); day++) {
             LocalDate date = date(year, month, day);
             LocalDate test = (LocalDate) TemporalAdjusters.dayOfWeekInMonth(0, dow).adjustInto(date);
-            assertEquals(test, expected);
+            assertEquals(expected, test);
         }
     }
 
-    @DataProvider(name = "dayOfWeekInMonth_negative")
     Object[][] data_dayOfWeekInMonth_negative() {
         return new Object[][] {
             {2011, 1, TUESDAY, date(2011, 1, 25)},
@@ -390,13 +393,14 @@ public class TCKTemporalAdjusters {
         };
     }
 
-    @Test(dataProvider = "dayOfWeekInMonth_negative")
+    @ParameterizedTest
+    @MethodSource("data_dayOfWeekInMonth_negative")
     public void test_dayOfWeekInMonth_negative(int year, int month, DayOfWeek dow, LocalDate expected) {
         for (int ordinal = 0; ordinal < 5; ordinal++) {
             for (int day = 1; day <= Month.of(month).length(false); day++) {
                 LocalDate date = date(year, month, day);
                 LocalDate test = (LocalDate) TemporalAdjusters.dayOfWeekInMonth(-1 - ordinal, dow).adjustInto(date);
-                assertEquals(test, expected.minusWeeks(ordinal));
+                assertEquals(expected.minusWeeks(ordinal), test);
             }
         }
     }
@@ -409,17 +413,18 @@ public class TCKTemporalAdjusters {
         assertNotNull(TemporalAdjusters.firstInMonth(MONDAY));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_firstInMonth_nullDayOfWeek() {
-        TemporalAdjusters.firstInMonth(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TemporalAdjusters.firstInMonth(null));
     }
 
-    @Test(dataProvider = "dayOfWeekInMonth_positive")
+    @ParameterizedTest
+    @MethodSource("data_dayOfWeekInMonth_positive")
     public void test_firstInMonth(int year, int month, DayOfWeek dow, LocalDate expected) {
         for (int day = 1; day <= Month.of(month).length(false); day++) {
             LocalDate date = date(year, month, day);
             LocalDate test = (LocalDate) TemporalAdjusters.firstInMonth(dow).adjustInto(date);
-            assertEquals(test, expected, "day-of-month=" + day);
+            assertEquals(expected, test, "day-of-month=" + day);
         }
     }
 
@@ -431,17 +436,18 @@ public class TCKTemporalAdjusters {
         assertNotNull(TemporalAdjusters.lastInMonth(MONDAY));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_lastInMonth_nullDayOfWeek() {
-        TemporalAdjusters.lastInMonth(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TemporalAdjusters.lastInMonth(null));
     }
 
-    @Test(dataProvider = "dayOfWeekInMonth_negative")
+    @ParameterizedTest
+    @MethodSource("data_dayOfWeekInMonth_negative")
     public void test_lastInMonth(int year, int month, DayOfWeek dow, LocalDate expected) {
         for (int day = 1; day <= Month.of(month).length(false); day++) {
             LocalDate date = date(year, month, day);
             LocalDate test = (LocalDate) TemporalAdjusters.lastInMonth(dow).adjustInto(date);
-            assertEquals(test, expected, "day-of-month=" + day);
+            assertEquals(expected, test, "day-of-month=" + day);
         }
     }
 
@@ -453,9 +459,9 @@ public class TCKTemporalAdjusters {
         assertNotNull(TemporalAdjusters.next(MONDAY));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void factory_next_nullDayOfWeek() {
-        TemporalAdjusters.next(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TemporalAdjusters.next(null));
     }
 
     @Test
@@ -475,7 +481,7 @@ public class TCKTemporalAdjusters {
                     } else {
                         assertSame(month, Month.DECEMBER);
                         assertTrue(date.getDayOfMonth() > 24);
-                        assertEquals(test.getYear(), 2008);
+                        assertEquals(2008, test.getYear());
                         assertSame(test.getMonth(), Month.JANUARY);
                         assertTrue(test.getDayOfMonth() < 8);
                     }
@@ -492,9 +498,9 @@ public class TCKTemporalAdjusters {
         assertNotNull(TemporalAdjusters.nextOrSame(MONDAY));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void factory_nextOrCurrent_nullDayOfWeek() {
-        TemporalAdjusters.nextOrSame(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TemporalAdjusters.nextOrSame(null));
     }
 
     @Test
@@ -511,12 +517,12 @@ public class TCKTemporalAdjusters {
                     if (test.getYear() == 2007) {
                         int dayDiff = test.getDayOfYear() - date.getDayOfYear();
                         assertTrue(dayDiff < 8);
-                        assertEquals(date.equals(test), date.getDayOfWeek() == dow);
+                        assertEquals(date.getDayOfWeek() == dow, date.equals(test));
                     } else {
                         assertFalse(date.getDayOfWeek() == dow);
                         assertSame(month, Month.DECEMBER);
                         assertTrue(date.getDayOfMonth() > 24);
-                        assertEquals(test.getYear(), 2008);
+                        assertEquals(2008, test.getYear());
                         assertSame(test.getMonth(), Month.JANUARY);
                         assertTrue(test.getDayOfMonth() < 8);
                     }
@@ -533,9 +539,9 @@ public class TCKTemporalAdjusters {
         assertNotNull(TemporalAdjusters.previous(MONDAY));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void factory_previous_nullDayOfWeek() {
-        TemporalAdjusters.previous(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TemporalAdjusters.previous(null));
     }
 
     @Test
@@ -555,7 +561,7 @@ public class TCKTemporalAdjusters {
                     } else {
                         assertSame(month, Month.JANUARY);
                         assertTrue(date.getDayOfMonth() < 8);
-                        assertEquals(test.getYear(), 2006);
+                        assertEquals(2006, test.getYear());
                         assertSame(test.getMonth(), Month.DECEMBER);
                         assertTrue(test.getDayOfMonth() > 24);
                     }
@@ -572,9 +578,9 @@ public class TCKTemporalAdjusters {
         assertNotNull(TemporalAdjusters.previousOrSame(MONDAY));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void factory_previousOrCurrent_nullDayOfWeek() {
-        TemporalAdjusters.previousOrSame(null);
+        Assertions.assertThrows(NullPointerException.class, () -> TemporalAdjusters.previousOrSame(null));
     }
 
     @Test
@@ -591,12 +597,12 @@ public class TCKTemporalAdjusters {
                     if (test.getYear() == 2007) {
                         int dayDiff = test.getDayOfYear() - date.getDayOfYear();
                         assertTrue(dayDiff <= 0 && dayDiff > -7);
-                        assertEquals(date.equals(test), date.getDayOfWeek() == dow);
+                        assertEquals(date.getDayOfWeek() == dow, date.equals(test));
                     } else {
                         assertFalse(date.getDayOfWeek() == dow);
                         assertSame(month, Month.JANUARY);
                         assertTrue(date.getDayOfMonth() < 7);
-                        assertEquals(test.getYear(), 2006);
+                        assertEquals(2006, test.getYear());
                         assertSame(test.getMonth(), Month.DECEMBER);
                         assertTrue(test.getDayOfMonth() > 25);
                     }
diff --git a/test/jdk/java/time/tck/java/time/temporal/TCKWeekFields.java b/test/jdk/java/time/tck/java/time/temporal/TCKWeekFields.java
index f379766897c..b7c83f8de80 100644
--- a/test/jdk/java/time/tck/java/time/temporal/TCKWeekFields.java
+++ b/test/jdk/java/time/tck/java/time/temporal/TCKWeekFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,11 +62,12 @@ import static java.time.temporal.ChronoField.DAY_OF_WEEK;
 import static java.time.temporal.ChronoField.DAY_OF_YEAR;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoField.YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.time.DateTimeException;
@@ -79,85 +80,92 @@ import java.time.temporal.TemporalField;
 import java.time.temporal.ValueRange;
 import java.time.temporal.WeekFields;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import tck.java.time.AbstractTCKTest;
 
 /**
  * Test WeekFields.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKWeekFields extends AbstractTCKTest {
 
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_of_DayOfWeek_int_singleton(DayOfWeek firstDayOfWeek, int minDays) {
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
-        assertEquals(week.getFirstDayOfWeek(), firstDayOfWeek, "Incorrect firstDayOfWeek");
-        assertEquals(week.getMinimalDaysInFirstWeek(), minDays, "Incorrect MinimalDaysInFirstWeek");
+        assertEquals(firstDayOfWeek, week.getFirstDayOfWeek(), "Incorrect firstDayOfWeek");
+        assertEquals(minDays, week.getMinimalDaysInFirstWeek(), "Incorrect MinimalDaysInFirstWeek");
         assertSame(WeekFields.of(firstDayOfWeek, minDays), week);
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_basics(DayOfWeek firstDayOfWeek, int minDays) {
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
-        assertEquals(week.dayOfWeek().isDateBased(), true);
-        assertEquals(week.dayOfWeek().isTimeBased(), false);
+        assertEquals(true, week.dayOfWeek().isDateBased());
+        assertEquals(false, week.dayOfWeek().isTimeBased());
 
-        assertEquals(week.weekOfMonth().isDateBased(), true);
-        assertEquals(week.weekOfMonth().isTimeBased(), false);
+        assertEquals(true, week.weekOfMonth().isDateBased());
+        assertEquals(false, week.weekOfMonth().isTimeBased());
 
-        assertEquals(week.weekOfYear().isDateBased(), true);
-        assertEquals(week.weekOfYear().isTimeBased(), false);
+        assertEquals(true, week.weekOfYear().isDateBased());
+        assertEquals(false, week.weekOfYear().isTimeBased());
 
-        assertEquals(week.weekOfWeekBasedYear().isDateBased(), true);
-        assertEquals(week.weekOfWeekBasedYear().isTimeBased(), false);
+        assertEquals(true, week.weekOfWeekBasedYear().isDateBased());
+        assertEquals(false, week.weekOfWeekBasedYear().isTimeBased());
 
-        assertEquals(week.weekBasedYear().isDateBased(), true);
-        assertEquals(week.weekBasedYear().isTimeBased(), false);
+        assertEquals(true, week.weekBasedYear().isDateBased());
+        assertEquals(false, week.weekBasedYear().isTimeBased());
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_dayOfWeekField_simpleGet() {
         LocalDate date = LocalDate.of(2000, 1, 10);  // Known to be ISO Monday
-        assertEquals(date.get(WeekFields.ISO.dayOfWeek()), 1);
-        assertEquals(date.get(WeekFields.of(DayOfWeek.MONDAY, 1).dayOfWeek()), 1);
-        assertEquals(date.get(WeekFields.of(DayOfWeek.MONDAY, 7).dayOfWeek()), 1);
-        assertEquals(date.get(WeekFields.SUNDAY_START.dayOfWeek()), 2);
-        assertEquals(date.get(WeekFields.of(DayOfWeek.SUNDAY, 1).dayOfWeek()), 2);
-        assertEquals(date.get(WeekFields.of(DayOfWeek.SUNDAY, 7).dayOfWeek()), 2);
-        assertEquals(date.get(WeekFields.of(DayOfWeek.SATURDAY, 1).dayOfWeek()), 3);
-        assertEquals(date.get(WeekFields.of(DayOfWeek.FRIDAY, 1).dayOfWeek()), 4);
-        assertEquals(date.get(WeekFields.of(DayOfWeek.TUESDAY, 1).dayOfWeek()), 7);
+        assertEquals(1, date.get(WeekFields.ISO.dayOfWeek()));
+        assertEquals(1, date.get(WeekFields.of(DayOfWeek.MONDAY, 1).dayOfWeek()));
+        assertEquals(1, date.get(WeekFields.of(DayOfWeek.MONDAY, 7).dayOfWeek()));
+        assertEquals(2, date.get(WeekFields.SUNDAY_START.dayOfWeek()));
+        assertEquals(2, date.get(WeekFields.of(DayOfWeek.SUNDAY, 1).dayOfWeek()));
+        assertEquals(2, date.get(WeekFields.of(DayOfWeek.SUNDAY, 7).dayOfWeek()));
+        assertEquals(3, date.get(WeekFields.of(DayOfWeek.SATURDAY, 1).dayOfWeek()));
+        assertEquals(4, date.get(WeekFields.of(DayOfWeek.FRIDAY, 1).dayOfWeek()));
+        assertEquals(7, date.get(WeekFields.of(DayOfWeek.TUESDAY, 1).dayOfWeek()));
     }
 
     @Test
     public void test_dayOfWeekField_simpleSet() {
         LocalDate date = LocalDate.of(2000, 1, 10);  // Known to be ISO Monday
-        assertEquals(date.with(WeekFields.ISO.dayOfWeek(), 2), LocalDate.of(2000, 1, 11));
-        assertEquals(date.with(WeekFields.ISO.dayOfWeek(), 7), LocalDate.of(2000, 1, 16));
+        assertEquals(LocalDate.of(2000, 1, 11), date.with(WeekFields.ISO.dayOfWeek(), 2));
+        assertEquals(LocalDate.of(2000, 1, 16), date.with(WeekFields.ISO.dayOfWeek(), 7));
 
-        assertEquals(date.with(WeekFields.SUNDAY_START.dayOfWeek(), 3), LocalDate.of(2000, 1, 11));
-        assertEquals(date.with(WeekFields.SUNDAY_START.dayOfWeek(), 7), LocalDate.of(2000, 1, 15));
+        assertEquals(LocalDate.of(2000, 1, 11), date.with(WeekFields.SUNDAY_START.dayOfWeek(), 3));
+        assertEquals(LocalDate.of(2000, 1, 15), date.with(WeekFields.SUNDAY_START.dayOfWeek(), 7));
 
-        assertEquals(date.with(WeekFields.of(DayOfWeek.SATURDAY, 1).dayOfWeek(), 4), LocalDate.of(2000, 1, 11));
-        assertEquals(date.with(WeekFields.of(DayOfWeek.TUESDAY, 1).dayOfWeek(), 1), LocalDate.of(2000, 1, 4));
+        assertEquals(LocalDate.of(2000, 1, 11), date.with(WeekFields.of(DayOfWeek.SATURDAY, 1).dayOfWeek(), 4));
+        assertEquals(LocalDate.of(2000, 1, 4), date.with(WeekFields.of(DayOfWeek.TUESDAY, 1).dayOfWeek(), 1));
     }
 
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_dayOfWeekField(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate day = LocalDate.of(2000, 1, 10);  // Known to be ISO Monday
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
         TemporalField f = week.dayOfWeek();
 
         for (int i = 1; i <= 7; i++) {
-            assertEquals(day.get(f), (7 + day.getDayOfWeek().getValue() - firstDayOfWeek.getValue()) % 7 + 1);
+            assertEquals((7 + day.getDayOfWeek().getValue() - firstDayOfWeek.getValue()) % 7 + 1, day.get(f));
             day = day.plusDays(1);
         }
     }
 
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_weekOfMonthField(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate day = LocalDate.of(2012, 12, 31);  // Known to be ISO Monday
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
@@ -183,14 +191,15 @@ public class TCKWeekFields extends AbstractTCKTest {
             offset += (actualWOM - 1) * 7;
             LocalDate result = day1.plusDays(offset);
 
-            assertEquals(result, day, "Incorrect dayOfWeek or weekOfMonth: "
+            assertEquals(day, result, "Incorrect dayOfWeek or weekOfMonth: "
                     + String.format("%s, ISO Dow: %s, offset: %s, actualDOW: %s, actualWOM: %s, expected: %s, result: %s%n",
                     week, day.getDayOfWeek(), offset, actualDOW, actualWOM, day, result));
             day = day.plusDays(1);
         }
     }
 
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_weekOfYearField(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate day = LocalDate.of(2012, 12, 31);  // Known to be ISO Monday
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
@@ -214,7 +223,7 @@ public class TCKWeekFields extends AbstractTCKTest {
             offset += (actualWOY - 1) * 7;
             LocalDate result = day1.plusDays(offset);
 
-            assertEquals(result, day, "Incorrect dayOfWeek or weekOfYear "
+            assertEquals(day, result, "Incorrect dayOfWeek or weekOfYear "
                     + String.format("%s, ISO Dow: %s, offset: %s, actualDOW: %s, actualWOM: %s, expected: %s, result: %s%n",
                     week, day.getDayOfWeek(), offset, actualDOW, actualWOY, day, result));
             day = day.plusDays(1);
@@ -228,7 +237,8 @@ public class TCKWeekFields extends AbstractTCKTest {
      * @param firstDayOfWeek the first day of the week
      * @param minDays the minimum number of days in the week
      */
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_weekOfWeekBasedYearField(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate day = LocalDate.of(2012, 12, 31);  // Known to be ISO Monday
         WeekFields weekDef = WeekFields.of(firstDayOfWeek, minDays);
@@ -256,14 +266,15 @@ public class TCKWeekFields extends AbstractTCKTest {
             weekStart += (actualWOWBY - 1) * 7;
             LocalDate result = day1.plusDays(weekStart);
 
-            assertEquals(result, day, "Incorrect dayOfWeek or weekOfYear "
+            assertEquals(day, result, "Incorrect dayOfWeek or weekOfYear "
                     + String.format("%s, ISO Dow: %s, weekStart: %s, actualDOW: %s, actualWOWBY: %s, YearOfWBY: %d, expected day: %s, result: %s%n",
                     weekDef, day.getDayOfWeek(), weekStart, actualDOW, actualWOWBY, actualYOWBY, day, result));
             day = day.plusDays(1);
         }
     }
 
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_fieldRanges(DayOfWeek firstDayOfWeek, int minDays) {
         WeekFields weekDef = WeekFields.of(firstDayOfWeek, minDays);
         TemporalField womField = weekDef.weekOfMonth();
@@ -277,10 +288,10 @@ public class TCKWeekFields extends AbstractTCKTest {
             LocalDate first = day.with(DAY_OF_MONTH, 1);
             int firstWOM = first.get(womField);
             ValueRange rangeWOM = day.range(womField);
-            assertEquals(rangeWOM.getMinimum(), firstWOM,
+            assertEquals(firstWOM, rangeWOM.getMinimum(),
                     "Range min should be same as WeekOfMonth for first day of month: "
                     + first + ", " + weekDef);
-            assertEquals(rangeWOM.getMaximum(), lastWOM,
+            assertEquals(lastWOM, rangeWOM.getMaximum(),
                     "Range max should be same as WeekOfMonth for last day of month: "
                     + last + ", " + weekDef);
 
@@ -289,10 +300,10 @@ public class TCKWeekFields extends AbstractTCKTest {
             first = day.with(DAY_OF_YEAR, 1);
             int firstWOY = first.get(woyField);
             ValueRange rangeWOY = day.range(woyField);
-            assertEquals(rangeWOY.getMinimum(), firstWOY,
+            assertEquals(firstWOY, rangeWOY.getMinimum(),
                     "Range min should be same as WeekOfYear for first day of Year: "
                     + day + ", " + weekDef);
-            assertEquals(rangeWOY.getMaximum(), lastWOY,
+            assertEquals(lastWOY, rangeWOY.getMaximum(),
                     "Range max should be same as WeekOfYear for last day of Year: "
                     + day + ", " + weekDef);
 
@@ -303,7 +314,8 @@ public class TCKWeekFields extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     // withDayOfWeek()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_withDayOfWeek(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate day = LocalDate.of(2012, 12, 15);  // Safely in the middle of a month
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
@@ -315,13 +327,14 @@ public class TCKWeekFields extends AbstractTCKTest {
         int woy = day.get(woyField);
         for (int dow = 1; dow <= 7; dow++) {
             LocalDate result = day.with(dowField, dow);
-            assertEquals(result.get(dowField), dow, String.format("Incorrect new Day of week: %s", result));
-            assertEquals(result.get(womField), wom, "Week of Month should not change");
-            assertEquals(result.get(woyField), woy, "Week of Year should not change");
+            assertEquals(dow, result.get(dowField), String.format("Incorrect new Day of week: %s", result));
+            assertEquals(wom, result.get(womField), "Week of Month should not change");
+            assertEquals(woy, result.get(woyField), "Week of Year should not change");
         }
     }
 
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_rangeWeekOfWeekBasedYear(DayOfWeek firstDayOfWeek, int minDays) {
         WeekFields weekFields = WeekFields.of(firstDayOfWeek, minDays);
         TemporalField dowField = weekFields.dayOfWeek();
@@ -336,10 +349,11 @@ public class TCKWeekFields extends AbstractTCKTest {
         int expectedWeeks = (int)ChronoUnit.DAYS.between(day1, day2) / 7;
 
         ValueRange range = day1.range(wowByField);
-        assertEquals(range.getMaximum(), expectedWeeks, "Range incorrect");
+        assertEquals(expectedWeeks, range.getMaximum(), "Range incorrect");
     }
 
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_withWeekOfWeekBasedYear(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate day = LocalDate.of(2012, 12, 31);
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
@@ -350,30 +364,31 @@ public class TCKWeekFields extends AbstractTCKTest {
         int dowExpected = (day.get(dowField) - 1) % 7 + 1;
         LocalDate dowDate = day.with(dowField, dowExpected);
         int dowResult = dowDate.get(dowField);
-        assertEquals(dowResult, dowExpected, "Localized DayOfWeek not correct; " + day + " -->" + dowDate);
+        assertEquals(dowExpected, dowResult, "Localized DayOfWeek not correct; " + day + " -->" + dowDate);
 
         int weekExpected = day.get(wowbyField) + 1;
         ValueRange range = day.range(wowbyField);
         weekExpected = ((weekExpected - 1) % (int)range.getMaximum()) + 1;
         LocalDate weekDate = day.with(wowbyField, weekExpected);
         int weekResult = weekDate.get(wowbyField);
-        assertEquals(weekResult, weekExpected, "Localized WeekOfWeekBasedYear not correct; " + day + " -->" + weekDate);
+        assertEquals(weekExpected, weekResult, "Localized WeekOfWeekBasedYear not correct; " + day + " -->" + weekDate);
 
         int yearExpected = day.get(yowbyField) + 1;
 
         LocalDate yearDate = day.with(yowbyField, yearExpected);
         int yearResult = yearDate.get(yowbyField);
-        assertEquals(yearResult, yearExpected, "Localized WeekBasedYear not correct; " + day  + " --> " + yearDate);
+        assertEquals(yearExpected, yearResult, "Localized WeekBasedYear not correct; " + day  + " --> " + yearDate);
 
         range = yearDate.range(wowbyField);
         weekExpected = Math.min(day.get(wowbyField), (int)range.getMaximum());
 
         int weekActual = yearDate.get(wowbyField);
-        assertEquals(weekActual, weekExpected, "Localized WeekOfWeekBasedYear week should not change; " + day + " --> " + yearDate + ", actual: " + weekActual + ", weekExpected: " + weekExpected);
+        assertEquals(weekExpected, weekActual, "Localized WeekOfWeekBasedYear week should not change; " + day + " --> " + yearDate + ", actual: " + weekActual + ", weekExpected: " + weekExpected);
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_parse_resolve_localizedWom(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 15);
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
@@ -388,13 +403,14 @@ public class TCKWeekFields extends AbstractTCKTest {
             String str = date.getYear() + ":" + date.getMonthValue() + ":" +
                     date.get(womField) + ":" + date.get(DAY_OF_WEEK);
             LocalDate parsed = LocalDate.parse(str, f);
-            assertEquals(parsed, date, " ::" + str + "::" + i);
+            assertEquals(date, parsed, " ::" + str + "::" + i);
 
             date = date.plusDays(1);
         }
     }
 
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_parse_resolve_localizedWom_lenient(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 15);
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
@@ -411,14 +427,15 @@ public class TCKWeekFields extends AbstractTCKTest {
             for (int j = wom - 10; j < wom + 10; j++) {
                 String str = date.getYear() + ":" + date.getMonthValue() + ":" + j + ":" + dow;
                 LocalDate parsed = LocalDate.parse(str, f);
-                assertEquals(parsed, date.plusWeeks(j - wom), " ::" + str + ": :" + i + "::" + j);
+                assertEquals(date.plusWeeks(j - wom), parsed, " ::" + str + ": :" + i + "::" + j);
             }
 
             date = date.plusDays(1);
         }
     }
 
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_parse_resolve_localizedWom_strict(DayOfWeek firstDayOfWeek, int minDays) {
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
         TemporalField womField = week.weekOfMonth();
@@ -430,17 +447,18 @@ public class TCKWeekFields extends AbstractTCKTest {
         String str = "2012:1:0:1";
         try {
             LocalDate date = LocalDate.parse(str, f);
-            assertEquals(date.getYear(), 2012);
-            assertEquals(date.getMonthValue(), 1);
-            assertEquals(date.get(womField), 0);
-            assertEquals(date.get(DAY_OF_WEEK), 1);
+            assertEquals(2012, date.getYear());
+            assertEquals(1, date.getMonthValue());
+            assertEquals(0, date.get(womField));
+            assertEquals(1, date.get(DAY_OF_WEEK));
         } catch (DateTimeException ex) {
             // expected
         }
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_parse_resolve_localizedWomDow(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 15);
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
@@ -456,13 +474,14 @@ public class TCKWeekFields extends AbstractTCKTest {
             String str = date.getYear() + ":" + date.getMonthValue() + ":" +
                     date.get(womField) + ":" + date.get(dowField);
             LocalDate parsed = LocalDate.parse(str, f);
-            assertEquals(parsed, date, " :: " + str + " " + i);
+            assertEquals(date, parsed, " :: " + str + " " + i);
 
             date = date.plusDays(1);
         }
     }
 
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_parse_resolve_localizedWomDow_lenient(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 15);
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
@@ -480,7 +499,7 @@ public class TCKWeekFields extends AbstractTCKTest {
             for (int j = wom - 10; j < wom + 10; j++) {
                 String str = date.getYear() + ":" + date.getMonthValue() + ":" + j + ":" + dow;
                 LocalDate parsed = LocalDate.parse(str, f);
-                assertEquals(parsed, date.plusWeeks(j - wom), " ::" + str + ": :" + i + "::" + j);
+                assertEquals(date.plusWeeks(j - wom), parsed, " ::" + str + ": :" + i + "::" + j);
             }
 
             date = date.plusDays(1);
@@ -488,7 +507,8 @@ public class TCKWeekFields extends AbstractTCKTest {
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_parse_resolve_localizedWoy(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 15);
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
@@ -502,13 +522,14 @@ public class TCKWeekFields extends AbstractTCKTest {
             String str = date.getYear() + ":" +
                     date.get(woyField) + ":" + date.get(DAY_OF_WEEK);
             LocalDate parsed = LocalDate.parse(str, f);
-            assertEquals(parsed, date, " :: " + str + " " + i);
+            assertEquals(date, parsed, " :: " + str + " " + i);
 
             date = date.plusDays(1);
         }
     }
 
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_parse_resolve_localizedWoy_lenient(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 15);
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
@@ -524,14 +545,15 @@ public class TCKWeekFields extends AbstractTCKTest {
             for (int j = woy - 60; j < woy + 60; j++) {
                 String str = date.getYear() + ":" + j + ":" + dow;
                 LocalDate parsed = LocalDate.parse(str, f);
-                assertEquals(parsed, date.plusWeeks(j - woy), " ::" + str + ": :" + i + "::" + j);
+                assertEquals(date.plusWeeks(j - woy), parsed, " ::" + str + ": :" + i + "::" + j);
             }
 
             date = date.plusDays(1);
         }
     }
 
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_parse_resolve_localizedWoy_strict(DayOfWeek firstDayOfWeek, int minDays) {
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
         TemporalField woyField = week.weekOfYear();
@@ -542,16 +564,17 @@ public class TCKWeekFields extends AbstractTCKTest {
         String str = "2012:0:1";
         try {
             LocalDate date = LocalDate.parse(str, f);
-            assertEquals(date.getYear(), 2012);
-            assertEquals(date.get(woyField), 0);
-            assertEquals(date.get(DAY_OF_WEEK), 1);
+            assertEquals(2012, date.getYear());
+            assertEquals(0, date.get(woyField));
+            assertEquals(1, date.get(DAY_OF_WEEK));
         } catch (DateTimeException ex) {
             // expected
         }
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_parse_resolve_localizedWoyDow(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 15);
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
@@ -567,13 +590,14 @@ public class TCKWeekFields extends AbstractTCKTest {
             String str = date.getYear() + ":" + date.getMonthValue() + ":" +
                     date.get(woyField) + ":" + date.get(dowField);
             LocalDate parsed = LocalDate.parse(str, f);
-            assertEquals(parsed, date, " :: " + str + " " + i);
+            assertEquals(date, parsed, " :: " + str + " " + i);
 
             date = date.plusDays(1);
         }
     }
 
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_parse_resolve_localizedWoyDow_lenient(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 15);
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
@@ -590,7 +614,7 @@ public class TCKWeekFields extends AbstractTCKTest {
             for (int j = woy - 60; j < woy + 60; j++) {
                 String str = date.getYear() + ":" + j + ":" + dow;
                 LocalDate parsed = LocalDate.parse(str, f);
-                assertEquals(parsed, date.plusWeeks(j - woy), " ::" + str + ": :" + i + "::" + j);
+                assertEquals(date.plusWeeks(j - woy), parsed, " ::" + str + ": :" + i + "::" + j);
             }
 
             date = date.plusDays(1);
@@ -598,7 +622,8 @@ public class TCKWeekFields extends AbstractTCKTest {
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_parse_resolve_localizedWoWBY(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 31);
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
@@ -613,13 +638,14 @@ public class TCKWeekFields extends AbstractTCKTest {
             String str = date.get(yowbyField) + ":" + date.get(wowbyField) + ":" +
                     date.get(DAY_OF_WEEK);
             LocalDate parsed = LocalDate.parse(str, f);
-            assertEquals(parsed, date, " :: " + str + " " + i);
+            assertEquals(date, parsed, " :: " + str + " " + i);
 
             date = date.plusDays(1);
         }
     }
 
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_parse_resolve_localizedWoWBY_lenient(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 31);
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
@@ -636,14 +662,15 @@ public class TCKWeekFields extends AbstractTCKTest {
             for (int j = wowby - 60; j < wowby + 60; j++) {
                 String str = date.get(yowbyField) + ":" + j + ":" + dow;
                 LocalDate parsed = LocalDate.parse(str, f);
-                assertEquals(parsed, date.plusWeeks(j - wowby), " ::" + str + ": :" + i + "::" + j);
+                assertEquals(date.plusWeeks(j - wowby), parsed, " ::" + str + ": :" + i + "::" + j);
             }
 
             date = date.plusDays(1);
         }
     }
 
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_parse_resolve_localizedWoWBY_strict(DayOfWeek firstDayOfWeek, int minDays) {
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
         TemporalField wowbyField = week.weekOfWeekBasedYear();
@@ -655,16 +682,17 @@ public class TCKWeekFields extends AbstractTCKTest {
         String str = "2012:0:1";
         try {
             LocalDate date = LocalDate.parse(str, f);
-            assertEquals(date.get(yowbyField), 2012);
-            assertEquals(date.get(wowbyField), 0);
-            assertEquals(date.get(DAY_OF_WEEK), 1);
+            assertEquals(2012, date.get(yowbyField));
+            assertEquals(0, date.get(wowbyField));
+            assertEquals(1, date.get(DAY_OF_WEEK));
         } catch (DateTimeException ex) {
             // expected
         }
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_parse_resolve_localizedWoWBYDow(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 31);
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
@@ -680,13 +708,14 @@ public class TCKWeekFields extends AbstractTCKTest {
             String str = date.get(yowbyField) + ":" + date.get(wowbyField) + ":" +
                     date.get(dowField);
             LocalDate parsed = LocalDate.parse(str, f);
-            assertEquals(parsed, date, " :: " + str + " " + i);
+            assertEquals(date, parsed, " :: " + str + " " + i);
 
             date = date.plusDays(1);
         }
     }
 
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_parse_resolve_localizedWoWBYDow_lenient(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 31);
         WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
@@ -704,7 +733,7 @@ public class TCKWeekFields extends AbstractTCKTest {
             for (int j = wowby - 60; j < wowby + 60; j++) {
                 String str = date.get(yowbyField) + ":" + j + ":" + dow;
                 LocalDate parsed = LocalDate.parse(str, f);
-                assertEquals(parsed, date.plusWeeks(j - wowby), " ::" + str + ": :" + i + "::" + j);
+                assertEquals(date.plusWeeks(j - wowby), parsed, " ::" + str + ": :" + i + "::" + j);
             }
 
             date = date.plusDays(1);
@@ -713,7 +742,6 @@ public class TCKWeekFields extends AbstractTCKTest {
 
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="weekFields")
     Object[][] data_weekFields() {
         Object[][] objects = new Object[49][];
         int i = 0;
@@ -726,7 +754,6 @@ public class TCKWeekFields extends AbstractTCKTest {
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="WeekBasedYearData")
     Object[][] provider_WeekBasedYearData() {
         return new Object[][] {
             {WeekFields.of(DayOfWeek.SUNDAY, 1),  2008, 52, 7, LocalDate.of(2008, 12, 27)},
@@ -741,20 +768,20 @@ public class TCKWeekFields extends AbstractTCKTest {
        };
     }
 
-    @Test(dataProvider="WeekBasedYearData")
+    @ParameterizedTest
+    @MethodSource("provider_WeekBasedYearData")
     public void test_weekBasedYears(WeekFields weekDef, int weekBasedYear,
             int weekOfWeekBasedYear, int dayOfWeek, LocalDate date) {
         TemporalField dowField = weekDef.dayOfWeek();
         TemporalField wowbyField = weekDef.weekOfWeekBasedYear();
         TemporalField yowbyField = weekDef.weekBasedYear();
-        assertEquals(date.get(dowField), dayOfWeek, "DayOfWeek mismatch");
-        assertEquals(date.get(wowbyField), weekOfWeekBasedYear, "Week of WeekBasedYear mismatch");
-        assertEquals(date.get(yowbyField), weekBasedYear, "Year of WeekBasedYear mismatch");
+        assertEquals(dayOfWeek, date.get(dowField), "DayOfWeek mismatch");
+        assertEquals(weekOfWeekBasedYear, date.get(wowbyField), "Week of WeekBasedYear mismatch");
+        assertEquals(weekBasedYear, date.get(yowbyField), "Year of WeekBasedYear mismatch");
     }
 
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="IsoWeekData")
     Object[][] data_week() {
         return new Object[][] {
                 {LocalDate.of(1969, 12, 29), DayOfWeek.MONDAY, 1, 1970},
@@ -776,16 +803,17 @@ public class TCKWeekFields extends AbstractTCKTest {
     // WEEK_OF_WEEK_BASED_YEAR
     // Validate with the same data used by IsoFields.
     //-----------------------------------------------------------------------
-    @Test(dataProvider="IsoWeekData")
+    @ParameterizedTest
+    @MethodSource("data_week")
     public void test_WOWBY(LocalDate date, DayOfWeek dow, int week, int wby) {
         WeekFields weekDef = WeekFields.ISO;
         TemporalField dowField = weekDef.dayOfWeek();
         TemporalField wowbyField = weekDef.weekOfWeekBasedYear();
         TemporalField yowbyField = weekDef.weekBasedYear();
 
-        assertEquals(date.get(dowField), dow.getValue());
-        assertEquals(date.get(wowbyField), week);
-        assertEquals(date.get(yowbyField), wby);
+        assertEquals(dow.getValue(), date.get(dowField));
+        assertEquals(week, date.get(wowbyField));
+        assertEquals(wby, date.get(yowbyField));
     }
 
     //-----------------------------------------------------------------------
@@ -798,11 +826,11 @@ public class TCKWeekFields extends AbstractTCKTest {
 
         assertTrue(weekDef_iso.equals(WeekFields.of(DayOfWeek.MONDAY, 4)));
         assertTrue(weekDef_sundayStart.equals(WeekFields.of(DayOfWeek.SUNDAY, 1)));
-        assertEquals(weekDef_iso.hashCode(), WeekFields.of(DayOfWeek.MONDAY, 4).hashCode());
-        assertEquals(weekDef_sundayStart.hashCode(), WeekFields.of(DayOfWeek.SUNDAY, 1).hashCode());
+        assertEquals(WeekFields.of(DayOfWeek.MONDAY, 4).hashCode(), weekDef_iso.hashCode());
+        assertEquals(WeekFields.of(DayOfWeek.SUNDAY, 1).hashCode(), weekDef_sundayStart.hashCode());
 
         assertFalse(weekDef_iso.equals(weekDef_sundayStart));
-        assertNotEquals(weekDef_iso.hashCode(), weekDef_sundayStart.hashCode());
+        assertNotEquals(weekDef_sundayStart.hashCode(), weekDef_iso.hashCode());
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/temporal/serial/TCKChronoFieldSerialization.java b/test/jdk/java/time/tck/java/time/temporal/serial/TCKChronoFieldSerialization.java
index bb8c5c566a5..b82a278cb34 100644
--- a/test/jdk/java/time/tck/java/time/temporal/serial/TCKChronoFieldSerialization.java
+++ b/test/jdk/java/time/tck/java/time/temporal/serial/TCKChronoFieldSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,21 +86,21 @@ import static java.time.temporal.ChronoField.ERA;
 import java.io.IOException;
 import java.time.temporal.ChronoField;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import tck.java.time.AbstractTCKTest;
 
 /**
  * Test serialization of ChronoField.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKChronoFieldSerialization extends AbstractTCKTest {
 
     //-----------------------------------------------------------------------
     // List of Fields
     //-----------------------------------------------------------------------
-    @DataProvider(name="fieldBased")
     Object[][] data_fieldBased() {
         return new Object[][] {
                 {DAY_OF_WEEK},
@@ -135,7 +135,8 @@ public class TCKChronoFieldSerialization extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider = "fieldBased")
+    @ParameterizedTest
+    @MethodSource("data_fieldBased")
     public void test_fieldSerializable(ChronoField field) throws IOException, ClassNotFoundException {
         assertSerializableSame(field);
     }
diff --git a/test/jdk/java/time/tck/java/time/temporal/serial/TCKChronoUnitSerialization.java b/test/jdk/java/time/tck/java/time/temporal/serial/TCKChronoUnitSerialization.java
index e97e183d252..9714220b7be 100644
--- a/test/jdk/java/time/tck/java/time/temporal/serial/TCKChronoUnitSerialization.java
+++ b/test/jdk/java/time/tck/java/time/temporal/serial/TCKChronoUnitSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,21 +74,21 @@ import static java.time.temporal.ChronoUnit.YEARS;
 import java.io.IOException;
 import java.time.temporal.ChronoUnit;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import tck.java.time.AbstractTCKTest;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKChronoUnitSerialization extends AbstractTCKTest {
 
     //-----------------------------------------------------------------------
     // ChronoUnits
     //-----------------------------------------------------------------------
-    @DataProvider(name="chronoUnit")
     Object[][] data_chronoUnit() {
         return new Object[][] {
                 {FOREVER},
@@ -112,7 +112,8 @@ public class TCKChronoUnitSerialization extends AbstractTCKTest {
         };
     }
 
-    @Test(dataProvider = "chronoUnit")
+    @ParameterizedTest
+    @MethodSource("data_chronoUnit")
     public void test_unitType(ChronoUnit unit) throws IOException, ClassNotFoundException {
         assertSerializableSame(unit);
     }
diff --git a/test/jdk/java/time/tck/java/time/temporal/serial/TCKJulianFieldsSerialization.java b/test/jdk/java/time/tck/java/time/temporal/serial/TCKJulianFieldsSerialization.java
index 53047f8441a..a861290ac0e 100644
--- a/test/jdk/java/time/tck/java/time/temporal/serial/TCKJulianFieldsSerialization.java
+++ b/test/jdk/java/time/tck/java/time/temporal/serial/TCKJulianFieldsSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,19 +63,19 @@ import java.io.IOException;
 import java.time.temporal.JulianFields;
 import java.time.temporal.TemporalField;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import tck.java.time.AbstractTCKTest;
 
 /**
  * Test serialization of JulianFields
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKJulianFieldsSerialization extends AbstractTCKTest {
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="julian_fields")
     Object[][] julian_samples() {
         return new Object[][] {
             {JulianFields.JULIAN_DAY},
@@ -86,7 +86,8 @@ public class TCKJulianFieldsSerialization extends AbstractTCKTest {
 
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="julian_fields")
+    @ParameterizedTest
+    @MethodSource("julian_samples")
     public void test_serializable(TemporalField field) throws IOException, ClassNotFoundException {
         assertSerializable(field);
     }
diff --git a/test/jdk/java/time/tck/java/time/temporal/serial/TCKValueRangeSerialization.java b/test/jdk/java/time/tck/java/time/temporal/serial/TCKValueRangeSerialization.java
index d99efd03535..a3612e7f6a6 100644
--- a/test/jdk/java/time/tck/java/time/temporal/serial/TCKValueRangeSerialization.java
+++ b/test/jdk/java/time/tck/java/time/temporal/serial/TCKValueRangeSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,7 @@
  */
 package tck.java.time.temporal.serial;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -71,19 +70,20 @@ import java.io.ObjectOutputStream;
 import java.time.temporal.ValueRange;
 import java.util.Arrays;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import tck.java.time.AbstractTCKTest;
 
 /**
  * Test serialization of ValueRange.
  */
-@Test
 public class TCKValueRangeSerialization extends AbstractTCKTest {
 
     //-----------------------------------------------------------------------
     // Serialization
     //-----------------------------------------------------------------------
+    @Test
     public void test_serialization() throws Exception {
         ValueRange range = ValueRange.of(1, 2, 3, 4);
         assertSerializable(range);
@@ -94,6 +94,7 @@ public class TCKValueRangeSerialization extends AbstractTCKTest {
      * Verify Serialized bytes of a ValueRange.
      * @throws IOException if thrown during serialization is an unexpected test tailure
      */
+    @Test
     public void test_valueRangeSerialized() throws IOException {
         byte[] expected = {
             (byte)172, (byte)237,   0,   5, 115, 114,   0,  29, 106,  97, /* \u00ac \u00ed \u0000 \u0005 s r \u0000 \u001d j a */
@@ -118,7 +119,7 @@ public class TCKValueRangeSerialization extends AbstractTCKTest {
             oos.writeObject(range);
 
             byte[] actual = baos.toByteArray();
-            assertEquals(actual, expected, "Serialized bytes incorrect");
+            Assertions.assertArrayEquals(expected, actual, "Serialized bytes incorrect");
         }
     }
 
diff --git a/test/jdk/java/time/tck/java/time/temporal/serial/TCKWeekFieldsSerialization.java b/test/jdk/java/time/tck/java/time/temporal/serial/TCKWeekFieldsSerialization.java
index 3523f05c88c..34171276cd1 100644
--- a/test/jdk/java/time/tck/java/time/temporal/serial/TCKWeekFieldsSerialization.java
+++ b/test/jdk/java/time/tck/java/time/temporal/serial/TCKWeekFieldsSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,13 +54,11 @@
  */
 package tck.java.time.temporal.serial;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import tck.java.time.AbstractTCKTest;
 
 import java.io.IOException;
@@ -70,21 +68,26 @@ import java.time.DayOfWeek;
 import java.time.temporal.WeekFields;
 import java.util.Arrays;
 
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 /**
  * Test serialization of WeekFields.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKWeekFieldsSerialization extends AbstractTCKTest {
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="weekFields")
+    @ParameterizedTest
+    @MethodSource("data_weekFields")
     public void test_serializable_singleton(DayOfWeek firstDayOfWeek, int minDays) throws IOException, ClassNotFoundException {
         WeekFields weekDef = WeekFields.of(firstDayOfWeek, minDays);
         assertSerializableSame(weekDef);  // spec state singleton
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="weekFields")
     Object[][] data_weekFields() {
         Object[][] objects = new Object[49][];
         int i = 0;
@@ -110,7 +113,7 @@ public class TCKWeekFieldsSerialization extends AbstractTCKTest {
         System.arraycopy(good1, 0, val, 105, good1.length);
         try (ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(val))) {
             Object o = in.readObject();
-            assertEquals(o, WeekFields.of(DayOfWeek.MONDAY, 5), "Should be MONDAY, min = 5");
+            assertEquals(WeekFields.of(DayOfWeek.MONDAY, 5), o, "Should be MONDAY, min = 5");
         } catch (Exception ioe) {
             fail("Unexpected exception " + ioe);
         }
diff --git a/test/jdk/java/time/tck/java/time/zone/TCKFixedZoneRules.java b/test/jdk/java/time/tck/java/time/zone/TCKFixedZoneRules.java
index 08df5433349..83d8af37306 100644
--- a/test/jdk/java/time/tck/java/time/zone/TCKFixedZoneRules.java
+++ b/test/jdk/java/time/tck/java/time/zone/TCKFixedZoneRules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@
  */
 package tck.java.time.zone;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -76,13 +76,16 @@ import java.time.zone.ZoneOffsetTransitionRule;
 import java.time.zone.ZoneOffsetTransitionRule.TimeDefinition;
 import java.time.zone.ZoneRules;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test ZoneRules for fixed offset time-zones.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKFixedZoneRules {
 
     private static final ZoneOffset OFFSET_PONE = ZoneOffset.ofHours(1);
@@ -95,7 +98,6 @@ public class TCKFixedZoneRules {
         return offset.getRules();
     }
 
-    @DataProvider(name="rules")
     Object[][] data_rules() {
         return new Object[][] {
             {make(OFFSET_PONE), OFFSET_PONE},
@@ -108,95 +110,111 @@ public class TCKFixedZoneRules {
     // Basics
     //-----------------------------------------------------------------------
 
-    @Test(dataProvider="rules")
+    @ParameterizedTest
+    @MethodSource("data_rules")
     public void test_getOffset_Instant(ZoneRules test, ZoneOffset expectedOffset) {
-        assertEquals(test.getOffset(INSTANT), expectedOffset);
-        assertEquals(test.getOffset((Instant) null), expectedOffset);
+        assertEquals(expectedOffset, test.getOffset(INSTANT));
+        assertEquals(expectedOffset, test.getOffset((Instant) null));
     }
 
-    @Test(dataProvider="rules")
+    @ParameterizedTest
+    @MethodSource("data_rules")
     public void test_getOffset_LocalDateTime(ZoneRules test, ZoneOffset expectedOffset) {
-        assertEquals(test.getOffset(LDT), expectedOffset);
-        assertEquals(test.getOffset((LocalDateTime) null), expectedOffset);
+        assertEquals(expectedOffset, test.getOffset(LDT));
+        assertEquals(expectedOffset, test.getOffset((LocalDateTime) null));
     }
 
-    @Test(dataProvider="rules")
+    @ParameterizedTest
+    @MethodSource("data_rules")
     public void test_getValidOffsets_LDT(ZoneRules test, ZoneOffset expectedOffset) {
-        assertEquals(test.getValidOffsets(LDT).size(), 1);
-        assertEquals(test.getValidOffsets(LDT).get(0), expectedOffset);
-        assertEquals(test.getValidOffsets(null).size(), 1);
-        assertEquals(test.getValidOffsets(null).get(0), expectedOffset);
+        assertEquals(1, test.getValidOffsets(LDT).size());
+        assertEquals(expectedOffset, test.getValidOffsets(LDT).get(0));
+        assertEquals(1, test.getValidOffsets(null).size());
+        assertEquals(expectedOffset, test.getValidOffsets(null).get(0));
     }
 
-    @Test(dataProvider="rules")
+    @ParameterizedTest
+    @MethodSource("data_rules")
     public void test_getTransition_LDT(ZoneRules test, ZoneOffset expectedOffset) {
-        assertEquals(test.getTransition(LDT), null);
-        assertEquals(test.getTransition(null), null);
+        assertEquals(null, test.getTransition(LDT));
+        assertEquals(null, test.getTransition(null));
     }
 
-    @Test(dataProvider="rules")
+    @ParameterizedTest
+    @MethodSource("data_rules")
     public void test_isValidOffset_LDT_ZO(ZoneRules test, ZoneOffset expectedOffset) {
-        assertEquals(test.isValidOffset(LDT, expectedOffset), true);
-        assertEquals(test.isValidOffset(LDT, ZoneOffset.UTC), false);
-        assertEquals(test.isValidOffset(LDT, null), false);
+        assertEquals(true, test.isValidOffset(LDT, expectedOffset));
+        assertEquals(false, test.isValidOffset(LDT, ZoneOffset.UTC));
+        assertEquals(false, test.isValidOffset(LDT, null));
 
-        assertEquals(test.isValidOffset(null, expectedOffset), true);
-        assertEquals(test.isValidOffset(null, ZoneOffset.UTC), false);
-        assertEquals(test.isValidOffset(null, null), false);
+        assertEquals(true, test.isValidOffset(null, expectedOffset));
+        assertEquals(false, test.isValidOffset(null, ZoneOffset.UTC));
+        assertEquals(false, test.isValidOffset(null, null));
     }
 
-    @Test(dataProvider="rules")
+    @ParameterizedTest
+    @MethodSource("data_rules")
     public void test_getStandardOffset_Instant(ZoneRules test, ZoneOffset expectedOffset) {
-        assertEquals(test.getStandardOffset(INSTANT), expectedOffset);
-        assertEquals(test.getStandardOffset(null), expectedOffset);
+        assertEquals(expectedOffset, test.getStandardOffset(INSTANT));
+        assertEquals(expectedOffset, test.getStandardOffset(null));
     }
 
-    @Test(dataProvider="rules")
+    @ParameterizedTest
+    @MethodSource("data_rules")
     public void test_getDaylightSavings_Instant(ZoneRules test, ZoneOffset expectedOffset) {
-        assertEquals(test.getDaylightSavings(INSTANT), Duration.ZERO);
-        assertEquals(test.getDaylightSavings(null), Duration.ZERO);
+        assertEquals(Duration.ZERO, test.getDaylightSavings(INSTANT));
+        assertEquals(Duration.ZERO, test.getDaylightSavings(null));
     }
 
-    @Test(dataProvider="rules")
+    @ParameterizedTest
+    @MethodSource("data_rules")
     public void test_isDaylightSavings_Instant(ZoneRules test, ZoneOffset expectedOffset) {
-        assertEquals(test.isDaylightSavings(INSTANT), false);
-        assertEquals(test.isDaylightSavings(null), false);
+        assertEquals(false, test.isDaylightSavings(INSTANT));
+        assertEquals(false, test.isDaylightSavings(null));
     }
 
     //-------------------------------------------------------------------------
-    @Test(dataProvider="rules")
+    @ParameterizedTest
+    @MethodSource("data_rules")
     public void test_nextTransition_Instant(ZoneRules test, ZoneOffset expectedOffset) {
-        assertEquals(test.nextTransition(INSTANT), null);
-        assertEquals(test.nextTransition(null), null);
+        assertEquals(null, test.nextTransition(INSTANT));
+        assertEquals(null, test.nextTransition(null));
     }
 
-    @Test(dataProvider="rules")
+    @ParameterizedTest
+    @MethodSource("data_rules")
     public void test_previousTransition_Instant(ZoneRules test, ZoneOffset expectedOffset) {
-        assertEquals(test.previousTransition(INSTANT), null);
-        assertEquals(test.previousTransition(null), null);
+        assertEquals(null, test.previousTransition(INSTANT));
+        assertEquals(null, test.previousTransition(null));
     }
 
     //-------------------------------------------------------------------------
-    @Test(dataProvider="rules")
+    @ParameterizedTest
+    @MethodSource("data_rules")
     public void test_getTransitions(ZoneRules test, ZoneOffset expectedOffset) {
-        assertEquals(test.getTransitions().size(), 0);
+        assertEquals(0, test.getTransitions().size());
     }
 
-    @Test(expectedExceptions=UnsupportedOperationException.class)
+    @Test
     public void test_getTransitions_immutable() {
-        ZoneRules test = make(OFFSET_PTWO);
-        test.getTransitions().add(ZoneOffsetTransition.of(LDT, OFFSET_PONE, OFFSET_PTWO));
+        Assertions.assertThrows(UnsupportedOperationException.class, () -> {
+            ZoneRules test = make(OFFSET_PTWO);
+            test.getTransitions().add(ZoneOffsetTransition.of(LDT, OFFSET_PONE, OFFSET_PTWO));
+        });
     }
 
-    @Test(dataProvider="rules")
+    @ParameterizedTest
+    @MethodSource("data_rules")
     public void test_getTransitionRules(ZoneRules test, ZoneOffset expectedOffset) {
-        assertEquals(test.getTransitionRules().size(), 0);
+        assertEquals(0, test.getTransitionRules().size());
     }
 
-    @Test(expectedExceptions=UnsupportedOperationException.class)
+    @Test
     public void test_getTransitionRules_immutable() {
-        ZoneRules test = make(OFFSET_PTWO);
-        test.getTransitionRules().add(ZoneOffsetTransitionRule.of(Month.JULY, 2, null, LocalTime.of(12, 30), false, TimeDefinition.STANDARD, OFFSET_PONE, OFFSET_PTWO, OFFSET_PONE));
+        Assertions.assertThrows(UnsupportedOperationException.class, () -> {
+            ZoneRules test = make(OFFSET_PTWO);
+            test.getTransitionRules().add(ZoneOffsetTransitionRule.of(Month.JULY, 2, null, LocalTime.of(12, 30), false, TimeDefinition.STANDARD, OFFSET_PONE, OFFSET_PTWO, OFFSET_PONE));
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -207,16 +225,16 @@ public class TCKFixedZoneRules {
         ZoneRules a = make(OFFSET_PONE);
         ZoneRules b = make(OFFSET_PTWO);
 
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), false);
-        assertEquals(b.equals(a), false);
-        assertEquals(b.equals(b), true);
+        assertEquals(true, a.equals(a));
+        assertEquals(false, a.equals(b));
+        assertEquals(false, b.equals(a));
+        assertEquals(true, b.equals(b));
 
-        assertEquals(a.equals("Rubbish"), false);
-        assertEquals(a.equals(null), false);
+        assertEquals(false, a.equals("Rubbish"));
+        assertEquals(false, a.equals(null));
 
-        assertEquals(a.hashCode() == a.hashCode(), true);
-        assertEquals(b.hashCode() == b.hashCode(), true);
+        assertEquals(true, a.hashCode() == a.hashCode());
+        assertEquals(true, b.hashCode() == b.hashCode());
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/zone/TCKZoneOffsetTransition.java b/test/jdk/java/time/tck/java/time/zone/TCKZoneOffsetTransition.java
index 9cd42624bfa..241da3d0519 100644
--- a/test/jdk/java/time/tck/java/time/zone/TCKZoneOffsetTransition.java
+++ b/test/jdk/java/time/tck/java/time/zone/TCKZoneOffsetTransition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,8 @@
 package tck.java.time.zone;
 
 import static java.time.temporal.ChronoUnit.HOURS;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
@@ -68,13 +69,14 @@ import java.time.Year;
 import java.time.ZoneOffset;
 import java.time.zone.ZoneOffsetTransition;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 import tck.java.time.AbstractTCKTest;
 
 /**
  * Test ZoneOffsetTransition.
  */
-@Test
 public class TCKZoneOffsetTransition extends AbstractTCKTest {
 
     private static final ZoneOffset OFFSET_0100 = ZoneOffset.ofHours(1);
@@ -86,29 +88,29 @@ public class TCKZoneOffsetTransition extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     // factory
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_factory_nullTransition() {
-        ZoneOffsetTransition.of(null, OFFSET_0100, OFFSET_0200);
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneOffsetTransition.of(null, OFFSET_0100, OFFSET_0200));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_factory_nullOffsetBefore() {
-        ZoneOffsetTransition.of(LocalDateTime.of(2010, 12, 3, 11, 30), null, OFFSET_0200);
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneOffsetTransition.of(LocalDateTime.of(2010, 12, 3, 11, 30), null, OFFSET_0200));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_factory_nullOffsetAfter() {
-        ZoneOffsetTransition.of(LocalDateTime.of(2010, 12, 3, 11, 30), OFFSET_0200, null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneOffsetTransition.of(LocalDateTime.of(2010, 12, 3, 11, 30), OFFSET_0200, null));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_factory_sameOffset() {
-        ZoneOffsetTransition.of(LocalDateTime.of(2010, 12, 3, 11, 30), OFFSET_0200, OFFSET_0200);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> ZoneOffsetTransition.of(LocalDateTime.of(2010, 12, 3, 11, 30), OFFSET_0200, OFFSET_0200));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_factory_noNanos() {
-        ZoneOffsetTransition.of(LocalDateTime.of(2010, 12, 3, 11, 30, 0, 500), OFFSET_0200, OFFSET_0300);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> ZoneOffsetTransition.of(LocalDateTime.of(2010, 12, 3, 11, 30, 0, 500), OFFSET_0200, OFFSET_0300));
     }
 
     //-----------------------------------------------------------------------
@@ -119,14 +121,14 @@ public class TCKZoneOffsetTransition extends AbstractTCKTest {
         LocalDateTime before = LocalDateTime.of(2010, 3, 31, 1, 0);
         LocalDateTime after = LocalDateTime.of(2010, 3, 31, 2, 0);
         ZoneOffsetTransition test = ZoneOffsetTransition.of(before, OFFSET_0200, OFFSET_0300);
-        assertEquals(test.isGap(), true);
-        assertEquals(test.isOverlap(), false);
-        assertEquals(test.getDateTimeBefore(), before);
-        assertEquals(test.getDateTimeAfter(), after);
-        assertEquals(test.getInstant(), before.toInstant(OFFSET_0200));
-        assertEquals(test.getOffsetBefore(), OFFSET_0200);
-        assertEquals(test.getOffsetAfter(), OFFSET_0300);
-        assertEquals(test.getDuration(), Duration.of(1, HOURS));
+        assertEquals(true, test.isGap());
+        assertEquals(false, test.isOverlap());
+        assertEquals(before, test.getDateTimeBefore());
+        assertEquals(after, test.getDateTimeAfter());
+        assertEquals(before.toInstant(OFFSET_0200), test.getInstant());
+        assertEquals(OFFSET_0200, test.getOffsetBefore());
+        assertEquals(OFFSET_0300, test.getOffsetAfter());
+        assertEquals(Duration.of(1, HOURS), test.getDuration());
     }
 
     @Test
@@ -134,14 +136,14 @@ public class TCKZoneOffsetTransition extends AbstractTCKTest {
         LocalDateTime before = LocalDateTime.of(2010, 10, 31, 1, 0);
         LocalDateTime after = LocalDateTime.of(2010, 10, 31, 0, 0);
         ZoneOffsetTransition test = ZoneOffsetTransition.of(before, OFFSET_0300, OFFSET_0200);
-        assertEquals(test.isGap(), false);
-        assertEquals(test.isOverlap(), true);
-        assertEquals(test.getDateTimeBefore(), before);
-        assertEquals(test.getDateTimeAfter(), after);
-        assertEquals(test.getInstant(), before.toInstant(OFFSET_0300));
-        assertEquals(test.getOffsetBefore(), OFFSET_0300);
-        assertEquals(test.getOffsetAfter(), OFFSET_0200);
-        assertEquals(test.getDuration(), Duration.of(-1, HOURS));
+        assertEquals(false, test.isGap());
+        assertEquals(true, test.isOverlap());
+        assertEquals(before, test.getDateTimeBefore());
+        assertEquals(after, test.getDateTimeAfter());
+        assertEquals(before.toInstant(OFFSET_0300), test.getInstant());
+        assertEquals(OFFSET_0300, test.getOffsetBefore());
+        assertEquals(OFFSET_0200, test.getOffsetAfter());
+        assertEquals(Duration.of(-1, HOURS), test.getDuration());
     }
 
 
@@ -152,22 +154,22 @@ public class TCKZoneOffsetTransition extends AbstractTCKTest {
     public void test_isValidOffset_gap() {
         LocalDateTime ldt = LocalDateTime.of(2010, 3, 31, 1, 0);
         ZoneOffsetTransition test = ZoneOffsetTransition.of(ldt, OFFSET_0200, OFFSET_0300);
-        assertEquals(test.isValidOffset(OFFSET_0100), false);
-        assertEquals(test.isValidOffset(OFFSET_0200), false);
-        assertEquals(test.isValidOffset(OFFSET_0230), false);
-        assertEquals(test.isValidOffset(OFFSET_0300), false);
-        assertEquals(test.isValidOffset(OFFSET_0400), false);
+        assertEquals(false, test.isValidOffset(OFFSET_0100));
+        assertEquals(false, test.isValidOffset(OFFSET_0200));
+        assertEquals(false, test.isValidOffset(OFFSET_0230));
+        assertEquals(false, test.isValidOffset(OFFSET_0300));
+        assertEquals(false, test.isValidOffset(OFFSET_0400));
     }
 
     @Test
     public void test_isValidOffset_overlap() {
         LocalDateTime ldt = LocalDateTime.of(2010, 10, 31, 1, 0);
         ZoneOffsetTransition test = ZoneOffsetTransition.of(ldt, OFFSET_0300, OFFSET_0200);
-        assertEquals(test.isValidOffset(OFFSET_0100), false);
-        assertEquals(test.isValidOffset(OFFSET_0200), true);
-        assertEquals(test.isValidOffset(OFFSET_0230), false);
-        assertEquals(test.isValidOffset(OFFSET_0300), true);
-        assertEquals(test.isValidOffset(OFFSET_0400), false);
+        assertEquals(false, test.isValidOffset(OFFSET_0100));
+        assertEquals(true, test.isValidOffset(OFFSET_0200));
+        assertEquals(false, test.isValidOffset(OFFSET_0230));
+        assertEquals(true, test.isValidOffset(OFFSET_0300));
+        assertEquals(false, test.isValidOffset(OFFSET_0400));
     }
 
     //-----------------------------------------------------------------------
@@ -182,17 +184,17 @@ public class TCKZoneOffsetTransition extends AbstractTCKTest {
         ZoneOffsetTransition c = ZoneOffsetTransition.of(
             LocalDateTime.ofEpochSecond(23875287L + 1, 0, OFFSET_0100), OFFSET_0100,OFFSET_0400);
 
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(a.compareTo(b) < 0, true);
-        assertEquals(a.compareTo(c) < 0, true);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, a.compareTo(b) < 0);
+        assertEquals(true, a.compareTo(c) < 0);
 
-        assertEquals(b.compareTo(a) > 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
-        assertEquals(b.compareTo(c) < 0, true);
+        assertEquals(true, b.compareTo(a) > 0);
+        assertEquals(true, b.compareTo(b) == 0);
+        assertEquals(true, b.compareTo(c) < 0);
 
-        assertEquals(c.compareTo(a) > 0, true);
-        assertEquals(c.compareTo(b) > 0, true);
-        assertEquals(c.compareTo(c) == 0, true);
+        assertEquals(true, c.compareTo(a) > 0);
+        assertEquals(true, c.compareTo(b) > 0);
+        assertEquals(true, c.compareTo(c) == 0);
     }
 
     @Test
@@ -204,17 +206,17 @@ public class TCKZoneOffsetTransition extends AbstractTCKTest {
         ZoneOffsetTransition c = ZoneOffsetTransition.of(
             LocalDateTime.ofEpochSecond(23875287L, 0, OFFSET_0100), OFFSET_0100, OFFSET_0400);
 
-        assertEquals(a.compareTo(a) == 0, true);
-        assertEquals(a.compareTo(b) == 0, true);
-        assertEquals(a.compareTo(c) == 0, true);
+        assertEquals(true, a.compareTo(a) == 0);
+        assertEquals(true, a.compareTo(b) == 0);
+        assertEquals(true, a.compareTo(c) == 0);
 
-        assertEquals(b.compareTo(a) == 0, true);
-        assertEquals(b.compareTo(b) == 0, true);
-        assertEquals(b.compareTo(c) == 0, true);
+        assertEquals(true, b.compareTo(a) == 0);
+        assertEquals(true, b.compareTo(b) == 0);
+        assertEquals(true, b.compareTo(c) == 0);
 
-        assertEquals(c.compareTo(a) == 0, true);
-        assertEquals(c.compareTo(b) == 0, true);
-        assertEquals(c.compareTo(c) == 0, true);
+        assertEquals(true, c.compareTo(a) == 0);
+        assertEquals(true, c.compareTo(b) == 0);
+        assertEquals(true, c.compareTo(c) == 0);
     }
 
     //-----------------------------------------------------------------------
@@ -228,18 +230,18 @@ public class TCKZoneOffsetTransition extends AbstractTCKTest {
         LocalDateTime ldtB = LocalDateTime.of(2010, 10, 31, 1, 0);
         ZoneOffsetTransition b = ZoneOffsetTransition.of(ldtB, OFFSET_0300, OFFSET_0200);
 
-        assertEquals(a1.equals(a1), true);
-        assertEquals(a1.equals(a2), true);
-        assertEquals(a1.equals(b), false);
-        assertEquals(a2.equals(a1), true);
-        assertEquals(a2.equals(a2), true);
-        assertEquals(a2.equals(b), false);
-        assertEquals(b.equals(a1), false);
-        assertEquals(b.equals(a2), false);
-        assertEquals(b.equals(b), true);
+        assertEquals(true, a1.equals(a1));
+        assertEquals(true, a1.equals(a2));
+        assertEquals(false, a1.equals(b));
+        assertEquals(true, a2.equals(a1));
+        assertEquals(true, a2.equals(a2));
+        assertEquals(false, a2.equals(b));
+        assertEquals(false, b.equals(a1));
+        assertEquals(false, b.equals(a2));
+        assertEquals(true, b.equals(b));
 
-        assertEquals(a1.equals(""), false);
-        assertEquals(a1.equals(null), false);
+        assertEquals(false, a1.equals(""));
+        assertEquals(false, a1.equals(null));
     }
 
     //-----------------------------------------------------------------------
@@ -254,7 +256,7 @@ public class TCKZoneOffsetTransition extends AbstractTCKTest {
         ZoneOffsetTransition b = ZoneOffsetTransition.of(ldtB, OFFSET_0300, OFFSET_0200);
 
         assertEquals(a1.hashCode(), a1.hashCode());
-        assertEquals(a1.hashCode(), a2.hashCode());
+        assertEquals(a2.hashCode(), a1.hashCode());
         assertEquals(b.hashCode(), b.hashCode());
     }
 
@@ -265,14 +267,14 @@ public class TCKZoneOffsetTransition extends AbstractTCKTest {
     public void test_toString_gap() {
         LocalDateTime ldt = LocalDateTime.of(2010, 3, 31, 1, 0);
         ZoneOffsetTransition test = ZoneOffsetTransition.of(ldt, OFFSET_0200, OFFSET_0300);
-        assertEquals(test.toString(), "Transition[Gap at 2010-03-31T01:00+02:00 to +03:00]");
+        assertEquals("Transition[Gap at 2010-03-31T01:00+02:00 to +03:00]", test.toString());
     }
 
     @Test
     public void test_toString_overlap() {
         LocalDateTime ldt = LocalDateTime.of(2010, 10, 31, 1, 0);
         ZoneOffsetTransition test = ZoneOffsetTransition.of(ldt, OFFSET_0300, OFFSET_0200);
-        assertEquals(test.toString(), "Transition[Overlap at 2010-10-31T01:00+03:00 to +02:00]");
+        assertEquals("Transition[Overlap at 2010-10-31T01:00+03:00 to +02:00]", test.toString());
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/zone/TCKZoneOffsetTransitionRule.java b/test/jdk/java/time/tck/java/time/zone/TCKZoneOffsetTransitionRule.java
index 3c0c14c1ca6..e12251c6874 100644
--- a/test/jdk/java/time/tck/java/time/zone/TCKZoneOffsetTransitionRule.java
+++ b/test/jdk/java/time/tck/java/time/zone/TCKZoneOffsetTransitionRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@
  */
 package tck.java.time.zone;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.DayOfWeek;
 import java.time.LocalDateTime;
@@ -70,13 +70,14 @@ import java.time.zone.ZoneOffsetTransition;
 import java.time.zone.ZoneOffsetTransitionRule;
 import java.time.zone.ZoneOffsetTransitionRule.TimeDefinition;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 import tck.java.time.AbstractTCKTest;
 
 /**
  * Test ZoneOffsetTransitionRule.
  */
-@Test
 public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
 
     private static final LocalTime TIME_0100 = LocalTime.of(1, 0);
@@ -86,81 +87,81 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
     //-----------------------------------------------------------------------
     // factory
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_factory_nullMonth() {
-        ZoneOffsetTransitionRule.of(
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneOffsetTransitionRule.of(
                 null, 20, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
-                OFFSET_0200, OFFSET_0200, OFFSET_0300);
+                OFFSET_0200, OFFSET_0200, OFFSET_0300));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_factory_nullTime() {
-        ZoneOffsetTransitionRule.of(
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, null, false, TimeDefinition.WALL,
-                OFFSET_0200, OFFSET_0200, OFFSET_0300);
+                OFFSET_0200, OFFSET_0200, OFFSET_0300));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_factory_nullTimeDefinition() {
-        ZoneOffsetTransitionRule.of(
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, TIME_0100, false, null,
-                OFFSET_0200, OFFSET_0200, OFFSET_0300);
+                OFFSET_0200, OFFSET_0200, OFFSET_0300));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_factory_nullStandardOffset() {
-        ZoneOffsetTransitionRule.of(
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
-                null, OFFSET_0200, OFFSET_0300);
+                null, OFFSET_0200, OFFSET_0300));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_factory_nullOffsetBefore() {
-        ZoneOffsetTransitionRule.of(
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
-                OFFSET_0200, null, OFFSET_0300);
+                OFFSET_0200, null, OFFSET_0300));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_factory_nullOffsetAfter() {
-        ZoneOffsetTransitionRule.of(
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
-                OFFSET_0200, OFFSET_0200, null);
+                OFFSET_0200, OFFSET_0200, null));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_factory_invalidDayOfMonthIndicator_tooSmall() {
-        ZoneOffsetTransitionRule.of(
+        Assertions.assertThrows(IllegalArgumentException.class, () -> ZoneOffsetTransitionRule.of(
                 Month.MARCH, -29, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
-                OFFSET_0200, OFFSET_0200, OFFSET_0300);
+                OFFSET_0200, OFFSET_0200, OFFSET_0300));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_factory_invalidDayOfMonthIndicator_zero() {
-        ZoneOffsetTransitionRule.of(
+        Assertions.assertThrows(IllegalArgumentException.class, () -> ZoneOffsetTransitionRule.of(
                 Month.MARCH, 0, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
-                OFFSET_0200, OFFSET_0200, OFFSET_0300);
+                OFFSET_0200, OFFSET_0200, OFFSET_0300));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_factory_invalidDayOfMonthIndicator_tooLarge() {
-        ZoneOffsetTransitionRule.of(
+        Assertions.assertThrows(IllegalArgumentException.class, () -> ZoneOffsetTransitionRule.of(
                 Month.MARCH, 32, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
-                OFFSET_0200, OFFSET_0200, OFFSET_0300);
+                OFFSET_0200, OFFSET_0200, OFFSET_0300));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_factory_invalidMidnightFlag() {
-        ZoneOffsetTransitionRule.of(
+        Assertions.assertThrows(IllegalArgumentException.class, () -> ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, TIME_0100, true, TimeDefinition.WALL,
-                OFFSET_0200, OFFSET_0200, OFFSET_0300);
+                OFFSET_0200, OFFSET_0200, OFFSET_0300));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_factory_nonZeroTimeNanos() {
-        ZoneOffsetTransitionRule.of(
-            Month.MARCH, 20, DayOfWeek.SUNDAY, LocalTime.of(1, 2, 3, 400_000_000),
-            false, TimeDefinition.WALL, OFFSET_0200, OFFSET_0200, OFFSET_0300);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> ZoneOffsetTransitionRule.of(
+                Month.MARCH, 20, DayOfWeek.SUNDAY, LocalTime.of(1, 2, 3, 400_000_000),
+                false, TimeDefinition.WALL, OFFSET_0200, OFFSET_0200, OFFSET_0300));
     }
 
     //-----------------------------------------------------------------------
@@ -171,15 +172,15 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule test = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(test.getMonth(), Month.MARCH);
-        assertEquals(test.getDayOfMonthIndicator(), 20);
-        assertEquals(test.getDayOfWeek(), DayOfWeek.SUNDAY);
-        assertEquals(test.getLocalTime(), TIME_0100);
-        assertEquals(test.isMidnightEndOfDay(), false);
-        assertEquals(test.getTimeDefinition(), TimeDefinition.WALL);
-        assertEquals(test.getStandardOffset(), OFFSET_0200);
-        assertEquals(test.getOffsetBefore(), OFFSET_0200);
-        assertEquals(test.getOffsetAfter(), OFFSET_0300);
+        assertEquals(Month.MARCH, test.getMonth());
+        assertEquals(20, test.getDayOfMonthIndicator());
+        assertEquals(DayOfWeek.SUNDAY, test.getDayOfWeek());
+        assertEquals(TIME_0100, test.getLocalTime());
+        assertEquals(false, test.isMidnightEndOfDay());
+        assertEquals(TimeDefinition.WALL, test.getTimeDefinition());
+        assertEquals(OFFSET_0200, test.getStandardOffset());
+        assertEquals(OFFSET_0200, test.getOffsetBefore());
+        assertEquals(OFFSET_0300, test.getOffsetAfter());
     }
 
     @Test
@@ -187,15 +188,15 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule test = ZoneOffsetTransitionRule.of(
                 Month.MARCH, -1, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(test.getMonth(), Month.MARCH);
-        assertEquals(test.getDayOfMonthIndicator(), -1);
-        assertEquals(test.getDayOfWeek(), DayOfWeek.SUNDAY);
-        assertEquals(test.getLocalTime(), TIME_0100);
-        assertEquals(test.isMidnightEndOfDay(), false);
-        assertEquals(test.getTimeDefinition(), TimeDefinition.WALL);
-        assertEquals(test.getStandardOffset(), OFFSET_0200);
-        assertEquals(test.getOffsetBefore(), OFFSET_0200);
-        assertEquals(test.getOffsetAfter(), OFFSET_0300);
+        assertEquals(Month.MARCH, test.getMonth());
+        assertEquals(-1, test.getDayOfMonthIndicator());
+        assertEquals(DayOfWeek.SUNDAY, test.getDayOfWeek());
+        assertEquals(TIME_0100, test.getLocalTime());
+        assertEquals(false, test.isMidnightEndOfDay());
+        assertEquals(TimeDefinition.WALL, test.getTimeDefinition());
+        assertEquals(OFFSET_0200, test.getStandardOffset());
+        assertEquals(OFFSET_0200, test.getOffsetBefore());
+        assertEquals(OFFSET_0300, test.getOffsetAfter());
     }
 
     @Test
@@ -203,15 +204,15 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule test = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, null, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(test.getMonth(), Month.MARCH);
-        assertEquals(test.getDayOfMonthIndicator(), 20);
-        assertEquals(test.getDayOfWeek(), null);
-        assertEquals(test.getLocalTime(), TIME_0100);
-        assertEquals(test.isMidnightEndOfDay(), false);
-        assertEquals(test.getTimeDefinition(), TimeDefinition.WALL);
-        assertEquals(test.getStandardOffset(), OFFSET_0200);
-        assertEquals(test.getOffsetBefore(), OFFSET_0200);
-        assertEquals(test.getOffsetAfter(), OFFSET_0300);
+        assertEquals(Month.MARCH, test.getMonth());
+        assertEquals(20, test.getDayOfMonthIndicator());
+        assertEquals(null, test.getDayOfWeek());
+        assertEquals(TIME_0100, test.getLocalTime());
+        assertEquals(false, test.isMidnightEndOfDay());
+        assertEquals(TimeDefinition.WALL, test.getTimeDefinition());
+        assertEquals(OFFSET_0200, test.getStandardOffset());
+        assertEquals(OFFSET_0200, test.getOffsetBefore());
+        assertEquals(OFFSET_0300, test.getOffsetAfter());
     }
 
 
@@ -225,7 +226,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
         ZoneOffsetTransition trans = ZoneOffsetTransition.of(
                 LocalDateTime.of(2000, Month.MARCH, 26, 1, 0), OFFSET_0200, OFFSET_0300);
-        assertEquals(test.createTransition(2000), trans);
+        assertEquals(trans, test.createTransition(2000));
     }
 
     @Test
@@ -235,7 +236,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
                 OFFSET_0200, OFFSET_0300, OFFSET_0200);
         ZoneOffsetTransition trans = ZoneOffsetTransition.of(
                 LocalDateTime.of(2000, Month.MARCH, 27, 0, 0), OFFSET_0300, OFFSET_0200);
-        assertEquals(test.createTransition(2000), trans);
+        assertEquals(trans, test.createTransition(2000));
     }
 
     @Test
@@ -245,7 +246,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
         ZoneOffsetTransition trans = ZoneOffsetTransition.of(
                 LocalDateTime.of(2000, Month.MARCH, 26, 1, 0), OFFSET_0200, OFFSET_0300);
-        assertEquals(test.createTransition(2000), trans);
+        assertEquals(trans, test.createTransition(2000));
     }
 
     @Test
@@ -255,7 +256,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
         ZoneOffsetTransition trans = ZoneOffsetTransition.of(
                 LocalDateTime.of(2000, Month.MARCH, 19, 1, 0), OFFSET_0200, OFFSET_0300);
-        assertEquals(test.createTransition(2000), trans);
+        assertEquals(trans, test.createTransition(2000));
     }
 
     @Test
@@ -265,7 +266,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
         ZoneOffsetTransition trans = ZoneOffsetTransition.of(
                 LocalDateTime.of(2000, Month.MARCH, 26, 1, 0), OFFSET_0200, OFFSET_0300);
-        assertEquals(test.createTransition(2000), trans);
+        assertEquals(trans, test.createTransition(2000));
     }
 
     @Test
@@ -275,7 +276,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
         ZoneOffsetTransition trans = ZoneOffsetTransition.of(
                 LocalDateTime.of(2000, Month.MARCH, 20, 1, 0), OFFSET_0200, OFFSET_0300);
-        assertEquals(test.createTransition(2000), trans);
+        assertEquals(trans, test.createTransition(2000));
     }
 
     //-----------------------------------------------------------------------
@@ -289,10 +290,10 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule b = ZoneOffsetTransitionRule.of(
                 Month.APRIL, 20, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), false);
-        assertEquals(b.equals(a), false);
-        assertEquals(b.equals(b), true);
+        assertEquals(true, a.equals(a));
+        assertEquals(false, a.equals(b));
+        assertEquals(false, b.equals(a));
+        assertEquals(true, b.equals(b));
     }
 
     @Test
@@ -303,10 +304,10 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule b = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 21, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), false);
-        assertEquals(b.equals(a), false);
-        assertEquals(b.equals(b), true);
+        assertEquals(true, a.equals(a));
+        assertEquals(false, a.equals(b));
+        assertEquals(false, b.equals(a));
+        assertEquals(true, b.equals(b));
     }
 
     @Test
@@ -317,10 +318,10 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule b = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SATURDAY, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), false);
-        assertEquals(b.equals(a), false);
-        assertEquals(b.equals(b), true);
+        assertEquals(true, a.equals(a));
+        assertEquals(false, a.equals(b));
+        assertEquals(false, b.equals(a));
+        assertEquals(true, b.equals(b));
     }
 
     @Test
@@ -331,10 +332,10 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule b = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, null, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), false);
-        assertEquals(b.equals(a), false);
-        assertEquals(b.equals(b), true);
+        assertEquals(true, a.equals(a));
+        assertEquals(false, a.equals(b));
+        assertEquals(false, b.equals(a));
+        assertEquals(true, b.equals(b));
     }
 
     @Test
@@ -345,10 +346,10 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule b = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, LocalTime.MIDNIGHT, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), false);
-        assertEquals(b.equals(a), false);
-        assertEquals(b.equals(b), true);
+        assertEquals(true, a.equals(a));
+        assertEquals(false, a.equals(b));
+        assertEquals(false, b.equals(a));
+        assertEquals(true, b.equals(b));
     }
 
     @Test
@@ -359,10 +360,10 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule b = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, LocalTime.MIDNIGHT, true, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), false);
-        assertEquals(b.equals(a), false);
-        assertEquals(b.equals(b), true);
+        assertEquals(true, a.equals(a));
+        assertEquals(false, a.equals(b));
+        assertEquals(false, b.equals(a));
+        assertEquals(true, b.equals(b));
     }
 
     @Test
@@ -373,10 +374,10 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule b = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.STANDARD,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), false);
-        assertEquals(b.equals(a), false);
-        assertEquals(b.equals(b), true);
+        assertEquals(true, a.equals(a));
+        assertEquals(false, a.equals(b));
+        assertEquals(false, b.equals(a));
+        assertEquals(true, b.equals(b));
     }
 
     @Test
@@ -387,10 +388,10 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule b = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0300, OFFSET_0200, OFFSET_0300);
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), false);
-        assertEquals(b.equals(a), false);
-        assertEquals(b.equals(b), true);
+        assertEquals(true, a.equals(a));
+        assertEquals(false, a.equals(b));
+        assertEquals(false, b.equals(a));
+        assertEquals(true, b.equals(b));
     }
 
     @Test
@@ -401,10 +402,10 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule b = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0300, OFFSET_0300);
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), false);
-        assertEquals(b.equals(a), false);
-        assertEquals(b.equals(b), true);
+        assertEquals(true, a.equals(a));
+        assertEquals(false, a.equals(b));
+        assertEquals(false, b.equals(a));
+        assertEquals(true, b.equals(b));
     }
 
     @Test
@@ -415,10 +416,10 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule b = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0200);
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), false);
-        assertEquals(b.equals(a), false);
-        assertEquals(b.equals(b), true);
+        assertEquals(true, a.equals(a));
+        assertEquals(false, a.equals(b));
+        assertEquals(false, b.equals(a));
+        assertEquals(true, b.equals(b));
     }
 
     @Test
@@ -426,7 +427,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule a = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(a.equals("TZDB"), false);
+        assertEquals(false, a.equals("TZDB"));
     }
 
     @Test
@@ -434,7 +435,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule a = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(a.equals(null), false);
+        assertEquals(false, a.equals(null));
     }
 
     //-----------------------------------------------------------------------
@@ -448,7 +449,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule b = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(b.hashCode(), a.hashCode());
     }
 
     @Test
@@ -459,7 +460,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule b = ZoneOffsetTransitionRule.of(
                 Month.OCTOBER, 20, null, LocalTime.MIDNIGHT, true, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0300, OFFSET_0200);
-        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(b.hashCode(), a.hashCode());
     }
 
     @Test
@@ -470,7 +471,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule b = ZoneOffsetTransitionRule.of(
                 Month.MARCH, -1, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(b.hashCode(), a.hashCode());
     }
 
     @Test
@@ -481,7 +482,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule b = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, null, TIME_0100, false, TimeDefinition.STANDARD,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(b.hashCode(), a.hashCode());
     }
 
     //-----------------------------------------------------------------------
@@ -492,7 +493,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule test = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(test.toString(), "TransitionRule[Gap +02:00 to +03:00, SUNDAY on or after MARCH 20 at 01:00 WALL, standard offset +02:00]");
+        assertEquals("TransitionRule[Gap +02:00 to +03:00, SUNDAY on or after MARCH 20 at 01:00 WALL, standard offset +02:00]", test.toString());
     }
 
     @Test
@@ -500,7 +501,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule test = ZoneOffsetTransitionRule.of(
                 Month.OCTOBER, 20, DayOfWeek.SUNDAY, LocalTime.MIDNIGHT, true, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0300, OFFSET_0200);
-        assertEquals(test.toString(), "TransitionRule[Overlap +03:00 to +02:00, SUNDAY on or after OCTOBER 20 at 24:00 WALL, standard offset +02:00]");
+        assertEquals("TransitionRule[Overlap +03:00 to +02:00, SUNDAY on or after OCTOBER 20 at 24:00 WALL, standard offset +02:00]", test.toString());
     }
 
     @Test
@@ -508,7 +509,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule test = ZoneOffsetTransitionRule.of(
                 Month.MARCH, -1, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(test.toString(), "TransitionRule[Gap +02:00 to +03:00, SUNDAY on or before last day of MARCH at 01:00 WALL, standard offset +02:00]");
+        assertEquals("TransitionRule[Gap +02:00 to +03:00, SUNDAY on or before last day of MARCH at 01:00 WALL, standard offset +02:00]", test.toString());
     }
 
     @Test
@@ -516,7 +517,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule test = ZoneOffsetTransitionRule.of(
                 Month.MARCH, -2, DayOfWeek.SUNDAY, TIME_0100, false, TimeDefinition.WALL,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(test.toString(), "TransitionRule[Gap +02:00 to +03:00, SUNDAY on or before last day minus 1 of MARCH at 01:00 WALL, standard offset +02:00]");
+        assertEquals("TransitionRule[Gap +02:00 to +03:00, SUNDAY on or before last day minus 1 of MARCH at 01:00 WALL, standard offset +02:00]", test.toString());
     }
 
     @Test
@@ -524,7 +525,7 @@ public class TCKZoneOffsetTransitionRule extends AbstractTCKTest {
         ZoneOffsetTransitionRule test = ZoneOffsetTransitionRule.of(
                 Month.MARCH, 20, null, TIME_0100, false, TimeDefinition.STANDARD,
                 OFFSET_0200, OFFSET_0200, OFFSET_0300);
-        assertEquals(test.toString(), "TransitionRule[Gap +02:00 to +03:00, MARCH 20 at 01:00 STANDARD, standard offset +02:00]");
+        assertEquals("TransitionRule[Gap +02:00 to +03:00, MARCH 20 at 01:00 STANDARD, standard offset +02:00]", test.toString());
     }
 
 }
diff --git a/test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java b/test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java
index d44216b69b5..265555a1792 100644
--- a/test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java
+++ b/test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,10 +59,10 @@
  */
 package tck.java.time.zone;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -88,12 +88,12 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test ZoneRules.
  */
-@Test
 public class TCKZoneRules {
 
     private static final ZoneOffset OFFSET_ZERO = ZoneOffset.ofHours(0);
@@ -115,7 +115,7 @@ public class TCKZoneRules {
     @Test
     public void test_London() {
         ZoneRules test = europeLondon();
-        assertEquals(test.isFixedOffset(), false);
+        assertEquals(false, test.isFixedOffset());
     }
 
     @Test
@@ -124,60 +124,60 @@ public class TCKZoneRules {
         ZonedDateTime old = createZDT(1800, 1, 1, ZoneOffset.UTC);
         Instant instant = old.toInstant();
         ZoneOffset offset = ZoneOffset.ofHoursMinutesSeconds(0, -1, -15);
-        assertEquals(test.getOffset(instant), offset);
+        assertEquals(offset, test.getOffset(instant));
         checkOffset(test, old.toLocalDateTime(), offset, 1);
-        assertEquals(test.getStandardOffset(instant), offset);
-        assertEquals(test.getDaylightSavings(instant), Duration.ZERO);
-        assertEquals(test.isDaylightSavings(instant), false);
+        assertEquals(offset, test.getStandardOffset(instant));
+        assertEquals(Duration.ZERO, test.getDaylightSavings(instant));
+        assertEquals(false, test.isDaylightSavings(instant));
     }
 
     @Test
     public void test_London_getOffset() {
         ZoneRules test = europeLondon();
-        assertEquals(test.getOffset(createInstant(2008, 1, 1, ZoneOffset.UTC)), OFFSET_ZERO);
-        assertEquals(test.getOffset(createInstant(2008, 2, 1, ZoneOffset.UTC)), OFFSET_ZERO);
-        assertEquals(test.getOffset(createInstant(2008, 3, 1, ZoneOffset.UTC)), OFFSET_ZERO);
-        assertEquals(test.getOffset(createInstant(2008, 4, 1, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 5, 1, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 6, 1, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 7, 1, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 8, 1, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 9, 1, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 10, 1, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 11, 1, ZoneOffset.UTC)), OFFSET_ZERO);
-        assertEquals(test.getOffset(createInstant(2008, 12, 1, ZoneOffset.UTC)), OFFSET_ZERO);
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 1, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 2, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 3, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 4, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 5, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 6, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 7, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 8, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 9, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 10, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 11, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 12, 1, ZoneOffset.UTC)));
     }
 
     @Test
     public void test_London_getOffset_toDST() {
         ZoneRules test = europeLondon();
-        assertEquals(test.getOffset(createInstant(2008, 3, 24, ZoneOffset.UTC)), OFFSET_ZERO);
-        assertEquals(test.getOffset(createInstant(2008, 3, 25, ZoneOffset.UTC)), OFFSET_ZERO);
-        assertEquals(test.getOffset(createInstant(2008, 3, 26, ZoneOffset.UTC)), OFFSET_ZERO);
-        assertEquals(test.getOffset(createInstant(2008, 3, 27, ZoneOffset.UTC)), OFFSET_ZERO);
-        assertEquals(test.getOffset(createInstant(2008, 3, 28, ZoneOffset.UTC)), OFFSET_ZERO);
-        assertEquals(test.getOffset(createInstant(2008, 3, 29, ZoneOffset.UTC)), OFFSET_ZERO);
-        assertEquals(test.getOffset(createInstant(2008, 3, 30, ZoneOffset.UTC)), OFFSET_ZERO);
-        assertEquals(test.getOffset(createInstant(2008, 3, 31, ZoneOffset.UTC)), OFFSET_PONE);
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 3, 24, ZoneOffset.UTC)));
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 3, 25, ZoneOffset.UTC)));
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 3, 26, ZoneOffset.UTC)));
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 3, 27, ZoneOffset.UTC)));
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 3, 28, ZoneOffset.UTC)));
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 3, 29, ZoneOffset.UTC)));
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 3, 30, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 3, 31, ZoneOffset.UTC)));
         // cutover at 01:00Z
-        assertEquals(test.getOffset(createInstant(2008, 3, 30, 0, 59, 59, 999999999, ZoneOffset.UTC)), OFFSET_ZERO);
-        assertEquals(test.getOffset(createInstant(2008, 3, 30, 1, 0, 0, 0, ZoneOffset.UTC)), OFFSET_PONE);
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 3, 30, 0, 59, 59, 999999999, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 3, 30, 1, 0, 0, 0, ZoneOffset.UTC)));
     }
 
     @Test
     public void test_London_getOffset_fromDST() {
         ZoneRules test = europeLondon();
-        assertEquals(test.getOffset(createInstant(2008, 10, 24, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 10, 25, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 10, 26, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 10, 27, ZoneOffset.UTC)), OFFSET_ZERO);
-        assertEquals(test.getOffset(createInstant(2008, 10, 28, ZoneOffset.UTC)), OFFSET_ZERO);
-        assertEquals(test.getOffset(createInstant(2008, 10, 29, ZoneOffset.UTC)), OFFSET_ZERO);
-        assertEquals(test.getOffset(createInstant(2008, 10, 30, ZoneOffset.UTC)), OFFSET_ZERO);
-        assertEquals(test.getOffset(createInstant(2008, 10, 31, ZoneOffset.UTC)), OFFSET_ZERO);
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 10, 24, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 10, 25, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 10, 26, ZoneOffset.UTC)));
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 10, 27, ZoneOffset.UTC)));
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 10, 28, ZoneOffset.UTC)));
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 10, 29, ZoneOffset.UTC)));
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 10, 30, ZoneOffset.UTC)));
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 10, 31, ZoneOffset.UTC)));
         // cutover at 01:00Z
-        assertEquals(test.getOffset(createInstant(2008, 10, 26, 0, 59, 59, 999999999, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 10, 26, 1, 0, 0, 0, ZoneOffset.UTC)), OFFSET_ZERO);
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 10, 26, 0, 59, 59, 999999999, ZoneOffset.UTC)));
+        assertEquals(OFFSET_ZERO, test.getOffset(createInstant(2008, 10, 26, 1, 0, 0, 0, ZoneOffset.UTC)));
     }
 
     @Test
@@ -234,17 +234,17 @@ public class TCKZoneRules {
         ZoneRules test = europeLondon();
         final LocalDateTime dateTime = LocalDateTime.of(2008, 3, 30, 1, 0, 0, 0);
         ZoneOffsetTransition trans = checkOffset(test, dateTime, OFFSET_ZERO, GAP);
-        assertEquals(trans.isGap(), true);
-        assertEquals(trans.isOverlap(), false);
-        assertEquals(trans.getOffsetBefore(), OFFSET_ZERO);
-        assertEquals(trans.getOffsetAfter(), OFFSET_PONE);
-        assertEquals(trans.getInstant(), createInstant(2008, 3, 30, 1, 0, ZoneOffset.UTC));
-        assertEquals(trans.getDateTimeBefore(), LocalDateTime.of(2008, 3, 30, 1, 0));
-        assertEquals(trans.getDateTimeAfter(), LocalDateTime.of(2008, 3, 30, 2, 0));
-        assertEquals(trans.isValidOffset(OFFSET_ZERO), false);
-        assertEquals(trans.isValidOffset(OFFSET_PONE), false);
-        assertEquals(trans.isValidOffset(OFFSET_PTWO), false);
-        assertEquals(trans.toString(), "Transition[Gap at 2008-03-30T01:00Z to +01:00]");
+        assertEquals(true, trans.isGap());
+        assertEquals(false, trans.isOverlap());
+        assertEquals(OFFSET_ZERO, trans.getOffsetBefore());
+        assertEquals(OFFSET_PONE, trans.getOffsetAfter());
+        assertEquals(createInstant(2008, 3, 30, 1, 0, ZoneOffset.UTC), trans.getInstant());
+        assertEquals(LocalDateTime.of(2008, 3, 30, 1, 0), trans.getDateTimeBefore());
+        assertEquals(LocalDateTime.of(2008, 3, 30, 2, 0), trans.getDateTimeAfter());
+        assertEquals(false, trans.isValidOffset(OFFSET_ZERO));
+        assertEquals(false, trans.isValidOffset(OFFSET_PONE));
+        assertEquals(false, trans.isValidOffset(OFFSET_PTWO));
+        assertEquals("Transition[Gap at 2008-03-30T01:00Z to +01:00]", trans.toString());
 
         assertFalse(trans.equals(null));
         assertFalse(trans.equals(OFFSET_ZERO));
@@ -252,7 +252,7 @@ public class TCKZoneRules {
 
         final ZoneOffsetTransition otherTrans = test.getTransition(dateTime);
         assertTrue(trans.equals(otherTrans));
-        assertEquals(trans.hashCode(), otherTrans.hashCode());
+        assertEquals(otherTrans.hashCode(), trans.hashCode());
     }
 
     @Test
@@ -260,18 +260,18 @@ public class TCKZoneRules {
         ZoneRules test = europeLondon();
         final LocalDateTime dateTime = LocalDateTime.of(2008, 10, 26, 1, 0, 0, 0);
         ZoneOffsetTransition trans = checkOffset(test, dateTime, OFFSET_PONE, OVERLAP);
-        assertEquals(trans.isGap(), false);
-        assertEquals(trans.isOverlap(), true);
-        assertEquals(trans.getOffsetBefore(), OFFSET_PONE);
-        assertEquals(trans.getOffsetAfter(), OFFSET_ZERO);
-        assertEquals(trans.getInstant(), createInstant(2008, 10, 26, 1, 0, ZoneOffset.UTC));
-        assertEquals(trans.getDateTimeBefore(), LocalDateTime.of(2008, 10, 26, 2, 0));
-        assertEquals(trans.getDateTimeAfter(), LocalDateTime.of(2008, 10, 26, 1, 0));
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-1)), false);
-        assertEquals(trans.isValidOffset(OFFSET_ZERO), true);
-        assertEquals(trans.isValidOffset(OFFSET_PONE), true);
-        assertEquals(trans.isValidOffset(OFFSET_PTWO), false);
-        assertEquals(trans.toString(), "Transition[Overlap at 2008-10-26T02:00+01:00 to Z]");
+        assertEquals(false, trans.isGap());
+        assertEquals(true, trans.isOverlap());
+        assertEquals(OFFSET_PONE, trans.getOffsetBefore());
+        assertEquals(OFFSET_ZERO, trans.getOffsetAfter());
+        assertEquals(createInstant(2008, 10, 26, 1, 0, ZoneOffset.UTC), trans.getInstant());
+        assertEquals(LocalDateTime.of(2008, 10, 26, 2, 0), trans.getDateTimeBefore());
+        assertEquals(LocalDateTime.of(2008, 10, 26, 1, 0), trans.getDateTimeAfter());
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(-1)));
+        assertEquals(true, trans.isValidOffset(OFFSET_ZERO));
+        assertEquals(true, trans.isValidOffset(OFFSET_PONE));
+        assertEquals(false, trans.isValidOffset(OFFSET_PTWO));
+        assertEquals("Transition[Overlap at 2008-10-26T02:00+01:00 to Z]", trans.toString());
 
         assertFalse(trans.equals(null));
         assertFalse(trans.equals(OFFSET_PONE));
@@ -279,7 +279,7 @@ public class TCKZoneRules {
 
         final ZoneOffsetTransition otherTrans = test.getTransition(dateTime);
         assertTrue(trans.equals(otherTrans));
-        assertEquals(trans.hashCode(), otherTrans.hashCode());
+        assertEquals(otherTrans.hashCode(), trans.hashCode());
     }
 
     @Test
@@ -289,11 +289,11 @@ public class TCKZoneRules {
         while (zdt.getYear() < 2010) {
             Instant instant = zdt.toInstant();
             if (zdt.getYear() < 1848) {
-                assertEquals(test.getStandardOffset(instant), ZoneOffset.ofHoursMinutesSeconds(0, -1, -15));
+                assertEquals(ZoneOffset.ofHoursMinutesSeconds(0, -1, -15), test.getStandardOffset(instant));
             } else if (zdt.getYear() >= 1969 && zdt.getYear() < 1972) {
-                assertEquals(test.getStandardOffset(instant), OFFSET_PONE);
+                assertEquals(OFFSET_PONE, test.getStandardOffset(instant));
             } else {
-                assertEquals(test.getStandardOffset(instant), OFFSET_ZERO);
+                assertEquals(OFFSET_ZERO, test.getStandardOffset(instant));
             }
             zdt = zdt.plusMonths(6);
         }
@@ -305,19 +305,19 @@ public class TCKZoneRules {
         List<ZoneOffsetTransition> trans = test.getTransitions();
 
         ZoneOffsetTransition first = trans.get(0);
-        assertEquals(first.getDateTimeBefore(), LocalDateTime.of(1847, 12, 1, 0, 0));
-        assertEquals(first.getOffsetBefore(), ZoneOffset.ofHoursMinutesSeconds(0, -1, -15));
-        assertEquals(first.getOffsetAfter(), OFFSET_ZERO);
+        assertEquals(LocalDateTime.of(1847, 12, 1, 0, 0), first.getDateTimeBefore());
+        assertEquals(ZoneOffset.ofHoursMinutesSeconds(0, -1, -15), first.getOffsetBefore());
+        assertEquals(OFFSET_ZERO, first.getOffsetAfter());
 
         ZoneOffsetTransition spring1916 = trans.get(1);
-        assertEquals(spring1916.getDateTimeBefore(), LocalDateTime.of(1916, 5, 21, 2, 0));
-        assertEquals(spring1916.getOffsetBefore(), OFFSET_ZERO);
-        assertEquals(spring1916.getOffsetAfter(), OFFSET_PONE);
+        assertEquals(LocalDateTime.of(1916, 5, 21, 2, 0), spring1916.getDateTimeBefore());
+        assertEquals(OFFSET_ZERO, spring1916.getOffsetBefore());
+        assertEquals(OFFSET_PONE, spring1916.getOffsetAfter());
 
         ZoneOffsetTransition autumn1916 = trans.get(2);
-        assertEquals(autumn1916.getDateTimeBefore(), LocalDateTime.of(1916, 10, 1, 3, 0));
-        assertEquals(autumn1916.getOffsetBefore(), OFFSET_PONE);
-        assertEquals(autumn1916.getOffsetAfter(), OFFSET_ZERO);
+        assertEquals(LocalDateTime.of(1916, 10, 1, 3, 0), autumn1916.getDateTimeBefore());
+        assertEquals(OFFSET_PONE, autumn1916.getOffsetBefore());
+        assertEquals(OFFSET_ZERO, autumn1916.getOffsetAfter());
 
         ZoneOffsetTransition zot = null;
         Iterator<ZoneOffsetTransition> it = trans.iterator();
@@ -327,81 +327,81 @@ public class TCKZoneRules {
                 break;
             }
         }
-        assertEquals(zot.getDateTimeBefore(), LocalDateTime.of(1990, 3, 25, 1, 0));
-        assertEquals(zot.getOffsetBefore(), OFFSET_ZERO);
+        assertEquals(LocalDateTime.of(1990, 3, 25, 1, 0), zot.getDateTimeBefore());
+        assertEquals(OFFSET_ZERO, zot.getOffsetBefore());
         zot = it.next();
-        assertEquals(zot.getDateTimeBefore(), LocalDateTime.of(1990, 10, 28, 2, 0));
-        assertEquals(zot.getOffsetBefore(), OFFSET_PONE);
+        assertEquals(LocalDateTime.of(1990, 10, 28, 2, 0), zot.getDateTimeBefore());
+        assertEquals(OFFSET_PONE, zot.getOffsetBefore());
         zot = it.next();
-        assertEquals(zot.getDateTimeBefore(), LocalDateTime.of(1991, 3, 31, 1, 0));
-        assertEquals(zot.getOffsetBefore(), OFFSET_ZERO);
+        assertEquals(LocalDateTime.of(1991, 3, 31, 1, 0), zot.getDateTimeBefore());
+        assertEquals(OFFSET_ZERO, zot.getOffsetBefore());
         zot = it.next();
-        assertEquals(zot.getDateTimeBefore(), LocalDateTime.of(1991, 10, 27, 2, 0));
-        assertEquals(zot.getOffsetBefore(), OFFSET_PONE);
+        assertEquals(LocalDateTime.of(1991, 10, 27, 2, 0), zot.getDateTimeBefore());
+        assertEquals(OFFSET_PONE, zot.getOffsetBefore());
         zot = it.next();
-        assertEquals(zot.getDateTimeBefore(), LocalDateTime.of(1992, 3, 29, 1, 0));
-        assertEquals(zot.getOffsetBefore(), OFFSET_ZERO);
+        assertEquals(LocalDateTime.of(1992, 3, 29, 1, 0), zot.getDateTimeBefore());
+        assertEquals(OFFSET_ZERO, zot.getOffsetBefore());
         zot = it.next();
-        assertEquals(zot.getDateTimeBefore(), LocalDateTime.of(1992, 10, 25, 2, 0));
-        assertEquals(zot.getOffsetBefore(), OFFSET_PONE);
+        assertEquals(LocalDateTime.of(1992, 10, 25, 2, 0), zot.getDateTimeBefore());
+        assertEquals(OFFSET_PONE, zot.getOffsetBefore());
         zot = it.next();
-        assertEquals(zot.getDateTimeBefore(), LocalDateTime.of(1993, 3, 28, 1, 0));
-        assertEquals(zot.getOffsetBefore(), OFFSET_ZERO);
+        assertEquals(LocalDateTime.of(1993, 3, 28, 1, 0), zot.getDateTimeBefore());
+        assertEquals(OFFSET_ZERO, zot.getOffsetBefore());
         zot = it.next();
-        assertEquals(zot.getDateTimeBefore(), LocalDateTime.of(1993, 10, 24, 2, 0));
-        assertEquals(zot.getOffsetBefore(), OFFSET_PONE);
+        assertEquals(LocalDateTime.of(1993, 10, 24, 2, 0), zot.getDateTimeBefore());
+        assertEquals(OFFSET_PONE, zot.getOffsetBefore());
         zot = it.next();
-        assertEquals(zot.getDateTimeBefore(), LocalDateTime.of(1994, 3, 27, 1, 0));
-        assertEquals(zot.getOffsetBefore(), OFFSET_ZERO);
+        assertEquals(LocalDateTime.of(1994, 3, 27, 1, 0), zot.getDateTimeBefore());
+        assertEquals(OFFSET_ZERO, zot.getOffsetBefore());
         zot = it.next();
-        assertEquals(zot.getDateTimeBefore(), LocalDateTime.of(1994, 10, 23, 2, 0));
-        assertEquals(zot.getOffsetBefore(), OFFSET_PONE);
+        assertEquals(LocalDateTime.of(1994, 10, 23, 2, 0), zot.getDateTimeBefore());
+        assertEquals(OFFSET_PONE, zot.getOffsetBefore());
         zot = it.next();
-        assertEquals(zot.getDateTimeBefore(), LocalDateTime.of(1995, 3, 26, 1, 0));
-        assertEquals(zot.getOffsetBefore(), OFFSET_ZERO);
+        assertEquals(LocalDateTime.of(1995, 3, 26, 1, 0), zot.getDateTimeBefore());
+        assertEquals(OFFSET_ZERO, zot.getOffsetBefore());
         zot = it.next();
-        assertEquals(zot.getDateTimeBefore(), LocalDateTime.of(1995, 10, 22, 2, 0));
-        assertEquals(zot.getOffsetBefore(), OFFSET_PONE);
+        assertEquals(LocalDateTime.of(1995, 10, 22, 2, 0), zot.getDateTimeBefore());
+        assertEquals(OFFSET_PONE, zot.getOffsetBefore());
         zot = it.next();
-        assertEquals(zot.getDateTimeBefore(), LocalDateTime.of(1996, 3, 31, 1, 0));
-        assertEquals(zot.getOffsetBefore(), OFFSET_ZERO);
+        assertEquals(LocalDateTime.of(1996, 3, 31, 1, 0), zot.getDateTimeBefore());
+        assertEquals(OFFSET_ZERO, zot.getOffsetBefore());
         zot = it.next();
-        assertEquals(zot.getDateTimeBefore(), LocalDateTime.of(1996, 10, 27, 2, 0));
-        assertEquals(zot.getOffsetBefore(), OFFSET_PONE);
+        assertEquals(LocalDateTime.of(1996, 10, 27, 2, 0), zot.getDateTimeBefore());
+        assertEquals(OFFSET_PONE, zot.getOffsetBefore());
         zot = it.next();
-        assertEquals(zot.getDateTimeBefore(), LocalDateTime.of(1997, 3, 30, 1, 0));
-        assertEquals(zot.getOffsetBefore(), OFFSET_ZERO);
+        assertEquals(LocalDateTime.of(1997, 3, 30, 1, 0), zot.getDateTimeBefore());
+        assertEquals(OFFSET_ZERO, zot.getOffsetBefore());
         zot = it.next();
-        assertEquals(zot.getDateTimeBefore(), LocalDateTime.of(1997, 10, 26, 2, 0));
-        assertEquals(zot.getOffsetBefore(), OFFSET_PONE);
-        assertEquals(it.hasNext(), false);
+        assertEquals(LocalDateTime.of(1997, 10, 26, 2, 0), zot.getDateTimeBefore());
+        assertEquals(OFFSET_PONE, zot.getOffsetBefore());
+        assertEquals(false, it.hasNext());
     }
 
     @Test
     public void test_London_getTransitionRules() {
         ZoneRules test = europeLondon();
         List<ZoneOffsetTransitionRule> rules = test.getTransitionRules();
-        assertEquals(rules.size(), 2);
+        assertEquals(2, rules.size());
 
         ZoneOffsetTransitionRule in = rules.get(0);
-        assertEquals(in.getMonth(), Month.MARCH);
-        assertEquals(in.getDayOfMonthIndicator(), 25);  // optimized from -1
-        assertEquals(in.getDayOfWeek(), DayOfWeek.SUNDAY);
-        assertEquals(in.getLocalTime(), LocalTime.of(1, 0));
-        assertEquals(in.getTimeDefinition(), TimeDefinition.UTC);
-        assertEquals(in.getStandardOffset(), OFFSET_ZERO);
-        assertEquals(in.getOffsetBefore(), OFFSET_ZERO);
-        assertEquals(in.getOffsetAfter(), OFFSET_PONE);
+        assertEquals(Month.MARCH, in.getMonth());
+        assertEquals(25, in.getDayOfMonthIndicator());  // optimized from -1
+        assertEquals(DayOfWeek.SUNDAY, in.getDayOfWeek());
+        assertEquals(LocalTime.of(1, 0), in.getLocalTime());
+        assertEquals(TimeDefinition.UTC, in.getTimeDefinition());
+        assertEquals(OFFSET_ZERO, in.getStandardOffset());
+        assertEquals(OFFSET_ZERO, in.getOffsetBefore());
+        assertEquals(OFFSET_PONE, in.getOffsetAfter());
 
         ZoneOffsetTransitionRule out = rules.get(1);
-        assertEquals(out.getMonth(), Month.OCTOBER);
-        assertEquals(out.getDayOfMonthIndicator(), 25);  // optimized from -1
-        assertEquals(out.getDayOfWeek(), DayOfWeek.SUNDAY);
-        assertEquals(out.getLocalTime(), LocalTime.of(1, 0));
-        assertEquals(out.getTimeDefinition(), TimeDefinition.UTC);
-        assertEquals(out.getStandardOffset(), OFFSET_ZERO);
-        assertEquals(out.getOffsetBefore(), OFFSET_PONE);
-        assertEquals(out.getOffsetAfter(), OFFSET_ZERO);
+        assertEquals(Month.OCTOBER, out.getMonth());
+        assertEquals(25, out.getDayOfMonthIndicator());  // optimized from -1
+        assertEquals(DayOfWeek.SUNDAY, out.getDayOfWeek());
+        assertEquals(LocalTime.of(1, 0), out.getLocalTime());
+        assertEquals(TimeDefinition.UTC, out.getTimeDefinition());
+        assertEquals(OFFSET_ZERO, out.getStandardOffset());
+        assertEquals(OFFSET_PONE, out.getOffsetBefore());
+        assertEquals(OFFSET_ZERO, out.getOffsetAfter());
     }
 
     //-----------------------------------------------------------------------
@@ -411,14 +411,14 @@ public class TCKZoneRules {
         List<ZoneOffsetTransition> trans = test.getTransitions();
 
         ZoneOffsetTransition first = trans.get(0);
-        assertEquals(test.nextTransition(first.getInstant().minusNanos(1)), first);
+        assertEquals(first, test.nextTransition(first.getInstant().minusNanos(1)));
 
         for (int i = 0; i < trans.size() - 1; i++) {
             ZoneOffsetTransition cur = trans.get(i);
             ZoneOffsetTransition next = trans.get(i + 1);
 
-            assertEquals(test.nextTransition(cur.getInstant()), next);
-            assertEquals(test.nextTransition(next.getInstant().minusNanos(1)), next);
+            assertEquals(next, test.nextTransition(cur.getInstant()));
+            assertEquals(next, test.nextTransition(next.getInstant().minusNanos(1)));
         }
     }
 
@@ -429,18 +429,18 @@ public class TCKZoneRules {
         List<ZoneOffsetTransition> trans = test.getTransitions();
 
         ZoneOffsetTransition last = trans.get(trans.size() - 1);
-        assertEquals(test.nextTransition(last.getInstant()), rules.get(0).createTransition(1998));
+        assertEquals(rules.get(0).createTransition(1998), test.nextTransition(last.getInstant()));
 
         for (int year = 1998; year < 2010; year++) {
             ZoneOffsetTransition a = rules.get(0).createTransition(year);
             ZoneOffsetTransition b = rules.get(1).createTransition(year);
             ZoneOffsetTransition c = rules.get(0).createTransition(year + 1);
 
-            assertEquals(test.nextTransition(a.getInstant()), b);
-            assertEquals(test.nextTransition(b.getInstant().minusNanos(1)), b);
+            assertEquals(b, test.nextTransition(a.getInstant()));
+            assertEquals(b, test.nextTransition(b.getInstant().minusNanos(1)));
 
-            assertEquals(test.nextTransition(b.getInstant()), c);
-            assertEquals(test.nextTransition(c.getInstant().minusNanos(1)), c);
+            assertEquals(c, test.nextTransition(b.getInstant()));
+            assertEquals(c, test.nextTransition(c.getInstant().minusNanos(1)));
         }
     }
 
@@ -449,7 +449,7 @@ public class TCKZoneRules {
         ZoneRules test = europeLondon();
         List<ZoneOffsetTransitionRule> rules = test.getTransitionRules();
         ZoneOffsetTransition zot = rules.get(1).createTransition(Year.MAX_VALUE);
-        assertEquals(test.nextTransition(zot.getInstant()), null);
+        assertEquals(null, test.nextTransition(zot.getInstant()));
     }
 
     //-----------------------------------------------------------------------
@@ -459,16 +459,16 @@ public class TCKZoneRules {
         List<ZoneOffsetTransition> trans = test.getTransitions();
 
         ZoneOffsetTransition first = trans.get(0);
-        assertEquals(test.previousTransition(first.getInstant()), null);
-        assertEquals(test.previousTransition(first.getInstant().minusNanos(1)), null);
+        assertEquals(null, test.previousTransition(first.getInstant()));
+        assertEquals(null, test.previousTransition(first.getInstant().minusNanos(1)));
 
         for (int i = 0; i < trans.size() - 1; i++) {
             ZoneOffsetTransition prev = trans.get(i);
             ZoneOffsetTransition cur = trans.get(i + 1);
 
-            assertEquals(test.previousTransition(cur.getInstant()), prev);
-            assertEquals(test.previousTransition(prev.getInstant().plusSeconds(1)), prev);
-            assertEquals(test.previousTransition(prev.getInstant().plusNanos(1)), prev);
+            assertEquals(prev, test.previousTransition(cur.getInstant()));
+            assertEquals(prev, test.previousTransition(prev.getInstant().plusSeconds(1)));
+            assertEquals(prev, test.previousTransition(prev.getInstant().plusNanos(1)));
         }
     }
 
@@ -479,13 +479,13 @@ public class TCKZoneRules {
         List<ZoneOffsetTransition> trans = test.getTransitions();
 
         ZoneOffsetTransition last = trans.get(trans.size() - 1);
-        assertEquals(test.previousTransition(last.getInstant().plusSeconds(1)), last);
-        assertEquals(test.previousTransition(last.getInstant().plusNanos(1)), last);
+        assertEquals(last, test.previousTransition(last.getInstant().plusSeconds(1)));
+        assertEquals(last, test.previousTransition(last.getInstant().plusNanos(1)));
 
         // Jan 1st of year between transitions and rules
         ZonedDateTime odt = ZonedDateTime.ofInstant(last.getInstant(), last.getOffsetAfter());
         odt = odt.withDayOfYear(1).plusYears(1).with(LocalTime.MIDNIGHT);
-        assertEquals(test.previousTransition(odt.toInstant()), last);
+        assertEquals(last, test.previousTransition(odt.toInstant()));
 
         // later years
         for (int year = 1998; year < 2010; year++) {
@@ -493,13 +493,13 @@ public class TCKZoneRules {
             ZoneOffsetTransition b = rules.get(1).createTransition(year);
             ZoneOffsetTransition c = rules.get(0).createTransition(year + 1);
 
-            assertEquals(test.previousTransition(c.getInstant()), b);
-            assertEquals(test.previousTransition(b.getInstant().plusSeconds(1)), b);
-            assertEquals(test.previousTransition(b.getInstant().plusNanos(1)), b);
+            assertEquals(b, test.previousTransition(c.getInstant()));
+            assertEquals(b, test.previousTransition(b.getInstant().plusSeconds(1)));
+            assertEquals(b, test.previousTransition(b.getInstant().plusNanos(1)));
 
-            assertEquals(test.previousTransition(b.getInstant()), a);
-            assertEquals(test.previousTransition(a.getInstant().plusSeconds(1)), a);
-            assertEquals(test.previousTransition(a.getInstant().plusNanos(1)), a);
+            assertEquals(a, test.previousTransition(b.getInstant()));
+            assertEquals(a, test.previousTransition(a.getInstant().plusSeconds(1)));
+            assertEquals(a, test.previousTransition(a.getInstant().plusNanos(1)));
         }
     }
 
@@ -513,7 +513,7 @@ public class TCKZoneRules {
     @Test
     public void test_Paris() {
         ZoneRules test = europeParis();
-        assertEquals(test.isFixedOffset(), false);
+        assertEquals(false, test.isFixedOffset());
     }
 
     @Test
@@ -522,60 +522,60 @@ public class TCKZoneRules {
         ZonedDateTime old = createZDT(1800, 1, 1, ZoneOffset.UTC);
         Instant instant = old.toInstant();
         ZoneOffset offset = ZoneOffset.ofHoursMinutesSeconds(0, 9, 21);
-        assertEquals(test.getOffset(instant), offset);
+        assertEquals(offset, test.getOffset(instant));
         checkOffset(test, old.toLocalDateTime(), offset, 1);
-        assertEquals(test.getStandardOffset(instant), offset);
-        assertEquals(test.getDaylightSavings(instant), Duration.ZERO);
-        assertEquals(test.isDaylightSavings(instant), false);
+        assertEquals(offset, test.getStandardOffset(instant));
+        assertEquals(Duration.ZERO, test.getDaylightSavings(instant));
+        assertEquals(false, test.isDaylightSavings(instant));
     }
 
     @Test
     public void test_Paris_getOffset() {
         ZoneRules test = europeParis();
-        assertEquals(test.getOffset(createInstant(2008, 1, 1, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 2, 1, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 3, 1, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 4, 1, ZoneOffset.UTC)), OFFSET_PTWO);
-        assertEquals(test.getOffset(createInstant(2008, 5, 1, ZoneOffset.UTC)), OFFSET_PTWO);
-        assertEquals(test.getOffset(createInstant(2008, 6, 1, ZoneOffset.UTC)), OFFSET_PTWO);
-        assertEquals(test.getOffset(createInstant(2008, 7, 1, ZoneOffset.UTC)), OFFSET_PTWO);
-        assertEquals(test.getOffset(createInstant(2008, 8, 1, ZoneOffset.UTC)), OFFSET_PTWO);
-        assertEquals(test.getOffset(createInstant(2008, 9, 1, ZoneOffset.UTC)), OFFSET_PTWO);
-        assertEquals(test.getOffset(createInstant(2008, 10, 1, ZoneOffset.UTC)), OFFSET_PTWO);
-        assertEquals(test.getOffset(createInstant(2008, 11, 1, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 12, 1, ZoneOffset.UTC)), OFFSET_PONE);
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 1, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 2, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 3, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PTWO, test.getOffset(createInstant(2008, 4, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PTWO, test.getOffset(createInstant(2008, 5, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PTWO, test.getOffset(createInstant(2008, 6, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PTWO, test.getOffset(createInstant(2008, 7, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PTWO, test.getOffset(createInstant(2008, 8, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PTWO, test.getOffset(createInstant(2008, 9, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PTWO, test.getOffset(createInstant(2008, 10, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 11, 1, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 12, 1, ZoneOffset.UTC)));
     }
 
     @Test
     public void test_Paris_getOffset_toDST() {
         ZoneRules test = europeParis();
-        assertEquals(test.getOffset(createInstant(2008, 3, 24, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 3, 25, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 3, 26, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 3, 27, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 3, 28, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 3, 29, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 3, 30, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 3, 31, ZoneOffset.UTC)), OFFSET_PTWO);
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 3, 24, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 3, 25, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 3, 26, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 3, 27, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 3, 28, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 3, 29, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 3, 30, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PTWO, test.getOffset(createInstant(2008, 3, 31, ZoneOffset.UTC)));
         // cutover at 01:00Z
-        assertEquals(test.getOffset(createInstant(2008, 3, 30, 0, 59, 59, 999999999, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 3, 30, 1, 0, 0, 0, ZoneOffset.UTC)), OFFSET_PTWO);
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 3, 30, 0, 59, 59, 999999999, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PTWO, test.getOffset(createInstant(2008, 3, 30, 1, 0, 0, 0, ZoneOffset.UTC)));
     }
 
     @Test
     public void test_Paris_getOffset_fromDST() {
         ZoneRules test = europeParis();
-        assertEquals(test.getOffset(createInstant(2008, 10, 24, ZoneOffset.UTC)), OFFSET_PTWO);
-        assertEquals(test.getOffset(createInstant(2008, 10, 25, ZoneOffset.UTC)), OFFSET_PTWO);
-        assertEquals(test.getOffset(createInstant(2008, 10, 26, ZoneOffset.UTC)), OFFSET_PTWO);
-        assertEquals(test.getOffset(createInstant(2008, 10, 27, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 10, 28, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 10, 29, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 10, 30, ZoneOffset.UTC)), OFFSET_PONE);
-        assertEquals(test.getOffset(createInstant(2008, 10, 31, ZoneOffset.UTC)), OFFSET_PONE);
+        assertEquals(OFFSET_PTWO, test.getOffset(createInstant(2008, 10, 24, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PTWO, test.getOffset(createInstant(2008, 10, 25, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PTWO, test.getOffset(createInstant(2008, 10, 26, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 10, 27, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 10, 28, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 10, 29, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 10, 30, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 10, 31, ZoneOffset.UTC)));
         // cutover at 01:00Z
-        assertEquals(test.getOffset(createInstant(2008, 10, 26, 0, 59, 59, 999999999, ZoneOffset.UTC)), OFFSET_PTWO);
-        assertEquals(test.getOffset(createInstant(2008, 10, 26, 1, 0, 0, 0, ZoneOffset.UTC)), OFFSET_PONE);
+        assertEquals(OFFSET_PTWO, test.getOffset(createInstant(2008, 10, 26, 0, 59, 59, 999999999, ZoneOffset.UTC)));
+        assertEquals(OFFSET_PONE, test.getOffset(createInstant(2008, 10, 26, 1, 0, 0, 0, ZoneOffset.UTC)));
     }
 
     @Test
@@ -632,15 +632,15 @@ public class TCKZoneRules {
         ZoneRules test = europeParis();
         final LocalDateTime dateTime = LocalDateTime.of(2008, 3, 30, 2, 0, 0, 0);
         ZoneOffsetTransition trans = checkOffset(test, dateTime, OFFSET_PONE, GAP);
-        assertEquals(trans.isGap(), true);
-        assertEquals(trans.isOverlap(), false);
-        assertEquals(trans.getOffsetBefore(), OFFSET_PONE);
-        assertEquals(trans.getOffsetAfter(), OFFSET_PTWO);
-        assertEquals(trans.getInstant(), createInstant(2008, 3, 30, 1, 0, ZoneOffset.UTC));
-        assertEquals(trans.isValidOffset(OFFSET_ZERO), false);
-        assertEquals(trans.isValidOffset(OFFSET_PONE), false);
-        assertEquals(trans.isValidOffset(OFFSET_PTWO), false);
-        assertEquals(trans.toString(), "Transition[Gap at 2008-03-30T02:00+01:00 to +02:00]");
+        assertEquals(true, trans.isGap());
+        assertEquals(false, trans.isOverlap());
+        assertEquals(OFFSET_PONE, trans.getOffsetBefore());
+        assertEquals(OFFSET_PTWO, trans.getOffsetAfter());
+        assertEquals(createInstant(2008, 3, 30, 1, 0, ZoneOffset.UTC), trans.getInstant());
+        assertEquals(false, trans.isValidOffset(OFFSET_ZERO));
+        assertEquals(false, trans.isValidOffset(OFFSET_PONE));
+        assertEquals(false, trans.isValidOffset(OFFSET_PTWO));
+        assertEquals("Transition[Gap at 2008-03-30T02:00+01:00 to +02:00]", trans.toString());
 
         assertFalse(trans.equals(null));
         assertFalse(trans.equals(OFFSET_PONE));
@@ -648,7 +648,7 @@ public class TCKZoneRules {
 
         final ZoneOffsetTransition otherTrans = test.getTransition(dateTime);
         assertTrue(trans.equals(otherTrans));
-        assertEquals(trans.hashCode(), otherTrans.hashCode());
+        assertEquals(otherTrans.hashCode(), trans.hashCode());
     }
 
     @Test
@@ -656,16 +656,16 @@ public class TCKZoneRules {
         ZoneRules test = europeParis();
         final LocalDateTime dateTime = LocalDateTime.of(2008, 10, 26, 2, 0, 0, 0);
         ZoneOffsetTransition trans = checkOffset(test, dateTime, OFFSET_PTWO, OVERLAP);
-        assertEquals(trans.isGap(), false);
-        assertEquals(trans.isOverlap(), true);
-        assertEquals(trans.getOffsetBefore(), OFFSET_PTWO);
-        assertEquals(trans.getOffsetAfter(), OFFSET_PONE);
-        assertEquals(trans.getInstant(), createInstant(2008, 10, 26, 1, 0, ZoneOffset.UTC));
-        assertEquals(trans.isValidOffset(OFFSET_ZERO), false);
-        assertEquals(trans.isValidOffset(OFFSET_PONE), true);
-        assertEquals(trans.isValidOffset(OFFSET_PTWO), true);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(3)), false);
-        assertEquals(trans.toString(), "Transition[Overlap at 2008-10-26T03:00+02:00 to +01:00]");
+        assertEquals(false, trans.isGap());
+        assertEquals(true, trans.isOverlap());
+        assertEquals(OFFSET_PTWO, trans.getOffsetBefore());
+        assertEquals(OFFSET_PONE, trans.getOffsetAfter());
+        assertEquals(createInstant(2008, 10, 26, 1, 0, ZoneOffset.UTC), trans.getInstant());
+        assertEquals(false, trans.isValidOffset(OFFSET_ZERO));
+        assertEquals(true, trans.isValidOffset(OFFSET_PONE));
+        assertEquals(true, trans.isValidOffset(OFFSET_PTWO));
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(3)));
+        assertEquals("Transition[Overlap at 2008-10-26T03:00+02:00 to +01:00]", trans.toString());
 
         assertFalse(trans.equals(null));
         assertFalse(trans.equals(OFFSET_PTWO));
@@ -673,7 +673,7 @@ public class TCKZoneRules {
 
         final ZoneOffsetTransition otherTrans = test.getTransition(dateTime);
         assertTrue(trans.equals(otherTrans));
-        assertEquals(trans.hashCode(), otherTrans.hashCode());
+        assertEquals(otherTrans.hashCode(), trans.hashCode());
     }
 
     @Test
@@ -683,15 +683,15 @@ public class TCKZoneRules {
         while (zdt.getYear() < 2010) {
             Instant instant = zdt.toInstant();
             if (zdt.toLocalDate().isBefore(LocalDate.of(1911, 3, 11))) {
-                assertEquals(test.getStandardOffset(instant), ZoneOffset.ofHoursMinutesSeconds(0, 9, 21));
+                assertEquals(ZoneOffset.ofHoursMinutesSeconds(0, 9, 21), test.getStandardOffset(instant));
             } else if (zdt.toLocalDate().isBefore(LocalDate.of(1940, 6, 14))) {
-                assertEquals(test.getStandardOffset(instant), OFFSET_ZERO);
+                assertEquals(OFFSET_ZERO, test.getStandardOffset(instant));
             } else if (zdt.toLocalDate().isBefore(LocalDate.of(1944, 8, 25))) {
-                assertEquals(test.getStandardOffset(instant), OFFSET_PONE);
+                assertEquals(OFFSET_PONE, test.getStandardOffset(instant));
             } else if (zdt.toLocalDate().isBefore(LocalDate.of(1945, 9, 16))) {
-                assertEquals(test.getStandardOffset(instant), OFFSET_ZERO);
+                assertEquals(OFFSET_ZERO, test.getStandardOffset(instant));
             } else {
-                assertEquals(test.getStandardOffset(instant), OFFSET_PONE);
+                assertEquals(OFFSET_PONE, test.getStandardOffset(instant));
             }
             zdt = zdt.plusMonths(6);
         }
@@ -707,7 +707,7 @@ public class TCKZoneRules {
     @Test
     public void test_NewYork() {
         ZoneRules test = americaNewYork();
-        assertEquals(test.isFixedOffset(), false);
+        assertEquals(false, test.isFixedOffset());
     }
 
     @Test
@@ -716,73 +716,73 @@ public class TCKZoneRules {
         ZonedDateTime old = createZDT(1800, 1, 1, ZoneOffset.UTC);
         Instant instant = old.toInstant();
         ZoneOffset offset = ZoneOffset.of("-04:56:02");
-        assertEquals(test.getOffset(instant), offset);
+        assertEquals(offset, test.getOffset(instant));
         checkOffset(test, old.toLocalDateTime(), offset, 1);
-        assertEquals(test.getStandardOffset(instant), offset);
-        assertEquals(test.getDaylightSavings(instant), Duration.ZERO);
-        assertEquals(test.isDaylightSavings(instant), false);
+        assertEquals(offset, test.getStandardOffset(instant));
+        assertEquals(Duration.ZERO, test.getDaylightSavings(instant));
+        assertEquals(false, test.isDaylightSavings(instant));
     }
 
     @Test
     public void test_NewYork_getOffset() {
         ZoneRules test = americaNewYork();
         ZoneOffset offset = ZoneOffset.ofHours(-5);
-        assertEquals(test.getOffset(createInstant(2008, 1, 1, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getOffset(createInstant(2008, 2, 1, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getOffset(createInstant(2008, 3, 1, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getOffset(createInstant(2008, 4, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 5, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 6, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 7, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 8, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 9, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 10, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 11, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 12, 1, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getOffset(createInstant(2008, 1, 28, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getOffset(createInstant(2008, 2, 28, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getOffset(createInstant(2008, 3, 28, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 4, 28, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 5, 28, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 6, 28, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 7, 28, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 8, 28, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 9, 28, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 10, 28, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 11, 28, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getOffset(createInstant(2008, 12, 28, offset)), ZoneOffset.ofHours(-5));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 1, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 2, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 3, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 4, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 5, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 6, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 7, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 8, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 9, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 10, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 11, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 12, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 1, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 2, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 3, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 4, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 5, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 6, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 7, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 8, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 9, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 10, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 11, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 12, 28, offset)));
     }
 
     @Test
     public void test_NewYork_getOffset_toDST() {
         ZoneRules test = americaNewYork();
         ZoneOffset offset = ZoneOffset.ofHours(-5);
-        assertEquals(test.getOffset(createInstant(2008, 3, 8, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getOffset(createInstant(2008, 3, 9, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getOffset(createInstant(2008, 3, 10, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 3, 11, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 3, 12, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 3, 13, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 3, 14, offset)), ZoneOffset.ofHours(-4));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 3, 8, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 3, 9, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 3, 10, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 3, 11, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 3, 12, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 3, 13, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 3, 14, offset)));
         // cutover at 02:00 local
-        assertEquals(test.getOffset(createInstant(2008, 3, 9, 1, 59, 59, 999999999, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getOffset(createInstant(2008, 3, 9, 2, 0, 0, 0, offset)), ZoneOffset.ofHours(-4));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 3, 9, 1, 59, 59, 999999999, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 3, 9, 2, 0, 0, 0, offset)));
     }
 
     @Test
     public void test_NewYork_getOffset_fromDST() {
         ZoneRules test = americaNewYork();
         ZoneOffset offset = ZoneOffset.ofHours(-4);
-        assertEquals(test.getOffset(createInstant(2008, 11, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 11, 2, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 11, 3, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getOffset(createInstant(2008, 11, 4, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getOffset(createInstant(2008, 11, 5, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getOffset(createInstant(2008, 11, 6, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getOffset(createInstant(2008, 11, 7, offset)), ZoneOffset.ofHours(-5));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 11, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 11, 2, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 11, 3, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 11, 4, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 11, 5, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 11, 6, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 11, 7, offset)));
         // cutover at 02:00 local
-        assertEquals(test.getOffset(createInstant(2008, 11, 2, 1, 59, 59, 999999999, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getOffset(createInstant(2008, 11, 2, 2, 0, 0, 0, offset)), ZoneOffset.ofHours(-5));
+        assertEquals(ZoneOffset.ofHours(-4), test.getOffset(createInstant(2008, 11, 2, 1, 59, 59, 999999999, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getOffset(createInstant(2008, 11, 2, 2, 0, 0, 0, offset)));
     }
 
     @Test
@@ -849,15 +849,15 @@ public class TCKZoneRules {
         ZoneRules test = americaNewYork();
         final LocalDateTime dateTime = LocalDateTime.of(2008, 3, 9, 2, 0, 0, 0);
         ZoneOffsetTransition trans = checkOffset(test, dateTime, ZoneOffset.ofHours(-5), GAP);
-        assertEquals(trans.isGap(), true);
-        assertEquals(trans.isOverlap(), false);
-        assertEquals(trans.getOffsetBefore(), ZoneOffset.ofHours(-5));
-        assertEquals(trans.getOffsetAfter(), ZoneOffset.ofHours(-4));
-        assertEquals(trans.getInstant(), createInstant(2008, 3, 9, 2, 0, ZoneOffset.ofHours(-5)));
-        assertEquals(trans.isValidOffset(OFFSET_PTWO), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-5)), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-4)), false);
-        assertEquals(trans.toString(), "Transition[Gap at 2008-03-09T02:00-05:00 to -04:00]");
+        assertEquals(true, trans.isGap());
+        assertEquals(false, trans.isOverlap());
+        assertEquals(ZoneOffset.ofHours(-5), trans.getOffsetBefore());
+        assertEquals(ZoneOffset.ofHours(-4), trans.getOffsetAfter());
+        assertEquals(createInstant(2008, 3, 9, 2, 0, ZoneOffset.ofHours(-5)), trans.getInstant());
+        assertEquals(false, trans.isValidOffset(OFFSET_PTWO));
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(-5)));
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(-4)));
+        assertEquals("Transition[Gap at 2008-03-09T02:00-05:00 to -04:00]", trans.toString());
 
         assertFalse(trans.equals(null));
         assertFalse(trans.equals(ZoneOffset.ofHours(-5)));
@@ -865,7 +865,7 @@ public class TCKZoneRules {
 
         final ZoneOffsetTransition otherTrans = test.getTransition(dateTime);
         assertTrue(trans.equals(otherTrans));
-        assertEquals(trans.hashCode(), otherTrans.hashCode());
+        assertEquals(otherTrans.hashCode(), trans.hashCode());
     }
 
     @Test
@@ -873,16 +873,16 @@ public class TCKZoneRules {
         ZoneRules test = americaNewYork();
         final LocalDateTime dateTime = LocalDateTime.of(2008, 11, 2, 1, 0, 0, 0);
         ZoneOffsetTransition trans = checkOffset(test, dateTime, ZoneOffset.ofHours(-4), OVERLAP);
-        assertEquals(trans.isGap(), false);
-        assertEquals(trans.isOverlap(), true);
-        assertEquals(trans.getOffsetBefore(), ZoneOffset.ofHours(-4));
-        assertEquals(trans.getOffsetAfter(), ZoneOffset.ofHours(-5));
-        assertEquals(trans.getInstant(), createInstant(2008, 11, 2, 2, 0, ZoneOffset.ofHours(-4)));
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-1)), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-5)), true);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-4)), true);
-        assertEquals(trans.isValidOffset(OFFSET_PTWO), false);
-        assertEquals(trans.toString(), "Transition[Overlap at 2008-11-02T02:00-04:00 to -05:00]");
+        assertEquals(false, trans.isGap());
+        assertEquals(true, trans.isOverlap());
+        assertEquals(ZoneOffset.ofHours(-4), trans.getOffsetBefore());
+        assertEquals(ZoneOffset.ofHours(-5), trans.getOffsetAfter());
+        assertEquals(createInstant(2008, 11, 2, 2, 0, ZoneOffset.ofHours(-4)), trans.getInstant());
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(-1)));
+        assertEquals(true, trans.isValidOffset(ZoneOffset.ofHours(-5)));
+        assertEquals(true, trans.isValidOffset(ZoneOffset.ofHours(-4)));
+        assertEquals(false, trans.isValidOffset(OFFSET_PTWO));
+        assertEquals("Transition[Overlap at 2008-11-02T02:00-04:00 to -05:00]", trans.toString());
 
         assertFalse(trans.equals(null));
         assertFalse(trans.equals(ZoneOffset.ofHours(-4)));
@@ -890,7 +890,7 @@ public class TCKZoneRules {
 
         final ZoneOffsetTransition otherTrans = test.getTransition(dateTime);
         assertTrue(trans.equals(otherTrans));
-        assertEquals(trans.hashCode(), otherTrans.hashCode());
+        assertEquals(otherTrans.hashCode(), trans.hashCode());
     }
 
     @Test
@@ -900,9 +900,9 @@ public class TCKZoneRules {
         while (dateTime.getYear() < 2010) {
             Instant instant = dateTime.toInstant();
             if (dateTime.toLocalDate().isBefore(LocalDate.of(1883, 11, 18))) {
-                assertEquals(test.getStandardOffset(instant), ZoneOffset.of("-04:56:02"));
+                assertEquals(ZoneOffset.of("-04:56:02"), test.getStandardOffset(instant));
             } else {
-                assertEquals(test.getStandardOffset(instant), ZoneOffset.ofHours(-5));
+                assertEquals(ZoneOffset.ofHours(-5), test.getStandardOffset(instant));
             }
             dateTime = dateTime.plusMonths(6);
         }
@@ -921,14 +921,14 @@ public class TCKZoneRules {
         List<ZoneOffsetTransition> trans = test.getTransitions();
 
         ZoneOffsetTransition first = trans.get(0);
-        assertEquals(test.nextTransition(first.getInstant().minusNanos(1)), first);
+        assertEquals(first, test.nextTransition(first.getInstant().minusNanos(1)));
 
         for (int i = 0; i < trans.size() - 1; i++) {
             ZoneOffsetTransition cur = trans.get(i);
             ZoneOffsetTransition next = trans.get(i + 1);
 
-            assertEquals(test.nextTransition(cur.getInstant()), next);
-            assertEquals(test.nextTransition(next.getInstant().minusNanos(1)), next);
+            assertEquals(next, test.nextTransition(cur.getInstant()));
+            assertEquals(next, test.nextTransition(next.getInstant().minusNanos(1)));
         }
     }
 
@@ -938,7 +938,7 @@ public class TCKZoneRules {
         List<ZoneOffsetTransition> trans = test.getTransitions();
 
         ZoneOffsetTransition last = trans.get(trans.size() - 1);
-        assertEquals(test.nextTransition(last.getInstant()), null);
+        assertEquals(null, test.nextTransition(last.getInstant()));
     }
 
     //-----------------------------------------------------------------------
@@ -954,14 +954,14 @@ public class TCKZoneRules {
         List<ZoneOffsetTransition> trans = test.getTransitions();
 
         ZoneOffsetTransition first = trans.get(0);
-        assertEquals(test.nextTransition(first.getInstant().minusNanos(1)), first);
+        assertEquals(first, test.nextTransition(first.getInstant().minusNanos(1)));
 
         for (int i = 0; i < trans.size() - 1; i++) {
             ZoneOffsetTransition cur = trans.get(i);
             ZoneOffsetTransition next = trans.get(i + 1);
 
-            assertEquals(test.nextTransition(cur.getInstant()), next);
-            assertEquals(test.nextTransition(next.getInstant().minusNanos(1)), next);
+            assertEquals(next, test.nextTransition(cur.getInstant()));
+            assertEquals(next, test.nextTransition(next.getInstant().minusNanos(1)));
         }
     }
 
@@ -971,17 +971,17 @@ public class TCKZoneRules {
         ZoneRules test = pacificApia();
         Instant instantBefore = LocalDate.of(2011, 12, 27).atStartOfDay(ZoneOffset.UTC).toInstant();
         ZoneOffsetTransition trans = test.nextTransition(instantBefore);
-        assertEquals(trans.getDateTimeBefore(), LocalDateTime.of(2011, 12, 30, 0, 0));
-        assertEquals(trans.getDateTimeAfter(), LocalDateTime.of(2011, 12, 31, 0, 0));
-        assertEquals(trans.isGap(), true);
-        assertEquals(trans.isOverlap(), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-10)), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(+14)), false);
-        assertEquals(trans.getDuration(), Duration.ofHours(24));
-        assertEquals(trans.getInstant(), LocalDateTime.of(2011, 12, 31, 0, 0).toInstant(ZoneOffset.ofHours(+14)));
+        assertEquals(LocalDateTime.of(2011, 12, 30, 0, 0), trans.getDateTimeBefore());
+        assertEquals(LocalDateTime.of(2011, 12, 31, 0, 0), trans.getDateTimeAfter());
+        assertEquals(true, trans.isGap());
+        assertEquals(false, trans.isOverlap());
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(-10)));
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(+14)));
+        assertEquals(Duration.ofHours(24), trans.getDuration());
+        assertEquals(LocalDateTime.of(2011, 12, 31, 0, 0).toInstant(ZoneOffset.ofHours(+14)), trans.getInstant());
 
         ZonedDateTime zdt = ZonedDateTime.of(2011, 12, 29, 23, 0, 0, 0, ZoneId.of("Pacific/Apia"));
-        assertEquals(zdt.plusHours(2).toLocalDateTime(), LocalDateTime.of(2011, 12, 31, 1, 0));
+        assertEquals(LocalDateTime.of(2011, 12, 31, 1, 0), zdt.plusHours(2).toLocalDateTime());
     }
 
     @Test
@@ -990,30 +990,34 @@ public class TCKZoneRules {
         ZoneRules test = pacificApia();
         Instant instantBefore = LocalDate.of(1892, 7, 2).atStartOfDay(ZoneOffset.UTC).toInstant();
         ZoneOffsetTransition trans = test.nextTransition(instantBefore);
-        assertEquals(trans.getDateTimeBefore(), LocalDateTime.of(1892, 7, 5, 0, 0));
-        assertEquals(trans.getDateTimeAfter(), LocalDateTime.of(1892, 7, 4, 0, 0));
-        assertEquals(trans.isGap(), false);
-        assertEquals(trans.isOverlap(), true);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHoursMinutesSeconds(+12, 33, 4)), true);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHoursMinutesSeconds(-11, -26, -56)), true);
-        assertEquals(trans.getDuration(), Duration.ofHours(-24));
-        assertEquals(trans.getInstant(), LocalDateTime.of(1892, 7, 4, 0, 0).toInstant(ZoneOffset.ofHoursMinutesSeconds(-11, -26, -56)));
+        assertEquals(LocalDateTime.of(1892, 7, 5, 0, 0), trans.getDateTimeBefore());
+        assertEquals(LocalDateTime.of(1892, 7, 4, 0, 0), trans.getDateTimeAfter());
+        assertEquals(false, trans.isGap());
+        assertEquals(true, trans.isOverlap());
+        assertEquals(true, trans.isValidOffset(ZoneOffset.ofHoursMinutesSeconds(+12, 33, 4)));
+        assertEquals(true, trans.isValidOffset(ZoneOffset.ofHoursMinutesSeconds(-11, -26, -56)));
+        assertEquals(Duration.ofHours(-24), trans.getDuration());
+        assertEquals(LocalDateTime.of(1892, 7, 4, 0, 0).toInstant(ZoneOffset.ofHoursMinutesSeconds(-11, -26, -56)), trans.getInstant());
 
         ZonedDateTime zdt = ZonedDateTime.of(1892, 7, 4, 23, 0, 0, 0, ZoneId.of("Pacific/Apia"));
-        assertEquals(zdt.plusHours(2).toLocalDateTime(), LocalDateTime.of(1892, 7, 4, 1, 0, 0));
+        assertEquals(LocalDateTime.of(1892, 7, 4, 1, 0, 0), zdt.plusHours(2).toLocalDateTime());
     }
 
     //-------------------------------------------------------------------------
-    @Test(expectedExceptions=UnsupportedOperationException.class)
+    @Test
     public void test_getTransitions_immutable() {
-        ZoneRules test = europeParis();
-        test.getTransitions().clear();
+        Assertions.assertThrows(UnsupportedOperationException.class, () -> {
+            ZoneRules test = europeParis();
+            test.getTransitions().clear();
+        });
     }
 
-    @Test(expectedExceptions=UnsupportedOperationException.class)
+    @Test
     public void test_getTransitionRules_immutable() {
-        ZoneRules test = europeParis();
-        test.getTransitionRules().clear();
+        Assertions.assertThrows(UnsupportedOperationException.class, () -> {
+            ZoneRules test = europeParis();
+            test.getTransitionRules().clear();
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -1073,23 +1077,23 @@ public class TCKZoneRules {
 
          OffsetDateTime before_time_of_stdOffsetTransition1 = OffsetDateTime.of(time_of_stdOffsetTransition1, stdOffset1).minusSeconds(1);
          OffsetDateTime after_time_of_stdOffsetTransition1 = OffsetDateTime.of(time_of_stdOffsetTransition1, stdOffset1).plusSeconds(1);
-         assertEquals(zoneRule.getStandardOffset(before_time_of_stdOffsetTransition1.toInstant()), stdOffset1);
-         assertEquals(zoneRule.getStandardOffset(after_time_of_stdOffsetTransition1.toInstant()), stdOffset2);
+         assertEquals(stdOffset1, zoneRule.getStandardOffset(before_time_of_stdOffsetTransition1.toInstant()));
+         assertEquals(stdOffset2, zoneRule.getStandardOffset(after_time_of_stdOffsetTransition1.toInstant()));
 
          OffsetDateTime  before_time_of_wallOffsetTransition1 = OffsetDateTime.of(time_of_wallOffsetTransition1, wallOffset1).minusSeconds(1);
          OffsetDateTime  after_time_of_wallOffsetTransition1 = OffsetDateTime.of(time_of_wallOffsetTransition1, wallOffset1).plusSeconds(1);
-         assertEquals(zoneRule.nextTransition(before_time_of_wallOffsetTransition1.toInstant()), wallOffsetTransition1);
-         assertEquals(zoneRule.nextTransition(after_time_of_wallOffsetTransition1.toInstant()), wallOffsetTransition2);
+         assertEquals(wallOffsetTransition1, zoneRule.nextTransition(before_time_of_wallOffsetTransition1.toInstant()));
+         assertEquals(wallOffsetTransition2, zoneRule.nextTransition(after_time_of_wallOffsetTransition1.toInstant()));
 
          OffsetDateTime  before_time_of_wallOffsetTransition2 = OffsetDateTime.of(time_of_wallOffsetTransition2, wallOffset2).minusSeconds(1);
          OffsetDateTime  after_time_of_wallOffsetTransition2 = OffsetDateTime.of(time_of_wallOffsetTransition2, wallOffset2).plusSeconds(1);
-         assertEquals(zoneRule.nextTransition(before_time_of_wallOffsetTransition2.toInstant()), wallOffsetTransition2);
-         assertEquals(zoneRule.nextTransition(after_time_of_wallOffsetTransition2.toInstant()), wallOffsetTransition3);
+         assertEquals(wallOffsetTransition2, zoneRule.nextTransition(before_time_of_wallOffsetTransition2.toInstant()));
+         assertEquals(wallOffsetTransition3, zoneRule.nextTransition(after_time_of_wallOffsetTransition2.toInstant()));
 
          OffsetDateTime  before_time_of_wallOffsetTransition3 = OffsetDateTime.of(time_of_wallOffsetTransition3, wallOffset3).minusSeconds(1);
          OffsetDateTime  after_time_of_wallOffsetTransition3 = OffsetDateTime.of(time_of_wallOffsetTransition3, wallOffset3).plusSeconds(1);
-         assertEquals(zoneRule.nextTransition(before_time_of_wallOffsetTransition3.toInstant()), wallOffsetTransition3);
-         assertEquals(zoneRule.nextTransition(after_time_of_wallOffsetTransition3.toInstant()), rule1.createTransition(2014));
+         assertEquals(wallOffsetTransition3, zoneRule.nextTransition(before_time_of_wallOffsetTransition3.toInstant()));
+         assertEquals(rule1.createTransition(2014), zoneRule.nextTransition(after_time_of_wallOffsetTransition3.toInstant()));
     }
 
     //-----------------------------------------------------------------------
@@ -1100,31 +1104,31 @@ public class TCKZoneRules {
         ZoneRules test1 = europeLondon();
         ZoneRules test2 = europeParis();
         ZoneRules test2b = europeParis();
-        assertEquals(test1.equals(test2), false);
-        assertEquals(test2.equals(test1), false);
+        assertEquals(false, test1.equals(test2));
+        assertEquals(false, test2.equals(test1));
 
-        assertEquals(test1.equals(test1), true);
-        assertEquals(test2.equals(test2), true);
-        assertEquals(test2.equals(test2b), true);
+        assertEquals(true, test1.equals(test1));
+        assertEquals(true, test2.equals(test2));
+        assertEquals(true, test2.equals(test2b));
 
-        assertEquals(test1.hashCode() == test1.hashCode(), true);
-        assertEquals(test2.hashCode() == test2.hashCode(), true);
-        assertEquals(test2.hashCode() == test2b.hashCode(), true);
+        assertEquals(true, test1.hashCode() == test1.hashCode());
+        assertEquals(true, test2.hashCode() == test2.hashCode());
+        assertEquals(true, test2.hashCode() == test2b.hashCode());
     }
 
     @Test
     public void test_equals_null() {
-        assertEquals(europeLondon().equals(null), false);
+        assertEquals(false, europeLondon().equals(null));
     }
 
     @Test
     public void test_equals_notZoneRules() {
-        assertEquals(europeLondon().equals("Europe/London"), false);
+        assertEquals(false, europeLondon().equals("Europe/London"));
     }
 
     @Test
     public void test_toString() {
-        assertEquals(europeLondon().toString().contains("ZoneRules"), true);
+        assertEquals(true, europeLondon().toString().contains("ZoneRules"));
     }
 
     //-----------------------------------------------------------------------
@@ -1152,17 +1156,17 @@ public class TCKZoneRules {
 
     private ZoneOffsetTransition checkOffset(ZoneRules rules, LocalDateTime dateTime, ZoneOffset offset, int type) {
         List<ZoneOffset> validOffsets = rules.getValidOffsets(dateTime);
-        assertEquals(validOffsets.size(), type);
-        assertEquals(rules.getOffset(dateTime), offset);
+        assertEquals(type, validOffsets.size());
+        assertEquals(offset, rules.getOffset(dateTime));
         if (type == 1) {
-            assertEquals(validOffsets.get(0), offset);
+            assertEquals(offset, validOffsets.get(0));
             return null;
         } else {
             ZoneOffsetTransition zot = rules.getTransition(dateTime);
             assertNotNull(zot);
-            assertEquals(zot.isOverlap(), type == 2);
-            assertEquals(zot.isGap(), type == 0);
-            assertEquals(zot.isValidOffset(offset), type == 2);
+            assertEquals(type == 2, zot.isOverlap());
+            assertEquals(type == 0, zot.isGap());
+            assertEquals(type == 2, zot.isValidOffset(offset));
             return zot;
         }
     }
diff --git a/test/jdk/java/time/tck/java/time/zone/TCKZoneRulesProvider.java b/test/jdk/java/time/tck/java/time/zone/TCKZoneRulesProvider.java
index f51bb396f50..32b1a688b54 100644
--- a/test/jdk/java/time/tck/java/time/zone/TCKZoneRulesProvider.java
+++ b/test/jdk/java/time/tck/java/time/zone/TCKZoneRulesProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,9 +59,9 @@
  */
 package tck.java.time.zone;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.ZoneId;
 import java.time.ZoneOffset;
@@ -74,12 +74,12 @@ import java.util.NavigableMap;
 import java.util.Set;
 import java.util.TreeMap;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test ZoneRulesProvider.
  */
-@Test
 public class TCKZoneRulesProvider {
 
     private static String TZDB_VERSION = "2012i";
@@ -90,12 +90,12 @@ public class TCKZoneRulesProvider {
     @Test
     public void test_getAvailableGroupIds() {
         Set<String> zoneIds = ZoneRulesProvider.getAvailableZoneIds();
-        assertEquals(zoneIds.contains("Europe/London"), true);
+        assertEquals(true, zoneIds.contains("Europe/London"));
     }
 
-    @Test(expectedExceptions=UnsupportedOperationException.class)
+    @Test
     public void test_getAvailableGroupIds_modifyZoneId() {
-        ZoneRulesProvider.getAvailableZoneIds().clear();
+        Assertions.assertThrows(UnsupportedOperationException.class, () -> ZoneRulesProvider.getAvailableZoneIds().clear());
     }
 
     //-----------------------------------------------------------------------
@@ -106,17 +106,17 @@ public class TCKZoneRulesProvider {
         ZoneRules rules = ZoneRulesProvider.getRules("Europe/London", false);
         assertNotNull(rules);
         ZoneRules rules2 = ZoneRulesProvider.getRules("Europe/London", false);
-        assertEquals(rules2, rules);
+        assertEquals(rules, rules2);
     }
 
-    @Test(expectedExceptions=ZoneRulesException.class)
+    @Test
     public void test_getRules_StringBoolean_unknownId() {
-        ZoneRulesProvider.getRules("Europe/Lon", false);
+        Assertions.assertThrows(ZoneRulesException.class, () -> ZoneRulesProvider.getRules("Europe/Lon", false));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_getRules_StringBoolean_null() {
-        ZoneRulesProvider.getRules(null, false);
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneRulesProvider.getRules(null, false));
     }
 
     @Test
@@ -124,13 +124,13 @@ public class TCKZoneRulesProvider {
         MockDynamicProvider dynamicProvider = new MockDynamicProvider();
         ZoneRulesProvider.registerProvider(dynamicProvider);
 
-        assertEquals(dynamicProvider.count, 0);
+        assertEquals(0, dynamicProvider.count);
         ZoneRules rules1 = ZoneId.of("DynamicLocation").getRules();
-        assertEquals(dynamicProvider.count, 2);
-        assertEquals(rules1, dynamicProvider.BASE);
+        assertEquals(2, dynamicProvider.count);
+        assertEquals(dynamicProvider.BASE, rules1);
         ZoneRules rules2 = ZoneId.of("DynamicLocation").getRules();
-        assertEquals(dynamicProvider.count, 4);
-        assertEquals(rules2, dynamicProvider.ALTERNATE);
+        assertEquals(4, dynamicProvider.count);
+        assertEquals(dynamicProvider.ALTERNATE, rules2);
     }
 
     //-----------------------------------------------------------------------
@@ -141,23 +141,23 @@ public class TCKZoneRulesProvider {
         NavigableMap<String, ZoneRules> versions = ZoneRulesProvider.getVersions("Europe/London");
         assertTrue(versions.size() >= 1);
         ZoneRules rules = ZoneRulesProvider.getRules("Europe/London", false);
-        assertEquals(versions.lastEntry().getValue(), rules);
+        assertEquals(rules, versions.lastEntry().getValue());
 
         NavigableMap<String, ZoneRules> copy = new TreeMap<>(versions);
         versions.clear();
-        assertEquals(versions.size(), 0);
+        assertEquals(0, versions.size());
         NavigableMap<String, ZoneRules> versions2 = ZoneRulesProvider.getVersions("Europe/London");
-        assertEquals(versions2, copy);
+        assertEquals(copy, versions2);
     }
 
-    @Test(expectedExceptions=ZoneRulesException.class)
+    @Test
     public void test_getVersions_String_unknownId() {
-        ZoneRulesProvider.getVersions("Europe/Lon");
+        Assertions.assertThrows(ZoneRulesException.class, () -> ZoneRulesProvider.getVersions("Europe/Lon"));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_getVersions_String_null() {
-        ZoneRulesProvider.getVersions(null);
+        Assertions.assertThrows(NullPointerException.class, () -> ZoneRulesProvider.getVersions(null));
     }
 
     //-----------------------------------------------------------------------
@@ -165,7 +165,7 @@ public class TCKZoneRulesProvider {
     //-----------------------------------------------------------------------
     @Test
     public void test_refresh() {
-        assertEquals(ZoneRulesProvider.refresh(), false);
+        assertEquals(false, ZoneRulesProvider.refresh());
     }
 
     //-----------------------------------------------------------------------
@@ -174,12 +174,12 @@ public class TCKZoneRulesProvider {
     @Test
     public void test_registerProvider() {
         Set<String> pre = ZoneRulesProvider.getAvailableZoneIds();
-        assertEquals(pre.contains("FooLocation"), false);
+        assertEquals(false, pre.contains("FooLocation"));
         ZoneRulesProvider.registerProvider(new MockTempProvider());
-        assertEquals(pre.contains("FooLocation"), false);
+        assertEquals(false, pre.contains("FooLocation"));
         Set<String> post = ZoneRulesProvider.getAvailableZoneIds();
-        assertEquals(post.contains("FooLocation"), true);
-        assertEquals(ZoneRulesProvider.getRules("FooLocation", false), ZoneOffset.of("+01:45").getRules());
+        assertEquals(true, post.contains("FooLocation"));
+        assertEquals(ZoneOffset.of("+01:45").getRules(), ZoneRulesProvider.getRules("FooLocation", false));
     }
 
     static class MockTempProvider extends ZoneRulesProvider {
diff --git a/test/jdk/java/time/tck/java/time/zone/serial/TCKFixedZoneRulesSerialization.java b/test/jdk/java/time/tck/java/time/zone/serial/TCKFixedZoneRulesSerialization.java
index 790e54fbb6d..719d5aab5f7 100644
--- a/test/jdk/java/time/tck/java/time/zone/serial/TCKFixedZoneRulesSerialization.java
+++ b/test/jdk/java/time/tck/java/time/zone/serial/TCKFixedZoneRulesSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,6 @@
  */
 package tck.java.time.zone.serial;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -69,12 +67,15 @@ import java.io.ObjectOutputStream;
 import java.time.ZoneOffset;
 import java.time.zone.ZoneRules;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test serialization of ZoneRules for fixed offset time-zones.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TCKFixedZoneRulesSerialization {
 
     private static final ZoneOffset OFFSET_PONE = ZoneOffset.ofHours(1);
@@ -85,7 +86,6 @@ public class TCKFixedZoneRulesSerialization {
         return offset.getRules();
     }
 
-    @DataProvider(name="rules")
     Object[][] data_rules() {
         return new Object[][] {
             {make(OFFSET_PONE), OFFSET_PONE},
@@ -97,7 +97,8 @@ public class TCKFixedZoneRulesSerialization {
     //-----------------------------------------------------------------------
     // Basics
     //-----------------------------------------------------------------------
-    @Test(dataProvider="rules")
+    @ParameterizedTest
+    @MethodSource("data_rules")
     public void test_serialization(ZoneRules test, ZoneOffset expectedOffset) throws Exception {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream(baos);
@@ -109,8 +110,8 @@ public class TCKFixedZoneRulesSerialization {
         ObjectInputStream in = new ObjectInputStream(bais);
         ZoneRules result = (ZoneRules) in.readObject();
 
-        assertEquals(result, test);
-        assertEquals(result.getClass(), test.getClass());
+        assertEquals(test, result);
+        assertEquals(test.getClass(), result.getClass());
     }
 
 
diff --git a/test/jdk/java/time/tck/java/time/zone/serial/TCKZoneOffsetTransitionRuleSerialization.java b/test/jdk/java/time/tck/java/time/zone/serial/TCKZoneOffsetTransitionRuleSerialization.java
index 42796f66f8f..ded4772cd9f 100644
--- a/test/jdk/java/time/tck/java/time/zone/serial/TCKZoneOffsetTransitionRuleSerialization.java
+++ b/test/jdk/java/time/tck/java/time/zone/serial/TCKZoneOffsetTransitionRuleSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,13 +66,13 @@ import java.time.ZoneOffset;
 import java.time.zone.ZoneOffsetTransitionRule;
 import java.time.zone.ZoneOffsetTransitionRule.TimeDefinition;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+
 import tck.java.time.AbstractTCKTest;
 
 /**
  * Test ZoneOffsetTransitionRule serialization.
  */
-@Test
 public class TCKZoneOffsetTransitionRuleSerialization extends AbstractTCKTest {
 
     private static final LocalTime TIME_0100 = LocalTime.of(1, 0);
diff --git a/test/jdk/java/time/tck/java/time/zone/serial/TCKZoneOffsetTransitionSerialization.java b/test/jdk/java/time/tck/java/time/zone/serial/TCKZoneOffsetTransitionSerialization.java
index 01ffefe09df..b6ae7dae76b 100644
--- a/test/jdk/java/time/tck/java/time/zone/serial/TCKZoneOffsetTransitionSerialization.java
+++ b/test/jdk/java/time/tck/java/time/zone/serial/TCKZoneOffsetTransitionSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,6 @@ package tck.java.time.zone.serial;
 import static java.time.temporal.ChronoUnit.HOURS;
 
 import java.time.Duration;
-import org.testng.annotations.Test;
 import tck.java.time.AbstractTCKTest;
 
 import java.time.LocalDateTime;
@@ -70,10 +69,11 @@ import java.time.Year;
 import java.time.ZoneOffset;
 import java.time.zone.ZoneOffsetTransition;
 
+import org.junit.jupiter.api.Test;
+
 /**
  * Test serialization of ZoneOffsetTransition.
  */
-@Test
 public class TCKZoneOffsetTransitionSerialization extends AbstractTCKTest {
 
     private static final ZoneOffset OFFSET_0200 = ZoneOffset.ofHours(2);
diff --git a/test/jdk/java/time/tck/java/time/zone/serial/TCKZoneRulesSerialization.java b/test/jdk/java/time/tck/java/time/zone/serial/TCKZoneRulesSerialization.java
index 5262d68eea0..1ba549ba916 100644
--- a/test/jdk/java/time/tck/java/time/zone/serial/TCKZoneRulesSerialization.java
+++ b/test/jdk/java/time/tck/java/time/zone/serial/TCKZoneRulesSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,6 @@
  */
 package tck.java.time.zone.serial;
 
-import org.testng.annotations.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -68,16 +67,17 @@ import java.io.ObjectOutputStream;
 import java.time.ZoneId;
 import java.time.zone.ZoneRules;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 import tck.java.time.AbstractTCKTest;
 
 /**
  * Test serialization of ZoneRules.
  */
-@Test
 public class TCKZoneRulesSerialization extends AbstractTCKTest{
 
+    @Test
     public void test_serialization_loaded() throws Exception {
         assertSerialization(europeLondon());
         assertSerialization(europeParis());
@@ -95,7 +95,7 @@ public class TCKZoneRulesSerialization extends AbstractTCKTest{
         ObjectInputStream in = new ObjectInputStream(bais);
         ZoneRules result = (ZoneRules) in.readObject();
 
-        assertEquals(result, test);
+        assertEquals(test, result);
     }
 
     //-----------------------------------------------------------------------
diff --git a/test/jdk/java/time/test/TEST.properties b/test/jdk/java/time/test/TEST.properties
index 4cc5775e862..e2ecb3e5dc3 100644
--- a/test/jdk/java/time/test/TEST.properties
+++ b/test/jdk/java/time/test/TEST.properties
@@ -1,5 +1,5 @@
-# java.time tests use TestNG
-TestNG.dirs = ..
+# java.time tests use JUnit
+JUnit.dirs = ..
 othervm.dirs = java/time
 lib.dirs = /test/lib /test/jdk/tools/lib
 lib.build = jdk.test.lib.RandomFactory
diff --git a/test/jdk/java/time/test/java/time/AbstractTest.java b/test/jdk/java/time/test/java/time/AbstractTest.java
index 6e4734b8e4c..2a117011533 100644
--- a/test/jdk/java/time/test/java/time/AbstractTest.java
+++ b/test/jdk/java/time/test/java/time/AbstractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,9 +59,7 @@
  */
 package test.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
diff --git a/test/jdk/java/time/test/java/time/TestClock_Fixed.java b/test/jdk/java/time/test/java/time/TestClock_Fixed.java
index cf07ceea07b..1c82a092c6a 100644
--- a/test/jdk/java/time/test/java/time/TestClock_Fixed.java
+++ b/test/jdk/java/time/test/java/time/TestClock_Fixed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,8 @@
  */
 package test.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.time.Clock;
 import java.time.Instant;
@@ -68,18 +68,18 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test fixed clock.
  */
-@Test
 public class TestClock_Fixed {
 
     private static final ZoneId PARIS = ZoneId.of("Europe/Paris");
     private static final Instant INSTANT = LocalDateTime.of(2008, 6, 30, 11, 30, 10, 500).atZone(ZoneOffset.ofHours(2)).toInstant();
 
     //-------------------------------------------------------------------------
+    @Test
     public void test_withZone_same() {
         Clock test = Clock.fixed(INSTANT, PARIS);
         Clock changed = test.withZone(PARIS);
@@ -87,9 +87,10 @@ public class TestClock_Fixed {
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_toString() {
         Clock test = Clock.fixed(INSTANT, PARIS);
-        assertEquals(test.toString(), "FixedClock[2008-06-30T09:30:10.000000500Z,Europe/Paris]");
+        assertEquals("FixedClock[2008-06-30T09:30:10.000000500Z,Europe/Paris]", test.toString());
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/TestClock_Offset.java b/test/jdk/java/time/test/java/time/TestClock_Offset.java
index ed62300e681..03fc2974955 100644
--- a/test/jdk/java/time/test/java/time/TestClock_Offset.java
+++ b/test/jdk/java/time/test/java/time/TestClock_Offset.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,25 +59,25 @@
  */
 package test.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.time.Clock;
 import java.time.Duration;
 import java.time.ZoneId;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test offset clock.
  */
-@Test
 public class TestClock_Offset {
 
     private static final ZoneId PARIS = ZoneId.of("Europe/Paris");
     private static final Duration OFFSET = Duration.ofSeconds(2);
 
     //-------------------------------------------------------------------------
+    @Test
     public void test_withZone_same() {
         Clock test = Clock.offset(Clock.system(PARIS), OFFSET);
         Clock changed = test.withZone(PARIS);
@@ -85,9 +85,10 @@ public class TestClock_Offset {
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_toString() {
         Clock test = Clock.offset(Clock.systemUTC(), OFFSET);
-        assertEquals(test.toString(), "OffsetClock[SystemClock[Z],PT2S]");
+        assertEquals("OffsetClock[SystemClock[Z],PT2S]", test.toString());
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/TestClock_System.java b/test/jdk/java/time/test/java/time/TestClock_System.java
index 05d235e3b3c..4d685e78cc1 100644
--- a/test/jdk/java/time/test/java/time/TestClock_System.java
+++ b/test/jdk/java/time/test/java/time/TestClock_System.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,8 @@
  */
 package test.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.lang.reflect.Field;
 import java.time.Clock;
@@ -68,18 +68,21 @@ import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test system clock.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestClock_System {
 
     private static final ZoneId PARIS = ZoneId.of("Europe/Paris");
     private static final Clock systemUTC = Clock.systemUTC();
 
+    @Test
     public void test_withZone_same() {
         Clock test = Clock.system(PARIS);
         Clock changed = test.withZone(PARIS);
@@ -87,13 +90,13 @@ public class TestClock_System {
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_toString() {
         Clock test = Clock.system(PARIS);
-        assertEquals(test.toString(), "SystemClock[Europe/Paris]");
+        assertEquals("SystemClock[Europe/Paris]", test.toString());
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleSystemUTC")
     Object[][] provider_sampleSystemUTC() {
         return new Object[][] {
             {"Clock.systemUTC()#1",  Clock.systemUTC()},
@@ -104,7 +107,8 @@ public class TestClock_System {
     }
 
     // Test for 8073394
-    @Test(dataProvider="sampleSystemUTC")
+    @ParameterizedTest
+    @MethodSource("provider_sampleSystemUTC")
     public void test_systemUTC(String s, Clock clock) {
         if (clock != systemUTC) {
             throw new RuntimeException("Unexpected clock instance for " + s + ": "
@@ -126,6 +130,7 @@ public class TestClock_System {
                         + time.getNano();
     }
 
+    @Test
     public void test_ClockResolution() {
         Clock highestUTC = Clock.systemUTC();
 
@@ -392,6 +397,7 @@ public class TestClock_System {
         }
     }
 
+    @Test
     public void test_OffsetRegular() throws IllegalAccessException {
         System.out.println("*** Testing regular cases ***");
         SystemClockOffset.testWithOffset("System.currentTimeMillis()/1000",
@@ -402,6 +408,7 @@ public class TestClock_System {
                 System.currentTimeMillis()/1000 + 1024);
     }
 
+    @Test
     public void test_OffsetLimits() throws IllegalAccessException {
         System.out.println("*** Testing limits ***");
         SystemClockOffset.testWithOffset("System.currentTimeMillis()/1000 - MAX_OFFSET + 1",
diff --git a/test/jdk/java/time/test/java/time/TestClock_Tick.java b/test/jdk/java/time/test/java/time/TestClock_Tick.java
index 53e27541764..5e23ed74ca2 100644
--- a/test/jdk/java/time/test/java/time/TestClock_Tick.java
+++ b/test/jdk/java/time/test/java/time/TestClock_Tick.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,8 @@
  */
 package test.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -69,12 +69,11 @@ import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test tick clock.
  */
-@Test
 public class TestClock_Tick {
 
     private static final ZoneId MOSCOW = ZoneId.of("Europe/Moscow");
@@ -82,6 +81,7 @@ public class TestClock_Tick {
     private static final ZonedDateTime ZDT = LocalDateTime.of(2008, 6, 30, 11, 30, 10, 500).atZone(ZoneOffset.ofHours(2));
 
     //-------------------------------------------------------------------------
+    @Test
     public void test_withZone_same() {
         Clock test = Clock.tick(Clock.system(PARIS), Duration.ofMillis(500));
         Clock changed = test.withZone(PARIS);
@@ -89,14 +89,16 @@ public class TestClock_Tick {
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_toString() {
         Clock test = Clock.tick(Clock.systemUTC(), Duration.ofMillis(500));
-        assertEquals(test.toString(), "TickClock[SystemClock[Z],PT0.5S]");
+        assertEquals("TickClock[SystemClock[Z],PT0.5S]", test.toString());
     }
 
     //-----------------------------------------------------------------------
     // Ensure divide-by-zero will not be thrown
     // @bug 8310232
+    @Test
     public void test_millis() {
         var test = Clock.tick(Clock.systemUTC(), Duration.ofNanos(1000));
         test.millis();
diff --git a/test/jdk/java/time/test/java/time/TestDuration.java b/test/jdk/java/time/test/java/time/TestDuration.java
index 2b2043377f3..37147687511 100644
--- a/test/jdk/java/time/test/java/time/TestDuration.java
+++ b/test/jdk/java/time/test/java/time/TestDuration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,18 +59,16 @@
  */
 package test.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.time.Duration;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Duration.
  */
-@Test
 public class TestDuration extends AbstractTest {
 
     //-----------------------------------------------------------------------
@@ -187,14 +185,14 @@ public class TestDuration extends AbstractTest {
             for (int j = 0; j < durations.length; j++) {
                 Duration b = durations[j];
                 if (i < j) {
-                    assertEquals(a.compareTo(b)< 0, true, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(true, a.compareTo(b)< 0, a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else if (i > j) {
-                    assertEquals(a.compareTo(b) > 0, true, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(true, a.compareTo(b) > 0, a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else {
-                    assertEquals(a.compareTo(b), 0, a + " <=> " + b);
-                    assertEquals(a.equals(b), true, a + " <=> " + b);
+                    assertEquals(0, a.compareTo(b), a + " <=> " + b);
+                    assertEquals(true, a.equals(b), a + " <=> " + b);
                 }
             }
         }
diff --git a/test/jdk/java/time/test/java/time/TestInstant.java b/test/jdk/java/time/test/java/time/TestInstant.java
index 8dbd951bde1..40f3138ac28 100644
--- a/test/jdk/java/time/test/java/time/TestInstant.java
+++ b/test/jdk/java/time/test/java/time/TestInstant.java
@@ -66,16 +66,18 @@ import java.time.ZoneOffset;
 import java.time.format.DateTimeParseException;
 import java.time.temporal.ChronoUnit;
 
-import org.testng.annotations.Test;
-import org.testng.annotations.DataProvider;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test Instant.
  * @bug 8273369 8331202 8364752
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestInstant extends AbstractTest {
 
     @Test
@@ -83,7 +85,6 @@ public class TestInstant extends AbstractTest {
         assertImmutable(Instant.class);
     }
 
-    @DataProvider(name="sampleEpochMillis")
     private Object[][] provider_sampleEpochMillis() {
         return new Object[][] {
             {"Long.MAX_VALUE", Long.MAX_VALUE},
@@ -96,11 +97,12 @@ public class TestInstant extends AbstractTest {
         };
     }
 
-    @Test(dataProvider="sampleEpochMillis")
+    @ParameterizedTest
+    @MethodSource("provider_sampleEpochMillis")
     public void test_epochMillis(String name, long millis) {
         Instant t1 = Instant.ofEpochMilli(millis);
         long m = t1.toEpochMilli();
-        assertEquals(millis, m, name);
+        assertEquals(m, millis, name);
     }
 
     /**
@@ -113,7 +115,7 @@ public class TestInstant extends AbstractTest {
         var nanoMax = Instant.EPOCH.plusNanos(Long.MAX_VALUE);
         var totalMicros = Instant.EPOCH.until(nanoMax, ChronoUnit.MICROS);
         var plusOneMicro = Instant.EPOCH.until(nanoMax.plusNanos(1000), ChronoUnit.MICROS);
-        assertEquals(plusOneMicro - totalMicros, 1L);
+        assertEquals(1L, plusOneMicro - totalMicros);
     }
 
     /**
@@ -122,11 +124,10 @@ public class TestInstant extends AbstractTest {
      */
     @Test
     public void test_millisUntil() {
-        assertEquals(Instant.MIN.until(Instant.MIN.plusSeconds(1), ChronoUnit.MILLIS), 1000L);
-        assertEquals(Instant.MAX.plusSeconds(-1).until(Instant.MAX, ChronoUnit.MILLIS), 1000L);
+        assertEquals(1000L, Instant.MIN.until(Instant.MIN.plusSeconds(1), ChronoUnit.MILLIS));
+        assertEquals(1000L, Instant.MAX.plusSeconds(-1).until(Instant.MAX, ChronoUnit.MILLIS));
     }
 
-    @DataProvider
     private Object[][] provider_until_1arg() {
         Instant t1 = Instant.ofEpochSecond(0, 10);
         Instant t2 = Instant.ofEpochSecond(10, -20);
@@ -138,24 +139,22 @@ public class TestInstant extends AbstractTest {
         };
     }
 
-    @Test(dataProvider = "provider_until_1arg")
+    @ParameterizedTest
+    @MethodSource("provider_until_1arg")
     public void test_until_1arg(Instant start, Instant end) {
         Duration result = start.until(end);
         Duration expected = Duration.ofSeconds(end.getEpochSecond() - start.getEpochSecond(),
                 end.getNano() - start.getNano());
-        assertEquals(result, expected);
+        assertEquals(expected, result);
         expected = Duration.between(start, end);
-        assertEquals(result, expected);
+        assertEquals(expected, result);
     }
 
     @Test
     public void test_until_1arg_NPE() {
-        assertThrows(NullPointerException.class, () -> {
-            Instant.now().until(null);
-        });
+        assertThrows(NullPointerException.class, () -> Instant.now().until(null));
     }
 
-    @DataProvider
     private Object[][] valid_instants() {
         var I1 = OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.of("+02")).toInstant();
         var I2 = OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.of("+02:02")).toInstant();
@@ -178,12 +177,12 @@ public class TestInstant extends AbstractTest {
         };
     }
 
-    @Test(dataProvider = "valid_instants")
+    @ParameterizedTest
+    @MethodSource("valid_instants")
     public void test_parse_valid(String instant, Instant expected) {
-        assertEquals(Instant.parse(instant), expected);
+        assertEquals(expected, Instant.parse(instant));
     }
 
-    @DataProvider
     private Object[][] invalid_instants() {
         return new Object[][] {
             {"2017-01-01T00:00:00.000"},
@@ -204,7 +203,8 @@ public class TestInstant extends AbstractTest {
         };
     }
 
-    @Test(dataProvider = "invalid_instants")
+    @ParameterizedTest
+    @MethodSource("invalid_instants")
     public void test_parse_invalid(String instant) {
         assertThrows(DateTimeParseException.class, () -> Instant.parse(instant));
     }
diff --git a/test/jdk/java/time/test/java/time/TestInstantSource.java b/test/jdk/java/time/test/java/time/TestInstantSource.java
index 31fe7874e62..e0f70047718 100644
--- a/test/jdk/java/time/test/java/time/TestInstantSource.java
+++ b/test/jdk/java/time/test/java/time/TestInstantSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,10 @@
 package test.java.time;
 
 import static java.time.temporal.ChronoUnit.SECONDS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -34,67 +35,70 @@ import java.time.InstantSource;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test instant source.
  */
-@Test
 public class TestInstantSource {
 
     private static final ZoneId PARIS = ZoneId.of("Europe/Paris");
 
+    @Test
     public void test_system() {
         // main tests for Clock.currentInstant() are in TestClock_System
         var test = InstantSource.system();
         assertSame(test.withZone(ZoneOffset.UTC), Clock.systemUTC());
-        assertEquals(test.withZone(PARIS), Clock.system(PARIS));
+        assertEquals(Clock.system(PARIS), test.withZone(PARIS));
         var millis = System.currentTimeMillis();
         var testMillis = test.millis();
         var testInstantMillis = test.instant().toEpochMilli();
         assertTrue(Math.abs(testMillis - millis) < 1000);
         assertTrue(Math.abs(testInstantMillis - millis) < 1000);
         assertSame(test, InstantSource.system());
-        assertEquals(test.hashCode(), InstantSource.system().hashCode());
-        assertEquals(test.toString(), "SystemInstantSource");
+        assertEquals(InstantSource.system().hashCode(), test.hashCode());
+        assertEquals("SystemInstantSource", test.toString());
     }
 
+    @Test
     public void test_tick() {
         var millis = 257265861691L;
         var instant = Instant.ofEpochMilli(millis);
         var duration = Duration.ofSeconds(1);
         var test = InstantSource.tick(InstantSource.fixed(instant), duration);
-        assertEquals(test.withZone(ZoneOffset.UTC), Clock.tick(Clock.fixed(instant, ZoneOffset.UTC), duration));
-        assertEquals(test.withZone(PARIS), Clock.tick(Clock.fixed(instant, PARIS), duration));
-        assertEquals(test.millis(), (millis / 1000) * 1000);
-        assertEquals(test.instant(), instant.truncatedTo(SECONDS));
-        assertEquals(test, InstantSource.tick(InstantSource.fixed(instant), duration));
-        assertEquals(test.hashCode(), InstantSource.tick(InstantSource.fixed(instant), duration).hashCode());
+        assertEquals(Clock.tick(Clock.fixed(instant, ZoneOffset.UTC), duration), test.withZone(ZoneOffset.UTC));
+        assertEquals(Clock.tick(Clock.fixed(instant, PARIS), duration), test.withZone(PARIS));
+        assertEquals((millis / 1000) * 1000, test.millis());
+        assertEquals(instant.truncatedTo(SECONDS), test.instant());
+        assertEquals(InstantSource.tick(InstantSource.fixed(instant), duration), test);
+        assertEquals(InstantSource.tick(InstantSource.fixed(instant), duration).hashCode(), test.hashCode());
     }
 
+    @Test
     public void test_fixed() {
         var millis = 257265861691L;
         var instant = Instant.ofEpochMilli(millis);
         var test = InstantSource.fixed(instant);
-        assertEquals(test.withZone(ZoneOffset.UTC), Clock.fixed(instant, ZoneOffset.UTC));
-        assertEquals(test.withZone(PARIS), Clock.fixed(instant, PARIS));
-        assertEquals(test.millis(), millis);
-        assertEquals(test.instant(), instant);
-        assertEquals(test, InstantSource.fixed(instant));
-        assertEquals(test.hashCode(), InstantSource.fixed(instant).hashCode());
+        assertEquals(Clock.fixed(instant, ZoneOffset.UTC), test.withZone(ZoneOffset.UTC));
+        assertEquals(Clock.fixed(instant, PARIS), test.withZone(PARIS));
+        assertEquals(millis, test.millis());
+        assertEquals(instant, test.instant());
+        assertEquals(InstantSource.fixed(instant), test);
+        assertEquals(InstantSource.fixed(instant).hashCode(), test.hashCode());
     }
 
+    @Test
     public void test_offset() {
         var millis = 257265861691L;
         var instant = Instant.ofEpochMilli(millis);
         var duration = Duration.ofSeconds(120);
         var test = InstantSource.offset(InstantSource.fixed(instant), duration);
-        assertEquals(test.withZone(ZoneOffset.UTC), Clock.offset(Clock.fixed(instant, ZoneOffset.UTC), duration));
-        assertEquals(test.withZone(PARIS), Clock.offset(Clock.fixed(instant, PARIS), duration));
-        assertEquals(test.millis(), millis + 120_000);
-        assertEquals(test.instant(), instant.plusSeconds(120));
-        assertEquals(test, InstantSource.offset(InstantSource.fixed(instant), duration));
-        assertEquals(test.hashCode(), InstantSource.offset(InstantSource.fixed(instant), duration).hashCode());
+        assertEquals(Clock.offset(Clock.fixed(instant, ZoneOffset.UTC), duration), test.withZone(ZoneOffset.UTC));
+        assertEquals(Clock.offset(Clock.fixed(instant, PARIS), duration), test.withZone(PARIS));
+        assertEquals(millis + 120_000, test.millis());
+        assertEquals(instant.plusSeconds(120), test.instant());
+        assertEquals(InstantSource.offset(InstantSource.fixed(instant), duration), test);
+        assertEquals(InstantSource.offset(InstantSource.fixed(instant), duration).hashCode(), test.hashCode());
     }
 
     static class MockInstantSource implements InstantSource {
@@ -106,13 +110,14 @@ public class TestInstantSource {
         }
     }
 
+    @Test
     public void test_mock() {
         var test = new MockInstantSource();
-        assertEquals(test.withZone(ZoneOffset.UTC).getZone(), ZoneOffset.UTC);
-        assertEquals(test.withZone(PARIS).getZone(), PARIS);
-        assertEquals(test.withZone(ZoneOffset.UTC).withZone(PARIS).getZone(), PARIS);
-        assertEquals(test.millis(), MockInstantSource.FIXED.toEpochMilli());
-        assertEquals(test.instant(), MockInstantSource.FIXED);
+        assertEquals(ZoneOffset.UTC, test.withZone(ZoneOffset.UTC).getZone());
+        assertEquals(PARIS, test.withZone(PARIS).getZone());
+        assertEquals(PARIS, test.withZone(ZoneOffset.UTC).withZone(PARIS).getZone());
+        assertEquals(MockInstantSource.FIXED.toEpochMilli(), test.millis());
+        assertEquals(MockInstantSource.FIXED, test.instant());
         assertEquals(test.withZone(ZoneOffset.UTC), test.withZone(ZoneOffset.UTC));
         assertEquals(test.withZone(ZoneOffset.UTC).hashCode(), test.withZone(ZoneOffset.UTC).hashCode());
     }
diff --git a/test/jdk/java/time/test/java/time/TestLocalDate.java b/test/jdk/java/time/test/java/time/TestLocalDate.java
index ef7a10ac687..b7f232665d0 100644
--- a/test/jdk/java/time/test/java/time/TestLocalDate.java
+++ b/test/jdk/java/time/test/java/time/TestLocalDate.java
@@ -60,10 +60,11 @@
 package test.java.time;
 
 import static java.time.temporal.ChronoField.YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ObjectStreamClass;
 import java.io.ObjectStreamField;
@@ -74,19 +75,21 @@ import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.IsoFields;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test LocalDate.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestLocalDate extends AbstractTest {
 
     private LocalDate TEST_2007_07_15;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_2007_07_15 = LocalDate.of(2007, 7, 15);
     }
@@ -180,7 +183,6 @@ public class TestLocalDate extends AbstractTest {
     //-----------------------------------------------------------------------
     // plusWeeks()
     //-----------------------------------------------------------------------
-    @DataProvider(name="samplePlusWeeksSymmetry")
     Object[][] provider_samplePlusWeeksSymmetry() {
         return new Object[][] {
             {LocalDate.of(-1, 1, 1)},
@@ -212,14 +214,15 @@ public class TestLocalDate extends AbstractTest {
         };
     }
 
-    @Test(dataProvider="samplePlusWeeksSymmetry")
+    @ParameterizedTest
+    @MethodSource("provider_samplePlusWeeksSymmetry")
     public void test_plusWeeks_symmetry(LocalDate reference) {
         for (int weeks = 0; weeks < 365 * 8; weeks++) {
             LocalDate t = reference.plusWeeks(weeks).plusWeeks(-weeks);
-            assertEquals(t, reference);
+            assertEquals(reference, t);
 
             t = reference.plusWeeks(-weeks).plusWeeks(weeks);
-            assertEquals(t, reference);
+            assertEquals(reference, t);
         }
     }
 
@@ -232,7 +235,6 @@ public class TestLocalDate extends AbstractTest {
     //-----------------------------------------------------------------------
     // plusDays()
     //-----------------------------------------------------------------------
-    @DataProvider(name="samplePlusDaysSymmetry")
     Object[][] provider_samplePlusDaysSymmetry() {
         return new Object[][] {
             {LocalDate.of(-1, 1, 1)},
@@ -264,14 +266,15 @@ public class TestLocalDate extends AbstractTest {
         };
     }
 
-    @Test(dataProvider="samplePlusDaysSymmetry")
+    @ParameterizedTest
+    @MethodSource("provider_samplePlusDaysSymmetry")
     public void test_plusDays_symmetry(LocalDate reference) {
         for (int days = 0; days < 365 * 8; days++) {
             LocalDate t = reference.plusDays(days).plusDays(-days);
-            assertEquals(t, reference);
+            assertEquals(reference, t);
 
             t = reference.plusDays(-days).plusDays(days);
-            assertEquals(t, reference);
+            assertEquals(reference, t);
         }
     }
 
@@ -308,7 +311,6 @@ public class TestLocalDate extends AbstractTest {
     //-----------------------------------------------------------------------
     // minusWeeks()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleMinusWeeksSymmetry")
     Object[][] provider_sampleMinusWeeksSymmetry() {
         return new Object[][] {
             {LocalDate.of(-1, 1, 1)},
@@ -340,14 +342,15 @@ public class TestLocalDate extends AbstractTest {
         };
     }
 
-    @Test(dataProvider="sampleMinusWeeksSymmetry")
+    @ParameterizedTest
+    @MethodSource("provider_sampleMinusWeeksSymmetry")
     public void test_minusWeeks_symmetry(LocalDate reference) {
         for (int weeks = 0; weeks < 365 * 8; weeks++) {
             LocalDate t = reference.minusWeeks(weeks).minusWeeks(-weeks);
-            assertEquals(t, reference);
+            assertEquals(reference, t);
 
             t = reference.minusWeeks(-weeks).minusWeeks(weeks);
-            assertEquals(t, reference);
+            assertEquals(reference, t);
         }
     }
 
@@ -360,7 +363,6 @@ public class TestLocalDate extends AbstractTest {
     //-----------------------------------------------------------------------
     // minusDays()
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleMinusDaysSymmetry")
     Object[][] provider_sampleMinusDaysSymmetry() {
         return new Object[][] {
             {LocalDate.of(-1, 1, 1)},
@@ -392,14 +394,15 @@ public class TestLocalDate extends AbstractTest {
         };
     }
 
-    @Test(dataProvider="sampleMinusDaysSymmetry")
+    @ParameterizedTest
+    @MethodSource("provider_sampleMinusDaysSymmetry")
     public void test_minusDays_symmetry(LocalDate reference) {
         for (int days = 0; days < 365 * 8; days++) {
             LocalDate t = reference.minusDays(days).minusDays(-days);
-            assertEquals(t, reference);
+            assertEquals(reference, t);
 
             t = reference.minusDays(-days).minusDays(days);
-            assertEquals(t, reference);
+            assertEquals(reference, t);
         }
     }
 
@@ -415,12 +418,12 @@ public class TestLocalDate extends AbstractTest {
 
         LocalDate test = LocalDate.of(0, 1, 1);
         for (long i = date_0000_01_01; i < 700000; i++) {
-            assertEquals(LocalDate.ofEpochDay(test.toEpochDay()), test);
+            assertEquals(test, LocalDate.ofEpochDay(test.toEpochDay()));
             test = next(test);
         }
         test = LocalDate.of(0, 1, 1);
         for (long i = date_0000_01_01; i > -2000000; i--) {
-            assertEquals(LocalDate.ofEpochDay(test.toEpochDay()), test);
+            assertEquals(test, LocalDate.ofEpochDay(test.toEpochDay()));
             test = previous(test);
         }
     }
@@ -434,11 +437,11 @@ public class TestLocalDate extends AbstractTest {
         int[] offsets = new int[] { 0, 1, 2, 3, 28, 29, 30, 31, 32, 363, 364, 365, 366, 367 };
         for (int offset : offsets) {
             LocalDate minDate = LocalDate.ofEpochDay(minDay + offset);
-            assertEquals(minDate, LocalDate.MIN.plusDays(offset));
+            assertEquals(LocalDate.MIN.plusDays(offset), minDate);
             assertTrue(ChronoField.YEAR.range().isValidValue(minDate.getYear()));
 
             LocalDate maxDate = LocalDate.ofEpochDay(maxDay - offset);
-            assertEquals(maxDate, LocalDate.MAX.minusDays(offset));
+            assertEquals(LocalDate.MAX.minusDays(offset), maxDate);
             assertTrue(ChronoField.YEAR.range().isValidValue(maxDate.getYear()));
 
             try {
@@ -463,25 +466,24 @@ public class TestLocalDate extends AbstractTest {
                 LocalDate b = localDates[j];
                 if (i < j) {
                     assertTrue(a.compareTo(b) < 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), true, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(true, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else if (i > j) {
                     assertTrue(a.compareTo(b) > 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), true, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(true, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else {
-                    assertEquals(a.compareTo(b), 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), true, a + " <=> " + b);
+                    assertEquals(0, a.compareTo(b), a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(true, a.equals(b), a + " <=> " + b);
                 }
             }
         }
     }
 
-    @DataProvider(name="quarterYearsToAdd")
     Object[][] provider_quarterYearsToAdd() {
         return new Object[][] {
             {Long.valueOf(-1000000000)},
@@ -496,7 +498,8 @@ public class TestLocalDate extends AbstractTest {
         };
     }
 
-    @Test(dataProvider="quarterYearsToAdd")
+    @ParameterizedTest
+    @MethodSource("provider_quarterYearsToAdd")
     public void test_plus_QuarterYears(long quarterYears) {
         LocalDate t0 = TEST_2007_07_15
                 .plus(quarterYears, IsoFields.QUARTER_YEARS);
@@ -504,10 +507,11 @@ public class TestLocalDate extends AbstractTest {
                 .plus(quarterYears, ChronoUnit.MONTHS)
                 .plus(quarterYears, ChronoUnit.MONTHS)
                 .plus(quarterYears, ChronoUnit.MONTHS);
-        assertEquals(t0, t1);
+        assertEquals(t1, t0);
     }
 
-    @Test(dataProvider="quarterYearsToAdd")
+    @ParameterizedTest
+    @MethodSource("provider_quarterYearsToAdd")
     public void test_minus_QuarterYears(long quarterYears) {
         LocalDate t0 = TEST_2007_07_15
                 .minus(quarterYears, IsoFields.QUARTER_YEARS);
@@ -515,7 +519,7 @@ public class TestLocalDate extends AbstractTest {
                 .minus(quarterYears, ChronoUnit.MONTHS)
                 .minus(quarterYears, ChronoUnit.MONTHS)
                 .minus(quarterYears, ChronoUnit.MONTHS);
-        assertEquals(t0, t1);
+        assertEquals(t1, t0);
     }
 
     // Verify serialized fields types are backward compatible
@@ -524,9 +528,9 @@ public class TestLocalDate extends AbstractTest {
         var osc = ObjectStreamClass.lookup(LocalDate.class);
         for (ObjectStreamField f : osc.getFields()) {
             switch (f.getName()) {
-                case "year" -> assertEquals(f.getType(), int.class, f.getName());
+                case "year" -> assertEquals(int.class, f.getType(), f.getName());
                 case "month",
-                     "day" -> assertEquals(f.getType(), short.class);
+                     "day" -> assertEquals(short.class, f.getType());
                 default -> fail("unknown field in LocalDate: " + f.getName());
             }
         }
diff --git a/test/jdk/java/time/test/java/time/TestLocalDateTime.java b/test/jdk/java/time/test/java/time/TestLocalDateTime.java
index 80469ed0621..fb53ec70ede 100644
--- a/test/jdk/java/time/test/java/time/TestLocalDateTime.java
+++ b/test/jdk/java/time/test/java/time/TestLocalDateTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,9 +59,9 @@
  */
 package test.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -69,13 +69,15 @@ import java.time.LocalTime;
 import java.time.Period;
 import java.time.temporal.ChronoUnit;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test LocalDateTime.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestLocalDateTime extends AbstractTest {
 
     private LocalDateTime TEST_2007_07_15_12_30_40_987654321 = LocalDateTime.of(2007, 7, 15, 12, 30, 40, 987654321);
@@ -87,7 +89,6 @@ public class TestLocalDateTime extends AbstractTest {
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleDates")
     Object[][] provider_sampleDates() {
         return new Object[][] {
             {2008, 7, 5},
@@ -99,7 +100,6 @@ public class TestLocalDateTime extends AbstractTest {
         };
     }
 
-    @DataProvider(name="sampleTimes")
     Object[][] provider_sampleTimes() {
         return new Object[][] {
             {0, 0, 0, 0},
@@ -444,7 +444,7 @@ public class TestLocalDateTime extends AbstractTest {
     @Test
     public void test_minusSeconds_noChange_oneDay() {
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321.minusSeconds(24 * 60 * 60);
-        assertEquals(t.toLocalDate(), TEST_2007_07_15_12_30_40_987654321.toLocalDate().minusDays(1));
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.toLocalDate().minusDays(1), t.toLocalDate());
         assertSame(t.toLocalTime(), TEST_2007_07_15_12_30_40_987654321.toLocalTime());
     }
 
@@ -469,7 +469,7 @@ public class TestLocalDateTime extends AbstractTest {
     @Test
     public void test_minusNanos_noChange_oneDay() {
         LocalDateTime t = TEST_2007_07_15_12_30_40_987654321.minusNanos(24 * 60 * 60 * 1000000000L);
-        assertEquals(t.toLocalDate(), TEST_2007_07_15_12_30_40_987654321.toLocalDate().minusDays(1));
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.toLocalDate().minusDays(1), t.toLocalDate());
         assertSame(t.toLocalTime(), TEST_2007_07_15_12_30_40_987654321.toLocalTime());
     }
 
@@ -488,7 +488,8 @@ public class TestLocalDateTime extends AbstractTest {
     //-----------------------------------------------------------------------
     // toLocalDate()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleDates")
+    @ParameterizedTest
+    @MethodSource("provider_sampleDates")
     public void test_getDate(int year, int month, int day) {
         LocalDate d = LocalDate.of(year, month, day);
         LocalDateTime dt = LocalDateTime.of(d, LocalTime.MIDNIGHT);
@@ -498,7 +499,8 @@ public class TestLocalDateTime extends AbstractTest {
     //-----------------------------------------------------------------------
     // toLocalTime()
     //-----------------------------------------------------------------------
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_getTime(int h, int m, int s, int ns) {
         LocalTime t = LocalTime.of(h, m, s, ns);
         LocalDateTime dt = LocalDateTime.of(LocalDate.of(2011, 7, 30), t);
@@ -549,19 +551,19 @@ public class TestLocalDateTime extends AbstractTest {
                 LocalDateTime b = localDateTimes[j];
                 if (i < j) {
                     assertTrue(a.compareTo(b) < 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), true, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(true, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else if (i > j) {
                     assertTrue(a.compareTo(b) > 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), true, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(true, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else {
-                    assertEquals(a.compareTo(b), 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), true, a + " <=> " + b);
+                    assertEquals(0, a.compareTo(b), a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(true, a.equals(b), a + " <=> " + b);
                 }
             }
         }
diff --git a/test/jdk/java/time/test/java/time/TestLocalTime.java b/test/jdk/java/time/test/java/time/TestLocalTime.java
index 8e25a85f198..24a456683fd 100644
--- a/test/jdk/java/time/test/java/time/TestLocalTime.java
+++ b/test/jdk/java/time/test/java/time/TestLocalTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,19 +59,18 @@
  */
 package test.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.Clock;
 import java.time.LocalTime;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test LocalTime.
  */
-@Test
 public class TestLocalTime extends AbstractTest {
     static final long NANOS_PER_SECOND = 1_000_000_000L;
     static final long NANOS_PER_MINUTE = 60 * NANOS_PER_SECOND;
@@ -85,10 +84,10 @@ public class TestLocalTime extends AbstractTest {
 
     //-----------------------------------------------------------------------
     private void check(LocalTime time, int h, int m, int s, int n) {
-        assertEquals(time.getHour(), h);
-        assertEquals(time.getMinute(), m);
-        assertEquals(time.getSecond(), s);
-        assertEquals(time.getNano(), n);
+        assertEquals(h, time.getHour());
+        assertEquals(m, time.getMinute());
+        assertEquals(s, time.getSecond());
+        assertEquals(n, time.getNano());
     }
 
     //-----------------------------------------------------------------------
@@ -184,8 +183,8 @@ public class TestLocalTime extends AbstractTest {
     //-----------------------------------------------------------------------
     // now()
     //-----------------------------------------------------------------------
-    @Test
     @SuppressWarnings("unused")
+    @Test
     public void now() {
         // Warmup the TimeZone data so the following test does not include
         // one-time initialization
diff --git a/test/jdk/java/time/test/java/time/TestMonthDay.java b/test/jdk/java/time/test/java/time/TestMonthDay.java
index 311a40030c1..a5195387d2b 100644
--- a/test/jdk/java/time/test/java/time/TestMonthDay.java
+++ b/test/jdk/java/time/test/java/time/TestMonthDay.java
@@ -59,10 +59,10 @@
  */
 package test.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ObjectStreamClass;
 import java.io.ObjectStreamField;
@@ -70,18 +70,17 @@ import java.time.LocalDate;
 import java.time.Month;
 import java.time.MonthDay;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test MonthDay.
  */
-@Test
 public class TestMonthDay extends AbstractTest {
 
     private MonthDay TEST_07_15;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_07_15 = MonthDay.of(7, 15);
     }
@@ -94,8 +93,8 @@ public class TestMonthDay extends AbstractTest {
 
     //-----------------------------------------------------------------------
     void check(MonthDay test, int m, int d) {
-        assertEquals(test.getMonth().getValue(), m);
-        assertEquals(test.getDayOfMonth(), d);
+        assertEquals(m, test.getMonth().getValue());
+        assertEquals(d, test.getDayOfMonth());
     }
 
     @Test
@@ -129,19 +128,19 @@ public class TestMonthDay extends AbstractTest {
                 MonthDay b = localDates[j];
                 if (i < j) {
                     assertTrue(a.compareTo(b) < 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), true, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(true, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else if (i > j) {
                     assertTrue(a.compareTo(b) > 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), true, a + " <=> " + b);
-                    assertEquals(a.equals(b), false, a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(true, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(false, a.equals(b), a + " <=> " + b);
                 } else {
-                    assertEquals(a.compareTo(b), 0, a + " <=> " + b);
-                    assertEquals(a.isBefore(b), false, a + " <=> " + b);
-                    assertEquals(a.isAfter(b), false, a + " <=> " + b);
-                    assertEquals(a.equals(b), true, a + " <=> " + b);
+                    assertEquals(0, a.compareTo(b), a + " <=> " + b);
+                    assertEquals(false, a.isBefore(b), a + " <=> " + b);
+                    assertEquals(false, a.isAfter(b), a + " <=> " + b);
+                    assertEquals(true, a.equals(b), a + " <=> " + b);
                 }
             }
         }
@@ -155,7 +154,7 @@ public class TestMonthDay extends AbstractTest {
         for (ObjectStreamField f : osc.getFields()) {
             switch (f.getName()) {
                 case "month",
-                     "day" -> assertEquals(f.getType(), int.class, f.getName());
+                     "day" -> assertEquals(int.class, f.getType(), f.getName());
                 default -> fail("unknown field in MonthDay: " + f.getName());
             }
         }
diff --git a/test/jdk/java/time/test/java/time/TestOffsetDateTime.java b/test/jdk/java/time/test/java/time/TestOffsetDateTime.java
index bd145fa9663..3caf4d13c88 100644
--- a/test/jdk/java/time/test/java/time/TestOffsetDateTime.java
+++ b/test/jdk/java/time/test/java/time/TestOffsetDateTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,8 @@
  */
 package test.java.time;
 
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.Duration;
 import java.time.LocalDate;
@@ -69,23 +69,25 @@ import java.time.LocalTime;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test OffsetDateTime.
  *
  * @bug 8211990
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestOffsetDateTime extends AbstractTest {
 
     private static final ZoneOffset OFFSET_PONE = ZoneOffset.ofHours(1);
     private static final ZoneOffset OFFSET_PTWO = ZoneOffset.ofHours(2);
     private OffsetDateTime TEST_2008_6_30_11_30_59_000000500;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         TEST_2008_6_30_11_30_59_000000500 = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59, 500), OFFSET_PONE);
     }
@@ -98,7 +100,6 @@ public class TestOffsetDateTime extends AbstractTest {
     //-----------------------------------------------------------------------
     // basics
     //-----------------------------------------------------------------------
-    @DataProvider(name="sampleTimes")
     Object[][] provider_sampleTimes() {
         return new Object[][] {
             {2008, 6, 30, 11, 30, 20, 500, OFFSET_PONE},
@@ -108,7 +109,8 @@ public class TestOffsetDateTime extends AbstractTest {
         };
     }
 
-    @Test(dataProvider="sampleTimes")
+    @ParameterizedTest
+    @MethodSource("provider_sampleTimes")
     public void test_get_same(int y, int o, int d, int h, int m, int s, int n, ZoneOffset offset) {
         LocalDate localDate = LocalDate.of(y, o, d);
         LocalTime localTime = LocalTime.of(h, m, s, n);
@@ -329,6 +331,6 @@ public class TestOffsetDateTime extends AbstractTest {
         OffsetDateTime start = OffsetDateTime.MAX
                                 .withOffsetSameLocal(ZoneOffset.ofHours(-17));
         OffsetDateTime end = OffsetDateTime.MAX;
-        assertEquals(Duration.between(start, end), Duration.ofHours(1));
+        assertEquals(Duration.ofHours(1), Duration.between(start, end));
     }
 }
diff --git a/test/jdk/java/time/test/java/time/TestOffsetDateTime_instants.java b/test/jdk/java/time/test/java/time/TestOffsetDateTime_instants.java
index 28b32ba2811..9131a7b02b6 100644
--- a/test/jdk/java/time/test/java/time/TestOffsetDateTime_instants.java
+++ b/test/jdk/java/time/test/java/time/TestOffsetDateTime_instants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@
  */
 package test.java.time;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.DateTimeException;
 import java.time.Instant;
@@ -70,12 +70,12 @@ import java.time.OffsetDateTime;
 import java.time.Year;
 import java.time.ZoneOffset;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test OffsetDateTime creation.
  */
-@Test
 public class TestOffsetDateTime_instants {
 
     private static final ZoneOffset OFFSET_PONE = ZoneOffset.ofHours(1);
@@ -83,148 +83,167 @@ public class TestOffsetDateTime_instants {
     private static final ZoneOffset OFFSET_MIN = ZoneOffset.ofHours(-18);
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_ofInstant_nullInstant() {
-        OffsetDateTime.ofInstant((Instant) null, OFFSET_PONE);
+        Assertions.assertThrows(NullPointerException.class, () -> OffsetDateTime.ofInstant((Instant) null, OFFSET_PONE));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void factory_ofInstant_nullOffset() {
-        Instant instant = Instant.ofEpochSecond(0L);
-        OffsetDateTime.ofInstant(instant, (ZoneOffset) null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            Instant instant = Instant.ofEpochSecond(0L);
+            OffsetDateTime.ofInstant(instant, (ZoneOffset) null);
+        });
     }
 
+    @Test
     public void factory_ofInstant_allSecsInDay() {
         for (int i = 0; i < (24 * 60 * 60); i++) {
             Instant instant = Instant.ofEpochSecond(i);
             OffsetDateTime test = OffsetDateTime.ofInstant(instant, OFFSET_PONE);
-            assertEquals(test.getYear(), 1970);
-            assertEquals(test.getMonth(), Month.JANUARY);
-            assertEquals(test.getDayOfMonth(), 1 + (i >= 23 * 60 * 60 ? 1 : 0));
-            assertEquals(test.getHour(), ((i / (60 * 60)) + 1) % 24);
-            assertEquals(test.getMinute(), (i / 60) % 60);
-            assertEquals(test.getSecond(), i % 60);
+            assertEquals(1970, test.getYear());
+            assertEquals(Month.JANUARY, test.getMonth());
+            assertEquals(1 + (i >= 23 * 60 * 60 ? 1 : 0), test.getDayOfMonth());
+            assertEquals(((i / (60 * 60)) + 1) % 24, test.getHour());
+            assertEquals((i / 60) % 60, test.getMinute());
+            assertEquals(i % 60, test.getSecond());
         }
     }
 
+    @Test
     public void factory_ofInstant_allDaysInCycle() {
         // sanity check using different algorithm
         OffsetDateTime expected = OffsetDateTime.of(LocalDate.of(1970, 1, 1), LocalTime.of(0, 0, 0, 0), ZoneOffset.UTC);
         for (long i = 0; i < 146097; i++) {
             Instant instant = Instant.ofEpochSecond(i * 24L * 60L * 60L);
             OffsetDateTime test = OffsetDateTime.ofInstant(instant, ZoneOffset.UTC);
-            assertEquals(test, expected);
+            assertEquals(expected, test);
             expected = expected.plusDays(1);
         }
     }
 
+    @Test
     public void factory_ofInstant_history() {
         doTest_factory_ofInstant_all(-2820, 2820);
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void factory_ofInstant_minYear() {
         doTest_factory_ofInstant_all(Year.MIN_VALUE, Year.MIN_VALUE + 420);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofInstant_tooLow() {
-        long days_0000_to_1970 = (146097 * 5) - (30 * 365 + 7);
-        int year = Year.MIN_VALUE - 1;
-        long days = (year * 365L + (year / 4 - year / 100 + year / 400)) - days_0000_to_1970;
-        Instant instant = Instant.ofEpochSecond(days * 24L * 60L * 60L);
-        OffsetDateTime.ofInstant(instant, ZoneOffset.UTC);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            long days_0000_to_1970 = (146097 * 5) - (30 * 365 + 7);
+            int year = Year.MIN_VALUE - 1;
+            long days = (year * 365L + (year / 4 - year / 100 + year / 400)) - days_0000_to_1970;
+            Instant instant = Instant.ofEpochSecond(days * 24L * 60L * 60L);
+            OffsetDateTime.ofInstant(instant, ZoneOffset.UTC);
+        });
     }
 
+    @Test
     public void factory_ofInstant_maxYear() {
         doTest_factory_ofInstant_all(Year.MAX_VALUE - 420, Year.MAX_VALUE);
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofInstant_tooBig() {
-        long days_0000_to_1970 = (146097 * 5) - (30 * 365 + 7);
-        long year = Year.MAX_VALUE + 1L;
-        long days = (year * 365L + (year / 4 - year / 100 + year / 400)) - days_0000_to_1970;
-        Instant instant = Instant.ofEpochSecond(days * 24L * 60L * 60L);
-        OffsetDateTime.ofInstant(instant, ZoneOffset.UTC);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            long days_0000_to_1970 = (146097 * 5) - (30 * 365 + 7);
+            long year = Year.MAX_VALUE + 1L;
+            long days = (year * 365L + (year / 4 - year / 100 + year / 400)) - days_0000_to_1970;
+            Instant instant = Instant.ofEpochSecond(days * 24L * 60L * 60L);
+            OffsetDateTime.ofInstant(instant, ZoneOffset.UTC);
+        });
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void factory_ofInstant_minWithMinOffset() {
         long days_0000_to_1970 = (146097 * 5) - (30 * 365 + 7);
         int year = Year.MIN_VALUE;
         long days = (year * 365L + (year / 4 - year / 100 + year / 400)) - days_0000_to_1970;
         Instant instant = Instant.ofEpochSecond(days * 24L * 60L * 60L - OFFSET_MIN.getTotalSeconds());
         OffsetDateTime test = OffsetDateTime.ofInstant(instant, OFFSET_MIN);
-        assertEquals(test.getYear(), Year.MIN_VALUE);
-        assertEquals(test.getMonth().getValue(), 1);
-        assertEquals(test.getDayOfMonth(), 1);
-        assertEquals(test.getOffset(), OFFSET_MIN);
-        assertEquals(test.getHour(), 0);
-        assertEquals(test.getMinute(), 0);
-        assertEquals(test.getSecond(), 0);
-        assertEquals(test.getNano(), 0);
+        assertEquals(Year.MIN_VALUE, test.getYear());
+        assertEquals(1, test.getMonth().getValue());
+        assertEquals(1, test.getDayOfMonth());
+        assertEquals(OFFSET_MIN, test.getOffset());
+        assertEquals(0, test.getHour());
+        assertEquals(0, test.getMinute());
+        assertEquals(0, test.getSecond());
+        assertEquals(0, test.getNano());
     }
 
+    @Test
     public void factory_ofInstant_minWithMaxOffset() {
         long days_0000_to_1970 = (146097 * 5) - (30 * 365 + 7);
         int year = Year.MIN_VALUE;
         long days = (year * 365L + (year / 4 - year / 100 + year / 400)) - days_0000_to_1970;
         Instant instant = Instant.ofEpochSecond(days * 24L * 60L * 60L - OFFSET_MAX.getTotalSeconds());
         OffsetDateTime test = OffsetDateTime.ofInstant(instant, OFFSET_MAX);
-        assertEquals(test.getYear(), Year.MIN_VALUE);
-        assertEquals(test.getMonth().getValue(), 1);
-        assertEquals(test.getDayOfMonth(), 1);
-        assertEquals(test.getOffset(), OFFSET_MAX);
-        assertEquals(test.getHour(), 0);
-        assertEquals(test.getMinute(), 0);
-        assertEquals(test.getSecond(), 0);
-        assertEquals(test.getNano(), 0);
+        assertEquals(Year.MIN_VALUE, test.getYear());
+        assertEquals(1, test.getMonth().getValue());
+        assertEquals(1, test.getDayOfMonth());
+        assertEquals(OFFSET_MAX, test.getOffset());
+        assertEquals(0, test.getHour());
+        assertEquals(0, test.getMinute());
+        assertEquals(0, test.getSecond());
+        assertEquals(0, test.getNano());
     }
 
+    @Test
     public void factory_ofInstant_maxWithMinOffset() {
         long days_0000_to_1970 = (146097 * 5) - (30 * 365 + 7);
         int year = Year.MAX_VALUE;
         long days = (year * 365L + (year / 4 - year / 100 + year / 400)) + 365 - days_0000_to_1970;
         Instant instant = Instant.ofEpochSecond((days + 1) * 24L * 60L * 60L - 1 - OFFSET_MIN.getTotalSeconds());
         OffsetDateTime test = OffsetDateTime.ofInstant(instant, OFFSET_MIN);
-        assertEquals(test.getYear(), Year.MAX_VALUE);
-        assertEquals(test.getMonth().getValue(), 12);
-        assertEquals(test.getDayOfMonth(), 31);
-        assertEquals(test.getOffset(), OFFSET_MIN);
-        assertEquals(test.getHour(), 23);
-        assertEquals(test.getMinute(), 59);
-        assertEquals(test.getSecond(), 59);
-        assertEquals(test.getNano(), 0);
+        assertEquals(Year.MAX_VALUE, test.getYear());
+        assertEquals(12, test.getMonth().getValue());
+        assertEquals(31, test.getDayOfMonth());
+        assertEquals(OFFSET_MIN, test.getOffset());
+        assertEquals(23, test.getHour());
+        assertEquals(59, test.getMinute());
+        assertEquals(59, test.getSecond());
+        assertEquals(0, test.getNano());
     }
 
+    @Test
     public void factory_ofInstant_maxWithMaxOffset() {
         long days_0000_to_1970 = (146097 * 5) - (30 * 365 + 7);
         int year = Year.MAX_VALUE;
         long days = (year * 365L + (year / 4 - year / 100 + year / 400)) + 365 - days_0000_to_1970;
         Instant instant = Instant.ofEpochSecond((days + 1) * 24L * 60L * 60L - 1 - OFFSET_MAX.getTotalSeconds());
         OffsetDateTime test = OffsetDateTime.ofInstant(instant, OFFSET_MAX);
-        assertEquals(test.getYear(), Year.MAX_VALUE);
-        assertEquals(test.getMonth().getValue(), 12);
-        assertEquals(test.getDayOfMonth(), 31);
-        assertEquals(test.getOffset(), OFFSET_MAX);
-        assertEquals(test.getHour(), 23);
-        assertEquals(test.getMinute(), 59);
-        assertEquals(test.getSecond(), 59);
-        assertEquals(test.getNano(), 0);
+        assertEquals(Year.MAX_VALUE, test.getYear());
+        assertEquals(12, test.getMonth().getValue());
+        assertEquals(31, test.getDayOfMonth());
+        assertEquals(OFFSET_MAX, test.getOffset());
+        assertEquals(23, test.getHour());
+        assertEquals(59, test.getMinute());
+        assertEquals(59, test.getSecond());
+        assertEquals(0, test.getNano());
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofInstant_maxInstantWithMaxOffset() {
-        Instant instant = Instant.ofEpochSecond(Long.MAX_VALUE);
-        OffsetDateTime.ofInstant(instant, OFFSET_MAX);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant instant = Instant.ofEpochSecond(Long.MAX_VALUE);
+            OffsetDateTime.ofInstant(instant, OFFSET_MAX);
+        });
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void factory_ofInstant_maxInstantWithMinOffset() {
-        Instant instant = Instant.ofEpochSecond(Long.MAX_VALUE);
-        OffsetDateTime.ofInstant(instant, OFFSET_MIN);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Instant instant = Instant.ofEpochSecond(Long.MAX_VALUE);
+            OffsetDateTime.ofInstant(instant, OFFSET_MIN);
+        });
     }
 
     //-----------------------------------------------------------------------
@@ -241,7 +260,7 @@ public class TestOffsetDateTime_instants {
             Instant instant = Instant.ofEpochSecond(i * 24L * 60L * 60L);
             try {
                 OffsetDateTime test = OffsetDateTime.ofInstant(instant, ZoneOffset.UTC);
-                assertEquals(test, expected);
+                assertEquals(expected, test);
                 if (expected.toLocalDate().equals(maxDate) == false) {
                     expected = expected.plusDays(1);
                 }
@@ -282,65 +301,75 @@ public class TestOffsetDateTime_instants {
     //    }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_toInstant_19700101() {
         OffsetDateTime dt = OffsetDateTime.of(LocalDate.of(1970, 1, 1), LocalTime.of(0, 0, 0, 0), ZoneOffset.UTC);
         Instant test = dt.toInstant();
-        assertEquals(test.getEpochSecond(), 0);
-        assertEquals(test.getNano(), 0);
+        assertEquals(0, test.getEpochSecond());
+        assertEquals(0, test.getNano());
     }
 
+    @Test
     public void test_toInstant_19700101_oneNano() {
         OffsetDateTime dt = OffsetDateTime.of(LocalDate.of(1970, 1, 1), LocalTime.of(0, 0, 0, 1), ZoneOffset.UTC);
         Instant test = dt.toInstant();
-        assertEquals(test.getEpochSecond(), 0);
-        assertEquals(test.getNano(), 1);
+        assertEquals(0, test.getEpochSecond());
+        assertEquals(1, test.getNano());
     }
 
+    @Test
     public void test_toInstant_19700101_minusOneNano() {
         OffsetDateTime dt = OffsetDateTime.of(LocalDate.of(1969, 12, 31), LocalTime.of(23, 59, 59, 999999999), ZoneOffset.UTC);
         Instant test = dt.toInstant();
-        assertEquals(test.getEpochSecond(), -1);
-        assertEquals(test.getNano(), 999999999);
+        assertEquals(-1, test.getEpochSecond());
+        assertEquals(999999999, test.getNano());
     }
 
+    @Test
     public void test_toInstant_19700102() {
         OffsetDateTime dt = OffsetDateTime.of(LocalDate.of(1970, 1, 2), LocalTime.of(0, 0, 0, 0), ZoneOffset.UTC);
         Instant test = dt.toInstant();
-        assertEquals(test.getEpochSecond(), 24L * 60L * 60L);
-        assertEquals(test.getNano(), 0);
+        assertEquals(24L * 60L * 60L, test.getEpochSecond());
+        assertEquals(0, test.getNano());
     }
 
+    @Test
     public void test_toInstant_19691231() {
         OffsetDateTime dt = OffsetDateTime.of(LocalDate.of(1969, 12, 31), LocalTime.of(0, 0, 0, 0), ZoneOffset.UTC);
         Instant test = dt.toInstant();
-        assertEquals(test.getEpochSecond(), -24L * 60L * 60L);
-        assertEquals(test.getNano(), 0);
+        assertEquals(-24L * 60L * 60L, test.getEpochSecond());
+        assertEquals(0, test.getNano());
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_toEpochSecond_19700101() {
         OffsetDateTime dt = OffsetDateTime.of(LocalDate.of(1970, 1, 1), LocalTime.of(0, 0, 0, 0), ZoneOffset.UTC);
-        assertEquals(dt.toEpochSecond(), 0);
+        assertEquals(0, dt.toEpochSecond());
     }
 
+    @Test
     public void test_toEpochSecond_19700101_oneNano() {
         OffsetDateTime dt = OffsetDateTime.of(LocalDate.of(1970, 1, 1), LocalTime.of( 0, 0, 0, 1), ZoneOffset.UTC);
-        assertEquals(dt.toEpochSecond(), 0);
+        assertEquals(0, dt.toEpochSecond());
     }
 
+    @Test
     public void test_toEpochSecond_19700101_minusOneNano() {
         OffsetDateTime dt = OffsetDateTime.of(LocalDate.of(1969, 12, 31), LocalTime.of(23, 59, 59, 999999999), ZoneOffset.UTC);
-        assertEquals(dt.toEpochSecond(), -1);
+        assertEquals(-1, dt.toEpochSecond());
     }
 
+    @Test
     public void test_toEpochSecond_19700102() {
         OffsetDateTime dt = OffsetDateTime.of(LocalDate.of(1970, 1, 2), LocalTime.of(0, 0, 0, 0), ZoneOffset.UTC);
-        assertEquals(dt.toEpochSecond(), 24L * 60L * 60L);
+        assertEquals(24L * 60L * 60L, dt.toEpochSecond());
     }
 
+    @Test
     public void test_toEpochSecond_19691231() {
         OffsetDateTime dt = OffsetDateTime.of(LocalDate.of(1969, 12, 31), LocalTime.of(0, 0, 0, 0), ZoneOffset.UTC);
-        assertEquals(dt.toEpochSecond(), -24L * 60L * 60L);
+        assertEquals(-24L * 60L * 60L, dt.toEpochSecond());
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/TestOffsetTime.java b/test/jdk/java/time/test/java/time/TestOffsetTime.java
index 41116a7c964..ce3a73aa987 100644
--- a/test/jdk/java/time/test/java/time/TestOffsetTime.java
+++ b/test/jdk/java/time/test/java/time/TestOffsetTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,12 +61,11 @@ package test.java.time;
 
 import java.time.OffsetTime;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test OffsetTime.
  */
-@Test
 public class TestOffsetTime extends AbstractTest {
 
     @Test
diff --git a/test/jdk/java/time/test/java/time/TestPeriod.java b/test/jdk/java/time/test/java/time/TestPeriod.java
index 2c6d4030d84..a74fbf4c8d2 100644
--- a/test/jdk/java/time/test/java/time/TestPeriod.java
+++ b/test/jdk/java/time/test/java/time/TestPeriod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,17 +59,16 @@
  */
 package test.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.time.Period;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test.
  */
-@Test
 public class TestPeriod extends AbstractTest {
 
     @Test
@@ -98,10 +97,10 @@ public class TestPeriod extends AbstractTest {
         Period test6 = Period.ofDays(6);
         Period test5M = Period.ofMonths(5);
         Period test5Y = Period.ofYears(5);
-        assertEquals(test5.hashCode() == test5.hashCode(), true);
-        assertEquals(test5.hashCode() == test6.hashCode(), false);
-        assertEquals(test5.hashCode() == test5M.hashCode(), false);
-        assertEquals(test5.hashCode() == test5Y.hashCode(), false);
+        assertEquals(true, test5.hashCode() == test5.hashCode());
+        assertEquals(false, test5.hashCode() == test6.hashCode());
+        assertEquals(false, test5.hashCode() == test5M.hashCode());
+        assertEquals(false, test5.hashCode() == test5Y.hashCode());
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/TestYear.java b/test/jdk/java/time/test/java/time/TestYear.java
index 71791ab5fa7..ddb82d91b26 100644
--- a/test/jdk/java/time/test/java/time/TestYear.java
+++ b/test/jdk/java/time/test/java/time/TestYear.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,12 +61,11 @@ package test.java.time;
 
 import java.time.Year;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Year.
  */
-@Test
 public class TestYear extends AbstractTest {
 
     @Test
diff --git a/test/jdk/java/time/test/java/time/TestYearMonth.java b/test/jdk/java/time/test/java/time/TestYearMonth.java
index 0552994b8c2..51202c902f9 100644
--- a/test/jdk/java/time/test/java/time/TestYearMonth.java
+++ b/test/jdk/java/time/test/java/time/TestYearMonth.java
@@ -64,15 +64,13 @@ import java.io.ObjectStreamField;
 import java.time.LocalDate;
 import java.time.YearMonth;
 
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test YearMonth.
  */
-@Test
 public class TestYearMonth extends AbstractTest {
 
     //-----------------------------------------------------------------------
@@ -87,8 +85,8 @@ public class TestYearMonth extends AbstractTest {
         var osc = ObjectStreamClass.lookup(YearMonth.class);
         for (ObjectStreamField f : osc.getFields()) {
             switch (f.getName()) {
-                case "year" -> assertEquals(f.getType(), int.class, f.getName());
-                case "month" -> assertEquals(f.getType(), int.class, f.getName());
+                case "year" -> assertEquals(int.class, f.getType(), f.getName());
+                case "month" -> assertEquals(int.class, f.getType(), f.getName());
                 default -> fail("unknown field in YearMonth: " + f.getName());
             }
         }
diff --git a/test/jdk/java/time/test/java/time/TestZoneId.java b/test/jdk/java/time/test/java/time/TestZoneId.java
index df2bbbc519e..fa8727560af 100644
--- a/test/jdk/java/time/test/java/time/TestZoneId.java
+++ b/test/jdk/java/time/test/java/time/TestZoneId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,10 +59,10 @@
  */
 package test.java.time;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -81,12 +81,12 @@ import java.util.Locale;
 import java.util.SimpleTimeZone;
 import java.util.TimeZone;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test ZoneId.
  */
-@Test
 public class TestZoneId extends AbstractTest {
 
     private static final int OVERLAP = 2;
@@ -95,6 +95,7 @@ public class TestZoneId extends AbstractTest {
     //-----------------------------------------------------------------------
     // Basics
     //-----------------------------------------------------------------------
+    @Test
     public void test_immutable() {
         // cannot use standard test as ZoneId is abstract
         Class<ZoneId> cls = ZoneId.class;
@@ -112,100 +113,111 @@ public class TestZoneId extends AbstractTest {
     //-----------------------------------------------------------------------
     // UTC
     //-----------------------------------------------------------------------
+    @Test
     public void test_constant_UTC() {
         ZoneId test = ZoneOffset.UTC;
-        assertEquals(test.getId(), "Z");
-        assertEquals(test.getDisplayName(TextStyle.FULL, Locale.UK), "Z");
-        assertEquals(test.getRules().isFixedOffset(), true);
-        assertEquals(test.getRules().getOffset(Instant.ofEpochSecond(0L)), ZoneOffset.UTC);
+        assertEquals("Z", test.getId());
+        assertEquals("Z", test.getDisplayName(TextStyle.FULL, Locale.UK));
+        assertEquals(true, test.getRules().isFixedOffset());
+        assertEquals(ZoneOffset.UTC, test.getRules().getOffset(Instant.ofEpochSecond(0L)));
         checkOffset(test.getRules(), createLDT(2008, 6, 30), ZoneOffset.UTC, 1);
     }
 
     //-----------------------------------------------------------------------
     // system default
     //-----------------------------------------------------------------------
+    @Test
     public void test_systemDefault() {
         ZoneId test = ZoneId.systemDefault();
-        assertEquals(test.getId(), TimeZone.getDefault().getID());
+        assertEquals(TimeZone.getDefault().getID(), test.getId());
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_systemDefault_unableToConvert_badFormat() {
-        TimeZone current = TimeZone.getDefault();
-        try {
-            TimeZone.setDefault(new SimpleTimeZone(127, "Something Weird"));
-            ZoneId.systemDefault();
-        } finally {
-            TimeZone.setDefault(current);
-        }
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            TimeZone current = TimeZone.getDefault();
+            try {
+                TimeZone.setDefault(new SimpleTimeZone(127, "Something Weird"));
+                ZoneId.systemDefault();
+            } finally {
+                TimeZone.setDefault(current);
+            }
+        });
     }
 
-    @Test(expectedExceptions = ZoneRulesException.class)
+    @Test
     public void test_systemDefault_unableToConvert_unknownId() {
-        TimeZone current = TimeZone.getDefault();
-        try {
-            TimeZone.setDefault(new SimpleTimeZone(127, "SomethingWeird"));
-            ZoneId.systemDefault();
-        } finally {
-            TimeZone.setDefault(current);
-        }
+        Assertions.assertThrows(ZoneRulesException.class, () -> {
+            TimeZone current = TimeZone.getDefault();
+            try {
+                TimeZone.setDefault(new SimpleTimeZone(127, "SomethingWeird"));
+                ZoneId.systemDefault();
+            } finally {
+                TimeZone.setDefault(current);
+            }
+        });
     }
 
     //-----------------------------------------------------------------------
     // Europe/London
     //-----------------------------------------------------------------------
+    @Test
     public void test_London() {
         ZoneId test = ZoneId.of("Europe/London");
-        assertEquals(test.getId(), "Europe/London");
-        assertEquals(test.getRules().isFixedOffset(), false);
+        assertEquals("Europe/London", test.getId());
+        assertEquals(false, test.getRules().isFixedOffset());
     }
 
+    @Test
     public void test_London_getOffset() {
         ZoneId test = ZoneId.of("Europe/London");
-        assertEquals(test.getRules().getOffset(createInstant(2008, 1, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 2, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 4, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 5, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 6, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 7, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 8, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 9, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 11, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 12, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 1, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 2, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 3, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 4, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 5, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 6, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 7, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 8, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 9, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 10, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 11, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 12, 1, ZoneOffset.UTC)));
     }
 
+    @Test
     public void test_London_getOffset_toDST() {
         ZoneId test = ZoneId.of("Europe/London");
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 24, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 25, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 26, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 27, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 28, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 29, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 30, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 31, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 3, 24, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 3, 25, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 3, 26, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 3, 27, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 3, 28, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 3, 29, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 3, 30, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 3, 31, ZoneOffset.UTC)));
         // cutover at 01:00Z
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 30, 0, 59, 59, 999999999, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 30, 1, 0, 0, 0, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 3, 30, 0, 59, 59, 999999999, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 3, 30, 1, 0, 0, 0, ZoneOffset.UTC)));
     }
 
+    @Test
     public void test_London_getOffset_fromDST() {
         ZoneId test = ZoneId.of("Europe/London");
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 24, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 25, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 26, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 27, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 28, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 29, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 30, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 31, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 10, 24, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 10, 25, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 10, 26, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 10, 27, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 10, 28, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 10, 29, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 10, 30, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 10, 31, ZoneOffset.UTC)));
         // cutover at 01:00Z
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 26, 0, 59, 59, 999999999, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 26, 1, 0, 0, 0, ZoneOffset.UTC)), ZoneOffset.ofHours(0));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 10, 26, 0, 59, 59, 999999999, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(0), test.getRules().getOffset(createInstant(2008, 10, 26, 1, 0, 0, 0, ZoneOffset.UTC)));
     }
 
+    @Test
     public void test_London_getOffsetInfo() {
         ZoneId test = ZoneId.of("Europe/London");
         checkOffset(test.getRules(), createLDT(2008, 1, 1), ZoneOffset.ofHours(0), 1);
@@ -222,6 +234,7 @@ public class TestZoneId extends AbstractTest {
         checkOffset(test.getRules(), createLDT(2008, 12, 1), ZoneOffset.ofHours(0), 1);
     }
 
+    @Test
     public void test_London_getOffsetInfo_toDST() {
         ZoneId test = ZoneId.of("Europe/London");
         checkOffset(test.getRules(), createLDT(2008, 3, 24), ZoneOffset.ofHours(0), 1);
@@ -238,6 +251,7 @@ public class TestZoneId extends AbstractTest {
         checkOffset(test.getRules(), LocalDateTime.of(2008, 3, 30, 2, 0, 0, 0), ZoneOffset.ofHours(1), 1);
     }
 
+    @Test
     public void test_London_getOffsetInfo_fromDST() {
         ZoneId test = ZoneId.of("Europe/London");
         checkOffset(test.getRules(), createLDT(2008, 10, 24), ZoneOffset.ofHours(1), 1);
@@ -254,22 +268,23 @@ public class TestZoneId extends AbstractTest {
         checkOffset(test.getRules(), LocalDateTime.of(2008, 10, 26, 2, 0, 0, 0), ZoneOffset.ofHours(0), 1);
     }
 
+    @Test
     public void test_London_getOffsetInfo_gap() {
         ZoneId test = ZoneId.of("Europe/London");
         final LocalDateTime dateTime = LocalDateTime.of(2008, 3, 30, 1, 0, 0, 0);
         ZoneOffsetTransition trans = checkOffset(test.getRules(), dateTime, ZoneOffset.ofHours(0), GAP);
-        assertEquals(trans.isGap(), true);
-        assertEquals(trans.isOverlap(), false);
-        assertEquals(trans.getOffsetBefore(), ZoneOffset.ofHours(0));
-        assertEquals(trans.getOffsetAfter(), ZoneOffset.ofHours(1));
-        assertEquals(trans.getInstant(), dateTime.toInstant(ZoneOffset.UTC));
-        assertEquals(trans.getDateTimeBefore(), LocalDateTime.of(2008, 3, 30, 1, 0));
-        assertEquals(trans.getDateTimeAfter(), LocalDateTime.of(2008, 3, 30, 2, 0));
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-1)), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(0)), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(1)), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(2)), false);
-        assertEquals(trans.toString(), "Transition[Gap at 2008-03-30T01:00Z to +01:00]");
+        assertEquals(true, trans.isGap());
+        assertEquals(false, trans.isOverlap());
+        assertEquals(ZoneOffset.ofHours(0), trans.getOffsetBefore());
+        assertEquals(ZoneOffset.ofHours(1), trans.getOffsetAfter());
+        assertEquals(dateTime.toInstant(ZoneOffset.UTC), trans.getInstant());
+        assertEquals(LocalDateTime.of(2008, 3, 30, 1, 0), trans.getDateTimeBefore());
+        assertEquals(LocalDateTime.of(2008, 3, 30, 2, 0), trans.getDateTimeAfter());
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(-1)));
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(0)));
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(1)));
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(2)));
+        assertEquals("Transition[Gap at 2008-03-30T01:00Z to +01:00]", trans.toString());
 
         assertFalse(trans.equals(null));
         assertFalse(trans.equals(ZoneOffset.ofHours(0)));
@@ -277,25 +292,26 @@ public class TestZoneId extends AbstractTest {
 
         final ZoneOffsetTransition otherTrans = test.getRules().getTransition(dateTime);
         assertTrue(trans.equals(otherTrans));
-        assertEquals(trans.hashCode(), otherTrans.hashCode());
+        assertEquals(otherTrans.hashCode(), trans.hashCode());
     }
 
+    @Test
     public void test_London_getOffsetInfo_overlap() {
         ZoneId test = ZoneId.of("Europe/London");
         final LocalDateTime dateTime = LocalDateTime.of(2008, 10, 26, 1, 0, 0, 0);
         ZoneOffsetTransition trans = checkOffset(test.getRules(), dateTime, ZoneOffset.ofHours(1), OVERLAP);
-        assertEquals(trans.isGap(), false);
-        assertEquals(trans.isOverlap(), true);
-        assertEquals(trans.getOffsetBefore(), ZoneOffset.ofHours(1));
-        assertEquals(trans.getOffsetAfter(), ZoneOffset.ofHours(0));
-        assertEquals(trans.getInstant(), dateTime.toInstant(ZoneOffset.UTC));
-        assertEquals(trans.getDateTimeBefore(), LocalDateTime.of(2008, 10, 26, 2, 0));
-        assertEquals(trans.getDateTimeAfter(), LocalDateTime.of(2008, 10, 26, 1, 0));
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-1)), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(0)), true);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(1)), true);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(2)), false);
-        assertEquals(trans.toString(), "Transition[Overlap at 2008-10-26T02:00+01:00 to Z]");
+        assertEquals(false, trans.isGap());
+        assertEquals(true, trans.isOverlap());
+        assertEquals(ZoneOffset.ofHours(1), trans.getOffsetBefore());
+        assertEquals(ZoneOffset.ofHours(0), trans.getOffsetAfter());
+        assertEquals(dateTime.toInstant(ZoneOffset.UTC), trans.getInstant());
+        assertEquals(LocalDateTime.of(2008, 10, 26, 2, 0), trans.getDateTimeBefore());
+        assertEquals(LocalDateTime.of(2008, 10, 26, 1, 0), trans.getDateTimeAfter());
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(-1)));
+        assertEquals(true, trans.isValidOffset(ZoneOffset.ofHours(0)));
+        assertEquals(true, trans.isValidOffset(ZoneOffset.ofHours(1)));
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(2)));
+        assertEquals("Transition[Overlap at 2008-10-26T02:00+01:00 to Z]", trans.toString());
 
         assertFalse(trans.equals(null));
         assertFalse(trans.equals(ZoneOffset.ofHours(1)));
@@ -303,64 +319,69 @@ public class TestZoneId extends AbstractTest {
 
         final ZoneOffsetTransition otherTrans = test.getRules().getTransition(dateTime);
         assertTrue(trans.equals(otherTrans));
-        assertEquals(trans.hashCode(), otherTrans.hashCode());
+        assertEquals(otherTrans.hashCode(), trans.hashCode());
     }
 
     //-----------------------------------------------------------------------
     // Europe/Paris
     //-----------------------------------------------------------------------
+    @Test
     public void test_Paris() {
         ZoneId test = ZoneId.of("Europe/Paris");
-        assertEquals(test.getId(), "Europe/Paris");
-        assertEquals(test.getRules().isFixedOffset(), false);
+        assertEquals("Europe/Paris", test.getId());
+        assertEquals(false, test.getRules().isFixedOffset());
     }
 
+    @Test
     public void test_Paris_getOffset() {
         ZoneId test = ZoneId.of("Europe/Paris");
-        assertEquals(test.getRules().getOffset(createInstant(2008, 1, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 2, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 4, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(2));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 5, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(2));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 6, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(2));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 7, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(2));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 8, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(2));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 9, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(2));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(2));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 11, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 12, 1, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 1, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 2, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 3, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(2), test.getRules().getOffset(createInstant(2008, 4, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(2), test.getRules().getOffset(createInstant(2008, 5, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(2), test.getRules().getOffset(createInstant(2008, 6, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(2), test.getRules().getOffset(createInstant(2008, 7, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(2), test.getRules().getOffset(createInstant(2008, 8, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(2), test.getRules().getOffset(createInstant(2008, 9, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(2), test.getRules().getOffset(createInstant(2008, 10, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 11, 1, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 12, 1, ZoneOffset.UTC)));
     }
 
+    @Test
     public void test_Paris_getOffset_toDST() {
         ZoneId test = ZoneId.of("Europe/Paris");
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 24, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 25, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 26, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 27, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 28, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 29, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 30, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 31, ZoneOffset.UTC)), ZoneOffset.ofHours(2));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 3, 24, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 3, 25, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 3, 26, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 3, 27, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 3, 28, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 3, 29, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 3, 30, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(2), test.getRules().getOffset(createInstant(2008, 3, 31, ZoneOffset.UTC)));
         // cutover at 01:00Z
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 30, 0, 59, 59, 999999999, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 30, 1, 0, 0, 0, ZoneOffset.UTC)), ZoneOffset.ofHours(2));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 3, 30, 0, 59, 59, 999999999, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(2), test.getRules().getOffset(createInstant(2008, 3, 30, 1, 0, 0, 0, ZoneOffset.UTC)));
     }
 
+    @Test
     public void test_Paris_getOffset_fromDST() {
         ZoneId test = ZoneId.of("Europe/Paris");
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 24, ZoneOffset.UTC)), ZoneOffset.ofHours(2));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 25, ZoneOffset.UTC)), ZoneOffset.ofHours(2));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 26, ZoneOffset.UTC)), ZoneOffset.ofHours(2));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 27, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 28, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 29, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 30, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 31, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
+        assertEquals(ZoneOffset.ofHours(2), test.getRules().getOffset(createInstant(2008, 10, 24, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(2), test.getRules().getOffset(createInstant(2008, 10, 25, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(2), test.getRules().getOffset(createInstant(2008, 10, 26, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 10, 27, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 10, 28, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 10, 29, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 10, 30, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 10, 31, ZoneOffset.UTC)));
         // cutover at 01:00Z
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 26, 0, 59, 59, 999999999, ZoneOffset.UTC)), ZoneOffset.ofHours(2));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 26, 1, 0, 0, 0, ZoneOffset.UTC)), ZoneOffset.ofHours(1));
+        assertEquals(ZoneOffset.ofHours(2), test.getRules().getOffset(createInstant(2008, 10, 26, 0, 59, 59, 999999999, ZoneOffset.UTC)));
+        assertEquals(ZoneOffset.ofHours(1), test.getRules().getOffset(createInstant(2008, 10, 26, 1, 0, 0, 0, ZoneOffset.UTC)));
     }
 
+    @Test
     public void test_Paris_getOffsetInfo() {
         ZoneId test = ZoneId.of("Europe/Paris");
         checkOffset(test.getRules(), createLDT(2008, 1, 1), ZoneOffset.ofHours(1), 1);
@@ -377,6 +398,7 @@ public class TestZoneId extends AbstractTest {
         checkOffset(test.getRules(), createLDT(2008, 12, 1), ZoneOffset.ofHours(1), 1);
     }
 
+    @Test
     public void test_Paris_getOffsetInfo_toDST() {
         ZoneId test = ZoneId.of("Europe/Paris");
         checkOffset(test.getRules(), createLDT(2008, 3, 24), ZoneOffset.ofHours(1), 1);
@@ -393,6 +415,7 @@ public class TestZoneId extends AbstractTest {
         checkOffset(test.getRules(), LocalDateTime.of(2008, 3, 30, 3, 0, 0, 0), ZoneOffset.ofHours(2), 1);
     }
 
+    @Test
     public void test_Paris_getOffsetInfo_fromDST() {
         ZoneId test = ZoneId.of("Europe/Paris");
         checkOffset(test.getRules(), createLDT(2008, 10, 24), ZoneOffset.ofHours(2), 1);
@@ -409,20 +432,21 @@ public class TestZoneId extends AbstractTest {
         checkOffset(test.getRules(), LocalDateTime.of(2008, 10, 26, 3, 0, 0, 0), ZoneOffset.ofHours(1), 1);
     }
 
+    @Test
     public void test_Paris_getOffsetInfo_gap() {
         ZoneId test = ZoneId.of("Europe/Paris");
         final LocalDateTime dateTime = LocalDateTime.of(2008, 3, 30, 2, 0, 0, 0);
         ZoneOffsetTransition trans = checkOffset(test.getRules(), dateTime, ZoneOffset.ofHours(1), GAP);
-        assertEquals(trans.isGap(), true);
-        assertEquals(trans.isOverlap(), false);
-        assertEquals(trans.getOffsetBefore(), ZoneOffset.ofHours(1));
-        assertEquals(trans.getOffsetAfter(), ZoneOffset.ofHours(2));
-        assertEquals(trans.getInstant(), createInstant(2008, 3, 30, 1, 0, 0, 0, ZoneOffset.UTC));
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(0)), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(1)), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(2)), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(3)), false);
-        assertEquals(trans.toString(), "Transition[Gap at 2008-03-30T02:00+01:00 to +02:00]");
+        assertEquals(true, trans.isGap());
+        assertEquals(false, trans.isOverlap());
+        assertEquals(ZoneOffset.ofHours(1), trans.getOffsetBefore());
+        assertEquals(ZoneOffset.ofHours(2), trans.getOffsetAfter());
+        assertEquals(createInstant(2008, 3, 30, 1, 0, 0, 0, ZoneOffset.UTC), trans.getInstant());
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(0)));
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(1)));
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(2)));
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(3)));
+        assertEquals("Transition[Gap at 2008-03-30T02:00+01:00 to +02:00]", trans.toString());
 
         assertFalse(trans.equals(null));
         assertFalse(trans.equals(ZoneOffset.ofHours(1)));
@@ -430,23 +454,24 @@ public class TestZoneId extends AbstractTest {
 
         final ZoneOffsetTransition otherDis = test.getRules().getTransition(dateTime);
         assertTrue(trans.equals(otherDis));
-        assertEquals(trans.hashCode(), otherDis.hashCode());
+        assertEquals(otherDis.hashCode(), trans.hashCode());
     }
 
+    @Test
     public void test_Paris_getOffsetInfo_overlap() {
         ZoneId test = ZoneId.of("Europe/Paris");
         final LocalDateTime dateTime = LocalDateTime.of(2008, 10, 26, 2, 0, 0, 0);
         ZoneOffsetTransition trans = checkOffset(test.getRules(), dateTime, ZoneOffset.ofHours(2), OVERLAP);
-        assertEquals(trans.isGap(), false);
-        assertEquals(trans.isOverlap(), true);
-        assertEquals(trans.getOffsetBefore(), ZoneOffset.ofHours(2));
-        assertEquals(trans.getOffsetAfter(), ZoneOffset.ofHours(1));
-        assertEquals(trans.getInstant(), createInstant(2008, 10, 26, 1, 0, 0, 0, ZoneOffset.UTC));
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(0)), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(1)), true);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(2)), true);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(3)), false);
-        assertEquals(trans.toString(), "Transition[Overlap at 2008-10-26T03:00+02:00 to +01:00]");
+        assertEquals(false, trans.isGap());
+        assertEquals(true, trans.isOverlap());
+        assertEquals(ZoneOffset.ofHours(2), trans.getOffsetBefore());
+        assertEquals(ZoneOffset.ofHours(1), trans.getOffsetAfter());
+        assertEquals(createInstant(2008, 10, 26, 1, 0, 0, 0, ZoneOffset.UTC), trans.getInstant());
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(0)));
+        assertEquals(true, trans.isValidOffset(ZoneOffset.ofHours(1)));
+        assertEquals(true, trans.isValidOffset(ZoneOffset.ofHours(2)));
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(3)));
+        assertEquals("Transition[Overlap at 2008-10-26T03:00+02:00 to +01:00]", trans.toString());
 
         assertFalse(trans.equals(null));
         assertFalse(trans.equals(ZoneOffset.ofHours(2)));
@@ -454,77 +479,82 @@ public class TestZoneId extends AbstractTest {
 
         final ZoneOffsetTransition otherDis = test.getRules().getTransition(dateTime);
         assertTrue(trans.equals(otherDis));
-        assertEquals(trans.hashCode(), otherDis.hashCode());
+        assertEquals(otherDis.hashCode(), trans.hashCode());
     }
 
     //-----------------------------------------------------------------------
     // America/New_York
     //-----------------------------------------------------------------------
+    @Test
     public void test_NewYork() {
         ZoneId test = ZoneId.of("America/New_York");
-        assertEquals(test.getId(), "America/New_York");
-        assertEquals(test.getRules().isFixedOffset(), false);
+        assertEquals("America/New_York", test.getId());
+        assertEquals(false, test.getRules().isFixedOffset());
     }
 
+    @Test
     public void test_NewYork_getOffset() {
         ZoneId test = ZoneId.of("America/New_York");
         ZoneOffset offset = ZoneOffset.ofHours(-5);
-        assertEquals(test.getRules().getOffset(createInstant(2008, 1, 1, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 2, 1, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 1, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 4, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 5, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 6, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 7, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 8, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 9, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 11, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 12, 1, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 1, 28, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 2, 28, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 28, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 4, 28, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 5, 28, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 6, 28, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 7, 28, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 8, 28, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 9, 28, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 10, 28, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 11, 28, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 12, 28, offset)), ZoneOffset.ofHours(-5));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 1, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 2, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 3, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 4, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 5, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 6, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 7, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 8, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 9, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 10, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 11, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 12, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 1, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 2, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 3, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 4, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 5, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 6, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 7, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 8, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 9, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 10, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 11, 28, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 12, 28, offset)));
     }
 
+    @Test
     public void test_NewYork_getOffset_toDST() {
         ZoneId test = ZoneId.of("America/New_York");
         ZoneOffset offset = ZoneOffset.ofHours(-5);
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 8, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 9, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 10, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 11, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 12, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 13, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 14, offset)), ZoneOffset.ofHours(-4));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 3, 8, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 3, 9, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 3, 10, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 3, 11, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 3, 12, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 3, 13, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 3, 14, offset)));
         // cutover at 02:00 local
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 9, 1, 59, 59, 999999999, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 3, 9, 2, 0, 0, 0, offset)), ZoneOffset.ofHours(-4));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 3, 9, 1, 59, 59, 999999999, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 3, 9, 2, 0, 0, 0, offset)));
     }
 
+    @Test
     public void test_NewYork_getOffset_fromDST() {
         ZoneId test = ZoneId.of("America/New_York");
         ZoneOffset offset = ZoneOffset.ofHours(-4);
-        assertEquals(test.getRules().getOffset(createInstant(2008, 11, 1, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 11, 2, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 11, 3, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 11, 4, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 11, 5, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 11, 6, offset)), ZoneOffset.ofHours(-5));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 11, 7, offset)), ZoneOffset.ofHours(-5));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 11, 1, offset)));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 11, 2, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 11, 3, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 11, 4, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 11, 5, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 11, 6, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 11, 7, offset)));
         // cutover at 02:00 local
-        assertEquals(test.getRules().getOffset(createInstant(2008, 11, 2, 1, 59, 59, 999999999, offset)), ZoneOffset.ofHours(-4));
-        assertEquals(test.getRules().getOffset(createInstant(2008, 11, 2, 2, 0, 0, 0, offset)), ZoneOffset.ofHours(-5));
+        assertEquals(ZoneOffset.ofHours(-4), test.getRules().getOffset(createInstant(2008, 11, 2, 1, 59, 59, 999999999, offset)));
+        assertEquals(ZoneOffset.ofHours(-5), test.getRules().getOffset(createInstant(2008, 11, 2, 2, 0, 0, 0, offset)));
     }
 
+    @Test
     public void test_NewYork_getOffsetInfo() {
         ZoneId test = ZoneId.of("America/New_York");
         checkOffset(test.getRules(), createLDT(2008, 1, 1), ZoneOffset.ofHours(-5), 1);
@@ -553,6 +583,7 @@ public class TestZoneId extends AbstractTest {
         checkOffset(test.getRules(), createLDT(2008, 12, 28), ZoneOffset.ofHours(-5), 1);
     }
 
+    @Test
     public void test_NewYork_getOffsetInfo_toDST() {
         ZoneId test = ZoneId.of("America/New_York");
         checkOffset(test.getRules(), createLDT(2008, 3, 8), ZoneOffset.ofHours(-5), 1);
@@ -568,6 +599,7 @@ public class TestZoneId extends AbstractTest {
         checkOffset(test.getRules(), LocalDateTime.of(2008, 3, 9, 3, 0, 0, 0), ZoneOffset.ofHours(-4), 1);
     }
 
+    @Test
     public void test_NewYork_getOffsetInfo_fromDST() {
         ZoneId test = ZoneId.of("America/New_York");
         checkOffset(test.getRules(), createLDT(2008, 11, 1), ZoneOffset.ofHours(-4), 1);
@@ -583,18 +615,19 @@ public class TestZoneId extends AbstractTest {
         checkOffset(test.getRules(), LocalDateTime.of(2008, 11, 2, 2, 0, 0, 0), ZoneOffset.ofHours(-5), 1);
     }
 
+    @Test
     public void test_NewYork_getOffsetInfo_gap() {
         ZoneId test = ZoneId.of("America/New_York");
         final LocalDateTime dateTime = LocalDateTime.of(2008, 3, 9, 2, 0, 0, 0);
         ZoneOffsetTransition trans = checkOffset(test.getRules(), dateTime, ZoneOffset.ofHours(-5), GAP);
-        assertEquals(trans.getOffsetBefore(), ZoneOffset.ofHours(-5));
-        assertEquals(trans.getOffsetAfter(), ZoneOffset.ofHours(-4));
-        assertEquals(trans.getInstant(), createInstant(2008, 3, 9, 2, 0, 0, 0, ZoneOffset.ofHours(-5)));
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-6)), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-5)), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-4)), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-3)), false);
-        assertEquals(trans.toString(), "Transition[Gap at 2008-03-09T02:00-05:00 to -04:00]");
+        assertEquals(ZoneOffset.ofHours(-5), trans.getOffsetBefore());
+        assertEquals(ZoneOffset.ofHours(-4), trans.getOffsetAfter());
+        assertEquals(createInstant(2008, 3, 9, 2, 0, 0, 0, ZoneOffset.ofHours(-5)), trans.getInstant());
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(-6)));
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(-5)));
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(-4)));
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(-3)));
+        assertEquals("Transition[Gap at 2008-03-09T02:00-05:00 to -04:00]", trans.toString());
 
         assertFalse(trans.equals(null));
         assertFalse(trans.equals(ZoneOffset.ofHours(-5)));
@@ -603,21 +636,22 @@ public class TestZoneId extends AbstractTest {
         final ZoneOffsetTransition otherTrans = test.getRules().getTransition(dateTime);
         assertTrue(trans.equals(otherTrans));
 
-        assertEquals(trans.hashCode(), otherTrans.hashCode());
+        assertEquals(otherTrans.hashCode(), trans.hashCode());
     }
 
+    @Test
     public void test_NewYork_getOffsetInfo_overlap() {
         ZoneId test = ZoneId.of("America/New_York");
         final LocalDateTime dateTime = LocalDateTime.of(2008, 11, 2, 1, 0, 0, 0);
         ZoneOffsetTransition trans = checkOffset(test.getRules(), dateTime, ZoneOffset.ofHours(-4), OVERLAP);
-        assertEquals(trans.getOffsetBefore(), ZoneOffset.ofHours(-4));
-        assertEquals(trans.getOffsetAfter(), ZoneOffset.ofHours(-5));
-        assertEquals(trans.getInstant(), createInstant(2008, 11, 2, 2, 0, 0, 0, ZoneOffset.ofHours(-4)));
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-1)), false);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-5)), true);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-4)), true);
-        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(2)), false);
-        assertEquals(trans.toString(), "Transition[Overlap at 2008-11-02T02:00-04:00 to -05:00]");
+        assertEquals(ZoneOffset.ofHours(-4), trans.getOffsetBefore());
+        assertEquals(ZoneOffset.ofHours(-5), trans.getOffsetAfter());
+        assertEquals(createInstant(2008, 11, 2, 2, 0, 0, 0, ZoneOffset.ofHours(-4)), trans.getInstant());
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(-1)));
+        assertEquals(true, trans.isValidOffset(ZoneOffset.ofHours(-5)));
+        assertEquals(true, trans.isValidOffset(ZoneOffset.ofHours(-4)));
+        assertEquals(false, trans.isValidOffset(ZoneOffset.ofHours(2)));
+        assertEquals("Transition[Overlap at 2008-11-02T02:00-04:00 to -05:00]", trans.toString());
 
         assertFalse(trans.equals(null));
         assertFalse(trans.equals(ZoneOffset.ofHours(-4)));
@@ -626,22 +660,24 @@ public class TestZoneId extends AbstractTest {
         final ZoneOffsetTransition otherTrans = test.getRules().getTransition(dateTime);
         assertTrue(trans.equals(otherTrans));
 
-        assertEquals(trans.hashCode(), otherTrans.hashCode());
+        assertEquals(otherTrans.hashCode(), trans.hashCode());
     }
 
     //-----------------------------------------------------------------------
     // getXxx() isXxx()
     //-----------------------------------------------------------------------
+    @Test
     public void test_get_Tzdb() {
         ZoneId test = ZoneId.of("Europe/London");
-        assertEquals(test.getId(), "Europe/London");
-        assertEquals(test.getRules().isFixedOffset(), false);
+        assertEquals("Europe/London", test.getId());
+        assertEquals(false, test.getRules().isFixedOffset());
     }
 
+    @Test
     public void test_get_TzdbFixed() {
         ZoneId test = ZoneId.of("+01:30");
-        assertEquals(test.getId(), "+01:30");
-        assertEquals(test.getRules().isFixedOffset(), true);
+        assertEquals("+01:30", test.getId());
+        assertEquals(true, test.getRules().isFixedOffset());
     }
 
     //-----------------------------------------------------------------------
@@ -665,17 +701,17 @@ public class TestZoneId extends AbstractTest {
 
     private ZoneOffsetTransition checkOffset(ZoneRules rules, LocalDateTime dateTime, ZoneOffset offset, int type) {
         List<ZoneOffset> validOffsets = rules.getValidOffsets(dateTime);
-        assertEquals(validOffsets.size(), type);
-        assertEquals(rules.getOffset(dateTime), offset);
+        assertEquals(type, validOffsets.size());
+        assertEquals(offset, rules.getOffset(dateTime));
         if (type == 1) {
-            assertEquals(validOffsets.get(0), offset);
+            assertEquals(offset, validOffsets.get(0));
             return null;
         } else {
             ZoneOffsetTransition zot = rules.getTransition(dateTime);
             assertNotNull(zot);
-            assertEquals(zot.isOverlap(), type == 2);
-            assertEquals(zot.isGap(), type == 0);
-            assertEquals(zot.isValidOffset(offset), type == 2);
+            assertEquals(type == 2, zot.isOverlap());
+            assertEquals(type == 0, zot.isGap());
+            assertEquals(type == 2, zot.isValidOffset(offset));
             return zot;
         }
     }
diff --git a/test/jdk/java/time/test/java/time/TestZoneOffset.java b/test/jdk/java/time/test/java/time/TestZoneOffset.java
index b85a629aefc..8a42fe2a0ab 100644
--- a/test/jdk/java/time/test/java/time/TestZoneOffset.java
+++ b/test/jdk/java/time/test/java/time/TestZoneOffset.java
@@ -60,17 +60,16 @@
  */
 package test.java.time;
 
-import static org.testng.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.util.Set;
 import java.time.ZoneOffset;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test ZoneOffset.
  */
-@Test
 public class TestZoneOffset extends AbstractTest {
 
     @Test
diff --git a/test/jdk/java/time/test/java/time/TestZonedDateTime.java b/test/jdk/java/time/test/java/time/TestZonedDateTime.java
index 15a95d1f3bc..436187cf3d0 100644
--- a/test/jdk/java/time/test/java/time/TestZonedDateTime.java
+++ b/test/jdk/java/time/test/java/time/TestZonedDateTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,21 +59,20 @@
  */
 package test.java.time;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.ZonedDateTime;
 import java.time.ZoneId;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test ZonedDateTime.
  *
  * @bug 8211990
  */
-@Test
 public class TestZonedDateTime extends AbstractTest {
 
     @Test
@@ -89,6 +88,6 @@ public class TestZonedDateTime extends AbstractTest {
         ZonedDateTime end = ZonedDateTime.of(LocalDateTime.MAX, sanJose);
         ZonedDateTime start = end.withZoneSameLocal(tokyo);
 
-        assertEquals(Duration.between(start, end), Duration.ofHours(17));
+        assertEquals(Duration.ofHours(17), Duration.between(start, end));
     }
 }
diff --git a/test/jdk/java/time/test/java/time/chrono/TestChronoLocalDate.java b/test/jdk/java/time/test/java/time/chrono/TestChronoLocalDate.java
index 79410941206..bb738feee05 100644
--- a/test/jdk/java/time/test/java/time/chrono/TestChronoLocalDate.java
+++ b/test/jdk/java/time/test/java/time/chrono/TestChronoLocalDate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,8 +54,8 @@
  */
 package test.java.time.chrono;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -69,16 +69,16 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test chrono local date.
  */
-@Test
 public class TestChronoLocalDate {
     // this class primarily tests whether the generics work OK
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_date_comparator_checkGenerics_ISO() {
         List<ChronoLocalDate> dates = new ArrayList<>();
         ChronoLocalDate date = LocalDate.of(2013, 1, 1);
@@ -99,10 +99,11 @@ public class TestChronoLocalDate {
         List<ChronoLocalDate> copy = new ArrayList<>(dates);
         Collections.shuffle(copy);
         Collections.sort(copy, ChronoLocalDate.timeLineOrder());
-        assertEquals(copy, dates);
+        assertEquals(dates, copy);
         assertTrue(ChronoLocalDate.timeLineOrder().compare(copy.get(0), copy.get(1)) < 0);
     }
 
+    @Test
     public void test_date_comparator_checkGenerics_LocalDate() {
         List<LocalDate> dates = new ArrayList<>();
         LocalDate date = LocalDate.of(2013, 1, 1);
@@ -123,11 +124,12 @@ public class TestChronoLocalDate {
         List<LocalDate> copy = new ArrayList<>(dates);
         Collections.shuffle(copy);
         Collections.sort(copy, ChronoLocalDate.timeLineOrder());
-        assertEquals(copy, dates);
+        assertEquals(dates, copy);
         assertTrue(ChronoLocalDate.timeLineOrder().compare(copy.get(0), copy.get(1)) < 0);
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_date_checkGenerics_genericsMethod() {
         Chronology chrono = ThaiBuddhistChronology.INSTANCE;
         ChronoLocalDate date = chrono.dateNow();
@@ -138,6 +140,7 @@ public class TestChronoLocalDate {
         date = processClassWeird(ThaiBuddhistDate.class);
     }
 
+    @Test
     public void test_date_checkGenerics_genericsMethod_concreteType() {
         ThaiBuddhistChronology chrono = ThaiBuddhistChronology.INSTANCE;
         ThaiBuddhistDate date = chrono.dateNow();
@@ -149,6 +152,7 @@ public class TestChronoLocalDate {
         // date = processClassWeird(ThaiBuddhistDate.class);  // does not compile (correct)
     }
 
+    @Test
     public <D extends ChronoLocalDate> void test_date_checkGenerics_genericsMethod_withType() {
         Chronology chrono = ThaiBuddhistChronology.INSTANCE;
         @SuppressWarnings("unchecked")
@@ -180,6 +184,7 @@ public class TestChronoLocalDate {
         return null;
     }
 
+    @Test
     public void test_date_checkGenerics_chronoLocalDateTime1() {
         LocalDateTime now = LocalDateTime.now();
         Chronology chrono = ThaiBuddhistChronology.INSTANCE;
@@ -187,6 +192,7 @@ public class TestChronoLocalDate {
         ldt = processCLDT(ldt);
     }
 
+    @Test
     public void test_date_checkGenerics_chronoLocalDateTime2() {
         LocalDateTime now = LocalDateTime.now();
         Chronology chrono = ThaiBuddhistChronology.INSTANCE;
diff --git a/test/jdk/java/time/test/java/time/chrono/TestChronologyPerf.java b/test/jdk/java/time/test/java/time/chrono/TestChronologyPerf.java
index 5026ebf1700..ab6bdd7ee1d 100644
--- a/test/jdk/java/time/test/java/time/chrono/TestChronologyPerf.java
+++ b/test/jdk/java/time/test/java/time/chrono/TestChronologyPerf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ import java.time.chrono.HijrahDate;
 import java.time.temporal.ChronoUnit;
 import java.util.Set;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test the speed of initializing all calendars.
diff --git a/test/jdk/java/time/test/java/time/chrono/TestEraDisplayName.java b/test/jdk/java/time/test/java/time/chrono/TestEraDisplayName.java
index 4e20ceb5495..99cd7499adb 100644
--- a/test/jdk/java/time/test/java/time/chrono/TestEraDisplayName.java
+++ b/test/jdk/java/time/test/java/time/chrono/TestEraDisplayName.java
@@ -30,10 +30,11 @@ import java.util.Arrays;
 import java.util.Locale;
 import java.util.stream.Stream;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Tests Era.getDisplayName() correctly returns the name based on each
@@ -42,7 +43,7 @@ import static org.testng.Assert.assertFalse;
  *
  * @bug 8171049 8224105 8240626 8354548
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestEraDisplayName {
     private static final Locale THAI = Locale.forLanguageTag("th-TH");
     private static final Locale EGYPT = Locale.forLanguageTag("ar-EG");
@@ -52,7 +53,6 @@ public class TestEraDisplayName {
          DateTimeFormatter.ofPattern("yyyy MM dd GGGG G GGGGG")
             .withChronology(JapaneseChronology.INSTANCE);
 
-    @DataProvider(name="eraDisplayName")
     Object[][] eraDisplayName() {
         return new Object[][] {
             // Era, text style, displyay locale, expected name
@@ -141,7 +141,6 @@ public class TestEraDisplayName {
         };
     }
 
-    @DataProvider
     Object[][] allLocales() {
         return Arrays.stream(Locale.getAvailableLocales())
             .map(Stream::of)
@@ -149,7 +148,6 @@ public class TestEraDisplayName {
             .toArray(Object[][]::new);
     }
 
-    @DataProvider
     Object[][] allEras() {
         return Stream.of(IsoEra.values(),
                         JapaneseEra.values(),
@@ -162,29 +160,28 @@ public class TestEraDisplayName {
             .toArray(Object[][]::new);
     }
 
-    @Test(dataProvider="eraDisplayName")
+    @ParameterizedTest
+    @MethodSource("eraDisplayName")
     public void test_eraDisplayName(Era era, TextStyle style, Locale locale, String expected) {
-        assertEquals(era.getDisplayName(style, locale), expected);
+        assertEquals(expected, era.getDisplayName(style, locale));
     }
 
-    @Test(dataProvider="allLocales")
+    @ParameterizedTest
+    @MethodSource("allLocales")
     public void test_reiwaNames(Locale locale) throws DateTimeParseException {
         DateTimeFormatter f = JAPANESE_FORMATTER.withLocale(locale);
-        assertEquals(LocalDate.parse(REIWA_1ST.format(f), f), REIWA_1ST);
+        assertEquals(REIWA_1ST, LocalDate.parse(REIWA_1ST.format(f), f));
     }
 
     // Make sure era display names aren't empty
     // @bug 8240626
-    @Test(dataProvider="allEras")
+    @ParameterizedTest
+    @MethodSource("allEras")
     public void test_noEmptyEraNames(Era era) {
         Arrays.stream(Locale.getAvailableLocales())
-            .forEach(l -> {
-                Arrays.stream(TextStyle.values())
-                    .forEach(s -> {
-                        assertFalse(era.getDisplayName(s, l).isEmpty(),
-                            "getDisplayName() returns empty display name for era: " + era
-                            + ", style: " + s + ", locale: " + l);
-                    });
-            });
+            .forEach(l -> Arrays.stream(TextStyle.values())
+                .forEach(s -> assertFalse(era.getDisplayName(s, l).isEmpty(),
+                    "getDisplayName() returns empty display name for era: " + era
+                    + ", style: " + s + ", locale: " + l)));
     }
 }
diff --git a/test/jdk/java/time/test/java/time/chrono/TestExampleCode.java b/test/jdk/java/time/test/java/time/chrono/TestExampleCode.java
index 5258a0b8062..b4e3c41d5e3 100644
--- a/test/jdk/java/time/test/java/time/chrono/TestExampleCode.java
+++ b/test/jdk/java/time/test/java/time/chrono/TestExampleCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,7 @@
 
 package test.java.time.chrono;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.LocalDate;
 import java.time.LocalTime;
@@ -72,13 +72,16 @@ import java.time.temporal.ChronoUnit;
 import java.util.Locale;
 import java.util.Set;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test case verify that the example code in the package-info.java compiles
  * and runs.
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestExampleCode {
 
     @Test
@@ -113,14 +116,14 @@ public class TestExampleCode {
     //-----------------------------------------------------------------------
     // Data provider for Hijrah Type names
     //-----------------------------------------------------------------------
-    @DataProvider(name = "HijrahTypeNames")
     Object[][] data_of_ummalqura() {
         return new Object[][]{
             { "Hijrah-umalqura", "islamic-umalqura"},
         };
     }
 
-    @Test(dataProvider= "HijrahTypeNames")
+    @ParameterizedTest
+    @MethodSource("data_of_ummalqura")
     public void test_HijrahTypeViaLocale(String calendarId, String calendarType) {
         Locale.Builder builder = new Locale.Builder();
         builder.setLanguage("en").setRegion("US");
@@ -130,7 +133,7 @@ public class TestExampleCode {
         System.out.printf(" Locale language tag: %s, Chronology ID: %s, type: %s%n",
                 locale.toLanguageTag(), chrono, chrono.getCalendarType());
         Chronology expected = Chronology.of(calendarId);
-        assertEquals(chrono, expected, "Expected chronology not found");
+        assertEquals(expected, chrono, "Expected chronology not found");
     }
 
     @Test
diff --git a/test/jdk/java/time/test/java/time/chrono/TestIsoChronoImpl.java b/test/jdk/java/time/test/java/time/chrono/TestIsoChronoImpl.java
index 59f5016a6fc..adc8949e61e 100644
--- a/test/jdk/java/time/test/java/time/chrono/TestIsoChronoImpl.java
+++ b/test/jdk/java/time/test/java/time/chrono/TestIsoChronoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,8 @@ import static java.time.temporal.ChronoField.DAY_OF_MONTH;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoField.YEAR;
 import static java.time.temporal.ChronoField.YEAR_OF_ERA;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
@@ -69,16 +70,16 @@ import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestIsoChronoImpl {
 
-    @DataProvider(name = "RangeVersusCalendar")
     Object[][] provider_rangeVersusCalendar() {
         return new Object[][]{
             {LocalDate.of(1583, 1, 1), LocalDate.of(2100, 1, 1)},
@@ -88,10 +89,11 @@ public class TestIsoChronoImpl {
     //-----------------------------------------------------------------------
     // Verify  ISO Calendar matches java.util.Calendar for range
     //-----------------------------------------------------------------------
-    @Test(dataProvider = "RangeVersusCalendar")
+    @ParameterizedTest
+    @MethodSource("provider_rangeVersusCalendar")
     public void test_IsoChrono_vsCalendar(LocalDate isoStartDate, LocalDate isoEndDate) {
         GregorianCalendar cal = new GregorianCalendar();
-        assertEquals(cal.getCalendarType(), "gregory", "Unexpected calendar type");
+        assertEquals("gregory", cal.getCalendarType(), "Unexpected calendar type");
         LocalDate isoDate = IsoChronology.INSTANCE.date(isoStartDate);
 
         cal.setTimeZone(TimeZone.getTimeZone("GMT+00"));
@@ -100,9 +102,9 @@ public class TestIsoChronoImpl {
         cal.set(Calendar.DAY_OF_MONTH, isoDate.get(DAY_OF_MONTH));
 
         while (isoDate.isBefore(isoEndDate)) {
-            assertEquals(isoDate.get(DAY_OF_MONTH), cal.get(Calendar.DAY_OF_MONTH), "Day mismatch in " + isoDate + ";  cal: " + cal);
-            assertEquals(isoDate.get(MONTH_OF_YEAR), cal.get(Calendar.MONTH) + 1, "Month mismatch in " + isoDate);
-            assertEquals(isoDate.get(YEAR_OF_ERA), cal.get(Calendar.YEAR), "Year mismatch in " + isoDate);
+            assertEquals(cal.get(Calendar.DAY_OF_MONTH), isoDate.get(DAY_OF_MONTH), "Day mismatch in " + isoDate + ";  cal: " + cal);
+            assertEquals(cal.get(Calendar.MONTH) + 1, isoDate.get(MONTH_OF_YEAR), "Month mismatch in " + isoDate);
+            assertEquals(cal.get(Calendar.YEAR), isoDate.get(YEAR_OF_ERA), "Year mismatch in " + isoDate);
 
             isoDate = isoDate.plus(1, ChronoUnit.DAYS);
             cal.add(Calendar.DAY_OF_MONTH, 1);
@@ -113,10 +115,11 @@ public class TestIsoChronoImpl {
     // Verify  ISO Calendar matches java.util.Calendar
     // DayOfWeek, WeekOfMonth, WeekOfYear for range
     //-----------------------------------------------------------------------
-    @Test(dataProvider = "RangeVersusCalendar")
+    @ParameterizedTest
+    @MethodSource("provider_rangeVersusCalendar")
     public void test_DayOfWeek_IsoChronology_vsCalendar(LocalDate isoStartDate, LocalDate isoEndDate) {
         GregorianCalendar cal = new GregorianCalendar();
-        assertEquals(cal.getCalendarType(), "gregory", "Unexpected calendar type");
+        assertEquals("gregory", cal.getCalendarType(), "Unexpected calendar type");
         LocalDate isoDate = IsoChronology.INSTANCE.date(isoStartDate);
 
         for (DayOfWeek firstDayOfWeek : DayOfWeek.values()) {
@@ -132,29 +135,29 @@ public class TestIsoChronoImpl {
 
                 // For every date in the range
                 while (isoDate.isBefore(isoEndDate)) {
-                    assertEquals(isoDate.get(DAY_OF_MONTH), cal.get(Calendar.DAY_OF_MONTH), "Day mismatch in " + isoDate + ";  cal: " + cal);
-                    assertEquals(isoDate.get(MONTH_OF_YEAR), cal.get(Calendar.MONTH) + 1, "Month mismatch in " + isoDate);
-                    assertEquals(isoDate.get(YEAR_OF_ERA), cal.get(Calendar.YEAR), "Year mismatch in " + isoDate);
+                    assertEquals(cal.get(Calendar.DAY_OF_MONTH), isoDate.get(DAY_OF_MONTH), "Day mismatch in " + isoDate + ";  cal: " + cal);
+                    assertEquals(cal.get(Calendar.MONTH) + 1, isoDate.get(MONTH_OF_YEAR), "Month mismatch in " + isoDate);
+                    assertEquals(cal.get(Calendar.YEAR), isoDate.get(YEAR_OF_ERA), "Year mismatch in " + isoDate);
 
                     int jdow = Math.floorMod(cal.get(Calendar.DAY_OF_WEEK) - 2, 7) + 1;
                     int dow = isoDate.get(weekDef.dayOfWeek());
-                    assertEquals(jdow, dow, "Calendar DayOfWeek does not match ISO DayOfWeek");
+                    assertEquals(dow, jdow, "Calendar DayOfWeek does not match ISO DayOfWeek");
 
                     int jweekOfMonth = cal.get(Calendar.WEEK_OF_MONTH);
                     int isoWeekOfMonth = isoDate.get(weekDef.weekOfMonth());
-                    assertEquals(jweekOfMonth, isoWeekOfMonth, "Calendar WeekOfMonth does not match ISO WeekOfMonth");
+                    assertEquals(isoWeekOfMonth, jweekOfMonth, "Calendar WeekOfMonth does not match ISO WeekOfMonth");
 
                     int jweekOfYear = cal.get(Calendar.WEEK_OF_YEAR);
                     int weekOfYear = isoDate.get(weekDef.weekOfWeekBasedYear());
-                    assertEquals(jweekOfYear, weekOfYear,  "GregorianCalendar WeekOfYear does not match WeekOfWeekBasedYear");
+                    assertEquals(weekOfYear, jweekOfYear,  "GregorianCalendar WeekOfYear does not match WeekOfWeekBasedYear");
 
                     int jWeekYear = cal.getWeekYear();
                     int weekBasedYear = isoDate.get(weekDef.weekBasedYear());
-                    assertEquals(jWeekYear, weekBasedYear,  "GregorianCalendar getWeekYear does not match YearOfWeekBasedYear");
+                    assertEquals(weekBasedYear, jWeekYear,  "GregorianCalendar getWeekYear does not match YearOfWeekBasedYear");
 
                     int jweeksInWeekyear = cal.getWeeksInWeekYear();
                     int weeksInWeekBasedYear = (int)isoDate.range(weekDef.weekOfWeekBasedYear()).getMaximum();
-                    assertEquals(jweeksInWeekyear, weeksInWeekBasedYear, "length of weekBasedYear");
+                    assertEquals(weeksInWeekBasedYear, jweeksInWeekyear, "length of weekBasedYear");
 
                     isoDate = isoDate.plus(1, ChronoUnit.DAYS);
                     cal.add(Calendar.DAY_OF_MONTH, 1);
diff --git a/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronoImpl.java b/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronoImpl.java
index fc2fa9798af..6ed24d579dd 100644
--- a/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronoImpl.java
+++ b/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@
  */
 package test.java.time.chrono;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.LocalDate;
 import java.time.LocalTime;
@@ -71,19 +71,20 @@ import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestJapaneseChronoImpl {
 
     /**
      * Range of years to check consistency with java.util.Calendar
      */
-    @DataProvider(name="RangeVersusCalendar")
     Object[][] provider_rangeVersusCalendar() {
         return new Object[][] {
             {LocalDate.of(1873, 1, 1), LocalDate.of(2100, 1, 1)},
@@ -93,13 +94,14 @@ public class TestJapaneseChronoImpl {
     //-----------------------------------------------------------------------
     // Verify  Japanese Calendar matches java.util.Calendar for range
     //-----------------------------------------------------------------------
-    @Test(dataProvider="RangeVersusCalendar")
+    @ParameterizedTest
+    @MethodSource("provider_rangeVersusCalendar")
     public void test_JapaneseChrono_vsCalendar(LocalDate isoStartDate, LocalDate isoEndDate) {
         Locale locale = Locale.forLanguageTag("ja-JP-u-ca-japanese");
-        assertEquals(locale.toString(), "ja_JP_#u-ca-japanese", "Unexpected locale");
+        assertEquals("ja_JP_#u-ca-japanese", locale.toString(), "Unexpected locale");
 
         Calendar cal = java.util.Calendar.getInstance(locale);
-        assertEquals(cal.getCalendarType(), "japanese", "Unexpected calendar type");
+        assertEquals("japanese", cal.getCalendarType(), "Unexpected calendar type");
 
         JapaneseDate jDate = JapaneseChronology.INSTANCE.date(isoStartDate);
 
@@ -110,9 +112,9 @@ public class TestJapaneseChronoImpl {
         cal.setTimeInMillis(millis);
 
         while (jDate.isBefore(isoEndDate)) {
-            assertEquals(jDate.get(ChronoField.DAY_OF_MONTH), cal.get(Calendar.DAY_OF_MONTH), "Day mismatch in " + jDate + ";  cal: " + cal);
-            assertEquals(jDate.get(ChronoField.MONTH_OF_YEAR), cal.get(Calendar.MONTH) + 1, "Month mismatch in " + jDate);
-            assertEquals(jDate.get(ChronoField.YEAR_OF_ERA), cal.get(Calendar.YEAR), "Year mismatch in " + jDate);
+            assertEquals(cal.get(Calendar.DAY_OF_MONTH), jDate.get(ChronoField.DAY_OF_MONTH), "Day mismatch in " + jDate + ";  cal: " + cal);
+            assertEquals(cal.get(Calendar.MONTH) + 1, jDate.get(ChronoField.MONTH_OF_YEAR), "Month mismatch in " + jDate);
+            assertEquals(cal.get(Calendar.YEAR), jDate.get(ChronoField.YEAR_OF_ERA), "Year mismatch in " + jDate);
 
             jDate = jDate.plus(1, ChronoUnit.DAYS);
             cal.add(Calendar.DAY_OF_MONTH, 1);
@@ -136,11 +138,11 @@ public class TestJapaneseChronoImpl {
                 cal.setTimeZone(TimeZone.getTimeZone("GMT+00"));
                 cal.setTimeInMillis(millis);
 
-                assertEquals(jd.get(ChronoField.DAY_OF_YEAR), cal.get(Calendar.DAY_OF_YEAR),
+                assertEquals(cal.get(Calendar.DAY_OF_YEAR), jd.get(ChronoField.DAY_OF_YEAR),
                         "different DAY_OF_YEAR values in " + era + ", year: " + year);
-                assertEquals(jd.range(ChronoField.DAY_OF_YEAR).getMaximum(), cal.getActualMaximum(Calendar.DAY_OF_YEAR),
+                assertEquals(cal.getActualMaximum(Calendar.DAY_OF_YEAR), jd.range(ChronoField.DAY_OF_YEAR).getMaximum(),
                         "different maximum for DAY_OF_YEAR in " + era + ", year: " + year);
-                assertEquals(jd.range(ChronoField.DAY_OF_YEAR).getMinimum(), cal.getActualMinimum(Calendar.DAY_OF_YEAR),
+                assertEquals(cal.getActualMinimum(Calendar.DAY_OF_YEAR), jd.range(ChronoField.DAY_OF_YEAR).getMinimum(),
                         "different minimum for DAY_OF_YEAR in " + era + ",  year: " + year);
             }
         }
diff --git a/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronology.java b/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronology.java
index 6e7df8638f9..85c33a964a3 100644
--- a/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronology.java
+++ b/test/jdk/java/time/test/java/time/chrono/TestJapaneseChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,20 +29,22 @@ import java.time.temporal.*;
 import java.util.List;
 import java.util.Locale;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Tests for the Japanese chronology
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestJapaneseChronology {
     private static final JapaneseChronology JAPANESE = JapaneseChronology.INSTANCE;
     private static final Locale jaJPJP = Locale.forLanguageTag("ja-JP-u-ca-japanese");
 
-    @DataProvider(name="transitions")
     Object[][] transitionData() {
         return new Object[][] {
             // Japanese era, yearOfEra, month, dayOfMonth, gregorianYear
@@ -62,7 +64,6 @@ public class TestJapaneseChronology {
         };
     }
 
-    @DataProvider(name="day_year_data")
     Object[][] dayYearData() {
         return new Object[][] {
             // Japanese era, yearOfEra, dayOfYear, month, dayOfMonth
@@ -80,7 +81,6 @@ public class TestJapaneseChronology {
         };
     }
 
-    @DataProvider(name="range_data")
     Object[][] rangeData() {
         return new Object[][] {
             // field, minSmallest, minLargest, maxSmallest, maxLargest
@@ -91,7 +91,6 @@ public class TestJapaneseChronology {
         };
     }
 
-    @DataProvider(name="invalid_dates")
     Object[][] invalidDatesData() {
         return new Object[][] {
             // Japanese era, yearOfEra, month, dayOfMonth
@@ -114,7 +113,6 @@ public class TestJapaneseChronology {
         };
     }
 
-    @DataProvider(name="invalid_eraYear")
     Object[][] invalidEraYearData() {
         return new Object[][] {
             // Japanese era, yearOfEra
@@ -136,7 +134,6 @@ public class TestJapaneseChronology {
         };
     }
 
-    @DataProvider(name="invalid_day_year_data")
     Object[][] invalidDayYearData() {
         return new Object[][] {
             // Japanese era, yearOfEra, dayOfYear
@@ -155,7 +152,6 @@ public class TestJapaneseChronology {
         };
     }
 
-    @DataProvider
     Object[][] eraNameData() {
         return new Object[][] {
             // Japanese era, name, exception
@@ -171,56 +167,69 @@ public class TestJapaneseChronology {
     @Test
     public void test_ofLocale() {
         // must be a singleton
-        assertEquals(Chronology.ofLocale(jaJPJP) == JAPANESE, true);
+        assertEquals(true, Chronology.ofLocale(jaJPJP) == JAPANESE);
     }
 
-    @Test(dataProvider="transitions")
+    @ParameterizedTest
+    @MethodSource("transitionData")
     public void test_transitions(JapaneseEra era, int yearOfEra, int month, int dayOfMonth, int gregorianYear) {
-        assertEquals(JAPANESE.prolepticYear(era, yearOfEra), gregorianYear);
+        assertEquals(gregorianYear, JAPANESE.prolepticYear(era, yearOfEra));
 
         JapaneseDate jdate1 = JapaneseDate.of(era, yearOfEra, month, dayOfMonth);
         JapaneseDate jdate2 = JapaneseDate.of(gregorianYear, month, dayOfMonth);
-        assertEquals(jdate1, jdate2);
+        assertEquals(jdate2, jdate1);
     }
 
-    @Test(dataProvider="range_data")
+    @ParameterizedTest
+    @MethodSource("rangeData")
     public void test_range(ChronoField field, int minSmallest, int minLargest, int maxSmallest, int maxLargest) {
         ValueRange range = JAPANESE.range(field);
-        assertEquals(range.getMinimum(), minSmallest);
-        assertEquals(range.getLargestMinimum(), minLargest);
-        assertEquals(range.getSmallestMaximum(), maxSmallest);
-        assertEquals(range.getMaximum(), maxLargest);
+        assertEquals(minSmallest, range.getMinimum());
+        assertEquals(minLargest, range.getLargestMinimum());
+        assertEquals(maxSmallest, range.getSmallestMaximum());
+        assertEquals(maxLargest, range.getMaximum());
     }
 
-    @Test(dataProvider="day_year_data")
+    @ParameterizedTest
+    @MethodSource("dayYearData")
     public void test_firstDayOfEra(JapaneseEra era, int yearOfEra, int dayOfYear, int month, int dayOfMonth) {
         JapaneseDate date1 = JAPANESE.dateYearDay(era, yearOfEra, dayOfYear);
         JapaneseDate date2 = JAPANESE.date(era, yearOfEra, month, dayOfMonth);
-        assertEquals(date1, date2);
+        assertEquals(date2, date1);
     }
 
-    @Test(dataProvider="invalid_dates", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("invalidDatesData")
     public void test_invalidDate(JapaneseEra era, int yearOfEra, int month, int dayOfMonth) {
-        JapaneseDate jdate = JapaneseDate.of(era, yearOfEra, month, dayOfMonth);
-        System.out.printf("No DateTimeException with %s %d.%02d.%02d%n", era, yearOfEra, month, dayOfMonth);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            JapaneseDate jdate = JapaneseDate.of(era, yearOfEra, month, dayOfMonth);
+            System.out.printf("No DateTimeException with %s %d.%02d.%02d%n", era, yearOfEra, month, dayOfMonth);
+        });
     }
 
-    @Test(dataProvider="invalid_eraYear", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("invalidEraYearData")
     public void test_invalidEraYear(JapaneseEra era, int yearOfEra) {
-        int year = JAPANESE.prolepticYear(era, yearOfEra);
-        System.out.printf("No DateTimeException with era=%s, year=%d%n", era, yearOfEra);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            int year = JAPANESE.prolepticYear(era, yearOfEra);
+            System.out.printf("No DateTimeException with era=%s, year=%d%n", era, yearOfEra);
+        });
     }
 
-    @Test(dataProvider="invalid_day_year_data", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("invalidDayYearData")
     public void test_invalidDayYear(JapaneseEra era, int yearOfEra, int dayOfYear) {
-        JapaneseDate date = JAPANESE.dateYearDay(era, yearOfEra, dayOfYear);
-        System.out.printf("No DateTimeException with era=%s, year=%d, dayOfYear=%d%n", era, yearOfEra, dayOfYear);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            JapaneseDate date = JAPANESE.dateYearDay(era, yearOfEra, dayOfYear);
+            System.out.printf("No DateTimeException with era=%s, year=%d, dayOfYear=%d%n", era, yearOfEra, dayOfYear);
+        });
     }
 
-    @Test(dataProvider="eraNameData")
+    @ParameterizedTest
+    @MethodSource("eraNameData")
     public void test_eraName(String eraName, JapaneseEra era, Class expectedEx) {
         try {
-            assertEquals(JapaneseEra.valueOf(eraName), era);
+            assertEquals(era, JapaneseEra.valueOf(eraName));
         } catch (Exception ex) {
             assertTrue(expectedEx.isInstance(ex));
         }
diff --git a/test/jdk/java/time/test/java/time/chrono/TestServiceLoader.java b/test/jdk/java/time/test/java/time/chrono/TestServiceLoader.java
index 3eaa4253681..93e00b48b7a 100644
--- a/test/jdk/java/time/test/java/time/chrono/TestServiceLoader.java
+++ b/test/jdk/java/time/test/java/time/chrono/TestServiceLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,21 +59,20 @@
  */
 package test.java.time.chrono;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.time.chrono.Chronology;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.ServiceLoader;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests that a custom Chronology is available via the ServiceLoader.
  * The CopticChronology is configured via META-INF/services/java.time.chrono.Chronology.
  */
-@Test
 public class TestServiceLoader {
 
     @Test
@@ -85,7 +84,7 @@ public class TestServiceLoader {
         }
         var coptic = chronos.get("Coptic");
         assertNotNull(coptic, "CopticChronology not found");
-        assertEquals(coptic.isIsoBased(), false);
+        assertEquals(false, coptic.isIsoBased());
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/chrono/TestThaiBuddhistChronoImpl.java b/test/jdk/java/time/test/java/time/chrono/TestThaiBuddhistChronoImpl.java
index e878ac0dcb3..bb32a9e7d65 100644
--- a/test/jdk/java/time/test/java/time/chrono/TestThaiBuddhistChronoImpl.java
+++ b/test/jdk/java/time/test/java/time/chrono/TestThaiBuddhistChronoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@
  */
 package test.java.time.chrono;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.LocalDate;
 import java.time.chrono.ThaiBuddhistChronology;
@@ -65,19 +65,19 @@ import java.util.Calendar;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestThaiBuddhistChronoImpl {
 
     /**
      * Range of years to check consistency with java.util.Calendar
      */
-    @DataProvider(name="RangeVersusCalendar")
     Object[][] provider_rangeVersusCalendar() {
         return new Object[][] {
             {LocalDate.of(1583, 1, 1), LocalDate.of(2100, 1, 1)},
@@ -87,12 +87,13 @@ public class TestThaiBuddhistChronoImpl {
     //-----------------------------------------------------------------------
     // Verify  ThaiBuddhist Calendar matches java.util.Calendar for range
     //-----------------------------------------------------------------------
-    @Test(dataProvider="RangeVersusCalendar")
+    @ParameterizedTest
+    @MethodSource("provider_rangeVersusCalendar")
     public void test_ThaiBuddhistChrono_vsCalendar(LocalDate isoStartDate, LocalDate isoEndDate) {
         Locale locale = Locale.forLanguageTag("th-TH--u-ca-buddhist");
-        assertEquals(locale.toString(), "th_TH", "Unexpected locale");
+        assertEquals("th_TH", locale.toString(), "Unexpected locale");
         Calendar cal = java.util.Calendar.getInstance(locale);
-        assertEquals(cal.getCalendarType(), "buddhist", "Unexpected calendar type");
+        assertEquals("buddhist", cal.getCalendarType(), "Unexpected calendar type");
 
         ThaiBuddhistDate thaiDate = ThaiBuddhistChronology.INSTANCE.date(isoStartDate);
 
@@ -102,9 +103,9 @@ public class TestThaiBuddhistChronoImpl {
         cal.set(Calendar.DAY_OF_MONTH, thaiDate.get(ChronoField.DAY_OF_MONTH));
 
         while (thaiDate.isBefore(isoEndDate)) {
-            assertEquals(thaiDate.get(ChronoField.DAY_OF_MONTH), cal.get(Calendar.DAY_OF_MONTH), "Day mismatch in " + thaiDate + ";  cal: " + cal);
-            assertEquals(thaiDate.get(ChronoField.MONTH_OF_YEAR), cal.get(Calendar.MONTH) + 1, "Month mismatch in " + thaiDate);
-            assertEquals(thaiDate.get(ChronoField.YEAR_OF_ERA), cal.get(Calendar.YEAR), "Year mismatch in " + thaiDate);
+            assertEquals(cal.get(Calendar.DAY_OF_MONTH), thaiDate.get(ChronoField.DAY_OF_MONTH), "Day mismatch in " + thaiDate + ";  cal: " + cal);
+            assertEquals(cal.get(Calendar.MONTH) + 1, thaiDate.get(ChronoField.MONTH_OF_YEAR), "Month mismatch in " + thaiDate);
+            assertEquals(cal.get(Calendar.YEAR), thaiDate.get(ChronoField.YEAR_OF_ERA), "Year mismatch in " + thaiDate);
 
             thaiDate = thaiDate.plus(1, ChronoUnit.DAYS);
             cal.add(Calendar.DAY_OF_MONTH, 1);
diff --git a/test/jdk/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java b/test/jdk/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java
index 8d68abfd227..2dfd112596b 100644
--- a/test/jdk/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java
+++ b/test/jdk/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,11 @@ import static java.time.temporal.ChronoField.DAY_OF_MONTH;
 import static java.time.temporal.ChronoField.DAY_OF_YEAR;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoField.YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.DateTimeException;
 import java.time.DayOfWeek;
@@ -64,15 +65,18 @@ import java.time.temporal.ValueRange;
 import java.time.temporal.WeekFields;
 import java.util.Locale;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Tests for the Umm alQura chronology and data.
  * Note: The dates used for testing are just a sample of calendar data.
  * @bug 8067800
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestUmmAlQuraChronology {
 
     private static final ZoneOffset OFFSET_PTWO = ZoneOffset.ofHours(2);
@@ -82,21 +86,22 @@ public class TestUmmAlQuraChronology {
     @Test
     public void test_aliases() {
         HijrahChronology hc = (HijrahChronology) Chronology.of("Hijrah");
-        assertEquals(hc, HijrahChronology.INSTANCE, "Alias for Hijrah-umalqura");
+        assertEquals(HijrahChronology.INSTANCE, hc, "Alias for Hijrah-umalqura");
         hc = (HijrahChronology) Chronology.of("islamic");
-        assertEquals(hc, HijrahChronology.INSTANCE, "Alias for Hijrah-umalqura");
+        assertEquals(HijrahChronology.INSTANCE, hc, "Alias for Hijrah-umalqura");
     }
 
     // Test to check if the exception is thrown for an incorrect chronology id
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_badChronology() {
-        Chronology test = Chronology.of("Hijrah-ummalqura");
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            Chronology test = Chronology.of("Hijrah-ummalqura");
+        });
     }
 
     //--------------------------------------------------------------------------
     // regular data factory for Umm alQura dates and the corresponding ISO dates
     //--------------------------------------------------------------------------
-    @DataProvider(name = "UmmAlQuraVsISODates")
     Object[][] data_UmmAlQuraVsISODates() {
         return new Object[][] {
             {HijrahDate.of(1318, 1, 1), LocalDate.of(1900, 04, 30)},
@@ -110,9 +115,10 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to verify the epoch days for given Hijrah & ISO date instances
-    @Test(dataProvider="UmmAlQuraVsISODates")
+    @ParameterizedTest
+    @MethodSource("data_UmmAlQuraVsISODates")
         public void Test_UmmAlQuraVsISODates(HijrahDate hd, LocalDate ld) {
-        assertEquals(hd.toEpochDay(), ld.toEpochDay(), "Umm alQura date and ISO date should have same epochDay");
+        assertEquals(ld.toEpochDay(), hd.toEpochDay(), "Umm alQura date and ISO date should have same epochDay");
     }
 
     // UmmAlQura chronology ranges for year, month and days for the HijrahChronology
@@ -120,28 +126,27 @@ public class TestUmmAlQuraChronology {
     public void Test_UmmAlQuraChronoRange() {
         HijrahChronology chrono = HijrahChronology.INSTANCE;
         ValueRange year = chrono.range(YEAR);
-        assertEquals(year.getMinimum(), 1300, "Minimum year");
-        assertEquals(year.getLargestMinimum(), 1300, "Largest minimum year");
-        assertEquals(year.getMaximum(), 1600, "Largest year");
-        assertEquals(year.getSmallestMaximum(), 1600, "Smallest Maximum year");
+        assertEquals(1300, year.getMinimum(), "Minimum year");
+        assertEquals(1300, year.getLargestMinimum(), "Largest minimum year");
+        assertEquals(1600, year.getMaximum(), "Largest year");
+        assertEquals(1600, year.getSmallestMaximum(), "Smallest Maximum year");
 
         ValueRange month = chrono.range(MONTH_OF_YEAR);
-        assertEquals(month.getMinimum(), 1, "Minimum month");
-        assertEquals(month.getLargestMinimum(), 1, "Largest minimum month");
-        assertEquals(month.getMaximum(), 12, "Largest month");
-        assertEquals(month.getSmallestMaximum(), 12, "Smallest Maximum month");
+        assertEquals(1, month.getMinimum(), "Minimum month");
+        assertEquals(1, month.getLargestMinimum(), "Largest minimum month");
+        assertEquals(12, month.getMaximum(), "Largest month");
+        assertEquals(12, month.getSmallestMaximum(), "Smallest Maximum month");
 
         ValueRange day = chrono.range(DAY_OF_MONTH);
-        assertEquals(day.getMinimum(), 1, "Minimum day");
-        assertEquals(day.getLargestMinimum(), 1, "Largest minimum day");
-        assertEquals(day.getMaximum(), 30, "Largest day");
-        assertEquals(day.getSmallestMaximum(), 29, "Smallest Maximum day");
+        assertEquals(1, day.getMinimum(), "Minimum day");
+        assertEquals(1, day.getLargestMinimum(), "Largest minimum day");
+        assertEquals(30, day.getMaximum(), "Largest day");
+        assertEquals(29, day.getSmallestMaximum(), "Smallest Maximum day");
     }
 
     //-----------------------------------------------------------------------
     // regular data factory for dates and the corresponding range values
     //-----------------------------------------------------------------------
-    @DataProvider(name = "dates")
     Object[][] data_dates() {
         return new Object[][]{
             {HijrahDate.of(1300, 5, 1), 1300, 1600, 1, 12, 1, 30, 30},
@@ -153,7 +158,8 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to verify the min/max field ranges for given dates
-    @Test(dataProvider="dates")
+    @ParameterizedTest
+    @MethodSource("data_dates")
     public void Test_UmmAlQuraRanges(HijrahDate date,
                         int minYear, int maxYear,
                         int minMonth, int maxMonth,
@@ -161,33 +167,33 @@ public class TestUmmAlQuraChronology {
         // Check the chronology ranges
         HijrahChronology chrono = date.getChronology();
         ValueRange yearRange = chrono.range(YEAR);
-        assertEquals(yearRange.getMinimum(), minYear, "Minimum year for Hijrah chronology");
-        assertEquals(yearRange.getLargestMinimum(), minYear, "Largest minimum year for Hijrah chronology");
-        assertEquals(yearRange.getMaximum(), maxYear, "Maximum year for Hijrah chronology");
-        assertEquals(yearRange.getSmallestMaximum(), maxYear, "Smallest Maximum year for Hijrah chronology");
+        assertEquals(minYear, yearRange.getMinimum(), "Minimum year for Hijrah chronology");
+        assertEquals(minYear, yearRange.getLargestMinimum(), "Largest minimum year for Hijrah chronology");
+        assertEquals(maxYear, yearRange.getMaximum(), "Maximum year for Hijrah chronology");
+        assertEquals(maxYear, yearRange.getSmallestMaximum(), "Smallest Maximum year for Hijrah chronology");
 
         ValueRange monthRange = chrono.range(MONTH_OF_YEAR);
-        assertEquals(monthRange.getMinimum(), minMonth, "Minimum month for Hijrah chronology");
-        assertEquals(monthRange.getMaximum(), maxMonth, "Maximum month for Hijrah chronology");
+        assertEquals(minMonth, monthRange.getMinimum(), "Minimum month for Hijrah chronology");
+        assertEquals(maxMonth, monthRange.getMaximum(), "Maximum month for Hijrah chronology");
 
         ValueRange daysRange = chrono.range(DAY_OF_MONTH);
-        assertEquals(daysRange.getMinimum(), minDay, "Minimum day for chronology");
-        assertEquals(daysRange.getMaximum(), maxChronoDay, "Maximum day for Hijrah chronology");
+        assertEquals(minDay, daysRange.getMinimum(), "Minimum day for chronology");
+        assertEquals(maxChronoDay, daysRange.getMaximum(), "Maximum day for Hijrah chronology");
 
         // Check the date ranges
         yearRange = date.range(YEAR);
-        assertEquals(yearRange.getMinimum(), minYear, "Minimum year for Hijrah date");
-        assertEquals(yearRange.getLargestMinimum(), minYear, "Largest minimum  year for Hijrah date");
-        assertEquals(yearRange.getMaximum(), maxYear, "Maximum year for Hijrah date");
-        assertEquals(yearRange.getSmallestMaximum(), maxYear, "Smallest maximum year for Hijrah date");
+        assertEquals(minYear, yearRange.getMinimum(), "Minimum year for Hijrah date");
+        assertEquals(minYear, yearRange.getLargestMinimum(), "Largest minimum  year for Hijrah date");
+        assertEquals(maxYear, yearRange.getMaximum(), "Maximum year for Hijrah date");
+        assertEquals(maxYear, yearRange.getSmallestMaximum(), "Smallest maximum year for Hijrah date");
 
         monthRange = date.range(MONTH_OF_YEAR);
-        assertEquals(monthRange.getMinimum(), minMonth, "Minimum month for HijrahDate");
-        assertEquals(monthRange.getMaximum(), maxMonth, "Maximum month for HijrahDate");
+        assertEquals(minMonth, monthRange.getMinimum(), "Minimum month for HijrahDate");
+        assertEquals(maxMonth, monthRange.getMaximum(), "Maximum month for HijrahDate");
 
         daysRange = date.range(DAY_OF_MONTH);
-        assertEquals(daysRange.getMinimum(), minDay, "Minimum day for HijrahDate");
-        assertEquals(daysRange.getMaximum(), maxDay, "Maximum day for HijrahDate");
+        assertEquals(minDay, daysRange.getMinimum(), "Minimum day for HijrahDate");
+        assertEquals(maxDay, daysRange.getMaximum(), "Maximum day for HijrahDate");
 
     }
 
@@ -223,7 +229,6 @@ public class TestUmmAlQuraChronology {
     }
 
     // Data provider to verify the dateYearDay() method
-    @DataProvider(name="dateYearDay")
     Object[][] data_dateYearDay() {
         return new Object[][] {
             {HijrahChronology.INSTANCE.dateYearDay(1434, 42), HijrahChronology.INSTANCE.date(1434, 02, 13)},
@@ -236,9 +241,10 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to verify the dateYearDay() method
-    @Test(dataProvider="dateYearDay")
+    @ParameterizedTest
+    @MethodSource("data_dateYearDay")
     public void test_DateYearDay(ChronoLocalDate date1,   ChronoLocalDate date2) {
-       assertEquals(date1, date2);
+       assertEquals(date2, date1);
     }
 
     //-----------------------------------------------------------------------
@@ -250,7 +256,7 @@ public class TestUmmAlQuraChronology {
         for (int i = 1; i <= hd1.lengthOfYear(); i++) {
             HijrahDate hd = HijrahChronology.INSTANCE.dateYearDay(1434, i);
             int doy = hd.get(DAY_OF_YEAR);
-            assertEquals(doy, i, "get(DAY_OF_YEAR) incorrect for " + i);
+            assertEquals(i, doy, "get(DAY_OF_YEAR) incorrect for " + i);
         }
     }
 
@@ -260,54 +266,57 @@ public class TestUmmAlQuraChronology {
         for (int i = 1; i <= hd.lengthOfYear(); i++) {
             HijrahDate hd2 = hd.with(DAY_OF_YEAR, i);
             int doy = hd2.get(DAY_OF_YEAR);
-            assertEquals(doy, i, "with(DAY_OF_YEAR) incorrect for " + i + " " + hd2);
+            assertEquals(i, doy, "with(DAY_OF_YEAR) incorrect for " + i + " " + hd2);
         }
     }
 
-    @Test(expectedExceptions=java.time.DateTimeException.class)
+    @Test
     public void test_withDayOfYearTooSmall() {
-        HijrahDate hd = HijrahChronology.INSTANCE.dateYearDay(1435, 1);
-        HijrahDate hd2 = hd.with(DAY_OF_YEAR, 0);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            HijrahDate hd = HijrahChronology.INSTANCE.dateYearDay(1435, 1);
+            HijrahDate hd2 = hd.with(DAY_OF_YEAR, 0);
+        });
     }
 
-    @Test(expectedExceptions=java.time.DateTimeException.class)
+    @Test
     public void test_withDayOfYearTooLarge() {
-        HijrahDate hd = HijrahChronology.INSTANCE.dateYearDay(1435, 1);
-        HijrahDate hd2 = hd.with(DAY_OF_YEAR, hd.lengthOfYear() + 1);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            HijrahDate hd = HijrahChronology.INSTANCE.dateYearDay(1435, 1);
+            HijrahDate hd2 = hd.with(DAY_OF_YEAR, hd.lengthOfYear() + 1);
+        });
     }
 
     // Test to verify the with() method with ChronoField is set to DAY_OF_WEEK
     @Test
     public void test_adjustWithDayOfWeek() {
-        assertEquals(HijrahChronology.INSTANCE.date(1320, 1, 15).with(ChronoField.DAY_OF_WEEK, 4), HijrahDate.of(1320, 1, 15));
-        assertEquals(HijrahChronology.INSTANCE.date(1421, 11, 15).with(ChronoField.DAY_OF_WEEK, 1), HijrahDate.of(1421, 11, 11));
-        assertEquals(HijrahChronology.INSTANCE.date(1529, 7, 18).with(ChronoField.DAY_OF_WEEK, 6), HijrahDate.of(1529, 7, 20));
-        assertEquals(HijrahChronology.INSTANCE.date(1534, 2, 10).with(ChronoField.DAY_OF_WEEK, 5), HijrahDate.of(1534, 2, 12));
-        assertEquals(HijrahChronology.INSTANCE.date(1552, 4, 1).with(ChronoField.DAY_OF_WEEK, 2), HijrahDate.of(1552, 3, 26));
+        assertEquals(HijrahDate.of(1320, 1, 15), HijrahChronology.INSTANCE.date(1320, 1, 15).with(ChronoField.DAY_OF_WEEK, 4));
+        assertEquals(HijrahDate.of(1421, 11, 11), HijrahChronology.INSTANCE.date(1421, 11, 15).with(ChronoField.DAY_OF_WEEK, 1));
+        assertEquals(HijrahDate.of(1529, 7, 20), HijrahChronology.INSTANCE.date(1529, 7, 18).with(ChronoField.DAY_OF_WEEK, 6));
+        assertEquals(HijrahDate.of(1534, 2, 12), HijrahChronology.INSTANCE.date(1534, 2, 10).with(ChronoField.DAY_OF_WEEK, 5));
+        assertEquals(HijrahDate.of(1552, 3, 26), HijrahChronology.INSTANCE.date(1552, 4, 1).with(ChronoField.DAY_OF_WEEK, 2));
     }
 
     // Test to verify the with() method with ChronoField is set to DAY_OF_MONTH
     @Test
     public void test_adjustWithDayOfMonth() {
-        assertEquals(HijrahChronology.INSTANCE.date(1320, 1, 15).with(ChronoField.DAY_OF_MONTH, 2), HijrahDate.of(1320, 1, 2));
-        assertEquals(HijrahChronology.INSTANCE.date(1421, 11, 15).with(ChronoField.DAY_OF_MONTH, 9), HijrahDate.of(1421, 11, 9));
-        assertEquals(HijrahChronology.INSTANCE.date(1529, 7, 18).with(ChronoField.DAY_OF_MONTH, 13), HijrahDate.of(1529, 7, 13));
-        assertEquals(HijrahChronology.INSTANCE.date(1534, 12, 10).with(ChronoField.DAY_OF_MONTH, 29), HijrahDate.of(1534, 12, 29));
-        assertEquals(HijrahChronology.INSTANCE.date(1552, 4, 1).with(ChronoField.DAY_OF_MONTH, 6), HijrahDate.of(1552, 4, 6));
+        assertEquals(HijrahDate.of(1320, 1, 2), HijrahChronology.INSTANCE.date(1320, 1, 15).with(ChronoField.DAY_OF_MONTH, 2));
+        assertEquals(HijrahDate.of(1421, 11, 9), HijrahChronology.INSTANCE.date(1421, 11, 15).with(ChronoField.DAY_OF_MONTH, 9));
+        assertEquals(HijrahDate.of(1529, 7, 13), HijrahChronology.INSTANCE.date(1529, 7, 18).with(ChronoField.DAY_OF_MONTH, 13));
+        assertEquals(HijrahDate.of(1534, 12, 29), HijrahChronology.INSTANCE.date(1534, 12, 10).with(ChronoField.DAY_OF_MONTH, 29));
+        assertEquals(HijrahDate.of(1552, 4, 6), HijrahChronology.INSTANCE.date(1552, 4, 1).with(ChronoField.DAY_OF_MONTH, 6));
     }
 
     // Test to verify the with() method with ChronoField is set to DAY_OF_YEAR
     @Test
     public void test_adjustWithDayOfYear() {
-        assertEquals(HijrahChronology.INSTANCE.date(1320, 1, 15).with(ChronoField.DAY_OF_YEAR, 24), HijrahDate.of(1320, 1, 24));
-        assertEquals(HijrahChronology.INSTANCE.date(1421, 11, 15).with(ChronoField.DAY_OF_YEAR, 135), HijrahDate.of(1421, 5, 18));
-        assertEquals(HijrahChronology.INSTANCE.date(1529, 7, 18).with(ChronoField.DAY_OF_YEAR, 64), HijrahDate.of(1529, 3, 5));
-        assertEquals(HijrahChronology.INSTANCE.date(1534, 2, 10).with(ChronoField.DAY_OF_YEAR, 354), HijrahDate.of(1534, 12, 29));
-        assertEquals(HijrahChronology.INSTANCE.date(1552, 4, 1).with(ChronoField.DAY_OF_YEAR, 291), HijrahDate.of(1552, 10, 26));
+        assertEquals(HijrahDate.of(1320, 1, 24), HijrahChronology.INSTANCE.date(1320, 1, 15).with(ChronoField.DAY_OF_YEAR, 24));
+        assertEquals(HijrahDate.of(1421, 5, 18), HijrahChronology.INSTANCE.date(1421, 11, 15).with(ChronoField.DAY_OF_YEAR, 135));
+        assertEquals(HijrahDate.of(1529, 3, 5), HijrahChronology.INSTANCE.date(1529, 7, 18).with(ChronoField.DAY_OF_YEAR, 64));
+        assertEquals(HijrahDate.of(1534, 12, 29), HijrahChronology.INSTANCE.date(1534, 2, 10).with(ChronoField.DAY_OF_YEAR, 354));
+        assertEquals(HijrahDate.of(1552, 10, 26), HijrahChronology.INSTANCE.date(1552, 4, 1).with(ChronoField.DAY_OF_YEAR, 291));
     }
 
     // Data provider to get the difference between two dates in terms of days, months and years
-    @DataProvider(name="datesForDiff")
     Object[][] data_datesForDiffs() {
         return new Object[][] {
             {HijrahDate.of(1350, 5, 15), HijrahDate.of(1351, 12, 29), 574, 19, 1},
@@ -319,15 +328,15 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to verify the difference between two given dates in terms of days, months and years
-    @Test(dataProvider="datesForDiff")
+    @ParameterizedTest
+    @MethodSource("data_datesForDiffs")
     public void test_diffBetweenDates(ChronoLocalDate from, ChronoLocalDate to, long days, long months, long years) {
-          assertEquals(from.until(to, ChronoUnit.DAYS), days);
-          assertEquals(from.until(to, ChronoUnit.MONTHS), months);
-          assertEquals(from.until(to, ChronoUnit.YEARS), years);
+          assertEquals(days, from.until(to, ChronoUnit.DAYS));
+          assertEquals(months, from.until(to, ChronoUnit.MONTHS));
+          assertEquals(years, from.until(to, ChronoUnit.YEARS));
     }
 
     // Data provider to get the difference between two dates as a period
-    @DataProvider(name="datesForPeriod")
     Object[][] data_Period() {
         return new Object[][] {
             {HijrahDate.of(1350, 5, 15), HijrahDate.of(1434, 7, 20), HijrahChronology.INSTANCE.period(84, 2, 5)},
@@ -339,34 +348,35 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to get the Period between two given dates
-    @Test(dataProvider="datesForPeriod")
+    @ParameterizedTest
+    @MethodSource("data_Period")
     public void test_until(HijrahDate h1, HijrahDate h2, ChronoPeriod p) {
         ChronoPeriod period = h1.until(h2);
-        assertEquals(period, p);
+        assertEquals(p, period);
     }
 
     // Test to get the Period between dates in different chronologies
-    @Test(dataProvider="datesForPeriod")
+    @ParameterizedTest
+    @MethodSource("data_Period")
     public void test_periodUntilDiffChrono(HijrahDate h1, HijrahDate h2, ChronoPeriod p) {
         MinguoDate m = MinguoChronology.INSTANCE.date(h2);
         ChronoPeriod period = h1.until(m);
-        assertEquals(period, p);
+        assertEquals(p, period);
     }
 
     // Test to get the adjusted date from a given date using TemporalAdjuster methods
     @Test
     public void test_temporalDayAdjustments() {
         HijrahDate date = HijrahDate.of(1554, 7, 21);
-        assertEquals(date.with(TemporalAdjusters.firstDayOfMonth()), HijrahDate.of(1554, 7, 1));
-        assertEquals(date.with(TemporalAdjusters.lastDayOfMonth()), HijrahDate.of(1554, 7, 29));
-        assertEquals(date.with(TemporalAdjusters.firstDayOfNextMonth()), HijrahDate.of(1554, 8, 1));
-        assertEquals(date.with(TemporalAdjusters.firstDayOfNextYear()), HijrahDate.of(1555, 1, 1));
-        assertEquals(date.with(TemporalAdjusters.firstDayOfYear()), HijrahDate.of(1554, 1, 1));
-        assertEquals(date.with(TemporalAdjusters.lastDayOfYear()), HijrahDate.of(1554, 12, 30));
+        assertEquals(HijrahDate.of(1554, 7, 1), date.with(TemporalAdjusters.firstDayOfMonth()));
+        assertEquals(HijrahDate.of(1554, 7, 29), date.with(TemporalAdjusters.lastDayOfMonth()));
+        assertEquals(HijrahDate.of(1554, 8, 1), date.with(TemporalAdjusters.firstDayOfNextMonth()));
+        assertEquals(HijrahDate.of(1555, 1, 1), date.with(TemporalAdjusters.firstDayOfNextYear()));
+        assertEquals(HijrahDate.of(1554, 1, 1), date.with(TemporalAdjusters.firstDayOfYear()));
+        assertEquals(HijrahDate.of(1554, 12, 30), date.with(TemporalAdjusters.lastDayOfYear()));
     }
 
     // Data provider for string representation of the date instances
-    @DataProvider(name="toString")
     Object[][] data_toString() {
         return new Object[][] {
             {HijrahChronology.INSTANCE.date(1320, 1, 1), "Hijrah-umalqura AH 1320-01-01"},
@@ -378,13 +388,13 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to verify the returned string value of a given date instance
-    @Test(dataProvider="toString")
+    @ParameterizedTest
+    @MethodSource("data_toString")
     public void test_toString(ChronoLocalDate hijrahDate, String expected) {
-        assertEquals(hijrahDate.toString(), expected);
+        assertEquals(expected, hijrahDate.toString());
     }
 
     // Data provider for maximum number of days
-    @DataProvider(name="monthDays")
     Object[][] data_monthDays() {
         return new Object[][] {
             {1432, 1, 29},
@@ -397,27 +407,28 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to verify the maximum number of days by adding one month to a given date
-    @Test (dataProvider="monthDays")
+    @ParameterizedTest
+    @MethodSource("data_monthDays")
     public void test_valueRange_monthDays(int year, int month, int maxlength) {
         ChronoLocalDate date = HijrahChronology.INSTANCE.date(year, month, 1);
         ValueRange range = null;
         for (int i=1; i<=12; i++) {
             range = date.range(ChronoField.DAY_OF_MONTH);
             date = date.plus(1, ChronoUnit.MONTHS);
-            assertEquals(range.getMaximum(), month, maxlength);
+            assertEquals(month, range.getMaximum(), maxlength);
         }
     }
 
     // Test to get the last day of the month by adjusting the date with lastDayOfMonth() method
-    @Test(dataProvider="monthDays")
+    @ParameterizedTest
+    @MethodSource("data_monthDays")
     public void test_lastDayOfMonth(int year, int month, int numDays) {
         HijrahDate hDate = HijrahChronology.INSTANCE.date(year, month, 1);
         hDate = hDate.with(TemporalAdjusters.lastDayOfMonth());
-        assertEquals(hDate.get(ChronoField.DAY_OF_MONTH), numDays);
+        assertEquals(numDays, hDate.get(ChronoField.DAY_OF_MONTH));
     }
 
     // Data provider for the 12 islamic month names in a formatted date
-    @DataProvider(name="patternMonthNames")
     Object[][] data_patternMonthNames() {
         return new Object[][] {
             {1434, 1, 1, "01 AH Thu Muharram 1434"},
@@ -436,15 +447,15 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to verify the formatted dates
-    @Test(dataProvider="patternMonthNames")
+    @ParameterizedTest
+    @MethodSource("data_patternMonthNames")
     public void test_ofPattern(int year, int month, int day, String expected) {
         DateTimeFormatter test = DateTimeFormatter.ofPattern("dd G E MMMM yyyy", Locale.US);
-        assertEquals(test.format(HijrahDate.of(year, month, day)), expected);
+        assertEquals(expected, test.format(HijrahDate.of(year, month, day)));
     }
 
     // Data provider for localized dates
-    @DataProvider(name="chronoDateTimes")
-   Object[][] data_chronodatetimes() {
+    Object[][] data_chronodatetimes() {
         return new Object[][] {
             {1432, 12, 29, "Safar 1, 1434 AH"},
             {1433, 1, 30, "Safar 30, 1434 AH"},
@@ -453,7 +464,8 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to verify the localized dates using ofLocalizedDate() method
-    @Test(dataProvider="chronoDateTimes")
+    @ParameterizedTest
+    @MethodSource("data_chronodatetimes")
     public void test_formatterOfLocalizedDate(int year, int month, int day, String expected) {
         HijrahDate hd = HijrahChronology.INSTANCE.date(year, month, day);
         ChronoLocalDateTime<HijrahDate> hdt = hd.atTime(LocalTime.NOON);
@@ -464,12 +476,11 @@ public class TestUmmAlQuraChronology {
         hdt = hdt.plus(1, ChronoUnit.MINUTES);
         hdt = hdt.plus(1, ChronoUnit.SECONDS);
         DateTimeFormatter df = DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).withChronology(Chronology.of("Hijrah-umalqura")).withLocale(Locale.US);
-        assertEquals(df.format(hdt), expected);
+        assertEquals(expected, df.format(hdt));
     }
 
     // Data provider to get the day of the week in a given date
     // The day of the week varies if the week starts with a saturday or sunday
-    @DataProvider(name="dayOfWeek")
     Object[][] data_dayOfweek() {
         return new Object[][] {
             {HijrahDate.of(1434, 6, 24), 1, 7},
@@ -481,14 +492,14 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to get the day of the week based on a Saturday/Sunday as the first day of the week
-    @Test(dataProvider="dayOfWeek")
+    @ParameterizedTest
+    @MethodSource("data_dayOfweek")
     public void test_dayOfWeek(HijrahDate date, int satStart, int sunStart) {
-        assertEquals(date.get(WeekFields.of(DayOfWeek.SATURDAY, 7).dayOfWeek()), satStart);
-        assertEquals(date.get(WeekFields.of(DayOfWeek.SUNDAY, 7).dayOfWeek()), sunStart);
+        assertEquals(satStart, date.get(WeekFields.of(DayOfWeek.SATURDAY, 7).dayOfWeek()));
+        assertEquals(sunStart, date.get(WeekFields.of(DayOfWeek.SUNDAY, 7).dayOfWeek()));
     }
 
     // Data sample to get the epoch days of a date instance
-    @DataProvider(name="epochDays")
     Object[][] data_epochdays() {
         return new Object[][] {
             {1332, -20486},
@@ -502,14 +513,14 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to verify the number of epoch days of a date instance
-    @Test(dataProvider="epochDays")
+    @ParameterizedTest
+    @MethodSource("data_epochdays")
     public void test_epochDays(int y, long epoch) {
         HijrahDate date = HijrahDate.of(y, 1, 1);
-        assertEquals(date.toEpochDay(), epoch);
+        assertEquals(epoch, date.toEpochDay());
     }
 
     // Data provider to verify whether a given hijrah year is a leap year or not
-    @DataProvider(name="leapYears")
     Object[][] data_leapyears() {
         return new Object[][] {
             {1302, true},
@@ -524,15 +535,15 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to verify whether a given hijrah year is a leap year or not
-    @Test(dataProvider="leapYears")
+    @ParameterizedTest
+    @MethodSource("data_leapyears")
     public void test_leapYears(int y, boolean leapyear) {
         HijrahDate date = HijrahDate.of(y, 1, 1);
-        assertEquals(date.isLeapYear(), leapyear);
+        assertEquals(leapyear, date.isLeapYear());
     }
 
     // Data provider to verify that a given hijrah year is outside the range of supported years
     // The values are dependent on the currently configured UmmAlQura calendar data
-    @DataProvider(name="OutOfRangeLeapYears")
     Object[][] data_invalid_leapyears() {
         return new Object[][] {
                 {1299},
@@ -542,14 +553,14 @@ public class TestUmmAlQuraChronology {
         };
     }
 
-    @Test(dataProvider="OutOfRangeLeapYears")
+    @ParameterizedTest
+    @MethodSource("data_invalid_leapyears")
     public void test_notLeapYears(int y) {
         assertFalse(HijrahChronology.INSTANCE.isLeapYear(y), "Out of range leap year");
     }
 
 
     // Date samples to convert HijrahDate to LocalDate and vice versa
-    @DataProvider(name="samples")
     Object[][] data_samples() {
         return new Object[][] {
             {HijrahChronology.INSTANCE.date(1319, 12, 30), LocalDate.of(1902, 4, 9)},
@@ -562,45 +573,50 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to get LocalDate instance from a given HijrahDate
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_toLocalDate(ChronoLocalDate hijrahDate, LocalDate iso) {
-        assertEquals(LocalDate.from(hijrahDate), iso);
+        assertEquals(iso, LocalDate.from(hijrahDate));
     }
 
     // Test to adjust HijrahDate with a given LocalDate
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_adjust_toLocalDate(ChronoLocalDate hijrahDate, LocalDate iso) {
-        assertEquals(hijrahDate.with(iso), hijrahDate);
+        assertEquals(hijrahDate, hijrahDate.with(iso));
     }
 
     // Test to get a HijrahDate from a calendrical
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_fromCalendrical(ChronoLocalDate hijrahDate, LocalDate iso) {
-        assertEquals(HijrahChronology.INSTANCE.date(iso), hijrahDate);
+        assertEquals(hijrahDate, HijrahChronology.INSTANCE.date(iso));
     }
 
     // Test to verify the day of week of a given HijrahDate and LocalDate
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_dayOfWeekEqualIsoDayOfWeek(ChronoLocalDate hijrahDate, LocalDate iso) {
-        assertEquals(hijrahDate.get(ChronoField.DAY_OF_WEEK), iso.get(ChronoField.DAY_OF_WEEK), "Hijrah day of week should be same as ISO day of week");
+        assertEquals(iso.get(ChronoField.DAY_OF_WEEK), hijrahDate.get(ChronoField.DAY_OF_WEEK), "Hijrah day of week should be same as ISO day of week");
     }
 
     // Test to get the local date by applying the MIN adjustment with hijrah date
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_LocalDate_adjustToHijrahDate(ChronoLocalDate hijrahDate, LocalDate localDate) {
         LocalDate test = LocalDate.MIN.with(hijrahDate);
-        assertEquals(test, localDate);
+        assertEquals(localDate, test);
     }
 
     // Test to get the local date time by applying the MIN adjustment with hijrah date
-    @Test(dataProvider="samples")
+    @ParameterizedTest
+    @MethodSource("data_samples")
     public void test_LocalDateTime_adjustToHijrahDate(ChronoLocalDate hijrahDate, LocalDate localDate) {
         LocalDateTime test = LocalDateTime.MIN.with(hijrahDate);
-        assertEquals(test, LocalDateTime.of(localDate, LocalTime.MIDNIGHT));
+        assertEquals(LocalDateTime.of(localDate, LocalTime.MIDNIGHT), test);
     }
 
     // Sample dates for comparison
-    @DataProvider(name="datesForComparison")
     Object[][] data_datesForComparison() {
         return new Object[][] {
             {HijrahChronology.INSTANCE.date(1434, 6, 26), LocalDate.of(2013, 5, 5), -1, 1},
@@ -612,42 +628,42 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to compare dates in both forward and reverse order
-    @Test(dataProvider="datesForComparison")
+    @ParameterizedTest
+    @MethodSource("data_datesForComparison")
     public void test_compareDates(HijrahDate hdate, LocalDate ldate, int result1, int result2) {
-        assertEquals(ldate.compareTo(hdate), result1);
-        assertEquals(hdate.compareTo(ldate), result2);
+        assertEquals(result1, ldate.compareTo(hdate));
+        assertEquals(result2, hdate.compareTo(ldate));
     }
 
     // Test to verify the values of various chrono fields for a given hijrah date instance
     @Test
     public void test_chronoFields() {
         ChronoLocalDate hdate = HijrahChronology.INSTANCE.date(1434, 6, 28);
-        assertEquals(hdate.get(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), 7);
-        assertEquals(hdate.get(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), 7);
-        assertEquals(hdate.get(ChronoField.ALIGNED_WEEK_OF_MONTH), 4);
-        assertEquals(hdate.get(ChronoField.ALIGNED_WEEK_OF_YEAR), 25);
-        assertEquals(hdate.get(ChronoField.ERA), 1);
-        assertEquals(hdate.get(ChronoField.YEAR_OF_ERA), 1434);
-        assertEquals(hdate.get(ChronoField.MONTH_OF_YEAR), 6);
-        assertEquals(hdate.get(ChronoField.DAY_OF_MONTH), 28);
-        assertEquals(hdate.get(ChronoField.DAY_OF_WEEK), 3);
-        assertEquals(hdate.get(ChronoField.DAY_OF_YEAR), 175);
+        assertEquals(7, hdate.get(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH));
+        assertEquals(7, hdate.get(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR));
+        assertEquals(4, hdate.get(ChronoField.ALIGNED_WEEK_OF_MONTH));
+        assertEquals(25, hdate.get(ChronoField.ALIGNED_WEEK_OF_YEAR));
+        assertEquals(1, hdate.get(ChronoField.ERA));
+        assertEquals(1434, hdate.get(ChronoField.YEAR_OF_ERA));
+        assertEquals(6, hdate.get(ChronoField.MONTH_OF_YEAR));
+        assertEquals(28, hdate.get(ChronoField.DAY_OF_MONTH));
+        assertEquals(3, hdate.get(ChronoField.DAY_OF_WEEK));
+        assertEquals(175, hdate.get(ChronoField.DAY_OF_YEAR));
     }
 
     // Test to verify the returned hijrah date after adjusting the day of week as Saturday
     @Test
     public void test_adjustInto() {
-        assertEquals(DayOfWeek.SATURDAY.adjustInto(HijrahDate.of(1434, 6, 28)), HijrahDate.of(1434, 7, 1));
-        assertEquals(DayOfWeek.SATURDAY.adjustInto(HijrahDate.of(1432, 4, 13)), HijrahDate.of(1432, 4, 14));
-        assertEquals(DayOfWeek.SATURDAY.adjustInto(HijrahDate.of(1433, 11, 29)), HijrahDate.of(1433, 12, 4));
-        assertEquals(DayOfWeek.SATURDAY.adjustInto(HijrahDate.of(1434, 5, 10)), HijrahDate.of(1434, 5, 11));
-        assertEquals(DayOfWeek.SATURDAY.adjustInto(HijrahDate.of(1434, 9, 11)), HijrahDate.of(1434, 9, 12));
+        assertEquals(HijrahDate.of(1434, 7, 1), DayOfWeek.SATURDAY.adjustInto(HijrahDate.of(1434, 6, 28)));
+        assertEquals(HijrahDate.of(1432, 4, 14), DayOfWeek.SATURDAY.adjustInto(HijrahDate.of(1432, 4, 13)));
+        assertEquals(HijrahDate.of(1433, 12, 4), DayOfWeek.SATURDAY.adjustInto(HijrahDate.of(1433, 11, 29)));
+        assertEquals(HijrahDate.of(1434, 5, 11), DayOfWeek.SATURDAY.adjustInto(HijrahDate.of(1434, 5, 10)));
+        assertEquals(HijrahDate.of(1434, 9, 12), DayOfWeek.SATURDAY.adjustInto(HijrahDate.of(1434, 9, 11)));
     }
 
     //-----------------------------------------------------------------------
     // zonedDateTime(TemporalAccessor)
     //-----------------------------------------------------------------------
-    @DataProvider(name="zonedDateTime")
     Object[][] data_zonedDateTime() {
         return new Object[][] {
             {ZonedDateTime.of(2012, 2, 29, 2, 7, 1, 1, ZONE_RIYADH), HijrahChronology.INSTANCE.date(1433, 4, 7), LocalTime.of(2, 7, 1, 1), null},
@@ -661,13 +677,14 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to check the zoned date times
-    @Test(dataProvider="zonedDateTime")
+    @ParameterizedTest
+    @MethodSource("data_zonedDateTime")
     public void test_zonedDateTime(TemporalAccessor accessor,  HijrahDate expectedDate, LocalTime expectedTime, Class<?> expectedEx) {
         if (expectedEx == null) {
             ChronoZonedDateTime<HijrahDate> result = HijrahChronology.INSTANCE.zonedDateTime(accessor);
-            assertEquals(result.toLocalDate(), expectedDate);
-            assertEquals(HijrahDate.from(accessor), expectedDate);
-            assertEquals(result.toLocalTime(), expectedTime);
+            assertEquals(expectedDate, result.toLocalDate());
+            assertEquals(expectedDate, HijrahDate.from(accessor));
+            assertEquals(expectedTime, result.toLocalTime());
 
         } else {
             try {
@@ -688,18 +705,17 @@ public class TestUmmAlQuraChronology {
         ZonedDateTime zonedDateTime = ZonedDateTime.of(2012, 2, 29, 2, 7, 1, 1, ZONE_RIYADH);
 
         ChronoZonedDateTime<HijrahDate> result = HijrahChronology.INSTANCE.zonedDateTime(offsetDateTime.toInstant(), offsetDateTime.getOffset());
-        assertEquals(result.toLocalDate(), HijrahChronology.INSTANCE.date(1433, 4, 7));
-        assertEquals(result.toLocalTime(), LocalTime.of(2, 7, 1, 1));
+        assertEquals(HijrahChronology.INSTANCE.date(1433, 4, 7), result.toLocalDate());
+        assertEquals(LocalTime.of(2, 7, 1, 1), result.toLocalTime());
 
         result = HijrahChronology.INSTANCE.zonedDateTime(zonedDateTime.toInstant(), zonedDateTime.getOffset());
-        assertEquals(result.toLocalDate(), HijrahChronology.INSTANCE.date(1433, 4, 7));
-        assertEquals(result.toLocalTime(), LocalTime.of(2, 7, 1, 1));
+        assertEquals(HijrahChronology.INSTANCE.date(1433, 4, 7), result.toLocalDate());
+        assertEquals(LocalTime.of(2, 7, 1, 1), result.toLocalTime());
     }
 
     //-----------------------------------------------------------------------
     // localDateTime()
     //-----------------------------------------------------------------------
-    @DataProvider(name="localDateTime")
     Object[][] data_localDateTime() {
         return new Object[][] {
             {LocalDateTime.of(2012, 2, 29, 2, 7), HijrahChronology.INSTANCE.date(1433, 4, 7), LocalTime.of(2, 7), null},
@@ -713,13 +729,14 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to verify local date time values from various date instances defined in the localDateTime data provider
-    @Test(dataProvider="localDateTime")
+    @ParameterizedTest
+    @MethodSource("data_localDateTime")
     public void test_localDateTime(TemporalAccessor accessor,  HijrahDate expectedDate, LocalTime expectedTime, Class<?> expectedEx) {
         if (expectedEx == null) {
             ChronoLocalDateTime<HijrahDate> result = HijrahChronology.INSTANCE.localDateTime(accessor);
-            assertEquals(result.toLocalDate(), expectedDate);
-            assertEquals(HijrahDate.from(accessor), expectedDate);
-            assertEquals(result.toLocalTime(), expectedTime);
+            assertEquals(expectedDate, result.toLocalDate());
+            assertEquals(expectedDate, HijrahDate.from(accessor));
+            assertEquals(expectedTime, result.toLocalTime());
         } else {
             try {
                 ChronoLocalDateTime<HijrahDate> result = HijrahChronology.INSTANCE.localDateTime(accessor);
@@ -731,7 +748,6 @@ public class TestUmmAlQuraChronology {
     }
 
     // Sample Hijrah & Minguo Dates
-    @DataProvider(name="hijrahToMinguo")
     Object[][] data_hijrahToMinguo() {
         return new Object[][] {
             {HijrahDate.of(1350,5,15), MinguoDate.of(20,9,28)},
@@ -743,13 +759,13 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to verify the date conversion from Hijrah to Minguo chronology
-    @Test(dataProvider="hijrahToMinguo")
+    @ParameterizedTest
+    @MethodSource("data_hijrahToMinguo")
     public void test_hijrahToMinguo(HijrahDate hijrah, MinguoDate minguo) {
-        assertEquals(MinguoChronology.INSTANCE.date(hijrah), minguo);
+        assertEquals(minguo, MinguoChronology.INSTANCE.date(hijrah));
     }
 
     // Sample Hijrah & Thai Dates
-    @DataProvider(name="hijrahToThai")
     Object[][] data_hijrahToThai() {
         return new Object[][] {
             {HijrahDate.of(1350,5,15), ThaiBuddhistDate.of(2474,9,28)},
@@ -761,13 +777,13 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to verify the date conversion from Hijrah to Thai chronology
-    @Test(dataProvider="hijrahToThai")
+    @ParameterizedTest
+    @MethodSource("data_hijrahToThai")
     public void test_hijrahToThai(HijrahDate hijrah, ThaiBuddhistDate thai) {
-        assertEquals(ThaiBuddhistChronology.INSTANCE.date(hijrah), thai);
+        assertEquals(thai, ThaiBuddhistChronology.INSTANCE.date(hijrah));
     }
 
     // Sample Hijrah & Japanese Dates
-    @DataProvider(name="hijrahToJapanese")
     Object[][] data_hijrahToJapanese() {
         return new Object[][] {
             {HijrahDate.of(1350,5,15), "Japanese Showa 6-09-28"},
@@ -781,12 +797,12 @@ public class TestUmmAlQuraChronology {
     }
 
     // Test to verify the date conversion from Hijrah to Japanese chronology
-    @Test(dataProvider="hijrahToJapanese")
+    @ParameterizedTest
+    @MethodSource("data_hijrahToJapanese")
       public void test_hijrahToJapanese(HijrahDate hijrah, String japanese) {
-          assertEquals(JapaneseChronology.INSTANCE.date(hijrah).toString(), japanese);
+          assertEquals(japanese, JapaneseChronology.INSTANCE.date(hijrah).toString());
     }
 
-    @DataProvider(name="alignedDayOfWeekInMonthTestDates")
     Object[][] data_alignedDayOfWeekInMonth() {
         return new Object[][] {
             {1437, 9, 1, 1, 1},
@@ -799,18 +815,20 @@ public class TestUmmAlQuraChronology {
     //-----------------------------------------------------------------------
     // Test for aligned-week-of-month calculation based on the day-of-month
     //-----------------------------------------------------------------------
-    @Test(dataProvider="alignedDayOfWeekInMonthTestDates")
+    @ParameterizedTest
+    @MethodSource("data_alignedDayOfWeekInMonth")
     public void test_alignedWeekOfMonth(int year, int month, int dom, int wom, int dowm) {
         HijrahDate date = HijrahChronology.INSTANCE.date(year, month, dom);
-        assertEquals(date.getLong(ChronoField.ALIGNED_WEEK_OF_MONTH), wom);
+        assertEquals(wom, date.getLong(ChronoField.ALIGNED_WEEK_OF_MONTH));
     }
 
     //-----------------------------------------------------------------------
     // Test for aligned-day-of-week calculation based on the day-of-month
     //-----------------------------------------------------------------------
-    @Test(dataProvider="alignedDayOfWeekInMonthTestDates")
+    @ParameterizedTest
+    @MethodSource("data_alignedDayOfWeekInMonth")
     public void test_alignedDayOfWeekInMonth(int year, int month, int dom, int wom, int dowm) {
         HijrahDate date = HijrahChronology.INSTANCE.date(year, month, dom);
-        assertEquals(date.getLong(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), dowm);
+        assertEquals(dowm, date.getLong(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH));
     }
 }
diff --git a/test/jdk/java/time/test/java/time/format/AbstractTestPrinterParser.java b/test/jdk/java/time/test/java/time/format/AbstractTestPrinterParser.java
index 023f5c190ad..b4e9590c23d 100644
--- a/test/jdk/java/time/test/java/time/format/AbstractTestPrinterParser.java
+++ b/test/jdk/java/time/test/java/time/format/AbstractTestPrinterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,13 +72,11 @@ import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalField;
 import java.util.Locale;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeEach;
 
 /**
  * Abstract PrinterParser test.
  */
-@Test
 public class AbstractTestPrinterParser {
 
     protected StringBuilder buf;
@@ -88,7 +86,7 @@ public class AbstractTestPrinterParser {
     protected DecimalStyle decimalStyle;
 
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         buf = new StringBuilder();
         builder = new DateTimeFormatterBuilder();
diff --git a/test/jdk/java/time/test/java/time/format/TestCharLiteralParser.java b/test/jdk/java/time/test/java/time/format/TestCharLiteralParser.java
index 696aab0f539..d1896c865e1 100644
--- a/test/jdk/java/time/test/java/time/format/TestCharLiteralParser.java
+++ b/test/jdk/java/time/test/java/time/format/TestCharLiteralParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,24 +60,25 @@
 package test.java.time.format;
 
 import static java.time.temporal.ChronoField.YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.text.ParsePosition;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalQueries;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test CharLiteralPrinterParser.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestCharLiteralParser extends AbstractTestPrinterParser {
 
-    @DataProvider(name="success")
     Object[][] data_success() {
         return new Object[][] {
             // match
@@ -100,24 +101,24 @@ public class TestCharLiteralParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="success")
+    @ParameterizedTest
+    @MethodSource("data_success")
     public void test_parse_success(char c, boolean caseSensitive,
                                    String text, int pos, int expectedPos) {
         setCaseSensitive(caseSensitive);
         ParsePosition ppos = new ParsePosition(pos);
         TemporalAccessor parsed = getFormatter(c).parseUnresolved(text, ppos);
         if (ppos.getErrorIndex() != -1) {
-            assertEquals(ppos.getIndex(), expectedPos);
+            assertEquals(expectedPos, ppos.getIndex());
         } else {
-            assertEquals(ppos.getIndex(), expectedPos);
-            assertEquals(parsed.isSupported(YEAR), false);
-            assertEquals(parsed.query(TemporalQueries.chronology()), null);
-            assertEquals(parsed.query(TemporalQueries.zoneId()), null);
+            assertEquals(expectedPos, ppos.getIndex());
+            assertEquals(false, parsed.isSupported(YEAR));
+            assertEquals(null, parsed.query(TemporalQueries.chronology()));
+            assertEquals(null, parsed.query(TemporalQueries.zoneId()));
         }
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="error")
     Object[][] data_error() {
         return new Object[][] {
             {'a', "a", -1, IndexOutOfBoundsException.class},
@@ -125,7 +126,8 @@ public class TestCharLiteralParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="error")
+    @ParameterizedTest
+    @MethodSource("data_error")
     public void test_parse_error(char c, String text, int pos, Class<?> expected) {
         try {
             ParsePosition ppos = new ParsePosition(pos);
diff --git a/test/jdk/java/time/test/java/time/format/TestCharLiteralPrinter.java b/test/jdk/java/time/test/java/time/format/TestCharLiteralPrinter.java
index 6aaf6a5b97d..71b7c7bed53 100644
--- a/test/jdk/java/time/test/java/time/format/TestCharLiteralPrinter.java
+++ b/test/jdk/java/time/test/java/time/format/TestCharLiteralPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,42 +59,45 @@
  */
 package test.java.time.format;
 
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test CharLiteralPrinterParser.
  */
-@Test
 public class TestCharLiteralPrinter extends AbstractTestPrinterParser {
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_print_emptyCalendrical() throws Exception {
         buf.append("EXISTING");
         getFormatter('a').formatTo(EMPTY_DTA, buf);
-        assertEquals(buf.toString(), "EXISTINGa");
+        assertEquals("EXISTINGa", buf.toString());
     }
 
+    @Test
     public void test_print_dateTime() throws Exception {
         buf.append("EXISTING");
         getFormatter('a').formatTo(dta, buf);
-        assertEquals(buf.toString(), "EXISTINGa");
+        assertEquals("EXISTINGa", buf.toString());
     }
 
+    @Test
     public void test_print_emptyAppendable() throws Exception {
         getFormatter('a').formatTo(dta, buf);
-        assertEquals(buf.toString(), "a");
+        assertEquals("a", buf.toString());
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_toString() throws Exception {
-        assertEquals(getFormatter('a').toString(), "'a'");
+        assertEquals("'a'", getFormatter('a').toString());
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_toString_apos() throws Exception {
-        assertEquals(getFormatter('\'').toString(), "''");
+        assertEquals("''", getFormatter('\'').toString());
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestDateTimeFormatter.java b/test/jdk/java/time/test/java/time/format/TestDateTimeFormatter.java
index f6c1b253573..2ccc0da8f58 100644
--- a/test/jdk/java/time/test/java/time/format/TestDateTimeFormatter.java
+++ b/test/jdk/java/time/test/java/time/format/TestDateTimeFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,11 +60,12 @@
 package test.java.time.format;
 
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertThrows;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.DateTimeException;
 import java.time.DayOfWeek;
@@ -93,14 +94,16 @@ import java.time.temporal.TemporalAccessor;
 import java.util.Locale;
 import java.util.function.Function;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test DateTimeFormatter.
  * @bug 8085887 8293146
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestDateTimeFormatter {
 
     @Test
@@ -203,7 +206,6 @@ public class TestDateTimeFormatter {
         assertTrue(msg.contains("11:30:56"), msg);
     }
 
-    @DataProvider(name="nozone_exception_cases")
     Object[][] exceptionCases() {
         return new Object[][] {
                 {LocalDateTime.of(2000, 1, 1, 1, 1), "z", "ZoneId"},
@@ -213,7 +215,8 @@ public class TestDateTimeFormatter {
 
     // Test cases that should throw an exception with a cogent message
     // containing the Type being queried and the Temporal being queried.
-    @Test(dataProvider="nozone_exception_cases")
+    @ParameterizedTest
+    @MethodSource("exceptionCases")
     public void test_throws_message(Temporal temporal, String pattern, String queryName) {
         DateTimeFormatter fmt = DateTimeFormatter.ofPattern(pattern);
         try {
@@ -277,7 +280,6 @@ public class TestDateTimeFormatter {
     private static final DateTimeFormatter STRICT_WEEK = DateTimeFormatter.ofPattern("YYYY-'W'ww-e")
             .withResolverStyle(ResolverStyle.STRICT);
     private static final Locale EGYPT = Locale.forLanguageTag("en-EG");
-    @DataProvider(name = "week53Dates")
     Object[][] data_week53Dates() {
         return new Object[][] {
                 // WeekFields[SUNDAY,1]
@@ -321,15 +323,14 @@ public class TestDateTimeFormatter {
         };
     }
 
-    @Test (dataProvider = "week53Dates")
+    @ParameterizedTest
+    @MethodSource("data_week53Dates")
     public void test_week_53(String weekDate, Locale locale, LocalDate expected) {
         var f = STRICT_WEEK.withLocale(locale);
         if (expected != null) {
-            assertEquals(LocalDate.parse(weekDate, f), expected);
+            assertEquals(expected, LocalDate.parse(weekDate, f));
         } else {
-            assertThrows(DateTimeException.class, () -> {
-                LocalDate.parse(weekDate, f);
-            });
+            assertThrows(DateTimeException.class, () -> LocalDate.parse(weekDate, f));
         }
     }
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java b/test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java
index 6d62dfe1265..294d204a216 100644
--- a/test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java
+++ b/test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java
@@ -66,9 +66,10 @@ import static java.time.temporal.ChronoField.HOUR_OF_DAY;
 import static java.time.temporal.ChronoField.MINUTE_OF_HOUR;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoField.YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.text.ParsePosition;
 import java.time.LocalDate;
@@ -95,19 +96,22 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test DateTimeFormatterBuilder.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestDateTimeFormatterBuilder {
 
     private DateTimeFormatterBuilder builder;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         builder = new DateTimeFormatterBuilder();
     }
@@ -116,7 +120,7 @@ public class TestDateTimeFormatterBuilder {
     @Test
     public void test_toFormatter_empty() throws Exception {
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "");
+        assertEquals("", f.toString());
     }
 
     //-----------------------------------------------------------------------
@@ -124,14 +128,14 @@ public class TestDateTimeFormatterBuilder {
     public void test_parseCaseSensitive() throws Exception {
         builder.parseCaseSensitive();
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "ParseCaseSensitive(true)");
+        assertEquals("ParseCaseSensitive(true)", f.toString());
     }
 
     @Test
     public void test_parseCaseInsensitive() throws Exception {
         builder.parseCaseInsensitive();
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "ParseCaseSensitive(false)");
+        assertEquals("ParseCaseSensitive(false)", f.toString());
     }
 
     //-----------------------------------------------------------------------
@@ -139,14 +143,14 @@ public class TestDateTimeFormatterBuilder {
     public void test_parseStrict() throws Exception {
         builder.parseStrict();
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "ParseStrict(true)");
+        assertEquals("ParseStrict(true)", f.toString());
     }
 
     @Test
     public void test_parseLenient() throws Exception {
         builder.parseLenient();
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "ParseStrict(false)");
+        assertEquals("ParseStrict(false)", f.toString());
     }
 
     //-----------------------------------------------------------------------
@@ -154,12 +158,12 @@ public class TestDateTimeFormatterBuilder {
     public void test_appendValue_1arg() throws Exception {
         builder.appendValue(DAY_OF_MONTH);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Value(DayOfMonth)");
+        assertEquals("Value(DayOfMonth)", f.toString());
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendValue_1arg_null() throws Exception {
-        builder.appendValue(null);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendValue(null));
     }
 
     //-----------------------------------------------------------------------
@@ -167,22 +171,22 @@ public class TestDateTimeFormatterBuilder {
     public void test_appendValue_2arg() throws Exception {
         builder.appendValue(DAY_OF_MONTH, 3);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Value(DayOfMonth,3)");
+        assertEquals("Value(DayOfMonth,3)", f.toString());
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendValue_2arg_null() throws Exception {
-        builder.appendValue(null, 3);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendValue(null, 3));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValue_2arg_widthTooSmall() throws Exception {
-        builder.appendValue(DAY_OF_MONTH, 0);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValue(DAY_OF_MONTH, 0));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValue_2arg_widthTooBig() throws Exception {
-        builder.appendValue(DAY_OF_MONTH, 20);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValue(DAY_OF_MONTH, 20));
     }
 
     //-----------------------------------------------------------------------
@@ -190,42 +194,42 @@ public class TestDateTimeFormatterBuilder {
     public void test_appendValue_3arg() throws Exception {
         builder.appendValue(DAY_OF_MONTH, 2, 3, SignStyle.NORMAL);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Value(DayOfMonth,2,3,NORMAL)");
+        assertEquals("Value(DayOfMonth,2,3,NORMAL)", f.toString());
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendValue_3arg_nullField() throws Exception {
-        builder.appendValue(null, 2, 3, SignStyle.NORMAL);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendValue(null, 2, 3, SignStyle.NORMAL));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValue_3arg_minWidthTooSmall() throws Exception {
-        builder.appendValue(DAY_OF_MONTH, 0, 2, SignStyle.NORMAL);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValue(DAY_OF_MONTH, 0, 2, SignStyle.NORMAL));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValue_3arg_minWidthTooBig() throws Exception {
-        builder.appendValue(DAY_OF_MONTH, 20, 2, SignStyle.NORMAL);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValue(DAY_OF_MONTH, 20, 2, SignStyle.NORMAL));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValue_3arg_maxWidthTooSmall() throws Exception {
-        builder.appendValue(DAY_OF_MONTH, 2, 0, SignStyle.NORMAL);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValue(DAY_OF_MONTH, 2, 0, SignStyle.NORMAL));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValue_3arg_maxWidthTooBig() throws Exception {
-        builder.appendValue(DAY_OF_MONTH, 2, 20, SignStyle.NORMAL);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValue(DAY_OF_MONTH, 2, 20, SignStyle.NORMAL));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendValue_3arg_maxWidthMinWidth() throws Exception {
-        builder.appendValue(DAY_OF_MONTH, 4, 2, SignStyle.NORMAL);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendValue(DAY_OF_MONTH, 4, 2, SignStyle.NORMAL));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendValue_3arg_nullSignStyle() throws Exception {
-        builder.appendValue(DAY_OF_MONTH, 2, 3, null);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendValue(DAY_OF_MONTH, 2, 3, null));
     }
 
     //-----------------------------------------------------------------------
@@ -233,30 +237,30 @@ public class TestDateTimeFormatterBuilder {
     public void test_appendValue_subsequent2_parse3() throws Exception {
         builder.appendValue(MONTH_OF_YEAR, 1, 2, SignStyle.NORMAL).appendValue(DAY_OF_MONTH, 2);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Value(MonthOfYear,1,2,NORMAL)Value(DayOfMonth,2)");
+        assertEquals("Value(MonthOfYear,1,2,NORMAL)Value(DayOfMonth,2)", f.toString());
         TemporalAccessor parsed = f.parseUnresolved("123", new ParsePosition(0));
-        assertEquals(parsed.getLong(MONTH_OF_YEAR), 1L);
-        assertEquals(parsed.getLong(DAY_OF_MONTH), 23L);
+        assertEquals(1L, parsed.getLong(MONTH_OF_YEAR));
+        assertEquals(23L, parsed.getLong(DAY_OF_MONTH));
     }
 
     @Test
     public void test_appendValue_subsequent2_parse4() throws Exception {
         builder.appendValue(MONTH_OF_YEAR, 1, 2, SignStyle.NORMAL).appendValue(DAY_OF_MONTH, 2);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Value(MonthOfYear,1,2,NORMAL)Value(DayOfMonth,2)");
+        assertEquals("Value(MonthOfYear,1,2,NORMAL)Value(DayOfMonth,2)", f.toString());
         TemporalAccessor parsed = f.parseUnresolved("0123", new ParsePosition(0));
-        assertEquals(parsed.getLong(MONTH_OF_YEAR), 1L);
-        assertEquals(parsed.getLong(DAY_OF_MONTH), 23L);
+        assertEquals(1L, parsed.getLong(MONTH_OF_YEAR));
+        assertEquals(23L, parsed.getLong(DAY_OF_MONTH));
     }
 
     @Test
     public void test_appendValue_subsequent2_parse5() throws Exception {
         builder.appendValue(MONTH_OF_YEAR, 1, 2, SignStyle.NORMAL).appendValue(DAY_OF_MONTH, 2).appendLiteral('4');
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Value(MonthOfYear,1,2,NORMAL)Value(DayOfMonth,2)'4'");
+        assertEquals("Value(MonthOfYear,1,2,NORMAL)Value(DayOfMonth,2)'4'", f.toString());
         TemporalAccessor parsed = f.parseUnresolved("01234", new ParsePosition(0));
-        assertEquals(parsed.getLong(MONTH_OF_YEAR), 1L);
-        assertEquals(parsed.getLong(DAY_OF_MONTH), 23L);
+        assertEquals(1L, parsed.getLong(MONTH_OF_YEAR));
+        assertEquals(23L, parsed.getLong(DAY_OF_MONTH));
     }
 
     @Test
@@ -266,38 +270,38 @@ public class TestDateTimeFormatterBuilder {
             .appendValue(MONTH_OF_YEAR, 2)
             .appendValue(DAY_OF_MONTH, 2);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Value(Year,4,10,EXCEEDS_PAD)Value(MonthOfYear,2)Value(DayOfMonth,2)");
+        assertEquals("Value(Year,4,10,EXCEEDS_PAD)Value(MonthOfYear,2)Value(DayOfMonth,2)", f.toString());
         TemporalAccessor parsed = f.parseUnresolved("20090630", new ParsePosition(0));
-        assertEquals(parsed.getLong(YEAR), 2009L);
-        assertEquals(parsed.getLong(MONTH_OF_YEAR), 6L);
-        assertEquals(parsed.getLong(DAY_OF_MONTH), 30L);
+        assertEquals(2009L, parsed.getLong(YEAR));
+        assertEquals(6L, parsed.getLong(MONTH_OF_YEAR));
+        assertEquals(30L, parsed.getLong(DAY_OF_MONTH));
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendValueReduced_null() throws Exception {
-        builder.appendValueReduced(null, 2, 2, 2000);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendValueReduced(null, 2, 2, 2000));
     }
 
     @Test
     public void test_appendValueReduced() throws Exception {
         builder.appendValueReduced(YEAR, 2, 2, 2000);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "ReducedValue(Year,2,2,2000)");
+        assertEquals("ReducedValue(Year,2,2,2000)", f.toString());
         TemporalAccessor parsed = f.parseUnresolved("12", new ParsePosition(0));
-        assertEquals(parsed.getLong(YEAR), 2012L);
+        assertEquals(2012L, parsed.getLong(YEAR));
     }
 
     @Test
     public void test_appendValueReduced_subsequent_parse() throws Exception {
         builder.appendValue(MONTH_OF_YEAR, 1, 2, SignStyle.NORMAL).appendValueReduced(YEAR, 2, 2, 2000);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Value(MonthOfYear,1,2,NORMAL)ReducedValue(Year,2,2,2000)");
+        assertEquals("Value(MonthOfYear,1,2,NORMAL)ReducedValue(Year,2,2,2000)", f.toString());
         ParsePosition ppos = new ParsePosition(0);
         TemporalAccessor parsed = f.parseUnresolved("123", ppos);
         assertNotNull(parsed, "Parse failed: " + ppos.toString());
-        assertEquals(parsed.getLong(MONTH_OF_YEAR), 1L);
-        assertEquals(parsed.getLong(YEAR), 2023L);
+        assertEquals(1L, parsed.getLong(MONTH_OF_YEAR));
+        assertEquals(2023L, parsed.getLong(YEAR));
     }
 
     //-----------------------------------------------------------------------
@@ -307,42 +311,42 @@ public class TestDateTimeFormatterBuilder {
     public void test_appendFraction_4arg() throws Exception {
         builder.appendFraction(MINUTE_OF_HOUR, 1, 9, false);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Fraction(MinuteOfHour,1,9)");
+        assertEquals("Fraction(MinuteOfHour,1,9)", f.toString());
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendFraction_4arg_nullRule() throws Exception {
-        builder.appendFraction(null, 1, 9, false);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendFraction(null, 1, 9, false));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendFraction_4arg_invalidRuleNotFixedSet() throws Exception {
-        builder.appendFraction(DAY_OF_MONTH, 1, 9, false);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendFraction(DAY_OF_MONTH, 1, 9, false));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendFraction_4arg_minTooSmall() throws Exception {
-        builder.appendFraction(MINUTE_OF_HOUR, -1, 9, false);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendFraction(MINUTE_OF_HOUR, -1, 9, false));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendFraction_4arg_minTooBig() throws Exception {
-        builder.appendFraction(MINUTE_OF_HOUR, 10, 9, false);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendFraction(MINUTE_OF_HOUR, 10, 9, false));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendFraction_4arg_maxTooSmall() throws Exception {
-        builder.appendFraction(MINUTE_OF_HOUR, 0, -1, false);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendFraction(MINUTE_OF_HOUR, 0, -1, false));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendFraction_4arg_maxTooBig() throws Exception {
-        builder.appendFraction(MINUTE_OF_HOUR, 1, 10, false);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendFraction(MINUTE_OF_HOUR, 1, 10, false));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_appendFraction_4arg_maxWidthMinWidth() throws Exception {
-        builder.appendFraction(MINUTE_OF_HOUR, 9, 3, false);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendFraction(MINUTE_OF_HOUR, 9, 3, false));
     }
 
     //-----------------------------------------------------------------------
@@ -352,12 +356,12 @@ public class TestDateTimeFormatterBuilder {
     public void test_appendText_1arg() throws Exception {
         builder.appendText(MONTH_OF_YEAR);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Text(MonthOfYear)");
+        assertEquals("Text(MonthOfYear)", f.toString());
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendText_1arg_null() throws Exception {
-        builder.appendText(null);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendText(null));
     }
 
     //-----------------------------------------------------------------------
@@ -365,17 +369,17 @@ public class TestDateTimeFormatterBuilder {
     public void test_appendText_2arg() throws Exception {
         builder.appendText(MONTH_OF_YEAR, TextStyle.SHORT);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Text(MonthOfYear,SHORT)");
+        assertEquals("Text(MonthOfYear,SHORT)", f.toString());
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendText_2arg_nullRule() throws Exception {
-        builder.appendText(null, TextStyle.SHORT);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendText(null, TextStyle.SHORT));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendText_2arg_nullStyle() throws Exception {
-        builder.appendText(MONTH_OF_YEAR, (TextStyle) null);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendText(MONTH_OF_YEAR, (TextStyle) null));
     }
 
     //-----------------------------------------------------------------------
@@ -396,17 +400,17 @@ public class TestDateTimeFormatterBuilder {
         map.put(12L, "DBR");
         builder.appendText(MONTH_OF_YEAR, map);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Text(MonthOfYear)");  // TODO: toString should be different?
+        assertEquals("Text(MonthOfYear)", f.toString());  // TODO: toString should be different?
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendTextMap_nullRule() throws Exception {
-        builder.appendText(null, new HashMap<Long, String>());
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendText(null, new HashMap<Long, String>()));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendTextMap_nullStyle() throws Exception {
-        builder.appendText(MONTH_OF_YEAR, (Map<Long, String>) null);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendText(MONTH_OF_YEAR, (Map<Long, String>) null));
     }
 
     //-----------------------------------------------------------------------
@@ -416,10 +420,9 @@ public class TestDateTimeFormatterBuilder {
     public void test_appendOffsetId() throws Exception {
         builder.appendOffsetId();
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Offset(+HH:MM:ss,'Z')");
+        assertEquals("Offset(+HH:MM:ss,'Z')", f.toString());
     }
 
-    @DataProvider(name="offsetPatterns")
     Object[][] data_offsetPatterns() {
         return new Object[][] {
                 {"+HH", 2, 0, 0, "+02"},
@@ -466,24 +469,25 @@ public class TestDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="offsetPatterns")
+    @ParameterizedTest
+    @MethodSource("data_offsetPatterns")
     public void test_appendOffset_format(String pattern, int h, int m, int s, String expected) throws Exception {
         builder.appendOffset(pattern, "Z");
         DateTimeFormatter f = builder.toFormatter();
         ZoneOffset offset = ZoneOffset.ofHoursMinutesSeconds(h, m, s);
-        assertEquals(f.format(offset), expected);
+        assertEquals(expected, f.format(offset));
     }
 
-    @Test(dataProvider="offsetPatterns")
+    @ParameterizedTest
+    @MethodSource("data_offsetPatterns")
     public void test_appendOffset_parse(String pattern, int h, int m, int s, String expected) throws Exception {
         builder.appendOffset(pattern, "Z");
         DateTimeFormatter f = builder.toFormatter();
         ZoneOffset offset = ZoneOffset.ofHoursMinutesSeconds(h, m, s);
         ZoneOffset parsed = f.parse(expected, ZoneOffset::from);
-        assertEquals(f.format(parsed), expected);
+        assertEquals(expected, f.format(parsed));
     }
 
-    @DataProvider(name="badOffsetPatterns")
     Object[][] data_badOffsetPatterns() {
         return new Object[][] {
             {"HH"},
@@ -498,19 +502,20 @@ public class TestDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="badOffsetPatterns", expectedExceptions=IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("data_badOffsetPatterns")
     public void test_appendOffset_badPattern(String pattern) throws Exception {
-        builder.appendOffset(pattern, "Z");
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.appendOffset(pattern, "Z"));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendOffset_3arg_nullText() throws Exception {
-        builder.appendOffset("+HH:MM", null);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendOffset("+HH:MM", null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendOffset_3arg_nullPattern() throws Exception {
-        builder.appendOffset(null, "Z");
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendOffset(null, "Z"));
     }
 
     //-----------------------------------------------------------------------
@@ -520,19 +525,19 @@ public class TestDateTimeFormatterBuilder {
     public void test_appendZoneId() throws Exception {
         builder.appendZoneId();
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "ZoneId()");
+        assertEquals("ZoneId()", f.toString());
     }
 
     @Test
     public void test_appendZoneText_1arg() throws Exception {
         builder.appendZoneText(TextStyle.FULL);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "ZoneText(FULL)");
+        assertEquals("ZoneText(FULL)", f.toString());
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendZoneText_1arg_nullText() throws Exception {
-        builder.appendZoneText(null);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendZoneText(null));
     }
 
     //-----------------------------------------------------------------------
@@ -542,15 +547,14 @@ public class TestDateTimeFormatterBuilder {
     public void test_appendDayPeriodText_1arg() throws Exception {
         builder.appendDayPeriodText(TextStyle.FULL);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "DayPeriod(FULL)");
+        assertEquals("DayPeriod(FULL)", f.toString());
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_appendDayPeriodText_1arg_nullText() throws Exception {
-        builder.appendDayPeriodText(null);
+        Assertions.assertThrows(NullPointerException.class, () -> builder.appendDayPeriodText(null));
     }
 
-    @DataProvider(name="dayPeriodFormat")
     Object[][] data_dayPeriodFormat() {
         return new Object[][] {
             {0, 0, TextStyle.FULL, Locale.US, "midnight"},
@@ -588,15 +592,15 @@ public class TestDateTimeFormatterBuilder {
             {23, 0, TextStyle.NARROW, Locale.JAPAN, "\u591c\u4e2d"},
         };
     }
-    @Test (dataProvider="dayPeriodFormat")
+    @ParameterizedTest
+    @MethodSource("data_dayPeriodFormat")
     public void test_dayPeriodFormat(int hod, int moh, TextStyle ts, Locale l, String expected) throws Exception {
         builder.appendDayPeriodText(ts);
         LocalTime t = LocalTime.of(hod, moh);
         DateTimeFormatter f = builder.toFormatter().withLocale(l);
-        assertEquals(f.format(t), expected);
+        assertEquals(expected, f.format(t));
     }
 
-    @DataProvider(name="dayPeriodParse")
     Object[][] data_dayPeriodParse() {
         return new Object[][] {
                 {TextStyle.FULL, Locale.US, 0, 0, "midnight"},
@@ -638,16 +642,16 @@ public class TestDateTimeFormatterBuilder {
                 {TextStyle.NARROW, Locale.JAPAN, 21, 0, "\u591c"},
         };
     }
-    @Test (dataProvider="dayPeriodParse")
+    @ParameterizedTest
+    @MethodSource("data_dayPeriodParse")
     public void test_dayPeriodParse(TextStyle ts, Locale l, long hod, long moh, String dayPeriod) throws Exception {
         builder.appendDayPeriodText(ts);
         DateTimeFormatter f = builder.toFormatter().withLocale(l);
         var p = f.parse(dayPeriod);
-        assertEquals(p.getLong(HOUR_OF_DAY), hod);
-        assertEquals(p.getLong(MINUTE_OF_HOUR), moh);
+        assertEquals(hod, p.getLong(HOUR_OF_DAY));
+        assertEquals(moh, p.getLong(MINUTE_OF_HOUR));
     }
 
-    @DataProvider(name="dayPeriodParsePattern")
     Object[][] data_dayPeriodParsePattern() {
         return new Object[][] {
             {"H B", "23 at night", 23},
@@ -663,15 +667,15 @@ public class TestDateTimeFormatterBuilder {
         };
     }
 
-    @Test (dataProvider="dayPeriodParsePattern")
+    @ParameterizedTest
+    @MethodSource("data_dayPeriodParsePattern")
     public void test_dayPeriodParsePattern(String pattern, String hourDayPeriod, long expected) throws Exception {
         builder.appendPattern(pattern);
         DateTimeFormatter f = builder.toFormatter().withLocale(Locale.US);
         var p = f.parse(hourDayPeriod);
-        assertEquals(p.getLong(HOUR_OF_DAY), expected);
+        assertEquals(expected, p.getLong(HOUR_OF_DAY));
     }
 
-    @DataProvider(name="dayPeriodParseMidnight")
     Object[][] data_dayPeriodParseMidnight() {
         return new Object[][] {
             {"u-M-d H:m B", "2020-11-07 00:00 midnight", 7, 0},
@@ -679,16 +683,16 @@ public class TestDateTimeFormatterBuilder {
         };
     }
 
-    @Test (dataProvider="dayPeriodParseMidnight")
+    @ParameterizedTest
+    @MethodSource("data_dayPeriodParseMidnight")
     public void test_dayPeriodParseMidnight(String pattern, String dateTime, long expectedDOM, long expectedHOD) throws Exception {
         builder.appendPattern(pattern);
         DateTimeFormatter f = builder.toFormatter().withLocale(Locale.US);
         var p = f.parse(dateTime);
-        assertEquals(p.getLong(DAY_OF_MONTH), expectedDOM);
-        assertEquals(p.getLong(HOUR_OF_DAY), expectedHOD);
+        assertEquals(expectedDOM, p.getLong(DAY_OF_MONTH));
+        assertEquals(expectedHOD, p.getLong(HOUR_OF_DAY));
     }
 
-    @DataProvider(name="dayPeriodParseInvalid")
     Object[][] data_dayPeriodParseInvalid() {
         return new Object[][] {
                 {TextStyle.FULL, ResolverStyle.SMART, Locale.US, "00:01 midnight", "00:00"},
@@ -748,7 +752,8 @@ public class TestDateTimeFormatterBuilder {
                 {TextStyle.NARROW, ResolverStyle.LENIENT, Locale.JAPAN, "23:00 \u591c", "19:00-23:00"},
         };
     }
-    @Test (dataProvider="dayPeriodParseInvalid")
+    @ParameterizedTest
+    @MethodSource("data_dayPeriodParseInvalid")
     public void test_dayPeriodParseInvalid(TextStyle ts, ResolverStyle rs, Locale l, String dayPeriod, String periodRange) throws Exception {
         try {
             builder.append(ISO_LOCAL_TIME).appendLiteral(' ').appendDayPeriodText(ts)
@@ -759,13 +764,11 @@ public class TestDateTimeFormatterBuilder {
                 throw new RuntimeException("DateTimeParseException should be thrown");
             }
         } catch (DateTimeParseException e) {
-            assertEquals(e.getCause().getMessage(),
-                    "Conflict found: Resolved time " + dayPeriod.substring(0, 5) + " conflicts with " +
-                    "DayPeriod(" + periodRange + ")");
+            assertEquals("Conflict found: Resolved time " + dayPeriod.substring(0, 5) + " conflicts with " +
+                    "DayPeriod(" + periodRange + ")", e.getCause().getMessage());
         }
     }
 
-    @DataProvider(name="dayPeriodParsePatternInvalid")
     Object[][] data_dayPeriodParsePatternInvalid() {
         return new Object[][] {
                 {"H B", ResolverStyle.SMART, "47 at night", 23, null},
@@ -794,7 +797,8 @@ public class TestDateTimeFormatterBuilder {
         };
     }
 
-    @Test (dataProvider="dayPeriodParsePatternInvalid")
+    @ParameterizedTest
+    @MethodSource("data_dayPeriodParsePatternInvalid")
     public void test_dayPeriodParsePatternInvalid(String pattern, ResolverStyle rs, String hourDayPeriod, long expected, Period expectedExcessDays) throws Exception {
         try {
             builder.appendPattern(pattern);
@@ -803,18 +807,20 @@ public class TestDateTimeFormatterBuilder {
             if (rs != ResolverStyle.LENIENT) {
                 throw new RuntimeException("DateTimeParseException should be thrown");
             }
-            assertEquals(p.getLong(HOUR_OF_DAY), expected);
-            assertEquals(p.query(DateTimeFormatter.parsedExcessDays()), expectedExcessDays);
+            assertEquals(expected, p.getLong(HOUR_OF_DAY));
+            assertEquals(expectedExcessDays, p.query(DateTimeFormatter.parsedExcessDays()));
         } catch (DateTimeParseException e) {
             // exception successfully thrown
         }
     }
 
-    @Test (expectedExceptions = DateTimeParseException.class)
+    @Test
     public void test_dayPeriodParseStrictNoTime() {
-        builder.appendPattern("B");
-        DateTimeFormatter f = builder.toFormatter().withLocale(Locale.US).withResolverStyle(ResolverStyle.STRICT);
-        LocalTime.parse("at night", f);
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            builder.appendPattern("B");
+            DateTimeFormatter f = builder.toFormatter().withLocale(Locale.US).withResolverStyle(ResolverStyle.STRICT);
+            LocalTime.parse("at night", f);
+        });
     }
 
     @Test
@@ -880,7 +886,7 @@ public class TestDateTimeFormatterBuilder {
                 .appendPattern(" B")
                 .toFormatter()
                 .withLocale(Locale.US);
-        assertEquals((long)dtf.parse("0 in the morning").getLong(ChronoField.HOUR_OF_DAY), 6L);
+        assertEquals(6L, (long)dtf.parse("0 in the morning").getLong(ChronoField.HOUR_OF_DAY));
         try {
             dtf.parse("0 at night");
             fail("DateTimeParseException should be thrown");
@@ -895,24 +901,24 @@ public class TestDateTimeFormatterBuilder {
     @Test
     public void test_padNext_1arg() {
         builder.appendValue(MONTH_OF_YEAR).appendLiteral(':').padNext(2).appendValue(DAY_OF_MONTH);
-        assertEquals(builder.toFormatter().format(LocalDate.of(2013, 2, 1)), "2: 1");
+        assertEquals("2: 1", builder.toFormatter().format(LocalDate.of(2013, 2, 1)));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_padNext_1arg_invalidWidth() throws Exception {
-        builder.padNext(0);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.padNext(0));
     }
 
     //-----------------------------------------------------------------------
     @Test
     public void test_padNext_2arg_dash() throws Exception {
         builder.appendValue(MONTH_OF_YEAR).appendLiteral(':').padNext(2, '-').appendValue(DAY_OF_MONTH);
-        assertEquals(builder.toFormatter().format(LocalDate.of(2013, 2, 1)), "2:-1");
+        assertEquals("2:-1", builder.toFormatter().format(LocalDate.of(2013, 2, 1)));
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test
     public void test_padNext_2arg_invalidWidth() throws Exception {
-        builder.padNext(0, '-');
+        Assertions.assertThrows(IllegalArgumentException.class, () -> builder.padNext(0, '-'));
     }
 
     //-----------------------------------------------------------------------
@@ -921,8 +927,8 @@ public class TestDateTimeFormatterBuilder {
         builder.appendValue(MONTH_OF_YEAR).appendLiteral(':')
                 .padNext(5).optionalStart().appendValue(DAY_OF_MONTH).optionalEnd()
                 .appendLiteral(':').appendValue(YEAR);
-        assertEquals(builder.toFormatter().format(LocalDate.of(2013, 2, 1)), "2:    1:2013");
-        assertEquals(builder.toFormatter().format(YearMonth.of(2013, 2)), "2:     :2013");
+        assertEquals("2:    1:2013", builder.toFormatter().format(LocalDate.of(2013, 2, 1)));
+        assertEquals("2:     :2013", builder.toFormatter().format(YearMonth.of(2013, 2)));
     }
 
     //-----------------------------------------------------------------------
@@ -932,21 +938,21 @@ public class TestDateTimeFormatterBuilder {
     public void test_optionalStart_noEnd() throws Exception {
         builder.appendValue(MONTH_OF_YEAR).optionalStart().appendValue(DAY_OF_MONTH).appendValue(DAY_OF_WEEK);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Value(MonthOfYear)[Value(DayOfMonth)Value(DayOfWeek)]");
+        assertEquals("Value(MonthOfYear)[Value(DayOfMonth)Value(DayOfWeek)]", f.toString());
     }
 
     @Test
     public void test_optionalStart2_noEnd() throws Exception {
         builder.appendValue(MONTH_OF_YEAR).optionalStart().appendValue(DAY_OF_MONTH).optionalStart().appendValue(DAY_OF_WEEK);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Value(MonthOfYear)[Value(DayOfMonth)[Value(DayOfWeek)]]");
+        assertEquals("Value(MonthOfYear)[Value(DayOfMonth)[Value(DayOfWeek)]]", f.toString());
     }
 
     @Test
     public void test_optionalStart_doubleStart() throws Exception {
         builder.appendValue(MONTH_OF_YEAR).optionalStart().optionalStart().appendValue(DAY_OF_MONTH);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Value(MonthOfYear)[[Value(DayOfMonth)]]");
+        assertEquals("Value(MonthOfYear)[[Value(DayOfMonth)]]", f.toString());
     }
 
     //-----------------------------------------------------------------------
@@ -954,7 +960,7 @@ public class TestDateTimeFormatterBuilder {
     public void test_optionalEnd() throws Exception {
         builder.appendValue(MONTH_OF_YEAR).optionalStart().appendValue(DAY_OF_MONTH).optionalEnd().appendValue(DAY_OF_WEEK);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Value(MonthOfYear)[Value(DayOfMonth)]Value(DayOfWeek)");
+        assertEquals("Value(MonthOfYear)[Value(DayOfMonth)]Value(DayOfWeek)", f.toString());
     }
 
     @Test
@@ -962,39 +968,38 @@ public class TestDateTimeFormatterBuilder {
         builder.appendValue(MONTH_OF_YEAR).optionalStart().appendValue(DAY_OF_MONTH)
             .optionalStart().appendValue(DAY_OF_WEEK).optionalEnd().appendValue(DAY_OF_MONTH).optionalEnd();
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Value(MonthOfYear)[Value(DayOfMonth)[Value(DayOfWeek)]Value(DayOfMonth)]");
+        assertEquals("Value(MonthOfYear)[Value(DayOfMonth)[Value(DayOfWeek)]Value(DayOfMonth)]", f.toString());
     }
 
     @Test
     public void test_optionalEnd_doubleStartSingleEnd() throws Exception {
         builder.appendValue(MONTH_OF_YEAR).optionalStart().optionalStart().appendValue(DAY_OF_MONTH).optionalEnd();
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Value(MonthOfYear)[[Value(DayOfMonth)]]");
+        assertEquals("Value(MonthOfYear)[[Value(DayOfMonth)]]", f.toString());
     }
 
     @Test
     public void test_optionalEnd_doubleStartDoubleEnd() throws Exception {
         builder.appendValue(MONTH_OF_YEAR).optionalStart().optionalStart().appendValue(DAY_OF_MONTH).optionalEnd().optionalEnd();
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Value(MonthOfYear)[[Value(DayOfMonth)]]");
+        assertEquals("Value(MonthOfYear)[[Value(DayOfMonth)]]", f.toString());
     }
 
     @Test
     public void test_optionalStartEnd_immediateStartEnd() throws Exception {
         builder.appendValue(MONTH_OF_YEAR).optionalStart().optionalEnd().appendValue(DAY_OF_MONTH);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), "Value(MonthOfYear)Value(DayOfMonth)");
+        assertEquals("Value(MonthOfYear)Value(DayOfMonth)", f.toString());
     }
 
-    @Test(expectedExceptions=IllegalStateException.class)
+    @Test
     public void test_optionalEnd_noStart() throws Exception {
-        builder.optionalEnd();
+        Assertions.assertThrows(IllegalStateException.class, () -> builder.optionalEnd());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
-    @DataProvider(name="validPatterns")
     Object[][] dataValid() {
         return new Object[][] {
             {"'a'", "'a'"},
@@ -1162,15 +1167,15 @@ public class TestDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="validPatterns")
+    @ParameterizedTest
+    @MethodSource("dataValid")
     public void test_appendPattern_valid(String input, String expected) throws Exception {
         builder.appendPattern(input);
         DateTimeFormatter f = builder.toFormatter();
-        assertEquals(f.toString(), expected);
+        assertEquals(expected, f.toString());
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="invalidPatterns")
     Object[][] dataInvalid() {
         return new Object[][] {
             {"'"},
@@ -1241,17 +1246,19 @@ public class TestDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="invalidPatterns", expectedExceptions=IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("dataInvalid")
     public void test_appendPattern_invalid(String input) throws Exception {
-        try {
-            builder.appendPattern(input);
-        } catch (IllegalArgumentException ex) {
-            throw ex;
-        }
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            try {
+                builder.appendPattern(input);
+            } catch (IllegalArgumentException ex) {
+                throw ex;
+            }
+        });
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="localePatterns")
     Object[][] localizedDateTimePatterns() {
         return new Object[][] {
             {FormatStyle.FULL, FormatStyle.FULL, IsoChronology.INSTANCE, Locale.US, "EEEE, MMMM d, y, h:mm:ss\u202fa zzzz"},
@@ -1269,26 +1276,27 @@ public class TestDateTimeFormatterBuilder {
         };
     }
 
-    @Test(dataProvider="localePatterns")
+    @ParameterizedTest
+    @MethodSource("localizedDateTimePatterns")
     public void test_getLocalizedDateTimePattern(FormatStyle dateStyle, FormatStyle timeStyle,
             Chronology chrono, Locale locale, String expected) {
         String actual = DateTimeFormatterBuilder.getLocalizedDateTimePattern(dateStyle, timeStyle, chrono, locale);
-        assertEquals(actual, expected, "Pattern " + convertNonAscii(actual));
+        assertEquals(expected, actual, "Pattern " + convertNonAscii(actual));
     }
 
-    @Test(expectedExceptions=java.lang.IllegalArgumentException.class)
+    @Test
     public void test_getLocalizedDateTimePatternIAE() {
-        DateTimeFormatterBuilder.getLocalizedDateTimePattern(null, null, IsoChronology.INSTANCE, Locale.US);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> DateTimeFormatterBuilder.getLocalizedDateTimePattern(null, null, IsoChronology.INSTANCE, Locale.US));
     }
 
-    @Test(expectedExceptions=java.lang.NullPointerException.class)
+    @Test
     public void test_getLocalizedChronoNPE() {
-        DateTimeFormatterBuilder.getLocalizedDateTimePattern(FormatStyle.SHORT, FormatStyle.SHORT, null, Locale.US);
+        Assertions.assertThrows(NullPointerException.class, () -> DateTimeFormatterBuilder.getLocalizedDateTimePattern(FormatStyle.SHORT, FormatStyle.SHORT, null, Locale.US));
     }
 
-    @Test(expectedExceptions=java.lang.NullPointerException.class)
+    @Test
     public void test_getLocalizedLocaleNPE() {
-        DateTimeFormatterBuilder.getLocalizedDateTimePattern(FormatStyle.SHORT, FormatStyle.SHORT, IsoChronology.INSTANCE, null);
+        Assertions.assertThrows(NullPointerException.class, () -> DateTimeFormatterBuilder.getLocalizedDateTimePattern(FormatStyle.SHORT, FormatStyle.SHORT, IsoChronology.INSTANCE, null));
     }
 
     /**
diff --git a/test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilderWithLocale.java b/test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilderWithLocale.java
index a0981f0c4d8..ff44426dbe9 100644
--- a/test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilderWithLocale.java
+++ b/test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilderWithLocale.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,27 +84,26 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test DateTimeFormatterBuilder.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestDateTimeFormatterBuilderWithLocale {
 
     private DateTimeFormatterBuilder builder;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
         builder = new DateTimeFormatterBuilder();
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="patternPrint")
     Object[][] data_patternPrint() {
         return new Object[][] {
             {"Q", date(2012, 2, 10), "1"},
@@ -115,15 +114,15 @@ public class TestDateTimeFormatterBuilderWithLocale {
         };
     }
 
-    @Test(dataProvider="patternPrint")
+    @ParameterizedTest
+    @MethodSource("data_patternPrint")
     public void test_appendPattern_patternPrint(String input, Temporal temporal, String expected) throws Exception {
         DateTimeFormatter f = builder.appendPattern(input).toFormatter(Locale.UK);
         String test = f.format(temporal);
-        assertEquals(test, expected);
+        assertEquals(expected, test);
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="mapTextLookup")
     Object[][] data_mapTextLookup() {
         return new Object[][] {
             {IsoChronology.INSTANCE.date(1, 1, 1), Locale.ENGLISH},
@@ -133,7 +132,8 @@ public class TestDateTimeFormatterBuilderWithLocale {
         };
     }
 
-    @Test(dataProvider="mapTextLookup")
+    @ParameterizedTest
+    @MethodSource("data_mapTextLookup")
     public void test_appendText_mapTextLookup(ChronoLocalDate date, Locale locale) {
         final String firstYear = "firstYear";
         final String firstMonth = "firstMonth";
@@ -146,16 +146,15 @@ public class TestDateTimeFormatterBuilderWithLocale {
             .toFormatter(locale)
             .withResolverStyle(ResolverStyle.STRICT);
 
-        assertEquals(date.format(formatter), firstYearMonth);
+        assertEquals(firstYearMonth, date.format(formatter));
 
         TemporalAccessor ta = formatter.parse(firstYearMonth);
-        assertEquals(ta.getLong(ChronoField.YEAR_OF_ERA), first);
-        assertEquals(ta.getLong(ChronoField.MONTH_OF_YEAR), first);
+        assertEquals(first, ta.getLong(ChronoField.YEAR_OF_ERA));
+        assertEquals(first, ta.getLong(ChronoField.MONTH_OF_YEAR));
     }
 
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="localePatterns")
     Object[][] localizedDateTimePatterns() {
         return new Object[][] {
             // French Locale and ISO Chronology
@@ -202,11 +201,12 @@ public class TestDateTimeFormatterBuilderWithLocale {
         };
     }
 
-    @Test(dataProvider="localePatterns")
+    @ParameterizedTest
+    @MethodSource("localizedDateTimePatterns")
     public void test_getLocalizedDateTimePattern(FormatStyle dateStyle, FormatStyle timeStyle,
             Chronology chrono, Locale locale, String expected) {
         String actual = DateTimeFormatterBuilder.getLocalizedDateTimePattern(dateStyle, timeStyle, chrono, locale);
-        assertEquals(actual, expected, "Pattern " + convertNonAscii(actual));
+        assertEquals(expected, actual, "Pattern " + convertNonAscii(actual));
     }
 
     /**
diff --git a/test/jdk/java/time/test/java/time/format/TestDateTimeParsing.java b/test/jdk/java/time/test/java/time/format/TestDateTimeParsing.java
index 67c91e6ad7e..f50a99f8a0e 100644
--- a/test/jdk/java/time/test/java/time/format/TestDateTimeParsing.java
+++ b/test/jdk/java/time/test/java/time/format/TestDateTimeParsing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,8 +71,9 @@ import static java.time.temporal.ChronoField.NANO_OF_SECOND;
 import static java.time.temporal.ChronoField.OFFSET_SECONDS;
 import static java.time.temporal.ChronoField.SECOND_OF_DAY;
 import static java.util.Locale.US;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.text.ParsePosition;
 import java.time.DateTimeException;
@@ -88,14 +89,18 @@ import java.time.format.SignStyle;
 import java.time.temporal.TemporalAccessor;
 import java.util.Locale;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * @test
  * @summary Test parsing of edge cases.
  * @bug 8223773 8272473 8319640
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestDateTimeParsing {
 
     private static final ZoneId PARIS = ZoneId.of("Europe/Paris");
@@ -132,7 +137,6 @@ public class TestDateTimeParsing {
     private static final String DTPE_MESSAGE =
         "Invalid value for HourOfAmPm (valid values 0 - 11): 12";
 
-    @DataProvider(name = "instantZones")
     Object[][] data_instantZones() {
         return new Object[][] {
             {LOCALFIELDS_ZONEID, "2014-06-30 01:02:03 Europe/Paris", ZonedDateTime.of(2014, 6, 30, 1, 2, 3, 0, PARIS)},
@@ -154,37 +158,40 @@ public class TestDateTimeParsing {
         };
     }
 
-    @Test(dataProvider = "instantZones")
+    @ParameterizedTest
+    @MethodSource("data_instantZones")
     public void test_parse_instantZones_ZDT(DateTimeFormatter formatter, String text, ZonedDateTime expected) {
         TemporalAccessor actual = formatter.parse(text);
-        assertEquals(ZonedDateTime.from(actual), expected);
+        assertEquals(expected, ZonedDateTime.from(actual));
     }
 
-    @Test(dataProvider = "instantZones")
+    @ParameterizedTest
+    @MethodSource("data_instantZones")
     public void test_parse_instantZones_LDT(DateTimeFormatter formatter, String text, ZonedDateTime expected) {
         TemporalAccessor actual = formatter.parse(text);
-        assertEquals(LocalDateTime.from(actual), expected.toLocalDateTime());
+        assertEquals(expected.toLocalDateTime(), LocalDateTime.from(actual));
     }
 
-    @Test(dataProvider = "instantZones")
+    @ParameterizedTest
+    @MethodSource("data_instantZones")
     public void test_parse_instantZones_Instant(DateTimeFormatter formatter, String text, ZonedDateTime expected) {
         TemporalAccessor actual = formatter.parse(text);
-        assertEquals(Instant.from(actual), expected.toInstant());
+        assertEquals(expected.toInstant(), Instant.from(actual));
     }
 
-    @Test(dataProvider = "instantZones")
+    @ParameterizedTest
+    @MethodSource("data_instantZones")
     public void test_parse_instantZones_supported(DateTimeFormatter formatter, String text, ZonedDateTime expected) {
         TemporalAccessor actual = formatter.parse(text);
-        assertEquals(actual.isSupported(INSTANT_SECONDS), true);
-        assertEquals(actual.isSupported(EPOCH_DAY), true);
-        assertEquals(actual.isSupported(SECOND_OF_DAY), true);
-        assertEquals(actual.isSupported(NANO_OF_SECOND), true);
-        assertEquals(actual.isSupported(MICRO_OF_SECOND), true);
-        assertEquals(actual.isSupported(MILLI_OF_SECOND), true);
+        assertEquals(true, actual.isSupported(INSTANT_SECONDS));
+        assertEquals(true, actual.isSupported(EPOCH_DAY));
+        assertEquals(true, actual.isSupported(SECOND_OF_DAY));
+        assertEquals(true, actual.isSupported(NANO_OF_SECOND));
+        assertEquals(true, actual.isSupported(MICRO_OF_SECOND));
+        assertEquals(true, actual.isSupported(MILLI_OF_SECOND));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name = "instantNoZone")
     Object[][] data_instantNoZone() {
         return new Object[][] {
             {INSTANT, "2014-06-30T01:02:03Z", ZonedDateTime.of(2014, 6, 30, 1, 2, 3, 0, ZoneOffset.UTC).toInstant()},
@@ -193,55 +200,65 @@ public class TestDateTimeParsing {
         };
     }
 
-    @Test(dataProvider = "instantNoZone", expectedExceptions = DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_instantNoZone")
     public void test_parse_instantNoZone_ZDT(DateTimeFormatter formatter, String text, Instant expected) {
-        TemporalAccessor actual = formatter.parse(text);
-        ZonedDateTime.from(actual);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            TemporalAccessor actual = formatter.parse(text);
+            ZonedDateTime.from(actual);
+        });
     }
 
-    @Test(dataProvider = "instantNoZone", expectedExceptions = DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_instantNoZone")
     public void test_parse_instantNoZone_LDT(DateTimeFormatter formatter, String text, Instant expected) {
-        TemporalAccessor actual = formatter.parse(text);
-        LocalDateTime.from(actual);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            TemporalAccessor actual = formatter.parse(text);
+            LocalDateTime.from(actual);
+        });
     }
 
-    @Test(dataProvider = "instantNoZone")
+    @ParameterizedTest
+    @MethodSource("data_instantNoZone")
     public void test_parse_instantNoZone_Instant(DateTimeFormatter formatter, String text, Instant expected) {
         TemporalAccessor actual = formatter.parse(text);
-        assertEquals(Instant.from(actual), expected);
+        assertEquals(expected, Instant.from(actual));
     }
 
-    @Test(dataProvider = "instantNoZone")
+    @ParameterizedTest
+    @MethodSource("data_instantNoZone")
     public void test_parse_instantNoZone_supported(DateTimeFormatter formatter, String text, Instant expected) {
         TemporalAccessor actual = formatter.parse(text);
-        assertEquals(actual.isSupported(INSTANT_SECONDS), true);
-        assertEquals(actual.isSupported(EPOCH_DAY), false);
-        assertEquals(actual.isSupported(SECOND_OF_DAY), false);
-        assertEquals(actual.isSupported(NANO_OF_SECOND), true);
-        assertEquals(actual.isSupported(MICRO_OF_SECOND), true);
-        assertEquals(actual.isSupported(MILLI_OF_SECOND), true);
+        assertEquals(true, actual.isSupported(INSTANT_SECONDS));
+        assertEquals(false, actual.isSupported(EPOCH_DAY));
+        assertEquals(false, actual.isSupported(SECOND_OF_DAY));
+        assertEquals(true, actual.isSupported(NANO_OF_SECOND));
+        assertEquals(true, actual.isSupported(MICRO_OF_SECOND));
+        assertEquals(true, actual.isSupported(MILLI_OF_SECOND));
     }
 
     // Bug 8223773: validation check for the range of HourOfAmPm in SMART mode.
     // Should throw a DateTimeParseException, as 12 is out of range for HourOfAmPm.
-    @Test(expectedExceptions = DateTimeParseException.class)
+    @Test
     public void test_validateHourOfAmPm() {
-        try {
-            new DateTimeFormatterBuilder()
-                .appendValue(HOUR_OF_AMPM,2)
-                .appendText(AMPM_OF_DAY)
-                .toFormatter(US)
-                .parse("12PM");
-        } catch (DateTimeParseException e) {
-            Throwable cause = e.getCause();
-            if (cause == null ||
-                !DTPE_MESSAGE.equals(cause.getMessage())) {
-                throw new RuntimeException(
-                    "DateTimeParseException was thrown with different reason: " + e);
-            } else {
-                throw e;
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            try {
+                new DateTimeFormatterBuilder()
+                        .appendValue(HOUR_OF_AMPM,2)
+                        .appendText(AMPM_OF_DAY)
+                        .toFormatter(US)
+                        .parse("12PM");
+            } catch (DateTimeParseException e) {
+                Throwable cause = e.getCause();
+                if (cause == null ||
+                        !DTPE_MESSAGE.equals(cause.getMessage())) {
+                    throw new RuntimeException(
+                            "DateTimeParseException was thrown with different reason: " + e);
+                } else {
+                    throw e;
+                }
             }
-        }
+        });
     }
 
     // Checks ::toFormat().parseObject(text, pos) do not throw DateTimeException
diff --git a/test/jdk/java/time/test/java/time/format/TestDateTimeTextProvider.java b/test/jdk/java/time/test/java/time/format/TestDateTimeTextProvider.java
index f2a14374c49..80336b7b761 100644
--- a/test/jdk/java/time/test/java/time/format/TestDateTimeTextProvider.java
+++ b/test/jdk/java/time/test/java/time/format/TestDateTimeTextProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,8 @@ package test.java.time.format;
 import static java.time.temporal.ChronoField.AMPM_OF_DAY;
 import static java.time.temporal.ChronoField.DAY_OF_WEEK;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -70,19 +71,19 @@ import java.time.format.TextStyle;
 import java.time.temporal.TemporalField;
 import java.util.Locale;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test SimpleDateTimeTextProvider.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestDateTimeTextProvider extends AbstractTestPrinterParser {
 
     Locale enUS = Locale.US;
 
     //-----------------------------------------------------------------------
-    @DataProvider(name = "Text")
     Object[][] data_text() {
         return new Object[][] {
             {DAY_OF_WEEK, 1, TextStyle.SHORT, enUS, "Mon"},
@@ -133,10 +134,11 @@ public class TestDateTimeTextProvider extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider = "Text")
+    @ParameterizedTest
+    @MethodSource("data_text")
     public void test_getText(TemporalField field, Number value, TextStyle style, Locale locale, String expected) {
           DateTimeFormatter fmt = getFormatter(field, style).withLocale(locale);
-          assertEquals(fmt.format(ZonedDateTime.now().with(field, value.longValue())), expected);
+          assertEquals(expected, fmt.format(ZonedDateTime.now().with(field, value.longValue())));
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestDateTimeTextProviderWithLocale.java b/test/jdk/java/time/test/java/time/format/TestDateTimeTextProviderWithLocale.java
index 65d65251862..35b793bb769 100644
--- a/test/jdk/java/time/test/java/time/format/TestDateTimeTextProviderWithLocale.java
+++ b/test/jdk/java/time/test/java/time/format/TestDateTimeTextProviderWithLocale.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,7 +69,8 @@ package test.java.time.format;
 import static java.time.temporal.ChronoField.AMPM_OF_DAY;
 import static java.time.temporal.ChronoField.DAY_OF_WEEK;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -77,20 +78,20 @@ import java.time.format.TextStyle;
 import java.time.temporal.TemporalField;
 import java.util.Locale;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test SimpleDateTimeTextProviderWithLocale.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestDateTimeTextProviderWithLocale extends AbstractTestPrinterParser {
 
     Locale enUS = Locale.US;
     Locale ptBR = Locale.of("pt", "BR");
 
     //-----------------------------------------------------------------------
-    @DataProvider(name = "Text")
     Object[][] data_text() {
         return new Object[][] {
             {DAY_OF_WEEK, 1, TextStyle.SHORT, ptBR, "seg."},
@@ -138,10 +139,11 @@ public class TestDateTimeTextProviderWithLocale extends AbstractTestPrinterParse
         };
     }
 
-    @Test(dataProvider = "Text")
+    @ParameterizedTest
+    @MethodSource("data_text")
     public void test_getText(TemporalField field, Number value, TextStyle style, Locale locale, String expected) {
           DateTimeFormatter fmt = getFormatter(field, style).withLocale(locale);
-          assertEquals(fmt.format(ZonedDateTime.now().with(field, value.longValue())), expected);
+          assertEquals(expected, fmt.format(ZonedDateTime.now().with(field, value.longValue())));
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestDecimalStyle.java b/test/jdk/java/time/test/java/time/format/TestDecimalStyle.java
index b506d547ada..48f7da3e80c 100644
--- a/test/jdk/java/time/test/java/time/format/TestDecimalStyle.java
+++ b/test/jdk/java/time/test/java/time/format/TestDecimalStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,17 +59,16 @@
  */
 package test.java.time.format;
 
-import static org.testng.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.time.format.DecimalStyle;
 import java.util.Locale;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test DecimalStyle.
  */
-@Test
 public class TestDecimalStyle {
 
     @Test
diff --git a/test/jdk/java/time/test/java/time/format/TestFractionPrinterParser.java b/test/jdk/java/time/test/java/time/format/TestFractionPrinterParser.java
index 4dbca06709d..0c079173d1f 100644
--- a/test/jdk/java/time/test/java/time/format/TestFractionPrinterParser.java
+++ b/test/jdk/java/time/test/java/time/format/TestFractionPrinterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,8 +60,9 @@
 package test.java.time.format;
 
 import static java.time.temporal.ChronoField.*;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.text.ParsePosition;
 import java.time.DateTimeException;
@@ -71,8 +72,12 @@ import java.time.temporal.ChronoField;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalField;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import test.java.time.temporal.MockFieldValue;
 
 /**
@@ -80,7 +85,7 @@ import test.java.time.temporal.MockFieldValue;
  *
  * @bug 8230136 8276220
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestFractionPrinterParser extends AbstractTestPrinterParser {
 
     private DateTimeFormatter getFormatter(TemporalField field, int minWidth, int maxWidth, boolean decimalPoint) {
@@ -90,12 +95,11 @@ public class TestFractionPrinterParser extends AbstractTestPrinterParser {
     //-----------------------------------------------------------------------
     // print
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_print_emptyCalendrical() throws Exception {
-        getFormatter(NANO_OF_SECOND, 0, 9, true).formatTo(EMPTY_DTA, buf);
+        Assertions.assertThrows(DateTimeException.class, () -> getFormatter(NANO_OF_SECOND, 0, 9, true).formatTo(EMPTY_DTA, buf));
     }
 
-    @DataProvider(name="OOB_Nanos")
     Object[][] provider_oob_nanos() {
         return new Object[][]{
             {-1},
@@ -108,12 +112,12 @@ public class TestFractionPrinterParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="OOB_Nanos", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("provider_oob_nanos")
     public void test_print_oob_nanos(long value) throws Exception {
-        getFormatter(NANO_OF_SECOND, 0, 9, true).formatTo(new MockFieldValue(NANO_OF_SECOND, value), buf);
+        Assertions.assertThrows(DateTimeException.class, () -> getFormatter(NANO_OF_SECOND, 0, 9, true).formatTo(new MockFieldValue(NANO_OF_SECOND, value), buf));
     }
 
-    @DataProvider(name="OOB_Micros")
     Object[][] provider_oob_micros() {
         return new Object[][]{
                 {-1},
@@ -126,25 +130,27 @@ public class TestFractionPrinterParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="OOB_Micros", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("provider_oob_micros")
     public void test_print_oob_micros(long value) throws Exception {
-        getFormatter(MICRO_OF_SECOND, 0, 9, true).formatTo(new MockFieldValue(MICRO_OF_SECOND, value), buf);
+        Assertions.assertThrows(DateTimeException.class, () -> getFormatter(MICRO_OF_SECOND, 0, 9, true).formatTo(new MockFieldValue(MICRO_OF_SECOND, value), buf));
     }
 
+    @Test
     public void test_print_append() throws Exception {
         buf.append("EXISTING");
         getFormatter(NANO_OF_SECOND, 0, 9, true).formatTo(LocalTime.of(12, 30, 40, 3), buf);
-        assertEquals(buf.toString(), "EXISTING.000000003");
+        assertEquals("EXISTING.000000003", buf.toString());
     }
 
+    @Test
     public void test_print_append_micros() throws Exception {
         buf.append("EXISTING");
         getFormatter(MICRO_OF_SECOND, 0, 6, true).formatTo(LocalTime.of(12, 30, 40, 3000), buf);
-        assertEquals(buf.toString(), "EXISTING.000003");
+        assertEquals("EXISTING.000003", buf.toString());
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="Nanos")
     Object[][] provider_nanos() {
         return new Object[][] {
             {0, 9, 0,           ""},
@@ -266,26 +272,27 @@ public class TestFractionPrinterParser extends AbstractTestPrinterParser {
        };
     }
 
-    @Test(dataProvider="Nanos")
+    @ParameterizedTest
+    @MethodSource("provider_nanos")
     public void test_print_nanos(int minWidth, int maxWidth, int value, String result) throws Exception {
         getFormatter(NANO_OF_SECOND,  minWidth, maxWidth, true).formatTo(new MockFieldValue(NANO_OF_SECOND, value), buf);
         if (result == null) {
             fail("Expected exception");
         }
-        assertEquals(buf.toString(), result);
+        assertEquals(result, buf.toString());
     }
 
-    @Test(dataProvider="Nanos")
+    @ParameterizedTest
+    @MethodSource("provider_nanos")
     public void test_print_nanos_noDecimalPoint(int minWidth, int maxWidth, int value, String result) throws Exception {
         getFormatter(NANO_OF_SECOND,  minWidth, maxWidth, false).formatTo(new MockFieldValue(NANO_OF_SECOND, value), buf);
         if (result == null) {
             fail("Expected exception");
         }
-        assertEquals(buf.toString(), (result.startsWith(".") ? result.substring(1) : result));
+        assertEquals((result.startsWith(".") ? result.substring(1) : result), buf.toString());
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="Micros")
     Object[][] provider_micros() {
         return new Object[][] {
                 {0, 6, 0,           ""},
@@ -342,26 +349,27 @@ public class TestFractionPrinterParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="Micros")
+    @ParameterizedTest
+    @MethodSource("provider_micros")
     public void test_print_micros(int minWidth, int maxWidth, int value, String result) throws Exception {
         getFormatter(MICRO_OF_SECOND,  minWidth, maxWidth, true).formatTo(new MockFieldValue(MICRO_OF_SECOND, value), buf);
         if (result == null) {
             fail("Expected exception");
         }
-        assertEquals(buf.toString(), result);
+        assertEquals(result, buf.toString());
     }
 
-    @Test(dataProvider="Micros")
+    @ParameterizedTest
+    @MethodSource("provider_micros")
     public void test_print_micros_noDecimalPoint(int minWidth, int maxWidth, int value, String result) throws Exception {
         getFormatter(MICRO_OF_SECOND,  minWidth, maxWidth, false).formatTo(new MockFieldValue(MICRO_OF_SECOND, value), buf);
         if (result == null) {
             fail("Expected exception");
         }
-        assertEquals(buf.toString(), (result.startsWith(".") ? result.substring(1) : result));
+        assertEquals((result.startsWith(".") ? result.substring(1) : result), buf.toString());
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="Seconds")
     Object[][] provider_seconds() {
         return new Object[][] {
             {0, 9, 0,  ""},
@@ -384,51 +392,56 @@ public class TestFractionPrinterParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="Seconds")
+    @ParameterizedTest
+    @MethodSource("provider_seconds")
     public void test_print_seconds(int minWidth, int maxWidth, int value, String result) throws Exception {
         getFormatter(SECOND_OF_MINUTE, minWidth, maxWidth, true).formatTo(new MockFieldValue(SECOND_OF_MINUTE, value), buf);
         if (result == null) {
             fail("Expected exception");
         }
-        assertEquals(buf.toString(), result);
+        assertEquals(result, buf.toString());
     }
 
-    @Test(dataProvider="Seconds")
+    @ParameterizedTest
+    @MethodSource("provider_seconds")
     public void test_print_seconds_noDecimalPoint(int minWidth, int maxWidth, int value, String result) throws Exception {
         getFormatter(SECOND_OF_MINUTE, minWidth, maxWidth, false).formatTo(new MockFieldValue(SECOND_OF_MINUTE, value), buf);
         if (result == null) {
             fail("Expected exception");
         }
-        assertEquals(buf.toString(), (result.startsWith(".") ? result.substring(1) : result));
+        assertEquals((result.startsWith(".") ? result.substring(1) : result), buf.toString());
     }
 
     //-----------------------------------------------------------------------
     // parse
     //-----------------------------------------------------------------------
-    @Test(dataProvider="Nanos")
+    @ParameterizedTest
+    @MethodSource("provider_nanos")
     public void test_reverseParse(int minWidth, int maxWidth, int value, String result) throws Exception {
         ParsePosition pos = new ParsePosition(0);
         int expectedValue = fixParsedValue(maxWidth, value);
         TemporalAccessor parsed = getFormatter(NANO_OF_SECOND, minWidth, maxWidth, true).parseUnresolved(result, pos);
-        assertEquals(pos.getIndex(), result.length());
+        assertEquals(result.length(), pos.getIndex());
         assertParsed(parsed, NANO_OF_SECOND, value == 0 && minWidth == 0 ? null : (long) expectedValue);
     }
 
-    @Test(dataProvider="Nanos")
+    @ParameterizedTest
+    @MethodSource("provider_nanos")
     public void test_reverseParse_noDecimalPoint(int minWidth, int maxWidth, int value, String result) throws Exception {
         ParsePosition pos = new ParsePosition((result.startsWith(".") ? 1 : 0));
         TemporalAccessor parsed = getFormatter(NANO_OF_SECOND, minWidth, maxWidth, false).parseUnresolved(result, pos);
-        assertEquals(pos.getIndex(), result.length());
+        assertEquals(result.length(), pos.getIndex());
         int expectedValue = fixParsedValue(maxWidth, value);
         assertParsed(parsed, NANO_OF_SECOND, value == 0 && minWidth == 0 ? null : (long) expectedValue);
     }
 
-    @Test(dataProvider="Nanos")
+    @ParameterizedTest
+    @MethodSource("provider_nanos")
     public void test_reverseParse_followedByNonDigit(int minWidth, int maxWidth, int value, String result) throws Exception {
         ParsePosition pos = new ParsePosition(0);
         int expectedValue = fixParsedValue(maxWidth, value);
         TemporalAccessor parsed = getFormatter(NANO_OF_SECOND, minWidth, maxWidth, true).parseUnresolved(result + " ", pos);
-        assertEquals(pos.getIndex(), result.length());
+        assertEquals(result.length(), pos.getIndex());
         assertParsed(parsed, NANO_OF_SECOND, value == 0 && minWidth == 0 ? null : (long) expectedValue);
     }
 
@@ -441,12 +454,13 @@ public class TestFractionPrinterParser extends AbstractTestPrinterParser {
 //        assertParsed(parseContext, NANO_OF_SECOND, value == 0 && minWidth == 0 ? null : (long) expectedValue);
 //    }
 
-    @Test(dataProvider="Nanos")
+    @ParameterizedTest
+    @MethodSource("provider_nanos")
     public void test_reverseParse_preceededByNonDigit(int minWidth, int maxWidth, int value, String result) throws Exception {
         ParsePosition pos = new ParsePosition(1);
         int expectedValue = fixParsedValue(maxWidth, value);
         TemporalAccessor parsed = getFormatter(NANO_OF_SECOND, minWidth, maxWidth, true).parseUnresolved(" " + result, pos);
-        assertEquals(pos.getIndex(), result.length() + 1);
+        assertEquals(result.length() + 1, pos.getIndex());
         assertParsed(parsed, NANO_OF_SECOND, value == 0 && minWidth == 0 ? null : (long) expectedValue);
     }
 
@@ -458,25 +472,25 @@ public class TestFractionPrinterParser extends AbstractTestPrinterParser {
         return value;
     }
 
-    @Test(dataProvider="Seconds")
+    @ParameterizedTest
+    @MethodSource("provider_seconds")
     public void test_reverseParse_seconds(int minWidth, int maxWidth, int value, String result) throws Exception {
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter(SECOND_OF_MINUTE, minWidth, maxWidth, true).parseUnresolved(result, pos);
-        assertEquals(pos.getIndex(), result.length());
+        assertEquals(result.length(), pos.getIndex());
         assertParsed(parsed, SECOND_OF_MINUTE, value == 0 && minWidth == 0 ? null : (long) value);
     }
 
     private void assertParsed(TemporalAccessor parsed, TemporalField field, Long value) {
         if (value == null) {
-            assertEquals(parsed.isSupported(field), false);
+            assertEquals(false, parsed.isSupported(field));
         } else {
-            assertEquals(parsed.isSupported(field), true);
-            assertEquals(parsed.getLong(field), (long) value);
+            assertEquals(true, parsed.isSupported(field));
+            assertEquals((long) value, parsed.getLong(field));
         }
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="ParseNothing")
     Object[][] provider_parseNothing() {
         return new Object[][] {
             {NANO_OF_SECOND, 3, 6, true, "", 0, 0},
@@ -489,15 +503,15 @@ public class TestFractionPrinterParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider = "ParseNothing")
+    @ParameterizedTest
+    @MethodSource("provider_parseNothing")
     public void test_parse_nothing(TemporalField field, int min, int max, boolean decimalPoint, String text, int pos, int expected) {
         ParsePosition ppos = new ParsePosition(pos);
         TemporalAccessor parsed = getFormatter(field, min, max, decimalPoint).parseUnresolved(text, ppos);
-        assertEquals(ppos.getErrorIndex(), expected);
-        assertEquals(parsed, null);
+        assertEquals(expected, ppos.getErrorIndex());
+        assertEquals(null, parsed);
     }
 
-    @DataProvider(name="ParseMinWidth")
     Object[][] provider_parseMinWidth() {
         return new Object[][] {
             {MILLI_OF_SECOND, 3, 3, true, ".1x"},
@@ -506,22 +520,26 @@ public class TestFractionPrinterParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="ParseMinWidth", expectedExceptions=DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("provider_parseMinWidth")
     public void test_parse_minWidth(TemporalField field, int min, int max, boolean decimalPoint, String text) throws Exception {
-        builder
-            .appendFraction(field, min, max, decimalPoint)
-            .appendLiteral("x")
-            .toFormatter(locale)
-            .parse(text);
+        Assertions
+            .assertThrows(DateTimeException.class, () -> builder
+                    .appendFraction(field, min, max, decimalPoint)
+                    .appendLiteral("x")
+                    .toFormatter(locale)
+                    .parse(text));
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_toString() throws Exception {
-        assertEquals(getFormatter(NANO_OF_SECOND, 3, 6, true).toString(), "Fraction(NanoOfSecond,3,6,DecimalPoint)");
+        assertEquals("Fraction(NanoOfSecond,3,6,DecimalPoint)", getFormatter(NANO_OF_SECOND, 3, 6, true).toString());
     }
 
+    @Test
     public void test_toString_noDecimalPoint() throws Exception {
-        assertEquals(getFormatter(NANO_OF_SECOND, 3, 6, false).toString(), "Fraction(NanoOfSecond,3,6)");
+        assertEquals("Fraction(NanoOfSecond,3,6)", getFormatter(NANO_OF_SECOND, 3, 6, false).toString());
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestLocalizedOffsetPrinterParser.java b/test/jdk/java/time/test/java/time/format/TestLocalizedOffsetPrinterParser.java
index d1b1c25ba98..36b491178a7 100644
--- a/test/jdk/java/time/test/java/time/format/TestLocalizedOffsetPrinterParser.java
+++ b/test/jdk/java/time/test/java/time/format/TestLocalizedOffsetPrinterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@
 
 package test.java.time.format;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
@@ -47,20 +47,20 @@ import java.time.format.TextStyle;
 import java.util.Locale;
 import java.util.Objects;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test DateTimeFormatterBuilder.appendOffset().
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestLocalizedOffsetPrinterParser {
 
     private static final LocalDateTime DT_2012_06_30_12_30_40 = LocalDateTime.of(2012, 6, 30, 12, 30, 40);
 
     private static final Locale LOCALE_GA = Locale.of("ga");
 
-    @DataProvider(name="print_localized_custom_locale")
     Object[][] data_print_localized_custom_locale() {
         return new Object[][] {
                 {TextStyle.FULL, DT_2012_06_30_12_30_40, ZoneOffset.UTC, LOCALE_GA, "MAG"},
@@ -69,7 +69,8 @@ public class TestLocalizedOffsetPrinterParser {
         };
     }
 
-    @Test(dataProvider="print_localized_custom_locale")
+    @ParameterizedTest
+    @MethodSource("data_print_localized_custom_locale")
     public void test_print_localized_custom_locale(TextStyle style, LocalDateTime ldt, ZoneOffset offset, Locale locale, String expected) {
 
         Objects.requireNonNull(locale, "Locale must not be null");
@@ -78,27 +79,27 @@ public class TestLocalizedOffsetPrinterParser {
         ZonedDateTime zdt = ldt.atZone(offset);
 
         DateTimeFormatter f = new DateTimeFormatterBuilder().appendLocalizedOffset(style).toFormatter(locale);
-        assertEquals(f.format(odt), expected);
-        assertEquals(f.format(zdt), expected);
-        assertEquals(f.parse(expected, ZoneOffset::from), offset);
+        assertEquals(expected, f.format(odt));
+        assertEquals(expected, f.format(zdt));
+        assertEquals(offset, f.parse(expected, ZoneOffset::from));
 
         if (style == TextStyle.FULL) {
             f = new DateTimeFormatterBuilder().appendPattern("ZZZZ").toFormatter(locale);
-            assertEquals(f.format(odt), expected);
-            assertEquals(f.format(zdt), expected);
-            assertEquals(f.parse(expected, ZoneOffset::from), offset);
+            assertEquals(expected, f.format(odt));
+            assertEquals(expected, f.format(zdt));
+            assertEquals(offset, f.parse(expected, ZoneOffset::from));
 
             f = new DateTimeFormatterBuilder().appendPattern("OOOO").toFormatter(locale);
-            assertEquals(f.format(odt), expected);
-            assertEquals(f.format(zdt), expected);
-            assertEquals(f.parse(expected, ZoneOffset::from), offset);
+            assertEquals(expected, f.format(odt));
+            assertEquals(expected, f.format(zdt));
+            assertEquals(offset, f.parse(expected, ZoneOffset::from));
         }
 
         if (style == TextStyle.SHORT) {
             f = new DateTimeFormatterBuilder().appendPattern("O").toFormatter(locale);
-            assertEquals(f.format(odt), expected);
-            assertEquals(f.format(zdt), expected);
-            assertEquals(f.parse(expected, ZoneOffset::from), offset);
+            assertEquals(expected, f.format(odt));
+            assertEquals(expected, f.format(zdt));
+            assertEquals(offset, f.parse(expected, ZoneOffset::from));
         }
 
     }
diff --git a/test/jdk/java/time/test/java/time/format/TestLocalizedPattern.java b/test/jdk/java/time/test/java/time/format/TestLocalizedPattern.java
index aa8ff763aad..1be115bc0ed 100644
--- a/test/jdk/java/time/test/java/time/format/TestLocalizedPattern.java
+++ b/test/jdk/java/time/test/java/time/format/TestLocalizedPattern.java
@@ -22,7 +22,7 @@
  */
 package test.java.time.format;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.DateTimeException;
 import java.time.ZonedDateTime;
@@ -34,14 +34,16 @@ import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test DateTimeFormatter.ofLocalizedPattern() related methods.
  * @bug 8176706 8284840 8354548
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestLocalizedPattern {
 
     private static final ZonedDateTime ZDT =
@@ -52,7 +54,6 @@ public class TestLocalizedPattern {
             Locale.forLanguageTag("ja-JP-u-ca-japanese")
     );
 
-    @DataProvider(name = "validSkeletons")
     Object[][] data_validSkeletons() {
         return SAMPLE_LOCALES.stream()
                 .flatMap(l -> {
@@ -63,43 +64,46 @@ public class TestLocalizedPattern {
                 .toArray(new Object[0][0]);
     }
 
-    @DataProvider(name = "invalidSkeletons")
     Object[][] data_invalidSkeletons() {
         return new Object[][] {
             {"afo"}, {"hB"}, {"uMMM"}, {"MMMMMM"}, {"BhmsyMMM"},
         };
     }
 
-    @DataProvider(name = "unavailableSkeletons")
     Object[][] data_unavailableSkeletons() {
         return new Object[][] {
             {"yyyyyy"}, {"BBh"}, {"yMMMMEdBBh"},
         };
     }
 
-    @Test(dataProvider = "validSkeletons")
+    @ParameterizedTest
+    @MethodSource("data_validSkeletons")
     public void test_ofLocalizedPattern(String skeleton, String expected, Locale l) {
         var dtf = DateTimeFormatter.ofLocalizedPattern(skeleton).localizedBy(l);
-        assertEquals(dtf.format(ZDT), expected);
+        assertEquals(expected, dtf.format(ZDT));
     }
 
-    @Test(dataProvider = "invalidSkeletons", expectedExceptions = IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("data_invalidSkeletons")
     public void test_ofLocalizedPattern_invalid(String skeleton) {
-        DateTimeFormatter.ofLocalizedPattern(skeleton);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> DateTimeFormatter.ofLocalizedPattern(skeleton));
     }
 
-    @Test(dataProvider = "invalidSkeletons", expectedExceptions = IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("data_invalidSkeletons")
     public void test_appendLocalized_invalid(String skeleton) {
-        new DateTimeFormatterBuilder().appendLocalized(skeleton);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> new DateTimeFormatterBuilder().appendLocalized(skeleton));
     }
 
-    @Test(dataProvider = "unavailableSkeletons", expectedExceptions = DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_unavailableSkeletons")
     public void test_ofLocalizedPattern_unavailable(String skeleton) {
-        DateTimeFormatter.ofLocalizedPattern(skeleton).format(ZDT);
+        Assertions.assertThrows(DateTimeException.class, () -> DateTimeFormatter.ofLocalizedPattern(skeleton).format(ZDT));
     }
 
-    @Test(dataProvider = "unavailableSkeletons", expectedExceptions = DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_unavailableSkeletons")
     public void test_getLocalizedDateTimePattern_unavailable(String skeleton) {
-        DateTimeFormatterBuilder.getLocalizedDateTimePattern(skeleton, IsoChronology.INSTANCE, Locale.US);
+        Assertions.assertThrows(DateTimeException.class, () -> DateTimeFormatterBuilder.getLocalizedDateTimePattern(skeleton, IsoChronology.INSTANCE, Locale.US));
     }
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestNarrowMonthNamesAndDayNames.java b/test/jdk/java/time/test/java/time/format/TestNarrowMonthNamesAndDayNames.java
index 3e105665d14..92b7d1366b6 100644
--- a/test/jdk/java/time/test/java/time/format/TestNarrowMonthNamesAndDayNames.java
+++ b/test/jdk/java/time/test/java/time/format/TestNarrowMonthNamesAndDayNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  */
 package test.java.time.format;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.DayOfWeek;
 import java.time.Month;
@@ -37,9 +37,11 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestNarrowMonthNamesAndDayNames {
 
     static {
@@ -59,7 +61,6 @@ public class TestNarrowMonthNamesAndDayNames {
      * Locale en_US, de_DE, fr_FR, no_NO will have same Narrow and
      * Narrow_Standalone month Names for COMPAT Provider.
      */
-    @DataProvider(name = "MonthNarrows")
     public Object[][] monthNameData() {
         return new Object[][]{{new String[]{
             "J",
@@ -80,27 +81,23 @@ public class TestNarrowMonthNamesAndDayNames {
     //-----------------------------------------------------------------------
     // Check Narrow and Narrow_standalone month name values
     //-----------------------------------------------------------------------
-    @Test(dataProvider = "MonthNarrows")
+    @ParameterizedTest
+    @MethodSource("monthNameData")
     public void compareMonthNarrowValues(String[] monthNarrowExpected) {
-        LOCARR.forEach((loc) -> {
-            TEXTSTYLELIST.forEach((style) -> {
-                MONTHVALUES.forEach((value) -> {
-                    String result = value.getDisplayName(style, loc);
-                    int index = value.ordinal();
-                    assertEquals(result, monthNarrowExpected[index], "Test failed"
-                            + " for COMPAT Provider for locale "
-                            + loc + " for style " + style.name()
-                            + " with Month value " + value.name());
-                });
-            });
-        });
+        LOCARR.forEach((loc) -> TEXTSTYLELIST.forEach((style) -> MONTHVALUES.forEach((value) -> {
+            String result = value.getDisplayName(style, loc);
+            int index = value.ordinal();
+            assertEquals(monthNarrowExpected[index], result, "Test failed"
+                    + " for COMPAT Provider for locale "
+                    + loc + " for style " + style.name()
+                    + " with Month value " + value.name());
+        })));
     }
 
     /**
      * Locale en_US, de_DE, fr_FR, no_NO will have different Narrow and
      * Narrow_Standalone Day Names for COMPAT Provider.
      */
-    @DataProvider(name = "DayNarrows")
     public Object[][] dayNameData() {
         return new Object[][]{
             {Locale.US, new String[]{"M", "T", "W", "T", "F", "S", "S"}},
@@ -112,17 +109,16 @@ public class TestNarrowMonthNamesAndDayNames {
     //-----------------------------------------------------------------------
     // Check Narrow and Narrow_standalone Day name values
     //-----------------------------------------------------------------------
-    @Test(dataProvider = "DayNarrows")
+    @ParameterizedTest
+    @MethodSource("dayNameData")
     public void compareDayNarrowValues(Locale locale, String[] dayNarrowExpected) {
-        TEXTSTYLELIST.forEach((style) -> {
-            DAYVALUES.forEach((value) -> {
-                String result = value.getDisplayName(style, locale);
-                int index = value.ordinal();
-                assertEquals(result, dayNarrowExpected[index], "Test failed"
-                        + " for COMPAT Provider for locale "
-                        + locale + " for style " + style.name()
-                        + " with Day value " + value.name());
-            });
-        });
+        TEXTSTYLELIST.forEach((style) -> DAYVALUES.forEach((value) -> {
+            String result = value.getDisplayName(style, locale);
+            int index = value.ordinal();
+            assertEquals(dayNarrowExpected[index], result, "Test failed"
+                    + " for COMPAT Provider for locale "
+                    + locale + " for style " + style.name()
+                    + " with Day value " + value.name());
+        }));
     }
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestNonIsoFormatter.java b/test/jdk/java/time/test/java/time/format/TestNonIsoFormatter.java
index edca2ae8ceb..cb824e1ea7f 100644
--- a/test/jdk/java/time/test/java/time/format/TestNonIsoFormatter.java
+++ b/test/jdk/java/time/test/java/time/format/TestNonIsoFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
 
 package test.java.time.format;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.LocalDate;
 import java.time.chrono.ChronoLocalDate;
@@ -51,9 +51,11 @@ import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalQueries;
 import java.util.Locale;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test DateTimeFormatter with non-ISO chronology.
@@ -61,7 +63,7 @@ import org.testng.annotations.Test;
  * Strings in test data are all dependent on CLDR data which may change
  * in future CLDR releases.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestNonIsoFormatter {
     private static final Chronology ISO8601 = IsoChronology.INSTANCE;
     private static final Chronology JAPANESE = JapaneseChronology.INSTANCE;
@@ -76,11 +78,10 @@ public class TestNonIsoFormatter {
     private static final Locale thTHTH = Locale.forLanguageTag("th-TH-u-nu-thai");
     private static final Locale jaJPJP = Locale.forLanguageTag("ja-JP-u-ca-japanese");
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() {
     }
 
-    @DataProvider(name="format_data")
     Object[][] formatData() {
         return new Object[][] {
             // Chronology, Format Locale, Numbering Locale, ChronoLocalDate, expected string
@@ -102,7 +103,6 @@ public class TestNonIsoFormatter {
         };
     }
 
-    @DataProvider(name="invalid_text")
     Object[][] invalidText() {
         return new Object[][] {
             // TODO: currently fixed Chronology and Locale.
@@ -113,7 +113,6 @@ public class TestNonIsoFormatter {
         };
     }
 
-    @DataProvider(name="chrono_names")
     Object[][] chronoNamesData() {
         return new Object[][] {
             // Chronology, Locale, Chronology Name
@@ -137,7 +136,6 @@ public class TestNonIsoFormatter {
         };
     }
 
-    @DataProvider(name="lenient_eraYear")
     Object[][] lenientEraYear() {
         return new Object[][] {
             // Chronology, lenient era/year, strict era/year
@@ -147,17 +145,19 @@ public class TestNonIsoFormatter {
         };
     }
 
-    @Test(dataProvider="format_data")
+    @ParameterizedTest
+    @MethodSource("formatData")
     public void test_formatLocalizedDate(Chronology chrono, Locale formatLocale, Locale numberingLocale,
                                          ChronoLocalDate date, String expected) {
         DateTimeFormatter dtf = DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL)
             .withChronology(chrono).withLocale(formatLocale)
             .withDecimalStyle(DecimalStyle.of(numberingLocale));
         String text = dtf.format(date);
-        assertEquals(text, expected);
+        assertEquals(expected, text);
     }
 
-    @Test(dataProvider="format_data")
+    @ParameterizedTest
+    @MethodSource("formatData")
     public void test_parseLocalizedText(Chronology chrono, Locale formatLocale, Locale numberingLocale,
                                         ChronoLocalDate expected, String text) {
         DateTimeFormatter dtf = DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL)
@@ -165,28 +165,33 @@ public class TestNonIsoFormatter {
             .withDecimalStyle(DecimalStyle.of(numberingLocale));
         TemporalAccessor temporal = dtf.parse(text);
         ChronoLocalDate date = chrono.date(temporal);
-        assertEquals(date, expected);
+        assertEquals(expected, date);
     }
 
-    @Test(dataProvider="invalid_text", expectedExceptions=DateTimeParseException.class)
+    @ParameterizedTest
+    @MethodSource("invalidText")
     public void test_parseInvalidText(String text) {
-        DateTimeFormatter dtf = DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL)
-            .withChronology(JAPANESE).withLocale(Locale.JAPANESE);
-        dtf.parse(text);
+        Assertions.assertThrows(DateTimeParseException.class, () -> {
+            DateTimeFormatter dtf = DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL)
+                    .withChronology(JAPANESE).withLocale(Locale.JAPANESE);
+            dtf.parse(text);
+        });
     }
 
-    @Test(dataProvider="chrono_names")
+    @ParameterizedTest
+    @MethodSource("chronoNamesData")
     public void test_chronoNames(Chronology chrono, Locale locale, String expected) {
         DateTimeFormatter dtf = new DateTimeFormatterBuilder().appendChronologyText(TextStyle.SHORT)
             .toFormatter(locale);
         String text = dtf.format(chrono.dateNow());
-        assertEquals(text, expected);
+        assertEquals(expected, text);
         TemporalAccessor ta = dtf.parse(text);
         Chronology cal = ta.query(TemporalQueries.chronology());
-        assertEquals(cal, chrono);
+        assertEquals(chrono, cal);
     }
 
-    @Test(dataProvider="lenient_eraYear")
+    @ParameterizedTest
+    @MethodSource("lenientEraYear")
     public void test_lenientEraYear(Chronology chrono, String lenient, String strict) {
         String mdStr = "-01-01";
         DateTimeFormatter dtf = new DateTimeFormatterBuilder()
@@ -194,6 +199,6 @@ public class TestNonIsoFormatter {
             .toFormatter(Locale.ROOT)
             .withChronology(chrono);
         DateTimeFormatter dtfLenient = dtf.withResolverStyle(ResolverStyle.LENIENT);
-        assertEquals(LocalDate.parse(lenient+mdStr, dtfLenient), LocalDate.parse(strict+mdStr, dtf));
+        assertEquals(LocalDate.parse(strict+mdStr, dtf), LocalDate.parse(lenient+mdStr, dtfLenient));
     }
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestNumberParser.java b/test/jdk/java/time/test/java/time/format/TestNumberParser.java
index f3ac13b791d..ea92dfcaea5 100644
--- a/test/jdk/java/time/test/java/time/format/TestNumberParser.java
+++ b/test/jdk/java/time/test/java/time/format/TestNumberParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,9 +63,10 @@ import static java.time.temporal.ChronoField.DAY_OF_MONTH;
 import static java.time.temporal.ChronoField.DAY_OF_WEEK;
 import static java.time.temporal.ChronoField.DAY_OF_YEAR;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.text.ParsePosition;
 import java.time.format.DateTimeFormatter;
@@ -74,17 +75,17 @@ import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalField;
 import java.time.temporal.TemporalQueries;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test NumberPrinterParser.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestNumberParser extends AbstractTestPrinterParser {
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="error")
     Object[][] data_error() {
         return new Object[][] {
             {DAY_OF_MONTH, 1, 2, SignStyle.NEVER, "12", -1, IndexOutOfBoundsException.class},
@@ -92,7 +93,8 @@ public class TestNumberParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="error")
+    @ParameterizedTest
+    @MethodSource("data_error")
     public void test_parse_error(TemporalField field, int min, int max, SignStyle style, String text, int pos, Class<?> expected) {
         try {
             getFormatter(field, min, max, style).parseUnresolved(text, new ParsePosition(pos));
@@ -103,7 +105,6 @@ public class TestNumberParser extends AbstractTestPrinterParser {
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseData")
     Object[][] provider_parseData() {
         return new Object[][] {
             // normal
@@ -163,7 +164,8 @@ public class TestNumberParser extends AbstractTestPrinterParser {
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="parseData")
+    @ParameterizedTest
+    @MethodSource("provider_parseData")
     public void test_parse_fresh(int minWidth, int maxWidth, SignStyle signStyle, int subsequentWidth, String text, int pos, int expectedPos, long expectedValue) {
         ParsePosition ppos = new ParsePosition(pos);
         DateTimeFormatter dtf = getFormatter(DAY_OF_MONTH, minWidth, maxWidth, signStyle);
@@ -173,17 +175,18 @@ public class TestNumberParser extends AbstractTestPrinterParser {
         }
         TemporalAccessor parsed = dtf.parseUnresolved(text, ppos);
         if (ppos.getErrorIndex() != -1) {
-            assertEquals(ppos.getErrorIndex(), expectedPos);
+            assertEquals(expectedPos, ppos.getErrorIndex());
         } else {
             assertTrue(subsequentWidth >= 0);
-            assertEquals(ppos.getIndex(), expectedPos + subsequentWidth);
-            assertEquals(parsed.getLong(DAY_OF_MONTH), expectedValue);
-            assertEquals(parsed.query(TemporalQueries.chronology()), null);
-            assertEquals(parsed.query(TemporalQueries.zoneId()), null);
+            assertEquals(expectedPos + subsequentWidth, ppos.getIndex());
+            assertEquals(expectedValue, parsed.getLong(DAY_OF_MONTH));
+            assertEquals(null, parsed.query(TemporalQueries.chronology()));
+            assertEquals(null, parsed.query(TemporalQueries.zoneId()));
         }
     }
 
-    @Test(dataProvider="parseData")
+    @ParameterizedTest
+    @MethodSource("provider_parseData")
     public void test_parse_textField(int minWidth, int maxWidth, SignStyle signStyle, int subsequentWidth, String text, int pos, int expectedPos, long expectedValue) {
         ParsePosition ppos = new ParsePosition(pos);
         DateTimeFormatter dtf = getFormatter(DAY_OF_WEEK, minWidth, maxWidth, signStyle);
@@ -193,18 +196,17 @@ public class TestNumberParser extends AbstractTestPrinterParser {
         }
         TemporalAccessor parsed = dtf.parseUnresolved(text, ppos);
         if (ppos.getErrorIndex() != -1) {
-            assertEquals(ppos.getErrorIndex(), expectedPos);
+            assertEquals(expectedPos, ppos.getErrorIndex());
         } else {
             assertTrue(subsequentWidth >= 0);
-            assertEquals(ppos.getIndex(), expectedPos + subsequentWidth);
-            assertEquals(parsed.getLong(DAY_OF_WEEK), expectedValue);
-            assertEquals(parsed.query(TemporalQueries.chronology()), null);
-            assertEquals(parsed.query(TemporalQueries.zoneId()), null);
+            assertEquals(expectedPos + subsequentWidth, ppos.getIndex());
+            assertEquals(expectedValue, parsed.getLong(DAY_OF_WEEK));
+            assertEquals(null, parsed.query(TemporalQueries.chronology()));
+            assertEquals(null, parsed.query(TemporalQueries.zoneId()));
         }
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseSignsStrict")
     Object[][] provider_parseSignsStrict() {
         return new Object[][] {
             // basics
@@ -304,22 +306,22 @@ public class TestNumberParser extends AbstractTestPrinterParser {
        };
     }
 
-    @Test(dataProvider="parseSignsStrict")
+    @ParameterizedTest
+    @MethodSource("provider_parseSignsStrict")
     public void test_parseSignsStrict(String input, int min, int max, SignStyle style, int parseLen, Integer parseVal) throws Exception {
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter(DAY_OF_MONTH, min, max, style).parseUnresolved(input, pos);
         if (pos.getErrorIndex() != -1) {
-            assertEquals(pos.getErrorIndex(), parseLen);
+            assertEquals(parseLen, pos.getErrorIndex());
         } else {
-            assertEquals(pos.getIndex(), parseLen);
-            assertEquals(parsed.getLong(DAY_OF_MONTH), (long)parseVal);
-            assertEquals(parsed.query(TemporalQueries.chronology()), null);
-            assertEquals(parsed.query(TemporalQueries.zoneId()), null);
+            assertEquals(parseLen, pos.getIndex());
+            assertEquals((long)parseVal, parsed.getLong(DAY_OF_MONTH));
+            assertEquals(null, parsed.query(TemporalQueries.chronology()));
+            assertEquals(null, parsed.query(TemporalQueries.zoneId()));
         }
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseSignsLenient")
     Object[][] provider_parseSignsLenient() {
         return new Object[][] {
             // never
@@ -413,23 +415,23 @@ public class TestNumberParser extends AbstractTestPrinterParser {
        };
     }
 
-    @Test(dataProvider="parseSignsLenient")
+    @ParameterizedTest
+    @MethodSource("provider_parseSignsLenient")
     public void test_parseSignsLenient(String input, int min, int max, SignStyle style, int parseLen, Integer parseVal) throws Exception {
         setStrict(false);
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter(DAY_OF_MONTH, min, max, style).parseUnresolved(input, pos);
         if (pos.getErrorIndex() != -1) {
-            assertEquals(pos.getErrorIndex(), parseLen);
+            assertEquals(parseLen, pos.getErrorIndex());
         } else {
-            assertEquals(pos.getIndex(), parseLen);
-            assertEquals(parsed.getLong(DAY_OF_MONTH), (long)parseVal);
-            assertEquals(parsed.query(TemporalQueries.chronology()), null);
-            assertEquals(parsed.query(TemporalQueries.zoneId()), null);
+            assertEquals(parseLen, pos.getIndex());
+            assertEquals((long)parseVal, parsed.getLong(DAY_OF_MONTH));
+            assertEquals(null, parsed.query(TemporalQueries.chronology()));
+            assertEquals(null, parsed.query(TemporalQueries.zoneId()));
         }
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseDigitsLenient")
     Object[][] provider_parseDigitsLenient() {
         return new Object[][] {
                 // never
@@ -504,23 +506,23 @@ public class TestNumberParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="parseDigitsLenient")
+    @ParameterizedTest
+    @MethodSource("provider_parseDigitsLenient")
     public void test_parseDigitsLenient(String input, int min, int max, SignStyle style, int parseLen, Integer parseVal) throws Exception {
         setStrict(false);
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter(DAY_OF_MONTH, min, max, style).parseUnresolved(input, pos);
         if (pos.getErrorIndex() != -1) {
-            assertEquals(pos.getErrorIndex(), parseLen);
+            assertEquals(parseLen, pos.getErrorIndex());
         } else {
-            assertEquals(pos.getIndex(), parseLen);
-            assertEquals(parsed.getLong(DAY_OF_MONTH), (long)parseVal);
-            assertEquals(parsed.query(TemporalQueries.chronology()), null);
-            assertEquals(parsed.query(TemporalQueries.zoneId()), null);
+            assertEquals(parseLen, pos.getIndex());
+            assertEquals((long)parseVal, parsed.getLong(DAY_OF_MONTH));
+            assertEquals(null, parsed.query(TemporalQueries.chronology()));
+            assertEquals(null, parsed.query(TemporalQueries.zoneId()));
         }
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseDigitsAdjacentLenient")
     Object[][] provider_parseDigitsAdjacentLenient() {
         return new Object[][] {
                 // never
@@ -538,7 +540,8 @@ public class TestNumberParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="parseDigitsAdjacentLenient")
+    @ParameterizedTest
+    @MethodSource("provider_parseDigitsAdjacentLenient")
     public void test_parseDigitsAdjacentLenient(String input, int parseLen, Integer parseMonth, Integer parsedDay) throws Exception {
         setStrict(false);
         ParsePosition pos = new ParsePosition(0);
@@ -547,13 +550,13 @@ public class TestNumberParser extends AbstractTestPrinterParser {
                 .appendValue(DAY_OF_MONTH, 2).toFormatter(locale).withDecimalStyle(decimalStyle);
         TemporalAccessor parsed = f.parseUnresolved(input, pos);
         if (pos.getErrorIndex() != -1) {
-            assertEquals(pos.getErrorIndex(), parseLen);
+            assertEquals(parseLen, pos.getErrorIndex());
         } else {
-            assertEquals(pos.getIndex(), parseLen);
-            assertEquals(parsed.getLong(MONTH_OF_YEAR), (long) parseMonth);
-            assertEquals(parsed.getLong(DAY_OF_MONTH), (long) parsedDay);
-            assertEquals(parsed.query(TemporalQueries.chronology()), null);
-            assertEquals(parsed.query(TemporalQueries.zoneId()), null);
+            assertEquals(parseLen, pos.getIndex());
+            assertEquals((long) parseMonth, parsed.getLong(MONTH_OF_YEAR));
+            assertEquals((long) parsedDay, parsed.getLong(DAY_OF_MONTH));
+            assertEquals(null, parsed.query(TemporalQueries.chronology()));
+            assertEquals(null, parsed.query(TemporalQueries.zoneId()));
         }
     }
 
diff --git a/test/jdk/java/time/test/java/time/format/TestNumberPrinter.java b/test/jdk/java/time/test/java/time/format/TestNumberPrinter.java
index dedcc37e2ce..59038df910f 100644
--- a/test/jdk/java/time/test/java/time/format/TestNumberPrinter.java
+++ b/test/jdk/java/time/test/java/time/format/TestNumberPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,37 +61,42 @@ package test.java.time.format;
 
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
 import static java.time.temporal.ChronoField.HOUR_OF_DAY;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.DateTimeException;
 import java.time.LocalDate;
 import java.time.format.SignStyle;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import test.java.time.temporal.MockFieldValue;
 
 /**
  * Test SimpleNumberPrinterParser.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestNumberPrinter extends AbstractTestPrinterParser {
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_print_emptyCalendrical() throws Exception {
-        getFormatter(DAY_OF_MONTH, 1, 2, SignStyle.NEVER).formatTo(EMPTY_DTA, buf);
+        Assertions.assertThrows(DateTimeException.class, () -> getFormatter(DAY_OF_MONTH, 1, 2, SignStyle.NEVER).formatTo(EMPTY_DTA, buf));
     }
 
+    @Test
     public void test_print_append() throws Exception {
         buf.append("EXISTING");
         getFormatter(DAY_OF_MONTH, 1, 2, SignStyle.NEVER).formatTo(LocalDate.of(2012, 1, 3), buf);
-        assertEquals(buf.toString(), "EXISTING3");
+        assertEquals("EXISTING3", buf.toString());
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="Pad")
     Object[][] provider_pad() {
         return new Object[][] {
             {1, 1, -10, null},
@@ -181,72 +186,77 @@ public class TestNumberPrinter extends AbstractTestPrinterParser {
        };
     }
 
-    @Test(dataProvider="Pad")
+    @ParameterizedTest
+    @MethodSource("provider_pad")
     public void test_pad_NOT_NEGATIVE(int minPad, int maxPad, long value, String result) throws Exception {
         try {
             getFormatter(DAY_OF_MONTH, minPad, maxPad, SignStyle.NOT_NEGATIVE).formatTo(new MockFieldValue(DAY_OF_MONTH, value), buf);
             if (result == null || value < 0) {
                 fail("Expected exception");
             }
-            assertEquals(buf.toString(), result);
+            assertEquals(result, buf.toString());
         } catch (DateTimeException ex) {
             if (result == null || value < 0) {
-                assertEquals(ex.getMessage().contains(DAY_OF_MONTH.toString()), true);
+                assertEquals(true, ex.getMessage().contains(DAY_OF_MONTH.toString()));
             } else {
                 throw ex;
             }
         }
     }
 
-    @Test(dataProvider="Pad")
+    @ParameterizedTest
+    @MethodSource("provider_pad")
     public void test_pad_NEVER(int minPad, int maxPad, long value, String result) throws Exception {
         try {
             getFormatter(DAY_OF_MONTH, minPad, maxPad, SignStyle.NEVER).formatTo(new MockFieldValue(DAY_OF_MONTH, value), buf);
             if (result == null) {
                 fail("Expected exception");
             }
-            assertEquals(buf.toString(), result);
+            assertEquals(result, buf.toString());
         } catch (DateTimeException ex) {
             if (result != null) {
                 throw ex;
             }
-            assertEquals(ex.getMessage().contains(DAY_OF_MONTH.toString()), true);
+            assertEquals(true, ex.getMessage().contains(DAY_OF_MONTH.toString()));
         }
     }
 
-    @Test(dataProvider="Pad")
+    @ParameterizedTest
+    @MethodSource("provider_pad")
     public void test_pad_NORMAL(int minPad, int maxPad, long value, String result) throws Exception {
         try {
             getFormatter(DAY_OF_MONTH, minPad, maxPad, SignStyle.NORMAL).formatTo(new MockFieldValue(DAY_OF_MONTH, value), buf);
             if (result == null) {
                 fail("Expected exception");
             }
-            assertEquals(buf.toString(), (value < 0 ? "-" + result : result));
+            assertEquals((value < 0 ? "-" + result : result), buf.toString());
         } catch (DateTimeException ex) {
             if (result != null) {
                 throw ex;
             }
-            assertEquals(ex.getMessage().contains(DAY_OF_MONTH.toString()), true);
+            assertEquals(true, ex.getMessage().contains(DAY_OF_MONTH.toString()));
         }
     }
 
-    @Test(dataProvider="Pad")
+    @ParameterizedTest
+    @MethodSource("provider_pad")
     public void test_pad_ALWAYS(int minPad, int maxPad, long value, String result) throws Exception {
         try {
             getFormatter(DAY_OF_MONTH, minPad, maxPad, SignStyle.ALWAYS).formatTo(new MockFieldValue(DAY_OF_MONTH, value), buf);
             if (result == null) {
                 fail("Expected exception");
             }
-            assertEquals(buf.toString(), (value < 0 ? "-" + result : "+" + result));
+            assertEquals((value < 0 ? "-" + result : "+" + result), buf.toString());
         } catch (DateTimeException ex) {
             if (result != null) {
                 throw ex;
             }
-            assertEquals(ex.getMessage().contains(DAY_OF_MONTH.toString()), true);
+            assertEquals(true, ex.getMessage().contains(DAY_OF_MONTH.toString()));
         }
     }
 
-    @Test(dataProvider="Pad")
+    @ParameterizedTest
+    @MethodSource("provider_pad")
     public void test_pad_EXCEEDS_PAD(int minPad, int maxPad, long value, String result) throws Exception {
         try {
             getFormatter(DAY_OF_MONTH, minPad, maxPad, SignStyle.EXCEEDS_PAD).formatTo(new MockFieldValue(DAY_OF_MONTH, value), buf);
@@ -257,26 +267,29 @@ public class TestNumberPrinter extends AbstractTestPrinterParser {
             if (result.length() > minPad || value < 0) {
                 result = (value < 0 ? "-" + result : "+" + result);
             }
-            assertEquals(buf.toString(), result);
+            assertEquals(result, buf.toString());
         } catch (DateTimeException ex) {
             if (result != null) {
                 throw ex;
             }
-            assertEquals(ex.getMessage().contains(DAY_OF_MONTH.toString()), true);
+            assertEquals(true, ex.getMessage().contains(DAY_OF_MONTH.toString()));
         }
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_toString1() throws Exception {
-        assertEquals(getFormatter(HOUR_OF_DAY, 1, 19, SignStyle.NORMAL).toString(), "Value(HourOfDay)");
+        assertEquals("Value(HourOfDay)", getFormatter(HOUR_OF_DAY, 1, 19, SignStyle.NORMAL).toString());
     }
 
+    @Test
     public void test_toString2() throws Exception {
-        assertEquals(getFormatter(HOUR_OF_DAY, 2, 2, SignStyle.NOT_NEGATIVE).toString(), "Value(HourOfDay,2)");
+        assertEquals("Value(HourOfDay,2)", getFormatter(HOUR_OF_DAY, 2, 2, SignStyle.NOT_NEGATIVE).toString());
     }
 
+    @Test
     public void test_toString3() throws Exception {
-        assertEquals(getFormatter(HOUR_OF_DAY, 1, 2, SignStyle.NOT_NEGATIVE).toString(), "Value(HourOfDay,1,2,NOT_NEGATIVE)");
+        assertEquals("Value(HourOfDay,1,2,NOT_NEGATIVE)", getFormatter(HOUR_OF_DAY, 1, 2, SignStyle.NOT_NEGATIVE).toString());
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestPadPrinterDecorator.java b/test/jdk/java/time/test/java/time/format/TestPadPrinterDecorator.java
index adb7677556a..48721e470c3 100644
--- a/test/jdk/java/time/test/java/time/format/TestPadPrinterDecorator.java
+++ b/test/jdk/java/time/test/java/time/format/TestPadPrinterDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,79 +59,90 @@
  */
 package test.java.time.format;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.DateTimeException;
 import java.time.LocalDate;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test PadPrinterDecorator.
  */
-@Test
 public class TestPadPrinterDecorator extends AbstractTestPrinterParser {
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_print_emptyCalendrical() throws Exception {
         builder.padNext(3, '-').appendLiteral('Z');
         getFormatter().formatTo(EMPTY_DTA, buf);
-        assertEquals(buf.toString(), "--Z");
+        assertEquals("--Z", buf.toString());
     }
 
+    @Test
     public void test_print_fullDateTime() throws Exception {
         builder.padNext(3, '-').appendLiteral('Z');
         getFormatter().formatTo(LocalDate.of(2008, 12, 3), buf);
-        assertEquals(buf.toString(), "--Z");
+        assertEquals("--Z", buf.toString());
     }
 
+    @Test
     public void test_print_append() throws Exception {
         buf.append("EXISTING");
         builder.padNext(3, '-').appendLiteral('Z');
         getFormatter().formatTo(EMPTY_DTA, buf);
-        assertEquals(buf.toString(), "EXISTING--Z");
+        assertEquals("EXISTING--Z", buf.toString());
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_print_noPadRequiredSingle() throws Exception {
         builder.padNext(1, '-').appendLiteral('Z');
         getFormatter().formatTo(EMPTY_DTA, buf);
-        assertEquals(buf.toString(), "Z");
+        assertEquals("Z", buf.toString());
     }
 
+    @Test
     public void test_print_padRequiredSingle() throws Exception {
         builder.padNext(5, '-').appendLiteral('Z');
         getFormatter().formatTo(EMPTY_DTA, buf);
-        assertEquals(buf.toString(), "----Z");
+        assertEquals("----Z", buf.toString());
     }
 
+    @Test
     public void test_print_noPadRequiredMultiple() throws Exception {
         builder.padNext(4, '-').appendLiteral("WXYZ");
         getFormatter().formatTo(EMPTY_DTA, buf);
-        assertEquals(buf.toString(), "WXYZ");
+        assertEquals("WXYZ", buf.toString());
     }
 
+    @Test
     public void test_print_padRequiredMultiple() throws Exception {
         builder.padNext(5, '-').appendLiteral("WXYZ");
         getFormatter().formatTo(EMPTY_DTA, buf);
-        assertEquals(buf.toString(), "-WXYZ");
+        assertEquals("-WXYZ", buf.toString());
     }
 
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_print_overPad() throws Exception {
-        builder.padNext(3, '-').appendLiteral("WXYZ");
-        getFormatter().formatTo(EMPTY_DTA, buf);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            builder.padNext(3, '-').appendLiteral("WXYZ");
+            getFormatter().formatTo(EMPTY_DTA, buf);
+        });
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_toString1() throws Exception {
         builder.padNext(5, ' ').appendLiteral('Y');
-        assertEquals(getFormatter().toString(), "Pad('Y',5)");
+        assertEquals("Pad('Y',5)", getFormatter().toString());
     }
 
+    @Test
     public void test_toString2() throws Exception {
         builder.padNext(5, '-').appendLiteral('Y');
-        assertEquals(getFormatter().toString(), "Pad('Y',5,'-')");
+        assertEquals("Pad('Y',5,'-')", getFormatter().toString());
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestReducedParser.java b/test/jdk/java/time/test/java/time/format/TestReducedParser.java
index 3bf806563e8..2d9df7c11da 100644
--- a/test/jdk/java/time/test/java/time/format/TestReducedParser.java
+++ b/test/jdk/java/time/test/java/time/format/TestReducedParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,9 +65,10 @@ import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoField.YEAR;
 import static java.time.temporal.ChronoField.YEAR_OF_ERA;
 import static java.time.temporal.ChronoUnit.YEARS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertNotNull;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.text.ParsePosition;
 import java.time.LocalDate;
@@ -85,13 +86,15 @@ import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalField;
 import java.time.temporal.TemporalQueries;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test ReducedPrinterParser.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestReducedParser extends AbstractTestPrinterParser {
     private static final boolean STRICT = true;
     private static final boolean LENIENT = false;
@@ -109,7 +112,6 @@ public class TestReducedParser extends AbstractTestPrinterParser {
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="error")
     Object[][] data_error() {
         return new Object[][] {
             {YEAR, 2, 2010, "12", -1, IndexOutOfBoundsException.class},
@@ -117,7 +119,8 @@ public class TestReducedParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="error")
+    @ParameterizedTest
+    @MethodSource("data_error")
     public void test_parse_error(TemporalField field, int width, int baseValue, String text, int pos, Class<?> expected) {
         try {
             getFormatter0(field, width, baseValue).parseUnresolved(text, new ParsePosition(pos));
@@ -127,10 +130,11 @@ public class TestReducedParser extends AbstractTestPrinterParser {
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_parse_fieldRangeIgnored() throws Exception {
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter0(DAY_OF_YEAR, 3, 10).parseUnresolved("456", pos);
-        assertEquals(pos.getIndex(), 3);
+        assertEquals(3, pos.getIndex());
         assertParsed(parsed, DAY_OF_YEAR, 456L);  // parsed dayOfYear=456
     }
 
@@ -138,7 +142,6 @@ public class TestReducedParser extends AbstractTestPrinterParser {
     // Parse data and values that are consistent whether strict or lenient
     // The data is the ChronoField, width, baseValue, text, startPos, endPos, value
     //-----------------------------------------------------------------------
-    @DataProvider(name="ParseAll")
     Object[][] provider_parseAll() {
         return new Object[][] {
              // negative zero
@@ -182,30 +185,32 @@ public class TestReducedParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="ParseAll")
+    @ParameterizedTest
+    @MethodSource("provider_parseAll")
     public void test_parseAllStrict(TemporalField field, int width, int baseValue, String input, int pos, int parseLen, Integer parseVal) {
         ParsePosition ppos = new ParsePosition(pos);
         setStrict(true);
         TemporalAccessor parsed = getFormatter0(field, width, baseValue).parseUnresolved(input, ppos);
         if (ppos.getErrorIndex() != -1) {
-            assertEquals(ppos.getErrorIndex(), parseLen, "error case parse position");
-            assertEquals(parsed, parseVal, "unexpected parse result");
+            assertEquals(parseLen, ppos.getErrorIndex(), "error case parse position");
+            assertEquals(parseVal, parsed, "unexpected parse result");
         } else {
-            assertEquals(ppos.getIndex(), parseLen, "parse position");
+            assertEquals(parseLen, ppos.getIndex(), "parse position");
             assertParsed(parsed, YEAR, parseVal != null ? (long) parseVal : null);
         }
     }
 
-   @Test(dataProvider="ParseAll")
+   @ParameterizedTest
+    @MethodSource("provider_parseAll")
     public void test_parseAllLenient(TemporalField field, int width, int baseValue, String input, int pos, int parseLen, Integer parseVal) {
         ParsePosition ppos = new ParsePosition(pos);
         setStrict(false);
         TemporalAccessor parsed = getFormatter0(field, width, baseValue).parseUnresolved(input, ppos);
         if (ppos.getErrorIndex() != -1) {
-            assertEquals(ppos.getErrorIndex(), parseLen, "error case parse position");
-            assertEquals(parsed, parseVal, "unexpected parse result");
+            assertEquals(parseLen, ppos.getErrorIndex(), "error case parse position");
+            assertEquals(parseVal, parsed, "unexpected parse result");
         } else {
-            assertEquals(ppos.getIndex(), parseLen, "parse position");
+            assertEquals(parseLen, ppos.getIndex(), "parse position");
             assertParsed(parsed, YEAR, parseVal != null ? (long) parseVal : null);
         }
     }
@@ -215,7 +220,6 @@ public class TestReducedParser extends AbstractTestPrinterParser {
     // The data is the ChronoField, minWidth, maxWidth, baseValue, text, startPos,
     // Strict Pair(endPos, value), Lenient Pair(endPos, value)
     //-----------------------------------------------------------------------
-    @DataProvider(name="ParseLenientSensitive")
     Object[][] provider_parseLenientSensitive() {
         return new Object[][] {
             // few digits supplied
@@ -268,32 +272,34 @@ public class TestReducedParser extends AbstractTestPrinterParser {
     //-----------------------------------------------------------------------
     // Parsing tests for strict mode
     //-----------------------------------------------------------------------
-    @Test(dataProvider="ParseLenientSensitive")
+    @ParameterizedTest
+    @MethodSource("provider_parseLenientSensitive")
     public void test_parseStrict(TemporalField field, int minWidth, int maxWidth, int baseValue, String input, int pos,
         Pair strict, Pair lenient) {
         ParsePosition ppos = new ParsePosition(pos);
         setStrict(true);
         TemporalAccessor parsed = getFormatter0(field, minWidth, maxWidth, baseValue).parseUnresolved(input, ppos);
         if (ppos.getErrorIndex() != -1) {
-            assertEquals(ppos.getErrorIndex(), strict.parseLen, "error case parse position");
-            assertEquals(parsed, strict.parseVal, "unexpected parse result");
+            assertEquals(strict.parseLen, ppos.getErrorIndex(), "error case parse position");
+            assertEquals(strict.parseVal, parsed, "unexpected parse result");
         } else {
-            assertEquals(ppos.getIndex(), strict.parseLen, "parse position");
+            assertEquals(strict.parseLen, ppos.getIndex(), "parse position");
             assertParsed(parsed, YEAR, strict.parseVal != null ? (long) strict.parseVal : null);
         }
     }
 
-    @Test(dataProvider="ParseLenientSensitive")
+    @ParameterizedTest
+    @MethodSource("provider_parseLenientSensitive")
     public void test_parseStrict_baseDate(TemporalField field, int minWidth, int maxWidth, int baseValue, String input, int pos,
                                  Pair strict, Pair lenient) {
         ParsePosition ppos = new ParsePosition(pos);
         setStrict(true);
         TemporalAccessor parsed = getFormatterBaseDate(field, minWidth, maxWidth, baseValue).parseUnresolved(input, ppos);
         if (ppos.getErrorIndex() != -1) {
-            assertEquals(ppos.getErrorIndex(), strict.parseLen, "error case parse position");
-            assertEquals(parsed, strict.parseVal, "unexpected parse result");
+            assertEquals(strict.parseLen, ppos.getErrorIndex(), "error case parse position");
+            assertEquals(strict.parseVal, parsed, "unexpected parse result");
         } else {
-            assertEquals(ppos.getIndex(), strict.parseLen, "parse position");
+            assertEquals(strict.parseLen, ppos.getIndex(), "parse position");
             assertParsed(parsed, YEAR, strict.parseVal != null ? (long) strict.parseVal : null);
         }
     }
@@ -301,42 +307,44 @@ public class TestReducedParser extends AbstractTestPrinterParser {
     //-----------------------------------------------------------------------
     // Parsing tests for lenient mode
     //-----------------------------------------------------------------------
-    @Test(dataProvider="ParseLenientSensitive")
+    @ParameterizedTest
+    @MethodSource("provider_parseLenientSensitive")
     public void test_parseLenient(TemporalField field, int minWidth, int maxWidth, int baseValue, String input, int pos,
         Pair strict, Pair lenient) {
         ParsePosition ppos = new ParsePosition(pos);
         setStrict(false);
         TemporalAccessor parsed = getFormatter0(field, minWidth, maxWidth, baseValue).parseUnresolved(input, ppos);
         if (ppos.getErrorIndex() != -1) {
-            assertEquals(ppos.getErrorIndex(), lenient.parseLen, "error case parse position");
-            assertEquals(parsed, lenient.parseVal, "unexpected parse result");
+            assertEquals(lenient.parseLen, ppos.getErrorIndex(), "error case parse position");
+            assertEquals(lenient.parseVal, parsed, "unexpected parse result");
         } else {
-            assertEquals(ppos.getIndex(), lenient.parseLen, "parse position");
+            assertEquals(lenient.parseLen, ppos.getIndex(), "parse position");
             assertParsed(parsed, YEAR, lenient.parseVal != null ? (long) lenient.parseVal : null);
         }
     }
 
-    @Test(dataProvider="ParseLenientSensitive")
+    @ParameterizedTest
+    @MethodSource("provider_parseLenientSensitive")
     public void test_parseLenient_baseDate(TemporalField field, int minWidth, int maxWidth, int baseValue, String input, int pos,
                                   Pair strict, Pair lenient) {
         ParsePosition ppos = new ParsePosition(pos);
         setStrict(false);
         TemporalAccessor parsed = getFormatterBaseDate(field, minWidth, maxWidth, baseValue).parseUnresolved(input, ppos);
         if (ppos.getErrorIndex() != -1) {
-            assertEquals(ppos.getErrorIndex(), lenient.parseLen, "error case parse position");
-            assertEquals(parsed, lenient.parseVal, "unexpected parse result");
+            assertEquals(lenient.parseLen, ppos.getErrorIndex(), "error case parse position");
+            assertEquals(lenient.parseVal, parsed, "unexpected parse result");
         } else {
-            assertEquals(ppos.getIndex(), lenient.parseLen, "parse position");
+            assertEquals(lenient.parseLen, ppos.getIndex(), "parse position");
             assertParsed(parsed, YEAR, lenient.parseVal != null ? (long) lenient.parseVal : null);
         }
     }
 
     private void assertParsed(TemporalAccessor parsed, TemporalField field, Long value) {
         if (value == null) {
-            assertEquals(parsed, null, "Parsed Value");
+            assertEquals(null, parsed, "Parsed Value");
         } else {
-            assertEquals(parsed.isSupported(field), true, "isSupported: " + field);
-            assertEquals(parsed.getLong(field), (long) value, "Temporal.getLong: " + field);
+            assertEquals(true, parsed.isSupported(field), "isSupported: " + field);
+            assertEquals((long) value, parsed.getLong(field), "Temporal.getLong: " + field);
         }
     }
 
@@ -344,7 +352,6 @@ public class TestReducedParser extends AbstractTestPrinterParser {
     //-----------------------------------------------------------------------
     // Cases and values in adjacent parsing mode
     //-----------------------------------------------------------------------
-    @DataProvider(name="ParseAdjacent")
     Object[][] provider_parseAdjacent() {
         return new Object[][] {
             // general
@@ -363,7 +370,8 @@ public class TestReducedParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="ParseAdjacent")
+    @ParameterizedTest
+    @MethodSource("provider_parseAdjacent")
     public void test_parseAdjacent(String pattern, String input, boolean strict, int pos, int parseLen, int year, int month, int day) {
         ParsePosition ppos = new ParsePosition(0);
         builder = new DateTimeFormatterBuilder();
@@ -374,9 +382,9 @@ public class TestReducedParser extends AbstractTestPrinterParser {
         TemporalAccessor parsed = dtf.parseUnresolved(input, ppos);
         assertNotNull(parsed, String.format("parse failed: ppos: %s, formatter: %s%n", ppos.toString(), dtf));
         if (ppos.getErrorIndex() != -1) {
-            assertEquals(ppos.getErrorIndex(), parseLen, "error case parse position");
+            assertEquals(parseLen, ppos.getErrorIndex(), "error case parse position");
         } else {
-            assertEquals(ppos.getIndex(), parseLen, "parse position");
+            assertEquals(parseLen, ppos.getIndex(), "parse position");
             assertParsed(parsed, YEAR_OF_ERA, Long.valueOf(year));
             assertParsed(parsed, MONTH_OF_YEAR, Long.valueOf(month));
             assertParsed(parsed, DAY_OF_MONTH, Long.valueOf(day));
@@ -386,7 +394,6 @@ public class TestReducedParser extends AbstractTestPrinterParser {
     //-----------------------------------------------------------------------
     // Cases and values in reduced value parsing mode
     //-----------------------------------------------------------------------
-    @DataProvider(name="ReducedWithChrono")
     Object[][] provider_reducedWithChrono() {
         LocalDate baseYear = LocalDate.of(2000, 1, 1);
         return new Object[][] {
@@ -408,7 +415,8 @@ public class TestReducedParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="ReducedWithChrono")
+    @ParameterizedTest
+    @MethodSource("provider_reducedWithChrono")
     public void test_reducedWithChronoYear(ChronoLocalDate date) {
         Chronology chrono = date.getChronology();
         DateTimeFormatter df
@@ -421,12 +429,13 @@ public class TestReducedParser extends AbstractTestPrinterParser {
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = df.parseUnresolved(input, pos);
         int actual = parsed.get(YEAR);
-        assertEquals(actual, expected,
+        assertEquals(expected, actual,
                 String.format("Wrong date parsed, chrono: %s, input: %s",
                 chrono, input));
 
     }
-    @Test(dataProvider="ReducedWithChrono")
+    @ParameterizedTest
+    @MethodSource("provider_reducedWithChrono")
     public void test_reducedWithChronoYearOfEra(ChronoLocalDate date) {
         Chronology chrono = date.getChronology();
         DateTimeFormatter df
@@ -439,7 +448,7 @@ public class TestReducedParser extends AbstractTestPrinterParser {
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = df.parseUnresolved(input, pos);
         int actual = parsed.get(YEAR_OF_ERA);
-        assertEquals(actual, expected,
+        assertEquals(expected, actual,
                 String.format("Wrong date parsed, chrono: %s, input: %s",
                 chrono, input));
 
@@ -459,10 +468,10 @@ public class TestReducedParser extends AbstractTestPrinterParser {
 
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = df.parseUnresolved(input, pos);
-        assertEquals(pos.getIndex(), input.length(), "Input not parsed completely");
-        assertEquals(pos.getErrorIndex(), -1, "Error index should be -1 (no-error)");
+        assertEquals(input.length(), pos.getIndex(), "Input not parsed completely");
+        assertEquals(-1, pos.getErrorIndex(), "Error index should be -1 (no-error)");
         int actual = parsed.get(YEAR);
-        assertEquals(actual, expected,
+        assertEquals(expected, actual,
                 String.format("Wrong date parsed, chrono: %s, input: %s",
                 parsed.query(TemporalQueries.chronology()), input));
 
@@ -482,10 +491,10 @@ public class TestReducedParser extends AbstractTestPrinterParser {
         String input = "44 ThaiBuddhist ISO";
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = df.parseUnresolved(input, pos);
-        assertEquals(pos.getIndex(), input.length(), "Input not parsed completely: " + pos);
-        assertEquals(pos.getErrorIndex(), -1, "Error index should be -1 (no-error)");
+        assertEquals(input.length(), pos.getIndex(), "Input not parsed completely: " + pos);
+        assertEquals(-1, pos.getErrorIndex(), "Error index should be -1 (no-error)");
         int actual = parsed.get(YEAR);
-        assertEquals(actual, expected,
+        assertEquals(expected, actual,
                 String.format("Wrong date parsed, chrono: %s, input: %s",
                 parsed.query(TemporalQueries.chronology()), input));
 
diff --git a/test/jdk/java/time/test/java/time/format/TestReducedPrinter.java b/test/jdk/java/time/test/java/time/format/TestReducedPrinter.java
index c4b6cf4dc39..94c45662666 100644
--- a/test/jdk/java/time/test/java/time/format/TestReducedPrinter.java
+++ b/test/jdk/java/time/test/java/time/format/TestReducedPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,8 +60,9 @@
 package test.java.time.format;
 
 import static java.time.temporal.ChronoField.YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.DateTimeException;
 import java.time.LocalDate;
@@ -70,14 +71,18 @@ import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.TemporalField;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import test.java.time.temporal.MockFieldValue;
 
 /**
  * Test ReducedPrinterParser.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestReducedPrinter extends AbstractTestPrinterParser {
 
     private DateTimeFormatter getFormatter0(TemporalField field, int width, int baseValue) {
@@ -93,20 +98,20 @@ public class TestReducedPrinter extends AbstractTestPrinterParser {
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_print_emptyCalendrical() throws Exception {
-        getFormatter0(YEAR, 2, 2010).formatTo(EMPTY_DTA, buf);
+        Assertions.assertThrows(DateTimeException.class, () -> getFormatter0(YEAR, 2, 2010).formatTo(EMPTY_DTA, buf));
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_print_append() throws Exception {
         buf.append("EXISTING");
         getFormatter0(YEAR, 2, 2010).formatTo(LocalDate.of(2012, 1, 1), buf);
-        assertEquals(buf.toString(), "EXISTING12");
+        assertEquals("EXISTING12", buf.toString());
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="Pivot")
     Object[][] provider_pivot() {
         return new Object[][] {
             {1, 1, 2010, 2010, "0"},
@@ -175,34 +180,36 @@ public class TestReducedPrinter extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="Pivot")
+    @ParameterizedTest
+    @MethodSource("provider_pivot")
     public void test_pivot(int minWidth, int maxWidth, int baseValue, int value, String result) throws Exception {
         try {
             getFormatter0(YEAR, minWidth, maxWidth, baseValue).formatTo(new MockFieldValue(YEAR, value), buf);
             if (result == null) {
                 fail("Expected exception");
             }
-            assertEquals(buf.toString(), result);
+            assertEquals(result, buf.toString());
         } catch (DateTimeException ex) {
             if (result == null || value < 0) {
-                assertEquals(ex.getMessage().contains(YEAR.toString()), true);
+                assertEquals(true, ex.getMessage().contains(YEAR.toString()));
             } else {
                 throw ex;
             }
         }
     }
 
-    @Test(dataProvider="Pivot")
+    @ParameterizedTest
+    @MethodSource("provider_pivot")
     public void test_pivot_baseDate(int minWidth, int maxWidth, int baseValue, int value, String result) throws Exception {
         try {
             getFormatterBaseDate(YEAR, minWidth, maxWidth, baseValue).formatTo(new MockFieldValue(YEAR, value), buf);
             if (result == null) {
                 fail("Expected exception");
             }
-            assertEquals(buf.toString(), result);
+            assertEquals(result, buf.toString());
         } catch (DateTimeException ex) {
             if (result == null || value < 0) {
-                assertEquals(ex.getMessage().contains(YEAR.toString()), true);
+                assertEquals(true, ex.getMessage().contains(YEAR.toString()));
             } else {
                 throw ex;
             }
@@ -210,49 +217,51 @@ public class TestReducedPrinter extends AbstractTestPrinterParser {
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_minguoChrono_fixedWidth() throws Exception {
         // ISO 2021 is Minguo 110
         DateTimeFormatter f = getFormatterBaseDate(YEAR, 2, 2, 2021);
         MinguoDate date = MinguoDate.of(109, 6, 30);
-        assertEquals(f.format(date), "09");
+        assertEquals("09", f.format(date));
         date = MinguoDate.of(110, 6, 30);
-        assertEquals(f.format(date), "10");
+        assertEquals("10", f.format(date));
         date = MinguoDate.of(199, 6, 30);
-        assertEquals(f.format(date), "99");
+        assertEquals("99", f.format(date));
         date = MinguoDate.of(200, 6, 30);
-        assertEquals(f.format(date), "00");
+        assertEquals("00", f.format(date));
         date = MinguoDate.of(209, 6, 30);
-        assertEquals(f.format(date), "09");
+        assertEquals("09", f.format(date));
         date = MinguoDate.of(210, 6, 30);
-        assertEquals(f.format(date), "10");
+        assertEquals("10", f.format(date));
     }
 
+    @Test
     public void test_minguoChrono_extendedWidth() throws Exception {
         // ISO 2021 is Minguo 110
         DateTimeFormatter f = getFormatterBaseDate(YEAR, 2, 4, 2021);
         MinguoDate date = MinguoDate.of(109, 6, 30);
-        assertEquals(f.format(date), "109");
+        assertEquals("109", f.format(date));
         date = MinguoDate.of(110, 6, 30);
-        assertEquals(f.format(date), "10");
+        assertEquals("10", f.format(date));
         date = MinguoDate.of(199, 6, 30);
-        assertEquals(f.format(date), "99");
+        assertEquals("99", f.format(date));
         date = MinguoDate.of(200, 6, 30);
-        assertEquals(f.format(date), "00");
+        assertEquals("00", f.format(date));
         date = MinguoDate.of(209, 6, 30);
-        assertEquals(f.format(date), "09");
+        assertEquals("09", f.format(date));
         date = MinguoDate.of(210, 6, 30);
-        assertEquals(f.format(date), "210");
+        assertEquals("210", f.format(date));
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_toString() throws Exception {
-        assertEquals(getFormatter0(YEAR, 2, 2, 2005).toString(), "ReducedValue(Year,2,2,2005)");
+        assertEquals("ReducedValue(Year,2,2,2005)", getFormatter0(YEAR, 2, 2, 2005).toString());
     }
 
     //-----------------------------------------------------------------------
     // Cases and values in adjacent parsing mode
     //-----------------------------------------------------------------------
-    @DataProvider(name="PrintAdjacent")
     Object[][] provider_printAdjacent() {
         return new Object[][] {
             // general
@@ -265,7 +274,8 @@ public class TestReducedPrinter extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="PrintAdjacent")
+    @ParameterizedTest
+    @MethodSource("provider_printAdjacent")
     public void test_printAdjacent(String pattern, String text, int year, int month, int day) {
         builder = new DateTimeFormatterBuilder();
         builder.appendPattern(pattern);
@@ -273,7 +283,7 @@ public class TestReducedPrinter extends AbstractTestPrinterParser {
 
         LocalDate ld = LocalDate.of(year, month, day);
         String actual = dtf.format(ld);
-        assertEquals(actual, text, "formatter output: " + dtf);
+        assertEquals(text, actual, "formatter output: " + dtf);
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestSettingsParser.java b/test/jdk/java/time/test/java/time/format/TestSettingsParser.java
index ce7b2d7f187..1f71a37a007 100644
--- a/test/jdk/java/time/test/java/time/format/TestSettingsParser.java
+++ b/test/jdk/java/time/test/java/time/format/TestSettingsParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,29 +59,30 @@
  */
 package test.java.time.format;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.text.ParsePosition;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test SettingsParser.
  */
-@Test
 public class TestSettingsParser extends AbstractTestPrinterParser {
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_print_sensitive() throws Exception {
         setCaseSensitive(true);
         getFormatter().formatTo(dta, buf);
-        assertEquals(buf.toString(), "");
+        assertEquals("", buf.toString());
     }
 
+    @Test
     public void test_print_strict() throws Exception {
         setStrict(true);
         getFormatter().formatTo(dta, buf);
-        assertEquals(buf.toString(), "");
+        assertEquals("", buf.toString());
     }
 
     /*
@@ -92,53 +93,61 @@ public class TestSettingsParser extends AbstractTestPrinterParser {
     */
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_parse_changeStyle_sensitive() throws Exception {
         setCaseSensitive(true);
         ParsePosition pos = new ParsePosition(0);
         getFormatter().parseUnresolved("a", pos);
-        assertEquals(pos.getIndex(), 0);
+        assertEquals(0, pos.getIndex());
     }
 
+    @Test
     public void test_parse_changeStyle_insensitive() throws Exception {
         setCaseSensitive(false);
         ParsePosition pos = new ParsePosition(0);
         getFormatter().parseUnresolved("a", pos);
-        assertEquals(pos.getIndex(), 0);
+        assertEquals(0, pos.getIndex());
     }
 
+    @Test
     public void test_parse_changeStyle_strict() throws Exception {
         setStrict(true);
         ParsePosition pos = new ParsePosition(0);
         getFormatter().parseUnresolved("a", pos);
-        assertEquals(pos.getIndex(), 0);
+        assertEquals(0, pos.getIndex());
     }
 
+    @Test
     public void test_parse_changeStyle_lenient() throws Exception {
         setStrict(false);
         ParsePosition pos = new ParsePosition(0);
         getFormatter().parseUnresolved("a", pos);
-        assertEquals(pos.getIndex(), 0);
+        assertEquals(0, pos.getIndex());
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_toString_sensitive() throws Exception {
         setCaseSensitive(true);
-        assertEquals(getFormatter().toString(), "ParseCaseSensitive(true)");
+        assertEquals("ParseCaseSensitive(true)", getFormatter().toString());
     }
 
+    @Test
     public void test_toString_insensitive() throws Exception {
         setCaseSensitive(false);
-        assertEquals(getFormatter().toString(), "ParseCaseSensitive(false)");
+        assertEquals("ParseCaseSensitive(false)", getFormatter().toString());
     }
 
+    @Test
     public void test_toString_strict() throws Exception {
         setStrict(true);
-        assertEquals(getFormatter().toString(), "ParseStrict(true)");
+        assertEquals("ParseStrict(true)", getFormatter().toString());
     }
 
+    @Test
     public void test_toString_lenient() throws Exception {
         setStrict(false);
-        assertEquals(getFormatter().toString(), "ParseStrict(false)");
+        assertEquals("ParseStrict(false)", getFormatter().toString());
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestStringLiteralParser.java b/test/jdk/java/time/test/java/time/format/TestStringLiteralParser.java
index f8f5147f921..c442621ce34 100644
--- a/test/jdk/java/time/test/java/time/format/TestStringLiteralParser.java
+++ b/test/jdk/java/time/test/java/time/format/TestStringLiteralParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,24 +60,25 @@
 package test.java.time.format;
 
 import static java.time.temporal.ChronoField.YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.text.ParsePosition;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalQueries;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test StringLiteralPrinterParser.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestStringLiteralParser extends AbstractTestPrinterParser {
 
-    @DataProvider(name="success")
     Object[][] data_success() {
         return new Object[][] {
             // match
@@ -104,23 +105,23 @@ public class TestStringLiteralParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="success")
+    @ParameterizedTest
+    @MethodSource("data_success")
     public void test_parse_success(String s, boolean caseSensitive, String text, int pos, int expectedPos) {
         setCaseSensitive(caseSensitive);
         ParsePosition ppos = new ParsePosition(pos);
         TemporalAccessor parsed = getFormatter(s).parseUnresolved(text, ppos);
         if (ppos.getErrorIndex() != -1) {
-            assertEquals(ppos.getIndex(), expectedPos);
+            assertEquals(expectedPos, ppos.getIndex());
         } else {
-            assertEquals(ppos.getIndex(), expectedPos);
-            assertEquals(parsed.isSupported(YEAR), false);
-            assertEquals(parsed.query(TemporalQueries.chronology()), null);
-            assertEquals(parsed.query(TemporalQueries.zoneId()), null);
+            assertEquals(expectedPos, ppos.getIndex());
+            assertEquals(false, parsed.isSupported(YEAR));
+            assertEquals(null, parsed.query(TemporalQueries.chronology()));
+            assertEquals(null, parsed.query(TemporalQueries.zoneId()));
         }
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="error")
     Object[][] data_error() {
         return new Object[][] {
             {"hello", "hello", -1, IndexOutOfBoundsException.class},
@@ -128,7 +129,8 @@ public class TestStringLiteralParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="error")
+    @ParameterizedTest
+    @MethodSource("data_error")
     public void test_parse_error(String s, String text, int pos, Class<?> expected) {
         try {
             ParsePosition ppos = new ParsePosition(pos);
diff --git a/test/jdk/java/time/test/java/time/format/TestStringLiteralPrinter.java b/test/jdk/java/time/test/java/time/format/TestStringLiteralPrinter.java
index 6733af164a4..ed8717d8bdb 100644
--- a/test/jdk/java/time/test/java/time/format/TestStringLiteralPrinter.java
+++ b/test/jdk/java/time/test/java/time/format/TestStringLiteralPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,44 +59,47 @@
  */
 package test.java.time.format;
 
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test StringLiteralPrinterParser.
  */
-@Test
 public class TestStringLiteralPrinter extends AbstractTestPrinterParser {
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_print_emptyCalendrical() throws Exception {
         buf.append("EXISTING");
         getFormatter("hello").formatTo(EMPTY_DTA, buf);
-        assertEquals(buf.toString(), "EXISTINGhello");
+        assertEquals("EXISTINGhello", buf.toString());
     }
 
+    @Test
     public void test_print_dateTime() throws Exception {
         buf.append("EXISTING");
         getFormatter("hello").formatTo(dta, buf);
-        assertEquals(buf.toString(), "EXISTINGhello");
+        assertEquals("EXISTINGhello", buf.toString());
     }
 
 
 
 
+    @Test
     public void test_print_emptyAppendable() throws Exception {
         getFormatter("hello").formatTo(dta, buf);
-        assertEquals(buf.toString(), "hello");
+        assertEquals("hello", buf.toString());
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_toString() throws Exception {
-        assertEquals(getFormatter("hello").toString(), "'hello'");
+        assertEquals("'hello'", getFormatter("hello").toString());
     }
 
+    @Test
     public void test_toString_apos() throws Exception {
-        assertEquals(getFormatter("o'clock").toString(), "'o''clock'");
+        assertEquals("'o''clock'", getFormatter("o'clock").toString());
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestTextParser.java b/test/jdk/java/time/test/java/time/format/TestTextParser.java
index b6126a6b407..2482cbc5a6e 100644
--- a/test/jdk/java/time/test/java/time/format/TestTextParser.java
+++ b/test/jdk/java/time/test/java/time/format/TestTextParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,8 +63,9 @@ import static java.time.temporal.ChronoField.DAY_OF_MONTH;
 import static java.time.temporal.ChronoField.DAY_OF_WEEK;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.IsoFields.QUARTER_OF_YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.text.ParsePosition;
 import java.time.DayOfWeek;
@@ -77,17 +78,18 @@ import java.time.temporal.TemporalQueries;
 import java.time.temporal.ChronoField;
 import java.util.Locale;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test TextPrinterParser.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestTextParser extends AbstractTestPrinterParser {
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="error")
     Object[][] data_error() {
         return new Object[][] {
             {DAY_OF_WEEK, TextStyle.FULL, "Monday", -1, IndexOutOfBoundsException.class},
@@ -95,7 +97,8 @@ public class TestTextParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="error")
+    @ParameterizedTest
+    @MethodSource("data_error")
     public void test_parse_error(TemporalField field, TextStyle style, String text, int pos, Class<?> expected) {
         try {
             getFormatter(field, style).parseUnresolved(text, new ParsePosition(pos));
@@ -105,49 +108,53 @@ public class TestTextParser extends AbstractTestPrinterParser {
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_parse_midStr() throws Exception {
         ParsePosition pos = new ParsePosition(3);
-        assertEquals(getFormatter(DAY_OF_WEEK, TextStyle.FULL)
-                     .parseUnresolved("XxxMondayXxx", pos)
-                     .getLong(DAY_OF_WEEK), 1L);
-        assertEquals(pos.getIndex(), 9);
+        assertEquals(1L, getFormatter(DAY_OF_WEEK, TextStyle.FULL)
+                .parseUnresolved("XxxMondayXxx", pos)
+                .getLong(DAY_OF_WEEK));
+        assertEquals(9, pos.getIndex());
     }
 
+    @Test
     public void test_parse_remainderIgnored() throws Exception {
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(getFormatter(DAY_OF_WEEK, TextStyle.SHORT)
-                     .parseUnresolved("Wednesday", pos)
-                     .getLong(DAY_OF_WEEK), 3L);
-        assertEquals(pos.getIndex(), 3);
+        assertEquals(3L, getFormatter(DAY_OF_WEEK, TextStyle.SHORT)
+                .parseUnresolved("Wednesday", pos)
+                .getLong(DAY_OF_WEEK));
+        assertEquals(3, pos.getIndex());
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_parse_noMatch1() throws Exception {
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed =
             getFormatter(DAY_OF_WEEK, TextStyle.FULL).parseUnresolved("Munday", pos);
-        assertEquals(pos.getErrorIndex(), 0);
-        assertEquals(parsed, null);
+        assertEquals(0, pos.getErrorIndex());
+        assertEquals(null, parsed);
     }
 
+    @Test
     public void test_parse_noMatch2() throws Exception {
         ParsePosition pos = new ParsePosition(3);
         TemporalAccessor parsed =
             getFormatter(DAY_OF_WEEK, TextStyle.FULL).parseUnresolved("Monday", pos);
-        assertEquals(pos.getErrorIndex(), 3);
-        assertEquals(parsed, null);
+        assertEquals(3, pos.getErrorIndex());
+        assertEquals(null, parsed);
     }
 
+    @Test
     public void test_parse_noMatch_atEnd() throws Exception {
         ParsePosition pos = new ParsePosition(6);
         TemporalAccessor parsed =
             getFormatter(DAY_OF_WEEK, TextStyle.FULL).parseUnresolved("Monday", pos);
-        assertEquals(pos.getErrorIndex(), 6);
-        assertEquals(parsed, null);
+        assertEquals(6, pos.getErrorIndex());
+        assertEquals(null, parsed);
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseText")
     Object[][] provider_text() {
         return new Object[][] {
             {DAY_OF_WEEK, TextStyle.FULL, 1, "Monday"},
@@ -189,7 +196,6 @@ public class TestTextParser extends AbstractTestPrinterParser {
        };
     }
 
-    @DataProvider(name="parseNumber")
     Object[][] provider_number() {
         return new Object[][] {
             {DAY_OF_MONTH, TextStyle.FULL, 1, "1"},
@@ -204,7 +210,6 @@ public class TestTextParser extends AbstractTestPrinterParser {
        };
     }
 
-    @DataProvider(name="parseDayOfWeekText")
     Object[][] providerDayOfWeekData() {
         return new Object[][] {
             // Locale, pattern, input text, expected DayOfWeek
@@ -215,30 +220,34 @@ public class TestTextParser extends AbstractTestPrinterParser {
     }
 
 
-    @Test(dataProvider="parseText")
+    @ParameterizedTest
+    @MethodSource("provider_text")
     public void test_parseText(TemporalField field, TextStyle style, int value, String input) throws Exception {
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(getFormatter(field, style).parseUnresolved(input, pos).getLong(field), (long) value);
-        assertEquals(pos.getIndex(), input.length());
+        assertEquals((long) value, getFormatter(field, style).parseUnresolved(input, pos).getLong(field));
+        assertEquals(input.length(), pos.getIndex());
     }
 
-    @Test(dataProvider="parseNumber")
+    @ParameterizedTest
+    @MethodSource("provider_number")
     public void test_parseNumber(TemporalField field, TextStyle style, int value, String input) throws Exception {
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(getFormatter(field, style).parseUnresolved(input, pos).getLong(field), (long) value);
-        assertEquals(pos.getIndex(), input.length());
+        assertEquals((long) value, getFormatter(field, style).parseUnresolved(input, pos).getLong(field));
+        assertEquals(input.length(), pos.getIndex());
     }
 
-    @Test(dataProvider="parseDayOfWeekText")
+    @ParameterizedTest
+    @MethodSource("providerDayOfWeekData")
     public void test_parseDayOfWeekText(Locale locale, String pattern, String input, DayOfWeek expected) {
         DateTimeFormatter formatter = getPatternFormatter(pattern).withLocale(locale);
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(DayOfWeek.from(formatter.parse(input, pos)), expected);
-        assertEquals(pos.getIndex(), input.length());
+        assertEquals(expected, DayOfWeek.from(formatter.parse(input, pos)));
+        assertEquals(input.length(), pos.getIndex());
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="parseText")
+    @ParameterizedTest
+    @MethodSource("provider_text")
     public void test_parse_strict_caseSensitive_parseUpper(TemporalField field, TextStyle style, int value, String input) throws Exception {
         if (input.equals(input.toUpperCase(Locale.ROOT))) {
             // Skip if the given input is all upper case (e.g., "Q1")
@@ -247,19 +256,21 @@ public class TestTextParser extends AbstractTestPrinterParser {
         setCaseSensitive(true);
         ParsePosition pos = new ParsePosition(0);
         getFormatter(field, style).parseUnresolved(input.toUpperCase(Locale.ROOT), pos);
-        assertEquals(pos.getErrorIndex(), 0);
+        assertEquals(0, pos.getErrorIndex());
     }
 
-    @Test(dataProvider="parseText")
+    @ParameterizedTest
+    @MethodSource("provider_text")
     public void test_parse_strict_caseInsensitive_parseUpper(TemporalField field, TextStyle style, int value, String input) throws Exception {
         setCaseSensitive(false);
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(getFormatter(field, style).parseUnresolved(input.toUpperCase(Locale.ROOT), pos).getLong(field), (long) value);
-        assertEquals(pos.getIndex(), input.length());
+        assertEquals((long) value, getFormatter(field, style).parseUnresolved(input.toUpperCase(Locale.ROOT), pos).getLong(field));
+        assertEquals(input.length(), pos.getIndex());
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider="parseText")
+    @ParameterizedTest
+    @MethodSource("provider_text")
     public void test_parse_strict_caseSensitive_parseLower(TemporalField field, TextStyle style, int value, String input) throws Exception {
         if (input.equals(input.toLowerCase(Locale.ROOT))) {
             // Skip if the given input is all lower case (e.g., "1st quarter")
@@ -268,105 +279,118 @@ public class TestTextParser extends AbstractTestPrinterParser {
         setCaseSensitive(true);
         ParsePosition pos = new ParsePosition(0);
         getFormatter(field, style).parseUnresolved(input.toLowerCase(Locale.ROOT), pos);
-        assertEquals(pos.getErrorIndex(), 0);
+        assertEquals(0, pos.getErrorIndex());
     }
 
-    @Test(dataProvider="parseText")
+    @ParameterizedTest
+    @MethodSource("provider_text")
     public void test_parse_strict_caseInsensitive_parseLower(TemporalField field, TextStyle style, int value, String input) throws Exception {
         setCaseSensitive(false);
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(getFormatter(field, style).parseUnresolved(input.toLowerCase(Locale.ROOT), pos).getLong(field), (long) value);
-        assertEquals(pos.getIndex(), input.length());
+        assertEquals((long) value, getFormatter(field, style).parseUnresolved(input.toLowerCase(Locale.ROOT), pos).getLong(field));
+        assertEquals(input.length(), pos.getIndex());
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
+    @Test
     public void test_parse_full_strict_full_match() throws Exception {
         setStrict(true);
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(getFormatter(MONTH_OF_YEAR, TextStyle.FULL).parseUnresolved("January", pos).getLong(MONTH_OF_YEAR), 1L);
-        assertEquals(pos.getIndex(), 7);
+        assertEquals(1L, getFormatter(MONTH_OF_YEAR, TextStyle.FULL).parseUnresolved("January", pos).getLong(MONTH_OF_YEAR));
+        assertEquals(7, pos.getIndex());
     }
 
+    @Test
     public void test_parse_full_strict_short_noMatch() throws Exception {
         setStrict(true);
         ParsePosition pos = new ParsePosition(0);
         getFormatter(MONTH_OF_YEAR, TextStyle.FULL).parseUnresolved("Janua", pos);
-        assertEquals(pos.getErrorIndex(), 0);
+        assertEquals(0, pos.getErrorIndex());
     }
 
+    @Test
     public void test_parse_full_strict_number_noMatch() throws Exception {
         setStrict(true);
         ParsePosition pos = new ParsePosition(0);
         getFormatter(MONTH_OF_YEAR, TextStyle.FULL).parseUnresolved("1", pos);
-        assertEquals(pos.getErrorIndex(), 0);
+        assertEquals(0, pos.getErrorIndex());
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_parse_short_strict_full_match() throws Exception {
         setStrict(true);
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).parseUnresolved("January", pos).getLong(MONTH_OF_YEAR), 1L);
-        assertEquals(pos.getIndex(), 3);
+        assertEquals(1L, getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).parseUnresolved("January", pos).getLong(MONTH_OF_YEAR));
+        assertEquals(3, pos.getIndex());
     }
 
+    @Test
     public void test_parse_short_strict_short_match() throws Exception {
         setStrict(true);
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).parseUnresolved("Janua", pos).getLong(MONTH_OF_YEAR), 1L);
-        assertEquals(pos.getIndex(), 3);
+        assertEquals(1L, getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).parseUnresolved("Janua", pos).getLong(MONTH_OF_YEAR));
+        assertEquals(3, pos.getIndex());
     }
 
+    @Test
     public void test_parse_short_strict_number_noMatch() throws Exception {
         setStrict(true);
         ParsePosition pos = new ParsePosition(0);
         getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).parseUnresolved("1", pos);
-        assertEquals(pos.getErrorIndex(), 0);
+        assertEquals(0, pos.getErrorIndex());
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_parse_full_lenient_full_match() throws Exception {
         setStrict(false);
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(getFormatter(MONTH_OF_YEAR, TextStyle.FULL).parseUnresolved("January.", pos).getLong(MONTH_OF_YEAR), 1L);
-        assertEquals(pos.getIndex(), 7);
+        assertEquals(1L, getFormatter(MONTH_OF_YEAR, TextStyle.FULL).parseUnresolved("January.", pos).getLong(MONTH_OF_YEAR));
+        assertEquals(7, pos.getIndex());
     }
 
+    @Test
     public void test_parse_full_lenient_short_match() throws Exception {
         setStrict(false);
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(getFormatter(MONTH_OF_YEAR, TextStyle.FULL).parseUnresolved("Janua", pos).getLong(MONTH_OF_YEAR), 1L);
-        assertEquals(pos.getIndex(), 3);
+        assertEquals(1L, getFormatter(MONTH_OF_YEAR, TextStyle.FULL).parseUnresolved("Janua", pos).getLong(MONTH_OF_YEAR));
+        assertEquals(3, pos.getIndex());
     }
 
+    @Test
     public void test_parse_full_lenient_number_match() throws Exception {
         setStrict(false);
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(getFormatter(MONTH_OF_YEAR, TextStyle.FULL).parseUnresolved("1", pos).getLong(MONTH_OF_YEAR), 1L);
-        assertEquals(pos.getIndex(), 1);
+        assertEquals(1L, getFormatter(MONTH_OF_YEAR, TextStyle.FULL).parseUnresolved("1", pos).getLong(MONTH_OF_YEAR));
+        assertEquals(1, pos.getIndex());
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_parse_short_lenient_full_match() throws Exception {
         setStrict(false);
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).parseUnresolved("January", pos).getLong(MONTH_OF_YEAR), 1L);
-        assertEquals(pos.getIndex(), 7);
+        assertEquals(1L, getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).parseUnresolved("January", pos).getLong(MONTH_OF_YEAR));
+        assertEquals(7, pos.getIndex());
     }
 
+    @Test
     public void test_parse_short_lenient_short_match() throws Exception {
         setStrict(false);
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).parseUnresolved("Janua", pos).getLong(MONTH_OF_YEAR), 1L);
-        assertEquals(pos.getIndex(), 3);
+        assertEquals(1L, getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).parseUnresolved("Janua", pos).getLong(MONTH_OF_YEAR));
+        assertEquals(3, pos.getIndex());
     }
 
+    @Test
     public void test_parse_short_lenient_number_match() throws Exception {
         setStrict(false);
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).parseUnresolved("1", pos).getLong(MONTH_OF_YEAR), 1L);
-        assertEquals(pos.getIndex(), 1);
+        assertEquals(1L, getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).parseUnresolved("1", pos).getLong(MONTH_OF_YEAR));
+        assertEquals(1, pos.getIndex());
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestTextParserWithLocale.java b/test/jdk/java/time/test/java/time/format/TestTextParserWithLocale.java
index 371c5180832..35d458d6b45 100644
--- a/test/jdk/java/time/test/java/time/format/TestTextParserWithLocale.java
+++ b/test/jdk/java/time/test/java/time/format/TestTextParserWithLocale.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,24 +81,26 @@ import java.time.temporal.ChronoField;
 import java.time.temporal.TemporalField;
 import java.util.Locale;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
 import static java.time.temporal.ChronoField.DAY_OF_WEEK;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test TextPrinterParser.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestTextParserWithLocale extends AbstractTestPrinterParser {
     static final Locale RUSSIAN = Locale.of("ru");
     static final Locale FINNISH = Locale.of("fi");
 
-    @DataProvider(name="parseDayOfWeekText")
     Object[][] providerDayOfWeekData() {
         return new Object[][] {
             // Locale, pattern, input text, expected DayOfWeek
@@ -112,17 +114,17 @@ public class TestTextParserWithLocale extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="parseDayOfWeekText")
+    @ParameterizedTest
+    @MethodSource("providerDayOfWeekData")
     public void test_parseDayOfWeekText(Locale locale, String pattern, String input, DayOfWeek expected) {
         DateTimeFormatter formatter = getPatternFormatter(pattern).withLocale(locale);
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(DayOfWeek.from(formatter.parse(input, pos)), expected);
-        assertEquals(pos.getIndex(), input.length());
+        assertEquals(expected, DayOfWeek.from(formatter.parse(input, pos)));
+        assertEquals(input.length(), pos.getIndex());
     }
 
     //--------------------------------------------------------------------
     // Test data is dependent on localized resources.
-    @DataProvider(name="parseStandaloneText")
     Object[][] providerStandaloneText() {
         // Locale, TemporalField, TextStyle, expected value, input text
         return new Object[][] {
@@ -136,7 +138,6 @@ public class TestTextParserWithLocale extends AbstractTestPrinterParser {
     }
 
     // Test data is dependent on localized resources.
-    @DataProvider(name="parseLenientText")
     Object[][] providerLenientText() {
         // Locale, TemporalField, expected value, input text
         return new Object[][] {
@@ -147,47 +148,49 @@ public class TestTextParserWithLocale extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="parseStandaloneText")
+    @ParameterizedTest
+    @MethodSource("providerStandaloneText")
     public void test_parseStandaloneText(Locale locale, TemporalField field, TextStyle style, int expectedValue, String input) {
         DateTimeFormatter formatter = getFormatter(field, style).withLocale(locale);
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(formatter.parseUnresolved(input, pos).getLong(field), (long) expectedValue);
-        assertEquals(pos.getIndex(), input.length());
+        assertEquals((long) expectedValue, formatter.parseUnresolved(input, pos).getLong(field));
+        assertEquals(input.length(), pos.getIndex());
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_parse_french_short_strict_full_noMatch() throws Exception {
         setStrict(true);
         ParsePosition pos = new ParsePosition(0);
         getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).withLocale(Locale.FRENCH)
                                                     .parseUnresolved("janvier", pos);
-        assertEquals(pos.getErrorIndex(), 0);
+        assertEquals(0, pos.getErrorIndex());
     }
 
+    @Test
     public void test_parse_french_short_strict_short_match() throws Exception {
         setStrict(true);
         ParsePosition pos = new ParsePosition(0);
-        assertEquals(getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).withLocale(Locale.FRENCH)
-                                                                 .parseUnresolved("janv.", pos)
-                                                                 .getLong(MONTH_OF_YEAR),
-                     1L);
-        assertEquals(pos.getIndex(), 5);
+        assertEquals(1L, getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).withLocale(Locale.FRENCH)
+                .parseUnresolved("janv.", pos)
+                .getLong(MONTH_OF_YEAR));
+        assertEquals(5, pos.getIndex());
     }
 
     //-----------------------------------------------------------------------
 
-    @Test(dataProvider="parseLenientText")
+    @ParameterizedTest
+    @MethodSource("providerLenientText")
     public void test_parseLenientText(Locale locale, TemporalField field, int expectedValue, String input) {
         setStrict(false);
         ParsePosition pos = new ParsePosition(0);
         DateTimeFormatter formatter = getFormatter(field).withLocale(locale);
-        assertEquals(formatter.parseUnresolved(input, pos).getLong(field), (long) expectedValue);
-        assertEquals(pos.getIndex(), input.length());
+        assertEquals((long) expectedValue, formatter.parseUnresolved(input, pos).getLong(field));
+        assertEquals(input.length(), pos.getIndex());
     }
 
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="parseChronoLocalDate")
     Object[][] provider_chronoLocalDate() {
         return new Object[][] {
             { HijrahDate.now() },
@@ -213,14 +216,15 @@ public class TestTextParserWithLocale extends AbstractTestPrinterParser {
             .appendValue(ChronoField.DAY_OF_MONTH, 1, 2, SignStyle.NEVER)
             .toFormatter();
 
-    @Test(dataProvider="parseChronoLocalDate")
+    @ParameterizedTest
+    @MethodSource("provider_chronoLocalDate")
     public void test_chronoLocalDate(ChronoLocalDate date) throws Exception {
         System.out.printf(" %s, [fmt=%s]%n", date, fmt_chrono.format(date));
-        assertEquals(date, fmt_chrono.parse(fmt_chrono.format(date), ChronoLocalDate::from));
+        assertEquals(fmt_chrono.parse(fmt_chrono.format(date), ChronoLocalDate::from), date);
 
         DateTimeFormatter fmt = DateTimeFormatter.ofPattern("[GGG ]yyy-MM-dd")
                                                  .withChronology(date.getChronology());
         System.out.printf(" %s, [fmt=%s]%n", date.toString(), fmt.format(date));
-        assertEquals(date, fmt.parse(fmt.format(date), ChronoLocalDate::from));
+        assertEquals(fmt.parse(fmt.format(date), ChronoLocalDate::from), date);
     }
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestTextPrinter.java b/test/jdk/java/time/test/java/time/format/TestTextPrinter.java
index 379d6a23bb0..f07c935b025 100644
--- a/test/jdk/java/time/test/java/time/format/TestTextPrinter.java
+++ b/test/jdk/java/time/test/java/time/format/TestTextPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,7 +64,8 @@ import static java.time.temporal.ChronoField.DAY_OF_WEEK;
 import static java.time.temporal.ChronoField.ERA;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.IsoFields.QUARTER_OF_YEAR;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.DateTimeException;
 import java.time.DayOfWeek;
@@ -75,30 +76,34 @@ import java.time.format.TextStyle;
 import java.time.temporal.TemporalField;
 import java.util.Locale;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import test.java.time.temporal.MockFieldValue;
 
 /**
  * Test TextPrinterParser.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestTextPrinter extends AbstractTestPrinterParser {
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_print_emptyCalendrical() throws Exception {
-        getFormatter(DAY_OF_WEEK, TextStyle.FULL).formatTo(EMPTY_DTA, buf);
+        Assertions.assertThrows(DateTimeException.class, () -> getFormatter(DAY_OF_WEEK, TextStyle.FULL).formatTo(EMPTY_DTA, buf));
     }
 
+    @Test
     public void test_print_append() throws Exception {
         buf.append("EXISTING");
         getFormatter(DAY_OF_WEEK, TextStyle.FULL).formatTo(LocalDate.of(2012, 4, 18), buf);
-        assertEquals(buf.toString(), "EXISTINGWednesday");
+        assertEquals("EXISTINGWednesday", buf.toString());
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="print")
     Object[][] provider_dow() {
         return new Object[][] {
             {DAY_OF_WEEK, TextStyle.FULL, 1, "Monday"},
@@ -204,7 +209,6 @@ public class TestTextPrinter extends AbstractTestPrinterParser {
        };
     }
 
-    @DataProvider(name="print_DayOfWeekData")
     Object[][] providerDayOfWeekData() {
         return new Object[][] {
             // Locale, pattern, expected text, input DayOfWeek
@@ -214,26 +218,30 @@ public class TestTextPrinter extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="print")
+    @ParameterizedTest
+    @MethodSource("provider_dow")
     public void test_format(TemporalField field, TextStyle style, int value, String expected) throws Exception {
         getFormatter(field, style).formatTo(new MockFieldValue(field, value), buf);
-        assertEquals(buf.toString(), expected);
+        assertEquals(expected, buf.toString());
     }
 
-    @Test(dataProvider="print_DayOfWeekData")
+    @ParameterizedTest
+    @MethodSource("providerDayOfWeekData")
     public void test_formatDayOfWeek(Locale locale, String pattern, String expected, DayOfWeek dayOfWeek) {
         DateTimeFormatter formatter = getPatternFormatter(pattern).withLocale(locale);
         String text = formatter.format(dayOfWeek);
-        assertEquals(text, expected);
+        assertEquals(expected, text);
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_toString1() throws Exception {
-        assertEquals(getFormatter(MONTH_OF_YEAR, TextStyle.FULL).toString(), "Text(MonthOfYear)");
+        assertEquals("Text(MonthOfYear)", getFormatter(MONTH_OF_YEAR, TextStyle.FULL).toString());
     }
 
+    @Test
     public void test_toString2() throws Exception {
-        assertEquals(getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).toString(), "Text(MonthOfYear,SHORT)");
+        assertEquals("Text(MonthOfYear,SHORT)", getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).toString());
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestTextPrinterWithLocale.java b/test/jdk/java/time/test/java/time/format/TestTextPrinterWithLocale.java
index abbe4302f99..9b85de777b1 100644
--- a/test/jdk/java/time/test/java/time/format/TestTextPrinterWithLocale.java
+++ b/test/jdk/java/time/test/java/time/format/TestTextPrinterWithLocale.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,8 @@ import static java.time.temporal.ChronoField.DAY_OF_WEEK;
 import static java.time.temporal.ChronoField.ERA;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.IsoFields.QUARTER_OF_YEAR;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.DateTimeException;
 import java.time.DayOfWeek;
@@ -81,20 +82,22 @@ import java.time.format.TextStyle;
 import java.time.temporal.TemporalField;
 import java.util.Locale;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import test.java.time.temporal.MockFieldValue;
 
 /**
  * Test TextPrinterParserWithLocale.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestTextPrinterWithLocale extends AbstractTestPrinterParser {
     static final Locale RUSSIAN = Locale.of("ru");
     static final Locale FINNISH = Locale.of("fi");
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="print_DayOfWeekData")
     Object[][] providerDayOfWeekData() {
         return new Object[][] {
             // Locale, pattern, expected text, input DayOfWeek
@@ -109,7 +112,6 @@ public class TestTextPrinterWithLocale extends AbstractTestPrinterParser {
     }
 
     // Test data is dependent on localized resources.
-    @DataProvider(name="print_standalone")
     Object[][] provider_StandaloneNames() {
         return new Object[][] {
             // standalone names for 2013-01-01 (Tue)
@@ -121,31 +123,34 @@ public class TestTextPrinterWithLocale extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="print_DayOfWeekData")
+    @ParameterizedTest
+    @MethodSource("providerDayOfWeekData")
     public void test_formatDayOfWeek(Locale locale, String pattern, String expected, DayOfWeek dayOfWeek) {
         DateTimeFormatter formatter = getPatternFormatter(pattern).withLocale(locale);
         String text = formatter.format(dayOfWeek);
-        assertEquals(text, expected);
+        assertEquals(expected, text);
     }
 
-    @Test(dataProvider="print_standalone")
+    @ParameterizedTest
+    @MethodSource("provider_StandaloneNames")
     public void test_standaloneNames(Locale locale, TemporalField field, TextStyle style, String expected) {
         getFormatter(field, style).withLocale(locale).formatTo(LocalDate.of(2013, 1, 1), buf);
-        assertEquals(buf.toString(), expected);
+        assertEquals(expected, buf.toString());
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_print_french_long() throws Exception {
         getFormatter(MONTH_OF_YEAR, TextStyle.FULL).withLocale(Locale.FRENCH).formatTo(LocalDate.of(2012, 1, 1), buf);
-        assertEquals(buf.toString(), "janvier");
+        assertEquals("janvier", buf.toString());
     }
 
+    @Test
     public void test_print_french_short() throws Exception {
         getFormatter(MONTH_OF_YEAR, TextStyle.SHORT).withLocale(Locale.FRENCH).formatTo(LocalDate.of(2012, 1, 1), buf);
-        assertEquals(buf.toString(), "janv.");
+        assertEquals("janv.", buf.toString());
     }
 
-    @DataProvider(name="print_JapaneseChronology")
     Object[][] provider_japaneseEra() {
        return new Object[][] {
             {ERA,           TextStyle.FULL, 2, "Heisei"}, // Note: CLDR doesn't define "wide" Japanese era names.
@@ -154,10 +159,11 @@ public class TestTextPrinterWithLocale extends AbstractTestPrinterParser {
        };
     };
 
-    @Test(dataProvider="print_JapaneseChronology")
+    @ParameterizedTest
+    @MethodSource("provider_japaneseEra")
     public void test_formatJapaneseEra(TemporalField field, TextStyle style, int value, String expected) throws Exception {
         LocalDate ld = LocalDate.of(2013, 1, 31);
         getFormatter(field, style).withChronology(JapaneseChronology.INSTANCE).formatTo(ld, buf);
-        assertEquals(buf.toString(), expected);
+        assertEquals(expected, buf.toString());
     }
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestUTCParse.java b/test/jdk/java/time/test/java/time/format/TestUTCParse.java
index 2c41af68281..551f660e368 100644
--- a/test/jdk/java/time/test/java/time/format/TestUTCParse.java
+++ b/test/jdk/java/time/test/java/time/format/TestUTCParse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,13 +33,14 @@ import java.time.format.DateTimeFormatterBuilder;
 import java.time.format.TextStyle;
 import java.time.temporal.TemporalQueries;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestUTCParse {
 
-    @DataProvider
     public Object[][] utcZoneIdStrings() {
         return new Object[][] {
             {"UTC"},
@@ -48,12 +49,13 @@ public class TestUTCParse {
         };
     }
 
-    @Test(dataProvider = "utcZoneIdStrings")
+    @ParameterizedTest
+    @MethodSource("utcZoneIdStrings")
     public void testUTCOffsetRoundTrip(String zidString) {
         var fmt = new DateTimeFormatterBuilder()
                 .appendZoneText(TextStyle.NARROW)
                 .toFormatter();
         var zid = ZoneId.of(zidString);
-        assertEquals(fmt.parse(zidString).query(TemporalQueries.zoneId()), zid);
+        assertEquals(zid, fmt.parse(zidString).query(TemporalQueries.zoneId()));
     }
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestUnicodeExtension.java b/test/jdk/java/time/test/java/time/format/TestUnicodeExtension.java
index 6b99fea5c7c..80460fad007 100644
--- a/test/jdk/java/time/test/java/time/format/TestUnicodeExtension.java
+++ b/test/jdk/java/time/test/java/time/format/TestUnicodeExtension.java
@@ -31,7 +31,7 @@
  */
 package test.java.time.format;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.DayOfWeek;
 import java.time.ZonedDateTime;
@@ -50,15 +50,16 @@ import java.util.Locale;
 import java.util.TimeZone;
 import java.util.stream.Stream;
 
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test JavaTime with BCP47 U extensions
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestUnicodeExtension {
     private static TimeZone defaultTZ;
 
@@ -87,18 +88,17 @@ public class TestUnicodeExtension {
 
     private static final String PATTERN = "GGGG MMMM-dd-uu HH:mm:ss zzzz";
 
-    @BeforeTest
+    @BeforeAll
     public void beforeTest() {
         defaultTZ = TimeZone.getDefault();
         TimeZone.setDefault(TimeZone.getTimeZone(AMLA));
     }
 
-    @AfterTest
+    @AfterAll
     public void afterTest() {
         TimeZone.setDefault(defaultTZ);
     }
 
-    @DataProvider(name="localizedBy")
     Object[][] localizedBy() {
         return new Object[][] {
             // Locale, Chrono override, Zone override, Expected Chrono, Expected Zone,
@@ -188,7 +188,6 @@ public class TestUnicodeExtension {
         };
     }
 
-    @DataProvider(name="withLocale")
     Object[][] withLocale() {
         return new Object[][] {
             // Locale, Chrono override, Zone override, Expected Chrono, Expected Zone,
@@ -277,7 +276,6 @@ public class TestUnicodeExtension {
         };
     }
 
-    @DataProvider(name="firstDayOfWeek")
     Object[][] firstDayOfWeek () {
         return new Object[][] {
             // Locale, Expected DayOfWeek,
@@ -304,7 +302,6 @@ public class TestUnicodeExtension {
         };
     }
 
-    @DataProvider(name="minDaysInFirstWeek")
     Object[][] minDaysInFrstWeek () {
         return new Object[][] {
             // Locale, Expected minDay,
@@ -316,7 +313,6 @@ public class TestUnicodeExtension {
         };
     }
 
-    @DataProvider(name="ofPattern")
     Object[][] ofPattern() {
         return new Object[][] {
             // Locale, Expected Chrono, Expected Zone,
@@ -342,7 +338,6 @@ public class TestUnicodeExtension {
         };
     }
 
-    @DataProvider(name="shortTZID")
     Object[][] shortTZID() {
         return new Object[][] {
             // LDML's short ID, Expected Zone,
@@ -817,7 +812,6 @@ public class TestUnicodeExtension {
         };
     }
 
-    @DataProvider(name="getLocalizedDateTimePattern")
     Object[][] getLocalizedDateTimePattern() {
         return new Object[][] {
             // Locale, Expected pattern,
@@ -832,7 +826,6 @@ public class TestUnicodeExtension {
         };
     }
 
-    @DataProvider(name="getDisplayName")
     Object[][] getDisplayName() {
         return new Object[][] {
             // Locale, field, Expected name,
@@ -841,7 +834,8 @@ public class TestUnicodeExtension {
         };
     }
 
-    @Test(dataProvider="localizedBy")
+    @ParameterizedTest
+    @MethodSource("localizedBy")
     public void test_localizedBy(Locale locale, Chronology chrono, ZoneId zone,
                                 Chronology chronoExpected, ZoneId zoneExpected,
                                 String formatExpected) {
@@ -855,91 +849,94 @@ public class TestUnicodeExtension {
                 DateTimeFormatter dtf =
                         DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL, FormatStyle.FULL)
                                 .withChronology(chrono).withZone(zone).localizedBy(locale);
-                assertEquals(dtf.getChronology(), chronoExpected);
-                assertEquals(dtf.getZone(), zoneExpected);
+                assertEquals(chronoExpected, dtf.getChronology());
+                assertEquals(zoneExpected, dtf.getZone());
                 String formatted = dtf.format(ZDT);
-                assertEquals(formatted, formatExpected);
-                assertEquals(dtf.parse(formatted, ZonedDateTime::from),
-                        zoneExpected != null ? ZDT.withZoneSameInstant(zoneExpected) : ZDT);
+                assertEquals(formatExpected, formatted);
+                assertEquals(zoneExpected != null ? ZDT.withZoneSameInstant(zoneExpected) : ZDT, dtf.parse(formatted, ZonedDateTime::from));
             });
         } finally {
             Locale.setDefault(def);
         }
     }
 
-    @Test(dataProvider="withLocale")
+    @ParameterizedTest
+    @MethodSource("withLocale")
     public void test_withLocale(Locale locale, Chronology chrono, ZoneId zone,
                                 Chronology chronoExpected, ZoneId zoneExpected,
                                 String formatExpected) {
         DateTimeFormatter dtf =
             DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL, FormatStyle.FULL)
                 .withChronology(chrono).withZone(zone).withLocale(locale);
-        assertEquals(dtf.getChronology(), chronoExpected);
-        assertEquals(dtf.getZone(), zoneExpected);
+        assertEquals(chronoExpected, dtf.getChronology());
+        assertEquals(zoneExpected, dtf.getZone());
         String formatted = dtf.format(ZDT);
-        assertEquals(formatted, formatExpected);
-        assertEquals(dtf.parse(formatted, ZonedDateTime::from),
-            zoneExpected != null ? ZDT.withZoneSameInstant(zoneExpected) : ZDT);
+        assertEquals(formatExpected, formatted);
+        assertEquals(zoneExpected != null ? ZDT.withZoneSameInstant(zoneExpected) : ZDT, dtf.parse(formatted, ZonedDateTime::from));
     }
 
-    @Test(dataProvider="firstDayOfWeek")
+    @ParameterizedTest
+    @MethodSource("firstDayOfWeek")
     public void test_firstDayOfWeek(Locale locale, DayOfWeek dowExpected) {
         DayOfWeek dow = WeekFields.of(locale).getFirstDayOfWeek();
-        assertEquals(dow, dowExpected);
+        assertEquals(dowExpected, dow);
     }
 
-    @Test(dataProvider="minDaysInFirstWeek")
+    @ParameterizedTest
+    @MethodSource("minDaysInFrstWeek")
     public void test_minDaysInFirstWeek(Locale locale, int minDaysExpected) {
         int minDays = WeekFields.of(locale).getMinimalDaysInFirstWeek();
-        assertEquals(minDays, minDaysExpected);
+        assertEquals(minDaysExpected, minDays);
     }
 
-    @Test(dataProvider="ofPattern")
+    @ParameterizedTest
+    @MethodSource("ofPattern")
     public void test_ofPattern(Locale locale,
                                 Chronology chronoExpected, ZoneId zoneExpected,
                                 String formatExpected) {
         DateTimeFormatter dtf =
             DateTimeFormatter.ofPattern(PATTERN, locale);
-        assertEquals(dtf.getChronology(), chronoExpected);
-        assertEquals(dtf.getZone(), zoneExpected);
+        assertEquals(chronoExpected, dtf.getChronology());
+        assertEquals(zoneExpected, dtf.getZone());
         String formatted = dtf.format(ZDT);
-        assertEquals(formatted, formatExpected);
-        assertEquals(dtf.parse(formatted, ZonedDateTime::from),
-            zoneExpected != null ? ZDT.withZoneSameInstant(zoneExpected) : ZDT);
+        assertEquals(formatExpected, formatted);
+        assertEquals(zoneExpected != null ? ZDT.withZoneSameInstant(zoneExpected) : ZDT, dtf.parse(formatted, ZonedDateTime::from));
     }
 
-    @Test(dataProvider="ofPattern")
+    @ParameterizedTest
+    @MethodSource("ofPattern")
     public void test_toFormatter(Locale locale,
                                 Chronology chronoExpected, ZoneId zoneExpected,
                                 String formatExpected) {
         DateTimeFormatter dtf =
             new DateTimeFormatterBuilder().appendPattern(PATTERN).toFormatter(locale);
-        assertEquals(dtf.getChronology(), chronoExpected);
-        assertEquals(dtf.getZone(), zoneExpected);
+        assertEquals(chronoExpected, dtf.getChronology());
+        assertEquals(zoneExpected, dtf.getZone());
         String formatted = dtf.format(ZDT);
-        assertEquals(formatted, formatExpected);
-        assertEquals(dtf.parse(formatted, ZonedDateTime::from),
-            zoneExpected != null ? ZDT.withZoneSameInstant(zoneExpected) : ZDT);
+        assertEquals(formatExpected, formatted);
+        assertEquals(zoneExpected != null ? ZDT.withZoneSameInstant(zoneExpected) : ZDT, dtf.parse(formatted, ZonedDateTime::from));
     }
 
-    @Test(dataProvider="shortTZID")
+    @ParameterizedTest
+    @MethodSource("shortTZID")
     public void test_shortTZID(String shortID, String expectedZone) {
         Locale l = Locale.forLanguageTag("en-US-u-tz-" + shortID);
         DateTimeFormatter dtf =
             DateTimeFormatter.ofLocalizedDateTime(FormatStyle.FULL, FormatStyle.FULL)
                 .localizedBy(l);
-        assertEquals(dtf.getZone(), ZoneId.of(expectedZone));
+        assertEquals(ZoneId.of(expectedZone), dtf.getZone());
     }
 
-    @Test(dataProvider="getLocalizedDateTimePattern")
+    @ParameterizedTest
+    @MethodSource("getLocalizedDateTimePattern")
     public void test_getLocalizedDateTimePattern(Locale l, FormatStyle s, String expectedPattern) {
         DateTimeFormatterBuilder dtfb = new DateTimeFormatterBuilder();
-        assertEquals(dtfb.getLocalizedDateTimePattern(s, s, IsoChronology.INSTANCE, l),
-            expectedPattern);
+        assertEquals(expectedPattern, dtfb.getLocalizedDateTimePattern(s, s, IsoChronology.INSTANCE, l));
     }
 
-    @Test(dataProvider="getDisplayName")
+    @ParameterizedTest
+    @MethodSource("getDisplayName")
     public void test_getDisplayName(Locale l, TemporalField f, String expectedName) {
-        assertEquals(f.getDisplayName(l), expectedName);
+        assertEquals(expectedName, f.getDisplayName(l));
     }
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestZoneOffsetParser.java b/test/jdk/java/time/test/java/time/format/TestZoneOffsetParser.java
index 32425549834..b5807e3cb2d 100644
--- a/test/jdk/java/time/test/java/time/format/TestZoneOffsetParser.java
+++ b/test/jdk/java/time/test/java/time/format/TestZoneOffsetParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,24 +60,26 @@
 package test.java.time.format;
 
 import static java.time.temporal.ChronoField.OFFSET_SECONDS;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.text.ParsePosition;
 import java.time.ZoneOffset;
 import java.time.temporal.TemporalAccessor;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test ZoneOffsetPrinterParser.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestZoneOffsetParser extends AbstractTestPrinterParser {
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="error")
     Object[][] data_error() {
         return new Object[][] {
             {"+HH:MM:ss", "Z", "hello", -1, IndexOutOfBoundsException.class},
@@ -85,7 +87,8 @@ public class TestZoneOffsetParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="error")
+    @ParameterizedTest
+    @MethodSource("data_error")
     public void test_parse_error(String pattern, String noOffsetText, String text, int pos, Class<?> expected) {
         try {
             getFormatter(pattern, noOffsetText).parseUnresolved(text, new ParsePosition(pos));
@@ -95,65 +98,72 @@ public class TestZoneOffsetParser extends AbstractTestPrinterParser {
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_parse_exactMatch_UTC() throws Exception {
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter("+HH:MM:ss", "Z").parseUnresolved("Z", pos);
-        assertEquals(pos.getIndex(), 1);
+        assertEquals(1, pos.getIndex());
         assertParsed(parsed, ZoneOffset.UTC);
     }
 
+    @Test
     public void test_parse_startStringMatch_UTC() throws Exception {
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter("+HH:MM:ss", "Z").parseUnresolved("ZOTHER", pos);
-        assertEquals(pos.getIndex(), 1);
+        assertEquals(1, pos.getIndex());
         assertParsed(parsed, ZoneOffset.UTC);
     }
 
+    @Test
     public void test_parse_midStringMatch_UTC() throws Exception {
         ParsePosition pos = new ParsePosition(5);
         TemporalAccessor parsed = getFormatter("+HH:MM:ss", "Z").parseUnresolved("OTHERZOTHER", pos);
-        assertEquals(pos.getIndex(), 6);
+        assertEquals(6, pos.getIndex());
         assertParsed(parsed, ZoneOffset.UTC);
     }
 
+    @Test
     public void test_parse_endStringMatch_UTC() throws Exception {
         ParsePosition pos = new ParsePosition(5);
         TemporalAccessor parsed = getFormatter("+HH:MM:ss", "Z").parseUnresolved("OTHERZ", pos);
-        assertEquals(pos.getIndex(), 6);
+        assertEquals(6, pos.getIndex());
         assertParsed(parsed, ZoneOffset.UTC);
     }
 
     //-----------------------------------------------------------------------
+    @Test
     public void test_parse_exactMatch_UTC_EmptyUTC() throws Exception {
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter("+HH:MM:ss", "").parseUnresolved("", pos);
-        assertEquals(pos.getIndex(), 0);
+        assertEquals(0, pos.getIndex());
         assertParsed(parsed, ZoneOffset.UTC);
     }
 
+    @Test
     public void test_parse_startStringMatch_UTC_EmptyUTC() throws Exception {
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter("+HH:MM:ss", "").parseUnresolved("OTHER", pos);
-        assertEquals(pos.getIndex(), 0);
+        assertEquals(0, pos.getIndex());
         assertParsed(parsed, ZoneOffset.UTC);
     }
 
+    @Test
     public void test_parse_midStringMatch_UTC_EmptyUTC() throws Exception {
         ParsePosition pos = new ParsePosition(5);
         TemporalAccessor parsed = getFormatter("+HH:MM:ss", "").parseUnresolved("OTHEROTHER", pos);
-        assertEquals(pos.getIndex(), 5);
+        assertEquals(5, pos.getIndex());
         assertParsed(parsed, ZoneOffset.UTC);
     }
 
+    @Test
     public void test_parse_endStringMatch_UTC_EmptyUTC() throws Exception {
         ParsePosition pos = new ParsePosition(5);
         TemporalAccessor parsed = getFormatter("+HH:MM:ss", "").parseUnresolved("OTHER", pos);
-        assertEquals(pos.getIndex(), 5);
+        assertEquals(5, pos.getIndex());
         assertParsed(parsed, ZoneOffset.UTC);
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="offsets")
     Object[][] provider_offsets() {
         return new Object[][] {
             {"+HH", "+00", ZoneOffset.UTC},
@@ -228,72 +238,79 @@ public class TestZoneOffsetParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="offsets")
+    @ParameterizedTest
+    @MethodSource("provider_offsets")
     public void test_parse_exactMatch(String pattern, String parse, ZoneOffset expected) throws Exception {
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter(pattern, "Z").parseUnresolved(parse, pos);
-        assertEquals(pos.getIndex(), parse.length());
+        assertEquals(parse.length(), pos.getIndex());
         assertParsed(parsed, expected);
     }
 
-    @Test(dataProvider="offsets")
+    @ParameterizedTest
+    @MethodSource("provider_offsets")
     public void test_parse_startStringMatch(String pattern, String parse, ZoneOffset expected) throws Exception {
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter(pattern, "Z").parseUnresolved(parse + ":OTHER", pos);
-        assertEquals(pos.getIndex(), parse.length());
+        assertEquals(parse.length(), pos.getIndex());
         assertParsed(parsed, expected);
     }
 
-    @Test(dataProvider="offsets")
+    @ParameterizedTest
+    @MethodSource("provider_offsets")
     public void test_parse_midStringMatch(String pattern, String parse, ZoneOffset expected) throws Exception {
         ParsePosition pos = new ParsePosition(5);
         TemporalAccessor parsed = getFormatter(pattern, "Z").parseUnresolved("OTHER" + parse + ":OTHER", pos);
-        assertEquals(pos.getIndex(), parse.length() + 5);
+        assertEquals(parse.length() + 5, pos.getIndex());
         assertParsed(parsed, expected);
     }
 
-    @Test(dataProvider="offsets")
+    @ParameterizedTest
+    @MethodSource("provider_offsets")
     public void test_parse_endStringMatch(String pattern, String parse, ZoneOffset expected) throws Exception {
         ParsePosition pos = new ParsePosition(5);
         TemporalAccessor parsed = getFormatter(pattern, "Z").parseUnresolved("OTHER" + parse, pos);
-        assertEquals(pos.getIndex(), parse.length() + 5);
+        assertEquals(parse.length() + 5, pos.getIndex());
         assertParsed(parsed, expected);
     }
 
-    @Test(dataProvider="offsets")
+    @ParameterizedTest
+    @MethodSource("provider_offsets")
     public void test_parse_exactMatch_EmptyUTC(String pattern, String parse, ZoneOffset expected) throws Exception {
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter(pattern, "").parseUnresolved(parse, pos);
-        assertEquals(pos.getIndex(), parse.length());
+        assertEquals(parse.length(), pos.getIndex());
         assertParsed(parsed, expected);
     }
 
-    @Test(dataProvider="offsets")
+    @ParameterizedTest
+    @MethodSource("provider_offsets")
     public void test_parse_startStringMatch_EmptyUTC(String pattern, String parse, ZoneOffset expected) throws Exception {
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter(pattern, "").parseUnresolved(parse + ":OTHER", pos);
-        assertEquals(pos.getIndex(), parse.length());
+        assertEquals(parse.length(), pos.getIndex());
         assertParsed(parsed, expected);
     }
 
-    @Test(dataProvider="offsets")
+    @ParameterizedTest
+    @MethodSource("provider_offsets")
     public void test_parse_midStringMatch_EmptyUTC(String pattern, String parse, ZoneOffset expected) throws Exception {
         ParsePosition pos = new ParsePosition(5);
         TemporalAccessor parsed = getFormatter(pattern, "").parseUnresolved("OTHER" + parse + ":OTHER", pos);
-        assertEquals(pos.getIndex(), parse.length() + 5);
+        assertEquals(parse.length() + 5, pos.getIndex());
         assertParsed(parsed, expected);
     }
 
-    @Test(dataProvider="offsets")
+    @ParameterizedTest
+    @MethodSource("provider_offsets")
     public void test_parse_endStringMatch_EmptyUTC(String pattern, String parse, ZoneOffset expected) throws Exception {
         ParsePosition pos = new ParsePosition(5);
         TemporalAccessor parsed = getFormatter(pattern, "").parseUnresolved("OTHER" + parse, pos);
-        assertEquals(pos.getIndex(), parse.length() + 5);
+        assertEquals(parse.length() + 5, pos.getIndex());
         assertParsed(parsed, expected);
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="bigOffsets")
     Object[][] provider_bigOffsets() {
         return new Object[][] {
             {"+HH", "+19", 19 * 3600},
@@ -319,16 +336,16 @@ public class TestZoneOffsetParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="bigOffsets")
+    @ParameterizedTest
+    @MethodSource("provider_bigOffsets")
     public void test_parse_bigOffsets(String pattern, String parse, long offsetSecs) throws Exception {
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter(pattern, "").parseUnresolved(parse, pos);
-        assertEquals(pos.getIndex(), parse.length());
-        assertEquals(parsed.getLong(OFFSET_SECONDS), offsetSecs);
+        assertEquals(parse.length(), pos.getIndex());
+        assertEquals(offsetSecs, parsed.getLong(OFFSET_SECONDS));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="badOffsets")
     Object[][] provider_badOffsets() {
         return new Object[][] {
             {"+HH", "+1", 0},
@@ -390,55 +407,60 @@ public class TestZoneOffsetParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="badOffsets")
+    @ParameterizedTest
+    @MethodSource("provider_badOffsets")
     public void test_parse_invalid(String pattern, String parse, int expectedPosition) throws Exception {
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter(pattern, "Z").parseUnresolved(parse, pos);
-        assertEquals(pos.getErrorIndex(), expectedPosition);
-        assertEquals(parsed, null);
+        assertEquals(expectedPosition, pos.getErrorIndex());
+        assertEquals(null, parsed);
     }
 
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
+    @Test
     public void test_parse_caseSensitiveUTC_matchedCase() throws Exception {
         setCaseSensitive(true);
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter("+HH:MM:ss", "Z").parseUnresolved("Z", pos);
-        assertEquals(pos.getIndex(), 1);
+        assertEquals(1, pos.getIndex());
         assertParsed(parsed, ZoneOffset.UTC);
     }
 
+    @Test
     public void test_parse_caseSensitiveUTC_unmatchedCase() throws Exception {
         setCaseSensitive(true);
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter("+HH:MM:ss", "Z").parseUnresolved("z", pos);
-        assertEquals(pos.getErrorIndex(), 0);
-        assertEquals(parsed, null);
+        assertEquals(0, pos.getErrorIndex());
+        assertEquals(null, parsed);
     }
 
+    @Test
     public void test_parse_caseInsensitiveUTC_matchedCase() throws Exception {
         setCaseSensitive(false);
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter("+HH:MM:ss", "Z").parseUnresolved("Z", pos);
-        assertEquals(pos.getIndex(), 1);
+        assertEquals(1, pos.getIndex());
         assertParsed(parsed, ZoneOffset.UTC);
     }
 
+    @Test
     public void test_parse_caseInsensitiveUTC_unmatchedCase() throws Exception {
         setCaseSensitive(false);
         ParsePosition pos = new ParsePosition(0);
         TemporalAccessor parsed = getFormatter("+HH:MM:ss", "Z").parseUnresolved("z", pos);
-        assertEquals(pos.getIndex(), 1);
+        assertEquals(1, pos.getIndex());
         assertParsed(parsed, ZoneOffset.UTC);
     }
 
     private void assertParsed(TemporalAccessor parsed, ZoneOffset expectedOffset) {
         if (expectedOffset == null) {
-            assertEquals(parsed, null);
+            assertEquals(null, parsed);
         } else {
-            assertEquals(parsed.isSupported(OFFSET_SECONDS), true);
-            assertEquals(parsed.getLong(OFFSET_SECONDS), (long) expectedOffset.getTotalSeconds());
+            assertEquals(true, parsed.isSupported(OFFSET_SECONDS));
+            assertEquals((long) expectedOffset.getTotalSeconds(), parsed.getLong(OFFSET_SECONDS));
         }
     }
 
diff --git a/test/jdk/java/time/test/java/time/format/TestZoneOffsetPrinter.java b/test/jdk/java/time/test/java/time/format/TestZoneOffsetPrinter.java
index 4e1b7a402c7..12d54d12200 100644
--- a/test/jdk/java/time/test/java/time/format/TestZoneOffsetPrinter.java
+++ b/test/jdk/java/time/test/java/time/format/TestZoneOffsetPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,24 +59,26 @@
  */
 package test.java.time.format;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.DateTimeException;
 import java.time.ZoneOffset;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test ZoneOffsetPrinterParser.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestZoneOffsetPrinter extends AbstractTestPrinterParser {
 
     private static final ZoneOffset OFFSET_0130 = ZoneOffset.of("+01:30");
 
     //-----------------------------------------------------------------------
-    @DataProvider(name="offsets")
     Object[][] provider_offsets() {
         return new Object[][] {
             {"+HH", "NO-OFFSET", ZoneOffset.UTC},
@@ -147,27 +149,30 @@ public class TestZoneOffsetPrinter extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="offsets")
+    @ParameterizedTest
+    @MethodSource("provider_offsets")
     public void test_format(String pattern, String expected, ZoneOffset offset) throws Exception {
         buf.append("EXISTING");
         getFormatter(pattern, "NO-OFFSET").formatTo(offset, buf);
-        assertEquals(buf.toString(), "EXISTING" + expected);
+        assertEquals("EXISTING" + expected, buf.toString());
     }
 
-    @Test(dataProvider="offsets")
+    @ParameterizedTest
+    @MethodSource("provider_offsets")
     public void test_toString(String pattern, String expected, ZoneOffset offset) throws Exception {
-        assertEquals(getFormatter(pattern, "NO-OFFSET").toString(), "Offset(" + pattern + ",'NO-OFFSET')");
+        assertEquals("Offset(" + pattern + ",'NO-OFFSET')", getFormatter(pattern, "NO-OFFSET").toString());
     }
 
     //-----------------------------------------------------------------------
-    @Test(expectedExceptions=DateTimeException.class)
+    @Test
     public void test_print_emptyCalendrical() throws Exception {
-        getFormatter("+HH:MM:ss", "Z").formatTo(EMPTY_DTA, buf);
+        Assertions.assertThrows(DateTimeException.class, () -> getFormatter("+HH:MM:ss", "Z").formatTo(EMPTY_DTA, buf));
     }
 
+    @Test
     public void test_print_emptyAppendable() throws Exception {
         getFormatter("+HH:MM:ss", "Z").formatTo(OFFSET_0130, buf);
-        assertEquals(buf.toString(), "+01:30");
+        assertEquals("+01:30", buf.toString());
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java b/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java
index 20861f151e0..abe3cd6b154 100644
--- a/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java
+++ b/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java
@@ -23,8 +23,8 @@
 
 package test.java.time.format;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.text.DateFormatSymbols;
 import java.time.ZoneId;
@@ -46,8 +46,10 @@ import java.util.Set;
 import java.util.TimeZone;
 import jdk.test.lib.RandomFactory;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -59,7 +61,7 @@ import org.testng.annotations.Test;
 /**
  * Test ZoneTextPrinterParser
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestZoneTextPrinterParser extends AbstractTestPrinterParser {
 
     private static final Locale[] SAMPLE_LOCALES = {
@@ -73,6 +75,7 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser {
                                              .withDecimalStyle(DecimalStyle.of(locale));
     }
 
+    @Test
     public void test_printText() {
         Random r = RandomFactory.getRandom();
         int N = 8;
@@ -123,9 +126,10 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser {
             System.out.printf("[%-5s, %5s] :[%s]%n", locale.toString(), style.toString(),result);
             System.out.printf(" %5s, %5s  :[%s] %s%n", "", "", expected, zone);
         }
-        assertEquals(result, expected);
+        assertEquals(expected, result);
     }
 
+    @Test
     public void test_ParseText() {
         Set<String> zids = ZoneRulesProvider.getAvailableZoneIds();
         for (Locale locale : SAMPLE_LOCALES) {
@@ -153,7 +157,6 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser {
 
     private static Set<ZoneId> none = new HashSet<>();
 
-    @DataProvider(name="preferredZones")
     Object[][] data_preferredZones() {
         return new Object[][] {
             {"America/New_York", "Eastern Standard Time", none,      Locale.ENGLISH, TextStyle.FULL},
@@ -178,7 +181,8 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser {
        };
     }
 
-    @Test(dataProvider="preferredZones")
+    @ParameterizedTest
+    @MethodSource("data_preferredZones")
     public void test_ParseText(String expected, String text, Set<ZoneId> preferred, Locale locale, TextStyle style) {
         DateTimeFormatter fmt = new DateTimeFormatterBuilder().appendZoneText(style, preferred)
                                                               .toFormatter(locale)
@@ -191,7 +195,7 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser {
                           style == TextStyle.FULL ? " full" :"short",
                           text, ret, expected);
 
-        assertEquals(ret, expected);
+        assertEquals(expected, ret);
 
     }
 
@@ -246,7 +250,6 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser {
                  .withDecimalStyle(DecimalStyle.of(locale));
     }
 
-    @DataProvider(name="roundTripAtOverlap")
     Object[][] data_roundTripAtOverlap() {
         return new Object[][] {
             {"yyyy-MM-dd HH:mm:ss.SSS z",       "2021-10-31 02:30:00.000 CET"},
@@ -265,10 +268,11 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser {
         };
     }
 
-    @Test(dataProvider="roundTripAtOverlap")
+    @ParameterizedTest
+    @MethodSource("data_roundTripAtOverlap")
     public void test_roundTripAtOverlap(String pattern, String input) {
         var dtf = DateTimeFormatter.ofPattern(pattern, Locale.US);
-        assertEquals(dtf.format(ZonedDateTime.parse(input, dtf)), input);
+        assertEquals(input, dtf.format(ZonedDateTime.parse(input, dtf)));
         var lc = input.toLowerCase(Locale.ROOT);
         try {
             ZonedDateTime.parse(lc, dtf);
@@ -276,7 +280,7 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser {
         } catch (DateTimeParseException ignore) {}
 
         dtf = new DateTimeFormatterBuilder().parseCaseInsensitive().appendPattern(pattern).toFormatter(Locale.US);
-        assertEquals(dtf.format(ZonedDateTime.parse(input, dtf)), input);
-        assertEquals(dtf.format(ZonedDateTime.parse(lc, dtf)), input);
+        assertEquals(input, dtf.format(ZonedDateTime.parse(input, dtf)));
+        assertEquals(input, dtf.format(ZonedDateTime.parse(lc, dtf)));
     }
 }
diff --git a/test/jdk/java/time/test/java/time/temporal/TestChronoField.java b/test/jdk/java/time/test/java/time/temporal/TestChronoField.java
index a353a6b247b..716f586ff79 100644
--- a/test/jdk/java/time/test/java/time/temporal/TestChronoField.java
+++ b/test/jdk/java/time/test/java/time/temporal/TestChronoField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,8 +54,7 @@
  */
 package test.java.time.temporal;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.temporal.ChronoField;
 import java.time.temporal.IsoFields;
@@ -64,18 +63,18 @@ import java.time.temporal.WeekFields;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-import java.util.ResourceBundle;
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestChronoField {
     Map<ChronoField, String> fieldMap;
 
 
-    @BeforeClass
+    @BeforeAll
     public void initClass() {
         fieldMap = new HashMap<>();
         fieldMap.put(ChronoField.ERA, "era");
@@ -91,7 +90,6 @@ public class TestChronoField {
         fieldMap.put(ChronoField.OFFSET_SECONDS, "zone");
     }
 
-    @DataProvider(name = "localeList")
     Locale[] data_localeList() {
         return new Locale[] {
                 Locale.US,
@@ -101,7 +99,6 @@ public class TestChronoField {
         };
     }
     //-----------------------------------------------------------------------
-    @DataProvider(name = "localeDisplayNames")
     Object[][] data_localeDisplayNames() {
         return new Object[][] {
                 {ChronoField.ERA},
@@ -121,12 +118,14 @@ public class TestChronoField {
     public void test_IsoFields_week_based_year() {
         Locale locale = Locale.US;
         String name = IsoFields.WEEK_OF_WEEK_BASED_YEAR.getDisplayName(locale);
-        assertEquals(name, "week");
+        assertEquals("week", name);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_nullIsoFields_week_based_year() {
-        String name = IsoFields.WEEK_OF_WEEK_BASED_YEAR.getDisplayName((Locale)null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            String name = IsoFields.WEEK_OF_WEEK_BASED_YEAR.getDisplayName((Locale)null);
+        });
     }
 
     @Test
@@ -134,24 +133,28 @@ public class TestChronoField {
         Locale locale = Locale.US;
         TemporalField weekOfYearField = WeekFields.SUNDAY_START.weekOfYear();
         String name = weekOfYearField.getDisplayName(locale);
-        assertEquals(name, "week");
+        assertEquals("week", name);
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_nullWeekFields_week_based_year() {
-        TemporalField weekOfYearField = WeekFields.SUNDAY_START.weekOfYear();
-        String name = weekOfYearField.getDisplayName((Locale)null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            TemporalField weekOfYearField = WeekFields.SUNDAY_START.weekOfYear();
+            String name = weekOfYearField.getDisplayName((Locale)null);
+        });
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_nullLocaleChronoFieldDisplayName() {
-        ChronoField.YEAR.getDisplayName((Locale)null);
+        Assertions.assertThrows(NullPointerException.class, () -> ChronoField.YEAR.getDisplayName((Locale)null));
     }
 
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     public void test_nullLocaleTemporalFieldDisplayName() {
-        // Test the default method in TemporalField using the
-        // IsoFields.DAY_OF_QUARTER which does not override getDisplayName
-        IsoFields.DAY_OF_QUARTER.getDisplayName((Locale)null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            // Test the default method in TemporalField using the
+            // IsoFields.DAY_OF_QUARTER which does not override getDisplayName
+            IsoFields.DAY_OF_QUARTER.getDisplayName((Locale)null);
+        });
     }
 }
diff --git a/test/jdk/java/time/test/java/time/temporal/TestChronoUnit.java b/test/jdk/java/time/test/java/time/temporal/TestChronoUnit.java
index 95e5f6503ed..11ebcfd13bd 100644
--- a/test/jdk/java/time/test/java/time/temporal/TestChronoUnit.java
+++ b/test/jdk/java/time/test/java/time/temporal/TestChronoUnit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,23 +65,24 @@ import static java.time.temporal.ChronoUnit.DAYS;
 import static java.time.temporal.ChronoUnit.MONTHS;
 import static java.time.temporal.ChronoUnit.WEEKS;
 import static java.time.temporal.ChronoUnit.YEARS;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.LocalDate;
 import java.time.Month;
 import java.time.ZoneOffset;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestChronoUnit {
 
     //-----------------------------------------------------------------------
-    @DataProvider(name = "yearsBetween")
     Object[][] data_yearsBetween() {
         return new Object[][] {
             {date(1939, SEPTEMBER, 2), date(1939, SEPTEMBER, 1), 0},
@@ -102,47 +103,52 @@ public class TestChronoUnit {
         };
     }
 
-    @Test(dataProvider = "yearsBetween")
+    @ParameterizedTest
+    @MethodSource("data_yearsBetween")
     public void test_yearsBetween(LocalDate start, LocalDate end, long expected) {
-        assertEquals(YEARS.between(start, end), expected);
+        assertEquals(expected, YEARS.between(start, end));
     }
 
-    @Test(dataProvider = "yearsBetween")
+    @ParameterizedTest
+    @MethodSource("data_yearsBetween")
     public void test_yearsBetweenReversed(LocalDate start, LocalDate end, long expected) {
-        assertEquals(YEARS.between(end, start), -expected);
+        assertEquals(-expected, YEARS.between(end, start));
     }
 
-    @Test(dataProvider = "yearsBetween")
+    @ParameterizedTest
+    @MethodSource("data_yearsBetween")
     public void test_yearsBetween_LocalDateTimeSameTime(LocalDate start, LocalDate end, long expected) {
-        assertEquals(YEARS.between(start.atTime(12, 30), end.atTime(12, 30)), expected);
+        assertEquals(expected, YEARS.between(start.atTime(12, 30), end.atTime(12, 30)));
     }
 
-    @Test(dataProvider = "yearsBetween")
+    @ParameterizedTest
+    @MethodSource("data_yearsBetween")
     public void test_yearsBetween_LocalDateTimeLaterTime(LocalDate start, LocalDate end, long expected) {
         if (expected >= 0) {
-            assertEquals(YEARS.between(start.atTime(12, 30), end.atTime(12, 31)), expected);
+            assertEquals(expected, YEARS.between(start.atTime(12, 30), end.atTime(12, 31)));
         } else {
-            assertEquals(YEARS.between(start.atTime(12, 30), end.atTime(12, 29)), expected);
+            assertEquals(expected, YEARS.between(start.atTime(12, 30), end.atTime(12, 29)));
         }
     }
 
-    @Test(dataProvider = "yearsBetween")
+    @ParameterizedTest
+    @MethodSource("data_yearsBetween")
     public void test_yearsBetween_ZonedDateSameOffset(LocalDate start, LocalDate end, long expected) {
-        assertEquals(YEARS.between(start.atStartOfDay(ZoneOffset.ofHours(2)), end.atStartOfDay(ZoneOffset.ofHours(2))), expected);
+        assertEquals(expected, YEARS.between(start.atStartOfDay(ZoneOffset.ofHours(2)), end.atStartOfDay(ZoneOffset.ofHours(2))));
     }
 
-    @Test(dataProvider = "yearsBetween")
+    @ParameterizedTest
+    @MethodSource("data_yearsBetween")
     public void test_yearsBetween_ZonedDateLaterOffset(LocalDate start, LocalDate end, long expected) {
         // +01:00 is later than +02:00
         if (expected >= 0) {
-            assertEquals(YEARS.between(start.atStartOfDay(ZoneOffset.ofHours(2)), end.atStartOfDay(ZoneOffset.ofHours(1))), expected);
+            assertEquals(expected, YEARS.between(start.atStartOfDay(ZoneOffset.ofHours(2)), end.atStartOfDay(ZoneOffset.ofHours(1))));
         } else {
-            assertEquals(YEARS.between(start.atStartOfDay(ZoneOffset.ofHours(1)), end.atStartOfDay(ZoneOffset.ofHours(2))), expected);
+            assertEquals(expected, YEARS.between(start.atStartOfDay(ZoneOffset.ofHours(1)), end.atStartOfDay(ZoneOffset.ofHours(2))));
         }
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name = "monthsBetween")
     Object[][] data_monthsBetween() {
         return new Object[][] {
             {date(2012, JULY, 2), date(2012, JULY, 1), 0},
@@ -175,47 +181,52 @@ public class TestChronoUnit {
         };
     }
 
-    @Test(dataProvider = "monthsBetween")
+    @ParameterizedTest
+    @MethodSource("data_monthsBetween")
     public void test_monthsBetween(LocalDate start, LocalDate end, long expected) {
-        assertEquals(MONTHS.between(start, end), expected);
+        assertEquals(expected, MONTHS.between(start, end));
     }
 
-    @Test(dataProvider = "monthsBetween")
+    @ParameterizedTest
+    @MethodSource("data_monthsBetween")
     public void test_monthsBetweenReversed(LocalDate start, LocalDate end, long expected) {
-        assertEquals(MONTHS.between(end, start), -expected);
+        assertEquals(-expected, MONTHS.between(end, start));
     }
 
-    @Test(dataProvider = "monthsBetween")
+    @ParameterizedTest
+    @MethodSource("data_monthsBetween")
     public void test_monthsBetween_LocalDateTimeSameTime(LocalDate start, LocalDate end, long expected) {
-        assertEquals(MONTHS.between(start.atTime(12, 30), end.atTime(12, 30)), expected);
+        assertEquals(expected, MONTHS.between(start.atTime(12, 30), end.atTime(12, 30)));
     }
 
-    @Test(dataProvider = "monthsBetween")
+    @ParameterizedTest
+    @MethodSource("data_monthsBetween")
     public void test_monthsBetween_LocalDateTimeLaterTime(LocalDate start, LocalDate end, long expected) {
         if (expected >= 0) {
-            assertEquals(MONTHS.between(start.atTime(12, 30), end.atTime(12, 31)), expected);
+            assertEquals(expected, MONTHS.between(start.atTime(12, 30), end.atTime(12, 31)));
         } else {
-            assertEquals(MONTHS.between(start.atTime(12, 30), end.atTime(12, 29)), expected);
+            assertEquals(expected, MONTHS.between(start.atTime(12, 30), end.atTime(12, 29)));
         }
     }
 
-    @Test(dataProvider = "monthsBetween")
+    @ParameterizedTest
+    @MethodSource("data_monthsBetween")
     public void test_monthsBetween_ZonedDateSameOffset(LocalDate start, LocalDate end, long expected) {
-        assertEquals(MONTHS.between(start.atStartOfDay(ZoneOffset.ofHours(2)), end.atStartOfDay(ZoneOffset.ofHours(2))), expected);
+        assertEquals(expected, MONTHS.between(start.atStartOfDay(ZoneOffset.ofHours(2)), end.atStartOfDay(ZoneOffset.ofHours(2))));
     }
 
-    @Test(dataProvider = "monthsBetween")
+    @ParameterizedTest
+    @MethodSource("data_monthsBetween")
     public void test_monthsBetween_ZonedDateLaterOffset(LocalDate start, LocalDate end, long expected) {
         // +01:00 is later than +02:00
         if (expected >= 0) {
-            assertEquals(MONTHS.between(start.atStartOfDay(ZoneOffset.ofHours(2)), end.atStartOfDay(ZoneOffset.ofHours(1))), expected);
+            assertEquals(expected, MONTHS.between(start.atStartOfDay(ZoneOffset.ofHours(2)), end.atStartOfDay(ZoneOffset.ofHours(1))));
         } else {
-            assertEquals(MONTHS.between(start.atStartOfDay(ZoneOffset.ofHours(1)), end.atStartOfDay(ZoneOffset.ofHours(2))), expected);
+            assertEquals(expected, MONTHS.between(start.atStartOfDay(ZoneOffset.ofHours(1)), end.atStartOfDay(ZoneOffset.ofHours(2))));
         }
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name = "weeksBetween")
     Object[][] data_weeksBetween() {
         return new Object[][] {
             {date(2012, JULY, 2), date(2012, JUNE, 25), -1},
@@ -242,18 +253,19 @@ public class TestChronoUnit {
         };
     }
 
-    @Test(dataProvider = "weeksBetween")
+    @ParameterizedTest
+    @MethodSource("data_weeksBetween")
     public void test_weeksBetween(LocalDate start, LocalDate end, long expected) {
-        assertEquals(WEEKS.between(start, end), expected);
+        assertEquals(expected, WEEKS.between(start, end));
     }
 
-    @Test(dataProvider = "weeksBetween")
+    @ParameterizedTest
+    @MethodSource("data_weeksBetween")
     public void test_weeksBetweenReversed(LocalDate start, LocalDate end, long expected) {
-        assertEquals(WEEKS.between(end, start), -expected);
+        assertEquals(-expected, WEEKS.between(end, start));
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name = "daysBetween")
     Object[][] data_daysBetween() {
         return new Object[][] {
             {date(2012, JULY, 2), date(2012, JULY, 1), -1},
@@ -285,42 +297,48 @@ public class TestChronoUnit {
         };
     }
 
-    @Test(dataProvider = "daysBetween")
+    @ParameterizedTest
+    @MethodSource("data_daysBetween")
     public void test_daysBetween(LocalDate start, LocalDate end, long expected) {
-        assertEquals(DAYS.between(start, end), expected);
+        assertEquals(expected, DAYS.between(start, end));
     }
 
-    @Test(dataProvider = "daysBetween")
+    @ParameterizedTest
+    @MethodSource("data_daysBetween")
     public void test_daysBetweenReversed(LocalDate start, LocalDate end, long expected) {
-        assertEquals(DAYS.between(end, start), -expected);
+        assertEquals(-expected, DAYS.between(end, start));
     }
 
-    @Test(dataProvider = "daysBetween")
+    @ParameterizedTest
+    @MethodSource("data_daysBetween")
     public void test_daysBetween_LocalDateTimeSameTime(LocalDate start, LocalDate end, long expected) {
-        assertEquals(DAYS.between(start.atTime(12, 30), end.atTime(12, 30)), expected);
+        assertEquals(expected, DAYS.between(start.atTime(12, 30), end.atTime(12, 30)));
     }
 
-    @Test(dataProvider = "daysBetween")
+    @ParameterizedTest
+    @MethodSource("data_daysBetween")
     public void test_daysBetween_LocalDateTimeLaterTime(LocalDate start, LocalDate end, long expected) {
         if (expected >= 0) {
-            assertEquals(DAYS.between(start.atTime(12, 30), end.atTime(12, 31)), expected);
+            assertEquals(expected, DAYS.between(start.atTime(12, 30), end.atTime(12, 31)));
         } else {
-            assertEquals(DAYS.between(start.atTime(12, 30), end.atTime(12, 29)), expected);
+            assertEquals(expected, DAYS.between(start.atTime(12, 30), end.atTime(12, 29)));
         }
     }
 
-    @Test(dataProvider = "daysBetween")
+    @ParameterizedTest
+    @MethodSource("data_daysBetween")
     public void test_daysBetween_ZonedDateSameOffset(LocalDate start, LocalDate end, long expected) {
-        assertEquals(DAYS.between(start.atStartOfDay(ZoneOffset.ofHours(2)), end.atStartOfDay(ZoneOffset.ofHours(2))), expected);
+        assertEquals(expected, DAYS.between(start.atStartOfDay(ZoneOffset.ofHours(2)), end.atStartOfDay(ZoneOffset.ofHours(2))));
     }
 
-    @Test(dataProvider = "daysBetween")
+    @ParameterizedTest
+    @MethodSource("data_daysBetween")
     public void test_daysBetween_ZonedDateLaterOffset(LocalDate start, LocalDate end, long expected) {
         // +01:00 is later than +02:00
         if (expected >= 0) {
-            assertEquals(DAYS.between(start.atStartOfDay(ZoneOffset.ofHours(2)), end.atStartOfDay(ZoneOffset.ofHours(1))), expected);
+            assertEquals(expected, DAYS.between(start.atStartOfDay(ZoneOffset.ofHours(2)), end.atStartOfDay(ZoneOffset.ofHours(1))));
         } else {
-            assertEquals(DAYS.between(start.atStartOfDay(ZoneOffset.ofHours(1)), end.atStartOfDay(ZoneOffset.ofHours(2))), expected);
+            assertEquals(expected, DAYS.between(start.atStartOfDay(ZoneOffset.ofHours(1)), end.atStartOfDay(ZoneOffset.ofHours(2))));
         }
     }
 
diff --git a/test/jdk/java/time/test/java/time/temporal/TestDateTimeBuilderCombinations.java b/test/jdk/java/time/test/java/time/temporal/TestDateTimeBuilderCombinations.java
index ffa9fc3c342..8a81da27458 100644
--- a/test/jdk/java/time/test/java/time/temporal/TestDateTimeBuilderCombinations.java
+++ b/test/jdk/java/time/test/java/time/temporal/TestDateTimeBuilderCombinations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,8 +70,9 @@ import static java.time.temporal.ChronoField.EPOCH_DAY;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoField.PROLEPTIC_MONTH;
 import static java.time.temporal.ChronoField.YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.DateTimeException;
 import java.time.LocalDate;
@@ -80,15 +81,16 @@ import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalField;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestDateTimeBuilderCombinations {
 
-    @DataProvider(name = "combine")
     Object[][] data_combine() {
         return new Object[][] {
             {YEAR, 2012, MONTH_OF_YEAR, 6, DAY_OF_MONTH, 3, null, null, LocalDate.class, LocalDate.of(2012, 6, 3)},
@@ -101,7 +103,8 @@ public class TestDateTimeBuilderCombinations {
         };
     }
 
-    @Test(dataProvider = "combine")
+    @ParameterizedTest
+    @MethodSource("data_combine")
     public void test_derive(final TemporalField field1, final Number value1,
                             final TemporalField field2, final Number value2,
                             final TemporalField field3, final Number value3,
@@ -149,7 +152,7 @@ public class TestDateTimeBuilderCombinations {
         TemporalAccessor parsed = dtfb.toFormatter().parse(str);
         if (query == LocalDate.class) {
             if (expectedVal != null) {
-                assertEquals(parsed.query(LocalDate::from), expectedVal);
+                assertEquals(expectedVal, parsed.query(LocalDate::from));
             } else {
                 try {
                     parsed.query(LocalDate::from);
@@ -164,7 +167,6 @@ public class TestDateTimeBuilderCombinations {
     }
 
     //-----------------------------------------------------------------------
-    @DataProvider(name = "normalized")
     Object[][] data_normalized() {
         return new Object[][] {
             {YEAR, 2127, YEAR, 2127},
@@ -182,7 +184,8 @@ public class TestDateTimeBuilderCombinations {
         };
     }
 
-    @Test(dataProvider = "normalized")
+    @ParameterizedTest
+    @MethodSource("data_normalized")
     public void test_normalized(final TemporalField field1, final Number value1, TemporalField expectedField, Number expectedVal) {
         // mock for testing that does not fully comply with TemporalAccessor contract
         TemporalAccessor test = new TemporalAccessor() {
@@ -202,9 +205,9 @@ public class TestDateTimeBuilderCombinations {
         String str = value1.toString();
         TemporalAccessor temporal = f.parse(str);
         if (expectedVal != null) {
-            assertEquals(temporal.getLong(expectedField), expectedVal.longValue());
+            assertEquals(expectedVal.longValue(), temporal.getLong(expectedField));
         } else {
-            assertEquals(temporal.isSupported(expectedField), false);
+            assertEquals(false, temporal.isSupported(expectedField));
         }
     }
 
diff --git a/test/jdk/java/time/test/java/time/temporal/TestDateTimeValueRange.java b/test/jdk/java/time/test/java/time/temporal/TestDateTimeValueRange.java
index 570e6634a8a..e3e2f1758b9 100644
--- a/test/jdk/java/time/test/java/time/temporal/TestDateTimeValueRange.java
+++ b/test/jdk/java/time/test/java/time/temporal/TestDateTimeValueRange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@
  */
 package test.java.time.temporal;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -69,15 +69,19 @@ import java.time.DateTimeException;
 import java.time.temporal.ChronoField;
 import java.time.temporal.ValueRange;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import test.java.time.AbstractTest;
 
 /**
  * Test.
  * @bug 8239520
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestDateTimeValueRange extends AbstractTest {
 
     //-----------------------------------------------------------------------
@@ -91,63 +95,65 @@ public class TestDateTimeValueRange extends AbstractTest {
     //-----------------------------------------------------------------------
     // of(long,long)
     //-----------------------------------------------------------------------
+    @Test
     public void test_of_longlong() {
         ValueRange test = ValueRange.of(1, 12);
-        assertEquals(test.getMinimum(), 1);
-        assertEquals(test.getLargestMinimum(), 1);
-        assertEquals(test.getSmallestMaximum(), 12);
-        assertEquals(test.getMaximum(), 12);
-        assertEquals(test.isFixed(), true);
-        assertEquals(test.isIntValue(), true);
+        assertEquals(1, test.getMinimum());
+        assertEquals(1, test.getLargestMinimum());
+        assertEquals(12, test.getSmallestMaximum());
+        assertEquals(12, test.getMaximum());
+        assertEquals(true, test.isFixed());
+        assertEquals(true, test.isIntValue());
     }
 
+    @Test
     public void test_of_longlong_big() {
         ValueRange test = ValueRange.of(1, 123456789012345L);
-        assertEquals(test.getMinimum(), 1);
-        assertEquals(test.getLargestMinimum(), 1);
-        assertEquals(test.getSmallestMaximum(), 123456789012345L);
-        assertEquals(test.getMaximum(), 123456789012345L);
-        assertEquals(test.isFixed(), true);
-        assertEquals(test.isIntValue(), false);
+        assertEquals(1, test.getMinimum());
+        assertEquals(1, test.getLargestMinimum());
+        assertEquals(123456789012345L, test.getSmallestMaximum());
+        assertEquals(123456789012345L, test.getMaximum());
+        assertEquals(true, test.isFixed());
+        assertEquals(false, test.isIntValue());
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test_of_longlong_minGtMax() {
-        ValueRange.of(12, 1);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> ValueRange.of(12, 1));
     }
 
     //-----------------------------------------------------------------------
     // of(long,long,long)
     //-----------------------------------------------------------------------
+    @Test
     public void test_of_longlonglong() {
         ValueRange test = ValueRange.of(1, 28, 31);
-        assertEquals(test.getMinimum(), 1);
-        assertEquals(test.getLargestMinimum(), 1);
-        assertEquals(test.getSmallestMaximum(), 28);
-        assertEquals(test.getMaximum(), 31);
-        assertEquals(test.isFixed(), false);
-        assertEquals(test.isIntValue(), true);
+        assertEquals(1, test.getMinimum());
+        assertEquals(1, test.getLargestMinimum());
+        assertEquals(28, test.getSmallestMaximum());
+        assertEquals(31, test.getMaximum());
+        assertEquals(false, test.isFixed());
+        assertEquals(true, test.isIntValue());
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test_of_longlonglong_minGtMax() {
-        ValueRange.of(12, 1, 2);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> ValueRange.of(12, 1, 2));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test_of_longlonglong_smallestmaxminGtMax() {
-        ValueRange.of(1, 31, 28);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> ValueRange.of(1, 31, 28));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test_of_longlonglong_minGtSmallestMax() {
-        ValueRange.of(5, 2, 10);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> ValueRange.of(5, 2, 10));
     }
 
     //-----------------------------------------------------------------------
     // of(long,long,long,long)
     //-----------------------------------------------------------------------
-    @DataProvider(name="valid")
     Object[][] data_valid() {
         return new Object[][] {
                 {1, 1, 1, 1},
@@ -162,18 +168,18 @@ public class TestDateTimeValueRange extends AbstractTest {
         };
     }
 
-    @Test(dataProvider="valid")
+    @ParameterizedTest
+    @MethodSource("data_valid")
     public void test_of_longlonglonglong(long sMin, long lMin, long sMax, long lMax) {
         ValueRange test = ValueRange.of(sMin, lMin, sMax, lMax);
-        assertEquals(test.getMinimum(), sMin);
-        assertEquals(test.getLargestMinimum(), lMin);
-        assertEquals(test.getSmallestMaximum(), sMax);
-        assertEquals(test.getMaximum(), lMax);
-        assertEquals(test.isFixed(), sMin == lMin && sMax == lMax);
-        assertEquals(test.isIntValue(), true);
+        assertEquals(sMin, test.getMinimum());
+        assertEquals(lMin, test.getLargestMinimum());
+        assertEquals(sMax, test.getSmallestMaximum());
+        assertEquals(lMax, test.getMaximum());
+        assertEquals(sMin == lMin && sMax == lMax, test.isFixed());
+        assertEquals(true, test.isIntValue());
     }
 
-    @DataProvider(name="invalid")
     Object[][] data_invalid() {
         return new Object[][] {
                 {1, 2, 31, 28},
@@ -192,118 +198,138 @@ public class TestDateTimeValueRange extends AbstractTest {
         };
     }
 
-    @Test(dataProvider="invalid", expectedExceptions=IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("data_invalid")
     public void test_of_longlonglonglong_invalid(long sMin, long lMin, long sMax, long lMax) {
-        ValueRange.of(sMin, lMin, sMax, lMax);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> ValueRange.of(sMin, lMin, sMax, lMax));
     }
 
     //-----------------------------------------------------------------------
     // isValidValue(long)
     //-----------------------------------------------------------------------
+    @Test
     public void test_isValidValue_long() {
         ValueRange test = ValueRange.of(1, 28, 31);
-        assertEquals(test.isValidValue(0), false);
-        assertEquals(test.isValidValue(1), true);
-        assertEquals(test.isValidValue(2), true);
-        assertEquals(test.isValidValue(30), true);
-        assertEquals(test.isValidValue(31), true);
-        assertEquals(test.isValidValue(32), false);
+        assertEquals(false, test.isValidValue(0));
+        assertEquals(true, test.isValidValue(1));
+        assertEquals(true, test.isValidValue(2));
+        assertEquals(true, test.isValidValue(30));
+        assertEquals(true, test.isValidValue(31));
+        assertEquals(false, test.isValidValue(32));
     }
 
     //-----------------------------------------------------------------------
     // isValidIntValue(long)
     //-----------------------------------------------------------------------
+    @Test
     public void test_isValidValue_long_int() {
         ValueRange test = ValueRange.of(1, 28, 31);
-        assertEquals(test.isValidValue(0), false);
-        assertEquals(test.isValidValue(1), true);
-        assertEquals(test.isValidValue(31), true);
-        assertEquals(test.isValidValue(32), false);
+        assertEquals(false, test.isValidValue(0));
+        assertEquals(true, test.isValidValue(1));
+        assertEquals(true, test.isValidValue(31));
+        assertEquals(false, test.isValidValue(32));
     }
 
+    @Test
     public void test_isValidValue_long_long() {
         ValueRange test = ValueRange.of(1, 28, Integer.MAX_VALUE + 1L);
-        assertEquals(test.isValidIntValue(0), false);
-        assertEquals(test.isValidIntValue(1), false);
-        assertEquals(test.isValidIntValue(31), false);
-        assertEquals(test.isValidIntValue(32), false);
+        assertEquals(false, test.isValidIntValue(0));
+        assertEquals(false, test.isValidIntValue(1));
+        assertEquals(false, test.isValidIntValue(31));
+        assertEquals(false, test.isValidIntValue(32));
     }
 
     //-----------------------------------------------------------------------
     // checkValidValue
     //-----------------------------------------------------------------------
-    @Test(dataProvider="valid")
+    @ParameterizedTest
+    @MethodSource("data_valid")
     public void test_of_checkValidValue(long sMin, long lMin, long sMax, long lMax) {
         ValueRange test = ValueRange.of(sMin, lMin, sMax, lMax);
-        assertEquals(test.checkValidIntValue(sMin, null), sMin);
-        assertEquals(test.checkValidIntValue(lMin, null), lMin);
-        assertEquals(test.checkValidIntValue(sMax, null), sMax);
-        assertEquals(test.checkValidIntValue(lMax, null), lMax);
+        assertEquals(sMin, test.checkValidIntValue(sMin, null));
+        assertEquals(lMin, test.checkValidIntValue(lMin, null));
+        assertEquals(sMax, test.checkValidIntValue(sMax, null));
+        assertEquals(lMax, test.checkValidIntValue(lMax, null));
     }
 
-    @Test(dataProvider="valid", expectedExceptions = DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_valid")
     public void test_of_checkValidValueMinException(long sMin, long lMin, long sMax, long lMax) {
-        ValueRange test = ValueRange.of(sMin, lMin, sMax, lMax);
-        test.checkValidIntValue(sMin-1, null);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            ValueRange test = ValueRange.of(sMin, lMin, sMax, lMax);
+            test.checkValidIntValue(sMin-1, null);
+        });
     }
 
-    @Test(dataProvider="valid", expectedExceptions = DateTimeException.class)
+    @ParameterizedTest
+    @MethodSource("data_valid")
     public void test_of_checkValidValueMaxException(long sMin, long lMin, long sMax, long lMax) {
-        ValueRange test = ValueRange.of(sMin, lMin, sMax, lMax);
-        test.checkValidIntValue(lMax+1, null);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            ValueRange test = ValueRange.of(sMin, lMin, sMax, lMax);
+            test.checkValidIntValue(lMax+1, null);
+        });
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_checkValidValueUnsupported_long_long() {
-        ValueRange test = ValueRange.of(1, 28, Integer.MAX_VALUE + 1L);
-        test.checkValidIntValue(0, (ChronoField)null);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            ValueRange test = ValueRange.of(1, 28, Integer.MAX_VALUE + 1L);
+            test.checkValidIntValue(0, (ChronoField)null);
+        });
     }
 
-    @Test(expectedExceptions = DateTimeException.class)
+    @Test
     public void test_checkValidValueInvalid_long_long() {
-        ValueRange test = ValueRange.of(1, 28, Integer.MAX_VALUE + 1L);
-        test.checkValidIntValue(Integer.MAX_VALUE + 2L, (ChronoField)null);
+        Assertions.assertThrows(DateTimeException.class, () -> {
+            ValueRange test = ValueRange.of(1, 28, Integer.MAX_VALUE + 1L);
+            test.checkValidIntValue(Integer.MAX_VALUE + 2L, (ChronoField)null);
+        });
     }
 
     //-----------------------------------------------------------------------
     // equals() / hashCode()
     //-----------------------------------------------------------------------
+    @Test
     public void test_equals1() {
         ValueRange a = ValueRange.of(1, 2, 3, 4);
         ValueRange b = ValueRange.of(1, 2, 3, 4);
-        assertEquals(a.equals(a), true);
-        assertEquals(a.equals(b), true);
-        assertEquals(b.equals(a), true);
-        assertEquals(b.equals(b), true);
-        assertEquals(a.hashCode() == b.hashCode(), true);
+        assertEquals(true, a.equals(a));
+        assertEquals(true, a.equals(b));
+        assertEquals(true, b.equals(a));
+        assertEquals(true, b.equals(b));
+        assertEquals(true, a.hashCode() == b.hashCode());
     }
 
+    @Test
     public void test_equals2() {
         ValueRange a = ValueRange.of(1, 2, 3, 4);
-        assertEquals(a.equals(ValueRange.of(0, 2, 3, 4)), false);
-        assertEquals(a.equals(ValueRange.of(1, 3, 3, 4)), false);
-        assertEquals(a.equals(ValueRange.of(1, 2, 4, 4)), false);
-        assertEquals(a.equals(ValueRange.of(1, 2, 3, 5)), false);
+        assertEquals(false, a.equals(ValueRange.of(0, 2, 3, 4)));
+        assertEquals(false, a.equals(ValueRange.of(1, 3, 3, 4)));
+        assertEquals(false, a.equals(ValueRange.of(1, 2, 4, 4)));
+        assertEquals(false, a.equals(ValueRange.of(1, 2, 3, 5)));
     }
 
+    @Test
     public void test_equals_otherType() {
         ValueRange a = ValueRange.of(1, 12);
-        assertEquals(a.equals("Rubbish"), false);
+        assertEquals(false, a.equals("Rubbish"));
     }
 
+    @Test
     public void test_equals_null() {
         ValueRange a = ValueRange.of(1, 12);
-        assertEquals(a.equals(null), false);
+        assertEquals(false, a.equals(null));
     }
 
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
+    @Test
     public void test_toString() {
-        assertEquals(ValueRange.of(1, 1, 4, 4).toString(), "1 - 4");
-        assertEquals(ValueRange.of(1, 1, 3, 4).toString(), "1 - 3/4");
-        assertEquals(ValueRange.of(1, 2, 3, 4).toString(), "1/2 - 3/4");
-        assertEquals(ValueRange.of(1, 2, 4, 4).toString(), "1/2 - 4");
+        assertEquals("1 - 4", ValueRange.of(1, 1, 4, 4).toString());
+        assertEquals("1 - 3/4", ValueRange.of(1, 1, 3, 4).toString());
+        assertEquals("1/2 - 3/4", ValueRange.of(1, 2, 3, 4).toString());
+        assertEquals("1/2 - 4", ValueRange.of(1, 2, 4, 4).toString());
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/temporal/TestIsoFields.java b/test/jdk/java/time/test/java/time/temporal/TestIsoFields.java
index 53cd721c0e5..8a74582d976 100644
--- a/test/jdk/java/time/test/java/time/temporal/TestIsoFields.java
+++ b/test/jdk/java/time/test/java/time/temporal/TestIsoFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,9 @@ import static java.time.temporal.IsoFields.DAY_OF_QUARTER;
 import static java.time.temporal.IsoFields.QUARTER_OF_YEAR;
 import static java.time.temporal.IsoFields.WEEK_BASED_YEAR;
 import static java.time.temporal.IsoFields.WEEK_OF_WEEK_BASED_YEAR;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.LocalDate;
 import java.time.chrono.ChronoLocalDate;
@@ -38,15 +39,16 @@ import java.time.temporal.TemporalField;
 import java.time.temporal.ValueRange;
 import java.util.List;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Tests fields in IsoFields class are supported in Japanese/Minguo/ThaiBuddhist
  * date classes
  * @bug 8279185
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestIsoFields {
     private static final LocalDate ld = LocalDate.of(2022, 2, 25);
     private static final ChronoLocalDate J_DATE = JapaneseDate.from(ld);
@@ -54,7 +56,6 @@ public class TestIsoFields {
     private static final ChronoLocalDate TB_DATE = ThaiBuddhistDate.from(ld);
     private static final List<ChronoLocalDate> CLDATES = List.of(J_DATE, M_DATE, TB_DATE);
 
-    @DataProvider(name = "isSupported")
     Object[][] data_isSupported() {
         return new Object[][]{
                 {DAY_OF_QUARTER},
@@ -64,7 +65,6 @@ public class TestIsoFields {
         };
     }
 
-    @DataProvider(name = "range")
     Object[][] data_range() {
         return new Object[][]{
                 {J_DATE, DAY_OF_QUARTER, ValueRange.of(1, 90)},
@@ -82,7 +82,6 @@ public class TestIsoFields {
         };
     }
 
-    @DataProvider(name = "with_getLong")
     Object[][] data_with_getLong() {
         return new Object[][]{
                 {DAY_OF_QUARTER, 45},
@@ -92,24 +91,27 @@ public class TestIsoFields {
         };
     }
 
-    @Test(dataProvider = "isSupported")
+    @ParameterizedTest
+    @MethodSource("data_isSupported")
     public void test_isSupported(TemporalField f) {
         CLDATES.forEach(d -> assertTrue(d.isSupported(f)));
     }
 
-    @Test(dataProvider = "range")
+    @ParameterizedTest
+    @MethodSource("data_range")
     public void test_range(ChronoLocalDate cld, TemporalField f, ValueRange r) {
-        assertEquals(cld.range(f), r);
+        assertEquals(r, cld.range(f));
     }
 
-    @Test(dataProvider = "with_getLong")
+    @ParameterizedTest
+    @MethodSource("data_with_getLong")
     public void test_with_getLong(TemporalField f, long val) {
         CLDATES.forEach(d -> {
             var min = d.range(f).getMinimum();
             var max = d.range(f).getMaximum();
-            assertEquals(d.with(f, min).getLong(f), min);
-            assertEquals(d.with(f, max).getLong(f), max);
-            assertEquals(d.with(f, val).getLong(f), val);
+            assertEquals(min, d.with(f, min).getLong(f));
+            assertEquals(max, d.with(f, max).getLong(f));
+            assertEquals(val, d.with(f, val).getLong(f));
         });
     }
 }
diff --git a/test/jdk/java/time/test/java/time/temporal/TestIsoWeekFields.java b/test/jdk/java/time/test/java/time/temporal/TestIsoWeekFields.java
index 4c40e7278ed..80caa3ffcc1 100644
--- a/test/jdk/java/time/test/java/time/temporal/TestIsoWeekFields.java
+++ b/test/jdk/java/time/test/java/time/temporal/TestIsoWeekFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,9 @@
 package test.java.time.temporal;
 
 import static java.time.temporal.ChronoField.DAY_OF_WEEK;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
@@ -40,16 +41,17 @@ import java.time.temporal.TemporalField;
 import java.time.temporal.ValueRange;
 import java.time.temporal.WeekFields;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Test.
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestIsoWeekFields {
 
-    @DataProvider(name = "fields")
     Object[][] data_Fields() {
         return new Object[][] {
                 {IsoFields.WEEK_OF_WEEK_BASED_YEAR, IsoFields.WEEK_BASED_YEAR},
@@ -60,92 +62,101 @@ public class TestIsoWeekFields {
     //-----------------------------------------------------------------------
     // WEEK_OF_WEEK_BASED_YEAR
     //-----------------------------------------------------------------------
-    @Test(dataProvider = "fields")
+    @ParameterizedTest
+    @MethodSource("data_Fields")
     public void test_WOWBY_basics(TemporalField weekField, TemporalField yearField) {
-        assertEquals(weekField.isDateBased(), true);
-        assertEquals(weekField.isTimeBased(), false);
-        assertEquals(weekField.getBaseUnit(), ChronoUnit.WEEKS);
-        assertEquals(weekField.getRangeUnit(), IsoFields.WEEK_BASED_YEARS);
+        assertEquals(true, weekField.isDateBased());
+        assertEquals(false, weekField.isTimeBased());
+        assertEquals(ChronoUnit.WEEKS, weekField.getBaseUnit());
+        assertEquals(IsoFields.WEEK_BASED_YEARS, weekField.getRangeUnit());
     }
 
-    @Test(dataProvider = "fields")
+    @ParameterizedTest
+    @MethodSource("data_Fields")
     public void test_WOWBY_isSupportedBy(TemporalField weekField, TemporalField yearField) {
-        assertEquals(weekField.isSupportedBy(LocalTime.NOON), false);
-        assertEquals(weekField.isSupportedBy(MonthDay.of(2, 1)), false);
-        assertEquals(weekField.isSupportedBy(LocalDate.MIN), true);
-        assertEquals(weekField.isSupportedBy(OffsetDateTime.MAX), true);
-        assertEquals(weekField.isSupportedBy(ThaiBuddhistDate.now()), true);
+        assertEquals(false, weekField.isSupportedBy(LocalTime.NOON));
+        assertEquals(false, weekField.isSupportedBy(MonthDay.of(2, 1)));
+        assertEquals(true, weekField.isSupportedBy(LocalDate.MIN));
+        assertEquals(true, weekField.isSupportedBy(OffsetDateTime.MAX));
+        assertEquals(true, weekField.isSupportedBy(ThaiBuddhistDate.now()));
     }
 
     @Test
     public void test_WOWBY_isSupportedBy_fieldsDiffer() {
-        assertEquals(IsoFields.WEEK_OF_WEEK_BASED_YEAR.isSupportedBy(HijrahDate.now()), false);
-        assertEquals(WeekFields.ISO.weekOfWeekBasedYear().isSupportedBy(HijrahDate.now()), true);
+        assertEquals(false, IsoFields.WEEK_OF_WEEK_BASED_YEAR.isSupportedBy(HijrahDate.now()));
+        assertEquals(true, WeekFields.ISO.weekOfWeekBasedYear().isSupportedBy(HijrahDate.now()));
     }
 
-    @Test(dataProvider = "fields")
+    @ParameterizedTest
+    @MethodSource("data_Fields")
     public void test_WOWBY_range(TemporalField weekField, TemporalField yearField) {
-        assertEquals(weekField.range(), ValueRange.of(1, 52, 53));
+        assertEquals(ValueRange.of(1, 52, 53), weekField.range());
     }
 
-    @Test(dataProvider = "fields")
+    @ParameterizedTest
+    @MethodSource("data_Fields")
     public void test_WOWBY_rangeRefinedBy(TemporalField weekField, TemporalField yearField) {
-        assertEquals(weekField.rangeRefinedBy(LocalDate.of(2012, 12, 31)), ValueRange.of(1, 52));
-        assertEquals(weekField.rangeRefinedBy(LocalDate.of(2013, 12, 29)), ValueRange.of(1, 52));
-        assertEquals(weekField.rangeRefinedBy(LocalDate.of(2013, 12, 30)), ValueRange.of(1, 52));
-        assertEquals(weekField.rangeRefinedBy(LocalDate.of(2014, 12, 28)), ValueRange.of(1, 52));
-        assertEquals(weekField.rangeRefinedBy(LocalDate.of(2014, 12, 29)), ValueRange.of(1, 53));
-        assertEquals(weekField.rangeRefinedBy(LocalDate.of(2016, 1, 3)), ValueRange.of(1, 53));
-        assertEquals(weekField.rangeRefinedBy(LocalDate.of(2016, 1, 4)), ValueRange.of(1, 52));
+        assertEquals(ValueRange.of(1, 52), weekField.rangeRefinedBy(LocalDate.of(2012, 12, 31)));
+        assertEquals(ValueRange.of(1, 52), weekField.rangeRefinedBy(LocalDate.of(2013, 12, 29)));
+        assertEquals(ValueRange.of(1, 52), weekField.rangeRefinedBy(LocalDate.of(2013, 12, 30)));
+        assertEquals(ValueRange.of(1, 52), weekField.rangeRefinedBy(LocalDate.of(2014, 12, 28)));
+        assertEquals(ValueRange.of(1, 53), weekField.rangeRefinedBy(LocalDate.of(2014, 12, 29)));
+        assertEquals(ValueRange.of(1, 53), weekField.rangeRefinedBy(LocalDate.of(2016, 1, 3)));
+        assertEquals(ValueRange.of(1, 52), weekField.rangeRefinedBy(LocalDate.of(2016, 1, 4)));
     }
 
     //-----------------------------------------------------------------------
     // WEEK_BASED_YEAR
     //-----------------------------------------------------------------------
-    @Test(dataProvider = "fields")
+    @ParameterizedTest
+    @MethodSource("data_Fields")
     public void test_WBY_basics(TemporalField weekField, TemporalField yearField) {
-        assertEquals(yearField.isDateBased(), true);
-        assertEquals(yearField.isTimeBased(), false);
-        assertEquals(yearField.getBaseUnit(), IsoFields.WEEK_BASED_YEARS);
-        assertEquals(yearField.getRangeUnit(), ChronoUnit.FOREVER);
+        assertEquals(true, yearField.isDateBased());
+        assertEquals(false, yearField.isTimeBased());
+        assertEquals(IsoFields.WEEK_BASED_YEARS, yearField.getBaseUnit());
+        assertEquals(ChronoUnit.FOREVER, yearField.getRangeUnit());
     }
 
-    @Test(dataProvider = "fields")
+    @ParameterizedTest
+    @MethodSource("data_Fields")
     public void test_WBY_isSupportedBy(TemporalField weekField, TemporalField yearField) {
-        assertEquals(yearField.isSupportedBy(LocalTime.NOON), false);
-        assertEquals(yearField.isSupportedBy(MonthDay.of(2, 1)), false);
-        assertEquals(yearField.isSupportedBy(LocalDate.MIN), true);
-        assertEquals(yearField.isSupportedBy(OffsetDateTime.MAX), true);
-        assertEquals(yearField.isSupportedBy(ThaiBuddhistDate.now()), true);
+        assertEquals(false, yearField.isSupportedBy(LocalTime.NOON));
+        assertEquals(false, yearField.isSupportedBy(MonthDay.of(2, 1)));
+        assertEquals(true, yearField.isSupportedBy(LocalDate.MIN));
+        assertEquals(true, yearField.isSupportedBy(OffsetDateTime.MAX));
+        assertEquals(true, yearField.isSupportedBy(ThaiBuddhistDate.now()));
     }
 
     @Test
     public void test_WBY_isSupportedBy_ISO() {
-        assertEquals(IsoFields.WEEK_BASED_YEAR.isSupportedBy(HijrahDate.now()), false);
+        assertEquals(false, IsoFields.WEEK_BASED_YEAR.isSupportedBy(HijrahDate.now()));
     }
 
     @Test
     public void test_Unit_isSupportedBy_ISO() {
-        assertEquals(IsoFields.WEEK_BASED_YEARS.isSupportedBy(LocalDate.now()), true);
-        assertEquals(IsoFields.WEEK_BASED_YEARS.isSupportedBy(ThaiBuddhistDate.now()), true);
-        assertEquals(IsoFields.WEEK_BASED_YEARS.isSupportedBy(HijrahDate.now()), false);
-        assertEquals(IsoFields.QUARTER_YEARS.isSupportedBy(LocalDate.now()), true);
-        assertEquals(IsoFields.QUARTER_YEARS.isSupportedBy(ThaiBuddhistDate.now()), true);
-        assertEquals(IsoFields.QUARTER_YEARS.isSupportedBy(HijrahDate.now()), false);
+        assertEquals(true, IsoFields.WEEK_BASED_YEARS.isSupportedBy(LocalDate.now()));
+        assertEquals(true, IsoFields.WEEK_BASED_YEARS.isSupportedBy(ThaiBuddhistDate.now()));
+        assertEquals(false, IsoFields.WEEK_BASED_YEARS.isSupportedBy(HijrahDate.now()));
+        assertEquals(true, IsoFields.QUARTER_YEARS.isSupportedBy(LocalDate.now()));
+        assertEquals(true, IsoFields.QUARTER_YEARS.isSupportedBy(ThaiBuddhistDate.now()));
+        assertEquals(false, IsoFields.QUARTER_YEARS.isSupportedBy(HijrahDate.now()));
     }
 
-    @Test(dataProvider = "fields")
+    @ParameterizedTest
+    @MethodSource("data_Fields")
     public void test_WBY_range(TemporalField weekField, TemporalField yearField) {
-        assertEquals(yearField.range(), ValueRange.of(Year.MIN_VALUE, Year.MAX_VALUE));
+        assertEquals(ValueRange.of(Year.MIN_VALUE, Year.MAX_VALUE), yearField.range());
     }
 
-    @Test(dataProvider = "fields")
+    @ParameterizedTest
+    @MethodSource("data_Fields")
     public void test_WBY_rangeRefinedBy(TemporalField weekField, TemporalField yearField) {
-        assertEquals(yearField.rangeRefinedBy(LocalDate.of(2012, 12, 31)), ValueRange.of(Year.MIN_VALUE, Year.MAX_VALUE));
+        assertEquals(ValueRange.of(Year.MIN_VALUE, Year.MAX_VALUE), yearField.rangeRefinedBy(LocalDate.of(2012, 12, 31)));
     }
 
     //-----------------------------------------------------------------------
-    @Test(dataProvider = "fields")
+    @ParameterizedTest
+    @MethodSource("data_Fields")
     public void test_getFrom(TemporalField weekField, TemporalField yearField) {
         // tests every day from 2011 to 2016 inclusive
         LocalDate date = LocalDate.of(2011, 1, 3);
@@ -153,9 +164,9 @@ public class TestIsoWeekFields {
         int week = 1;
         int dow = 1;
         for (int i = 1; i <= ((52 + 52 + 52 + 52 + 53 + 52) * 7); i++) {
-            assertEquals(yearField.getFrom(date), wby);
-            assertEquals(weekField.getFrom(date), week);
-            assertEquals(DAY_OF_WEEK.getFrom(date), dow);
+            assertEquals(wby, yearField.getFrom(date));
+            assertEquals(week, weekField.getFrom(date));
+            assertEquals(dow, DAY_OF_WEEK.getFrom(date));
             if (dow == 7) {
                 dow = 1;
                 week++;
@@ -168,12 +179,13 @@ public class TestIsoWeekFields {
             }
             date = date.plusDays(1);
         }
-        assertEquals(yearField.getFrom(date), 2017);
-        assertEquals(weekField.getFrom(date), 1);
-        assertEquals(DAY_OF_WEEK.getFrom(date), 1);
+        assertEquals(2017, yearField.getFrom(date));
+        assertEquals(1, weekField.getFrom(date));
+        assertEquals(1, DAY_OF_WEEK.getFrom(date));
     }
 
-    @Test(dataProvider = "fields")
+    @ParameterizedTest
+    @MethodSource("data_Fields")
     public void test_adjustInto_dow(TemporalField weekField, TemporalField yearField) {
         // tests every day from 2012 to 2016 inclusive
         LocalDate date = LocalDate.of(2012, 1, 2);
@@ -183,9 +195,9 @@ public class TestIsoWeekFields {
         for (int i = 1; i <= ((52 + 52 + 52 + 53 + 52) * 7); i++) {
             for (int j = 1; j <= 7; j++) {
                 LocalDate adjusted = DAY_OF_WEEK.adjustInto(date, j);
-                assertEquals(adjusted.get(DAY_OF_WEEK), j);
-                assertEquals(adjusted.get(weekField), week);
-                assertEquals(adjusted.get(yearField), wby);
+                assertEquals(j, adjusted.get(DAY_OF_WEEK));
+                assertEquals(week, adjusted.get(weekField));
+                assertEquals(wby, adjusted.get(yearField));
             }
             if (dow == 7) {
                 dow = 1;
@@ -201,7 +213,8 @@ public class TestIsoWeekFields {
         }
     }
 
-    @Test(dataProvider = "fields")
+    @ParameterizedTest
+    @MethodSource("data_Fields")
     public void test_adjustInto_week(TemporalField weekField, TemporalField yearField) {
         // tests every day from 2012 to 2016 inclusive
         LocalDate date = LocalDate.of(2012, 1, 2);
@@ -212,9 +225,9 @@ public class TestIsoWeekFields {
             int weeksInYear = (wby == 2015 ? 53 : 52);
             for (int j = 1; j <= weeksInYear; j++) {
                 LocalDate adjusted = weekField.adjustInto(date, j);
-                assertEquals(adjusted.get(weekField), j);
-                assertEquals(adjusted.get(DAY_OF_WEEK), dow);
-                assertEquals(adjusted.get(yearField), wby);
+                assertEquals(j, adjusted.get(weekField));
+                assertEquals(dow, adjusted.get(DAY_OF_WEEK));
+                assertEquals(wby, adjusted.get(yearField));
             }
             if (dow == 7) {
                 dow = 1;
@@ -230,7 +243,8 @@ public class TestIsoWeekFields {
         }
     }
 
-    @Test(dataProvider = "fields")
+    @ParameterizedTest
+    @MethodSource("data_Fields")
     public void test_adjustInto_wby(TemporalField weekField, TemporalField yearField) {
         // tests every day from 2012 to 2016 inclusive
         LocalDate date = LocalDate.of(2012, 1, 2);
@@ -240,9 +254,9 @@ public class TestIsoWeekFields {
         for (int i = 1; i <= ((52 + 52 + 52 + 53 + 52) * 7); i++) {
             for (int j = 2004; j <= 2015; j++) {
                 LocalDate adjusted = yearField.adjustInto(date, j);
-                assertEquals(adjusted.get(yearField), j);
-                assertEquals(adjusted.get(DAY_OF_WEEK), dow);
-                assertEquals(adjusted.get(weekField), (week == 53 && wbyLen(j) == 52 ? 52 : week), "" + date + " " + adjusted);
+                assertEquals(j, adjusted.get(yearField));
+                assertEquals(dow, adjusted.get(DAY_OF_WEEK));
+                assertEquals((week == 53 && wbyLen(j) == 52 ? 52 : week), adjusted.get(weekField), "" + date + " " + adjusted);
             }
             if (dow == 7) {
                 dow = 1;
@@ -258,7 +272,8 @@ public class TestIsoWeekFields {
         }
     }
 
-    @Test(dataProvider = "fields")
+    @ParameterizedTest
+    @MethodSource("data_Fields")
     public void test_addTo_weekBasedYears(TemporalField weekField, TemporalField yearField) {
         // tests every day from 2012 to 2016 inclusive
         LocalDate date = LocalDate.of(2012, 1, 2);
@@ -268,9 +283,9 @@ public class TestIsoWeekFields {
         for (int i = 1; i <= ((52 + 52 + 52 + 53 + 52) * 7); i++) {
             for (int j = -5; j <= 5; j++) {
                 LocalDate adjusted = IsoFields.WEEK_BASED_YEARS.addTo(date, j);
-                assertEquals(adjusted.get(yearField), wby + j);
-                assertEquals(adjusted.get(DAY_OF_WEEK), dow);
-                assertEquals(adjusted.get(weekField), (week == 53 && wbyLen(wby + j) == 52 ? 52 : week), "" + date + " " + adjusted);
+                assertEquals(wby + j, adjusted.get(yearField));
+                assertEquals(dow, adjusted.get(DAY_OF_WEEK));
+                assertEquals((week == 53 && wbyLen(wby + j) == 52 ? 52 : week), adjusted.get(weekField), "" + date + " " + adjusted);
             }
             if (dow == 7) {
                 dow = 1;
diff --git a/test/jdk/java/time/test/java/time/temporal/TestJulianFields.java b/test/jdk/java/time/test/java/time/temporal/TestJulianFields.java
index 0d9d79e3158..5ed393d1b87 100644
--- a/test/jdk/java/time/test/java/time/temporal/TestJulianFields.java
+++ b/test/jdk/java/time/test/java/time/temporal/TestJulianFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,16 +59,15 @@
  */
 package test.java.time.temporal;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.temporal.JulianFields;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test.
  */
-@Test
 public class TestJulianFields {
 
     //-----------------------------------------------------------------------
@@ -76,9 +75,9 @@ public class TestJulianFields {
     //-----------------------------------------------------------------------
     @Test
     public void test_toString() {
-        assertEquals(JulianFields.JULIAN_DAY.toString(), "JulianDay");
-        assertEquals(JulianFields.MODIFIED_JULIAN_DAY.toString(), "ModifiedJulianDay");
-        assertEquals(JulianFields.RATA_DIE.toString(), "RataDie");
+        assertEquals("JulianDay", JulianFields.JULIAN_DAY.toString());
+        assertEquals("ModifiedJulianDay", JulianFields.MODIFIED_JULIAN_DAY.toString());
+        assertEquals("RataDie", JulianFields.RATA_DIE.toString());
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/zone/TestFixedZoneRules.java b/test/jdk/java/time/test/java/time/zone/TestFixedZoneRules.java
index d479134c26e..8f52372ab01 100644
--- a/test/jdk/java/time/test/java/time/zone/TestFixedZoneRules.java
+++ b/test/jdk/java/time/test/java/time/zone/TestFixedZoneRules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,19 +61,18 @@ package test.java.time.zone;
 
 import java.time.zone.ZoneRules;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test ZoneRules for fixed offset time-zones.
  */
-@Test
 public class TestFixedZoneRules {
 
     private static final ZoneOffset OFFSET_PONE = ZoneOffset.ofHours(1);
@@ -86,16 +85,16 @@ public class TestFixedZoneRules {
     @Test
     public void test_data_nullInput() {
         ZoneRules test = make(OFFSET_PONE);
-        assertEquals(test.getOffset((Instant) null), OFFSET_PONE);
-        assertEquals(test.getOffset((LocalDateTime) null), OFFSET_PONE);
-        assertEquals(test.getValidOffsets(null).size(), 1);
-        assertEquals(test.getValidOffsets(null).get(0), OFFSET_PONE);
-        assertEquals(test.getTransition(null), null);
-        assertEquals(test.getStandardOffset(null), OFFSET_PONE);
-        assertEquals(test.getDaylightSavings(null), Duration.ZERO);
-        assertEquals(test.isDaylightSavings(null), false);
-        assertEquals(test.nextTransition(null), null);
-        assertEquals(test.previousTransition(null), null);
+        assertEquals(OFFSET_PONE, test.getOffset((Instant) null));
+        assertEquals(OFFSET_PONE, test.getOffset((LocalDateTime) null));
+        assertEquals(1, test.getValidOffsets(null).size());
+        assertEquals(OFFSET_PONE, test.getValidOffsets(null).get(0));
+        assertEquals(null, test.getTransition(null));
+        assertEquals(OFFSET_PONE, test.getStandardOffset(null));
+        assertEquals(Duration.ZERO, test.getDaylightSavings(null));
+        assertEquals(false, test.isDaylightSavings(null));
+        assertEquals(null, test.nextTransition(null));
+        assertEquals(null, test.previousTransition(null));
     }
 
 }
diff --git a/test/jdk/java/time/test/java/time/zone/TestMutableZoneRules.java b/test/jdk/java/time/test/java/time/zone/TestMutableZoneRules.java
index 4474f70db05..a8d7f4746c7 100644
--- a/test/jdk/java/time/test/java/time/zone/TestMutableZoneRules.java
+++ b/test/jdk/java/time/test/java/time/zone/TestMutableZoneRules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,16 +27,15 @@ import java.time.*;
 import java.time.zone.*;
 import java.util.*;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
 
 /**
  * @summary ZoneRules invariants can be broken.
  *
  * @bug 8246788
  */
-@Test
 public class TestMutableZoneRules {
     static final ZoneOffset offset = ZoneOffset.ofHoursMinutes(1, 30);
 
@@ -48,16 +47,18 @@ public class TestMutableZoneRules {
         ZoneOffsetTransitionRule.of(Month.MARCH, 2, DayOfWeek.MONDAY, LocalTime.MIN, true,
                 ZoneOffsetTransitionRule.TimeDefinition.UTC, offset, offset, offset);
 
+    @Test
     public void testMutation() {
         ZoneOffsetTransitionRule[] array = { rule1 };
         ZoneRules zr1 = ZoneRules.of(offset, offset, List.of(), List.of(), List.of(rule1));
         ZoneRules zr2 = ZoneRules.of(offset, offset, List.of(), List.of(), new TestList(array, array.length));
 
-        assertEquals(zr2, zr1);
+        assertEquals(zr1, zr2);
         array[0] = rule2;
-        assertEquals(zr2, zr1);
+        assertEquals(zr1, zr2);
     }
 
+    @Test
     public void testLength() {
         ZoneOffsetTransitionRule[] array = new ZoneOffsetTransitionRule[17];
         Arrays.setAll(array, i -> rule1);
diff --git a/test/jdk/java/time/test/java/time/zone/TestZoneRules.java b/test/jdk/java/time/test/java/time/zone/TestZoneRules.java
index 584ed2e56c7..7a1e656ee87 100644
--- a/test/jdk/java/time/test/java/time/zone/TestZoneRules.java
+++ b/test/jdk/java/time/test/java/time/zone/TestZoneRules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,17 +40,19 @@ import java.time.zone.ZoneRules;
 import java.util.Collections;
 import java.util.List;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * @summary Tests for ZoneRules class.
  *
  * @bug 8212970 8236903 8239836
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestZoneRules {
 
     private static final ZoneId DUBLIN = ZoneId.of("Europe/Dublin");
@@ -68,7 +70,6 @@ public class TestZoneRules {
     private static final ZoneOffsetTransition ZOT = ZoneId.of("America/Los_Angeles").getRules().getTransitions().get(0);
     private static final ZoneOffsetTransitionRule ZOTR = ZoneId.of("America/Los_Angeles").getRules().getTransitionRules().get(0);
 
-    @DataProvider
     private Object[][] negativeDST () {
         return new Object[][] {
             // ZoneId, localDate, offset, standard offset, isDaylightSavings
@@ -102,7 +103,6 @@ public class TestZoneRules {
         };
     }
 
-    @DataProvider
     private Object[][] transitionBeyondDay() {
         return new Object[][] {
             // ZoneId, LocalDateTime, beforeOffset, afterOffset
@@ -117,7 +117,6 @@ public class TestZoneRules {
         };
     }
 
-    @DataProvider
     private Object[][] emptyTransitionList() {
         return new Object[][] {
             // days, offset, std offset, savings, isDST
@@ -126,7 +125,6 @@ public class TestZoneRules {
         };
     }
 
-    @DataProvider
     private Object[][] isFixedOffset() {
         return new Object[][] {
             // ZoneRules, expected
@@ -144,20 +142,22 @@ public class TestZoneRules {
      * negative savings in the source TZ files.
      * @bug 8212970
      */
-    @Test(dataProvider="negativeDST")
+    @ParameterizedTest
+    @MethodSource("negativeDST")
     public void test_NegativeDST(ZoneId zid, LocalDate ld, ZoneOffset offset, ZoneOffset stdOffset, boolean isDST) {
         Instant i = Instant.from(ZonedDateTime.of(ld, LocalTime.MIN, zid));
         ZoneRules zr = zid.getRules();
-        assertEquals(zr.getOffset(i), offset);
-        assertEquals(zr.getStandardOffset(i), stdOffset);
-        assertEquals(zr.isDaylightSavings(i), isDST);
+        assertEquals(offset, zr.getOffset(i));
+        assertEquals(stdOffset, zr.getStandardOffset(i));
+        assertEquals(isDST, zr.isDaylightSavings(i));
     }
 
     /**
      * Check the transition cutover time beyond 24:00, which should translate into the next day.
      * @bug 8212970
      */
-    @Test(dataProvider="transitionBeyondDay")
+    @ParameterizedTest
+    @MethodSource("transitionBeyondDay")
     public void test_TransitionBeyondDay(ZoneId zid, LocalDateTime ldt, ZoneOffset before, ZoneOffset after) {
         ZoneOffsetTransition zot = ZoneOffsetTransition.of(ldt, before, after);
         ZoneRules zr = zid.getRules();
@@ -198,14 +198,15 @@ public class TestZoneRules {
                 Collections.singletonList(transitionRule));
         ZoneOffset offsetA = zoneRulesA.getOffset(maxLocalDateTime);
         ZoneOffset offsetB = zoneRulesB.getOffset(maxLocalDateTime);
-        assertEquals(offsetA, offsetB);
+        assertEquals(offsetB, offsetA);
     }
 
     /**
      * Tests whether empty "transitionList" is correctly interpreted.
      * @bug 8239836
      */
-    @Test(dataProvider="emptyTransitionList")
+    @ParameterizedTest
+    @MethodSource("emptyTransitionList")
     public void test_EmptyTransitionList(int days, int offset, int stdOffset, int savings, boolean isDST) {
         LocalDateTime transitionDay = LocalDateTime.of(2020, 1, 1, 2, 0);
         Instant testDay = transitionDay.plusDays(days).toInstant(ZoneOffset.UTC);
@@ -217,18 +218,19 @@ public class TestZoneRules {
             Collections.singletonList(trans),
             Collections.emptyList(), Collections.emptyList());
 
-        assertEquals(rules.getOffset(testDay), ZoneOffset.ofHours(offset));
-        assertEquals(rules.getStandardOffset(testDay), ZoneOffset.ofHours(stdOffset));
-        assertEquals(rules.getDaylightSavings(testDay), Duration.ofHours(savings));
-        assertEquals(rules.isDaylightSavings(testDay), isDST);
+        assertEquals(ZoneOffset.ofHours(offset), rules.getOffset(testDay));
+        assertEquals(ZoneOffset.ofHours(stdOffset), rules.getStandardOffset(testDay));
+        assertEquals(Duration.ofHours(savings), rules.getDaylightSavings(testDay));
+        assertEquals(isDST, rules.isDaylightSavings(testDay));
     }
 
     /**
      * Tests whether isFixedOffset() is working correctly
      * @bug 8239836
      */
-    @Test(dataProvider="isFixedOffset")
+    @ParameterizedTest
+    @MethodSource("isFixedOffset")
     public void test_IsFixedOffset(ZoneRules zr, boolean expected) {
-        assertEquals(zr.isFixedOffset(), expected);
+        assertEquals(expected, zr.isFixedOffset());
     }
 }
diff --git a/test/jdk/java/time/test/java/time/zone/TestZoneRulesProvider.java b/test/jdk/java/time/test/java/time/zone/TestZoneRulesProvider.java
index 3a20dc2b864..6b0463d1b26 100644
--- a/test/jdk/java/time/test/java/time/zone/TestZoneRulesProvider.java
+++ b/test/jdk/java/time/test/java/time/zone/TestZoneRulesProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,17 +32,15 @@ import java.util.LinkedHashSet;
 import java.util.NavigableMap;
 import java.util.Set;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
 
 /**
  * @summary Tests for ZoneRulesProvider class.
  * @bug 8299571 8302983
  */
-@Test
 public class TestZoneRulesProvider {
 
     /**
diff --git a/test/jdk/java/time/test/java/util/TestFormatter.java b/test/jdk/java/time/test/java/util/TestFormatter.java
index 903e48ba96d..72b859e533e 100644
--- a/test/jdk/java/time/test/java/util/TestFormatter.java
+++ b/test/jdk/java/time/test/java/util/TestFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 package test.java.util;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.Instant;
 import java.time.LocalTime;
@@ -42,14 +42,15 @@ import java.time.temporal.UnsupportedTemporalTypeException;
 
 import java.util.*;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /* @test
  * @summary Unit test for j.u.Formatter threeten date/time support
  * @bug 8003680 8043387 8012638
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestFormatter {
 
     // time
@@ -71,7 +72,6 @@ public class TestFormatter {
     private int failure = 0;
     private boolean verbose = false;
 
-    @DataProvider(name = "calendarsByLocale")
     Object[][] data_calendars() {
         return new Object[][] {
             {"en_US"},
@@ -80,7 +80,8 @@ public class TestFormatter {
         };
     }
 
-    @Test(dataProvider="calendarsByLocale")
+    @ParameterizedTest
+    @MethodSource("data_calendars")
     public void test (String calendarLocale) {
         failure = 0;
         int N = 12;
@@ -128,7 +129,7 @@ public class TestFormatter {
                 System.out.println("All tests (" + total + ") PASSED");
             }
         }
-        assertEquals(failure, 0);
+        assertEquals(0, failure);
     }
 
     private String getClassName(Object o) {
diff --git a/test/jdk/java/util/Calendar/CalendarDisplayNamesTest.java b/test/jdk/java/util/Calendar/CalendarDisplayNamesTest.java
index 7c40714fc02..171bea55fcf 100644
--- a/test/jdk/java/util/Calendar/CalendarDisplayNamesTest.java
+++ b/test/jdk/java/util/Calendar/CalendarDisplayNamesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,21 +21,21 @@
  * questions.
  */
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import java.util.Calendar;
 import java.util.Locale;
 import java.util.Map;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * @test
  * @bug 8262108 8174269
  * @summary Verify the results returned by Calendar.getDisplayNames() API
  * @comment Locale providers: CLDR,SPI
- * @run testng/othervm -Djava.locale.providers=CLDR,SPI CalendarDisplayNamesTest
+ * @run junit/othervm -Djava.locale.providers=CLDR,SPI CalendarDisplayNamesTest
  * @comment Locale providers: default
- * @run testng CalendarDisplayNamesTest
+ * @run junit CalendarDisplayNamesTest
  */
 public class CalendarDisplayNamesTest {
 
@@ -55,7 +55,7 @@ public class CalendarDisplayNamesTest {
                     continue;
                 }
                 for (final Integer fieldValue : names.values()) {
-                    Assert.assertTrue(fieldValue == Calendar.AM || fieldValue == Calendar.PM,
+                    Assertions.assertTrue(fieldValue == Calendar.AM || fieldValue == Calendar.PM,
                             "Invalid field value " + fieldValue + " for calendar field AM_PM, in locale "
                                     + locale + " with style " + style);
                 }
diff --git a/test/jdk/java/util/Calendar/JapaneseLenientEraTest.java b/test/jdk/java/util/Calendar/JapaneseLenientEraTest.java
index 6a909a23a18..ca726afc29b 100644
--- a/test/jdk/java/util/Calendar/JapaneseLenientEraTest.java
+++ b/test/jdk/java/util/Calendar/JapaneseLenientEraTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8206120
  * @summary Test whether lenient era is accepted in JapaneseImperialCalendar
- * @run testng/othervm JapaneseLenientEraTest
+ * @run junit/othervm JapaneseLenientEraTest
  */
 
 import java.text.DateFormat;
@@ -34,15 +34,15 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class JapaneseLenientEraTest {
 
-    @DataProvider(name="lenientEra")
-    Object[][] names() {
+    Object[][] lenientEra() {
         return new Object[][] {
             // lenient era/year, strict era/year
             { "Meiji 123", "Heisei 2" },
@@ -51,7 +51,8 @@ public class JapaneseLenientEraTest {
         };
     }
 
-    @Test(dataProvider="lenientEra")
+    @ParameterizedTest
+    @MethodSource("lenientEra")
     public void testLenientEra(String lenient, String strict) throws Exception {
         Calendar c = new Calendar.Builder()
             .setCalendarType("japanese")
@@ -61,6 +62,6 @@ public class JapaneseLenientEraTest {
         Date lenDate = df.parse(lenient + "-01-01");
         df.setLenient(false);
         Date strDate = df.parse(strict + "-01-01");
-        assertEquals(lenDate, strDate);
+        assertEquals(strDate, lenDate);
     }
 }
diff --git a/test/jdk/java/util/Calendar/SupplementalJapaneseEraTestRun.java b/test/jdk/java/util/Calendar/SupplementalJapaneseEraTestRun.java
index 8eac4a97ef7..878955fdcc4 100644
--- a/test/jdk/java/util/Calendar/SupplementalJapaneseEraTestRun.java
+++ b/test/jdk/java/util/Calendar/SupplementalJapaneseEraTestRun.java
@@ -27,7 +27,7 @@
  * @summary Test for jdk.calendar.japanese.supplemental.era support
  * @library /test/lib
  * @build SupplementalJapaneseEraTest
- * @run testng/othervm SupplementalJapaneseEraTestRun
+ * @run junit/othervm SupplementalJapaneseEraTestRun
  */
 
 import java.util.Calendar;
@@ -45,11 +45,12 @@ import static java.util.Calendar.YEAR;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.Utils;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SupplementalJapaneseEraTestRun {
-    @DataProvider(name = "validprop")
     Object[][] validPropertyData() {
         return new Object[][] {
                 //Tests with valid property values
@@ -58,7 +59,6 @@ public class SupplementalJapaneseEraTestRun {
         };
     }
 
-    @DataProvider(name = "invalidprop")
     Object[][] invalidPropertyData() {
         return new Object[][] {
                 //Tests with invalid property values
@@ -76,7 +76,8 @@ public class SupplementalJapaneseEraTestRun {
         };
     }
 
-    @Test(dataProvider = "validprop")
+    @ParameterizedTest
+    @MethodSource("validPropertyData")
     public void ValidPropertyValuesTest(String prop)
             throws Throwable {
         //get the start time of the fictional next era
@@ -84,7 +85,8 @@ public class SupplementalJapaneseEraTestRun {
         testRun(prop + startTime, List.of("-t"));
     }
 
-    @Test(dataProvider = "invalidprop")
+    @ParameterizedTest
+    @MethodSource("invalidPropertyData")
     public void InvalidPropertyValuesTest(String prop)
             throws Throwable {
         //get the start time of the fictional next era
diff --git a/test/jdk/java/util/Collections/T5078378.java b/test/jdk/java/util/Collections/T5078378.java
index d3c9c198e70..1dc78dfe219 100644
--- a/test/jdk/java/util/Collections/T5078378.java
+++ b/test/jdk/java/util/Collections/T5078378.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/util/List/ListFactories.java b/test/jdk/java/util/List/ListFactories.java
index f02fcb95921..07cd2078e2e 100644
--- a/test/jdk/java/util/List/ListFactories.java
+++ b/test/jdk/java/util/List/ListFactories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/util/Locale/LocaleProvidersFormat.java b/test/jdk/java/util/Locale/LocaleProvidersFormat.java
index 157e92ce8a3..77b65dd6a74 100644
--- a/test/jdk/java/util/Locale/LocaleProvidersFormat.java
+++ b/test/jdk/java/util/Locale/LocaleProvidersFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/util/Locale/PreserveTagCase.java b/test/jdk/java/util/Locale/PreserveTagCase.java
index c5535e3a89f..3721067e831 100644
--- a/test/jdk/java/util/Locale/PreserveTagCase.java
+++ b/test/jdk/java/util/Locale/PreserveTagCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ public class PreserveTagCase {
      */
     @ParameterizedTest
     @MethodSource("filterProvider")
-    public static void testFilterTags(String ranges, List<String> tags,
+    public void testFilterTags(String ranges, List<String> tags,
                                   List<String> expected, FilteringMode mode) {
         List<LanguageRange> priorityList = LanguageRange.parse(ranges);
         List<String> actual = Locale.filterTags(priorityList, tags, mode);
@@ -67,7 +67,7 @@ public class PreserveTagCase {
      */
     @ParameterizedTest
     @MethodSource("lookupProvider")
-    public static void testLookupTag(String ranges, List<String> tags,
+    public void testLookupTag(String ranges, List<String> tags,
                                   String expected) {
         List<LanguageRange> priorityList = LanguageRange.parse(ranges);
         String actual = Locale.lookupTag(priorityList, tags);
diff --git a/test/jdk/java/util/Properties/CompatibilityTest.java b/test/jdk/java/util/Properties/CompatibilityTest.java
index 29c7be6fbcd..839680806c1 100644
--- a/test/jdk/java/util/Properties/CompatibilityTest.java
+++ b/test/jdk/java/util/Properties/CompatibilityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,19 +24,19 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Properties;
-import org.testng.Assert;
-
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
  * @bug 8252354
- * @run testng CompatibilityTest
+ * @run junit CompatibilityTest
  * @summary Verify compatibility.
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CompatibilityTest {
-    @DataProvider(name = "entries")
     public Object[][] getEntries() throws IOException {
         return new Object[][]{
             {8, 238923},
@@ -53,9 +53,10 @@ public class CompatibilityTest {
      * @param value the value
      * @throws IOException
      */
-    @Test(dataProvider = "entries")
+    @ParameterizedTest
+    @MethodSource("getEntries")
     void testThrows(Object key, Object value) throws IOException {
-        Assert.assertThrows(ClassCastException.class, () -> storeToXML(key, value));
+        Assertions.assertThrows(ClassCastException.class, () -> storeToXML(key, value));
     }
 
     void storeToXML(Object key, Object value) throws IOException {
diff --git a/test/jdk/java/util/Properties/EncodingTest.java b/test/jdk/java/util/Properties/EncodingTest.java
index d97730a37c7..069d16155f0 100644
--- a/test/jdk/java/util/Properties/EncodingTest.java
+++ b/test/jdk/java/util/Properties/EncodingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,19 +27,20 @@ import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Properties;
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * @test
  * @bug 8183743
  * @summary Test to verify the new overload method with Charset functions the
  * same as the existing method that takes a charset name.
- * @run testng EncodingTest
+ * @run junit EncodingTest
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class EncodingTest {
-    @DataProvider(name = "parameters")
     public Object[][] getParameters() throws IOException {
         return new Object[][]{
             {StandardCharsets.UTF_8.name(), null},
@@ -51,7 +52,8 @@ public class EncodingTest {
      * encoding name or a charset can be read with Properties#loadFromXML that
      * returns the same Properties object.
      */
-    @Test(dataProvider = "parameters")
+    @ParameterizedTest
+    @MethodSource("getParameters")
     void testLoadAndStore(String encoding, Charset charset) throws IOException {
         Properties props = new Properties();
         props.put("k0", "\u6C34");
@@ -74,6 +76,6 @@ public class EncodingTest {
             }
         }
 
-        Assert.assertEquals(props, p);
+        Assertions.assertEquals(p, props);
     }
 }
diff --git a/test/jdk/java/util/Properties/InitialCapacity.java b/test/jdk/java/util/Properties/InitialCapacity.java
index 81e5421bbef..d684c37adf4 100644
--- a/test/jdk/java/util/Properties/InitialCapacity.java
+++ b/test/jdk/java/util/Properties/InitialCapacity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,18 +22,22 @@
  */
 
 import java.util.Properties;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
  * @bug 8189319
  * @summary Test that Properties(int initialCapacity) throws exceptions (or
             doesn't) as expected
- * @run testng InitialCapacity
+ * @run junit InitialCapacity
  */
 public class InitialCapacity {
-    @Test(expectedExceptions = IllegalArgumentException.class)
-    public void negativeInitCap() { Properties p = new Properties(-1); }
+    @Test
+    public void negativeInitCap() { Assertions.assertThrows(IllegalArgumentException.class, () -> {
+        Properties p = new Properties(-1);
+        });
+}
 
     @Test
     public void positiveInitCap() { Properties p = new Properties(10); }
diff --git a/test/jdk/java/util/Properties/PropertiesEntrySetTest.java b/test/jdk/java/util/Properties/PropertiesEntrySetTest.java
index d7d58be44dd..f3262f734e3 100644
--- a/test/jdk/java/util/Properties/PropertiesEntrySetTest.java
+++ b/test/jdk/java/util/Properties/PropertiesEntrySetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,17 +26,17 @@
  * @bug        8245694
  * @summary    tests the entrySet() method of Properties class
  * @author     Yu Li
- * @run testng PropertiesEntrySetTest
+ * @run junit PropertiesEntrySetTest
  */
 
-import org.testng.annotations.Test;
 
 import java.util.Properties;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertThrows;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 public class PropertiesEntrySetTest {
 
@@ -99,13 +99,13 @@ public class PropertiesEntrySetTest {
     public void testToString() {
         Properties a = new Properties();
         var aEntrySet = a.entrySet();
-        assertEquals(aEntrySet.toString(), "[]");
+        assertEquals("[]", aEntrySet.toString());
 
         a.setProperty("p1", "1");
-        assertEquals(aEntrySet.toString(), "[p1=1]");
+        assertEquals("[p1=1]", aEntrySet.toString());
 
         a.setProperty("p2", "2");
-        assertEquals(aEntrySet.size(), 2);
+        assertEquals(2, aEntrySet.size());
         assertTrue(aEntrySet.toString().trim().startsWith("["));
         assertTrue(aEntrySet.toString().contains("p1=1"));
         assertTrue(aEntrySet.toString().contains("p2=2"));
@@ -115,18 +115,18 @@ public class PropertiesEntrySetTest {
         b.setProperty("p2", "2");
         b.setProperty("p1", "1");
         var bEntrySet = b.entrySet();
-        assertEquals(bEntrySet.size(), 2);
+        assertEquals(2, bEntrySet.size());
         assertTrue(bEntrySet.toString().trim().startsWith("["));
         assertTrue(bEntrySet.toString().contains("p1=1"));
         assertTrue(bEntrySet.toString().contains("p2=2"));
         assertTrue(bEntrySet.toString().trim().endsWith("]"));
 
         b.setProperty("p0", "0");
-        assertEquals(bEntrySet.size(), 3);
+        assertEquals(3, bEntrySet.size());
         assertTrue(bEntrySet.toString().contains("p0=0"));
 
         b.remove("p1");
-        assertEquals(bEntrySet.size(), 2);
+        assertEquals(2, bEntrySet.size());
         assertFalse(bEntrySet.toString().contains("p1=1"));
         assertTrue(bEntrySet.toString().trim().startsWith("["));
         assertTrue(bEntrySet.toString().contains("p0=0"));
@@ -134,7 +134,7 @@ public class PropertiesEntrySetTest {
         assertTrue(bEntrySet.toString().trim().endsWith("]"));
 
         b.remove("p0", "0");
-        assertEquals(bEntrySet.size(), 1);
+        assertEquals(1, bEntrySet.size());
         assertFalse(bEntrySet.toString().contains("p0=0"));
         assertTrue(bEntrySet.toString().trim().startsWith("["));
         assertTrue(bEntrySet.toString().contains("p2=2"));
@@ -151,13 +151,13 @@ public class PropertiesEntrySetTest {
         a.setProperty("p1", "1");
         a.setProperty("p2", "2");
         var aEntrySet = a.entrySet();
-        assertEquals(aEntrySet.size(), 2);
+        assertEquals(2, aEntrySet.size());
 
         var i = aEntrySet.iterator();
         var e1 = i.next();
         i.remove();
         assertFalse(aEntrySet.contains(e1));
-        assertEquals(aEntrySet.size(), 1);
+        assertEquals(1, aEntrySet.size());
 
         var e2 = i.next();
         aEntrySet.remove(e2);
@@ -172,14 +172,14 @@ public class PropertiesEntrySetTest {
         var bEntrySet = b.entrySet();
 
         assertFalse(bEntrySet.containsAll(aEntrySet));
-        assertEquals(bEntrySet.size(), 2);
+        assertEquals(2, bEntrySet.size());
 
         assertTrue(bEntrySet.removeAll(aEntrySet));
-        assertEquals(bEntrySet.size(), 1);
+        assertEquals(1, bEntrySet.size());
 
         assertTrue(bEntrySet.retainAll(aEntrySet));
         assertTrue(bEntrySet.isEmpty());
-        assertEquals(aEntrySet.size(), 2);
+        assertEquals(2, aEntrySet.size());
 
         aEntrySet.clear();
         assertTrue(aEntrySet.isEmpty());
diff --git a/test/jdk/java/util/Properties/PropertiesStoreTest.java b/test/jdk/java/util/Properties/PropertiesStoreTest.java
index b5a5b5a45aa..88c24698a14 100644
--- a/test/jdk/java/util/Properties/PropertiesStoreTest.java
+++ b/test/jdk/java/util/Properties/PropertiesStoreTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,6 @@
  * questions.
  */
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -45,13 +42,18 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
  * @summary tests the order in which the Properties.store() method writes out the properties
  * @bug 8231640 8282023
- * @run testng/othervm PropertiesStoreTest
+ * @run junit/othervm PropertiesStoreTest
  */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class PropertiesStoreTest {
 
     private static final String DATE_FORMAT_PATTERN = "EEE MMM dd HH:mm:ss zzz uuuu";
@@ -60,7 +62,6 @@ public class PropertiesStoreTest {
     private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern(DATE_FORMAT_PATTERN, Locale.US);
     private static final Locale PREV_LOCALE = Locale.getDefault();
 
-    @DataProvider(name = "propsProvider")
     private Object[][] createProps() {
         final Properties simple = new Properties();
         simple.setProperty("1", "one");
@@ -101,7 +102,6 @@ public class PropertiesStoreTest {
     /**
      * Returns a {@link Locale} to use for testing
      */
-    @DataProvider(name = "localeProvider")
     private Object[][] provideLocales() {
         // pick a non-english locale for testing
         Set<Locale> locales = Arrays.stream(Locale.getAvailableLocales())
@@ -122,7 +122,8 @@ public class PropertiesStoreTest {
      * Tests that the {@link Properties#store(Writer, String)} API writes out the properties
      * in the expected order
      */
-    @Test(dataProvider = "propsProvider")
+    @ParameterizedTest
+    @MethodSource("createProps")
     public void testStoreWriterKeyOrder(final Properties props, final String[] expectedOrder) throws Exception {
         // Properties.store(...) to a temp file
         final Path tmpFile = Files.createTempFile("8231640", "props");
@@ -136,7 +137,8 @@ public class PropertiesStoreTest {
      * Tests that the {@link Properties#store(OutputStream, String)} API writes out the properties
      * in the expected order
      */
-    @Test(dataProvider = "propsProvider")
+    @ParameterizedTest
+    @MethodSource("createProps")
     public void testStoreOutputStreamKeyOrder(final Properties props, final String[] expectedOrder) throws Exception {
         // Properties.store(...) to a temp file
         final Path tmpFile = Files.createTempFile("8231640", "props");
@@ -161,7 +163,7 @@ public class PropertiesStoreTest {
         try (final InputStream is = Files.newInputStream(storedProps)) {
             loaded.load(is);
         }
-        Assert.assertEquals(loaded, props, "Unexpected properties loaded from stored state");
+        Assertions.assertEquals(props, loaded, "Unexpected properties loaded from stored state");
 
         // now read lines from the stored file and keep track of the order in which the keys were
         // found in that file. Compare that order with the expected store order of the keys.
@@ -169,10 +171,10 @@ public class PropertiesStoreTest {
         try (final BufferedReader reader = Files.newBufferedReader(storedProps)) {
             actualOrder = readInOrder(reader);
         }
-        Assert.assertEquals(actualOrder.size(), expectedOrder.length,
+        Assertions.assertEquals(expectedOrder.length, actualOrder.size(),
                 "Unexpected number of keys read from stored properties");
         if (!Arrays.equals(actualOrder.toArray(new String[0]), expectedOrder)) {
-            Assert.fail("Unexpected order of stored property keys. Expected order: " + Arrays.toString(expectedOrder)
+            Assertions.fail("Unexpected order of stored property keys. Expected order: " + Arrays.toString(expectedOrder)
                     + ", found order: " + actualOrder);
         }
     }
@@ -180,7 +182,8 @@ public class PropertiesStoreTest {
     /**
      * Tests that {@link Properties#store(Writer, String)} writes out a proper date comment
      */
-    @Test(dataProvider = "localeProvider")
+    @ParameterizedTest
+    @MethodSource("provideLocales")
     public void testStoreWriterDateComment(final Locale testLocale) throws Exception {
         // switch the default locale to the one being tested
         Locale.setDefault(testLocale);
@@ -202,7 +205,8 @@ public class PropertiesStoreTest {
     /**
      * Tests that {@link Properties#store(OutputStream, String)} writes out a proper date comment
      */
-    @Test(dataProvider = "localeProvider")
+    @ParameterizedTest
+    @MethodSource("provideLocales")
     public void testStoreOutputStreamDateComment(final Locale testLocale) throws Exception {
         // switch the default locale to the one being tested
         Locale.setDefault(testLocale);
@@ -232,19 +236,19 @@ public class PropertiesStoreTest {
             while ((line = reader.readLine()) != null) {
                 if (line.startsWith("#")) {
                     if (comment != null) {
-                        Assert.fail("More than one comment line found in the stored properties file " + file);
+                        Assertions.fail("More than one comment line found in the stored properties file " + file);
                     }
                     comment = line.substring(1);
                 }
             }
         }
         if (comment == null) {
-            Assert.fail("No comment line found in the stored properties file " + file);
+            Assertions.fail("No comment line found in the stored properties file " + file);
         }
         try {
             FORMATTER.parse(comment);
         } catch (DateTimeParseException pe) {
-            Assert.fail("Unexpected date comment: " + comment, pe);
+            Assertions.fail("Unexpected date comment: " + comment, pe);
         }
     }
 
diff --git a/test/jdk/java/util/ResourceBundle/modules/basic/BasicTest.java b/test/jdk/java/util/ResourceBundle/modules/basic/BasicTest.java
index 69f0db83258..c17c4622ecb 100644
--- a/test/jdk/java/util/ResourceBundle/modules/basic/BasicTest.java
+++ b/test/jdk/java/util/ResourceBundle/modules/basic/BasicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
  *        jdk.test.lib.compiler.CompilerUtils
  *        jdk.test.lib.process.ProcessTools
  *        ModuleTestUtil
- * @run testng BasicTest
+ * @run junit BasicTest
  */
 
 import java.nio.file.Path;
@@ -54,13 +54,15 @@ import jdk.test.lib.JDKToolLauncher;
 import jdk.test.lib.Utils;
 import jdk.test.lib.compiler.CompilerUtils;
 import jdk.test.lib.process.ProcessTools;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static jdk.test.lib.Asserts.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class BasicTest {
     private static final String SRC_DIR_APPBASIC = "srcAppbasic";
     private static final String SRC_DIR_APPBASIC2 = "srcAppbasic2";
@@ -92,7 +94,6 @@ public class BasicTest {
 
     private static final String MAIN = "test/jdk.test.Main";
 
-    @DataProvider(name = "basicTestData")
     Object[][] basicTestData() {
         return new Object[][] {
                 // Named module "test" contains resource bundles for root and en,
@@ -122,7 +123,8 @@ public class BasicTest {
         };
     }
 
-    @Test(dataProvider = "basicTestData")
+    @ParameterizedTest
+    @MethodSource("basicTestData")
     public void runBasicTest(String src, String mod, List<String> moduleList,
             List<String> localeList, String resFormat) throws Throwable {
         Path srcPath = Paths.get(Utils.TEST_SRC, src);
diff --git a/test/jdk/java/util/ResourceBundle/modules/cache/CacheTest.java b/test/jdk/java/util/ResourceBundle/modules/cache/CacheTest.java
index 5655eb5de2d..df72af38855 100644
--- a/test/jdk/java/util/ResourceBundle/modules/cache/CacheTest.java
+++ b/test/jdk/java/util/ResourceBundle/modules/cache/CacheTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @library /test/lib
  * @modules jdk.compiler
  * @build CacheTest jdk.test.lib.compiler.CompilerUtils
- * @run testng CacheTest
+ * @run junit CacheTest
  */
 
 import java.nio.file.Files;
@@ -37,11 +37,12 @@ import java.nio.file.Paths;
 import static jdk.test.lib.process.ProcessTools.*;
 import jdk.test.lib.compiler.CompilerUtils;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CacheTest {
 
     private static final String TEST_SRC = System.getProperty("test.src");
@@ -55,7 +56,7 @@ public class CacheTest {
     private static final String MAIN = "test/jdk.test.Main";
     private static final String MAIN_CLASS = "jdk.test.Main";
 
-    @BeforeTest
+    @BeforeAll
     public void compileTestModules() throws Exception {
 
         for (String mn : new String[] {MAIN_BUNDLES_MODULE, TEST_MODULE}) {
diff --git a/test/jdk/java/util/ResourceBundle/modules/casesensitive/CaseInsensitiveNameClash.java b/test/jdk/java/util/ResourceBundle/modules/casesensitive/CaseInsensitiveNameClash.java
index 914ebf6bbf0..45f52b512c8 100644
--- a/test/jdk/java/util/ResourceBundle/modules/casesensitive/CaseInsensitiveNameClash.java
+++ b/test/jdk/java/util/ResourceBundle/modules/casesensitive/CaseInsensitiveNameClash.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @modules jdk.compiler
  * @build jdk.test.lib.compiler.CompilerUtils
  *        jdk.test.lib.process.ProcessTools CaseInsensitiveNameClash
- * @run testng CaseInsensitiveNameClash
+ * @run junit CaseInsensitiveNameClash
  */
 
 import java.nio.file.Files;
@@ -37,10 +37,12 @@ import java.nio.file.Paths;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.compiler.CompilerUtils;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CaseInsensitiveNameClash {
 
     private static final String TEST_SRC = System.getProperty("test.src");
@@ -54,7 +56,7 @@ public class CaseInsensitiveNameClash {
     /**
      * Compiles the module used by the test
      */
-    @BeforeTest
+    @BeforeAll
     public void compileAll() throws Exception {
         Path msrc = SRC_DIR.resolve(MODULE);
         assertTrue(CompilerUtils.compile(msrc, MODS_DIR,
diff --git a/test/jdk/java/util/ResourceBundle/modules/visibility/VisibilityTest.java b/test/jdk/java/util/ResourceBundle/modules/visibility/VisibilityTest.java
index e0fdb9a93ab..ee9da88d705 100644
--- a/test/jdk/java/util/ResourceBundle/modules/visibility/VisibilityTest.java
+++ b/test/jdk/java/util/ResourceBundle/modules/visibility/VisibilityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *        jdk.test.lib.compiler.CompilerUtils
  *        jdk.test.lib.process.ProcessTools
  *        ModuleTestUtil
- * @run testng VisibilityTest
+ * @run junit VisibilityTest
  */
 
 import java.nio.file.Path;
@@ -46,13 +46,13 @@ import jdk.test.lib.JDKToolLauncher;
 import jdk.test.lib.Utils;
 import jdk.test.lib.process.ProcessTools;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.testng.Assert.assertEquals;
-
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VisibilityTest {
     private static final Path SRC_DIR = Paths.get(Utils.TEST_SRC, "src");
     private static final Path MODS_DIR = Paths.get(Utils.TEST_CLASSES, "mods");
@@ -63,7 +63,7 @@ public class VisibilityTest {
     private static final List<String> MODULE_LIST = List.of("embargo",
             "exported.named.bundles", "named.bundles", "test");
 
-    @BeforeTest
+    @BeforeAll
     public void prepareTestEnv() throws Throwable {
         MODULE_LIST.forEach(mn -> ModuleTestUtil.prepareModule(SRC_DIR,
                 MODS_DIR, mn, ".properties"));
@@ -93,7 +93,6 @@ public class VisibilityTest {
      * "exported.named.bundle" are exported to unnamed modules.
      */
 
-    @DataProvider(name = "RunWithTestResData")
     Object[][] RunWithTestResData() {
         return new Object[][] {
                 // Tests using jdk.test.TestWithNoModuleArg and jdk.embargo.TestWithNoModuleArg.
@@ -188,7 +187,6 @@ public class VisibilityTest {
         };
     }
 
-    @DataProvider(name = "RunWithExportedResData")
     Object[][] RunWithExportedResData() {
         return new Object[][] {
                 // Tests using jdk.test.TestWithNoModuleArg and jdk.embargo.TestWithNoModuleArg
@@ -285,7 +283,6 @@ public class VisibilityTest {
         };
     }
 
-    @DataProvider(name = "RunWithPkgResData")
     Object[][] RunWithPkgResData() {
         return new Object[][] {
                 // jdk.pkg.resources.* are in an unnamed module.
@@ -300,10 +297,11 @@ public class VisibilityTest {
     /**
      * Test cases with jdk.test.resources.*
      */
-    @Test(dataProvider = "RunWithTestResData")
+    @ParameterizedTest
+    @MethodSource("RunWithTestResData")
     public void RunWithTestRes(List<String> argsList) throws Throwable {
         int exitCode = runCmd(argsList);
-        assertEquals(exitCode, 0, "Execution of the tests with "
+        assertEquals(0, exitCode, "Execution of the tests with "
                 + "jdk.test.resources.* failed. "
                 + "Unexpected exit code: " + exitCode);
     }
@@ -311,10 +309,11 @@ public class VisibilityTest {
     /**
      * Test cases with jdk.test.resources.exported.*
      */
-    @Test(dataProvider = "RunWithExportedResData")
+    @ParameterizedTest
+    @MethodSource("RunWithExportedResData")
     public void RunWithExportedRes(List<String> argsList) throws Throwable {
         int exitCode = runCmd(argsList);
-        assertEquals(exitCode, 0, "Execution of the tests with "
+        assertEquals(0, exitCode, "Execution of the tests with "
                 + "jdk.test.resources.exported.* failed. "
                 + "Unexpected exit code: " + exitCode);
     }
@@ -322,10 +321,11 @@ public class VisibilityTest {
     /**
      * Test cases with jdk.pkg.resources.*
      */
-    @Test(dataProvider = "RunWithPkgResData")
+    @ParameterizedTest
+    @MethodSource("RunWithPkgResData")
     public void RunWithPkgRes(List<String> argsList) throws Throwable {
         int exitCode = runCmd(argsList);
-        assertEquals(exitCode, 0, "Execution of the tests with "
+        assertEquals(0, exitCode, "Execution of the tests with "
                 + "jdk.pkg.resources.* failed. "
                 + "Unexpected exit code: " + exitCode);
     }
diff --git a/test/jdk/java/util/TimeZone/NegativeDSTTest.java b/test/jdk/java/util/TimeZone/NegativeDSTTest.java
index eb46b8d4b29..ab9438f2388 100644
--- a/test/jdk/java/util/TimeZone/NegativeDSTTest.java
+++ b/test/jdk/java/util/TimeZone/NegativeDSTTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.Instant;
 import java.time.LocalDate;
@@ -31,18 +31,19 @@ import java.time.ZoneId;
 import java.util.Date;
 import java.util.TimeZone;
 
-import org.testng.annotations.Test;
-import org.testng.annotations.DataProvider;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * @test
  * @bug 8212970 8324065
  * @summary Test whether the savings are positive in time zones that have
  *      negative savings in the source TZ files.
- * @run testng NegativeDSTTest
+ * @run junit NegativeDSTTest
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class NegativeDSTTest {
 
     private static final TimeZone DUBLIN = TimeZone.getTimeZone("Europe/Dublin");
@@ -51,7 +52,6 @@ public class NegativeDSTTest {
     private static final TimeZone CASABLANCA = TimeZone.getTimeZone("Africa/Casablanca");
     private static final int ONE_HOUR = 3600_000;
 
-    @DataProvider
     private Object[][] negativeDST () {
         return new Object[][] {
             // TimeZone, localDate, offset, isDaylightSavings
@@ -88,10 +88,11 @@ public class NegativeDSTTest {
         };
     }
 
-    @Test(dataProvider="negativeDST")
+    @ParameterizedTest
+    @MethodSource("negativeDST")
     public void test_NegativeDST(TimeZone tz, LocalDate ld, int offset, boolean isDST) {
         Date d = Date.from(Instant.from(ZonedDateTime.of(ld, LocalTime.MIN, tz.toZoneId())));
-        assertEquals(tz.getOffset(d.getTime()), offset);
-        assertEquals(tz.inDaylightTime(d), isDST);
+        assertEquals(offset, tz.getOffset(d.getTime()));
+        assertEquals(isDST, tz.inDaylightTime(d));
     }
 }
diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
index 750d9fae2b1..76d146afc71 100644
--- a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
+++ b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
@@ -1 +1 @@
-tzdata2025b
+tzdata2025c
diff --git a/test/jdk/java/util/TimeZone/ZoneIdRoundTripTest.java b/test/jdk/java/util/TimeZone/ZoneIdRoundTripTest.java
index 0f1eeb88328..16e24f7cb27 100644
--- a/test/jdk/java/util/TimeZone/ZoneIdRoundTripTest.java
+++ b/test/jdk/java/util/TimeZone/ZoneIdRoundTripTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,20 @@ import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.util.TimeZone;
 
-import org.testng.annotations.Test;
-import org.testng.annotations.DataProvider;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * @test
  * @bug 8285844
  * @summary Checks round-trips between TimeZone and ZoneId are consistent
- * @run testng ZoneIdRoundTripTest
+ * @run junit ZoneIdRoundTripTest
  */
-@Test
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class ZoneIdRoundTripTest {
 
-    @DataProvider
     private Object[][] testZoneIds() {
         return new Object[][] {
                 {ZoneId.of("Z"), 0},
@@ -60,11 +60,12 @@ public class ZoneIdRoundTripTest {
         };
     }
 
-    @Test(dataProvider="testZoneIds")
+    @ParameterizedTest
+    @MethodSource("testZoneIds")
     public void test_ZoneIdRoundTrip(ZoneId zid, int offset) {
         var tz = TimeZone.getTimeZone(zid);
-        assertEquals(tz.getRawOffset(), offset);
-        assertEquals(tz.toZoneId().normalized(), zid.normalized());
+        assertEquals(offset, tz.getRawOffset());
+        assertEquals(zid.normalized(), tz.toZoneId().normalized());
     }
 }
 
diff --git a/test/jdk/java/util/concurrent/CompletableFuture/CompletableFutureOrTimeoutExceptionallyTest.java b/test/jdk/java/util/concurrent/CompletableFuture/CompletableFutureOrTimeoutExceptionallyTest.java
index 210a791aad0..4b48b264714 100644
--- a/test/jdk/java/util/concurrent/CompletableFuture/CompletableFutureOrTimeoutExceptionallyTest.java
+++ b/test/jdk/java/util/concurrent/CompletableFuture/CompletableFutureOrTimeoutExceptionallyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/util/concurrent/Executors/AutoShutdown.java b/test/jdk/java/util/concurrent/Executors/AutoShutdown.java
index ec58a472f7b..d3f277baddf 100644
--- a/test/jdk/java/util/concurrent/Executors/AutoShutdown.java
+++ b/test/jdk/java/util/concurrent/Executors/AutoShutdown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/util/concurrent/forkjoin/Starvation.java b/test/jdk/java/util/concurrent/forkjoin/Starvation.java
index d864fa0ba33..f3336a3c7e9 100644
--- a/test/jdk/java/util/concurrent/forkjoin/Starvation.java
+++ b/test/jdk/java/util/concurrent/forkjoin/Starvation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/util/concurrent/locks/StampedLock/OOMEInStampedLock.java b/test/jdk/java/util/concurrent/locks/StampedLock/OOMEInStampedLock.java
index 32b77205163..1bec4f21c09 100644
--- a/test/jdk/java/util/concurrent/locks/StampedLock/OOMEInStampedLock.java
+++ b/test/jdk/java/util/concurrent/locks/StampedLock/OOMEInStampedLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/util/regex/TestCases.txt b/test/jdk/java/util/regex/TestCases.txt
index 3353335f84d..68a7a6651ad 100644
--- a/test/jdk/java/util/regex/TestCases.txt
+++ b/test/jdk/java/util/regex/TestCases.txt
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/util/stream/GathererTest.java b/test/jdk/java/util/stream/GathererTest.java
index 419347d76c6..5792dbbf1d5 100644
--- a/test/jdk/java/util/stream/GathererTest.java
+++ b/test/jdk/java/util/stream/GathererTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/util/zip/CloseInflaterDeflaterTest.java b/test/jdk/java/util/zip/CloseInflaterDeflaterTest.java
index 5c6732503f5..af314581a9e 100644
--- a/test/jdk/java/util/zip/CloseInflaterDeflaterTest.java
+++ b/test/jdk/java/util/zip/CloseInflaterDeflaterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/util/zip/DeflaterClose.java b/test/jdk/java/util/zip/DeflaterClose.java
index a4c4b233b4e..db81e787d92 100644
--- a/test/jdk/java/util/zip/DeflaterClose.java
+++ b/test/jdk/java/util/zip/DeflaterClose.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/util/zip/InflaterClose.java b/test/jdk/java/util/zip/InflaterClose.java
index 7c0e1606ade..515de5cb7ed 100644
--- a/test/jdk/java/util/zip/InflaterClose.java
+++ b/test/jdk/java/util/zip/InflaterClose.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/util/zip/TotalInOut.java b/test/jdk/java/util/zip/TotalInOut.java
index 92ab981def8..1a4d9624186 100644
--- a/test/jdk/java/util/zip/TotalInOut.java
+++ b/test/jdk/java/util/zip/TotalInOut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/management/mxbean/MXBeanInteropTest1.java b/test/jdk/javax/management/mxbean/MXBeanInteropTest1.java
index 011bdb144fb..61127a4ee10 100644
--- a/test/jdk/javax/management/mxbean/MXBeanInteropTest1.java
+++ b/test/jdk/javax/management/mxbean/MXBeanInteropTest1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/management/security/HashedPasswordFileTest.java b/test/jdk/javax/management/security/HashedPasswordFileTest.java
index 6cef1df4a0a..92c3692870e 100644
--- a/test/jdk/javax/management/security/HashedPasswordFileTest.java
+++ b/test/jdk/javax/management/security/HashedPasswordFileTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/net/ssl/DTLS/TEST.properties b/test/jdk/javax/net/ssl/DTLS/TEST.properties
index a50cba09c0f..ceb6c8c9c42 100644
--- a/test/jdk/javax/net/ssl/DTLS/TEST.properties
+++ b/test/jdk/javax/net/ssl/DTLS/TEST.properties
@@ -6,4 +6,3 @@ modules = \
     java.security.jgss/sun.security.krb5.internal:+open \
     java.security.jgss/sun.security.krb5.internal.ktab \
     java.base/sun.security.util
-maxOutputSize = 2500000
diff --git a/test/jdk/javax/net/ssl/HttpsURLConnection/Equals.java b/test/jdk/javax/net/ssl/HttpsURLConnection/Equals.java
index d36dfb2630e..35913edd2bf 100644
--- a/test/jdk/javax/net/ssl/HttpsURLConnection/Equals.java
+++ b/test/jdk/javax/net/ssl/HttpsURLConnection/Equals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @library /test/lib
  * @modules jdk.httpserver
  * @build jdk.test.lib.net.SimpleSSLContext
- * @run main/othervm -Djavax.net.debug=ssl,handshake,record Equals
+ * @run main/othervm Equals
  */
 import com.sun.net.httpserver.*;
 import java.net.*;
@@ -38,9 +38,24 @@ import jdk.test.lib.net.SimpleSSLContext;
 
 public class Equals {
 
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=ssl,handshake,record
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
+
     static SSLContext ctx;
 
     public static void main(String[] args) throws Exception {
+        if (debug) {
+            System.setProperty("javax.net.debug", "ssl,handshake,record");
+        }
+
         HttpsServer s2 = null;
         ExecutorService executor = null;
         try {
diff --git a/test/jdk/javax/net/ssl/HttpsURLConnection/SubjectAltNameIP.java b/test/jdk/javax/net/ssl/HttpsURLConnection/SubjectAltNameIP.java
index 2def2f69d6e..cbd2089e7bd 100644
--- a/test/jdk/javax/net/ssl/HttpsURLConnection/SubjectAltNameIP.java
+++ b/test/jdk/javax/net/ssl/HttpsURLConnection/SubjectAltNameIP.java
@@ -30,7 +30,7 @@
  * @modules java.base/sun.net.util
  * @comment Insert -Djavax.net.debug=all into the following lines to enable SSL debugging
  * @run main/othervm SubjectAltNameIP 127.0.0.1
- * @run main/othervm SubjectAltNameIP [::1]
+ * @run main/othervm SubjectAltNameIP ::1
  */
 
 import javax.net.ssl.HandshakeCompletedListener;
@@ -166,14 +166,19 @@ public class SubjectAltNameIP {
     }
 
     public static void main(String[] args) throws Exception {
+        boolean isIpv6Addr = IPAddressUtil.isIPv6LiteralAddress(args[0]);
 
-        if (IPAddressUtil.isIPv6LiteralAddress(args[0]) && !IPSupport.hasIPv6()) {
+        if (isIpv6Addr && !IPSupport.hasIPv6()) {
             throw new SkippedException("Skipping test - IPv6 is not supported");
         }
         /*
          * Start the tests.
          */
-        new SubjectAltNameIP(args[0]);
+        if (isIpv6Addr) { // use the URL notion wrapper
+            new SubjectAltNameIP("[" + args[0] + "]");
+        } else {
+            new SubjectAltNameIP(args[0]);
+        }
     }
 
     Thread serverThread = null;
diff --git a/test/jdk/javax/net/ssl/SSLEngine/NoAuthClientAuth.java b/test/jdk/javax/net/ssl/SSLEngine/NoAuthClientAuth.java
index 208fb3935ae..95754a4763e 100644
--- a/test/jdk/javax/net/ssl/SSLEngine/NoAuthClientAuth.java
+++ b/test/jdk/javax/net/ssl/SSLEngine/NoAuthClientAuth.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -99,7 +99,7 @@ public class NoAuthClientAuth {
      * including specific handshake messages, and might be best examined
      * after gaining some familiarity with this application.
      */
-    private static boolean debug = true;
+    private static boolean debug = false;
 
     private SSLContext sslc;
 
diff --git a/test/jdk/javax/net/ssl/SSLSession/ResumeTLS13withSNI.java b/test/jdk/javax/net/ssl/SSLSession/ResumeTLS13withSNI.java
index 3d05607bd39..d288fe70200 100644
--- a/test/jdk/javax/net/ssl/SSLSession/ResumeTLS13withSNI.java
+++ b/test/jdk/javax/net/ssl/SSLSession/ResumeTLS13withSNI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ public class ResumeTLS13withSNI {
      * including specific handshake messages, and might be best examined
      * after gaining some familiarity with this application.
      */
-    private static final boolean debug = true;
+    private static final boolean debug = false;
 
     private static final ByteBuffer clientOut =
             ByteBuffer.wrap("Hi Server, I'm Client".getBytes());
diff --git a/test/jdk/javax/net/ssl/SSLSession/ServerNameRejectedTLSSessionResumption.java b/test/jdk/javax/net/ssl/SSLSession/ServerNameRejectedTLSSessionResumption.java
index f80f3402c7e..de51b9c565e 100644
--- a/test/jdk/javax/net/ssl/SSLSession/ServerNameRejectedTLSSessionResumption.java
+++ b/test/jdk/javax/net/ssl/SSLSession/ServerNameRejectedTLSSessionResumption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,11 +43,20 @@ import javax.net.ssl.StandardConstants;
  *          between the server and the client happens correctly without any
  *          errors
  * @library /javax/net/ssl/templates
- * @run main/othervm -Djavax.net.debug=all
- *                   ServerNameRejectedTLSSessionResumption
+ * @run main/othervm ServerNameRejectedTLSSessionResumption
  */
 public class ServerNameRejectedTLSSessionResumption
         extends SSLContextTemplate {
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=all
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
 
     private static final String CLIENT_REQUESTED_SNI = "client.local";
     // dummy host, no connection is attempted in this test
@@ -56,6 +65,10 @@ public class ServerNameRejectedTLSSessionResumption
     private static final int PEER_PORT = 12345;
 
     public static void main(final String[] args) throws Exception {
+        if (debug) {
+            System.setProperty("javax.net.debug", "all");
+        }
+
         new ServerNameRejectedTLSSessionResumption().runTest();
     }
 
diff --git a/test/jdk/javax/net/ssl/SSLSocket/Tls13PacketSize.java b/test/jdk/javax/net/ssl/SSLSocket/Tls13PacketSize.java
index 16e009ed589..b9386af9e0c 100644
--- a/test/jdk/javax/net/ssl/SSLSocket/Tls13PacketSize.java
+++ b/test/jdk/javax/net/ssl/SSLSocket/Tls13PacketSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java
index a42134abdb1..bb288684384 100644
--- a/test/jdk/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java
+++ b/test/jdk/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,7 +71,7 @@ public class SSLEngineExplorerMatchedSNI extends SSLEngineService {
     /*
      * Turn on SSL debugging?
      */
-    static boolean debug = true;
+    static boolean debug = false;
 
     /*
      * Define the server side of the test.
diff --git a/test/jdk/javax/net/ssl/Stapling/HttpsUrlConnClient.java b/test/jdk/javax/net/ssl/Stapling/HttpsUrlConnClient.java
index b9829621d68..c34311f1689 100644
--- a/test/jdk/javax/net/ssl/Stapling/HttpsUrlConnClient.java
+++ b/test/jdk/javax/net/ssl/Stapling/HttpsUrlConnClient.java
@@ -33,7 +33,11 @@
  * @run main/othervm HttpsUrlConnClient RSASSA-PSS RSASSA-PSS
  */
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.math.BigInteger;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
@@ -41,7 +45,9 @@ import java.net.Socket;
 import java.net.URL;
 import java.net.HttpURLConnection;
 import java.net.InetAddress;
+
 import javax.net.ssl.*;
+
 import java.security.KeyStore;
 import java.security.PublicKey;
 import java.security.Security;
@@ -55,7 +61,16 @@ import java.security.cert.X509Certificate;
 import java.security.cert.PKIXRevocationChecker;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import jdk.test.lib.security.SimpleOCSPServer;
@@ -92,10 +107,6 @@ public class HttpsUrlConnClient {
     static String INT_ALIAS = "intermediate";
     static String SSL_ALIAS = "ssl";
 
-    /*
-     * Is the server ready to serve?
-     */
-    volatile static boolean serverReady = false;
     volatile int serverPort = 0;
 
     volatile Exception serverException = null;
@@ -164,7 +175,7 @@ public class HttpsUrlConnClient {
         ClientParameters cliParams = new ClientParameters();
         cliParams.protocols = allowedProts;
         ServerParameters servParams = new ServerParameters();
-        serverReady = false;
+        CountDownLatch serverReady = new CountDownLatch(1);
 
         System.out.println("=====================================");
         System.out.println("Stapling enabled, PKIXParameters with");
@@ -192,7 +203,7 @@ public class HttpsUrlConnClient {
         Security.setProperty("ocsp.enable", "false");
 
         HttpsUrlConnClient sslTest = new HttpsUrlConnClient(cliParams,
-                servParams);
+                servParams, serverReady);
         TestResult tr = sslTest.getResult();
         if (!checkClientValidationFailure(tr.clientExc, BasicReason.REVOKED)) {
             if (tr.clientExc != null) {
@@ -219,10 +230,11 @@ public class HttpsUrlConnClient {
     /*
      * Define the server side of the test.
      *
-     * If the server prematurely exits, serverReady will be set to true
+     * If the server prematurely exits, serverReady will be counted down
      * to avoid infinite hangs.
      */
-    void doServerSide(ServerParameters servParams) throws Exception {
+    void doServerSide(ServerParameters servParams, CountDownLatch serverReady)
+            throws Exception {
 
         // Selectively enable or disable the feature
         System.setProperty("jdk.tls.server.enableStatusRequestExtension",
@@ -274,7 +286,7 @@ public class HttpsUrlConnClient {
         /*
          * Signal Client, we're ready for his connect.
          */
-        serverReady = true;
+        serverReady.countDown();
 
         try (SSLSocket sslSocket = (SSLSocket) sslServerSocket.accept();
                 BufferedReader in = new BufferedReader(
@@ -306,18 +318,13 @@ public class HttpsUrlConnClient {
     /*
      * Define the client side of the test.
      *
-     * If the server prematurely exits, serverReady will be set to true
+     * If the server prematurely exits, serverReady will be counted down
      * to avoid infinite hangs.
      */
-    void doClientSide(ClientParameters cliParams) throws Exception {
+    void doClientSide(ClientParameters cliParams, CountDownLatch serverReady)
+            throws Exception {
 
-        // Wait 5 seconds for server ready
-        for (int i = 0; (i < 100 && !serverReady); i++) {
-            Thread.sleep(50);
-        }
-        if (!serverReady) {
-            throw new RuntimeException("Server not ready yet");
-        }
+        serverReady.await();
 
         // Selectively enable or disable the feature
         System.setProperty("jdk.tls.client.enableStatusRequestExtension",
@@ -373,16 +380,16 @@ public class HttpsUrlConnClient {
      *
      * Fork off the other side, then do your work.
      */
-    HttpsUrlConnClient(ClientParameters cliParams,
-            ServerParameters servParams) throws Exception {
+    HttpsUrlConnClient(ClientParameters cliParams, ServerParameters servParams,
+            CountDownLatch serverReady) throws Exception {
         Exception startException = null;
         try {
             if (separateServerThread) {
-                startServer(servParams, true);
-                startClient(cliParams, false);
+                startServer(servParams, true, serverReady);
+                startClient(cliParams, false, serverReady);
             } else {
-                startClient(cliParams, true);
-                startServer(servParams, false);
+                startClient(cliParams, true, serverReady);
+                startServer(servParams, false, serverReady);
             }
         } catch (Exception e) {
             startException = e;
@@ -453,51 +460,53 @@ public class HttpsUrlConnClient {
         return tr;
     }
 
-    final void startServer(ServerParameters servParams, boolean newThread)
-            throws Exception {
+    final void startServer(ServerParameters servParams, boolean newThread,
+            CountDownLatch serverReady) throws IOException {
         if (newThread) {
             serverThread = new Thread() {
                 @Override
                 public void run() {
                     try {
-                        doServerSide(servParams);
+                        doServerSide(servParams, serverReady);
                     } catch (Exception e) {
                         /*
                          * Our server thread just died.
                          *
                          * Release the client, if not active already...
                          */
-                        System.err.println("Server died...");
-                        serverReady = true;
+                        System.err.println("Server died: " + e);
                         serverException = e;
+                    } finally {
+                        serverReady.countDown();
                     }
                 }
             };
             serverThread.start();
         } else {
             try {
-                doServerSide(servParams);
+                doServerSide(servParams, serverReady);
             } catch (Exception e) {
+                System.err.println("Server died: " + e);
                 serverException = e;
             } finally {
-                serverReady = true;
+                serverReady.countDown();
             }
         }
     }
 
-    final void startClient(ClientParameters cliParams, boolean newThread)
-            throws Exception {
+    final void startClient(ClientParameters cliParams, boolean newThread,
+            CountDownLatch serverReady) throws Exception {
         if (newThread) {
             clientThread = new Thread() {
                 @Override
                 public void run() {
                     try {
-                        doClientSide(cliParams);
+                        doClientSide(cliParams, serverReady);
                     } catch (Exception e) {
                         /*
                          * Our client thread just died.
                          */
-                        System.err.println("Client died...");
+                        System.err.println("Client died: " + e);
                         clientException = e;
                     }
                 }
@@ -505,9 +514,10 @@ public class HttpsUrlConnClient {
             clientThread.start();
         } else {
             try {
-                doClientSide(cliParams);
+                doClientSide(cliParams, serverReady);
             } catch (Exception e) {
                 clientException = e;
+                System.err.println("Client died: " + e);
             }
         }
     }
diff --git a/test/jdk/javax/net/ssl/Stapling/SSLEngineWithStapling.java b/test/jdk/javax/net/ssl/Stapling/SSLEngineWithStapling.java
index 506e7b00e6d..34398a4b6f8 100644
--- a/test/jdk/javax/net/ssl/Stapling/SSLEngineWithStapling.java
+++ b/test/jdk/javax/net/ssl/Stapling/SSLEngineWithStapling.java
@@ -99,13 +99,13 @@ public class SSLEngineWithStapling {
     /*
      * Enables the JSSE system debugging system property:
      *
-     *     -Djavax.net.debug=all
+     *     -Djavax.net.debug=ssl,handshake
      *
      * This gives a lot of low-level information about operations underway,
      * including specific handshake messages, and might be best examined
      * after gaining some familiarity with this application.
      */
-    private static final boolean debug = true;
+    private static final boolean debug = false;
 
     private SSLEngine clientEngine;     // client Engine
     private ByteBuffer clientOut;       // write side of clientEngine
@@ -151,7 +151,7 @@ public class SSLEngineWithStapling {
      */
     public static void main(String args[]) throws Exception {
         if (debug) {
-            System.setProperty("javax.net.debug", "ssl:handshake");
+            System.setProperty("javax.net.debug", "ssl,handshake");
         }
 
         // Create the PKI we will use for the test and start the OCSP servers
diff --git a/test/jdk/javax/net/ssl/Stapling/StapleEnableProps.java b/test/jdk/javax/net/ssl/Stapling/StapleEnableProps.java
index 90b01d19c03..6bdb610643d 100644
--- a/test/jdk/javax/net/ssl/Stapling/StapleEnableProps.java
+++ b/test/jdk/javax/net/ssl/Stapling/StapleEnableProps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/net/ssl/TEST.properties b/test/jdk/javax/net/ssl/TEST.properties
new file mode 100644
index 00000000000..741c2565067
--- /dev/null
+++ b/test/jdk/javax/net/ssl/TEST.properties
@@ -0,0 +1 @@
+maxOutputSize=500000
diff --git a/test/jdk/javax/net/ssl/TLS/TestJSSE.java b/test/jdk/javax/net/ssl/TLS/TestJSSE.java
index 29631064011..baabd7f6054 100644
--- a/test/jdk/javax/net/ssl/TLS/TestJSSE.java
+++ b/test/jdk/javax/net/ssl/TLS/TestJSSE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,17 @@ import java.security.Security;
 
 public class TestJSSE {
 
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=ssl,record
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
+
     private static final String LOCAL_IP = InetAddress.getLoopbackAddress().getHostAddress();
 
     public static void main(String... args) throws Exception {
@@ -35,7 +46,9 @@ public class TestJSSE {
         Security.setProperty("jdk.tls.disabledAlgorithms", "");
 
         // enable debug output
-        System.setProperty("javax.net.debug", "ssl,record");
+        if (debug) {
+            System.setProperty("javax.net.debug", "ssl,record");
+        }
 
         String srvProtocol = System.getProperty("SERVER_PROTOCOL");
         String clnProtocol = System.getProperty("CLIENT_PROTOCOL");
diff --git a/test/jdk/javax/net/ssl/TLSCommon/TLSTest.java b/test/jdk/javax/net/ssl/TLSCommon/TLSTest.java
index 6aec08deedd..fc6369a2bbc 100644
--- a/test/jdk/javax/net/ssl/TLSCommon/TLSTest.java
+++ b/test/jdk/javax/net/ssl/TLSCommon/TLSTest.java
@@ -49,98 +49,112 @@ import javax.net.ssl.TrustManagerFactory;
  * @bug 8205111
  * @enablePreview
  * @summary Test TLS with different types of supported keys.
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha1 TLS_AES_128_GCM_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha256 TLS_AES_128_GCM_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha384 TLS_AES_128_GCM_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha512 TLS_AES_128_GCM_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ec_rsa_pkcs1_sha256 TLS_AES_128_GCM_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_sha1 TLS_AES_128_GCM_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_secp384r1_sha384
+ * @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha1 TLS_AES_128_GCM_SHA256
+ * @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha256 TLS_AES_128_GCM_SHA256
+ * @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha384 TLS_AES_128_GCM_SHA256
+ * @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha512 TLS_AES_128_GCM_SHA256
+ * @run main/othervm TLSTest TLSv1.3 ec_rsa_pkcs1_sha256 TLS_AES_128_GCM_SHA256
+ * @run main/othervm TLSTest TLSv1.3 ecdsa_sha1 TLS_AES_128_GCM_SHA256
+ * @run main/othervm TLSTest TLSv1.3 ecdsa_secp384r1_sha384
  *      TLS_AES_128_GCM_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_secp521r1_sha512
+ * @run main/othervm TLSTest TLSv1.3 ecdsa_secp521r1_sha512
  *      TLS_AES_128_GCM_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha256 TLS_AES_128_GCM_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha384 TLS_AES_128_GCM_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha512 TLS_AES_128_GCM_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha256 TLS_AES_128_GCM_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha384 TLS_AES_128_GCM_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha512 TLS_AES_128_GCM_SHA256
+ * @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha256 TLS_AES_128_GCM_SHA256
+ * @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha384 TLS_AES_128_GCM_SHA256
+ * @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha512 TLS_AES_128_GCM_SHA256
+ * @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha256 TLS_AES_128_GCM_SHA256
+ * @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha384 TLS_AES_128_GCM_SHA256
+ * @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha512 TLS_AES_128_GCM_SHA256
  *
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha1 TLS_AES_256_GCM_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha256 TLS_AES_256_GCM_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha384 TLS_AES_256_GCM_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha512 TLS_AES_256_GCM_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ec_rsa_pkcs1_sha256 TLS_AES_256_GCM_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_sha1 TLS_AES_256_GCM_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_secp384r1_sha384
+ * @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha1 TLS_AES_256_GCM_SHA384
+ * @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha256 TLS_AES_256_GCM_SHA384
+ * @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha384 TLS_AES_256_GCM_SHA384
+ * @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha512 TLS_AES_256_GCM_SHA384
+ * @run main/othervm TLSTest TLSv1.3 ec_rsa_pkcs1_sha256 TLS_AES_256_GCM_SHA384
+ * @run main/othervm TLSTest TLSv1.3 ecdsa_sha1 TLS_AES_256_GCM_SHA384
+ * @run main/othervm TLSTest TLSv1.3 ecdsa_secp384r1_sha384
  *      TLS_AES_256_GCM_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_secp521r1_sha512
+ * @run main/othervm TLSTest TLSv1.3 ecdsa_secp521r1_sha512
  *      TLS_AES_256_GCM_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha256 TLS_AES_256_GCM_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha384 TLS_AES_256_GCM_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha512 TLS_AES_256_GCM_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha256 TLS_AES_256_GCM_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha384 TLS_AES_256_GCM_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha512 TLS_AES_256_GCM_SHA384
+ * @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha256 TLS_AES_256_GCM_SHA384
+ * @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha384 TLS_AES_256_GCM_SHA384
+ * @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha512 TLS_AES_256_GCM_SHA384
+ * @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha256 TLS_AES_256_GCM_SHA384
+ * @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha384 TLS_AES_256_GCM_SHA384
+ * @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha512 TLS_AES_256_GCM_SHA384
  *
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pkcs1_sha256
+ * @run main/othervm TLSTest TLSv1.2 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
+ * @run main/othervm TLSTest TLSv1.2 rsa_pkcs1_sha256
  *      TLS_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pkcs1_sha384
+ * @run main/othervm TLSTest TLSv1.2 rsa_pkcs1_sha384
  *      TLS_RSA_WITH_AES_256_GCM_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pkcs1_sha512
+ * @run main/othervm TLSTest TLSv1.2 rsa_pkcs1_sha512
  *      TLS_RSA_WITH_AES_128_GCM_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 ec_rsa_pkcs1_sha256
+ * @run main/othervm TLSTest TLSv1.2 ec_rsa_pkcs1_sha256
  *      TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 ecdsa_sha1
+ * @run main/othervm TLSTest TLSv1.2 ecdsa_sha1
  *      TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 ecdsa_secp384r1_sha384
+ * @run main/othervm TLSTest TLSv1.2 ecdsa_secp384r1_sha384
  *      TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 ecdsa_secp521r1_sha512
+ * @run main/othervm TLSTest TLSv1.2 ecdsa_secp521r1_sha512
  *      TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_rsae_sha256
+ * @run main/othervm TLSTest TLSv1.2 rsa_pss_rsae_sha256
  *      TLS_RSA_WITH_AES_256_CBC_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_rsae_sha384
+ * @run main/othervm TLSTest TLSv1.2 rsa_pss_rsae_sha384
  *      TLS_RSA_WITH_AES_256_CBC_SHA
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_rsae_sha512
+ * @run main/othervm TLSTest TLSv1.2 rsa_pss_rsae_sha512
  *      TLS_RSA_WITH_AES_128_CBC_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_pss_sha256
+ * @run main/othervm TLSTest TLSv1.2 rsa_pss_pss_sha256
  *      TLS_DHE_RSA_WITH_AES_256_CBC_SHA256
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_pss_sha384
+ * @run main/othervm TLSTest TLSv1.2 rsa_pss_pss_sha384
  *      TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_pss_sha512
+ * @run main/othervm TLSTest TLSv1.2 rsa_pss_pss_sha512
  *      TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
  *
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pkcs1_sha256
+ * @run main/othervm TLSTest TLSv1.1 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
+ * @run main/othervm TLSTest TLSv1.1 rsa_pkcs1_sha256
  *      TLS_RSA_WITH_AES_256_CBC_SHA
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pkcs1_sha384
+ * @run main/othervm TLSTest TLSv1.1 rsa_pkcs1_sha384
  *      TLS_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pkcs1_sha512
+ * @run main/othervm TLSTest TLSv1.1 rsa_pkcs1_sha512
  *      TLS_RSA_WITH_AES_256_CBC_SHA
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pss_rsae_sha256
+ * @run main/othervm TLSTest TLSv1.1 rsa_pss_rsae_sha256
  *      TLS_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pss_rsae_sha384
+ * @run main/othervm TLSTest TLSv1.1 rsa_pss_rsae_sha384
  *      TLS_RSA_WITH_AES_256_CBC_SHA
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pss_rsae_sha512
+ * @run main/othervm TLSTest TLSv1.1 rsa_pss_rsae_sha512
  *      TLS_RSA_WITH_AES_128_CBC_SHA
  *
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pkcs1_sha256 TLS_RSA_WITH_AES_256_CBC_SHA
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pkcs1_sha384 TLS_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pkcs1_sha512 TLS_RSA_WITH_AES_256_CBC_SHA
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pss_rsae_sha256
+ * @run main/othervm TLSTest TLSv1 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
+ * @run main/othervm TLSTest TLSv1 rsa_pkcs1_sha256 TLS_RSA_WITH_AES_256_CBC_SHA
+ * @run main/othervm TLSTest TLSv1 rsa_pkcs1_sha384 TLS_RSA_WITH_AES_128_CBC_SHA
+ * @run main/othervm TLSTest TLSv1 rsa_pkcs1_sha512 TLS_RSA_WITH_AES_256_CBC_SHA
+ * @run main/othervm TLSTest TLSv1 rsa_pss_rsae_sha256
  *      TLS_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pss_rsae_sha384
+ * @run main/othervm TLSTest TLSv1 rsa_pss_rsae_sha384
  *      TLS_RSA_WITH_AES_256_CBC_SHA
- * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pss_rsae_sha512
+ * @run main/othervm TLSTest TLSv1 rsa_pss_rsae_sha512
  *      TLS_RSA_WITH_AES_128_CBC_SHA
  */
 public class TLSTest {
 
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=ssl,handshake
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
+
     private volatile static boolean clientRenegoReady = false;
 
     public static void main(String[] args) throws Exception {
+        if (debug) {
+            System.setProperty("javax.net.debug", "ssl,handshake");
+        }
 
         final String tlsProtocol = args[0];
         final KeyType keyType = KeyType.valueOf(args[1]);
diff --git a/test/jdk/javax/net/ssl/TLSCommon/TLSWithEdDSA.java b/test/jdk/javax/net/ssl/TLSCommon/TLSWithEdDSA.java
index 3fabc5bd73c..f21b7b32b6a 100644
--- a/test/jdk/javax/net/ssl/TLSCommon/TLSWithEdDSA.java
+++ b/test/jdk/javax/net/ssl/TLSCommon/TLSWithEdDSA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,6 @@
 /*
  * SunJSSE does not support dynamic system properties, no way to re-use
  * system properties in samevm/agentvm mode.
- * For extra debugging output, add -Djavax.net.debug=ssl:handshake into the
- * run directive below.
  */
 
 /*
@@ -74,6 +72,18 @@ import javax.net.ssl.X509KeyManager;
 import jdk.test.lib.security.SecurityUtils;
 
 public class TLSWithEdDSA extends SSLSocketTemplate {
+
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=ssl,handshake
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
+
     private static final String PASSWD = "passphrase";
     private static final String DEF_TRUST_ANCHORS = "CA_DSA_1024:CA_DSA_2048:" +
             "CA_ECDSA_SECP256R1:CA_ECDSA_SECP384R1:CA_ECDSA_SECP521R1:" +
@@ -556,6 +566,10 @@ public class TLSWithEdDSA extends SSLSocketTemplate {
     }
 
     public static void main(String[] args) throws Exception {
+        if (debug) {
+            System.setProperty("javax.net.debug", "ssl,handshake");
+        }
+
         SecurityUtils.removeFromDisabledTlsAlgs("TLSv1.1", "TLSv1");
         certFac = CertificateFactory.getInstance("X.509");
         String testFormat;
diff --git a/test/jdk/javax/net/ssl/TLSv12/ShortRSAKey512.java b/test/jdk/javax/net/ssl/TLSv12/ShortRSAKey512.java
index 4d4331dc973..3f8e5e4e6a5 100644
--- a/test/jdk/javax/net/ssl/TLSv12/ShortRSAKey512.java
+++ b/test/jdk/javax/net/ssl/TLSv12/ShortRSAKey512.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,7 +65,7 @@ public class ShortRSAKey512 extends SSLContextTemplate {
     /*
      * Turn on SSL debugging?
      */
-    static boolean debug = true;
+    static boolean debug = false;
 
     /*
      * Define the server side of the test.
diff --git a/test/jdk/javax/net/ssl/TLSv13/ClientHelloKeyShares.java b/test/jdk/javax/net/ssl/TLSv13/ClientHelloKeyShares.java
index 56f37a9e4f1..efb9895b33c 100644
--- a/test/jdk/javax/net/ssl/TLSv13/ClientHelloKeyShares.java
+++ b/test/jdk/javax/net/ssl/TLSv13/ClientHelloKeyShares.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,7 @@
  */
 
 // SunJSSE does not support dynamic system properties, no way to re-use
-// system properties in samevm/agentvm mode.  For further debugging output
-// set the -Djavax.net.debug=ssl:handshake property on the @run lines.
+// system properties in samevm/agentvm mode.
 
 /*
  * @test
@@ -46,6 +45,17 @@ import java.util.*;
 
 public class ClientHelloKeyShares {
 
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=ssl,handshake
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
+
     // Some TLS constants we'll use for testing
     private static final int TLS_REC_HANDSHAKE = 22;
     private static final int HELLO_EXT_SUPP_GROUPS = 10;
@@ -58,6 +68,10 @@ public class ClientHelloKeyShares {
     private static final int NG_X448 = 0x001E;
 
     public static void main(String args[]) throws Exception {
+        if (debug) {
+            System.setProperty("javax.net.debug", "ssl,handshake");
+        }
+
         // Arguments to this test are an abitrary number of integer
         // values which will be the expected NamedGroup IDs in the key_share
         // extension.  Expected named group assertions may also be affected
diff --git a/test/jdk/javax/net/ssl/TLSv13/HRRKeyShares.java b/test/jdk/javax/net/ssl/TLSv13/HRRKeyShares.java
index 313b2c5084b..560faf87049 100644
--- a/test/jdk/javax/net/ssl/TLSv13/HRRKeyShares.java
+++ b/test/jdk/javax/net/ssl/TLSv13/HRRKeyShares.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,7 @@
  */
 
 // SunJSSE does not support dynamic system properties, no way to re-use
-// system properties in samevm/agentvm mode.  For further debugging output
-// set the -Djavax.net.debug=ssl:handshake property on the @run lines.
+// system properties in samevm/agentvm mode.
 
 /*
  * @test
@@ -48,6 +47,16 @@ import jdk.test.lib.Utils;
 
 
 public class HRRKeyShares {
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=ssl,handshake
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
 
     // Some TLS constants we'll use for testing
     private static final int TLS_REC_HANDSHAKE = 22;
@@ -209,6 +218,11 @@ public class HRRKeyShares {
     }
 
     public static void main(String args[]) throws Exception {
+
+        if (debug) {
+            System.setProperty("javax.net.debug", "ssl,handshake");
+        }
+
         System.out.println("Test 1: Good HRR exchange using secp384r1");
         hrrKeyShareTest(NG_SECP384R1, true);
         System.out.println();
diff --git a/test/jdk/javax/net/ssl/compatibility/ClientHelloProcessing.java b/test/jdk/javax/net/ssl/compatibility/ClientHelloProcessing.java
index c147f732ec5..4c1b621b180 100644
--- a/test/jdk/javax/net/ssl/compatibility/ClientHelloProcessing.java
+++ b/test/jdk/javax/net/ssl/compatibility/ClientHelloProcessing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,17 @@ import java.util.Objects;
 
 public class ClientHelloProcessing {
 
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=ssl:handshake
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
+
     private static final ByteBuffer SERVOUTBUF =
             ByteBuffer.wrap("Server Side".getBytes());
 
@@ -476,7 +487,11 @@ public class ClientHelloProcessing {
 
     public static void main(String[] args) throws Exception {
         boolean allGood = true;
-        System.setProperty("javax.net.debug", "ssl:handshake");
+
+        if (debug) {
+            System.setProperty("javax.net.debug", "ssl:handshake");
+        }
+
         trustMgrFac = makeTrustManagerFactory(trustFilename, passwd);
         keyMgrFac = makeKeyManagerFactory(keyFilename, passwd);
 
diff --git a/test/jdk/javax/net/ssl/templates/SSLEngineTemplate.java b/test/jdk/javax/net/ssl/templates/SSLEngineTemplate.java
index 2c1cfaa44ef..fed82d1164f 100644
--- a/test/jdk/javax/net/ssl/templates/SSLEngineTemplate.java
+++ b/test/jdk/javax/net/ssl/templates/SSLEngineTemplate.java
@@ -54,6 +54,18 @@ import java.nio.ByteBuffer;
  * produced.
  */
 public class SSLEngineTemplate extends SSLContextTemplate {
+
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=all
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
+
     protected final SSLEngine clientEngine;     // client Engine
     protected final ByteBuffer clientOut;       // write side of clientEngine
     protected final ByteBuffer clientIn;        // read side of clientEngine
@@ -139,6 +151,10 @@ public class SSLEngineTemplate extends SSLContextTemplate {
     }
 
     public static void main(String[] args) throws Exception {
+        if (debug) {
+            System.setProperty("javax.net.debug", "all");
+        }
+
         new SSLEngineTemplate().runTest();
     }
 
diff --git a/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
index 51706cec927..9d1b1fe94c4 100644
--- a/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
+++ b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
@@ -58,11 +58,26 @@ import java.util.concurrent.TimeUnit;
  */
 public class SSLSocketTemplate extends SSLContextTemplate {
 
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=all
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
+
     /*
      * ==================
      * Run the test case.
      */
     public static void main(String[] args) throws Exception {
+        if (debug) {
+            System.setProperty("javax.net.debug", "all");
+        }
+
         (new SSLSocketTemplate()).run();
     }
 
diff --git a/test/jdk/javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java b/test/jdk/javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java
index afac39b83fb..ed082539ed3 100644
--- a/test/jdk/javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java
+++ b/test/jdk/javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sound/midi/Sequencer/Looping.java b/test/jdk/javax/sound/midi/Sequencer/Looping.java
index 9bcc9254653..6d2845aa61d 100644
--- a/test/jdk/javax/sound/midi/Sequencer/Looping.java
+++ b/test/jdk/javax/sound/midi/Sequencer/Looping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@ import javax.sound.midi.Track;
  * @test
  * @bug 4204105
  * @summary RFE: add loop() method(s) to Sequencer
- * @key intermittent
+ * @key sound
  */
 public class Looping {
 
diff --git a/test/jdk/javax/sound/midi/SysexMessage/SendRawSysexMessage.java b/test/jdk/javax/sound/midi/SysexMessage/SendRawSysexMessage.java
index 7b8c4b0a3f2..10770865dea 100644
--- a/test/jdk/javax/sound/midi/SysexMessage/SendRawSysexMessage.java
+++ b/test/jdk/javax/sound/midi/SysexMessage/SendRawSysexMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/ExpectedNPEOnNull.java b/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/ExpectedNPEOnNull.java
index 05ba16cded5..771860fd7c3 100644
--- a/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/ExpectedNPEOnNull.java
+++ b/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/ExpectedNPEOnNull.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/FakeInfo.java b/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/FakeInfo.java
index 71d27c4943c..21b448e60a1 100644
--- a/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/FakeInfo.java
+++ b/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/FakeInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/UnsupportedInfo.java b/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/UnsupportedInfo.java
index 5d37759fbad..5d339a0fcb6 100644
--- a/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/UnsupportedInfo.java
+++ b/test/jdk/javax/sound/midi/spi/MidiDeviceProvider/UnsupportedInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sound/sampled/Clip/ClipFlushCrash.java b/test/jdk/javax/sound/sampled/Clip/ClipFlushCrash.java
index 2baeb499eac..11c4fad066f 100644
--- a/test/jdk/javax/sound/sampled/Clip/ClipFlushCrash.java
+++ b/test/jdk/javax/sound/sampled/Clip/ClipFlushCrash.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sound/sampled/Clip/IsRunningHang.java b/test/jdk/javax/sound/sampled/Clip/IsRunningHang.java
index c417c5ad8d0..181fc94c2ce 100644
--- a/test/jdk/javax/sound/sampled/Clip/IsRunningHang.java
+++ b/test/jdk/javax/sound/sampled/Clip/IsRunningHang.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@ import javax.sound.sampled.LineUnavailableException;
 /**
  * @test
  * @bug 8156169
+ * @key sound
  * @run main/othervm/timeout=300 IsRunningHang
  */
 public final class IsRunningHang {
diff --git a/test/jdk/javax/sound/sampled/Clip/OpenNonIntegralNumberOfSampleframes.java b/test/jdk/javax/sound/sampled/Clip/OpenNonIntegralNumberOfSampleframes.java
index b3198b8ab77..f18c6451433 100644
--- a/test/jdk/javax/sound/sampled/Clip/OpenNonIntegralNumberOfSampleframes.java
+++ b/test/jdk/javax/sound/sampled/Clip/OpenNonIntegralNumberOfSampleframes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import javax.sound.sampled.LineUnavailableException;
 
 /**
  * @test
+ * @key sound
  * @bug 8167435
  */
 public final class OpenNonIntegralNumberOfSampleframes {
diff --git a/test/jdk/javax/sound/sampled/DataLine/LongFramePosition.java b/test/jdk/javax/sound/sampled/DataLine/LongFramePosition.java
index 079a785de8b..d5252751be9 100644
--- a/test/jdk/javax/sound/sampled/DataLine/LongFramePosition.java
+++ b/test/jdk/javax/sound/sampled/DataLine/LongFramePosition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@ import javax.sound.sampled.SourceDataLine;
 /**
  * @test
  * @bug 5049129
+ * @key sound
  * @summary DataLine.getLongFramePosition
  */
 public class LongFramePosition {
diff --git a/test/jdk/javax/sound/sampled/DirectAudio/bug6372428.java b/test/jdk/javax/sound/sampled/DirectAudio/bug6372428.java
index 177ebce85a0..f2c83540a8d 100644
--- a/test/jdk/javax/sound/sampled/DirectAudio/bug6372428.java
+++ b/test/jdk/javax/sound/sampled/DirectAudio/bug6372428.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ import javax.sound.sampled.TargetDataLine;
 /*
  * @test
  * @bug 6372428
+ * @key sound
  * @summary playback and capture doesn't interrupt after terminating thread that
  *          calls start()
  * @run main bug6372428
diff --git a/test/jdk/javax/sound/sampled/LinuxBlock/PlaySine.java b/test/jdk/javax/sound/sampled/LinuxBlock/PlaySine.java
index ceead0dae62..6ae635f5d7d 100644
--- a/test/jdk/javax/sound/sampled/LinuxBlock/PlaySine.java
+++ b/test/jdk/javax/sound/sampled/LinuxBlock/PlaySine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/swing/DefaultTableCellRenderer/DefRendererSerialize.java b/test/jdk/javax/swing/DefaultTableCellRenderer/DefRendererSerialize.java
new file mode 100644
index 00000000000..07e1b1d51c7
--- /dev/null
+++ b/test/jdk/javax/swing/DefaultTableCellRenderer/DefRendererSerialize.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4337898
+ * @key headful
+ * @summary Verifies Serializing DefaultTableCellRenderer doesn't change colors
+ * @run main DefRendererSerialize
+ */
+
+import java.awt.Color;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import javax.swing.JFrame;
+import javax.swing.JTable;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.SwingUtilities;
+import java.util.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+public class DefRendererSerialize {
+
+    private static JFrame frame;
+    private static JTable table;
+    private static volatile DefaultTableCellRenderer tcr;
+    private static String[][] rowData = { {"1-1","1-2","1-3"},
+                                          {"2-1","","2-3"},
+                                          {"3-1","3-2","3-3"} };
+
+    private static String[] columnData = {"Column 1", "Column 2", "Column 3"};
+    private static volatile Rectangle tableRect;
+    private static volatile Point tableOnScreen;
+    private static volatile Point p;
+    private static Color fg, bg;
+
+    public static void main (String[] args) throws Exception {
+        try {
+
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame();
+                table = new JTable(rowData, columnData);
+
+                DefaultTableCellRenderer tcr = new DefaultTableCellRenderer();
+                table.setDefaultRenderer(table.getColumnClass(1), tcr);
+
+                fg = tcr.getForeground();
+                bg = tcr.getBackground();
+                System.out.println("renderer fg " + fg + " bg " + bg);
+                tcr = (DefaultTableCellRenderer) table.getDefaultRenderer(table.getColumnClass(1));
+
+                // If this try block is removed, table text remains black on white.
+                byte[] serializedObject = null;
+                try {
+                    ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+                    ObjectOutputStream ostream = new ObjectOutputStream(bytes);
+                    ostream.writeObject(tcr);
+                    ostream.flush();
+                    serializedObject = bytes.toByteArray();
+                } catch (IOException ioex) {
+                    throw new RuntimeException(ioex);
+                }
+
+                if (serializedObject == null) {
+                    throw new RuntimeException("FAILED: Serialized byte array in null");
+                }
+                try {
+                    DefaultTableCellRenderer destcr;
+                    try (ObjectInputStream inputStream =
+                            new ObjectInputStream(new ByteArrayInputStream(serializedObject))) {
+                        destcr = (DefaultTableCellRenderer) inputStream.readObject();
+                    }
+                    System.out.println("deserialized renderer fg " + fg + " bg " + bg);
+                    if (!(fg == destcr.getForeground()) || !(bg == destcr.getBackground())) {
+                        throw new RuntimeException("Deserialized foreground and background color not same");
+                    }
+                } catch (IOException | ClassNotFoundException e) {
+                    throw new RuntimeException(e);
+                }
+
+                frame.add(table);
+
+                frame.pack();
+                frame.setLocationRelativeTo(null);
+                frame.setVisible(true);
+            });
+            Robot robot = new Robot();
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                tableRect = table.getCellRect(1, 1, true);
+                tableOnScreen = table.getLocationOnScreen();
+
+                p = new Point(tableOnScreen.x + tableRect.x + tableRect.width / 2,
+                                tableOnScreen.y + tableRect.y + tableRect.height / 2);
+
+            });
+            Color pixelColor = robot.getPixelColor(p.x, p.y);
+            System.out.println("pixelColor " + pixelColor);
+            if (!pixelColor.equals(Color.white)) {
+                throw new RuntimeException("Serializing DefaultTableCellRenderer changes colors");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JFileChooser/6520101/bug6520101.java b/test/jdk/javax/swing/JFileChooser/6520101/bug6520101.java
index f6671872ba8..131ccc0e348 100644
--- a/test/jdk/javax/swing/JFileChooser/6520101/bug6520101.java
+++ b/test/jdk/javax/swing/JFileChooser/6520101/bug6520101.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @bug 6520101
  * @summary JFileChooser throws OOM in 1.4.2, 5.0u4 and 1.6.0
  * @author Praveen Gupta
- * @run main/othervm/timeout=600 -Xmx8m -verify bug6520101
+ * @run main/othervm/timeout=600 -Xmx8m -Xverify:all bug6520101
 */
 
 import javax.swing.*;
diff --git a/test/jdk/javax/swing/JInternalFrame/JIFMaximizedTrfAttribute.java b/test/jdk/javax/swing/JInternalFrame/JIFMaximizedTrfAttribute.java
new file mode 100644
index 00000000000..f5030b934b6
--- /dev/null
+++ b/test/jdk/javax/swing/JInternalFrame/JIFMaximizedTrfAttribute.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6681958
+ * @summary Verifies Maximization state of JInternalFrames is
+ *          not corrupted by WindowsDesktopManager
+ * @requires (os.family == "windows")
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual JIFMaximizedTrfAttribute
+ */
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.BorderLayout;
+
+import javax.swing.JButton;
+import javax.swing.JDesktopPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+import javax.swing.UIManager;
+
+import java.beans.PropertyVetoException;
+
+public class JIFMaximizedTrfAttribute {
+
+    static final String INSTRUCTIONS = """
+        A maximised JInternalFrame would be shown with a
+        button "open another internal frame".
+        Press the button on the internal frame.
+        A second internal frame is created and opened.
+        If second internal frame is maximized,
+        press Pass else press Fail.""";
+
+    public static void main(String[] args) throws Exception {
+        // Set Windows L&F
+        UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+        PassFailJFrame.builder()
+                .title("Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(JIFMaximizedTrfAttribute::createUI)
+                .position(PassFailJFrame.Position.TOP_LEFT_CORNER)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+
+        final JDesktopPane pane = new JDesktopPane();
+        final JInternalFrame internal = new JInternalFrame("the first internal frame", true, true, true, true);
+        pane.add(internal);
+        internal.setBounds(0, 0, 200, 100);
+        try {
+            internal.setMaximum(true);
+        } catch (PropertyVetoException e) { }
+        internal.setVisible(true);
+        JButton button = new JButton("open another internal frame");
+        button.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent evt) {
+                final JInternalFrame internal2 = new JInternalFrame("another one", true, true, true, true);
+                pane.add(internal2);
+                internal2.setBounds(250, 150, 200, 100);
+                try {
+                    internal2.setMaximum(true);
+                } catch (PropertyVetoException e) {}
+                internal2.setVisible(true);
+            }
+        });
+        internal.add(button, BorderLayout.SOUTH);
+
+        JFrame f = new JFrame("JIFMaximizedTrfAttribute");
+        f.add(pane, BorderLayout.CENTER);
+        f.setSize(800, 600);
+        f.setLocationRelativeTo(null);
+        return f;
+    }
+}
diff --git a/test/jdk/javax/swing/JMenuItem/MenuItemTest/bug6197830.java b/test/jdk/javax/swing/JMenuItem/MenuItemTest/bug6197830.java
index afb1c7bb33f..5a30e202d9d 100644
--- a/test/jdk/javax/swing/JMenuItem/MenuItemTest/bug6197830.java
+++ b/test/jdk/javax/swing/JMenuItem/MenuItemTest/bug6197830.java
@@ -49,6 +49,7 @@ public class bug6197830 {
                 .columns(35)
                 .testUI(bug6197830::createTestUI)
                 .positionTestUIBottomRowCentered()
+                .logArea()
                 .build()
                 .awaitAndCheck();
     }
diff --git a/test/jdk/javax/swing/JOptionPane/bug4174551.java b/test/jdk/javax/swing/JOptionPane/bug4174551.java
index dbe6cdffe1a..ab96b28255f 100644
--- a/test/jdk/javax/swing/JOptionPane/bug4174551.java
+++ b/test/jdk/javax/swing/JOptionPane/bug4174551.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/swing/JProgressBar/TestProgressBarBorder.java b/test/jdk/javax/swing/JProgressBar/TestProgressBarBorder.java
deleted file mode 100644
index 06ccfc3b9bf..00000000000
--- a/test/jdk/javax/swing/JProgressBar/TestProgressBarBorder.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.awt.Graphics;
-import java.awt.image.BufferedImage;
-import javax.imageio.ImageIO;
-import javax.swing.JComponent;
-import javax.swing.JProgressBar;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-
-import static java.awt.image.BufferedImage.TYPE_INT_RGB;
-
-/*
- * @test
- * @bug 8224261
- * @key headful
- * @library ../regtesthelpers
- * @build Util
- * @summary Verifies JProgressBar border is not painted when border
- *          painting is set to false
- * @run main TestProgressBarBorder
- */
-
-public class TestProgressBarBorder {
-    public static void main(String[] args) throws Exception {
-        for (UIManager.LookAndFeelInfo laf :
-                UIManager.getInstalledLookAndFeels()) {
-            if (!laf.getName().contains("Nimbus") && !laf.getName().contains("GTK")) {
-                continue;
-            }
-            System.out.println("Testing LAF: " + laf.getName());
-            SwingUtilities.invokeAndWait(() -> test(laf));
-        }
-    }
-
-    private static void test(UIManager.LookAndFeelInfo laf) {
-        setLookAndFeel(laf);
-        JProgressBar progressBar = createProgressBar();
-        progressBar.setBorderPainted(true);
-        BufferedImage withBorder = paintToImage(progressBar);
-        progressBar.setBorderPainted(false);
-        BufferedImage withoutBorder = paintToImage(progressBar);
-
-        boolean equal = Util.compareBufferedImages(withBorder, withoutBorder);
-        if (equal) {
-            try {
-                ImageIO.write(withBorder, "png", new File("withBorder.png"));
-                ImageIO.write(withoutBorder, "png", new File("withoutBorder.png"));
-            } catch (IOException ignored) {}
-
-            throw new RuntimeException("JProgressBar border is painted when border " +
-                    "painting is set to false");
-        }
-    }
-
-    private static void setLookAndFeel(UIManager.LookAndFeelInfo laf) {
-        try {
-            UIManager.setLookAndFeel(laf.getClassName());
-        } catch (UnsupportedLookAndFeelException ignored) {
-            System.out.println("Unsupported LAF: " + laf.getClassName());
-        } catch (ClassNotFoundException | InstantiationException
-                 | IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static JProgressBar createProgressBar() {
-        JProgressBar progressBar = new JProgressBar();
-        progressBar.setSize(100, 50);
-        progressBar.setValue(0);
-        progressBar.setStringPainted(true);
-        return progressBar;
-    }
-
-    private static BufferedImage paintToImage(JComponent content) {
-        BufferedImage im = new BufferedImage(content.getWidth(), content.getHeight(),
-                TYPE_INT_RGB);
-        Graphics g = im.getGraphics();
-        content.paint(g);
-        g.dispose();
-        return im;
-    }
-}
diff --git a/test/jdk/javax/swing/JTable/TestRowHeightWithColIdentifier.java b/test/jdk/javax/swing/JTable/TestRowHeightWithColIdentifier.java
new file mode 100644
index 00000000000..ad2015e3b45
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/TestRowHeightWithColIdentifier.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6292135
+ * @summary Verifies DefaultTableModel.setColumnIdentifiers() doesn't
+ *          clear JTable Row Heights
+ * @run main TestRowHeightWithColIdentifier
+ */
+
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+import javax.swing.table.DefaultTableModel;
+
+public class TestRowHeightWithColIdentifier{
+
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            DefaultTableModel model = new DefaultTableModel(null, new Object[] {"FOO", "BAR"});
+            JTable table = new JTable(model);
+
+            model.addRow(new Object[] {"00", "01"});
+            model.addRow(new Object[] {"10", "11"});
+            model.addRow(new Object[] {"20", "21"});
+            for (int row = 0; row < table.getRowCount(); row++) {
+                table.setRowHeight(row, 100);
+            }
+            for (int row = 0; row < table.getRowCount(); row++) {
+                System.out.println("Before table rowHeight " + table.getRowHeight(row));
+            }
+            int oldRowHeight = table.getRowHeight(0);
+            model.setColumnIdentifiers(new Object[] {"Check", "it out!"});
+            for (int row = 0; row < table.getRowCount(); row++) {
+                System.out.println("After table rowHeight " + table.getRowHeight(row));
+            }
+            int curRowHeight = table.getRowHeight(0);
+            if (curRowHeight != oldRowHeight) {
+                throw new RuntimeException("DefaultTableModel.setColumnIdentifiers() Clears JTable Row Height");
+            }
+        });
+    }
+}
diff --git a/test/jdk/javax/swing/JTextArea/4697612/bug4697612.java b/test/jdk/javax/swing/JTextArea/4697612/bug4697612.java
index ee01c38ed67..9ba788f09f2 100644
--- a/test/jdk/javax/swing/JTextArea/4697612/bug4697612.java
+++ b/test/jdk/javax/swing/JTextArea/4697612/bug4697612.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/swing/SwingUtilities/UIMapTest.java b/test/jdk/javax/swing/SwingUtilities/UIMapTest.java
new file mode 100644
index 00000000000..4a801580b35
--- /dev/null
+++ b/test/jdk/javax/swing/SwingUtilities/UIMapTest.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6726690
+ * @summary Verifies SwingUtilities.replaceUI*Map() methods remove
+ *          previously installed maps
+ * @run main UIMapTest
+ */
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.ActionMap;
+import javax.swing.ComponentInputMap;
+import javax.swing.InputMap;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
+
+public class UIMapTest {
+
+    public static void main(String[] args) {
+
+        StringBuilder str = new StringBuilder();
+
+        // Create the test button
+        JButton button = new JButton("Test");
+
+        // Create an input map that maps ENTER to the button
+        ComponentInputMap map = new ComponentInputMap(button);
+        map.put(KeyStroke.getKeyStroke("pressed ENTER"), "pressed");
+        map.put(KeyStroke.getKeyStroke("released ENTER"), "released");
+
+        // Add the map
+        SwingUtilities.replaceUIInputMap(button, JComponent.WHEN_IN_FOCUSED_WINDOW, map);
+
+        // Attempt to remove the map
+        SwingUtilities.replaceUIInputMap(button, JComponent.WHEN_IN_FOCUSED_WINDOW, null);
+
+        if (button.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).
+            get(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)) != null) {
+            str.append("\nSwingUtilities.replaceUIInputMap " +
+                       "didn't remove previously installed input map");
+        }
+
+        // Get the InputMap for the button when it has focus
+        InputMap inputMap = button.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
+
+        // Map the VK_ENTER key stroke to a specific action name
+        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "doEnterAction");
+        Action enterAction = new AbstractAction() {
+            @Override
+            public void actionPerformed(ActionEvent e) { }
+        };
+        button.getActionMap().put("doEnterAction",  enterAction);
+        SwingUtilities.replaceUIActionMap(button, null);
+        if (button.getActionMap().size() != 0) {
+            str.append("\nSwingUtilities.replaceUIActionMap " +
+                       "didn't remove previously installed action map");
+        }
+        if (str.length() != 0) {
+            throw new RuntimeException(str.toString());
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/plaf/nimbus/TestNimbusProgressBarBorder.java b/test/jdk/javax/swing/plaf/nimbus/TestNimbusProgressBarBorder.java
new file mode 100644
index 00000000000..f9aade1d24d
--- /dev/null
+++ b/test/jdk/javax/swing/plaf/nimbus/TestNimbusProgressBarBorder.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8192888
+ * @key headful
+ * @summary Verifies ProgressBar in Synth L&F renders background
+ *          when border is not painted
+ * @run main TestNimbusProgressBarBorder
+ */
+
+import java.io.File;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.GridBagLayout;
+import java.awt.image.BufferedImage;
+import java.awt.Rectangle;
+import java.awt.Robot;
+
+import javax.imageio.ImageIO;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.UIManager;
+import javax.swing.SwingUtilities;
+
+public class TestNimbusProgressBarBorder {
+
+    private static JFrame frame;
+    private static JProgressBar progressBar;
+    private static boolean failure = true;
+    private static volatile Rectangle rect;
+
+    public static void main(String[] args) throws Exception {
+        int width = 200;
+        int height = 100;
+        try {
+            Robot robot = new Robot();
+            SwingUtilities.invokeAndWait(() -> {
+                try {
+                    // Set Nimbus L&F
+                    UIManager.setLookAndFeel("javax.swing.plaf.nimbus.NimbusLookAndFeel");
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+                frame = new JFrame("Nimbus JProgressBar Test");
+                frame.setSize(width, height);
+
+                // ProgressBar setup
+                progressBar = new JProgressBar(0, 100);
+                progressBar.setValue(0);
+                progressBar.setBorderPainted(false);
+
+                JPanel center = new JPanel(new GridBagLayout());
+                center.setBackground(Color.WHITE);
+                center.add(progressBar);
+
+                frame.add(center, BorderLayout.CENTER);
+                frame.setLocationRelativeTo(null);
+                frame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                rect = progressBar.getBounds();
+            });
+
+            BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
+            Graphics2D g2d = (Graphics2D) img.getGraphics();
+            g2d.setColor(Color.WHITE);
+            g2d.fillRect(0, 0, rect.width, rect.height);
+            progressBar.paint(g2d);
+            g2d.dispose();
+
+            robot.waitForIdle();
+            robot.delay(100);
+
+            for (int x = 10; x < (10 + rect.width / 2); x++) {
+                for (int y = 10; y < (10 + rect.height / 2); y++) {
+                    Color col = new Color(img.getRGB(x, y));
+                    if (!col.equals(Color.WHITE)) {
+                        failure = false;
+                        break;
+                    }
+                }
+            }
+            if (failure) {
+                ImageIO.write(img, "png", new File("ProgressBarTest.png"));
+                throw new RuntimeException("ProgressBar background not drawn");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/text/html/parser/Parser/6990651/bug6990651.java b/test/jdk/javax/swing/text/html/parser/Parser/6990651/bug6990651.java
index 9dada22ba60..0f8e3358eb6 100644
--- a/test/jdk/javax/swing/text/html/parser/Parser/6990651/bug6990651.java
+++ b/test/jdk/javax/swing/text/html/parser/Parser/6990651/bug6990651.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/swing/text/html/parser/Parser/8078268/bug8078268.java b/test/jdk/javax/swing/text/html/parser/Parser/8078268/bug8078268.java
index 363cb94d924..609542d3be6 100644
--- a/test/jdk/javax/swing/text/html/parser/Parser/8078268/bug8078268.java
+++ b/test/jdk/javax/swing/text/html/parser/Parser/8078268/bug8078268.java
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/incubator/vector/AbstractVectorTest.java b/test/jdk/jdk/incubator/vector/AbstractVectorTest.java
index 71cabe75b76..99824d6e693 100644
--- a/test/jdk/jdk/incubator/vector/AbstractVectorTest.java
+++ b/test/jdk/jdk/incubator/vector/AbstractVectorTest.java
@@ -110,15 +110,12 @@ public class AbstractVectorTest {
     }
 
     static final List<IntFunction<boolean[]>> BOOLEAN_MASK_GENERATORS = List.of(
-            withToString("mask[i % 2]", (int l) -> {
-                boolean[] a = new boolean[l];
-                for (int i = 0; i < l; i++) {
-                    a[i] = (i % 2 == 0);
-                }
-                return a;
+            withToString("mask[i % 2]", (int s) -> {
+                return fill_boolean(s,
+                        i -> ((i % 2) == 0));
             }),
-            withToString("mask[true]", (int l) -> {
-                boolean[] a = new boolean[l];
+            withToString("mask[true]", (int s) -> {
+                boolean[] a = new boolean[s];
                 Arrays.fill(a, true);
                 return a;
             }),
@@ -131,6 +128,26 @@ public class AbstractVectorTest {
                 flatMap(fa -> BOOLEAN_MASK_GENERATORS.stream().skip(1).map(
                                       fb -> List.of(fa, fb))).collect(Collectors.toList());
 
+    static long[] pack_booleans_to_longs(boolean[] mask) {
+        int totalLongs = (mask.length + 63) / 64; // ceil division
+        long[] packed = new long[totalLongs];
+        for (int i = 0; i < mask.length; i++) {
+            int longIndex = i / 64;
+            int bitIndex = i % 64;
+            if (mask[i]) {
+                packed[longIndex] |= 1L << bitIndex;
+            }
+        }
+        return packed;
+    }
+
+    static final List<IntFunction<long[]>> LONG_MASK_GENERATORS = BOOLEAN_MASK_GENERATORS.stream()
+            .map(f -> withToString(
+                    f.toString().replace("mask", "long_mask"),
+                    (IntFunction<long[]>) (int l) -> pack_booleans_to_longs(f.apply(l))
+            ))
+            .collect(Collectors.toList());
+
     static final List<BiFunction<Integer,Integer,int[]>> INT_SHUFFLE_GENERATORS = List.of(
             withToStringBi("shuffle[random]",
                     (Integer l, Integer m) -> RAND.ints(l, 0, m).toArray())
@@ -210,21 +227,6 @@ public class AbstractVectorTest {
         return a;
     }
 
-    interface FBooleanBinOp {
-        boolean apply(boolean a, boolean b);
-    }
-
-    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBooleanBinOp f) {
-        int i = 0;
-        try {
-            for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
-            }
-        } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
-        }
-    }
-
     // Non-optimized test partial wrap derived from the Spec:
     // Validation function for lane indexes which may be out of the valid range of [0..VLENGTH-1].
     // The index is forced into this range by adding or subtracting a suitable multiple of VLENGTH.
diff --git a/test/jdk/jdk/incubator/vector/Byte128VectorTests.java b/test/jdk/jdk/incubator/vector/Byte128VectorTests.java
index bea4d541987..3ad6d6f320f 100644
--- a/test/jdk/jdk/incubator/vector/Byte128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -393,6 +393,36 @@ public class Byte128VectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         byte apply(byte a, byte b);
     }
@@ -1232,8 +1262,23 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6390,6 +6435,157 @@ public class Byte128VectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, Byte128VectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte128VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte128VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte128VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte128VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte128VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotByte128VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Byte128VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongByte128VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "byteCompareOpProvider")
     static void ltByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
@@ -6700,115 +6896,22 @@ public class Byte128VectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsByte128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndByte128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte128VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrByte128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte128VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorByte128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte128VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotByte128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte128VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqByte128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte128VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeByte128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6913,23 +7016,6 @@ public class Byte128VectorTests extends AbstractVectorTest {
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongByte128VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Byte256VectorTests.java b/test/jdk/jdk/incubator/vector/Byte256VectorTests.java
index be5b3cf6198..d64caa3424f 100644
--- a/test/jdk/jdk/incubator/vector/Byte256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -393,6 +393,36 @@ public class Byte256VectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         byte apply(byte a, byte b);
     }
@@ -1232,8 +1262,23 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6390,6 +6435,157 @@ public class Byte256VectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, Byte256VectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte256VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte256VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte256VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte256VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte256VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotByte256VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Byte256VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongByte256VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "byteCompareOpProvider")
     static void ltByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
@@ -6700,115 +6896,22 @@ public class Byte256VectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsByte256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndByte256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte256VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrByte256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte256VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorByte256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte256VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotByte256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte256VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqByte256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte256VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeByte256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6913,23 +7016,6 @@ public class Byte256VectorTests extends AbstractVectorTest {
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongByte256VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Byte512VectorTests.java b/test/jdk/jdk/incubator/vector/Byte512VectorTests.java
index 0fd68b6f712..f494e3d3ae8 100644
--- a/test/jdk/jdk/incubator/vector/Byte512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -393,6 +393,36 @@ public class Byte512VectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         byte apply(byte a, byte b);
     }
@@ -1232,8 +1262,23 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6390,6 +6435,157 @@ public class Byte512VectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, Byte512VectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandByte512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte512VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorByte512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte512VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorByte512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte512VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotByte512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte512VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqByte512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte512VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotByte512VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Byte512VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongByte512VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "byteCompareOpProvider")
     static void ltByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
@@ -6700,115 +6896,22 @@ public class Byte512VectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsByte512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsByte512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndByte512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte512VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrByte512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte512VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorByte512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte512VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotByte512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte512VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqByte512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte512VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeByte512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6913,23 +7016,6 @@ public class Byte512VectorTests extends AbstractVectorTest {
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongByte512VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Byte64VectorTests.java b/test/jdk/jdk/incubator/vector/Byte64VectorTests.java
index 112b2e56b6f..da2961cd97b 100644
--- a/test/jdk/jdk/incubator/vector/Byte64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -393,6 +393,36 @@ public class Byte64VectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         byte apply(byte a, byte b);
     }
@@ -1232,8 +1262,23 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6390,6 +6435,157 @@ public class Byte64VectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, Byte64VectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandByte64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte64VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorByte64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte64VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorByte64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte64VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotByte64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte64VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqByte64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Byte64VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotByte64VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Byte64VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongByte64VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "byteCompareOpProvider")
     static void ltByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
@@ -6700,115 +6896,22 @@ public class Byte64VectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsByte64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsByte64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndByte64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte64VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrByte64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte64VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorByte64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte64VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotByte64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte64VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqByte64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Byte64VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeByte64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6913,23 +7016,6 @@ public class Byte64VectorTests extends AbstractVectorTest {
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongByte64VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java b/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java
index 435cacc013e..a5872219f10 100644
--- a/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -398,6 +398,36 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         byte apply(byte a, byte b);
     }
@@ -1237,8 +1267,23 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6395,6 +6440,157 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, ByteMaxVectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandByteMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorByteMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorByteMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotByteMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqByteMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, ByteMaxVectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotByteMaxVectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, ByteMaxVectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongByteMaxVectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "byteCompareOpProvider")
     static void ltByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
@@ -6705,115 +6901,22 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsByteMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsByteMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndByteMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrByteMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorByteMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotByteMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqByteMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeByteMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6918,7 +7021,6 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         }
     }
 
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Double128VectorTests.java b/test/jdk/jdk/incubator/vector/Double128VectorTests.java
index f15ce88ddb8..215edbb3a66 100644
--- a/test/jdk/jdk/incubator/vector/Double128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -411,6 +411,36 @@ relativeError));
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         double apply(double a, double b);
     }
@@ -1291,8 +1321,23 @@ relativeError));
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -4806,6 +4851,157 @@ relativeError));
         assertArraysEquals(r, a, mask, Double128VectorTests::SQRT);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandDouble128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double128VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorDouble128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double128VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorDouble128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double128VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotDouble128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double128VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqDouble128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double128VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotDouble128VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Double128VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongDouble128VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "doubleCompareOpProvider")
     static void ltDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
@@ -5095,115 +5291,22 @@ relativeError));
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsDouble128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsDouble128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndDouble128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double128VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrDouble128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double128VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorDouble128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double128VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotDouble128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double128VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqDouble128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double128VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeDouble128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -5308,23 +5411,6 @@ relativeError));
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongDouble128VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Double256VectorTests.java b/test/jdk/jdk/incubator/vector/Double256VectorTests.java
index e6c3662e0ad..14d52320ce8 100644
--- a/test/jdk/jdk/incubator/vector/Double256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -411,6 +411,36 @@ relativeError));
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         double apply(double a, double b);
     }
@@ -1291,8 +1321,23 @@ relativeError));
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -4806,6 +4851,157 @@ relativeError));
         assertArraysEquals(r, a, mask, Double256VectorTests::SQRT);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandDouble256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double256VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorDouble256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double256VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorDouble256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double256VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotDouble256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double256VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqDouble256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double256VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotDouble256VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Double256VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongDouble256VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "doubleCompareOpProvider")
     static void ltDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
@@ -5095,115 +5291,22 @@ relativeError));
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsDouble256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsDouble256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndDouble256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double256VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrDouble256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double256VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorDouble256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double256VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotDouble256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double256VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqDouble256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double256VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeDouble256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -5308,23 +5411,6 @@ relativeError));
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongDouble256VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Double512VectorTests.java b/test/jdk/jdk/incubator/vector/Double512VectorTests.java
index 7c37c9878e8..91a4669a1b1 100644
--- a/test/jdk/jdk/incubator/vector/Double512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -411,6 +411,36 @@ relativeError));
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         double apply(double a, double b);
     }
@@ -1291,8 +1321,23 @@ relativeError));
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -4806,6 +4851,157 @@ relativeError));
         assertArraysEquals(r, a, mask, Double512VectorTests::SQRT);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandDouble512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double512VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorDouble512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double512VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorDouble512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double512VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotDouble512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double512VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqDouble512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double512VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotDouble512VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Double512VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongDouble512VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "doubleCompareOpProvider")
     static void ltDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
@@ -5095,115 +5291,22 @@ relativeError));
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsDouble512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsDouble512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndDouble512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double512VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrDouble512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double512VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorDouble512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double512VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotDouble512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double512VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqDouble512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double512VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeDouble512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -5308,23 +5411,6 @@ relativeError));
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongDouble512VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Double64VectorTests.java b/test/jdk/jdk/incubator/vector/Double64VectorTests.java
index 85b96288b37..659e18cd8af 100644
--- a/test/jdk/jdk/incubator/vector/Double64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -411,6 +411,36 @@ relativeError));
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         double apply(double a, double b);
     }
@@ -1291,8 +1321,23 @@ relativeError));
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -4806,6 +4851,157 @@ relativeError));
         assertArraysEquals(r, a, mask, Double64VectorTests::SQRT);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandDouble64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double64VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorDouble64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double64VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorDouble64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double64VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotDouble64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double64VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqDouble64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Double64VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotDouble64VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Double64VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongDouble64VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "doubleCompareOpProvider")
     static void ltDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
@@ -5095,115 +5291,22 @@ relativeError));
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsDouble64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsDouble64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndDouble64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double64VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrDouble64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double64VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorDouble64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double64VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotDouble64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double64VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqDouble64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Double64VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeDouble64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -5308,23 +5411,6 @@ relativeError));
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongDouble64VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java b/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
index 7245990d66c..ac85f0bd07b 100644
--- a/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -416,6 +416,36 @@ relativeError));
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         double apply(double a, double b);
     }
@@ -1296,8 +1326,23 @@ relativeError));
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -4811,6 +4856,157 @@ relativeError));
         assertArraysEquals(r, a, mask, DoubleMaxVectorTests::SQRT);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandDoubleMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorDoubleMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorDoubleMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotDoubleMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqDoubleMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, DoubleMaxVectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotDoubleMaxVectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, DoubleMaxVectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongDoubleMaxVectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "doubleCompareOpProvider")
     static void ltDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
@@ -5100,115 +5296,22 @@ relativeError));
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsDoubleMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsDoubleMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndDoubleMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrDoubleMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorDoubleMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotDoubleMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqDoubleMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeDoubleMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -5313,7 +5416,6 @@ relativeError));
         }
     }
 
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Float128VectorTests.java b/test/jdk/jdk/incubator/vector/Float128VectorTests.java
index c4f4ed1b966..32b93293fb9 100644
--- a/test/jdk/jdk/incubator/vector/Float128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -411,6 +411,36 @@ relativeError));
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         float apply(float a, float b);
     }
@@ -1302,8 +1332,23 @@ relativeError));
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -4775,6 +4820,157 @@ relativeError));
         assertArraysEquals(r, a, mask, Float128VectorTests::SQRT);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandFloat128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float128VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorFloat128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float128VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorFloat128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float128VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotFloat128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float128VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqFloat128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float128VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotFloat128VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Float128VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongFloat128VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "floatCompareOpProvider")
     static void ltFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
@@ -5074,115 +5270,22 @@ relativeError));
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsFloat128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsFloat128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndFloat128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float128VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrFloat128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float128VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorFloat128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float128VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotFloat128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float128VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqFloat128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float128VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeFloat128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -5287,23 +5390,6 @@ relativeError));
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongFloat128VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Float256VectorTests.java b/test/jdk/jdk/incubator/vector/Float256VectorTests.java
index 87cbc165d59..9847865eacb 100644
--- a/test/jdk/jdk/incubator/vector/Float256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -411,6 +411,36 @@ relativeError));
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         float apply(float a, float b);
     }
@@ -1302,8 +1332,23 @@ relativeError));
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -4775,6 +4820,157 @@ relativeError));
         assertArraysEquals(r, a, mask, Float256VectorTests::SQRT);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandFloat256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float256VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorFloat256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float256VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorFloat256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float256VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotFloat256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float256VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqFloat256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float256VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotFloat256VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Float256VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongFloat256VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "floatCompareOpProvider")
     static void ltFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
@@ -5074,115 +5270,22 @@ relativeError));
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsFloat256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsFloat256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndFloat256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float256VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrFloat256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float256VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorFloat256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float256VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotFloat256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float256VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqFloat256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float256VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeFloat256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -5287,23 +5390,6 @@ relativeError));
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongFloat256VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Float512VectorTests.java b/test/jdk/jdk/incubator/vector/Float512VectorTests.java
index beb9561d882..0daa5310ff0 100644
--- a/test/jdk/jdk/incubator/vector/Float512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -411,6 +411,36 @@ relativeError));
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         float apply(float a, float b);
     }
@@ -1302,8 +1332,23 @@ relativeError));
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -4775,6 +4820,157 @@ relativeError));
         assertArraysEquals(r, a, mask, Float512VectorTests::SQRT);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandFloat512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float512VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorFloat512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float512VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorFloat512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float512VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotFloat512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float512VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqFloat512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float512VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotFloat512VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Float512VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongFloat512VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "floatCompareOpProvider")
     static void ltFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
@@ -5074,115 +5270,22 @@ relativeError));
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsFloat512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsFloat512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndFloat512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float512VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrFloat512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float512VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorFloat512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float512VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotFloat512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float512VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqFloat512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float512VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeFloat512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -5287,23 +5390,6 @@ relativeError));
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongFloat512VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Float64VectorTests.java b/test/jdk/jdk/incubator/vector/Float64VectorTests.java
index ee630abd8e0..921264fc4e2 100644
--- a/test/jdk/jdk/incubator/vector/Float64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -411,6 +411,36 @@ relativeError));
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         float apply(float a, float b);
     }
@@ -1302,8 +1332,23 @@ relativeError));
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -4775,6 +4820,157 @@ relativeError));
         assertArraysEquals(r, a, mask, Float64VectorTests::SQRT);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandFloat64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float64VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorFloat64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float64VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorFloat64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float64VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotFloat64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float64VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqFloat64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Float64VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotFloat64VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Float64VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongFloat64VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "floatCompareOpProvider")
     static void ltFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
@@ -5074,115 +5270,22 @@ relativeError));
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsFloat64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsFloat64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndFloat64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float64VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrFloat64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float64VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorFloat64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float64VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotFloat64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float64VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqFloat64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Float64VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeFloat64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -5287,23 +5390,6 @@ relativeError));
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongFloat64VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java b/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
index 41e4d6e4a5d..07c9b7d0ef9 100644
--- a/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -416,6 +416,36 @@ relativeError));
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         float apply(float a, float b);
     }
@@ -1307,8 +1337,23 @@ relativeError));
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -4780,6 +4825,157 @@ relativeError));
         assertArraysEquals(r, a, mask, FloatMaxVectorTests::SQRT);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandFloatMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorFloatMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorFloatMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotFloatMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqFloatMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, FloatMaxVectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotFloatMaxVectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, FloatMaxVectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongFloatMaxVectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "floatCompareOpProvider")
     static void ltFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
@@ -5079,115 +5275,22 @@ relativeError));
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsFloatMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsFloatMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndFloatMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrFloatMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorFloatMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotFloatMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqFloatMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeFloatMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -5292,7 +5395,6 @@ relativeError));
         }
     }
 
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Int128VectorTests.java b/test/jdk/jdk/incubator/vector/Int128VectorTests.java
index d6bca96ea6e..93912243ecd 100644
--- a/test/jdk/jdk/incubator/vector/Int128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Int128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -393,6 +393,36 @@ public class Int128VectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         int apply(int a, int b);
     }
@@ -1222,8 +1252,23 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6434,6 +6479,157 @@ public class Int128VectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, Int128VectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandInt128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int128VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorInt128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int128VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorInt128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int128VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotInt128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int128VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqInt128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int128VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotInt128VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Int128VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongInt128VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "intCompareOpProvider")
     static void ltInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
@@ -6733,115 +6929,22 @@ public class Int128VectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsInt128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsInt128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndInt128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int128VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrInt128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int128VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorInt128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int128VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotInt128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int128VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqInt128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int128VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeInt128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6946,23 +7049,6 @@ public class Int128VectorTests extends AbstractVectorTest {
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongInt128VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Int256VectorTests.java b/test/jdk/jdk/incubator/vector/Int256VectorTests.java
index ac98217b714..e8d6f3311ac 100644
--- a/test/jdk/jdk/incubator/vector/Int256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Int256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -393,6 +393,36 @@ public class Int256VectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         int apply(int a, int b);
     }
@@ -1222,8 +1252,23 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6434,6 +6479,157 @@ public class Int256VectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, Int256VectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandInt256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int256VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorInt256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int256VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorInt256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int256VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotInt256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int256VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqInt256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int256VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotInt256VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Int256VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongInt256VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "intCompareOpProvider")
     static void ltInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
@@ -6733,115 +6929,22 @@ public class Int256VectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsInt256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsInt256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndInt256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int256VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrInt256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int256VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorInt256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int256VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotInt256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int256VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqInt256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int256VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeInt256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6946,23 +7049,6 @@ public class Int256VectorTests extends AbstractVectorTest {
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongInt256VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Int512VectorTests.java b/test/jdk/jdk/incubator/vector/Int512VectorTests.java
index b56236db322..932d9ee4487 100644
--- a/test/jdk/jdk/incubator/vector/Int512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Int512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -393,6 +393,36 @@ public class Int512VectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         int apply(int a, int b);
     }
@@ -1222,8 +1252,23 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6434,6 +6479,157 @@ public class Int512VectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, Int512VectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandInt512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int512VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorInt512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int512VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorInt512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int512VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotInt512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int512VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqInt512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int512VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotInt512VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Int512VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongInt512VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "intCompareOpProvider")
     static void ltInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
@@ -6733,115 +6929,22 @@ public class Int512VectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsInt512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsInt512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndInt512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int512VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrInt512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int512VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorInt512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int512VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotInt512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int512VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqInt512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int512VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeInt512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6946,23 +7049,6 @@ public class Int512VectorTests extends AbstractVectorTest {
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongInt512VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Int64VectorTests.java b/test/jdk/jdk/incubator/vector/Int64VectorTests.java
index f87a0eb458c..3c00904a70e 100644
--- a/test/jdk/jdk/incubator/vector/Int64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Int64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -393,6 +393,36 @@ public class Int64VectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         int apply(int a, int b);
     }
@@ -1222,8 +1252,23 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6434,6 +6479,157 @@ public class Int64VectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, Int64VectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandInt64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int64VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorInt64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int64VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorInt64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int64VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotInt64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int64VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqInt64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Int64VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotInt64VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Int64VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongInt64VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "intCompareOpProvider")
     static void ltInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
@@ -6733,115 +6929,22 @@ public class Int64VectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsInt64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsInt64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndInt64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int64VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrInt64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int64VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorInt64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int64VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotInt64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int64VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqInt64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Int64VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeInt64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6946,23 +7049,6 @@ public class Int64VectorTests extends AbstractVectorTest {
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongInt64VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java b/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java
index c61aab0013e..42659bfe44e 100644
--- a/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -398,6 +398,36 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         int apply(int a, int b);
     }
@@ -1227,8 +1257,23 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6439,6 +6484,157 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, IntMaxVectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandIntMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, IntMaxVectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorIntMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, IntMaxVectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorIntMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, IntMaxVectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotIntMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, IntMaxVectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqIntMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, IntMaxVectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotIntMaxVectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, IntMaxVectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongIntMaxVectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "intCompareOpProvider")
     static void ltIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
@@ -6738,115 +6934,22 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsIntMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsIntMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndIntMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, IntMaxVectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrIntMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, IntMaxVectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorIntMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, IntMaxVectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotIntMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, IntMaxVectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqIntMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, IntMaxVectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeIntMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6951,7 +7054,6 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         }
     }
 
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Long128VectorTests.java b/test/jdk/jdk/incubator/vector/Long128VectorTests.java
index a8cf38c003a..6c305a5c2b4 100644
--- a/test/jdk/jdk/incubator/vector/Long128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Long128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -350,6 +350,36 @@ public class Long128VectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         long apply(long a, long b);
     }
@@ -1219,8 +1249,23 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6386,6 +6431,157 @@ public class Long128VectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, Long128VectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandLong128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long128VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorLong128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long128VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorLong128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long128VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotLong128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long128VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqLong128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long128VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotLong128VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Long128VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongLong128VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "longCompareOpProvider")
     static void ltLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
@@ -6619,115 +6815,22 @@ public class Long128VectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsLong128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsLong128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndLong128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long128VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrLong128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long128VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorLong128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long128VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotLong128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long128VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqLong128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long128VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeLong128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6832,23 +6935,6 @@ public class Long128VectorTests extends AbstractVectorTest {
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongLong128VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Long256VectorTests.java b/test/jdk/jdk/incubator/vector/Long256VectorTests.java
index a394a59699f..3b276391cb7 100644
--- a/test/jdk/jdk/incubator/vector/Long256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Long256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -350,6 +350,36 @@ public class Long256VectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         long apply(long a, long b);
     }
@@ -1219,8 +1249,23 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6386,6 +6431,157 @@ public class Long256VectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, Long256VectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandLong256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long256VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorLong256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long256VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorLong256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long256VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotLong256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long256VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqLong256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long256VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotLong256VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Long256VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongLong256VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "longCompareOpProvider")
     static void ltLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
@@ -6619,115 +6815,22 @@ public class Long256VectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsLong256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsLong256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndLong256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long256VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrLong256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long256VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorLong256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long256VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotLong256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long256VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqLong256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long256VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeLong256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6832,23 +6935,6 @@ public class Long256VectorTests extends AbstractVectorTest {
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongLong256VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Long512VectorTests.java b/test/jdk/jdk/incubator/vector/Long512VectorTests.java
index 2f12ea98399..181116cf399 100644
--- a/test/jdk/jdk/incubator/vector/Long512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Long512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -350,6 +350,36 @@ public class Long512VectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         long apply(long a, long b);
     }
@@ -1219,8 +1249,23 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6386,6 +6431,157 @@ public class Long512VectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, Long512VectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandLong512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long512VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorLong512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long512VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorLong512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long512VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotLong512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long512VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqLong512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long512VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotLong512VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Long512VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongLong512VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "longCompareOpProvider")
     static void ltLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
@@ -6619,115 +6815,22 @@ public class Long512VectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsLong512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsLong512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndLong512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long512VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrLong512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long512VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorLong512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long512VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotLong512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long512VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqLong512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long512VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeLong512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6832,23 +6935,6 @@ public class Long512VectorTests extends AbstractVectorTest {
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongLong512VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Long64VectorTests.java b/test/jdk/jdk/incubator/vector/Long64VectorTests.java
index 0fda0abed58..cb052925778 100644
--- a/test/jdk/jdk/incubator/vector/Long64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Long64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -350,6 +350,36 @@ public class Long64VectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         long apply(long a, long b);
     }
@@ -1219,8 +1249,23 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6386,6 +6431,157 @@ public class Long64VectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, Long64VectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandLong64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long64VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorLong64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long64VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorLong64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long64VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotLong64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long64VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqLong64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Long64VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotLong64VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Long64VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongLong64VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "longCompareOpProvider")
     static void ltLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
@@ -6619,115 +6815,22 @@ public class Long64VectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsLong64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsLong64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndLong64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long64VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrLong64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long64VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorLong64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long64VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotLong64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long64VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqLong64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Long64VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeLong64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6832,23 +6935,6 @@ public class Long64VectorTests extends AbstractVectorTest {
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongLong64VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java b/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java
index 7aa2bc4c510..6fe189867c2 100644
--- a/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -355,6 +355,36 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         long apply(long a, long b);
     }
@@ -1224,8 +1254,23 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6391,6 +6436,157 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, LongMaxVectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandLongMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, LongMaxVectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorLongMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, LongMaxVectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorLongMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, LongMaxVectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotLongMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, LongMaxVectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqLongMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, LongMaxVectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotLongMaxVectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, LongMaxVectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongLongMaxVectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "longCompareOpProvider")
     static void ltLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
@@ -6624,115 +6820,22 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsLongMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsLongMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndLongMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, LongMaxVectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrLongMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, LongMaxVectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorLongMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, LongMaxVectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotLongMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, LongMaxVectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqLongMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, LongMaxVectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeLongMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6837,7 +6940,6 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         }
     }
 
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Short128VectorTests.java b/test/jdk/jdk/incubator/vector/Short128VectorTests.java
index 5f4c54bb708..be39a01a4e7 100644
--- a/test/jdk/jdk/incubator/vector/Short128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Short128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -393,6 +393,36 @@ public class Short128VectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         short apply(short a, short b);
     }
@@ -1222,8 +1252,23 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6381,6 +6426,157 @@ public class Short128VectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, Short128VectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandShort128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short128VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorShort128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short128VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorShort128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short128VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotShort128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short128VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqShort128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short128VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotShort128VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Short128VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongShort128VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "shortCompareOpProvider")
     static void ltShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
@@ -6680,115 +6876,22 @@ public class Short128VectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsShort128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsShort128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndShort128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short128VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrShort128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short128VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorShort128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short128VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotShort128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short128VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqShort128VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short128VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeShort128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6893,23 +6996,6 @@ public class Short128VectorTests extends AbstractVectorTest {
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongShort128VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Short256VectorTests.java b/test/jdk/jdk/incubator/vector/Short256VectorTests.java
index 88986575f60..0b6ae53710e 100644
--- a/test/jdk/jdk/incubator/vector/Short256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Short256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -393,6 +393,36 @@ public class Short256VectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         short apply(short a, short b);
     }
@@ -1222,8 +1252,23 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6381,6 +6426,157 @@ public class Short256VectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, Short256VectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandShort256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short256VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorShort256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short256VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorShort256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short256VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotShort256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short256VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqShort256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short256VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotShort256VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Short256VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongShort256VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "shortCompareOpProvider")
     static void ltShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
@@ -6680,115 +6876,22 @@ public class Short256VectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsShort256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsShort256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndShort256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short256VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrShort256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short256VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorShort256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short256VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotShort256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short256VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqShort256VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short256VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeShort256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6893,23 +6996,6 @@ public class Short256VectorTests extends AbstractVectorTest {
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongShort256VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Short512VectorTests.java b/test/jdk/jdk/incubator/vector/Short512VectorTests.java
index 0f474375a47..d4568068b6a 100644
--- a/test/jdk/jdk/incubator/vector/Short512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Short512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -393,6 +393,36 @@ public class Short512VectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         short apply(short a, short b);
     }
@@ -1222,8 +1252,23 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6381,6 +6426,157 @@ public class Short512VectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, Short512VectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandShort512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short512VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorShort512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short512VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorShort512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short512VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotShort512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short512VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqShort512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short512VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotShort512VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Short512VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongShort512VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "shortCompareOpProvider")
     static void ltShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
@@ -6680,115 +6876,22 @@ public class Short512VectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsShort512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsShort512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndShort512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short512VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrShort512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short512VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorShort512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short512VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotShort512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short512VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqShort512VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short512VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeShort512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6893,23 +6996,6 @@ public class Short512VectorTests extends AbstractVectorTest {
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongShort512VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/Short64VectorTests.java b/test/jdk/jdk/incubator/vector/Short64VectorTests.java
index 4b99ed6d84c..83d5cfd18e8 100644
--- a/test/jdk/jdk/incubator/vector/Short64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Short64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -393,6 +393,36 @@ public class Short64VectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         short apply(short a, short b);
     }
@@ -1222,8 +1252,23 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6381,6 +6426,157 @@ public class Short64VectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, Short64VectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandShort64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short64VectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorShort64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short64VectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorShort64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short64VectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotShort64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short64VectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqShort64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, Short64VectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotShort64VectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, Short64VectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongShort64VectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "shortCompareOpProvider")
     static void ltShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
@@ -6680,115 +6876,22 @@ public class Short64VectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsShort64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsShort64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndShort64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short64VectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrShort64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short64VectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorShort64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short64VectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotShort64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short64VectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqShort64VectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, Short64VectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeShort64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6893,23 +6996,6 @@ public class Short64VectorTests extends AbstractVectorTest {
         }
     }
 
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongShort64VectorTestsSmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java b/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java
index 2bb3b9c1557..45ba8db51c1 100644
--- a/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -398,6 +398,36 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         short apply(short a, short b);
     }
@@ -1227,8 +1257,23 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
@@ -6386,6 +6431,157 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         assertArraysEquals(r, a, mask, ShortMaxVectorTests::REVERSE_BYTES);
     }
 
+    static boolean band(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandShortMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.and(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::band);
+    }
+
+    static boolean bor(boolean a, boolean b) {
+        return a | b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskorShortMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.or(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::bor);
+    }
+
+    static boolean bxor(boolean a, boolean b) {
+        return a != b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskxorShortMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.xor(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::bxor);
+    }
+
+    static boolean bandNot(boolean a, boolean b) {
+        return a & !b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskandNotShortMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.andNot(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::bandNot);
+    }
+
+    static boolean beq(boolean a, boolean b) {
+        return a == b;
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskeqShortMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.eq(bv).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, b, ShortMaxVectorTests::beq);
+    }
+
+    static boolean unot(boolean a) {
+        return !a;
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void masknotShortMaxVectorTests(IntFunction<boolean[]> fa) {
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.not().intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, ShortMaxVectorTests::unot);
+    }
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void maskFromToLongShortMaxVectorTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
+
     @Test(dataProvider = "shortCompareOpProvider")
     static void ltShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
@@ -6685,115 +6881,22 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqualsShortMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEqualsShortMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndShortMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOrShortMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXorShortMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNotShortMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEqShortMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCodeShortMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -6898,7 +7001,6 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         }
     }
 
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/gen-template.sh b/test/jdk/jdk/incubator/vector/gen-template.sh
index a6f794a5559..d9bae116da2 100644
--- a/test/jdk/jdk/incubator/vector/gen-template.sh
+++ b/test/jdk/jdk/incubator/vector/gen-template.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -73,6 +73,9 @@ binary_math_template="Binary-op-math"
 binary_math_broadcast_template="Binary-Broadcast-op-math"
 bool_reduction_scalar="BoolReduction-Scalar-op"
 bool_reduction_template="BoolReduction-op"
+bool_binary_template="BoolBinary-op"
+bool_unary_template="BoolUnary-op"
+mask_fromtolong_template="Mask-FromToLong"
 with_op_template="With-Op"
 shift_template="Shift-op"
 shift_masked_template="Shift-Masked-op"
@@ -230,7 +233,8 @@ function gen_op_tmpl {
 
   local gen_perf_tests=$generate_perf_tests
   if [[ $template == *"-Broadcast-"* ]] || [[ $template == "Miscellaneous" ]] ||
-     [[ $template == *"Compare-Masked"* ]] || [[ $template == *"Compare-Broadcast"* ]]; then
+     [[ $template == *"Compare-Masked"* ]] || [[ $template == *"Compare-Broadcast"* ]] ||
+     [[ $template == *"Mask-Binary"* ]]; then
     gen_perf_tests=false
   fi
   if [ $gen_perf_tests == true ]; then
@@ -625,6 +629,15 @@ gen_unary_alu_op "REVERSE_BYTES" "\$Boxtype\$.reverseBytes(a)" "intOrLong"
 gen_unary_alu_op "REVERSE_BYTES" "\$Boxtype\$.reverseBytes(a)" "short"
 gen_unary_alu_op "REVERSE_BYTES" "a" "byte"
 
+# Mask operations
+gen_op_tmpl $bool_binary_template "and" "a \& b"
+gen_op_tmpl $bool_binary_template "or" "a | b"
+gen_op_tmpl $bool_binary_template "xor" "a != b"
+gen_op_tmpl $bool_binary_template "andNot" "a \& !b"
+gen_op_tmpl $bool_binary_template "eq" "a == b"
+gen_op_tmpl $bool_unary_template "not" "!a"
+gen_op_tmpl $mask_fromtolong_template "FromToLong" ""
+
 # Miscellaneous Smoke Tests
 gen_op_tmpl $miscellaneous_template "MISC" "" ""
 
diff --git a/test/jdk/jdk/incubator/vector/templates/Kernel-BoolBinary-op.template b/test/jdk/jdk/incubator/vector/templates/Kernel-BoolBinary-op.template
new file mode 100644
index 00000000000..3f5bc428cdd
--- /dev/null
+++ b/test/jdk/jdk/incubator/vector/templates/Kernel-BoolBinary-op.template
@@ -0,0 +1,11 @@
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] b = fb.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                VectorMask bv = SPECIES.loadMask(b, i);
+                av.[[TEST]](bv).intoArray(r, i);
+            }
+        }
diff --git a/test/jdk/jdk/incubator/vector/templates/Kernel-BoolUnary-op.template b/test/jdk/jdk/incubator/vector/templates/Kernel-BoolUnary-op.template
new file mode 100644
index 00000000000..836db281c1b
--- /dev/null
+++ b/test/jdk/jdk/incubator/vector/templates/Kernel-BoolUnary-op.template
@@ -0,0 +1,9 @@
+        boolean[] a = fa.apply(SPECIES.length());
+        boolean[] r = new boolean[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                VectorMask av = SPECIES.loadMask(a, i);
+                av.[[TEST]]().intoArray(r, i);
+            }
+        }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-BoolBinary-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-BoolBinary-op.template
new file mode 100644
index 00000000000..9ee79e05363
--- /dev/null
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-BoolBinary-op.template
@@ -0,0 +1,10 @@
+
+    static boolean b[[TEST]](boolean a, boolean b) {
+        return [[TEST_OP]];
+    }
+
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void mask[[TEST]]$vectorteststype$(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+[[KERNEL]]
+        assertArraysEquals(r, a, b, $vectorteststype$::b[[TEST]]);
+    }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-BoolUnary-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-BoolUnary-op.template
new file mode 100644
index 00000000000..6b1f2185528
--- /dev/null
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-BoolUnary-op.template
@@ -0,0 +1,10 @@
+
+    static boolean u[[TEST]](boolean a) {
+        return [[TEST_OP]];
+    }
+
+    @Test(dataProvider = "boolMaskUnaryOpProvider")
+    static void mask[[TEST]]$vectorteststype$(IntFunction<boolean[]> fa) {
+[[KERNEL]]
+        assertArraysEquals(r, a, $vectorteststype$::u[[TEST]]);
+    }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Mask-FromToLong.template b/test/jdk/jdk/incubator/vector/templates/Unit-Mask-FromToLong.template
new file mode 100644
index 00000000000..784ef5f81b9
--- /dev/null
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Mask-FromToLong.template
@@ -0,0 +1,27 @@
+
+    private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
+
+    static void assertArraysEquals(long[] r, long[] a, long bits) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], a[i] & bits);
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    @Test(dataProvider = "longMaskProvider")
+    static void mask[[TEST]]$vectorteststype$(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = new long[a.length];
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i++) {
+                VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
+                r[i] = vmask.toLong();
+            }
+        }
+        assertArraysEquals(r, a, LONG_MASK_BITS);
+    }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Miscellaneous.template b/test/jdk/jdk/incubator/vector/templates/Unit-Miscellaneous.template
index 9a020c66d52..460f7624f2c 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Miscellaneous.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Miscellaneous.template
@@ -382,115 +382,22 @@
         }
     }
 
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEquals$vectorteststype$SmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    @Test(dataProvider = "boolMaskBinaryOpProvider")
+    static void maskEquals$vectorteststype$(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            boolean equals = av.equals(bv);
-            int to = i + SPECIES.length();
-            Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                var av = SPECIES.loadMask(a, i);
+                var bv = SPECIES.loadMask(b, i);
+                boolean equals = av.equals(bv);
+                int to = i + SPECIES.length();
+                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+            }
         }
     }
 
-    static boolean band(boolean a, boolean b) {
-        return a & b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAnd$vectorteststype$SmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.and(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, $vectorteststype$::band);
-    }
-
-    static boolean bor(boolean a, boolean b) {
-        return a | b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskOr$vectorteststype$SmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.or(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, $vectorteststype$::bor);
-    }
-
-    static boolean bxor(boolean a, boolean b) {
-        return a != b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskXor$vectorteststype$SmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.xor(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, $vectorteststype$::bxor);
-    }
-
-    static boolean bandNot(boolean a, boolean b) {
-        return a & !b;
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskAndNot$vectorteststype$SmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.andNot(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, $vectorteststype$::bandNot);
-    }
-
-    static boolean beq(boolean a, boolean b) {
-        return (a == b);
-    }
-
-    @Test(dataProvider = "maskCompareOpProvider")
-    static void maskEq$vectorteststype$SmokeTest(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
-        boolean[] a = fa.apply(SPECIES.length());
-        boolean[] b = fb.apply(SPECIES.length());
-        boolean[] r = new boolean[a.length];
-
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            var av = SPECIES.loadMask(a, i);
-            var bv = SPECIES.loadMask(b, i);
-            var cv = av.eq(bv);
-            cv.intoArray(r, i);
-        }
-        assertArraysEquals(r, a, b, $vectorteststype$::beq);
-    }
-
     @Test(dataProvider = "maskProvider")
     static void maskHashCode$vectorteststype$SmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
@@ -595,25 +502,6 @@
         }
     }
 
-#if[!MaxBit]
-    @DataProvider
-    public static Object[][] longMaskProvider() {
-        return new Object[][]{
-                {0xFFFFFFFFFFFFFFFFL},
-                {0x0000000000000000L},
-                {0x5555555555555555L},
-                {0x0123456789abcdefL},
-        };
-    }
-
-    @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLong$vectorteststype$SmokeTest(long inputLong) {
-        var vmask = VectorMask.fromLong(SPECIES, inputLong);
-        long outputLong = vmask.toLong();
-        Assert.assertEquals(outputLong, (inputLong & (((0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length()))))));
-    }
-#end[!MaxBit]
-
     @DataProvider
     public static Object[][] offsetProvider() {
         return new Object[][]{
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-header.template b/test/jdk/jdk/incubator/vector/templates/Unit-header.template
index 33c52f18c1c..7e00cb1678c 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-header.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-header.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -490,6 +490,36 @@ relativeError));
         }
     }
 
+    interface FBoolUnOp {
+        boolean apply(boolean a);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, FBoolUnOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+        }
+    }
+
+    interface FBoolBinOp {
+        boolean apply(boolean a, boolean b);
+    }
+
+    static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBoolBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+        }
+    }
+
     interface FBinOp {
         $type$ apply($type$ a, $type$ b);
     }
@@ -1521,8 +1551,23 @@ relativeError));
     }
 
     @DataProvider
-    public Object[][] maskCompareOpProvider() {
-        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
+    public Object[][] longMaskProvider() {
+        return LONG_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskBinaryOpProvider() {
+        return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
+                map(List::toArray).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] boolMaskUnaryOpProvider() {
+        return BOOLEAN_MASK_GENERATORS.stream().
+                map(f -> new Object[]{f}).
                 toArray(Object[][]::new);
     }
 
diff --git a/test/jdk/jdk/internal/platform/docker/MetricsCpuTester.java b/test/jdk/jdk/internal/platform/docker/MetricsCpuTester.java
index 62549e7b518..9ec9b2bbf0e 100644
--- a/test/jdk/jdk/internal/platform/docker/MetricsCpuTester.java
+++ b/test/jdk/jdk/internal/platform/docker/MetricsCpuTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
index 818c2c04a1d..12f90d65516 100644
--- a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
+++ b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
@@ -81,9 +81,7 @@ public class TestDockerMemoryMetrics {
             testMemorySoftLimit("500m","200m");
 
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
diff --git a/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java b/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java
index 1e5160330de..6e07d2e9ed5 100644
--- a/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java
+++ b/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java
@@ -53,9 +53,7 @@ public class TestGetFreeSwapSpaceSize {
                 "150M", Integer.toString(0)
             );
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
diff --git a/test/jdk/jdk/internal/platform/docker/TestLimitsUpdating.java b/test/jdk/jdk/internal/platform/docker/TestLimitsUpdating.java
index a3df580fed1..a42eee358c3 100644
--- a/test/jdk/jdk/internal/platform/docker/TestLimitsUpdating.java
+++ b/test/jdk/jdk/internal/platform/docker/TestLimitsUpdating.java
@@ -62,9 +62,7 @@ public class TestLimitsUpdating {
         try {
             testLimitUpdates();
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
diff --git a/test/jdk/jdk/internal/platform/docker/TestPidsLimit.java b/test/jdk/jdk/internal/platform/docker/TestPidsLimit.java
index 87ecae7ee62..0313fcc582d 100644
--- a/test/jdk/jdk/internal/platform/docker/TestPidsLimit.java
+++ b/test/jdk/jdk/internal/platform/docker/TestPidsLimit.java
@@ -59,9 +59,7 @@ public class TestPidsLimit {
             testPidsLimit("2000");
             testPidsLimit("Unlimited");
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
diff --git a/test/jdk/jdk/internal/platform/docker/TestSystemMetrics.java b/test/jdk/jdk/internal/platform/docker/TestSystemMetrics.java
index e6e78bd5cd8..1af38843a5c 100644
--- a/test/jdk/jdk/internal/platform/docker/TestSystemMetrics.java
+++ b/test/jdk/jdk/internal/platform/docker/TestSystemMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/internal/platform/docker/TestUseContainerSupport.java b/test/jdk/jdk/internal/platform/docker/TestUseContainerSupport.java
index e77783f395b..d1a43a2ba94 100644
--- a/test/jdk/jdk/internal/platform/docker/TestUseContainerSupport.java
+++ b/test/jdk/jdk/internal/platform/docker/TestUseContainerSupport.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2020, Red Hat, Inc.
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/internal/vm/Continuation/OSRWithManyLocals.java b/test/jdk/jdk/internal/vm/Continuation/OSRWithManyLocals.java
new file mode 100644
index 00000000000..2a8d4e91001
--- /dev/null
+++ b/test/jdk/jdk/internal/vm/Continuation/OSRWithManyLocals.java
@@ -0,0 +1,90 @@
+/*
+* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* This code is free software; you can redistribute it and/or modify it
+* under the terms of the GNU General Public License version 2 only, as
+* published by the Free Software Foundation.
+*
+* This code is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+* version 2 for more details (a copy is included in the LICENSE file that
+* accompanied this code).
+*
+* You should have received a copy of the GNU General Public License version
+* 2 along with this work; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*
+* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+* or visit www.oracle.com if you need additional information or have any
+* questions.
+*/
+
+/**
+* @test
+* @bug 8372591
+* @summary Test freeze/thaw of OSR frame from method with many locals
+* @requires vm.continuations
+* @requires vm.compMode != "Xint" & vm.compMode != "Xcomp"
+* @modules java.base/jdk.internal.vm
+* @library /test/lib /test/hotspot/jtreg
+* @build jdk.test.whitebox.WhiteBox
+* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI OSRWithManyLocals
+*/
+
+import jdk.internal.vm.Continuation;
+import jdk.internal.vm.ContinuationScope;
+
+import jdk.test.lib.Asserts;
+import java.lang.reflect.Method;
+import jdk.test.whitebox.WhiteBox;
+
+public class OSRWithManyLocals {
+    static final WhiteBox wb = WhiteBox.getWhiteBox();
+    static final ContinuationScope FOO = new ContinuationScope() {};
+    static final Method foo = getMethod("foo");
+
+    public static void main(String[] args) throws Exception {
+        runCont(new Continuation(FOO, () -> warmUp()));
+        runCont(new Continuation(FOO, () -> foo()));
+    }
+
+    public static void runCont(Continuation cont) {
+        while (!cont.isDone()) {
+            cont.run();
+        }
+    }
+
+    public static void warmUp() {
+        // Trigger compilation of Continuation.yield/yield0
+        for (int i = 0; i < 10_000; i++) {
+            Continuation.yield(FOO);
+        }
+    }
+
+    public static void foo() {
+        // Declare lots of locals so that size of OSR foo + Continuation.yield/yield0
+        // frames is less than (foo_sender.unextended_sp() - foo_sender.sp()).
+        double d1=1,d2=2,d3=3,d4=4,d5=5,d6=6,d7=7,d8=8,d9=9,d10=10,d11=11,d12=12,d13=13,d14=14,d15=15,d16=16,d17=17,d18=18;
+        double d19=19,d20=20,d21=21,d22=22,d23=23,d24=24,d25=25,d26=26,d27=27,d28=28,d29=29,d30=30,d31=31,d32=32,d33=33,d34=34;
+        double d35=35,d36=36,d37=37,d38=38,d39=39,d40=40,d41=41,d42=42,d43=43,d44=44,d45=45,d46=46,d47=47,d48=48,d49=49,d50=50;
+        double d51=51,d52=52,d53=53,d54=54,d55=55,d56=56,d57=57,d58=58,d59=59,d60=60,d61=61,d62=62,d63=63,d64=64,d65=65,d66=66;
+        double d67=67,d68=68,d69=69,d70=70,d71=71,d72=72,d73=73,d74=74,d75=75,d76=76,d77=77,d78=78,d79=79,d80=80,d81=81,d82=82;
+
+        // Provoke OSR compilation. After we verified the method was compiled keep looping
+        // until we trigger the _backedge_counter overflow to actually trigger OSR.
+        for (int i = 0; !wb.isMethodCompiled(foo, true) || i++ < 2_000;) {
+        }
+        Continuation.yield(FOO);
+    }
+
+    static Method getMethod(String method) {
+        try {
+            return OSRWithManyLocals.class.getMethod(method);
+        } catch (Exception e) {
+            throw new RuntimeException("Exception: couldn't found method " + method + ". " + e.getMessage());
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/api/consumer/TestRecordedClass.java b/test/jdk/jdk/jfr/api/consumer/TestRecordedClass.java
index 003e8c91edd..8717db370df 100644
--- a/test/jdk/jdk/jfr/api/consumer/TestRecordedClass.java
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordedClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/TestRecordedFrameType.java b/test/jdk/jdk/jfr/api/consumer/TestRecordedFrameType.java
index c988f37bd0b..e434a5baa8d 100644
--- a/test/jdk/jdk/jfr/api/consumer/TestRecordedFrameType.java
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordedFrameType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/TestRecordingFileSanitization.java b/test/jdk/jdk/jfr/api/consumer/TestRecordingFileSanitization.java
index dfa39b4ad85..cf0d7386386 100644
--- a/test/jdk/jdk/jfr/api/consumer/TestRecordingFileSanitization.java
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordingFileSanitization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/TestRecordingFileWrite.java b/test/jdk/jdk/jfr/api/consumer/TestRecordingFileWrite.java
index 5fc0dab0d30..a804cc58a88 100644
--- a/test/jdk/jdk/jfr/api/consumer/TestRecordingFileWrite.java
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordingFileWrite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/log/TestContent.java b/test/jdk/jdk/jfr/api/consumer/log/TestContent.java
index 75a2b98ac96..4b552af905b 100644
--- a/test/jdk/jdk/jfr/api/consumer/log/TestContent.java
+++ b/test/jdk/jdk/jfr/api/consumer/log/TestContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/log/TestDiskOnOff.java b/test/jdk/jdk/jfr/api/consumer/log/TestDiskOnOff.java
index 220820e3c99..34126e9a979 100644
--- a/test/jdk/jdk/jfr/api/consumer/log/TestDiskOnOff.java
+++ b/test/jdk/jdk/jfr/api/consumer/log/TestDiskOnOff.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/log/TestDynamicStart.java b/test/jdk/jdk/jfr/api/consumer/log/TestDynamicStart.java
index e598d4302a1..43923f8ad60 100644
--- a/test/jdk/jdk/jfr/api/consumer/log/TestDynamicStart.java
+++ b/test/jdk/jdk/jfr/api/consumer/log/TestDynamicStart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/log/TestMemoryDiskTransition.java b/test/jdk/jdk/jfr/api/consumer/log/TestMemoryDiskTransition.java
index 6ffb22a38eb..4e10c74625f 100644
--- a/test/jdk/jdk/jfr/api/consumer/log/TestMemoryDiskTransition.java
+++ b/test/jdk/jdk/jfr/api/consumer/log/TestMemoryDiskTransition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/log/TestMemoryOnly.java b/test/jdk/jdk/jfr/api/consumer/log/TestMemoryOnly.java
index 618dbaffad8..5ff6305384a 100644
--- a/test/jdk/jdk/jfr/api/consumer/log/TestMemoryOnly.java
+++ b/test/jdk/jdk/jfr/api/consumer/log/TestMemoryOnly.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/log/TestSystemEvents.java b/test/jdk/jdk/jfr/api/consumer/log/TestSystemEvents.java
index 8d90684e523..6df0d82a11e 100644
--- a/test/jdk/jdk/jfr/api/consumer/log/TestSystemEvents.java
+++ b/test/jdk/jdk/jfr/api/consumer/log/TestSystemEvents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/log/TestTruncation.java b/test/jdk/jdk/jfr/api/consumer/log/TestTruncation.java
index d2f6bf5b051..2741a3beca7 100644
--- a/test/jdk/jdk/jfr/api/consumer/log/TestTruncation.java
+++ b/test/jdk/jdk/jfr/api/consumer/log/TestTruncation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/log/TestUserEvents.java b/test/jdk/jdk/jfr/api/consumer/log/TestUserEvents.java
index 62feb2b9dbd..8cfee314ad2 100644
--- a/test/jdk/jdk/jfr/api/consumer/log/TestUserEvents.java
+++ b/test/jdk/jdk/jfr/api/consumer/log/TestUserEvents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/log/TestVerbosity.java b/test/jdk/jdk/jfr/api/consumer/log/TestVerbosity.java
index 841f990a8d3..d617568a996 100644
--- a/test/jdk/jdk/jfr/api/consumer/log/TestVerbosity.java
+++ b/test/jdk/jdk/jfr/api/consumer/log/TestVerbosity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/log/TestWithStreaming.java b/test/jdk/jdk/jfr/api/consumer/log/TestWithStreaming.java
index 78b4e959182..d1a4148d795 100644
--- a/test/jdk/jdk/jfr/api/consumer/log/TestWithStreaming.java
+++ b/test/jdk/jdk/jfr/api/consumer/log/TestWithStreaming.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/recordingstream/TestDump.java b/test/jdk/jdk/jfr/api/consumer/recordingstream/TestDump.java
index cf4dad5477e..249275a39c1 100644
--- a/test/jdk/jdk/jfr/api/consumer/recordingstream/TestDump.java
+++ b/test/jdk/jdk/jfr/api/consumer/recordingstream/TestDump.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/recordingstream/TestRecordingName.java b/test/jdk/jdk/jfr/api/consumer/recordingstream/TestRecordingName.java
index 18f23375478..41b6a8acab6 100644
--- a/test/jdk/jdk/jfr/api/consumer/recordingstream/TestRecordingName.java
+++ b/test/jdk/jdk/jfr/api/consumer/recordingstream/TestRecordingName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, NTT DATA.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/jdk/jdk/jfr/api/consumer/streaming/TestBaseRepositoryAfterStart.java b/test/jdk/jdk/jfr/api/consumer/streaming/TestBaseRepositoryAfterStart.java
index 2e0aceb3825..a380d87a750 100644
--- a/test/jdk/jdk/jfr/api/consumer/streaming/TestBaseRepositoryAfterStart.java
+++ b/test/jdk/jdk/jfr/api/consumer/streaming/TestBaseRepositoryAfterStart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/streaming/TestBaseRepositoryBeforeStart.java b/test/jdk/jdk/jfr/api/consumer/streaming/TestBaseRepositoryBeforeStart.java
index 180a0098843..bea5fc57145 100644
--- a/test/jdk/jdk/jfr/api/consumer/streaming/TestBaseRepositoryBeforeStart.java
+++ b/test/jdk/jdk/jfr/api/consumer/streaming/TestBaseRepositoryBeforeStart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/streaming/TestBaseRepositoryLastModified.java b/test/jdk/jdk/jfr/api/consumer/streaming/TestBaseRepositoryLastModified.java
index 6a9e8376ed2..bf9ed2c0f2c 100644
--- a/test/jdk/jdk/jfr/api/consumer/streaming/TestBaseRepositoryLastModified.java
+++ b/test/jdk/jdk/jfr/api/consumer/streaming/TestBaseRepositoryLastModified.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/consumer/streaming/TestBaseRepositoryMultipleProcesses.java b/test/jdk/jdk/jfr/api/consumer/streaming/TestBaseRepositoryMultipleProcesses.java
index 95f6c5d4e59..c00505b7f2d 100644
--- a/test/jdk/jdk/jfr/api/consumer/streaming/TestBaseRepositoryMultipleProcesses.java
+++ b/test/jdk/jdk/jfr/api/consumer/streaming/TestBaseRepositoryMultipleProcesses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/api/recording/dump/TestDumpDevNull.java b/test/jdk/jdk/jfr/api/recording/dump/TestDumpDevNull.java
index b83f9686868..196ecf98b53 100644
--- a/test/jdk/jdk/jfr/api/recording/dump/TestDumpDevNull.java
+++ b/test/jdk/jdk/jfr/api/recording/dump/TestDumpDevNull.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/allocation/TestObjectAllocationSampleEvent.java b/test/jdk/jdk/jfr/event/allocation/TestObjectAllocationSampleEvent.java
index e7effa02382..f69c56ca528 100644
--- a/test/jdk/jdk/jfr/event/allocation/TestObjectAllocationSampleEvent.java
+++ b/test/jdk/jdk/jfr/event/allocation/TestObjectAllocationSampleEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/compiler/TestCompilerQueueUtilization.java b/test/jdk/jdk/jfr/event/compiler/TestCompilerQueueUtilization.java
index d4e4e12eaa3..abd761ec592 100644
--- a/test/jdk/jdk/jfr/event/compiler/TestCompilerQueueUtilization.java
+++ b/test/jdk/jdk/jfr/event/compiler/TestCompilerQueueUtilization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/gc/detailed/TestG1InvalidHeapRegionTypeChangeEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestG1InvalidHeapRegionTypeChangeEvent.java
index 7939a769ccb..3a63f516bf3 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestG1InvalidHeapRegionTypeChangeEvent.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestG1InvalidHeapRegionTypeChangeEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/gc/detailed/TestGCCPUTimeEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestGCCPUTimeEvent.java
index cd9f0046cbb..5fc6d7c87ab 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestGCCPUTimeEvent.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestGCCPUTimeEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/gc/detailed/TestGCHeapMemoryPoolUsageEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestGCHeapMemoryPoolUsageEvent.java
index 1286c53d938..3e988d69b23 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestGCHeapMemoryPoolUsageEvent.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestGCHeapMemoryPoolUsageEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/gc/heapsummary/HeapSummaryEventAllGcs.java b/test/jdk/jdk/jfr/event/gc/heapsummary/HeapSummaryEventAllGcs.java
index 16dd6f44fed..2baf87eae31 100644
--- a/test/jdk/jdk/jfr/event/gc/heapsummary/HeapSummaryEventAllGcs.java
+++ b/test/jdk/jdk/jfr/event/gc/heapsummary/HeapSummaryEventAllGcs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/io/TestAsynchronousFileChannelEvents.java b/test/jdk/jdk/jfr/event/io/TestAsynchronousFileChannelEvents.java
index e0752c6d319..f337d315ba6 100644
--- a/test/jdk/jdk/jfr/event/io/TestAsynchronousFileChannelEvents.java
+++ b/test/jdk/jdk/jfr/event/io/TestAsynchronousFileChannelEvents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/io/TestSocketAdapterEvents.java b/test/jdk/jdk/jfr/event/io/TestSocketAdapterEvents.java
index 77a083ad8fe..6b45d060075 100644
--- a/test/jdk/jdk/jfr/event/io/TestSocketAdapterEvents.java
+++ b/test/jdk/jdk/jfr/event/io/TestSocketAdapterEvents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/profiling/BaseTestFullStackTrace.java b/test/jdk/jdk/jfr/event/profiling/BaseTestFullStackTrace.java
index de211b8c454..aadd9dded7e 100644
--- a/test/jdk/jdk/jfr/event/profiling/BaseTestFullStackTrace.java
+++ b/test/jdk/jdk/jfr/event/profiling/BaseTestFullStackTrace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleNative.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleNative.java
index 1617bce4ba3..b79edfeac10 100644
--- a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleNative.java
+++ b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleNative.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSamplingLongPeriod.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSamplingLongPeriod.java
index 69d32d48282..cbaf8d707e8 100644
--- a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSamplingLongPeriod.java
+++ b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSamplingLongPeriod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/runtime/TestDeprecatedEvent.java b/test/jdk/jdk/jfr/event/runtime/TestDeprecatedEvent.java
index e2ecea43a88..39add0e29fe 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestDeprecatedEvent.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestDeprecatedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/runtime/TestDirectBufferStatisticsEvent.java b/test/jdk/jdk/jfr/event/runtime/TestDirectBufferStatisticsEvent.java
index b007083dde9..581884664a5 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestDirectBufferStatisticsEvent.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestDirectBufferStatisticsEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/runtime/TestFinalizerStatisticsEvent.java b/test/jdk/jdk/jfr/event/runtime/TestFinalizerStatisticsEvent.java
index ead77f467ac..cd100e65079 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestFinalizerStatisticsEvent.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestFinalizerStatisticsEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/runtime/TestNativeLibraryLoadEvent.java b/test/jdk/jdk/jfr/event/runtime/TestNativeLibraryLoadEvent.java
index e0931d7453f..50b199066e7 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestNativeLibraryLoadEvent.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestNativeLibraryLoadEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/security/TestInitialSecurityPropertyEvent.java b/test/jdk/jdk/jfr/event/security/TestInitialSecurityPropertyEvent.java
index bed89be84c2..84f68fa4a18 100644
--- a/test/jdk/jdk/jfr/event/security/TestInitialSecurityPropertyEvent.java
+++ b/test/jdk/jdk/jfr/event/security/TestInitialSecurityPropertyEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/event/security/TestSecurityProviderServiceEvent.java b/test/jdk/jdk/jfr/event/security/TestSecurityProviderServiceEvent.java
index 70ed6f3d867..3acfe5bb3de 100644
--- a/test/jdk/jdk/jfr/event/security/TestSecurityProviderServiceEvent.java
+++ b/test/jdk/jdk/jfr/event/security/TestSecurityProviderServiceEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jcmd/TestJcmdConfigureReadOnly.java b/test/jdk/jdk/jfr/jcmd/TestJcmdConfigureReadOnly.java
index 9eefbd183b2..423b7726880 100644
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdConfigureReadOnly.java
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdConfigureReadOnly.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jcmd/TestJcmdDumpPathToGCRootsBFSDFS.java b/test/jdk/jdk/jfr/jcmd/TestJcmdDumpPathToGCRootsBFSDFS.java
new file mode 100644
index 00000000000..6815d354309
--- /dev/null
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdDumpPathToGCRootsBFSDFS.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jfr.jcmd;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jdk.jfr.Enabled;
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedObject;
+import jdk.jfr.consumer.RecordingFile;
+import jdk.jfr.internal.test.WhiteBox;
+import jdk.test.lib.jfr.EventNames;
+
+/**
+ * @test id=dfs-only
+ * @summary Test dumping with path-to-gc-roots and DFS only
+ * @bug 8373490
+ * @requires vm.hasJFR & vm.flagless
+ * @modules jdk.jfr/jdk.jfr.internal.test
+ * @library /test/lib /test/jdk
+ *
+ * @run main/othervm -XX:TLABSize=2k -Xmx256m jdk.jfr.jcmd.TestJcmdDumpPathToGCRootsBFSDFS dfs-only
+ */
+
+/**
+ * @test id=bfs-only
+ * @summary Test dumping with path-to-gc-roots and BFS only
+ * @bug 8373490
+ * @requires vm.hasJFR & vm.flagless
+ * @modules jdk.jfr/jdk.jfr.internal.test
+ * @library /test/lib /test/jdk
+ *
+ * @run main/othervm -XX:TLABSize=2k -Xmx256m jdk.jfr.jcmd.TestJcmdDumpPathToGCRootsBFSDFS bfs-only
+ */
+
+/**
+ * @test id=bfsdfs
+ * @summary Test dumping with path-to-gc-roots and mixed BFS+DFS
+ * @bug 8373490
+ * @requires vm.hasJFR & vm.flagless
+ * @modules jdk.jfr/jdk.jfr.internal.test
+ * @library /test/lib /test/jdk
+ *
+ * @run main/othervm -XX:TLABSize=2k -Xmx256m jdk.jfr.jcmd.TestJcmdDumpPathToGCRootsBFSDFS bfsdfs
+ */
+public class TestJcmdDumpPathToGCRootsBFSDFS {
+
+    // Note:
+    // - We start with a small heap of 256M in order to get the minimum Edge Queue size in BFS (lower cap is 32MB, enough to hold ~2mio edges)
+    // - We build a leak with an array containing more than 2mio entries
+    // That will hit BFS first, then fall back to DFS, showing the performance problem JDK-8373490 describes.
+    // DFS-only mode should work well, and so should BFS-only mode.
+
+    // The minimum size of the edge queue in BFS (keep in sync with hotspot)
+    private final static int minimumEdgeQueueSizeCap = 32 * 1024 * 1024;
+    // The size of the Edge structure (keep in sync with hotspot)
+    private final static int edgeSizeBytes = 16;
+
+    public static List<Object[]> leak;
+
+    public static void main(String[] args) throws Exception {
+        WhiteBox.setWriteAllObjectSamples(true);
+        String settingName = EventNames.OldObjectSample + "#" + "cutoff";
+
+        int edgesPerMinSizedQueue = minimumEdgeQueueSizeCap / 16;
+        int lower = 1_000_000;
+        int upper = 3_000_000;
+        int fudge = 250_000;
+        if (edgesPerMinSizedQueue < (lower + fudge)) {
+            throw new RuntimeException("edgesPerMinSizedQueue lower bound wrong?");
+        }
+        if (edgesPerMinSizedQueue > (upper - fudge)) {
+            throw new RuntimeException("edgesPerMinSizedQueue upper bound wrong?");
+        }
+
+        int leakedObjectCount;
+        boolean skipBFS;
+        switch (args[0]) {
+            case "bfsdfs" -> {
+                // Mixed mode: enough objects to saturate BFS queue
+                leakedObjectCount = upper;
+                skipBFS = false;
+            }
+            case "dfs-only" -> {
+                // DFS-only mode: object count does not matter, we enter DFS right away
+                leakedObjectCount = upper;
+                skipBFS = true;
+            }
+            case "bfs-only" -> {
+                // BFS-only mode: not enough objects to saturate BFS queue
+                leakedObjectCount = lower;
+                skipBFS = false;
+            }
+            default -> {
+                throw new RuntimeException("Invalid argument");
+            }
+        };
+
+        WhiteBox.setSkipBFS(skipBFS);
+
+        testDump("path-to-gc-roots=true", Collections.singletonMap(settingName, "infinity"), leakedObjectCount, true);
+    }
+
+    private static void testDump(String pathToGcRoots, Map<String, String> settings, int leakedObjectCount, boolean expectedChains) throws Exception {
+        while (true) {
+            try (Recording r = new Recording()) {
+                Map<String, String> p = new HashMap<>(settings);
+                p.put(EventNames.OldObjectSample + "#" + Enabled.NAME, "true");
+                r.setName("dodo");
+                r.setSettings(p);
+                r.setToDisk(true);
+                r.start();
+                clearLeak();
+                System.out.println("Recording id: " + r.getId());
+                System.out.println("Settings: " + settings.toString());
+                System.out.println("Command: JFR.dump " + pathToGcRoots);
+                System.out.println("Chains expected: " + expectedChains);
+                buildLeak(leakedObjectCount);
+                System.gc();
+                System.gc();
+                File recording = new File("TestJcmdDumpPathToGCRoots" + r.getId() + ".jfr");
+                recording.delete();
+                JcmdHelper.jcmd("JFR.dump", "name=dodo", pathToGcRoots, "filename=" + recording.getAbsolutePath());
+                r.setSettings(Collections.emptyMap());
+                List<RecordedEvent> events = RecordingFile.readAllEvents(recording.toPath());
+                if (events.isEmpty()) {
+                    System.out.println("No events found in recording. Retrying.");
+                    continue;
+                }
+                boolean chains = hasChains(events);
+                if (expectedChains && !chains) {
+                    System.out.println(events);
+                    System.out.println("Expected chains but found none. Retrying.");
+                    continue;
+                }
+                if (!expectedChains && chains) {
+                    System.out.println(events);
+                    System.out.println("Didn't expect chains but found some. Retrying.");
+                    continue;
+                }
+                return; // Success
+            }
+        }
+    }
+
+    private static void clearLeak() {
+      leak = null;
+      System.gc();
+    }
+
+    private static boolean hasChains(List<RecordedEvent> events) throws IOException {
+        for (RecordedEvent e : events) {
+            RecordedObject ro = e.getValue("object");
+            if (ro.getValue("referrer") != null) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static void buildLeak(int objectCount) {
+        leak = new ArrayList<Object[]>(objectCount);
+        for (int i = 0; i < objectCount;i ++) {
+            leak.add(new Object[0]);
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/jcmd/TestJcmdOptionSpecifiedOnce.java b/test/jdk/jdk/jfr/jcmd/TestJcmdOptionSpecifiedOnce.java
index a9b9bcc5872..58c79fb11e3 100644
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdOptionSpecifiedOnce.java
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdOptionSpecifiedOnce.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jcmd/TestJcmdStartGeneratedFilename.java b/test/jdk/jdk/jfr/jcmd/TestJcmdStartGeneratedFilename.java
index bf365b9c248..938ae48c112 100644
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdStartGeneratedFilename.java
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdStartGeneratedFilename.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jcmd/TestJcmdViewMissingData.java b/test/jdk/jdk/jfr/jcmd/TestJcmdViewMissingData.java
index b7a22b1adcc..f9743526d91 100644
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdViewMissingData.java
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdViewMissingData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jmx/streaming/TestClose.java b/test/jdk/jdk/jfr/jmx/streaming/TestClose.java
index 08c302d6d4b..fee6111a77e 100644
--- a/test/jdk/jdk/jfr/jmx/streaming/TestClose.java
+++ b/test/jdk/jdk/jfr/jmx/streaming/TestClose.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jmx/streaming/TestDelegated.java b/test/jdk/jdk/jfr/jmx/streaming/TestDelegated.java
index e20f92c3014..c3295297e39 100644
--- a/test/jdk/jdk/jfr/jmx/streaming/TestDelegated.java
+++ b/test/jdk/jdk/jfr/jmx/streaming/TestDelegated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jmx/streaming/TestDumpOrder.java b/test/jdk/jdk/jfr/jmx/streaming/TestDumpOrder.java
index 7535960366c..e6e269eb12f 100644
--- a/test/jdk/jdk/jfr/jmx/streaming/TestDumpOrder.java
+++ b/test/jdk/jdk/jfr/jmx/streaming/TestDumpOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jmx/streaming/TestMetadataEvent.java b/test/jdk/jdk/jfr/jmx/streaming/TestMetadataEvent.java
index 3e0e8773f0a..6d3c5fc4156 100644
--- a/test/jdk/jdk/jfr/jmx/streaming/TestMetadataEvent.java
+++ b/test/jdk/jdk/jfr/jmx/streaming/TestMetadataEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jmx/streaming/TestMultipleChunks.java b/test/jdk/jdk/jfr/jmx/streaming/TestMultipleChunks.java
index 942f64a5da4..41ebc660934 100644
--- a/test/jdk/jdk/jfr/jmx/streaming/TestMultipleChunks.java
+++ b/test/jdk/jdk/jfr/jmx/streaming/TestMultipleChunks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jmx/streaming/TestNew.java b/test/jdk/jdk/jfr/jmx/streaming/TestNew.java
index d2489730b03..83a07304a39 100644
--- a/test/jdk/jdk/jfr/jmx/streaming/TestNew.java
+++ b/test/jdk/jdk/jfr/jmx/streaming/TestNew.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jmx/streaming/TestRotate.java b/test/jdk/jdk/jfr/jmx/streaming/TestRotate.java
index 8a7c7428a99..319fc25b442 100644
--- a/test/jdk/jdk/jfr/jmx/streaming/TestRotate.java
+++ b/test/jdk/jdk/jfr/jmx/streaming/TestRotate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jmx/streaming/TestSetSettings.java b/test/jdk/jdk/jfr/jmx/streaming/TestSetSettings.java
index 2d1cb50dcfc..626387896af 100644
--- a/test/jdk/jdk/jfr/jmx/streaming/TestSetSettings.java
+++ b/test/jdk/jdk/jfr/jmx/streaming/TestSetSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jmx/streaming/TestStart.java b/test/jdk/jdk/jfr/jmx/streaming/TestStart.java
index 6d4bfc10f81..bfb45a6eeae 100644
--- a/test/jdk/jdk/jfr/jmx/streaming/TestStart.java
+++ b/test/jdk/jdk/jfr/jmx/streaming/TestStart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jmx/streaming/TestStop.java b/test/jdk/jdk/jfr/jmx/streaming/TestStop.java
index 572577786a1..bff95758a63 100644
--- a/test/jdk/jdk/jfr/jmx/streaming/TestStop.java
+++ b/test/jdk/jdk/jfr/jmx/streaming/TestStop.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jvm/TestChunkIntegrity.java b/test/jdk/jdk/jfr/jvm/TestChunkIntegrity.java
index dc66d2617af..452f2e24aaf 100644
--- a/test/jdk/jdk/jfr/jvm/TestChunkIntegrity.java
+++ b/test/jdk/jdk/jfr/jvm/TestChunkIntegrity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jvm/TestFatEvent.java b/test/jdk/jdk/jfr/jvm/TestFatEvent.java
index 3e10074cce9..c0b73832640 100644
--- a/test/jdk/jdk/jfr/jvm/TestFatEvent.java
+++ b/test/jdk/jdk/jfr/jvm/TestFatEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jvm/TestHiddenWait.java b/test/jdk/jdk/jfr/jvm/TestHiddenWait.java
index aaefc60527c..1ccc9a9b035 100644
--- a/test/jdk/jdk/jfr/jvm/TestHiddenWait.java
+++ b/test/jdk/jdk/jfr/jvm/TestHiddenWait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jvm/TestLongStringsInPool.java b/test/jdk/jdk/jfr/jvm/TestLongStringsInPool.java
index 45b66d508cd..5399668b0e7 100644
--- a/test/jdk/jdk/jfr/jvm/TestLongStringsInPool.java
+++ b/test/jdk/jdk/jfr/jvm/TestLongStringsInPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/jvm/TestVerifyInstrumentation.java b/test/jdk/jdk/jfr/jvm/TestVerifyInstrumentation.java
index ec9e64972ec..c2090f43c93 100644
--- a/test/jdk/jdk/jfr/jvm/TestVerifyInstrumentation.java
+++ b/test/jdk/jdk/jfr/jvm/TestVerifyInstrumentation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/startupargs/TestPreserveRepository.java b/test/jdk/jdk/jfr/startupargs/TestPreserveRepository.java
index 74023639f47..e9c4350408c 100644
--- a/test/jdk/jdk/jfr/startupargs/TestPreserveRepository.java
+++ b/test/jdk/jdk/jfr/startupargs/TestPreserveRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/startupargs/TestStartHelp.java b/test/jdk/jdk/jfr/startupargs/TestStartHelp.java
index 0b3b5869cad..53b18d7ee58 100644
--- a/test/jdk/jdk/jfr/startupargs/TestStartHelp.java
+++ b/test/jdk/jdk/jfr/startupargs/TestStartHelp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/startupargs/TestStartupOptionSpecifiedOnce.java b/test/jdk/jdk/jfr/startupargs/TestStartupOptionSpecifiedOnce.java
index 11749504eba..7049ad92cae 100644
--- a/test/jdk/jdk/jfr/startupargs/TestStartupOptionSpecifiedOnce.java
+++ b/test/jdk/jdk/jfr/startupargs/TestStartupOptionSpecifiedOnce.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/threading/TestStringPoolVirtualThreadPinning.java b/test/jdk/jdk/jfr/threading/TestStringPoolVirtualThreadPinning.java
index ef2a3698edc..589a77d3e4e 100644
--- a/test/jdk/jdk/jfr/threading/TestStringPoolVirtualThreadPinning.java
+++ b/test/jdk/jdk/jfr/threading/TestStringPoolVirtualThreadPinning.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/tool/TestConfigure.java b/test/jdk/jdk/jfr/tool/TestConfigure.java
index e200054319e..404c657fd98 100644
--- a/test/jdk/jdk/jfr/tool/TestConfigure.java
+++ b/test/jdk/jdk/jfr/tool/TestConfigure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/jfr/tool/TestView.java b/test/jdk/jdk/jfr/tool/TestView.java
index 38174859b51..56a1e3edc3b 100644
--- a/test/jdk/jdk/jfr/tool/TestView.java
+++ b/test/jdk/jdk/jfr/tool/TestView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jdk/modules/etc/DefaultModules.java b/test/jdk/jdk/modules/etc/DefaultModules.java
index febb5baf70f..2c4823e71a0 100644
--- a/test/jdk/jdk/modules/etc/DefaultModules.java
+++ b/test/jdk/jdk/modules/etc/DefaultModules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/jni/nullCaller/NullCallerTest.java b/test/jdk/jni/nullCaller/NullCallerTest.java
index 1ba6d6f0add..bd773172eeb 100644
--- a/test/jdk/jni/nullCaller/NullCallerTest.java
+++ b/test/jdk/jni/nullCaller/NullCallerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/performance/client/SwingMark/src/AbstractSwingTest.java b/test/jdk/performance/client/SwingMark/src/AbstractSwingTest.java
index 8a62d196857..8dd2e0b4caa 100644
--- a/test/jdk/performance/client/SwingMark/src/AbstractSwingTest.java
+++ b/test/jdk/performance/client/SwingMark/src/AbstractSwingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/test/jdk/performance/client/SwingMark/src/JMTest_01.java b/test/jdk/performance/client/SwingMark/src/JMTest_01.java
index fcc5fe309ba..c4af54b16ef 100644
--- a/test/jdk/performance/client/SwingMark/src/JMTest_01.java
+++ b/test/jdk/performance/client/SwingMark/src/JMTest_01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/test/jdk/performance/client/SwingMark/src/JMTest_02.java b/test/jdk/performance/client/SwingMark/src/JMTest_02.java
index 680ada9f1df..ca712ce25df 100644
--- a/test/jdk/performance/client/SwingMark/src/JMTest_02.java
+++ b/test/jdk/performance/client/SwingMark/src/JMTest_02.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/test/jdk/performance/client/SwingMark/src/JMTest_03.java b/test/jdk/performance/client/SwingMark/src/JMTest_03.java
index 38f5dff43bc..a2868798798 100644
--- a/test/jdk/performance/client/SwingMark/src/JMTest_03.java
+++ b/test/jdk/performance/client/SwingMark/src/JMTest_03.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/test/jdk/performance/client/SwingMark/src/JMTest_04.java b/test/jdk/performance/client/SwingMark/src/JMTest_04.java
index cbb32e5b916..53b0294a9bd 100644
--- a/test/jdk/performance/client/SwingMark/src/JMTest_04.java
+++ b/test/jdk/performance/client/SwingMark/src/JMTest_04.java
@@ -1,6 +1,6 @@
 import java.util.Date;
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/test/jdk/performance/client/SwingMark/src/JMTest_05.java b/test/jdk/performance/client/SwingMark/src/JMTest_05.java
index dc2a0bd1489..4c90eb23316 100644
--- a/test/jdk/performance/client/SwingMark/src/JMTest_05.java
+++ b/test/jdk/performance/client/SwingMark/src/JMTest_05.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/test/jdk/performance/client/SwingMark/src/MenuTest.java b/test/jdk/performance/client/SwingMark/src/MenuTest.java
index 91ce63e7667..9c336814980 100644
--- a/test/jdk/performance/client/SwingMark/src/MenuTest.java
+++ b/test/jdk/performance/client/SwingMark/src/MenuTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/test/jdk/performance/client/SwingMark/src/TypingTest.java b/test/jdk/performance/client/SwingMark/src/TypingTest.java
index 440b8b09e87..7a29926f7bb 100644
--- a/test/jdk/performance/client/SwingMark/src/TypingTest.java
+++ b/test/jdk/performance/client/SwingMark/src/TypingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html
index 6e6ff5a21a2..df6e417a669 100644
--- a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/sun/awt/font/TestArabicHebrew.java b/test/jdk/sun/awt/font/TestArabicHebrew.java
index 356d36a4d21..c97381bcf4c 100644
--- a/test/jdk/sun/awt/font/TestArabicHebrew.java
+++ b/test/jdk/sun/awt/font/TestArabicHebrew.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/sun/java2d/marlin/Bug8341381.java b/test/jdk/sun/java2d/marlin/Bug8341381.java
index b469ac49313..19223e3bdbb 100644
--- a/test/jdk/sun/java2d/marlin/Bug8341381.java
+++ b/test/jdk/sun/java2d/marlin/Bug8341381.java
@@ -89,13 +89,13 @@ public final class Bug8341381 {
     static final AtomicBoolean isMarlin = new AtomicBoolean();
     static final CountDownLatch latch = new CountDownLatch(1);
 
+    // initialize j.u.l Logger:
+    static final Logger log = Logger.getLogger("sun.java2d.marlin");
     public static void main(final String[] args) {
         Locale.setDefault(Locale.US);
 
         // FIRST: Get Marlin runtime state from its log:
 
-        // initialize j.u.l Logger:
-        final Logger log = Logger.getLogger("sun.java2d.marlin");
         log.addHandler(new Handler() {
             @Override
             public void publish(LogRecord record) {
diff --git a/test/jdk/sun/java2d/marlin/ClipShapeTest.java b/test/jdk/sun/java2d/marlin/ClipShapeTest.java
index e77fca6924d..256387c1aac 100644
--- a/test/jdk/sun/java2d/marlin/ClipShapeTest.java
+++ b/test/jdk/sun/java2d/marlin/ClipShapeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/sun/java2d/marlin/CrashNaNTest.java b/test/jdk/sun/java2d/marlin/CrashNaNTest.java
index f25be866f85..13ef3baca98 100644
--- a/test/jdk/sun/java2d/marlin/CrashNaNTest.java
+++ b/test/jdk/sun/java2d/marlin/CrashNaNTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,11 +54,12 @@ public class CrashNaNTest {
 
     static final boolean SAVE_IMAGE = false;
 
+    // initialize j.u.l Looger:
+    static final Logger log = Logger.getLogger("sun.java2d.marlin");
+
     public static void main(String argv[]) {
         Locale.setDefault(Locale.US);
 
-        // initialize j.u.l Looger:
-        final Logger log = Logger.getLogger("sun.java2d.marlin");
         log.addHandler(new Handler() {
             @Override
             public void publish(LogRecord record) {
diff --git a/test/jdk/sun/java2d/marlin/CrashPaintTest.java b/test/jdk/sun/java2d/marlin/CrashPaintTest.java
index cf710bc83a5..fccb1365c72 100644
--- a/test/jdk/sun/java2d/marlin/CrashPaintTest.java
+++ b/test/jdk/sun/java2d/marlin/CrashPaintTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,11 +53,12 @@ public class CrashPaintTest {
 
     static final boolean SAVE_IMAGE = false;
 
+    // initialize j.u.l Looger:
+    static final Logger log = Logger.getLogger("sun.java2d.marlin");
+
     public static void main(String argv[]) {
         Locale.setDefault(Locale.US);
 
-        // initialize j.u.l Looger:
-        final Logger log = Logger.getLogger("sun.java2d.marlin");
         log.addHandler(new Handler() {
             @Override
             public void publish(LogRecord record) {
diff --git a/test/jdk/sun/java2d/marlin/TextClipErrorTest.java b/test/jdk/sun/java2d/marlin/TextClipErrorTest.java
index 2e63e4689fa..486291710d4 100644
--- a/test/jdk/sun/java2d/marlin/TextClipErrorTest.java
+++ b/test/jdk/sun/java2d/marlin/TextClipErrorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,11 +61,12 @@ public class TextClipErrorTest {
     static final boolean SAVE_IMAGE = false;
     static final boolean SERIALIZE = false;
 
+    // initialize j.u.l Looger:
+    static final Logger log = Logger.getLogger("sun.java2d.marlin");
+
     public static void main(String[] args) {
         Locale.setDefault(Locale.US);
 
-        // initialize j.u.l Looger:
-        final Logger log = Logger.getLogger("sun.java2d.marlin");
         log.addHandler(new Handler() {
             @Override
             public void publish(LogRecord record) {
diff --git a/test/jdk/sun/net/www/protocol/http/NTLMFailTest.java b/test/jdk/sun/net/www/protocol/http/NTLMFailTest.java
new file mode 100644
index 00000000000..86db3d400da
--- /dev/null
+++ b/test/jdk/sun/net/www/protocol/http/NTLMFailTest.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8372731
+ * @library /test/lib
+ * @run main/othervm NTLMFailTest
+ * @run main/othervm -Djdk.includeInExceptions= NTLMFailTest
+ * @summary check that the Authentication failure exception
+ *     honors the jdk.includeInExceptions setting
+ */
+
+import jdk.test.lib.net.HttpHeaderParser;
+import jdk.test.lib.net.URIBuilder;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Authenticator;
+import java.net.HttpURLConnection;
+import java.net.InetAddress;
+import java.net.PasswordAuthentication;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URL;
+
+public class NTLMFailTest {
+
+    static final int BODY_LEN = 8192;
+
+    static final String RESP_SERVER_AUTH =
+            "HTTP/1.1 401 Unauthorized\r\n" +
+            "WWW-Authenticate: NTLM\r\n" +
+            "Connection: close\r\n" +
+            "Content-Length: " + BODY_LEN + "\r\n" +
+            "\r\n";
+
+    static final String RESP_SERVER_NTLM =
+            "HTTP/1.1 401 Unauthorized\r\n" +
+            "WWW-Authenticate: NTLM InvalidChallenge\r\n" +
+            "Connection: Keep-Alive\r\n" +
+            "Content-Length: " + BODY_LEN + "\r\n" +
+            "\r\n";
+
+    public static void main(String[] args) throws Exception {
+        Authenticator.setDefault(new TestAuthenticator());
+        try (NTLMServer server = startServer(new ServerSocket(0, 0, InetAddress.getLoopbackAddress()))) {
+            URL url = URIBuilder.newBuilder()
+                    .scheme("http")
+                    .loopback()
+                    .port(server.getLocalPort())
+                    .path("/")
+                    .toURLUnchecked();
+            HttpURLConnection uc = (HttpURLConnection) url.openConnection();
+            uc.setRequestMethod("HEAD");
+            uc.getInputStream().readAllBytes();
+            throw new RuntimeException("Expected exception was not thrown");
+        } catch (IOException e) {
+            if (e.getMessage().contains("Authentication failure")) {
+                System.err.println("Got expected exception:");
+                e.printStackTrace();
+                if (System.getProperty("jdk.includeInExceptions") == null) {
+                    // detailed message enabled by default
+                    if (e.getCause() == null) {
+                        throw new RuntimeException("Expected a detailed exception", e);
+                    }
+                    // no checks on the detailed message; it's platform-specific and may be translated
+                } else {
+                    // detailed message disabled
+                    if (e.getCause() != null) {
+                        throw new RuntimeException("Unexpected detailed exception", e);
+                    }
+                }
+            } else {
+                throw e;
+            }
+        }
+    }
+
+    static class NTLMServer extends Thread implements AutoCloseable {
+        final ServerSocket ss;
+        volatile boolean closed;
+
+        NTLMServer(ServerSocket serverSS) {
+            super();
+            setDaemon(true);
+            this.ss = serverSS;
+        }
+
+        int getLocalPort() { return ss.getLocalPort(); }
+
+        @Override
+        public void run() {
+            boolean doing2ndStageNTLM = false;
+            while (!closed) {
+                try {
+                    Socket s = ss.accept();
+                    InputStream is = s.getInputStream();
+                    OutputStream os = s.getOutputStream();
+                    doServer(is, os, doing2ndStageNTLM);
+                    if (!doing2ndStageNTLM) {
+                        doing2ndStageNTLM = true;
+                    } else {
+                        os.close();
+                    }
+                } catch (IOException ioe) {
+                    if (!closed) {
+                        ioe.printStackTrace();
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void close() {
+           if (closed) return;
+           synchronized(this) {
+               if (closed) return;
+               closed = true;
+           }
+           try { ss.close(); } catch (IOException x) { };
+        }
+    }
+
+    static NTLMServer startServer(ServerSocket serverSS) {
+        NTLMServer server = new NTLMServer(serverSS);
+        server.start();
+        return server;
+    }
+
+    static void doServer(InputStream is, OutputStream os, boolean doing2ndStageNTLM) throws IOException {
+        if (!doing2ndStageNTLM) {
+            new HttpHeaderParser(is);
+            os.write(RESP_SERVER_AUTH.getBytes("ASCII"));
+        } else {
+            new HttpHeaderParser(is);
+            os.write(RESP_SERVER_NTLM.getBytes("ASCII"));
+        }
+    }
+
+    static class TestAuthenticator extends Authenticator {
+        protected PasswordAuthentication getPasswordAuthentication() {
+            return new PasswordAuthentication("test", "secret".toCharArray());
+        }
+    }
+}
diff --git a/test/jdk/sun/security/krb5/config/native/TestDynamicStore.java b/test/jdk/sun/security/krb5/config/native/TestDynamicStore.java
index 0ee559f33e4..a1281995c46 100644
--- a/test/jdk/sun/security/krb5/config/native/TestDynamicStore.java
+++ b/test/jdk/sun/security/krb5/config/native/TestDynamicStore.java
@@ -27,7 +27,7 @@
  * @summary SCDynamicStoreConfig works
  * @modules java.security.jgss/sun.security.krb5
  * @library /test/lib
- * @run main/manual/native/timeout=180 TestDynamicStore
+ * @run main/manual/native TestDynamicStore
  * @requires (os.family == "mac")
  */
 
diff --git a/test/jdk/sun/security/provider/FileInputStreamPool/FileInputStreamPoolTest.java b/test/jdk/sun/security/provider/FileInputStreamPool/FileInputStreamPoolTest.java
index 32bdea4e153..d556b180265 100644
--- a/test/jdk/sun/security/provider/FileInputStreamPool/FileInputStreamPoolTest.java
+++ b/test/jdk/sun/security/provider/FileInputStreamPool/FileInputStreamPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java b/test/jdk/sun/security/provider/pqc/ML_DSA_Intrinsic_Test.java
similarity index 90%
rename from test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
rename to test/jdk/sun/security/provider/pqc/ML_DSA_Intrinsic_Test.java
index 1e9faf7fb74..d6d9fea789f 100644
--- a/test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
+++ b/test/jdk/sun/security/provider/pqc/ML_DSA_Intrinsic_Test.java
@@ -38,16 +38,17 @@ import java.util.HexFormat;
  */
 /*
  * @test
- * @comment This test should be reenabled on aarch64
- * @requires os.simpleArch == "x64"
  * @library /test/lib
  * @key randomness
  * @modules java.base/sun.security.provider:+open
  * @run main ML_DSA_Intrinsic_Test
  */
 
-// To run manually: java --add-opens java.base/sun.security.provider=ALL-UNNAMED --add-exports java.base/sun.security.provider=ALL-UNNAMED
-//  -XX:+UnlockDiagnosticVMOptions -XX:+UseDilithiumIntrinsics test/jdk/sun/security/provider/acvp/ML_DSA_Intrinsic_Test.java
+// To run manually:
+// java --add-opens java.base/sun.security.provider=ALL-UNNAMED
+//  --add-exports java.base/sun.security.provider=ALL-UNNAMED
+//  -XX:+UnlockDiagnosticVMOptions -XX:+UseDilithiumIntrinsics
+//  test/jdk/sun/security/provider/pqc/ML_DSA_Intrinsic_Test.java
 
 public class ML_DSA_Intrinsic_Test {
     public static void main(String[] args) throws Throwable {
@@ -104,9 +105,10 @@ public class ML_DSA_Intrinsic_Test {
         m.setAccessible(true);
         MethodHandle inverseNttJava = lookup.unreflect(m);
 
-        // Hint: if test fails, you can hardcode the seed to make the test more reproducible
         Random rnd = new Random();
         long seed = rnd.nextLong();
+        // Hint: if a test fails, it prints the seed, so you can hardcode
+        // it here to reproduce the failure
         rnd.setSeed(seed);
         //Note: it might be useful to increase this number during development of new intrinsics
         final int repeat = 10000;
@@ -117,32 +119,49 @@ public class ML_DSA_Intrinsic_Test {
         int[] prod3 = new int[ML_DSA_N];
         int[] prod4 = new int[ML_DSA_N];
         for (int i = 0; i < repeat; i++) {
-            // Hint: if test fails, you can hardcode the seed to make the test more reproducible:
-            // rnd.setSeed(seed);
-            testMult(prod1, prod2, coeffs1, coeffs2, mult, multJava, rnd, seed, i);
+            testMult(prod1, prod2, coeffs1, coeffs2,
+                    mult, multJava, rnd, seed, i);
             testMultConst(prod1, prod2, multConst, multConstJava, rnd, seed, i);
-            testDecompose(prod1, prod2, prod3, prod4, coeffs1, coeffs2, decompose, decomposeJava, rnd, seed, i);
+            testDecompose(prod1, prod2, prod3, prod4, coeffs1, coeffs2,
+                    decompose, decomposeJava, rnd, seed, i);
             testAlmostNtt(coeffs1, coeffs2, almostNtt, almostNttJava, rnd, seed, i);
             testInverseNtt(coeffs1, coeffs2, inverseNtt, inverseNttJava, rnd, seed, i);
         }
         System.out.println("Fuzz Success");
     }
 
-    private static final int ML_DSA_N = 256;
-    public static void testMult(int[] prod1, int[] prod2, int[] coeffs1, int[] coeffs2,
+    public static void testMult(int[] prod1, int[] prod2,
+        int[] coeffs1, int[] coeffs2,
         MethodHandle mult, MethodHandle multJava, Random rnd,
         long seed, int i) throws Throwable {
 
-        for (int j = 0; j<ML_DSA_N; j++) {
-            coeffs1[j] = rnd.nextInt();
-            coeffs2[j] = rnd.nextInt();
+        // This method is always called with arrays whose elements are between
+        // -ML_DSA_Q and ML_DSA_Q, so we only test for these here (although
+        // both versions work fine with array element sizes that satisfy the
+        // montMul() preconditions in sun.security.provider.ML_DSA.java
+        for (int j = 0; j < ML_DSA_N; j++) {
+            coeffs1[j] = rnd.nextInt(2 * ML_DSA_Q) - ML_DSA_Q;
+            coeffs2[j] = rnd.nextInt(2 * ML_DSA_Q) - ML_DSA_Q;
         }
 
         mult.invoke(prod1, coeffs1, coeffs2);
         multJava.invoke(prod2, coeffs1, coeffs2);
 
         if (!Arrays.equals(prod1, prod2)) {
-                throw new RuntimeException("[Seed "+seed+"@"+i+"] Result mult mismatch: " + formatOf(prod1) + " != " + formatOf(prod2));
+            // The Java version and the intrinsic version should not produce
+            // the exact same result (although usually they do), it is enough
+            // if the corresponding array elements are congruent modulo ML_DSA_Q
+            boolean modQequal = true;
+            for (int j = 0; j < ML_DSA_N; j++) {
+                if (prod1[j] != prod2[j]) {
+                    modQequal &= (((prod1[j] - prod2[j]) % ML_DSA_Q) == 0);
+                }
+            }
+            if (!modQequal) {
+                throw new RuntimeException("[Seed " + seed + "@" + i
+                        + "] Result mult mismatch: "
+                        + formatOf(prod1) + "\n != " + formatOf(prod2));
+            }
         }
     }
 
@@ -150,26 +169,30 @@ public class ML_DSA_Intrinsic_Test {
         MethodHandle multConst, MethodHandle multConstJava, Random rnd,
         long seed, int i) throws Throwable {
 
-        for (int j = 0; j<ML_DSA_N; j++) {
+        for (int j = 0; j < ML_DSA_N; j++) {
             prod1[j] = prod2[j] = rnd.nextInt();
         }
-        // Per Algorithm 3 in https://eprint.iacr.org/2018/039.pdf, one of the inputs is bound, which prevents overflows
-        int dilithium_q = 8380417;
-        int c = rnd.nextInt(dilithium_q);
+
+        // Per Algorithm 3 in https://eprint.iacr.org/2018/039.pdf,
+        // one of the inputs is bound, which prevents overflows
+        int c = rnd.nextInt(ML_DSA_Q);
 
         multConst.invoke(prod1, c);
         multConstJava.invoke(prod2, c);
 
         if (!Arrays.equals(prod1, prod2)) {
-                throw new RuntimeException("[Seed "+seed+"@"+i+"] Result multConst mismatch: " + formatOf(prod1) + " != " + formatOf(prod2));
+                throw new RuntimeException("[Seed " + seed + "@" + i
+                        + "] Result multConst mismatch: "
+                        + formatOf(prod1) + " != " + formatOf(prod2));
         }
     }
 
-    public static void testDecompose(int[] low1, int[] high1, int[] low2, int[] high2, int[] coeffs1, int[] coeffs2,
+    public static void testDecompose(int[] low1, int[] high1, int[] low2,
+        int[] high2, int[] coeffs1, int[] coeffs2,
         MethodHandle decompose, MethodHandle decomposeJava, Random rnd,
         long seed, int i) throws Throwable {
 
-        for (int j = 0; j<ML_DSA_N; j++) {
+        for (int j = 0; j < ML_DSA_N; j++) {
             coeffs1[j] = coeffs2[j] = rnd.nextInt();
         }
         int gamma2 = 95232;
@@ -182,18 +205,22 @@ public class ML_DSA_Intrinsic_Test {
         decomposeJava.invoke(coeffs2, low2, high2, 2 * gamma2, multiplier);
 
         if (!Arrays.equals(low1, low2)) {
-                throw new RuntimeException("[Seed "+seed+"@"+i+"] Result low mismatch: " + formatOf(low1) + " != " + formatOf(low2));
+                throw new RuntimeException("[Seed " + seed + "@" + i
+                        + "] Result low mismatch: "
+                        + formatOf(low1) + " != " + formatOf(low2));
         }
 
         if (!Arrays.equals(high1, high2)) {
-                throw new RuntimeException("[Seed "+seed+"@"+i+"] Result high mismatch: " + formatOf(high1) + " != " + formatOf(high2));
+                throw new RuntimeException("[Seed " + seed + "@" + i
+                        + "] Result high mismatch: "
+                        + formatOf(high1) + " != " + formatOf(high2));
         }
     }
 
     public static void testAlmostNtt(int[] coeffs1, int[] coeffs2,
         MethodHandle almostNtt, MethodHandle almostNttJava, Random rnd,
         long seed, int i) throws Throwable {
-        for (int j = 0; j<ML_DSA_N; j++) {
+        for (int j = 0; j < ML_DSA_N; j++) {
             coeffs1[j] = coeffs2[j] = rnd.nextInt();
         }
 
@@ -201,14 +228,16 @@ public class ML_DSA_Intrinsic_Test {
         almostNttJava.invoke(coeffs2);
 
         if (!Arrays.equals(coeffs1, coeffs2)) {
-            throw new RuntimeException("[Seed "+seed+"@"+i+"] Result AlmostNtt mismatch: " + formatOf(coeffs1) + " != " + formatOf(coeffs2));
+            throw new RuntimeException("[Seed " + seed + "@" + i
+                    +"] Result AlmostNtt mismatch: "
+                    + formatOf(coeffs1) + " != " + formatOf(coeffs2));
         }
     }
 
     public static void testInverseNtt(int[] coeffs1, int[] coeffs2,
         MethodHandle inverseNtt, MethodHandle inverseNttJava, Random rnd,
         long seed, int i) throws Throwable {
-        for (int j = 0; j<ML_DSA_N; j++) {
+        for (int j = 0; j < ML_DSA_N; j++) {
             coeffs1[j] = coeffs2[j] = rnd.nextInt();
         }
 
@@ -216,7 +245,9 @@ public class ML_DSA_Intrinsic_Test {
         inverseNttJava.invoke(coeffs2);
 
         if (!Arrays.equals(coeffs1, coeffs2)) {
-            throw new RuntimeException("[Seed "+seed+"@"+i+"] Result InverseNtt mismatch: " + formatOf(coeffs1) + " != " + formatOf(coeffs2));
+            throw new RuntimeException("[Seed " + seed+  "@" + i
+                    +"] Result InverseNtt mismatch: "
+                    + formatOf(coeffs1) + " != " + formatOf(coeffs2));
         }
     }
 
@@ -230,6 +261,9 @@ public class ML_DSA_Intrinsic_Test {
     }
 
     // Copied constants from sun.security.provider.ML_DSA
+    private static final int ML_DSA_N = 256;
+    private static final int ML_DSA_Q = 8380417;
+
     private static final int[] MONT_ZETAS_FOR_VECTOR_INVERSE_NTT = new int[]{
             -1976782, 846154, -1400424, -3937738, 1362209, 48306, -3919660, 554416,
             3545687, -1612842, 976891, -183443, 2286327, 420899, 2235985, 2939036,
diff --git a/test/jdk/sun/security/ssl/SSLEngineImpl/TestBadDNForPeerCA.java b/test/jdk/sun/security/ssl/SSLEngineImpl/TestBadDNForPeerCA.java
index 20b4c39afb1..cbdabea4a19 100644
--- a/test/jdk/sun/security/ssl/SSLEngineImpl/TestBadDNForPeerCA.java
+++ b/test/jdk/sun/security/ssl/SSLEngineImpl/TestBadDNForPeerCA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * @library /test/lib
  * @summary SSLEngine throws IAE during parsing of X500Principal
  * @run main/othervm TestBadDNForPeerCA
- * @run main/othervm -Djavax.net.debug=all TestBadDNForPeerCA
  */
 
 import javax.net.ssl.KeyManagerFactory;
@@ -45,6 +44,16 @@ import java.util.Base64;
 
 
 public class TestBadDNForPeerCA {
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=all
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
 
     private static final String proto = "TLSv1.3";
 
@@ -85,6 +94,10 @@ public class TestBadDNForPeerCA {
      */
     public static void main(String[] args) throws Exception {
 
+        if (debug) {
+            System.setProperty("javax.net.debug", "all");
+        }
+
         TestBadDNForPeerCA test = new TestBadDNForPeerCA();
 
         try {
diff --git a/test/jdk/sun/security/ssl/SSLEngineImpl/TestBadDNForPeerCA12.java b/test/jdk/sun/security/ssl/SSLEngineImpl/TestBadDNForPeerCA12.java
index 527ceb406c6..70405b61ab3 100644
--- a/test/jdk/sun/security/ssl/SSLEngineImpl/TestBadDNForPeerCA12.java
+++ b/test/jdk/sun/security/ssl/SSLEngineImpl/TestBadDNForPeerCA12.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * @library /test/lib
  * @summary SSLEngine throws IAE during parsing of X500Principal
  * @run main/othervm TestBadDNForPeerCA12
- * @run main/othervm -Djavax.net.debug=all TestBadDNForPeerCA12
  */
 
 import javax.net.ssl.KeyManagerFactory;
@@ -45,6 +44,17 @@ import java.util.Base64;
 
 public class TestBadDNForPeerCA12 {
 
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=all
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
+
     // Test was originally written for TLSv1.2
     private static final String proto = "TLSv1.2";
 
@@ -108,6 +118,10 @@ public class TestBadDNForPeerCA12 {
      */
     public static void main(String[] args) throws Exception {
 
+        if (debug) {
+            System.setProperty("javax.net.debug", "all");
+        }
+
         TestBadDNForPeerCA12 test = new TestBadDNForPeerCA12();
 
         try {
diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/NoInvalidateSocketException.java b/test/jdk/sun/security/ssl/SSLSessionImpl/NoInvalidateSocketException.java
index 696eb58d463..977e005daf3 100644
--- a/test/jdk/sun/security/ssl/SSLSessionImpl/NoInvalidateSocketException.java
+++ b/test/jdk/sun/security/ssl/SSLSessionImpl/NoInvalidateSocketException.java
@@ -52,6 +52,18 @@ import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 public class NoInvalidateSocketException extends SSLSocketTemplate {
+
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=ssl,session
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
+
     private static final int ITERATIONS = 10;
 
     // This controls how long the main thread waits before closing the socket.
@@ -73,8 +85,8 @@ public class NoInvalidateSocketException extends SSLSocketTemplate {
     private static volatile boolean finished = false;
 
     public static void main(String[] args) throws Exception {
-        if (System.getProperty("javax.net.debug") == null) {
-            System.setProperty("javax.net.debug", "session");
+        if (debug) {
+            System.setProperty("javax.net.debug", "ssl,session");
         }
 
         if (args != null && args.length >= 1) {
diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java
index c9768c1756c..b21d7aa4e31 100644
--- a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java
+++ b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java
@@ -26,7 +26,7 @@
  * @bug 8350830
  * @summary TLS 1.2 Client session resumption having ServerNameIndication
  * @modules java.base/sun.security.tools.keytool
- * @run main/othervm -Djavax.net.debug=all ResumeClientTLS12withSNI
+ * @run main/othervm ResumeClientTLS12withSNI
  */
 
 import javax.net.ssl.*;
@@ -41,6 +41,17 @@ import java.util.*;
 
 public class ResumeClientTLS12withSNI {
 
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=all
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
+
     /*
      * Enables logging of the SSLEngine operations.
      */
@@ -77,6 +88,11 @@ public class ResumeClientTLS12withSNI {
      * Main entry point for this test.
      */
     public static void main(String args[]) throws Exception {
+
+        if (debug) {
+            System.setProperty("javax.net.debug", "all");
+        }
+
         Files.deleteIfExists(Path.of(keyFilename));
 
         sun.security.tools.keytool.Main.main(
diff --git a/test/jdk/sun/security/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java b/test/jdk/sun/security/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java
index 145a68a6b0e..d085c1fe890 100644
--- a/test/jdk/sun/security/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java
+++ b/test/jdk/sun/security/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
  * @modules jdk.crypto.ec
  * @library /javax/net/ssl/templates
  * @summary Calling setWantClientAuth(true) disables anonymous suites
- * @run main/othervm -Djavax.net.debug=all AnonCipherWithWantClientAuth
+ * @run main/othervm AnonCipherWithWantClientAuth
  */
 
 import java.io.InputStream;
@@ -41,10 +41,27 @@ import java.security.Security;
 import javax.net.ssl.SSLSocket;
 
 public class AnonCipherWithWantClientAuth extends SSLSocketTemplate {
+
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=all
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
+
     /*
      * Run the test case.
      */
     public static void main(String[] args) throws Exception {
+
+        if (debug) {
+            System.setProperty("javax.net.debug", "all");
+        }
+
         // reset the security property to make sure that the algorithms
         // and keys used in this test are not disabled.
         Security.setProperty("jdk.tls.disabledAlgorithms", "");
diff --git a/test/jdk/sun/security/ssl/SignatureScheme/SigAlgosExtTestWithTLS12.java b/test/jdk/sun/security/ssl/SignatureScheme/SigAlgosExtTestWithTLS12.java
index 43bc40fabf2..351d3ad76a1 100644
--- a/test/jdk/sun/security/ssl/SignatureScheme/SigAlgosExtTestWithTLS12.java
+++ b/test/jdk/sun/security/ssl/SignatureScheme/SigAlgosExtTestWithTLS12.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (C) 2021, 2024, Tencent. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -56,6 +56,16 @@ import java.nio.ByteBuffer;
 import java.util.*;
 
 public class SigAlgosExtTestWithTLS12 extends SSLEngineTemplate {
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=ssl,handshake
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
 
     private static final boolean CLIENT_AUTH
             = Boolean.getBoolean("test.clientAuth");
@@ -114,7 +124,9 @@ public class SigAlgosExtTestWithTLS12 extends SSLEngineTemplate {
     }
 
     public static void main(String[] args) throws Exception {
-        System.setProperty("javax.net.debug", "ssl:handshake");
+        if (debug) {
+            System.setProperty("javax.net.debug", "ssl,handshake");
+        }
 
         try {
             new SigAlgosExtTestWithTLS12().run();
diff --git a/test/jdk/sun/security/ssl/SignatureScheme/SigSchemePropOrdering.java b/test/jdk/sun/security/ssl/SignatureScheme/SigSchemePropOrdering.java
index b7719e6af19..4299c1cc049 100644
--- a/test/jdk/sun/security/ssl/SignatureScheme/SigSchemePropOrdering.java
+++ b/test/jdk/sun/security/ssl/SignatureScheme/SigSchemePropOrdering.java
@@ -38,6 +38,16 @@ import java.util.Arrays;
 import java.util.List;
 
 public class SigSchemePropOrdering extends AbstractCheckSignatureSchemes {
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=ssl:handshake
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
 
     private static final String SIG_SCHEME_STR =
             "rsa_pkcs1_sha256,rsa_pss_rsae_sha256,rsa_pss_pss_sha256," +
@@ -48,7 +58,10 @@ public class SigSchemePropOrdering extends AbstractCheckSignatureSchemes {
     }
 
     public static void main(String[] args) throws Exception {
-        System.setProperty("javax.net.debug", "ssl:handshake");
+        if (debug) {
+            System.setProperty("javax.net.debug", "ssl:handshake");
+        }
+
         System.setProperty("jdk.tls.client.SignatureSchemes", SIG_SCHEME_STR);
         System.setProperty("jdk.tls.server.SignatureSchemes", SIG_SCHEME_STR);
         new SigSchemePropOrdering().run();
diff --git a/test/jdk/sun/security/ssl/Stapling/StatusResponseManager.java b/test/jdk/sun/security/ssl/Stapling/StatusResponseManager.java
index 57b16ed7862..6e78c6b4c73 100644
--- a/test/jdk/sun/security/ssl/Stapling/StatusResponseManager.java
+++ b/test/jdk/sun/security/ssl/Stapling/StatusResponseManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  *        jdk.test.lib.security.CertificateBuilder
  * @bug 8046321 8339403
  * @summary OCSP Stapling for TLS
- * @run main/othervm -Djavax.net.debug=ssl:respmgr
- *      java.base/sun.security.ssl.StatusResponseManagerTests
+ * @run main/othervm java.base/sun.security.ssl.StatusResponseManagerTests
  */
 
diff --git a/test/jdk/sun/security/ssl/Stapling/java.base/sun/security/ssl/StatusResponseManagerTests.java b/test/jdk/sun/security/ssl/Stapling/java.base/sun/security/ssl/StatusResponseManagerTests.java
index bcfc1290cf0..c7ecbe9f13c 100644
--- a/test/jdk/sun/security/ssl/Stapling/java.base/sun/security/ssl/StatusResponseManagerTests.java
+++ b/test/jdk/sun/security/ssl/Stapling/java.base/sun/security/ssl/StatusResponseManagerTests.java
@@ -47,7 +47,17 @@ import static sun.security.ssl.CertStatusExtension.*;
  */
 public class StatusResponseManagerTests {
 
-    private static final boolean debug = true;
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=ssl:respmgr
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
+
     private static final boolean ocspDebug = false;
 
     private static Field responseCacheField;
@@ -72,6 +82,11 @@ public class StatusResponseManagerTests {
     static X509Certificate[] chain;
 
     public static void main(String[] args) throws Exception {
+
+        if (debug) {
+            System.setProperty("javax.net.debug", "ssl:respmgr");
+        }
+
         responseCacheField =
                 StatusResponseManager.class.getDeclaredField("responseCache");
         responseCacheField.setAccessible(true);
diff --git a/test/jdk/sun/security/ssl/TEST.properties b/test/jdk/sun/security/ssl/TEST.properties
new file mode 100644
index 00000000000..741c2565067
--- /dev/null
+++ b/test/jdk/sun/security/ssl/TEST.properties
@@ -0,0 +1 @@
+maxOutputSize=500000
diff --git a/test/jdk/sun/security/util/Password/EmptyIn.java b/test/jdk/sun/security/util/Password/EmptyIn.java
new file mode 100644
index 00000000000..b5692b9e7f9
--- /dev/null
+++ b/test/jdk/sun/security/util/Password/EmptyIn.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.test.lib.Asserts;
+import sun.security.util.Password;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+/*
+ * @test
+ * @bug 8374555
+ * @summary only print warning when reading from System.in
+ * @modules java.base/sun.security.util
+ * @library /test/lib
+ */
+public class EmptyIn {
+    public static void main(String[] args) throws Exception {
+        testSystemIn();
+        testNotSystemIn();
+    }
+
+    static void testSystemIn() throws Exception {
+        var in = new ByteArrayInputStream(new byte[0]);
+        var err = new ByteArrayOutputStream();
+        var oldErr = System.err;
+        var oldIn = System.in;
+        try {
+            System.setIn(in);
+            System.setErr(new PrintStream(err));
+            Password.readPassword(System.in);
+        } finally {
+            System.setIn(oldIn);
+            System.setErr(oldErr);
+        }
+        // Read from System.in. Should warn.
+        Asserts.assertNotEquals(0, err.size());
+    }
+
+    static void testNotSystemIn() throws Exception {
+        var in = new ByteArrayInputStream(new byte[0]);
+        var err = new ByteArrayOutputStream();
+        var oldErr = System.err;
+        try {
+            System.setErr(new PrintStream(err));
+            Password.readPassword(in);
+        } finally {
+            System.setErr(oldErr);
+        }
+        // Not read from System.in. Should not warn.
+        Asserts.assertEQ(0, err.size());
+    }
+}
diff --git a/test/jdk/tools/jimage/ImageReaderDuplicateChildNodesTest.java b/test/jdk/tools/jimage/ImageReaderDuplicateChildNodesTest.java
index 8656a4a3d00..f8f6894df10 100644
--- a/test/jdk/tools/jimage/ImageReaderDuplicateChildNodesTest.java
+++ b/test/jdk/tools/jimage/ImageReaderDuplicateChildNodesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/tools/jlink/SnippetsTest.java b/test/jdk/tools/jlink/SnippetsTest.java
index ec0c94e3d26..67aa3cf1cec 100644
--- a/test/jdk/tools/jlink/SnippetsTest.java
+++ b/test/jdk/tools/jlink/SnippetsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/AnnotationsTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/AnnotationsTest.java
index f88d1f81a34..42dd8eda19b 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/AnnotationsTest.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/AnnotationsTest.java
@@ -353,12 +353,12 @@ public class AnnotationsTest extends JUnitAdapter {
         try {
             log = captureJPackageTestLog(() -> Main.main(TestBuilder.build().workDirRoot(workDir), args));
             assertRecordedTestDescs(expectedTestDescs);
-        } catch (Throwable t) {
-            t.printStackTrace(System.err);
+        } catch (Exception ex) {
+            ex.printStackTrace(System.err);
             System.exit(1);
 
             // Redundant, but needed to suppress "The local variable log may not have been initialized" error.
-            throw new RuntimeException(t);
+            throw new RuntimeException(ex);
         }
 
         final var actualTestCount = Integer.parseInt(log.stream().dropWhile(line -> {
diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/ExecutorTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/ExecutorTest.java
index c5d8aed845c..2b075e0f13c 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/ExecutorTest.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/ExecutorTest.java
@@ -210,7 +210,13 @@ public class ExecutorTest extends JUnitAdapter {
 
             assertEquals(0, result[0].getExitCode());
 
-            assertEquals(expectedCapturedSystemOut(commandWithDiscardedStreams), outputCapture.outLines());
+            // If we dump the subprocesses's output, and the command produced both STDOUT and STDERR,
+            // then the captured STDOUT may contain interleaved command's STDOUT and STDERR,
+            // not in sequential order (STDOUT followed by STDERR).
+            // In this case don't check the contents of the captured command's STDOUT.
+            if (toolProvider || outputCapture.outLines().isEmpty() || (command.stdout().isEmpty() || command.stderr().isEmpty())) {
+                assertEquals(expectedCapturedSystemOut(commandWithDiscardedStreams), outputCapture.outLines());
+            }
             assertEquals(expectedCapturedSystemErr(commandWithDiscardedStreams), outputCapture.errLines());
 
             assertEquals(expectedResultStdout(commandWithDiscardedStreams), result[0].stdout().getOutput());
diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JUnitUtilsTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JUnitUtilsTest.java
index 28b55f98fe2..291079d3d54 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JUnitUtilsTest.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JUnitUtilsTest.java
@@ -35,6 +35,7 @@ public class JUnitUtilsTest {
         JUnitUtils.assertArrayEquals(new int[] {1, 2, 3}, new int[] {1, 2, 3});
         JUnitUtils.assertArrayEquals(new long[] {1, 2, 3}, new long[] {1, 2, 3});
         JUnitUtils.assertArrayEquals(new boolean[] {true, true}, new boolean[] {true, true});
+        JUnitUtils.assertArrayEquals(null, null);
     }
 
     @Test
diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JavaAppDescTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JavaAppDescTest.java
index 08d0ba76d1c..4e926f987cc 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JavaAppDescTest.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JavaAppDescTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java
index 4723f4dadbd..16909d0eb40 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java
@@ -168,7 +168,7 @@ public class PackageTestTest extends JUnitAdapter {
         protected final int expectedTicks;
     }
 
-    private static class CountingConsumer extends TickCounter implements ThrowingConsumer<JPackageCommand> {
+    private static class CountingConsumer extends TickCounter implements ThrowingConsumer<JPackageCommand, RuntimeException> {
 
         @Override
         public void accept(JPackageCommand cmd) {
@@ -188,7 +188,7 @@ public class PackageTestTest extends JUnitAdapter {
         private final String label;
     }
 
-    private static class CountingRunnable extends TickCounter implements ThrowingRunnable {
+    private static class CountingRunnable extends TickCounter implements ThrowingRunnable<RuntimeException> {
 
         @Override
         public void run() {
@@ -208,7 +208,7 @@ public class PackageTestTest extends JUnitAdapter {
         private final String label;
     }
 
-    private static class CountingBundleVerifier extends TickCounter implements ThrowingBiConsumer<JPackageCommand, Executor.Result> {
+    private static class CountingBundleVerifier extends TickCounter implements ThrowingBiConsumer<JPackageCommand, Executor.Result, RuntimeException> {
 
         @Override
         public void accept(JPackageCommand cmd, Executor.Result result) {
diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/TKitTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/TKitTest.java
index 590f23b002d..00172791ad8 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/TKitTest.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/TKitTest.java
@@ -25,6 +25,7 @@ package jdk.jpackage.test;
 import static jdk.jpackage.internal.util.function.ThrowingRunnable.toRunnable;
 import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
 
+import java.io.IOException;
 import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -212,13 +213,13 @@ public class TKitTest extends JUnitAdapter {
 
     @Test
     @ParameterSupplier("testCreateTempPath")
-    public void testCreateTempFile(CreateTempTestSpec testSpec) throws Throwable {
+    public void testCreateTempFile(CreateTempTestSpec testSpec) throws IOException {
         testSpec.test(TKit::createTempFile, TKit::assertFileExists);
     }
 
     @Test
     @ParameterSupplier("testCreateTempPath")
-    public void testCreateTempDirectory(CreateTempTestSpec testSpec) throws Throwable {
+    public void testCreateTempDirectory(CreateTempTestSpec testSpec) throws IOException {
         testSpec.test(TKit::createTempDirectory, TKit::assertDirectoryEmpty);
     }
 
@@ -232,7 +233,7 @@ public class TKitTest extends JUnitAdapter {
             }
         }
 
-        void test(ThrowingFunction<String, Path> createTempPath, Consumer<Path> assertTempPathExists) throws Throwable {
+        void test(ThrowingFunction<String, Path, IOException> createTempPath, Consumer<Path> assertTempPathExists) throws IOException {
             for (var existingFile : existingFiles) {
                 existingFile = TKit.workDir().resolve(existingFile);
 
@@ -333,14 +334,14 @@ public class TKitTest extends JUnitAdapter {
         }).toList();
     }
 
-    private static void runAssertWithExpectedLogOutput(ThrowingRunnable action,
+    private static void runAssertWithExpectedLogOutput(ThrowingRunnable<? extends Exception> action,
             boolean expectFail, String... expectLogStrings) {
         runWithExpectedLogOutput(() -> {
             TKit.assertAssert(!expectFail, toRunnable(action));
         }, expectLogStrings);
     }
 
-    private static void runWithExpectedLogOutput(ThrowingRunnable action,
+    private static void runWithExpectedLogOutput(ThrowingRunnable<? extends Exception> action,
             String... expectLogStrings) {
         final var output = JUnitAdapter.captureJPackageTestLog(action);
         if (output.size() == 1 && expectLogStrings.length == 1) {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
index 95373fa0d61..8ce3f4d2948 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
@@ -152,7 +152,7 @@ public final class AdditionalLauncher {
     }
 
     public AdditionalLauncher setPersistenceHandler(
-            ThrowingBiConsumer<Path, Collection<Map.Entry<String, String>>> handler) {
+            ThrowingBiConsumer<Path, Collection<Map.Entry<String, String>>, ? extends Exception> handler) {
         if (handler != null) {
             createFileHandler = ThrowingBiConsumer.toBiConsumer(handler);
         } else {
@@ -182,7 +182,7 @@ public final class AdditionalLauncher {
                 Optional.ofNullable(defaultArguments), Optional.ofNullable(icon), rawProperties);
     }
 
-    private ThrowingConsumer<JPackageCommand> createVerifierAsConsumer() {
+    private ThrowingConsumer<JPackageCommand, ? extends Exception> createVerifierAsConsumer() {
         return cmd -> {
             createVerifier().verify(cmd, verifyActions.stream().sorted(Comparator.comparing(Action::ordinal)).toArray(Action[]::new));
         };
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Annotations.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Annotations.java
index 4b6072c80b5..1ae1a587c4e 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Annotations.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Annotations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java
index 967fd8cb653..94f5b0a52b4 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
index 91625603a2b..ef118e525c5 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
@@ -32,6 +32,7 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.io.StringReader;
+import java.io.UncheckedIOException;
 import java.io.Writer;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -42,12 +43,15 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
 import java.util.spi.ToolProvider;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import jdk.jpackage.internal.util.function.ThrowingSupplier;
+import jdk.jpackage.internal.util.function.ExceptionBox;
 
 public final class Executor extends CommandArguments<Executor> {
 
@@ -465,9 +469,37 @@ public final class Executor extends CommandArguments<Executor> {
         trace("Execute " + sb.toString() + "...");
         Process process = builder.start();
 
-        final var output = combine(
-                processProcessStream(outputStreamsControl.stdout(), process.getInputStream()),
-                processProcessStream(outputStreamsControl.stderr(), process.getErrorStream()));
+        var stdoutGobbler = CompletableFuture.<Optional<List<String>>>supplyAsync(() -> {
+            try {
+                return processProcessStream(outputStreamsControl.stdout(), process.getInputStream());
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        });
+
+        var stderrGobbler = CompletableFuture.<Optional<List<String>>>supplyAsync(() -> {
+            try {
+                return processProcessStream(outputStreamsControl.stderr(), process.getErrorStream());
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        });
+
+        final CommandOutput output;
+
+        try {
+            output = combine(stdoutGobbler.join(), stderrGobbler.join());
+        } catch (CompletionException ex) {
+            var cause = ex.getCause();
+            switch (cause) {
+                case UncheckedIOException uioex -> {
+                    throw uioex.getCause();
+                }
+                default -> {
+                    throw ExceptionBox.toUnchecked(ExceptionBox.unbox(cause));
+                }
+            }
+        }
 
         final int exitCode = process.waitFor();
         trace("Done. Exit code: " + exitCode);
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
index 197e835ed8d..38091cb3452 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -291,7 +291,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
     public JPackageCommand setFakeRuntime() {
         verifyMutable();
 
-        ThrowingConsumer<Path> createBulkFile = path -> {
+        ThrowingConsumer<Path, IOException> createBulkFile = path -> {
             Files.createDirectories(path.getParent());
             try (FileOutputStream out = new FileOutputStream(path.toFile())) {
                 byte[] bytes = new byte[4 * 1024];
@@ -328,12 +328,12 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
                 .removeArgumentWithValue("--input");
     }
 
-    JPackageCommand addPrerequisiteAction(ThrowingConsumer<JPackageCommand> action) {
+    JPackageCommand addPrerequisiteAction(ThrowingConsumer<JPackageCommand, ? extends Exception> action) {
         prerequisiteActions.add(action);
         return this;
     }
 
-    JPackageCommand addVerifyAction(ThrowingConsumer<JPackageCommand> action) {
+    JPackageCommand addVerifyAction(ThrowingConsumer<JPackageCommand, ? extends Exception> action) {
         return addVerifyAction(action, ActionRole.DEFAULT);
     }
 
@@ -343,12 +343,12 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         ;
     }
 
-    JPackageCommand addVerifyAction(ThrowingConsumer<JPackageCommand> action, ActionRole actionRole) {
+    JPackageCommand addVerifyAction(ThrowingConsumer<JPackageCommand, ? extends Exception> action, ActionRole actionRole) {
         verifyActions.add(action, actionRole);
         return this;
     }
 
-    Stream<ThrowingConsumer<JPackageCommand>> getVerifyActionsWithRole(ActionRole actionRole) {
+    Stream<ThrowingConsumer<JPackageCommand, ? extends Exception>> getVerifyActionsWithRole(ActionRole actionRole) {
         return verifyActions.actionsWithRole(actionRole);
     }
 
@@ -779,6 +779,30 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         defaultToolProvider.set(Optional.empty());
     }
 
+    /**
+     * Starts a new thread. In this thread calls
+     * {@link #useToolProviderByDefault(ToolProvider)} with the specified
+     * {@code jpackageToolProvider} and then calls {@code workload.run()}. Joins the
+     * thread.
+     * <p>
+     * The idea is to run the {@code workload} in the context of the specified
+     * jpackage {@code ToolProvider} without altering the global variable holding
+     * the default jpackage {@code ToolProvider}. The global variable is
+     * thread-local; setting its value in a new thread doesn't alter its copy in the
+     * calling thread.
+     *
+     * @param jpackageToolProvider jpackage {@code ToolProvider}
+     * @param workload             the workload to run
+     */
+    public static void withToolProvider(ToolProvider jpackageToolProvider, Runnable workload) {
+        Objects.requireNonNull(jpackageToolProvider);
+        Objects.requireNonNull(workload);
+        ThrowingRunnable.toRunnable(Thread.ofVirtual().start(() -> {
+            useToolProviderByDefault(jpackageToolProvider);
+            workload.run();
+        })::join).run();
+    }
+
     public JPackageCommand useToolProvider(boolean v) {
         verifyMutable();
         withToolProvider = v;
@@ -1648,16 +1672,16 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
             actions.addAll(other.actions);
         }
 
-        void add(ThrowingConsumer<JPackageCommand> action) {
+        void add(ThrowingConsumer<JPackageCommand, ? extends Exception> action) {
             add(action, ActionRole.DEFAULT);
         }
 
-        void add(ThrowingConsumer<JPackageCommand> action, ActionRole role) {
+        void add(ThrowingConsumer<JPackageCommand, ? extends Exception> action, ActionRole role) {
             verifyMutable();
             actions.add(new Action(action, role));
         }
 
-        Stream<ThrowingConsumer<JPackageCommand>> actionsWithRole(ActionRole role) {
+        Stream<ThrowingConsumer<JPackageCommand, ? extends Exception>> actionsWithRole(ActionRole role) {
             Objects.requireNonNull(role);
             return actions.stream().filter(action -> {
                 return Objects.equals(action.role(), role);
@@ -1666,7 +1690,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
 
         private static final class Action implements Consumer<JPackageCommand> {
 
-            Action(ThrowingConsumer<JPackageCommand> impl, ActionRole role) {
+            Action(ThrowingConsumer<JPackageCommand, ? extends Exception> impl, ActionRole role) {
                 this.impl = Objects.requireNonNull(impl);
                 this.role = Objects.requireNonNull(role);
             }
@@ -1675,7 +1699,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
                 return role;
             }
 
-            ThrowingConsumer<JPackageCommand> impl() {
+            ThrowingConsumer<JPackageCommand, ? extends Exception> impl() {
                 return impl;
             }
 
@@ -1688,7 +1712,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
             }
 
             private final ActionRole role;
-            private final ThrowingConsumer<JPackageCommand> impl;
+            private final ThrowingConsumer<JPackageCommand, ? extends Exception> impl;
             private boolean executed;
         }
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageStringBundle.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageStringBundle.java
index cdf2855faef..9425b84472c 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageStringBundle.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageStringBundle.java
@@ -26,7 +26,7 @@ package jdk.jpackage.test;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.MessageFormat;
-import static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
+import static jdk.jpackage.internal.util.function.ExceptionBox.toUnchecked;
 
 public enum JPackageStringBundle {
 
@@ -40,7 +40,7 @@ public enum JPackageStringBundle {
             i18nClass_getString = i18nClass.getDeclaredMethod("getString", String.class);
             i18nClass_getString.setAccessible(true);
         } catch (ClassNotFoundException|NoSuchMethodException ex) {
-            throw rethrowUnchecked(ex);
+            throw toUnchecked(ex);
         }
     }
 
@@ -51,7 +51,7 @@ public enum JPackageStringBundle {
         try {
             return (String)i18nClass_getString.invoke(i18nClass, key);
         } catch (IllegalAccessException|InvocationTargetException ex) {
-            throw rethrowUnchecked(ex);
+            throw toUnchecked(ex);
         }
     }
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java
index 09a46ecb7d1..e649adcf4b5 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java
index 89468ef7f86..15d96311d98 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java
@@ -102,7 +102,7 @@ public final class LauncherVerifier {
         EXECUTE_LAUNCHER(LauncherVerifier::executeLauncher),
         ;
 
-        Action(ThrowingBiConsumer<LauncherVerifier, JPackageCommand> action) {
+        Action(ThrowingBiConsumer<LauncherVerifier, JPackageCommand, ? extends Exception> action) {
             this.action = ThrowingBiConsumer.toBiConsumer(action);
         }
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
index e795f7c9760..3b02a3f6a69 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
@@ -645,7 +645,7 @@ public final class LinuxHelper {
     }
 
     private static void withTestFileAssociationsFile(FileAssociations fa,
-            ThrowingConsumer<Path> consumer) {
+            ThrowingConsumer<Path, ? extends Exception> consumer) {
         boolean iterated[] = new boolean[] { false };
         PackageTest.withFileAssociationsTestRuns(fa, (testRun, testFiles) -> {
             if (!iterated[0]) {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
index caeb0a206fc..92d9fa0bd44 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
@@ -43,6 +43,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.HashMap;
@@ -66,6 +67,7 @@ import javax.xml.stream.XMLStreamWriter;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
 import jdk.jpackage.internal.RetryExecutor;
+import jdk.jpackage.internal.util.FileUtils;
 import jdk.jpackage.internal.util.PListReader;
 import jdk.jpackage.internal.util.PathUtils;
 import jdk.jpackage.internal.util.XmlUtils;
@@ -73,20 +75,27 @@ import jdk.jpackage.internal.util.function.ThrowingConsumer;
 import jdk.jpackage.internal.util.function.ThrowingSupplier;
 import jdk.jpackage.test.MacSign.CertificateRequest;
 import jdk.jpackage.test.PackageTest.PackageHandlers;
+import jdk.jpackage.test.RunnablePackageTest.Action;
 import org.xml.sax.SAXException;
 
 public final class MacHelper {
 
     public static void withExplodedDmg(JPackageCommand cmd,
-            ThrowingConsumer<Path> consumer) {
+            ThrowingConsumer<Path, ? extends Exception> consumer) {
         cmd.verifyIsOfType(PackageType.MAC_DMG);
 
+        // Mount DMG under random temporary folder to avoid collisions when
+        // mounting DMG with same name asynchroniusly multiple times.
+        // See JDK-8373105. "hdiutil" does not handle such cases very good.
+        final var mountRoot = TKit.createTempDirectory("mountRoot");
+
         // Explode DMG assuming this can require interaction, thus use `yes`.
         String attachCMD[] = {
             "sh", "-c",
             String.join(" ", "yes", "|", "/usr/bin/hdiutil", "attach",
-                        JPackageCommand.escapeAndJoin(
-                                cmd.outputBundle().toString()), "-plist")};
+                    JPackageCommand.escapeAndJoin(cmd.outputBundle().toString()),
+                    "-mountroot", PathUtils.normalizedAbsolutePathString(mountRoot),
+                    "-nobrowse", "-plist")};
         RetryExecutor attachExecutor = new RetryExecutor();
         try {
             // 10 times with 6 second delays.
@@ -429,31 +438,29 @@ public final class MacHelper {
 
         final var runtimeBundleWorkDir = TKit.createTempDirectory("runtime-bundle");
 
-        final var unpackadeRuntimeBundleDir = runtimeBundleWorkDir.resolve("unpacked");
+        final var unpackedRuntimeBundleDir = runtimeBundleWorkDir.resolve("unpacked");
 
-        var cmd = new JPackageCommand()
-                .useToolProvider(true)
-                .ignoreDefaultRuntime(true)
-                .dumpOutput(true)
-                .setPackageType(PackageType.MAC_DMG)
-                .setArgumentValue("--name", "foo")
-                .addArguments("--runtime-image", runtimeImage)
-                .addArguments("--dest", runtimeBundleWorkDir);
+        // Preferably create a DMG bundle, fallback to PKG if DMG packaging is disabled.
+        new PackageTest().forTypes(Stream.of(
+                PackageType.MAC_DMG,
+                PackageType.MAC_PKG
+        ).filter(PackageType::isEnabled).findFirst().orElseThrow(PackageType::throwSkippedExceptionIfNativePackagingUnavailable))
+        .addInitializer(cmd -> {
+            cmd.useToolProvider(true)
+            .ignoreDefaultRuntime(true)
+            .dumpOutput(true)
+            .removeArgumentWithValue("--input")
+            .setArgumentValue("--name", "foo")
+            .setArgumentValue("--runtime-image", runtimeImage)
+            .setArgumentValue("--dest", runtimeBundleWorkDir);
 
-        mutator.ifPresent(cmd::mutate);
+            mutator.ifPresent(cmd::mutate);
+        }).addInstallVerifier(cmd -> {
+            final Path bundleRoot = cmd.pathToUnpackedPackageFile(cmd.appInstallationDirectory());
+            FileUtils.copyRecursive(bundleRoot, unpackedRuntimeBundleDir, LinkOption.NOFOLLOW_LINKS);
+        }).run(Action.CREATE, Action.UNPACK, Action.VERIFY_INSTALL, Action.PURGE);
 
-        cmd.execute();
-
-        MacHelper.withExplodedDmg(cmd, dmgImage -> {
-            if (dmgImage.endsWith(cmd.appInstallationDirectory().getFileName())) {
-                Executor.of("cp", "-R")
-                        .addArgument(dmgImage)
-                        .addArgument(unpackadeRuntimeBundleDir)
-                        .execute(0);
-            }
-        });
-
-        return unpackadeRuntimeBundleDir;
+        return unpackedRuntimeBundleDir;
     }
 
     public static Consumer<JPackageCommand> useKeychain(MacSign.ResolvedKeychain keychain) {
@@ -496,7 +503,7 @@ public final class MacHelper {
 
         @Override
         public String toString() {
-            var sb = new StringBuffer();
+            var sb = new StringBuilder();
             applyTo((optionName, _) -> {
                 sb.append(String.format("{%s: %s}", optionName, certRequest));
             });
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
index 7d2bb908edb..15249c51887 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
@@ -42,6 +42,7 @@ import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
 import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateExpiredException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.CertificateNotYetValidException;
@@ -526,7 +527,7 @@ public final class MacSign {
 
     private record CertificateStats(List<ResolvedCertificateRequest> allResolvedCertificateRequests,
             List<CertificateRequest> knownCertificateRequests,
-            Map<X509Certificate, Throwable> unmappedCertificates) {
+            Map<X509Certificate, Exception> unmappedCertificates) {
 
         static CertificateStats get(KeychainWithCertsSpec spec) {
             return CACHE.computeIfAbsent(spec, CertificateStats::create);
@@ -560,7 +561,7 @@ public final class MacSign {
         private static CertificateStats create(KeychainWithCertsSpec spec) {
             final var allCertificates = spec.keychain().findCertificates();
             final List<ResolvedCertificateRequest> allResolvedCertificateRequests = new ArrayList<>();
-            final Map<X509Certificate, Throwable> unmappedCertificates = new HashMap<>();
+            final Map<X509Certificate, Exception> unmappedCertificates = new HashMap<>();
 
             withTempDirectory(workDir -> {
                 for (final var cert : allCertificates) {
@@ -568,13 +569,7 @@ public final class MacSign {
                     try {
                         resolvedCertificateRequest = new ResolvedCertificateRequest(cert);
                     } catch (RuntimeException ex) {
-                        final Throwable t;
-                        if (ex instanceof ExceptionBox) {
-                            t = ex.getCause();
-                        } else {
-                            t = ex;
-                        }
-                        unmappedCertificates.put(cert, t);
+                        unmappedCertificates.put(cert, ExceptionBox.unbox(ex));
                         continue;
                     }
 
@@ -635,13 +630,13 @@ public final class MacSign {
         SHA1(20, () -> MessageDigest.getInstance("SHA-1")),
         SHA256(32, () -> MessageDigest.getInstance("SHA-256"));
 
-        DigestAlgorithm(int hashLength, ThrowingSupplier<MessageDigest> createDigest) {
+        DigestAlgorithm(int hashLength, ThrowingSupplier<MessageDigest, NoSuchAlgorithmException> createDigest) {
             this.hashLength = hashLength;
             this.createDigest = createDigest;
         }
 
         final int hashLength;
-        final ThrowingSupplier<MessageDigest> createDigest;
+        final ThrowingSupplier<MessageDigest, NoSuchAlgorithmException> createDigest;
     }
 
     public record CertificateHash(byte[] value, DigestAlgorithm alg) {
@@ -1223,7 +1218,7 @@ public final class MacSign {
         }).map(KeychainWithCertsSpec::keychain);
     }
 
-    private static void withTempDirectory(ThrowingConsumer<Path> callback) {
+    private static void withTempDirectory(ThrowingConsumer<Path, ? extends Exception> callback) {
         try {
             final var dir = Files.createTempDirectory("jdk.jpackage.test");
             try {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java
index 123fba56b71..1f37829791e 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java
@@ -262,8 +262,8 @@ public final class MacSignVerify {
                     signIdentities.add(new SignIdentity(name, fingerprint));
                 } while (lineIt.hasNext());
                 return signIdentities;
-            } catch (Throwable t) {
-                t.printStackTrace();
+            } catch (Exception ex) {
+                ex.printStackTrace();
                 reportUnexpectedCommandOutcome(exec.getPrintableCommandLine(), result);
                 return null; // Unreachable
             }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Main.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Main.java
index fa8fe166f5a..fee5b65c897 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Main.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Main.java
@@ -37,15 +37,16 @@ import java.util.List;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
+import jdk.jpackage.internal.util.function.ExceptionBox;
 
 
 public final class Main {
 
-    public static void main(String... args) throws Throwable {
+    public static void main(String... args) throws Exception {
         main(TestBuilder.build(), args);
     }
 
-    public static void main(TestBuilder.Builder builder, String... args) throws Throwable {
+    public static void main(TestBuilder.Builder builder, String... args) throws Exception {
         boolean listTests = false;
         List<TestInstance> tests = new ArrayList<>();
         try (TestBuilder testBuilder = builder.testConsumer(tests::add).create()) {
@@ -86,8 +87,8 @@ public final class Main {
                 try {
                     testBuilder.processCmdLineArg(arg);
                     success = true;
-                } catch (Throwable throwable) {
-                    TKit.unbox(throwable);
+                } catch (Exception ex) {
+                    throw ExceptionBox.unbox(ex);
                 } finally {
                     if (!success) {
                         TKit.log(String.format("Error processing parameter=[%s]", arg));
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MethodCall.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MethodCall.java
index 73d0a7fe495..b27531d0572 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MethodCall.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MethodCall.java
@@ -40,7 +40,7 @@ import java.util.stream.Stream;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
 import jdk.jpackage.test.TestInstance.TestDesc;
 
-class MethodCall implements ThrowingConsumer<Object> {
+class MethodCall implements ThrowingConsumer<Object, Exception> {
 
     MethodCall(Object[] instanceCtorArgs, Method method, Object ... args) {
         Objects.requireNonNull(instanceCtorArgs);
@@ -107,7 +107,7 @@ class MethodCall implements ThrowingConsumer<Object> {
     }
 
     @Override
-    public void accept(Object thiz) throws Throwable {
+    public void accept(Object thiz) throws Exception {
         method.invoke(thiz, methodArgs);
     }
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MsiDatabase.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MsiDatabase.java
index 87236575e2e..6b3fae07d41 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MsiDatabase.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MsiDatabase.java
@@ -213,7 +213,7 @@ final class MsiDatabase {
 
         Objects.requireNonNull(str);
         Objects.requireNonNull(callback);
-        var sb = new StringBuffer();
+        var sb = new StringBuilder();
         var m = FORMATTED_STRING_TOKEN.matcher(str);
         while (m.find()) {
             var token = m.group();
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ObjectMapper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ObjectMapper.java
index f35e255951e..126d0e07f00 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ObjectMapper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ObjectMapper.java
@@ -24,7 +24,7 @@ package jdk.jpackage.test;
 
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toSet;
-import static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
+import static jdk.jpackage.internal.util.function.ExceptionBox.toUnchecked;
 import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
 import static jdk.jpackage.internal.util.function.ThrowingRunnable.toRunnable;
 import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
@@ -283,7 +283,7 @@ public final class ObjectMapper {
         try {
             return m.invoke(obj);
         } catch (IllegalAccessException ex) {
-            throw rethrowUnchecked(ex);
+            throw toUnchecked(ex);
         } catch (InvocationTargetException ex) {
             return map(ex.getTargetException());
         }
@@ -724,7 +724,7 @@ public final class ObjectMapper {
                 }
                 xml.writeEndElement();
             } catch (Exception ex) {
-                rethrowUnchecked(ex);
+                throw toUnchecked(ex);
             }
         }
 
@@ -740,7 +740,7 @@ public final class ObjectMapper {
                 }
                 xml.writeEndElement();
             } catch (Exception ex) {
-                rethrowUnchecked(ex);
+                throw toUnchecked(ex);
             }
         }
     }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
index 5b3815510ce..2e4f11d056f 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
@@ -22,7 +22,7 @@
  */
 package jdk.jpackage.test;
 
-import static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
+import static jdk.jpackage.internal.util.function.ExceptionBox.toUnchecked;
 import static jdk.jpackage.internal.util.function.ThrowingBiConsumer.toBiConsumer;
 import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
 import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
@@ -143,7 +143,7 @@ public final class PackageTest extends RunnablePackageTest {
         return this;
     }
 
-    private PackageTest addInitializer(ThrowingConsumer<JPackageCommand> v, String id) {
+    private PackageTest addInitializer(ThrowingConsumer<JPackageCommand, ? extends Exception> v, String id) {
         Objects.requireNonNull(v);
         if (id != null) {
             if (namedInitializers.contains(id)) {
@@ -156,11 +156,11 @@ public final class PackageTest extends RunnablePackageTest {
         return this;
     }
 
-    private PackageTest addRunOnceInitializer(ThrowingRunnable v, String id) {
+    private PackageTest addRunOnceInitializer(ThrowingRunnable<? extends Exception> v, String id) {
         Objects.requireNonNull(v);
-        return addInitializer(new ThrowingConsumer<JPackageCommand>() {
+        return addInitializer(new ThrowingConsumer<JPackageCommand, Exception>() {
             @Override
-            public void accept(JPackageCommand unused) throws Throwable {
+            public void accept(JPackageCommand unused) throws Exception {
                 if (!executed) {
                     executed = true;
                     v.run();
@@ -171,21 +171,21 @@ public final class PackageTest extends RunnablePackageTest {
         }, id);
     }
 
-    public PackageTest addInitializer(ThrowingConsumer<JPackageCommand> v) {
+    public PackageTest addInitializer(ThrowingConsumer<JPackageCommand, ? extends Exception> v) {
         return addInitializer(v, null);
     }
 
-    public PackageTest addRunOnceInitializer(ThrowingRunnable v) {
+    public PackageTest addRunOnceInitializer(ThrowingRunnable<? extends Exception> v) {
         return addRunOnceInitializer(v, null);
     }
 
-    public PackageTest addBundleVerifier(ThrowingBiConsumer<JPackageCommand, Executor.Result> v) {
+    public PackageTest addBundleVerifier(ThrowingBiConsumer<JPackageCommand, Executor.Result, ? extends Exception> v) {
         Objects.requireNonNull(v);
         currentTypes.forEach(type -> handlers.get(type).addBundleVerifier(toBiConsumer(v)));
         return this;
     }
 
-    public PackageTest addBundleVerifier(ThrowingConsumer<JPackageCommand> v) {
+    public PackageTest addBundleVerifier(ThrowingConsumer<JPackageCommand, ? extends Exception> v) {
         Objects.requireNonNull(v);
         return addBundleVerifier((cmd, unused) -> toConsumer(v).accept(cmd));
     }
@@ -222,13 +222,13 @@ public final class PackageTest extends RunnablePackageTest {
         return this;
     }
 
-    public PackageTest addInstallVerifier(ThrowingConsumer<JPackageCommand> v) {
+    public PackageTest addInstallVerifier(ThrowingConsumer<JPackageCommand, ? extends Exception> v) {
         currentTypes.forEach(type -> handlers.get(type).addInstallVerifier(
                 toConsumer(v)));
         return this;
     }
 
-    public PackageTest addUninstallVerifier(ThrowingConsumer<JPackageCommand> v) {
+    public PackageTest addUninstallVerifier(ThrowingConsumer<JPackageCommand, ? extends Exception> v) {
         currentTypes.forEach(type -> handlers.get(type).addUninstallVerifier(
                 toConsumer(v)));
         return this;
@@ -259,7 +259,7 @@ public final class PackageTest extends RunnablePackageTest {
     }
 
     static void withFileAssociationsTestRuns(FileAssociations fa,
-            ThrowingBiConsumer<FileAssociations.TestRun, List<Path>> consumer) {
+            ThrowingBiConsumer<FileAssociations.TestRun, List<Path>, ? extends Exception> consumer) {
         Objects.requireNonNull(consumer);
         for (var testRun : fa.getTestRuns()) {
             TKit.withTempDirectory("fa-test-files", tempDir -> {
@@ -860,7 +860,7 @@ public final class PackageTest extends RunnablePackageTest {
                                 "Check the package has %d top installation directories",
                                 expectedRootCount));
             } catch (IOException ex) {
-                rethrowUnchecked(ex);
+                throw toUnchecked(ex);
             }
         }
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java
index be85c42eac9..085e782ea40 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java
@@ -60,7 +60,7 @@ public enum PackageType {
     PackageType(String packageName, String bundleSuffix, OperatingSystem os) {
         type  = Objects.requireNonNull(packageName);
         suffix = Objects.requireNonNull(bundleSuffix);
-        supported = isSupported(new BundlingOperationDescriptor(os, type, "create"));
+        supported = isSupported(new BundlingOperationDescriptor(os, type));
         enabled = supported && !Inner.DISABLED_PACKAGERS.contains(getType());
 
         if (suffix != null && enabled) {
@@ -102,11 +102,13 @@ public enum PackageType {
     }
 
     private static boolean isSupported(BundlingOperationDescriptor op) {
-        try {
-            return Inner.BUNDLING_ENV.configurationErrors(op).isEmpty();
-        } catch (NoSuchElementException ex) {
-            return false;
-        }
+        return Inner.BUNDLING_ENV.filter(bundlingEnv -> {
+            try {
+                return bundlingEnv.configurationErrors(op).isEmpty();
+            } catch (NoSuchElementException ex) {
+                return false;
+            }
+        }).isPresent();
     }
 
     private static Set<PackageType> orderedSet(PackageType... types) {
@@ -129,13 +131,13 @@ public enum PackageType {
                 TKit.tokenizeConfigProperty("disabledPackagers")).orElse(
                 TKit.isLinuxAPT() ? Set.of("rpm") : Collections.emptySet());
 
-        private static final BundlingEnvironment BUNDLING_ENV = ServiceLoader.load(
+        private static final Optional<BundlingEnvironment> BUNDLING_ENV = ServiceLoader.load(
                 ThrowingSupplier.toSupplier(() -> {
                     @SuppressWarnings("unchecked")
                     var reply = (Class<BundlingEnvironment>)Class.forName("jdk.jpackage.internal.cli.CliBundlingEnvironment");
                     return reply;
                 }).get(),
                 BundlingEnvironment.class.getClassLoader()
-        ).findFirst().orElseThrow();
+        ).findFirst();
     }
 }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/RunnablePackageTest.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/RunnablePackageTest.java
index 5337651bddc..a55efd43a88 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/RunnablePackageTest.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/RunnablePackageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
index 0afdf31ec68..47ab838f8d6 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
@@ -33,7 +33,6 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.UncheckedIOException;
-import java.lang.reflect.InvocationTargetException;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.LinkOption;
@@ -110,7 +109,7 @@ public final class TKit {
         throw throwUnknownPlatformError();
     }).get();
 
-    static void withExtraLogStream(ThrowingRunnable action) {
+    static void withExtraLogStream(ThrowingRunnable<? extends Exception> action) {
         if (state().extraLogStream != null) {
             ThrowingRunnable.toRunnable(action).run();
         } else {
@@ -120,19 +119,19 @@ public final class TKit {
         }
     }
 
-    static void withExtraLogStream(ThrowingRunnable action, PrintStream logStream) {
+    static void withExtraLogStream(ThrowingRunnable<? extends Exception> action, PrintStream logStream) {
         withNewState(action, stateBuilder -> {
             stateBuilder.extraLogStream(logStream);
         });
     }
 
-    public static void withMainLogStream(ThrowingRunnable action, PrintStream logStream) {
+    public static void withMainLogStream(ThrowingRunnable<? extends Exception> action, PrintStream logStream) {
         withNewState(action, stateBuilder -> {
             stateBuilder.mainLogStream(logStream);
         });
     }
 
-    public static void withStackTraceStream(ThrowingRunnable action, PrintStream logStream) {
+    public static void withStackTraceStream(ThrowingRunnable<? extends Exception> action, PrintStream logStream) {
         withNewState(action, stateBuilder -> {
             stateBuilder.stackTraceStream(logStream);
         });
@@ -146,7 +145,7 @@ public final class TKit {
         STATE.set(Objects.requireNonNull(v));
     }
 
-    private static void withNewState(ThrowingRunnable action, Consumer<State.Builder> stateBuilderMutator) {
+    private static void withNewState(ThrowingRunnable<? extends Exception> action, Consumer<State.Builder> stateBuilderMutator) {
         Objects.requireNonNull(action);
         Objects.requireNonNull(stateBuilderMutator);
 
@@ -198,7 +197,7 @@ public final class TKit {
         });
     }
 
-    static <T> T runAdhocTest(ThrowingSupplier<T> action) {
+    static <T> T runAdhocTest(ThrowingSupplier<T, ? extends Exception> action) {
         final List<T> box = new ArrayList<>();
         runAdhocTest(() -> {
             box.add(action.get());
@@ -206,7 +205,7 @@ public final class TKit {
         return box.getFirst();
     }
 
-    static void runAdhocTest(ThrowingRunnable action) {
+    static void runAdhocTest(ThrowingRunnable<? extends Exception> action) {
         Objects.requireNonNull(action);
 
         final Path workDir = toSupplier(() -> Files.createTempDirectory("jdk.jpackage-test")).get();
@@ -227,28 +226,20 @@ public final class TKit {
         runTests(List.of(test), Set.of(RunTestMode.FAIL_FAST));
     }
 
-    static Runnable ignoreExceptions(ThrowingRunnable action) {
+    static Runnable ignoreExceptions(ThrowingRunnable<? extends Exception> action) {
         return () -> {
             try {
                 try {
                     action.run();
-                } catch (Throwable ex) {
-                    unbox(ex);
+                } catch (Exception ex) {
+                    throw ExceptionBox.unbox(ex);
                 }
-            } catch (Throwable throwable) {
-                printStackTrace(throwable);
+            } catch (Exception | AssertionError t) {
+                printStackTrace(t);
             }
         };
     }
 
-    static void unbox(Throwable throwable) throws Throwable {
-        try {
-            throw throwable;
-        } catch (ExceptionBox | InvocationTargetException ex) {
-            unbox(ex.getCause());
-        }
-    }
-
     public static Path workDir() {
         return currentTest().workDir();
     }
@@ -440,7 +431,7 @@ public final class TKit {
         return createTempPath(role, Files::createFile);
     }
 
-    private static Path createTempPath(Path templatePath, ThrowingUnaryOperator<Path> createPath) {
+    private static Path createTempPath(Path templatePath, ThrowingUnaryOperator<Path, IOException> createPath) {
         if (templatePath.isAbsolute()) {
             throw new IllegalArgumentException();
         }
@@ -458,13 +449,11 @@ public final class TKit {
             return createPath.apply(path);
         } catch (IOException ex) {
             throw new UncheckedIOException(ex);
-        } catch (Throwable t) {
-            throw ExceptionBox.rethrowUnchecked(t);
         }
     }
 
     public static Path withTempDirectory(String role,
-            ThrowingConsumer<Path> action) {
+            ThrowingConsumer<Path, ? extends Exception> action) {
         final Path tempDir = ThrowingSupplier.toSupplier(
                 () -> createTempDirectory(role)).get();
         boolean keepIt = true;
@@ -1083,12 +1072,13 @@ public final class TKit {
     }
 
     /**
-     * Creates a directory by creating all nonexistent parent directories first
-     * just like java.nio.file.Files#createDirectories() and returns
-     * java.io.Closeable that will delete all created nonexistent parent
+     * Creates a directory by creating all nonexistent parent directories first just
+     * like
+     * {@link Files#createDirectories(Path, java.nio.file.attribute.FileAttribute...)}
+     * and returns java.io.Closeable that will delete all created nonexistent parent
      * directories.
      */
-    public static Closeable createDirectories(Path dir) throws IOException {
+    public static Closeable createDirectories(Path dir) {
         Objects.requireNonNull(dir);
 
         Collection<Path> dirsToDelete = new ArrayList<>();
@@ -1098,7 +1088,12 @@ public final class TKit {
             dirsToDelete.add(curDir);
             curDir = curDir.getParent();
         }
-        Files.createDirectories(dir);
+
+        try {
+            Files.createDirectories(dir);
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
 
         return new Closeable() {
             @Override
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestBuilder.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestBuilder.java
index 4009fe2f687..5f4547c701e 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestBuilder.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestBuilder.java
@@ -128,7 +128,7 @@ final class TestBuilder implements AutoCloseable {
         clear();
     }
 
-    void processCmdLineArg(String arg) throws Throwable {
+    void processCmdLineArg(String arg) throws Exception {
         int separatorIdx = arg.indexOf('=');
         final String argName;
         final String argValue;
@@ -140,7 +140,7 @@ final class TestBuilder implements AutoCloseable {
             argValue = null;
         }
         try {
-            ThrowingConsumer<String> argProcessor = argProcessors.get(argName);
+            var argProcessor = argProcessors.get(argName);
             if (argProcessor == null) {
                 throw new ParseException("Unrecognized");
             }
@@ -205,8 +205,8 @@ final class TestBuilder implements AutoCloseable {
     }
 
     private void createTestInstance(MethodCall testBody) {
-        final List<ThrowingConsumer<Object>> curBeforeActions;
-        final List<ThrowingConsumer<Object>> curAfterActions;
+        final List<ThrowingConsumer<Object, ? extends Exception>> curBeforeActions;
+        final List<ThrowingConsumer<Object, ? extends Exception>> curAfterActions;
 
         Method testMethod = testBody.getMethod();
         if (Stream.of(BeforeEach.class, AfterEach.class).anyMatch(
@@ -326,7 +326,7 @@ final class TestBuilder implements AutoCloseable {
     }
 
     // Wraps Method.invoke() into ThrowingRunnable.run()
-    private ThrowingConsumer<Object> wrap(Method method) {
+    private ThrowingConsumer<Object, ? extends Exception> wrap(Method method) {
         return (test) -> {
             Class<?> methodClass = method.getDeclaringClass();
             String methodName = String.join(".", methodClass.getName(),
@@ -375,13 +375,13 @@ final class TestBuilder implements AutoCloseable {
     }
 
     private final TestMethodSupplier testMethodSupplier;
-    private final Map<String, ThrowingConsumer<String>> argProcessors;
+    private final Map<String, ThrowingConsumer<String, ? extends Exception>> argProcessors;
     private final Consumer<TestInstance> testConsumer;
     private final Path workDirRoot;
     private final ClassLoader testClassLoader;
     private List<MethodCall> testGroup;
-    private List<ThrowingConsumer<Object>> beforeActions;
-    private List<ThrowingConsumer<Object>> afterActions;
+    private List<ThrowingConsumer<Object, ? extends Exception>> beforeActions;
+    private List<ThrowingConsumer<Object, ? extends Exception>> afterActions;
     private Set<String> excludedTests;
     private Set<String> includedTests;
     private String spaceSubstitute;
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java
index 4445a194ee7..3c622200249 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java
@@ -46,7 +46,7 @@ import jdk.jpackage.internal.util.function.ThrowingFunction;
 import jdk.jpackage.internal.util.function.ThrowingRunnable;
 import jdk.jpackage.internal.util.function.ThrowingSupplier;
 
-final class TestInstance implements ThrowingRunnable {
+final class TestInstance implements ThrowingRunnable<Exception> {
 
     static final class TestDesc {
         private TestDesc(Class<?> clazz, String functionName, String functionArgs, String instanceArgs) {
@@ -149,7 +149,7 @@ final class TestInstance implements ThrowingRunnable {
         private final String instanceArgs;
     }
 
-    TestInstance(ThrowingRunnable testBody, Path workDirRoot) {
+    TestInstance(ThrowingRunnable<? extends Exception> testBody, Path workDirRoot) {
         assertCount = 0;
         this.testConstructor = (unused) -> null;
         this.testBody = (unused) -> testBody.run();
@@ -160,8 +160,8 @@ final class TestInstance implements ThrowingRunnable {
         this.workDir = workDirRoot.resolve(createWorkDirPath(testDesc));
     }
 
-    TestInstance(MethodCall testBody, List<ThrowingConsumer<Object>> beforeActions,
-            List<ThrowingConsumer<Object>> afterActions, boolean dryRun, Path workDirRoot) {
+    TestInstance(MethodCall testBody, List<ThrowingConsumer<Object, ? extends Exception>> beforeActions,
+            List<ThrowingConsumer<Object, ? extends Exception>> afterActions, boolean dryRun, Path workDirRoot) {
         assertCount = 0;
         this.testConstructor = v -> ((MethodCall)v).newInstance();
         this.testBody = testBody;
@@ -226,7 +226,7 @@ final class TestInstance implements ThrowingRunnable {
     }
 
     @Override
-    public void run() throws Throwable {
+    public void run() throws Exception {
         final String fullName = fullName();
         TKit.log(String.format("[ RUN      ] %s", fullName));
         try {
@@ -333,10 +333,10 @@ final class TestInstance implements ThrowingRunnable {
     private Status status;
     private RuntimeException skippedTestException;
     private final TestDesc testDesc;
-    private final ThrowingFunction<ThrowingConsumer<Object>, Object> testConstructor;
-    private final ThrowingConsumer<Object> testBody;
-    private final List<ThrowingConsumer<Object>> beforeActions;
-    private final List<ThrowingConsumer<Object>> afterActions;
+    private final ThrowingFunction<ThrowingConsumer<Object, ? extends Exception>, Object, ? extends Exception> testConstructor;
+    private final ThrowingConsumer<Object, ? extends Exception> testBody;
+    private final List<ThrowingConsumer<Object, ? extends Exception>> beforeActions;
+    private final List<ThrowingConsumer<Object, ? extends Exception>> afterActions;
     private final boolean dryRun;
     private final Path workDir;
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WinExecutableIconVerifier.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WinExecutableIconVerifier.java
index 5110259e6f3..f4468fa9ab0 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WinExecutableIconVerifier.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WinExecutableIconVerifier.java
@@ -22,7 +22,7 @@
  */
 package jdk.jpackage.test;
 
-import static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
+import static jdk.jpackage.internal.util.function.ExceptionBox.toUnchecked;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -195,7 +195,7 @@ public final class WinExecutableIconVerifier {
             iconSwap.setAccessible(true);
         } catch (ClassNotFoundException | NoSuchMethodException
                 | SecurityException ex) {
-            throw rethrowUnchecked(ex);
+            throw toUnchecked(ex);
         }
     }
 
@@ -268,7 +268,7 @@ public final class WinExecutableIconVerifier {
                     }
                 }
             } catch (IllegalAccessException | InvocationTargetException ex) {
-                throw rethrowUnchecked(ex);
+                throw toUnchecked(ex);
             }
         } finally {
             executable.toFile().setWritable(false, true);
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
index 5e97b0d2dde..72b5dbc578b 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
@@ -22,7 +22,7 @@
  */
 package jdk.jpackage.test;
 
-import static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
+import static jdk.jpackage.internal.util.function.ExceptionBox.toUnchecked;
 import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
 
 import java.io.IOException;
@@ -634,7 +634,7 @@ public class WindowsHelper {
                 getShortPathWrapper.setAccessible(true);
             } catch (ClassNotFoundException | NoSuchMethodException
                     | SecurityException ex) {
-                throw rethrowUnchecked(ex);
+                throw toUnchecked(ex);
             }
         }
 
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DefaultBundlingEnvironmentTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DefaultBundlingEnvironmentTest.java
index ef5b118d7cf..35ab1fbec5e 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DefaultBundlingEnvironmentTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DefaultBundlingEnvironmentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java
index 6a84c8ea354..8623e5f064d 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PackagingPipelineTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PackagingPipelineTest.java
index 8168b876d2f..721e0802d16 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PackagingPipelineTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PackagingPipelineTest.java
@@ -23,7 +23,7 @@
 
 package jdk.jpackage.internal;
 
-import static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
+import static jdk.jpackage.internal.util.function.ExceptionBox.toUnchecked;
 import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
 import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -412,7 +412,7 @@ public class PackagingPipelineTest {
 
         final var expectedException = new Exception("foo");
         final var ex = testExceptionRethrow(expectedException, ExceptionBox.class, () -> {
-            rethrowUnchecked(expectedException);
+            throw toUnchecked(expectedException);
         });
         assertSame(expectedException, ex.getCause());
     }
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java
index 246b3722cbf..365a8a50b33 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java
@@ -23,6 +23,8 @@
 package jdk.jpackage.internal.cli;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -35,15 +37,23 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.UnaryOperator;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.JPackageException;
+import jdk.jpackage.internal.util.function.ExceptionBox;
 import jdk.jpackage.test.JUnitAdapter;
 import jdk.jpackage.test.TKit;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 public class MainTest extends JUnitAdapter.TestSrcInitializer {
 
@@ -53,6 +63,21 @@ public class MainTest extends JUnitAdapter.TestSrcInitializer {
         test.run();
     }
 
+    @ParameterizedTest
+    @MethodSource
+    public void test_ErrorReporter(ErrorReporterTestSpec test) {
+        test.run();
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"message.error-header", "message.advice-header"})
+    public void test_ErrorReporter_format(String key) {
+        var str = "Hello!";
+        var msg = I18N.format(key, str);
+        assertTrue(msg.contains(str));
+        assertNotEquals(str, msg);
+    }
+
     private static Collection<TestSpec> testOutput() {
         return Stream.of(
                 // Print the tool version
@@ -79,6 +104,73 @@ public class MainTest extends JUnitAdapter.TestSrcInitializer {
     }
 
 
+    private static List<ErrorReporterTestSpec> test_ErrorReporter() {
+        var data = new ArrayList<ErrorReporterTestSpec>();
+
+        for (var verbose : List.of(true, false)) {
+            for (var makeCause : List.<UnaryOperator<Exception>>of(
+                    ex -> ex,
+                    // UncheckedIOException
+                    ex -> {
+                        if (ex instanceof IOException ioex) {
+                            return new UncheckedIOException(ioex);
+                        } else {
+                            return null;
+                        }
+                    },
+                    // ExceptionBox
+                    ex -> {
+                        var rex = ExceptionBox.toUnchecked(ex);
+                        if (rex != ex) {
+                            return rex;
+                        } else {
+                            return null;
+                        }
+                    }
+            )) {
+                for (var expect : List.of(
+                        Map.entry(new IOException("I/O error"), true),
+                        Map.entry(new NullPointerException(), true),
+                        Map.entry(new JPackageException("Kaput!"), false),
+                        Map.entry(new ConfigException("It is broken", "Fix it!"), false),
+                        Map.entry(new ConfigException("It is broken. No advice how to fix it", (String)null), false),
+                        Map.entry(new Utils.ParseException("Malformed command line"), false),
+                        Map.entry(new StandardOption.AddLauncherIllegalArgumentException("Malformed value of --add-launcher option"), false)
+                )) {
+                    var cause = makeCause.apply(expect.getKey());
+                    if (cause == null) {
+                        continue;
+                    }
+
+                    var expectedOutput = new ArrayList<ExceptionFormatter>();
+                    if (expect.getValue()) {
+                        // An alien exception.
+                        expectedOutput.add(ExceptionFormatter.STACK_TRACE);
+                        expectedOutput.add(ExceptionFormatter.TO_STRING);
+                    } else {
+                        if (verbose) {
+                            expectedOutput.add(ExceptionFormatter.STACK_TRACE);
+                        }
+                        if (expect.getKey() instanceof ConfigException cex) {
+                            if (cex.getAdvice() != null) {
+                                expectedOutput.add(ExceptionFormatter.MESSAGE_WITH_ADVICE);
+                            } else {
+                                expectedOutput.add(ExceptionFormatter.GET_MESSAGE);
+                            }
+                        } else {
+                            expectedOutput.add(ExceptionFormatter.GET_MESSAGE);
+                        }
+                    }
+
+                    data.add(new ErrorReporterTestSpec(cause, expect.getKey(), verbose, expectedOutput));
+                }
+            }
+        }
+
+        return data;
+    }
+
+
     record TestSpec(List<String> args, int expectedExitCode, ExpectedOutput expectedStdout, ExpectedOutput expectedStderr) {
 
         TestSpec {
@@ -241,6 +333,97 @@ public class MainTest extends JUnitAdapter.TestSrcInitializer {
     }
 
 
+    private enum ExceptionFormatter {
+        GET_MESSAGE(errorMessage(Exception::getMessage)),
+        MESSAGE_WITH_ADVICE(ex -> {
+            var advice = Objects.requireNonNull(((ConfigException)ex).getAdvice());
+            var sb = new StringBuilder();
+            sb.append(GET_MESSAGE.format(ex));
+            sb.append(I18N.format("message.advice-header", advice));
+            sb.append(System.lineSeparator());
+            return sb.toString();
+        }),
+        TO_STRING(errorMessage(Exception::toString)),
+        STACK_TRACE(ex -> {
+            var sink = new StringWriter();
+            try (var pw = new PrintWriter(sink)) {
+                ex.printStackTrace(pw);
+            }
+            return sink.toString();
+        })
+        ;
+
+        ExceptionFormatter(Function<Exception, String> formatter) {
+            this.formatter = Objects.requireNonNull(formatter);
+        }
+
+        String format(Exception v) {
+            return formatter.apply(v);
+        }
+
+        private static Function<Exception, String> errorMessage(Function<Exception, String> formatter) {
+            Objects.requireNonNull(formatter);
+            return ex -> {
+                var msg = formatter.apply(ex);
+                return I18N.format("message.error-header", msg) + System.lineSeparator();
+            };
+        }
+
+        private final Function<Exception, String> formatter;
+    }
+
+
+    record ErrorReporterTestSpec(Exception cause, Exception expect, boolean verbose, List<ExceptionFormatter> expectOutput) {
+
+        ErrorReporterTestSpec {
+            Objects.requireNonNull(cause);
+            Objects.requireNonNull(expect);
+            Objects.requireNonNull(expectOutput);
+        }
+
+        ErrorReporterTestSpec(Exception cause, boolean verbose, List<ExceptionFormatter> expectOutput) {
+            this(cause, cause, verbose, expectOutput);
+        }
+
+        @Override
+        public String toString() {
+            var tokens = new ArrayList<String>();
+
+            if (cause == expect) {
+                tokens.add(cause.toString());
+            } else {
+                tokens.add(String.format("[%s] => [%s]", cause, expect));
+            }
+
+            tokens.add(expectOutput.stream().map(Enum::name).collect(Collectors.joining("+")));
+
+            if (verbose) {
+                tokens.add("verbose");
+            }
+
+            return tokens.stream().collect(Collectors.joining("; "));
+        }
+
+        void run() {
+            var sink = new StringWriter();
+
+            try (var pw = new PrintWriter(sink)) {
+                new Main.ErrorReporter(t -> {
+                    t.printStackTrace(pw);
+                }, msg -> {
+                    pw.println(msg);
+                }, verbose).reportError(cause);
+            }
+
+            var expected = expectOutput.stream().map(formatter -> {
+                return formatter.format(expect);
+            }).collect(Collectors.joining(""));
+
+            assertEquals(expected, sink.toString());
+        }
+    }
+
+
     private static TestSpec.Builder build() {
         return new TestSpec.Builder();
     }
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.java
index a46cb20815f..a85b5015e73 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.java
@@ -40,12 +40,10 @@ import java.util.stream.Stream;
 import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.internal.model.BundlingOperationDescriptor;
 import jdk.jpackage.internal.util.Result;
+import jdk.jpackage.internal.util.function.ExceptionBox;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.JUnitAdapter;
-import jdk.jpackage.test.JavaTool;
 import jdk.jpackage.test.TKit;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.condition.EnabledIf;
@@ -88,9 +86,8 @@ import org.junit.jupiter.api.condition.EnabledIf;
 @EnabledIf("jtregErrorTestAvailable")
 public class OptionsValidationFailTest {
 
-    @BeforeAll
-    public static void setCustomJPackageToolProvider() {
-        JPackageCommand.useToolProviderByDefault(new ToolProvider() {
+    private static ToolProvider createToolProvider() {
+        return new ToolProvider() {
 
             @Override
             public String name() {
@@ -150,17 +147,11 @@ public class OptionsValidationFailTest {
                 }
 
             };
-        });
-    }
-
-    @AfterAll
-    public static void resetJPackageToolProvider() {
-        Optional.ofNullable(JavaTool.JPACKAGE.asToolProvider()).ifPresentOrElse(
-                JPackageCommand::useToolProviderByDefault, JPackageCommand::useExecutableByDefault);
+        };
     }
 
     @TestFactory
-    Stream<DynamicTest> getTestCasesFromErrorTest() throws Throwable {
+    Stream<DynamicTest> getTestCasesFromErrorTest() throws Exception {
         final var jpackageTestsUnnamedModule = JUnitAdapter.class.getModule();
 
         final var testClassloader = new InMemoryClassLoader(Stream.of(
@@ -201,11 +192,23 @@ public class OptionsValidationFailTest {
             return "--jpt-include=" + testDesc;
         });
 
+        final var jpackageToolProviderMock = createToolProvider();
+
         return JUnitAdapter.createJPackageTests(testClassloader, Stream.of(
                 defaultExcludes,
                 defaultIncludes,
                 Stream.of("--jpt-run=ErrorTest")
-        ).flatMap(x -> x).toArray(String[]::new));
+        ).flatMap(x -> x).toArray(String[]::new)).map(dynamicTest -> {
+            return DynamicTest.dynamicTest(dynamicTest.getDisplayName(), () -> {
+                JPackageCommand.withToolProvider(jpackageToolProviderMock, () -> {
+                    try {
+                        dynamicTest.getExecutable().execute();
+                    } catch (Throwable t) {
+                        throw ExceptionBox.toUnchecked(ExceptionBox.unbox(t));
+                    }
+                });
+            });
+        });
     }
 
     private static boolean jtregErrorTestAvailable() {
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/ResultTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/ResultTest.java
new file mode 100644
index 00000000000..ca8f7aad102
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/ResultTest.java
@@ -0,0 +1,602 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import jdk.jpackage.internal.util.function.ExceptionBox;
+import jdk.jpackage.internal.util.function.ThrowingSupplier;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class ResultTest {
+
+    @Test
+    public void test_ctor_with_value() {
+        var result = new Result<String>(Optional.of("foo"), List.of());
+
+        assertTrue(result.hasValue());
+        assertFalse(result.hasErrors());
+        assertEquals(Optional.of("foo"), result.value());
+        assertEquals(List.of(), result.errors());
+        assertEquals(Optional.empty(), result.firstError());
+    }
+
+    @Test
+    public void test_ctor_with_errors() {
+        var ex = new Exception("Kaput!");
+        var result = new Result<String>(Optional.empty(), List.of(ex));
+
+        assertFalse(result.hasValue());
+        assertTrue(result.hasErrors());
+        assertEquals(Optional.empty(), result.value());
+        assertEquals(List.of(ex), result.errors());
+        assertEquals(Optional.of(ex), result.firstError());
+    }
+
+    @Test
+    public void test_ctor_invalid_npe() {
+        assertThrowsExactly(NullPointerException.class, () -> {
+            new Result<String>(Optional.of("foo"), null);
+        });
+
+        assertThrowsExactly(NullPointerException.class, () -> {
+            new Result<String>(null, List.of(new Exception()));
+        });
+
+        assertThrowsExactly(NullPointerException.class, () -> {
+            new Result<String>(null, null);
+        });
+    }
+
+    @Test
+    public void test_ctor_invalid_both_empty() {
+        var ex = assertThrowsExactly(IllegalArgumentException.class, () -> {
+            new Result<String>(Optional.empty(), List.of());
+        });
+        assertEquals("'value' and 'errors' cannot both be non-empty or both be empty", ex.getMessage());
+    }
+
+    @Test
+    public void test_ctor_invalid_both_non_empty() {
+        var ex = assertThrowsExactly(IllegalArgumentException.class, () -> {
+            new Result<String>(Optional.of("foo"), List.of(new Exception()));
+        });
+        assertEquals("'value' and 'errors' cannot both be non-empty or both be empty", ex.getMessage());
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_ofValue(boolean valid) {
+        if (valid) {
+            assertTrue(Result.ofValue("foo").hasValue());
+        } else {
+            assertThrowsExactly(NullPointerException.class, () -> {
+                Result.ofValue(null);
+            });
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_ofError(boolean valid) {
+        if (valid) {
+            var err = new Exception("foo");
+            var result = Result.ofError(err);
+            assertEquals(List.of(err), result.errors());
+        } else {
+            assertThrowsExactly(NullPointerException.class, () -> {
+                Result.ofError(null);
+            });
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_ofErrors(boolean valid) {
+        if (valid) {
+            var errors = List.of(new Exception("foo"), new IllegalArgumentException("bar"));
+            var result = Result.ofErrors(errors);
+            assertSame(errors, result.errors());
+        } else {
+            assertThrowsExactly(NullPointerException.class, () -> {
+                Result.ofErrors(null);
+            });
+
+            assertThrowsExactly(NullPointerException.class, () -> {
+                var errors = new ArrayList<Exception>();
+                errors.add(new Exception());
+                errors.add(null);
+                Result.ofErrors(errors);
+            });
+        }
+    }
+
+    @Test
+    public void test_of() {
+        assertEquals("foo", Result.<String>of(() -> {
+            return "foo";
+        }).orElseThrow());
+    }
+
+    @Test
+    public void test_of_null_value() {
+        assertThrowsExactly(NullPointerException.class, () -> {
+            Result.<String>of(() -> {
+                return null;
+            });
+        });
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_of_throws(boolean declaredExceptionType) {
+
+        Exception cause;
+        if (declaredExceptionType) {
+            cause = new IOException("foo");
+        } else {
+            cause = new UnsupportedOperationException("bar");
+        }
+
+        ThrowingSupplier<String, IOException> supplier = () -> {
+            if (declaredExceptionType) {
+                throw (IOException)cause;
+            } else {
+                throw (UnsupportedOperationException)cause;
+            }
+        };
+
+        if (declaredExceptionType) {
+            var result = Result.<String, IOException>of(supplier, IOException.class);
+            assertSame(cause, result.firstError().orElseThrow());
+            assertEquals(1, result.errors().size());
+        } else {
+            var ex = assertThrowsExactly(cause.getClass(), () -> {
+                Result.<String, IOException>of(supplier, IOException.class);
+            });
+            assertSame(cause, ex);
+        }
+    }
+
+    @Test
+    public void test_orElseThrow_hasValue() {
+        assertEquals("foo", Result.ofValue("foo").orElseThrow());
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_orElseThrow(boolean uncheckedException) {
+        Exception ex;
+        Class<? extends Exception> expectedType;
+        if (uncheckedException) {
+            ex = new RuntimeException("Kaput!");
+            expectedType = ex.getClass();
+        } else {
+            ex = new Exception("Kaput!");
+            expectedType = ExceptionBox.class;
+        }
+
+        var actual = assertThrowsExactly(expectedType, Result.ofError(ex)::orElseThrow);
+
+        if (uncheckedException) {
+            assertSame(ex, actual);
+        } else {
+            assertSame(ex, actual.getCause());
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void test_map_and_flatMap(MapTestSpec spec) {
+        spec.run();
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_peekValue(boolean hasValue) {
+        var pickedValue = Slot.<String>createEmpty();
+
+        Consumer<String> consumer = v -> {
+            assertNotNull(v);
+            assertTrue(pickedValue.find().isEmpty());
+            pickedValue.set(v);
+        };
+
+        Result<String> result;
+        if (hasValue) {
+            result = Result.ofValue("foo");
+        } else {
+            result = Result.ofError(new Exception("foo"));
+        }
+        result.peekValue(consumer);
+
+        if (hasValue) {
+            assertEquals("foo", pickedValue.get());
+        } else {
+            assertTrue(pickedValue.find().isEmpty());
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_peekErrors(boolean hasValue) {
+        var pickedErrors = Slot.<Collection<? extends Exception>>createEmpty();
+
+        Consumer<Collection<? extends Exception>> consumer = v -> {
+            assertNotNull(v);
+            assertTrue(pickedErrors.find().isEmpty());
+            pickedErrors.set(v);
+        };
+
+        Result<String> result;
+        if (hasValue) {
+            result = Result.ofValue("foo");
+        } else {
+            result = Result.ofErrors(List.of(new Exception("foo"), new IOException("bar")));
+        }
+        result.peekErrors(consumer);
+
+        if (hasValue) {
+            assertTrue(pickedErrors.find().isEmpty());
+        } else {
+            assertSame(result.errors(), pickedErrors.get());
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_mapErrors(boolean hasValue) {
+        Result<String> result;
+        if (hasValue) {
+            result = Result.ofValue("foo");
+        } else {
+            result = Result.ofErrors(List.of(new Exception("foo"), new IOException("bar")));
+        }
+
+        if (hasValue) {
+            var ex = assertThrowsExactly(IllegalStateException.class, result::mapErrors);
+            assertEquals("Can not map errors from a result without errors", ex.getMessage());
+        } else {
+            assertSame(result, result.mapErrors());
+        }
+    }
+
+    @Test
+    public void test_allHaveValues_empty() {
+        assertTrue(Result.allHaveValues());
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_allHaveValues(boolean expected) {
+        if (expected) {
+            assertTrue(Result.allHaveValues(Result.ofValue("foo"), Result.ofValue(37)));
+        } else {
+            assertFalse(Result.allHaveValues(Result.ofValue("foo"), Result.ofError(new Exception())));
+        }
+    }
+
+    enum MapFunctionType {
+        MAP,
+        FLAT_MAP,
+        ;
+    }
+
+    enum MapFunctionOutcome {
+        RETURN_NON_NULL,
+        RETURN_NULL,
+        THROW,
+        FLAT_MAP_NEW_ERRORS(MapFunctionType.FLAT_MAP),
+        ;
+
+        MapFunctionOutcome(MapFunctionType... supportedTypes) {
+            this.supportedTypes = Set.of(supportedTypes);
+        }
+
+        MapFunctionOutcome() {
+            this(MapFunctionType.values());
+        }
+
+        private final Set<MapFunctionType> supportedTypes;
+    }
+
+    record MapTestSpec(boolean hasValue, MapFunctionOutcome outcome, MapFunctionType type) {
+        MapTestSpec {
+            Objects.requireNonNull(outcome);
+            Objects.requireNonNull(type);
+        }
+
+        @Override
+        public String toString() {
+            var tokens = new ArrayList<String>();
+            tokens.add(outcome.name());
+            if (type == MapFunctionType.FLAT_MAP) {
+                tokens.add("flatMap");
+            }
+            if (!hasValue) {
+                tokens.add("no-value");
+            }
+            return String.join(", ", tokens);
+        }
+
+        void run() {
+            var builder = MapTest.<Integer, String>build();
+            if (hasValue) {
+                builder.initialValue(100);
+            }
+
+            Function<Integer, String> plainMapper;
+            switch (outcome) {
+                case RETURN_NON_NULL -> {
+                    if (hasValue) {
+                        builder.expectValue("200");
+                    }
+                    plainMapper = v -> {
+                        return String.valueOf(v * 2);
+                    };
+                }
+                case RETURN_NULL -> {
+                    builder.expectExceptionOfType(NullPointerException.class);
+                    plainMapper = _ -> {
+                        return null;
+                    };
+                }
+                case THROW -> {
+                    var cause = new UnsupportedOperationException("Unsupported");
+                    builder.expectException(cause);
+                    plainMapper = _ -> {
+                        throw cause;
+                    };
+                }
+                case FLAT_MAP_NEW_ERRORS -> {
+                    if (hasValue) {
+                        // Just a stub to make `builder.create()` pass.
+                        builder.expectValue("");
+                    }
+                    var mappedResult = Result.<String>ofError(new UnsupportedOperationException("Whoopsy-daisy"));
+                    var test = builder.create().copyWithMappedValue(mappedResult);
+                    test.flatMap(v -> {
+                        return mappedResult;
+                    });
+                    return;
+                }
+                default -> {
+                    throw ExceptionBox.reachedUnreachable();
+                }
+            }
+
+            var test = builder.create();
+
+            switch (type) {
+                case MAP -> {
+                    test.map(plainMapper);
+                }
+                case FLAT_MAP -> {
+                    test.flatMap(v -> {
+                        return Optional.ofNullable(plainMapper.apply(v)).map(Result::ofValue).orElse(null);
+                    });
+                }
+            }
+        }
+    }
+
+    private static List<MapTestSpec> test_map_and_flatMap() {
+        var data = new ArrayList<MapTestSpec>();
+        for (var type : MapFunctionType.values()) {
+            for (var outcome : MapFunctionOutcome.values()) {
+                if (outcome.supportedTypes.contains(type)) {
+                    for (var hasValue : List.of(true, false)) {
+                        data.add(new MapTestSpec(hasValue, outcome, type));
+                    }
+                }
+            }
+        }
+        return data;
+    }
+
+    private static final class Counter<T, U> implements Function<T, U> {
+
+        Counter(Function<T, U> impl) {
+            this.impl = Objects.requireNonNull(impl);
+        }
+
+        @Override
+        public U apply(T v) {
+            counter++;
+            return impl.apply(v);
+        }
+
+        int count() {
+            return counter;
+        }
+
+        private int counter;
+        private final Function<T, U> impl;
+    }
+
+    private record MapTest<T, U>(
+            Result<T> initialValue,
+            Optional<Result<U>> mappedValue,
+            Optional<Exception> expectedException,
+            Optional<Class<? extends Exception>> expectedExceptionType) {
+
+        MapTest {
+            Objects.requireNonNull(initialValue);
+            Objects.requireNonNull(mappedValue);
+            Objects.requireNonNull(expectedException);
+            Objects.requireNonNull(expectedExceptionType);
+
+            if (expectedExceptionType.isPresent() && mappedValue.isPresent()) {
+                // Bad configuration: the mapping operation is expected to throw,
+                // but it also expects it to return a value.
+                throw new IllegalArgumentException();
+            }
+
+            if (expectedExceptionType.isEmpty() && mappedValue.isEmpty()) {
+                // Bad configuration: the mapping operation is expected to return normally (not to throw),
+                // but it also doesn't expect a mapped value.
+                throw new IllegalArgumentException();
+            }
+
+            if (initialValue.hasErrors() && mappedValue.map(Result::hasValue).orElse(false)) {
+                // Bad configuration: the initial value has errors but they expect a mapped value without errors.
+                throw new IllegalArgumentException();
+            }
+
+            expectedException.map(Object::getClass).ifPresent(expectedExpectedExceptionType -> {
+                var configuredExpectedExceptionType = expectedExceptionType.orElseThrow();
+                if (!configuredExpectedExceptionType.equals(expectedExpectedExceptionType)) {
+                    throw new IllegalArgumentException(String.format(
+                            "expectedException=%s; expectedExceptionType=%s",
+                            expectedExpectedExceptionType, configuredExpectedExceptionType));
+                }
+            });
+        }
+
+        MapTest<T, U> copyWithMappedValue(Result<U> v) {
+            return new MapTest<>(initialValue, Optional.of(v), expectedException, expectedExceptionType);
+        }
+
+        static <T, U> Builder<T, U> build() {
+            return new Builder<>();
+        }
+
+        void map(Function<T, U> mapper) {
+            map(new Counter<>(mapper), initialValue::map);
+        }
+
+        void flatMap(Function<T, Result<U>> mapper) {
+            map(new Counter<>(mapper), initialValue::flatMap);
+        }
+
+        private <V> void map(Counter<T, V> countingMapper, Function<Counter<T, V>, Result<U>> mapper) {
+
+            if (initialValue.hasErrors()) {
+                Result<U> mapped = mapper.apply(countingMapper);
+                assertTrue(mapped.hasErrors());
+                assertEquals(initialValue.errors(), mapped.errors());
+            } else {
+                expectedExceptionType.ifPresentOrElse(theExpectedExceptionType -> {
+                    var ex = assertThrowsExactly(theExpectedExceptionType, () -> {
+                        initialValue.map(countingMapper);
+                    });
+
+                    expectedException.ifPresent(theExpectedException -> {
+                        assertSame(theExpectedException, ex);
+                    });
+                }, () -> {
+                    Result<U> mapped = mapper.apply(countingMapper);
+                    assertEquals(mappedValue.orElseThrow(), mapped);
+                });
+            }
+
+            if (initialValue.hasValue()) {
+                assertEquals(1, countingMapper.count());
+            } else {
+                assertEquals(0, countingMapper.count());
+            }
+        }
+
+        static final class Builder<T, U> {
+
+            MapTest<T, U> create() {
+
+                var theInitialValue = Optional.ofNullable(initialValue).orElseGet(() -> {
+                    return Result.ofError(new Exception("Kaput!"));
+                });
+
+                return new MapTest<>(
+                        theInitialValue,
+                        Optional.ofNullable(expectedValue).map(Result::ofValue).or(() -> {
+                            if (expectedExceptionType == null) {
+                                return Optional.of(theInitialValue.mapErrors());
+                            } else {
+                                return Optional.empty();
+                            }
+                        }),
+                        Optional.ofNullable(expectedException),
+                        Optional.ofNullable(expectedExceptionType));
+            }
+
+            Builder<T, U> initialValue(Result<T> v) {
+                initialValue = v;
+                return this;
+            }
+
+            Builder<T, U> initialValue(T v) {
+                return initialValue(Result.ofValue(v));
+            }
+
+            Builder<T, U> expectException(Exception v) {
+                expectedException = v;
+                if (expectedException != null) {
+                    expectedExceptionType = expectedException.getClass();
+                    expectValue(null);
+                } else {
+                    expectedExceptionType = null;
+                }
+                return this;
+            }
+
+            Builder<T, U> expectExceptionOfType(Class<? extends Exception> v) {
+                expectedException = null;
+                expectedExceptionType = v;
+                if (v != null) {
+                    expectValue(null);
+                }
+                return this;
+            }
+
+            Builder<T, U> expectValue(U v) {
+                expectedValue = v;
+                if (v != null) {
+                    expectException(null);
+                }
+                return this;
+            }
+
+            private Result<T> initialValue;
+            private U expectedValue;
+            private Exception expectedException;
+            private Class<? extends Exception> expectedExceptionType;
+        }
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/function/ExceptionBoxTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/function/ExceptionBoxTest.java
new file mode 100644
index 00000000000..c3ef239b02d
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/function/ExceptionBoxTest.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.util.function;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.UnaryOperator;
+import jdk.jpackage.internal.util.Slot;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+public class ExceptionBoxTest {
+
+    @Test
+    public void test_unbox_RuntimeException() {
+        var ex = new RuntimeException();
+        assertSame(ex, ExceptionBox.unbox(ex));
+    }
+
+    @Test
+    public void test_unbox_Exception() {
+        var ex = new Exception();
+        assertSame(ex, ExceptionBox.unbox(ex));
+    }
+
+    @Test
+    public void test_unbox_InvocationTargetException() {
+        var ex = new Exception();
+        assertSame(ex, ExceptionBox.unbox(new InvocationTargetException(ex)));
+    }
+
+    @Test
+    public void test_unbox_ExceptionBox() {
+        var ex = new Exception("foo");
+        // There is no way to directly instantiate ExceptionBox, use a workaround.
+        var box = assertThrowsExactly(ExceptionBox.class, () -> {
+            throw ExceptionBox.toUnchecked(ex);
+        });
+        assertSame(ex, ExceptionBox.unbox(box));
+    }
+
+    @Test
+    public void test_unbox_Error() {
+        var err = new Error("On Fire!");
+        var thrown = assertThrowsExactly(Error.class, () -> {
+            ExceptionBox.unbox(err);
+        });
+        assertSame(err, thrown);
+    }
+
+    @Test
+    public void test_reachedUnreachable() {
+        var err = ExceptionBox.reachedUnreachable();
+        assertEquals("Reached unreachable!", err.getMessage());
+    }
+
+    @Test
+    public void test_toUnchecked_RuntimeException() {
+        assertToUnchecked(new RuntimeException(), true);
+    }
+
+    @Test
+    public void test_toUnchecked_Exception() {
+        assertToUnchecked(new Exception(), false);
+    }
+
+    @Test
+    public void test_toUnchecked_ExceptionBox() {
+        // There is no way to directly instantiate ExceptionBox, use a workaround.
+        var box = assertThrowsExactly(ExceptionBox.class, () -> {
+            throw ExceptionBox.toUnchecked(new Exception("foo"));
+        });
+        assertToUnchecked(box, true);
+    }
+
+    @Test
+    public void test_toUnchecked_InterruptedException() throws InterruptedException {
+
+        var workerThreadReadyToWait = Slot.<Boolean>createEmpty();
+
+        var workerThreadInterruptedExceptionCaught = Slot.<Boolean>createEmpty();
+
+        var workerThreadException = new AtomicReference<Throwable>();
+
+        var thread = Thread.ofVirtual().uncaughtExceptionHandler((Thread _, Throwable e) -> {
+            trace("unexpected exception: %s", e);
+            workerThreadException.set(e);
+        }).start(() -> {
+            try {
+                var lock = new Object();
+                synchronized (lock) {
+                    synchronized (workerThreadReadyToWait) {
+                        workerThreadReadyToWait.set(true);
+                        workerThreadReadyToWait.notify();
+                    }
+                    trace("wait");
+                    lock.wait();
+                }
+            } catch (InterruptedException iex) {
+                trace("interrupted state cleared");
+                synchronized (workerThreadInterruptedExceptionCaught) {
+                    workerThreadInterruptedExceptionCaught.set(true);
+                    trace("notify about to interrupt itself");
+                    workerThreadInterruptedExceptionCaught.notify();
+                }
+                trace("before toUnchecked()");
+                var box = assertThrowsExactly(ExceptionBox.class, () -> {
+                    throw ExceptionBox.toUnchecked(iex);
+                });
+                assertSame(iex, box.getCause());
+            }
+        });
+
+        // Wait until the worker thread gets to the point
+        // when interrupting it will cause InterruptedException.
+        synchronized (workerThreadReadyToWait) {
+            while (workerThreadReadyToWait.find().isEmpty()) {
+                workerThreadReadyToWait.wait();
+            }
+        }
+
+        trace("interrupt %s", thread);
+        thread.interrupt();
+
+        // Wait until the worker thread catches an InterruptedException.
+        synchronized (workerThreadInterruptedExceptionCaught) {
+            while (workerThreadInterruptedExceptionCaught.find().isEmpty()) {
+                trace("wait for %s to catch InterruptedException", thread);
+                workerThreadInterruptedExceptionCaught.wait();
+            }
+        }
+
+        // Block waiting when ExceptionBox.toUnchecked()
+        // called in the worker thread will interrupt the worker thread.
+        while (!thread.isInterrupted()) {
+            trace("wait %s is interrupted", thread);
+            Thread.sleep(100);
+        }
+
+        trace("join interrupted %s", thread);
+        thread.join();
+
+        assertNull(workerThreadException.get());
+    }
+
+    @ParameterizedTest
+    @EnumSource(InvocationTargetExceptionType.class)
+    public void test_rethrowUnchecked_InvocationTargetException(InvocationTargetExceptionType type)
+            throws NoSuchMethodException, SecurityException, IllegalAccessException {
+
+        var m = ExceptionBoxTest.class.getMethod(type.methodName);
+
+        try {
+            m.invoke(null);
+        } catch (InvocationTargetException ex) {
+            var cause = assertThrows(type.expectedThrownType, () -> {
+                throw ExceptionBox.toUnchecked(ex);
+            });
+            assertSame(ex.getCause(), type.expectedThrowableGetter.apply(cause));
+        }
+    }
+
+    public enum InvocationTargetExceptionType {
+        CHECKED("throwIOException", t -> {
+            return t.getCause();
+        }, ExceptionBox.class),
+        UNCHECKED("throwNPE", x -> x, RuntimeException.class),
+        ERROR("throwError", x -> x, Error.class),
+        ;
+
+        InvocationTargetExceptionType(
+                String methodName,
+                UnaryOperator<Throwable> expectedThrowableGetter,
+                Class<? extends Throwable> expectedThrownType) {
+            this.methodName = Objects.requireNonNull(methodName);
+            this.expectedThrownType = Objects.requireNonNull(expectedThrownType);
+            this.expectedThrowableGetter = Objects.requireNonNull(expectedThrowableGetter);
+        }
+
+        final String methodName;
+        final Class<? extends Throwable> expectedThrownType;
+        final UnaryOperator<Throwable> expectedThrowableGetter;
+    }
+
+    public static void throwIOException() throws IOException {
+        throw new IOException("foo");
+    }
+
+    public static void throwNPE() {
+        throw new NullPointerException("foo");
+    }
+
+    public static void throwError() {
+        throw new Error("Kaput!");
+    }
+
+    private static void assertToUnchecked(Exception cause, boolean asis) {
+        Class<? extends Throwable> expectedType;
+        if (asis) {
+            expectedType = cause.getClass();
+        } else {
+            expectedType = ExceptionBox.class;
+        }
+        var unchecked = ExceptionBox.toUnchecked(cause);
+        if (asis) {
+            assertSame(cause, unchecked);
+        } else {
+            assertSame(cause, unchecked.getCause());
+        }
+    }
+
+    private void trace(String format, Object... args) {
+        Objects.requireNonNull(format);
+        System.out.println(String.format("[%s]: %s", Thread.currentThread(), String.format(format, args)));
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/function/FunctionalTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/function/FunctionalTest.java
new file mode 100644
index 00000000000..67c082916a6
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/function/FunctionalTest.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.util.function;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Map;
+import java.util.function.Supplier;
+import jdk.jpackage.internal.util.Slot;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class FunctionalTest {
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_toRunnable(boolean error) {
+        var reply = Slot.<Integer>createEmpty();
+
+        var runnable = ThrowingRunnable.toRunnable(() -> {
+            if (error) {
+                throw new Exception();
+            } else {
+                reply.set(135);
+            }
+        });
+
+        if (error) {
+            assertThrowsExactly(ExceptionBox.class, runnable::run);
+            assertTrue(reply.find().isEmpty());
+        } else {
+            runnable.run();
+            assertEquals(135, reply.get());
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_toSupplier(boolean error) {
+        var supplier = ThrowingSupplier.<Integer>toSupplier(() -> {
+            if (error) {
+                throw new Exception();
+            } else {
+                return 135;
+            }
+        });
+
+        if (error) {
+            assertThrowsExactly(ExceptionBox.class, supplier::get);
+        } else {
+            assertEquals(135, supplier.get());
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_toConsumer(boolean error) {
+        var reply = Slot.<Integer>createEmpty();
+
+        Runnable runnable = () -> {
+            ThrowingConsumer.<Integer>toConsumer(v -> {
+                if (error) {
+                    throw new Exception();
+                } else {
+                    reply.set(v);
+                }
+            }).accept(135);
+        };
+
+        if (error) {
+            assertThrowsExactly(ExceptionBox.class, runnable::run);
+            assertTrue(reply.find().isEmpty());
+        } else {
+            runnable.run();
+            assertEquals(135, reply.get());
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_toBiConsumer(boolean error) {
+        var reply = Slot.<Integer>createEmpty();
+        var reply2 = Slot.<String>createEmpty();
+
+        Runnable runnable = () -> {
+            ThrowingBiConsumer.<Integer, String>toBiConsumer((x, y) -> {
+                if (error) {
+                    throw new Exception();
+                } else {
+                    reply.set(x);
+                    reply2.set(y);
+                }
+            }).accept(456, "Hello");
+        };
+
+        if (error) {
+            assertThrowsExactly(ExceptionBox.class, runnable::run);
+            assertTrue(reply.find().isEmpty());
+            assertTrue(reply2.find().isEmpty());
+        } else {
+            runnable.run();
+            assertEquals(456, reply.get());
+            assertEquals("Hello", reply2.get());
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_toFunction(boolean error) {
+        Supplier<String> supplier = () -> {
+            return ThrowingFunction.<Integer, String>toFunction(v -> {
+                if (error) {
+                    throw new Exception();
+                } else {
+                    return String.valueOf(v);
+                }
+            }).apply(765);
+        };
+
+        if (error) {
+            assertThrowsExactly(ExceptionBox.class, supplier::get);
+        } else {
+            assertEquals("765", supplier.get());
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_toBiFunction(boolean error) {
+        Supplier< Map.Entry<String, Integer>> supplier = () -> {
+            return ThrowingBiFunction.<Integer, String, Map.Entry<String, Integer>>toBiFunction((x, y) -> {
+                if (error) {
+                    throw new Exception();
+                } else {
+                    return Map.entry(y, x + 23);
+                }
+            }).apply(400, "foo");
+        };
+
+        if (error) {
+            assertThrowsExactly(ExceptionBox.class, supplier::get);
+        } else {
+            assertEquals(Map.entry("foo", 423), supplier.get());
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_toUnaryOperator(boolean error) {
+        Supplier<Integer> supplier = () -> {
+            return ThrowingUnaryOperator.<Integer>toUnaryOperator(v -> {
+                if (error) {
+                    throw new Exception();
+                } else {
+                    return v - 222;
+                }
+            }).apply(777);
+        };
+
+        if (error) {
+            assertThrowsExactly(ExceptionBox.class, supplier::get);
+        } else {
+            assertEquals(555, supplier.get());
+        }
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/tools/jdk/jpackage/test/JUnitAdapter.java b/test/jdk/tools/jpackage/junit/tools/jdk/jpackage/test/JUnitAdapter.java
index 5a605b1642d..952b4b520d5 100644
--- a/test/jdk/tools/jpackage/junit/tools/jdk/jpackage/test/JUnitAdapter.java
+++ b/test/jdk/tools/jpackage/junit/tools/jdk/jpackage/test/JUnitAdapter.java
@@ -49,7 +49,7 @@ public class JUnitAdapter {
         }
     }
 
-    public static Stream<DynamicTest> createJPackageTests(ClassLoader testClassLoader, String... args) throws Throwable {
+    public static Stream<DynamicTest> createJPackageTests(ClassLoader testClassLoader, String... args) throws Exception {
         final List<TestInstance> tests = new ArrayList<>();
         try (final var testBuilder = TestBuilder.build().workDirRoot(Path.of("")).testClassLoader(testClassLoader).testConsumer(tests::add).create()) {
             for (final var arg : args) {
@@ -64,11 +64,11 @@ public class JUnitAdapter {
     }
 
     @TestFactory
-    Stream<DynamicTest> createJPackageTests() throws Throwable {
+    Stream<DynamicTest> createJPackageTests() throws Exception {
         return createJPackageTests(getClass().getClassLoader(), "--jpt-run=" + getClass().getName());
     }
 
-    static List<String> captureJPackageTestLog(ThrowingRunnable runnable) {
+    static List<String> captureJPackageTestLog(ThrowingRunnable<? extends Exception> runnable) {
         final var buf = new ByteArrayOutputStream();
         try (PrintStream ps = new PrintStream(buf, true, StandardCharsets.UTF_8)) {
             TKit.withExtraLogStream(runnable, ps);
diff --git a/test/jdk/tools/jpackage/junit/tools/jdk/jpackage/test/JUnitUtils.java b/test/jdk/tools/jpackage/junit/tools/jdk/jpackage/test/JUnitUtils.java
index c91b178cb10..0b63688ee20 100644
--- a/test/jdk/tools/jpackage/junit/tools/jdk/jpackage/test/JUnitUtils.java
+++ b/test/jdk/tools/jpackage/junit/tools/jdk/jpackage/test/JUnitUtils.java
@@ -22,6 +22,8 @@
  */
 package jdk.jpackage.test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Map;
 import java.util.Objects;
 import org.junit.jupiter.api.Assertions;
@@ -38,7 +40,11 @@ public final class JUnitUtils {
      * @param actual   the actual array to test for equality
      */
     public static void assertArrayEquals(Object expected, Object actual) {
-        ARRAY_ASSERTERS.getOrDefault(expected.getClass().componentType(), OBJECT_ARRAY_ASSERTER).acceptUnchecked(expected, actual);
+        if (expected == null || actual == null) {
+            assertEquals(expected, actual);
+        } else {
+            ARRAY_ASSERTERS.getOrDefault(expected.getClass().componentType(), OBJECT_ARRAY_ASSERTER).acceptUnchecked(expected, actual);
+        }
     }
 
     /**
diff --git a/test/jdk/tools/jpackage/linux/AppAboutUrlTest.java b/test/jdk/tools/jpackage/linux/AppAboutUrlTest.java
index aef46e29725..8196ab733c9 100644
--- a/test/jdk/tools/jpackage/linux/AppAboutUrlTest.java
+++ b/test/jdk/tools/jpackage/linux/AppAboutUrlTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,7 +82,7 @@ public class AppAboutUrlTest {
         runTest(JPackageCommand::setFakeRuntime, "", "(none)");
     }
 
-    private static void runTest(ThrowingConsumer<JPackageCommand> initializer,
+    private static void runTest(ThrowingConsumer<JPackageCommand, ? extends Exception> initializer,
             String expectedDebHomepage, String expectedRpmUrl) {
         new PackageTest()
                 .forTypes(PackageType.LINUX)
diff --git a/test/jdk/tools/jpackage/macosx/CustomInfoPListTest.java b/test/jdk/tools/jpackage/macosx/CustomInfoPListTest.java
index dd94330d039..50445c0e9ab 100644
--- a/test/jdk/tools/jpackage/macosx/CustomInfoPListTest.java
+++ b/test/jdk/tools/jpackage/macosx/CustomInfoPListTest.java
@@ -23,7 +23,6 @@
 
 import static java.util.Collections.unmodifiableSortedSet;
 import static java.util.Map.entry;
-import jdk.jpackage.internal.util.Slot;
 import static jdk.jpackage.internal.util.PListWriter.writeDict;
 import static jdk.jpackage.internal.util.PListWriter.writeKey;
 import static jdk.jpackage.internal.util.PListWriter.writePList;
@@ -52,6 +51,7 @@ import java.util.stream.Stream;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 import jdk.jpackage.internal.util.PListReader;
+import jdk.jpackage.internal.util.Slot;
 import jdk.jpackage.internal.util.function.ThrowingBiConsumer;
 import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.ParameterSupplier;
@@ -84,7 +84,7 @@ public class CustomInfoPListTest {
 
     @Test
     @ParameterSupplier("customPLists")
-    public void testAppImage(TestConfig cfg) throws Throwable {
+    public void testAppImage(TestConfig cfg) {
         testApp(new ConfigurationTarget(JPackageCommand.helloAppImage()), cfg);
     }
 
@@ -254,6 +254,10 @@ public class CustomInfoPListTest {
                         .addArguments(cmd.getAllArguments())
                         .setPackageType(PackageType.IMAGE)
                         .removeArgumentWithValue("--resource-dir")
+                        // Ignore externally configured runtime if any.
+                        // It may or may not have the "bin" directory, it also can be a bundle.
+                        // These factors affect the runtime plist file (see JDK-8363980) which may not be the default one.
+                        .ignoreDefaultRuntime(true)
                         .setArgumentValue("--dest", TKit.createTempDirectory("vanilla"));
                 vanillaCmd.execute();
 
@@ -320,8 +324,8 @@ public class CustomInfoPListTest {
         ;
 
         private CustomPListType(
-                ThrowingBiConsumer<JPackageCommand, XMLStreamWriter> inputPlistWriter,
-                ThrowingBiConsumer<JPackageCommand, XMLStreamWriter> outputPlistWriter,
+                ThrowingBiConsumer<JPackageCommand, XMLStreamWriter, ? extends Exception> inputPlistWriter,
+                ThrowingBiConsumer<JPackageCommand, XMLStreamWriter, ? extends Exception> outputPlistWriter,
                 String outputPlistFilename) {
             this.inputPlistWriter = ThrowingBiConsumer.toBiConsumer(inputPlistWriter);
             this.outputPlistWriter = ThrowingBiConsumer.toBiConsumer(outputPlistWriter);
diff --git a/test/jdk/tools/jpackage/macosx/EntitlementsTest.java b/test/jdk/tools/jpackage/macosx/EntitlementsTest.java
index aa5879e0c61..6e03c858db3 100644
--- a/test/jdk/tools/jpackage/macosx/EntitlementsTest.java
+++ b/test/jdk/tools/jpackage/macosx/EntitlementsTest.java
@@ -99,7 +99,7 @@ public class EntitlementsTest {
         }),
         ;
 
-        EntitlementsSource(ThrowingConsumer<JPackageCommand> initializer) {
+        EntitlementsSource(ThrowingConsumer<JPackageCommand, ? extends Exception> initializer) {
             this.initializer = toConsumer(initializer);
         }
 
diff --git a/test/jdk/tools/jpackage/share/AppContentTest.java b/test/jdk/tools/jpackage/share/AppContentTest.java
index 97c83bba57d..b6066bb9cc4 100644
--- a/test/jdk/tools/jpackage/share/AppContentTest.java
+++ b/test/jdk/tools/jpackage/share/AppContentTest.java
@@ -37,7 +37,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -631,7 +630,7 @@ public class AppContentTest {
 
     private static final class FileContentFactory implements ContentFactory {
 
-        FileContentFactory(ThrowingSupplier<Path> factory, Path pathInAppContentRoot) {
+        FileContentFactory(ThrowingSupplier<Path, IOException> factory, Path pathInAppContentRoot) {
             this.factory = ThrowingSupplier.toSupplier(factory);
             this.pathInAppContentRoot = pathInAppContentRoot;
             if (pathInAppContentRoot.isAbsolute()) {
diff --git a/test/jdk/tools/jpackage/share/AsyncTest.java b/test/jdk/tools/jpackage/share/AsyncTest.java
index b2755d4594f..e3a3f7e3cb8 100644
--- a/test/jdk/tools/jpackage/share/AsyncTest.java
+++ b/test/jdk/tools/jpackage/share/AsyncTest.java
@@ -37,6 +37,7 @@ import java.util.function.Predicate;
 import java.util.spi.ToolProvider;
 import java.util.stream.IntStream;
 import jdk.jpackage.internal.util.function.ThrowingRunnable;
+import jdk.jpackage.internal.util.Slot;
 import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.HelloApp;
@@ -61,7 +62,7 @@ import jdk.jpackage.test.TKit;
 public class AsyncTest {
 
     @Test
-    public void test() throws Throwable {
+    public void test() throws Exception {
 
         // Create test jar only once.
         // Besides of saving time, this avoids asynchronous invocations of java tool provider that randomly fail.
@@ -94,7 +95,7 @@ public class AsyncTest {
                 future.get(3, TimeUnit.MINUTES);
             }
 
-            Throwable[] fatalError = new Throwable[1];
+            var fatalError = Slot.<Exception>createEmpty();
 
             for (var future : futures) {
                 var result = future.get();
@@ -102,13 +103,11 @@ public class AsyncTest {
                 TKit.trace(String.format("[%s] STDOUT END", result.id()));
                 TKit.trace(String.format("[%s] STDERR BEGIN\n%s", result.id(), result.stderrBuffer()));
                 TKit.trace(String.format("[%s] STDERR END", result.id()));
-                result.throwable().filter(Predicate.not(TKit::isSkippedException)).ifPresent(t -> {
-                    fatalError[0] = t;
-                });
+                result.exception().filter(Predicate.not(TKit::isSkippedException)).ifPresent(fatalError::set);
             }
 
-            if (fatalError[0] != null) {
-                throw fatalError[0];
+            if (fatalError.find().isPresent()) {
+                throw fatalError.get();
             }
         }
     }
@@ -143,13 +142,13 @@ public class AsyncTest {
     }
 
 
-    private record Result(String stdoutBuffer, String stderrBuffer, String id, Optional<Throwable> throwable) {
+    private record Result(String stdoutBuffer, String stderrBuffer, String id, Optional<Exception> exception) {
 
         Result {
             Objects.requireNonNull(stdoutBuffer);
             Objects.requireNonNull(stderrBuffer);
             Objects.requireNonNull(id);
-            Objects.requireNonNull(throwable);
+            Objects.requireNonNull(exception);
         }
     }
 
@@ -157,7 +156,7 @@ public class AsyncTest {
     private record Workload(
             ByteArrayOutputStream stdoutBuffer,
             ByteArrayOutputStream stderrBuffer,
-            ThrowingRunnable runnable,
+            ThrowingRunnable<? extends Exception> runnable,
             String id) implements Callable<Result>  {
 
         Workload {
@@ -167,7 +166,7 @@ public class AsyncTest {
             Objects.requireNonNull(id);
         }
 
-        Workload(ThrowingRunnable runnable, String id) {
+        Workload(ThrowingRunnable<? extends Exception> runnable, String id) {
             this(new ByteArrayOutputStream(), new ByteArrayOutputStream(), runnable, id);
         }
 
@@ -202,14 +201,14 @@ public class AsyncTest {
                 }
             });
 
-            Optional<Throwable> err = Optional.empty();
+            Optional<Exception> err = Optional.empty();
             try (var bufOut = new PrintStream(stdoutBuffer, true, StandardCharsets.UTF_8);
                     var bufErr = new PrintStream(stderrBuffer, true, StandardCharsets.UTF_8)) {
                 TKit.withStackTraceStream(() -> {
                     TKit.withMainLogStream(runnable, bufOut);
                 }, bufErr);
-            } catch (Throwable t) {
-                err = Optional.of(t);
+            } catch (Exception ex) {
+                err = Optional.of(ex);
             }
             return new Result(stdoutBufferAsString(), stderrBufferAsString(), id, err);
         }
diff --git a/test/jdk/tools/jpackage/share/BasicTest.java b/test/jdk/tools/jpackage/share/BasicTest.java
index 958fe150711..afa847f6e1b 100644
--- a/test/jdk/tools/jpackage/share/BasicTest.java
+++ b/test/jdk/tools/jpackage/share/BasicTest.java
@@ -307,12 +307,12 @@ public final class BasicTest {
     @Test
     @Parameter("true")
     @Parameter("false")
-    public void testNoOutputDir(boolean appImage) throws Throwable {
+    public void testNoOutputDir(boolean appImage) throws IOException {
         var cmd = JPackageCommand.helloAppImage();
 
         final var execDir = cmd.outputDir();
 
-        final ThrowingConsumer<JPackageCommand> initializer = cmdNoOutputDir -> {
+        final ThrowingConsumer<JPackageCommand, IOException> initializer = cmdNoOutputDir -> {
             cmd.executePrerequisiteActions();
 
             final var pkgType = cmdNoOutputDir.packageType();
@@ -339,7 +339,7 @@ public final class BasicTest {
 
             // JPackageCommand.execute() will not do the cleanup if `--dest` parameter
             // is not specified, do it manually.
-            TKit.createDirectories(execDir);
+            Files.createDirectories(execDir);
             TKit.deleteDirectoryContentsRecursive(execDir);
         };
 
diff --git a/test/jdk/tools/jpackage/share/ErrorTest.java b/test/jdk/tools/jpackage/share/ErrorTest.java
index 955c17e6043..bc12577fa20 100644
--- a/test/jdk/tools/jpackage/share/ErrorTest.java
+++ b/test/jdk/tools/jpackage/share/ErrorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -707,12 +707,6 @@ public final class ErrorTest {
         final List<CannedFormattedString> errorMessages = new ArrayList<>();
         errorMessages.add(makeError(JPackageStringBundle.MAIN.cannedFormattedString(
                 "error.cert.not.found", "Developer ID Application: " + signingId, "")));
-        errorMessages.addAll(Stream.of(
-                Map.<String, UnaryOperator<CannedFormattedString>>entry("error.explicit-sign-no-cert", JPackageCommand::makeError),
-                Map.<String, UnaryOperator<CannedFormattedString>>entry("error.explicit-sign-no-cert.advice", JPackageCommand::makeAdvice)
-        ).map(e -> {
-            return e.getValue().apply(JPackageStringBundle.MAIN.cannedFormattedString(e.getKey()));
-        }).toList());
 
         final var cmd = JPackageCommand.helloAppImage()
                 .ignoreDefaultVerbose(true)
diff --git a/test/jdk/tools/jpackage/share/IconTest.java b/test/jdk/tools/jpackage/share/IconTest.java
index 12458eda34b..17759db7192 100644
--- a/test/jdk/tools/jpackage/share/IconTest.java
+++ b/test/jdk/tools/jpackage/share/IconTest.java
@@ -203,7 +203,7 @@ public class IconTest {
         return withDesktopFile;
     }
 
-    private ThrowingBiConsumer<JPackageCommand, Executor.Result> createBundleVerifier() {
+    private ThrowingBiConsumer<JPackageCommand, Executor.Result, IOException> createBundleVerifier() {
         return (cmd, result) -> {
             Stream.of(Launcher.Main, Launcher.Additional).filter(config::containsKey).forEach(launcher -> {
                 createConsoleOutputVerifier(cmd, launcher).ifPresent(verifier -> {
@@ -276,7 +276,7 @@ public class IconTest {
         return Optional.of(TKit.assertTextStream(lookupString.getValue()));
     }
 
-    private ThrowingConsumer<JPackageCommand> createInstallVerifier() {
+    private ThrowingConsumer<JPackageCommand, IOException> createInstallVerifier() {
         return cmd -> {
             var verifier = new LauncherIconVerifier();
 
diff --git a/test/jdk/tools/jpackage/share/InOutPathTest.java b/test/jdk/tools/jpackage/share/InOutPathTest.java
index d36731c2960..6956f66df42 100644
--- a/test/jdk/tools/jpackage/share/InOutPathTest.java
+++ b/test/jdk/tools/jpackage/share/InOutPathTest.java
@@ -21,6 +21,8 @@
  * questions.
  */
 
+import static jdk.jpackage.test.RunnablePackageTest.Action.CREATE_AND_UNPACK;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -31,17 +33,16 @@ import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 import jdk.internal.util.OperatingSystem;
-import jdk.jpackage.test.AppImageFile;
-import jdk.jpackage.test.ApplicationLayout;
-import jdk.jpackage.test.PackageFile;
+import jdk.jpackage.internal.util.function.ThrowingConsumer;
 import jdk.jpackage.test.Annotations.Parameters;
 import jdk.jpackage.test.Annotations.Test;
-import jdk.jpackage.internal.util.function.ThrowingConsumer;
+import jdk.jpackage.test.AppImageFile;
+import jdk.jpackage.test.ApplicationLayout;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.JPackageCommand.StandardAssert;
+import jdk.jpackage.test.PackageFile;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
-import static jdk.jpackage.test.RunnablePackageTest.Action.CREATE_AND_UNPACK;
 import jdk.jpackage.test.TKit;
 
 /*
@@ -145,11 +146,11 @@ public final class InOutPathTest {
     }
 
     @Test
-    public void test() throws Throwable {
+    public void test() throws Exception {
         runTest(packageTypes, configure);
     }
 
-    private static Envelope wrap(ThrowingConsumer<JPackageCommand> v, String label) {
+    private static Envelope wrap(ThrowingConsumer<JPackageCommand, ? extends Exception> v, String label) {
         return new Envelope(v, label);
     }
 
@@ -158,8 +159,8 @@ public final class InOutPathTest {
     }
 
     private static void runTest(Set<PackageType> packageTypes,
-            ThrowingConsumer<JPackageCommand> configure) throws Throwable {
-        ThrowingConsumer<JPackageCommand> configureWrapper = cmd -> {
+            ThrowingConsumer<JPackageCommand, ? extends Exception> configure) throws Exception {
+        ThrowingConsumer<JPackageCommand, Exception> configureWrapper = cmd -> {
             // Make sure the input directory is empty in every test run.
             // This is needed because jpackage output directories in this test
             // are subdirectories of the input directory.
@@ -212,7 +213,7 @@ public final class InOutPathTest {
             IOException {
         // Set output dir as a subdir of input dir
         Path outputDir = cmd.inputDir().resolve("out");
-        TKit.createDirectories(outputDir);
+        Files.createDirectories(outputDir);
         cmd.setArgumentValue("--dest", outputDir);
     }
 
@@ -232,7 +233,7 @@ public final class InOutPathTest {
             String argName, Path base) throws IOException {
         Path appContentFile = base.resolve(base.toString().replaceAll("[\\\\/]",
                 "-") + "-foo.txt");
-        TKit.createDirectories(appContentFile.getParent());
+        Files.createDirectories(appContentFile.getParent());
         TKit.createTextFile(appContentFile, List.of("Hello Duke!"));
         cmd.addArguments(argName, appContentFile.getParent());
     }
@@ -268,7 +269,7 @@ public final class InOutPathTest {
         }
     }
 
-    private static final record Envelope(ThrowingConsumer<JPackageCommand> value, String label) {
+    private static final record Envelope(ThrowingConsumer<JPackageCommand, ? extends Exception> value, String label) {
         @Override
         public String toString() {
             // Will produce the same test description for the same label every
@@ -291,7 +292,7 @@ public final class InOutPathTest {
     }
 
     private final Set<PackageType> packageTypes;
-    private final ThrowingConsumer<JPackageCommand> configure;
+    private final ThrowingConsumer<JPackageCommand, ? extends Exception> configure;
 
     // Placing jar file in the "Resources" subdir of the input directory would allow
     // to use the input directory with `--app-content` on OSX.
diff --git a/test/jdk/tools/jpackage/share/PerUserCfgTest.java b/test/jdk/tools/jpackage/share/PerUserCfgTest.java
index d2f368cd824..b28eb060b8f 100644
--- a/test/jdk/tools/jpackage/share/PerUserCfgTest.java
+++ b/test/jdk/tools/jpackage/share/PerUserCfgTest.java
@@ -158,8 +158,8 @@ public class PerUserCfgTest {
     }
 
     private static void withConfigFile(JPackageCommand cmd, Path srcCfgFile,
-            Path outputCfgFileDir, ThrowingConsumer<JPackageCommand> action) throws
-            Throwable {
+            Path outputCfgFileDir, ThrowingConsumer<JPackageCommand, ? extends Exception> action) throws
+            Exception {
         Path targetCfgFile = outputCfgFileDir.resolve(cmd.appLauncherCfgPath(
                 null).getFileName());
         TKit.assertPathExists(targetCfgFile, false);
diff --git a/test/jdk/tools/jpackage/share/RuntimePackageTest.java b/test/jdk/tools/jpackage/share/RuntimePackageTest.java
index 387b46acdfb..6cc668f94f9 100644
--- a/test/jdk/tools/jpackage/share/RuntimePackageTest.java
+++ b/test/jdk/tools/jpackage/share/RuntimePackageTest.java
@@ -30,7 +30,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Objects;
 import java.util.function.Predicate;
-import jdk.jpackage.internal.util.function.ThrowingSupplier;
+import java.util.function.Supplier;
 import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.JPackageCommand;
@@ -114,7 +114,7 @@ public class RuntimePackageTest {
         return init(JPackageCommand::createInputRuntimeImage);
     }
 
-    private static PackageTest init(ThrowingSupplier<Path> createRuntime) {
+    private static PackageTest init(Supplier<Path> createRuntime) {
         Objects.requireNonNull(createRuntime);
 
         final Path[] runtimeImageDir = new Path[1];
diff --git a/test/jdk/tools/jpackage/share/ServiceTest.java b/test/jdk/tools/jpackage/share/ServiceTest.java
index 94d3421a2cd..91950f0dba8 100644
--- a/test/jdk/tools/jpackage/share/ServiceTest.java
+++ b/test/jdk/tools/jpackage/share/ServiceTest.java
@@ -109,7 +109,7 @@ public class ServiceTest {
     }
 
     @Test
-    public void test() throws Throwable {
+    public void test() {
         var pkg = createPackageTest().addHelloAppInitializer("com.foo.ServiceTest");
         LauncherAsServiceVerifier.build().setExpectedValue("A1").applyTo(pkg);
         createTestInitializer().applyTo(pkg);
@@ -117,7 +117,7 @@ public class ServiceTest {
     }
 
     @Test
-    public void testUpdate() throws Throwable {
+    public void testUpdate() {
         var testInitializer = createTestInitializer().setUpgradeCode(
                 "4050AD4D-D6CC-452A-9CB0-58E5FA8C410F");
 
diff --git a/test/jdk/tools/jpackage/windows/WinRenameTest.java b/test/jdk/tools/jpackage/windows/WinRenameTest.java
index ab67ec7f4f9..b7f3243cd32 100644
--- a/test/jdk/tools/jpackage/windows/WinRenameTest.java
+++ b/test/jdk/tools/jpackage/windows/WinRenameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/tools/launcher/JniInvocationTest.java b/test/jdk/tools/launcher/JniInvocationTest.java
index e18dc8b137d..5affddee0fe 100644
--- a/test/jdk/tools/launcher/JniInvocationTest.java
+++ b/test/jdk/tools/launcher/JniInvocationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java
index dbc7a916885..70e619f3d3d 100644
--- a/test/jtreg-ext/requires/VMProps.java
+++ b/test/jtreg-ext/requires/VMProps.java
@@ -146,6 +146,7 @@ public class VMProps implements Callable<Map<String, String>> {
         map.put("jdk.containerized", this::jdkContainerized);
         map.put("vm.flagless", this::isFlagless);
         map.put("jdk.foreign.linker", this::jdkForeignLinker);
+        map.put("jdk.explodedImage", this::explodedImage);
         map.put("jlink.packagedModules", this::packagedModules);
         map.put("jdk.static", this::isStatic);
         vmGC(map); // vm.gc.X = true/false
@@ -751,6 +752,20 @@ public class VMProps implements Callable<Map<String, String>> {
         return "" + "true".equalsIgnoreCase(isEnabled);
     }
 
+    private String explodedImage() {
+        try {
+            Path jmodFile = Path.of(System.getProperty("java.home"), "jmods", "java.base.jmod");
+            if (Files.exists(jmodFile)) {
+                return Boolean.FALSE.toString();
+            } else {
+                return Boolean.TRUE.toString();
+            }
+        } catch (Throwable t) {
+            t.printStackTrace();
+            return errorWithMessage("Error in explodedImage " + t);
+        }
+    }
+
     private String packagedModules() {
         // Some jlink tests require packaged modules being present (jmods).
         // For a runtime linkable image build packaged modules aren't present
diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLandmarkRegions.java b/test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLandmarkRegions.java
index 784efa9767d..579fed9d355 100644
--- a/test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLandmarkRegions.java
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLandmarkRegions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java
index e9d7f7a795d..c8f79eb466c 100644
--- a/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownLinks.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownLinks.java
index 76fa87f4fff..24e9a798e1b 100644
--- a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownLinks.java
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownLinks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java
index 79a09b4f240..5231fa6b072 100644
--- a/test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java
+++ b/test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java
index 9c4c4da70e3..ded9a3a9d72 100644
--- a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java
+++ b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTagWithModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/jdk/javadoc/doclet/testTitleInHref/TestTitleInHref.java b/test/langtools/jdk/javadoc/doclet/testTitleInHref/TestTitleInHref.java
index 70a77fad5a7..67cba82c6d8 100644
--- a/test/langtools/jdk/javadoc/doclet/testTitleInHref/TestTitleInHref.java
+++ b/test/langtools/jdk/javadoc/doclet/testTitleInHref/TestTitleInHref.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/jdk/javadoc/tool/modules/Modules.java b/test/langtools/jdk/javadoc/tool/modules/Modules.java
index c8028ba5c7e..ce317bdb015 100644
--- a/test/langtools/jdk/javadoc/tool/modules/Modules.java
+++ b/test/langtools/jdk/javadoc/tool/modules/Modules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/jdk/jshell/Compiler.java b/test/langtools/jdk/jshell/Compiler.java
index a255008b15d..f2ae98102c4 100644
--- a/test/langtools/jdk/jshell/Compiler.java
+++ b/test/langtools/jdk/jshell/Compiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/jdk/jshell/HighlightUITest.java b/test/langtools/jdk/jshell/HighlightUITest.java
index 22403d5ae7e..77fb07a1632 100644
--- a/test/langtools/jdk/jshell/HighlightUITest.java
+++ b/test/langtools/jdk/jshell/HighlightUITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/jdk/jshell/Presets.java b/test/langtools/jdk/jshell/Presets.java
index afe193ee5c3..1d8e277dbdd 100644
--- a/test/langtools/jdk/jshell/Presets.java
+++ b/test/langtools/jdk/jshell/Presets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/jdk/jshell/ToolBasicTest.java b/test/langtools/jdk/jshell/ToolBasicTest.java
index 5015d1f64b1..7fba0a9cd44 100644
--- a/test/langtools/jdk/jshell/ToolBasicTest.java
+++ b/test/langtools/jdk/jshell/ToolBasicTest.java
@@ -585,6 +585,7 @@ public class ToolBasicTest extends ReplToolTesting {
         Compiler compiler = new Compiler();
         Path path = compiler.getPath("testSave.repl");
         {
+            Path pathWithDirectories = compiler.getPath("what/ever/testSave.repl");
             List<String> list = Arrays.asList(
                     "int a;",
                     "class A { public String toString() { return \"A\"; } }"
@@ -593,9 +594,11 @@ public class ToolBasicTest extends ReplToolTesting {
                     (a) -> assertVariable(a, "int", "a"),
                     (a) -> assertCommand(a, "()", null, null, null, "", ""),
                     (a) -> assertClass(a, "class A { public String toString() { return \"A\"; } }", "class", "A"),
-                    (a) -> assertCommand(a, "/save " + path.toString(), "")
+                    (a) -> assertCommand(a, "/save " + path.toString(), ""),
+                    (a) -> assertCommand(a, "/save " + pathWithDirectories.toString(), "")
             );
             assertEquals(list, Files.readAllLines(path));
+            assertEquals(list, Files.readAllLines(pathWithDirectories));
         }
         {
             List<String> output = new ArrayList<>();
diff --git a/test/langtools/tools/javac/6457284/T6457284.java b/test/langtools/tools/javac/6457284/T6457284.java
index f40d569ad91..939f10013c0 100644
--- a/test/langtools/tools/javac/6457284/T6457284.java
+++ b/test/langtools/tools/javac/6457284/T6457284.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/OverrideChecks/InterfaceImplements.java b/test/langtools/tools/javac/OverrideChecks/InterfaceImplements.java
index bb248b13ea1..ea172364bf7 100644
--- a/test/langtools/tools/javac/OverrideChecks/InterfaceImplements.java
+++ b/test/langtools/tools/javac/OverrideChecks/InterfaceImplements.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/OverrideChecks/InterfaceOverride.java b/test/langtools/tools/javac/OverrideChecks/InterfaceOverride.java
index 0b7b9de6857..387449fc940 100644
--- a/test/langtools/tools/javac/OverrideChecks/InterfaceOverride.java
+++ b/test/langtools/tools/javac/OverrideChecks/InterfaceOverride.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/OverrideChecks/T6326485.java b/test/langtools/tools/javac/OverrideChecks/T6326485.java
index 76b3e64f954..6bd809e43bf 100644
--- a/test/langtools/tools/javac/OverrideChecks/T6326485.java
+++ b/test/langtools/tools/javac/OverrideChecks/T6326485.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/SuperInit/NewLocalNotInInner.java b/test/langtools/tools/javac/SuperInit/NewLocalNotInInner.java
new file mode 100644
index 00000000000..8a69bc37667
--- /dev/null
+++ b/test/langtools/tools/javac/SuperInit/NewLocalNotInInner.java
@@ -0,0 +1,72 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8373570
+ * @summary Javac stack overflow on method-local class with nested record referring to enclosing type
+ * @compile/fail/ref=NewLocalNotInInner.out -XDrawDiagnostics NewLocalNotInInner.java
+ */
+class NewLocalNotInInner {
+    void m() {
+        class Local {
+            static class Foo {
+                void m() {
+                    new Local(); // error
+                }
+            }
+        }
+    }
+
+    void m_anon() {
+        class Local {
+            static class Foo {
+                void m() {
+                    new Local() { }; // error
+                }
+            }
+        }
+    }
+
+    void m_record() {
+        class Local {
+            record Foo() {
+                void m() {
+                    new Local(); // error
+                }
+            }
+        }
+    }
+
+    void m_intf() {
+        class Local {
+            interface Foo {
+                default void m() {
+                    new Local(); // error
+                }
+            }
+        }
+    }
+
+    void sup() {
+        class Local {
+            static class Foo {
+                void m() {
+                    class Sub extends Local { }; // error
+                    new Sub();
+                }
+            }
+        }
+    }
+
+    static void staticLocal() {
+        class Local { }
+        new Local(); // ok
+    }
+
+    static void staticLocalFromAnon() {
+        class Local { }
+        new Object() {
+            Local local() {
+                return new Local(); // ok
+            }
+        };
+    }
+}
diff --git a/test/langtools/tools/javac/SuperInit/NewLocalNotInInner.out b/test/langtools/tools/javac/SuperInit/NewLocalNotInInner.out
new file mode 100644
index 00000000000..dd816f2ab0e
--- /dev/null
+++ b/test/langtools/tools/javac/SuperInit/NewLocalNotInInner.out
@@ -0,0 +1,6 @@
+NewLocalNotInInner.java:12:21: compiler.err.local.cant.be.inst.static: kindname.class, Local
+NewLocalNotInInner.java:22:21: compiler.err.local.cant.be.inst.static: kindname.class, Local
+NewLocalNotInInner.java:32:21: compiler.err.local.cant.be.inst.static: kindname.class, Local
+NewLocalNotInInner.java:42:21: compiler.err.local.cant.be.inst.static: kindname.class, Local
+NewLocalNotInInner.java:52:21: compiler.err.local.cant.be.inst.static: kindname.class, Local
+5 errors
diff --git a/test/langtools/tools/javac/T4093617/T4093617.java b/test/langtools/tools/javac/T4093617/T4093617.java
index 35b6dcaadb8..2d999d9fa3c 100644
--- a/test/langtools/tools/javac/T4093617/T4093617.java
+++ b/test/langtools/tools/javac/T4093617/T4093617.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/T5092545.java b/test/langtools/tools/javac/T5092545.java
index 0191c789e6c..5b794682bc4 100644
--- a/test/langtools/tools/javac/T5092545.java
+++ b/test/langtools/tools/javac/T5092545.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/T5105890.java b/test/langtools/tools/javac/T5105890.java
index 12e579a8349..534d598ac59 100644
--- a/test/langtools/tools/javac/T5105890.java
+++ b/test/langtools/tools/javac/T5105890.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/T6180021/AbstractSub.java b/test/langtools/tools/javac/T6180021/AbstractSub.java
index 67334bdfc71..b909e3f8a3a 100644
--- a/test/langtools/tools/javac/T6180021/AbstractSub.java
+++ b/test/langtools/tools/javac/T6180021/AbstractSub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/T6180021/Sub.java b/test/langtools/tools/javac/T6180021/Sub.java
index 3233b9a2bf0..6172e077c61 100644
--- a/test/langtools/tools/javac/T6180021/Sub.java
+++ b/test/langtools/tools/javac/T6180021/Sub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/T6231246/T6231246.java b/test/langtools/tools/javac/T6231246/T6231246.java
index 34835d9e454..b067a2f494d 100644
--- a/test/langtools/tools/javac/T6231246/T6231246.java
+++ b/test/langtools/tools/javac/T6231246/T6231246.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/T6266772.java b/test/langtools/tools/javac/T6266772.java
index 79ae48a28fc..9a69f969d14 100644
--- a/test/langtools/tools/javac/T6266772.java
+++ b/test/langtools/tools/javac/T6266772.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/T6358024.java b/test/langtools/tools/javac/T6358024.java
index 7388ce55cef..6ccf2b332b8 100644
--- a/test/langtools/tools/javac/T6358024.java
+++ b/test/langtools/tools/javac/T6358024.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/T6358166.java b/test/langtools/tools/javac/T6358166.java
index d3d4b2ae162..20b83997c0e 100644
--- a/test/langtools/tools/javac/T6358166.java
+++ b/test/langtools/tools/javac/T6358166.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/T6361619.java b/test/langtools/tools/javac/T6361619.java
index 1f299a8f4c3..97c4e629bbe 100644
--- a/test/langtools/tools/javac/T6361619.java
+++ b/test/langtools/tools/javac/T6361619.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/T6395974.java b/test/langtools/tools/javac/T6395974.java
index 623a9563695..b88f775861d 100644
--- a/test/langtools/tools/javac/T6395974.java
+++ b/test/langtools/tools/javac/T6395974.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/T6397286.java b/test/langtools/tools/javac/T6397286.java
index 8e8ef882aa2..a7d4caa03dc 100644
--- a/test/langtools/tools/javac/T6397286.java
+++ b/test/langtools/tools/javac/T6397286.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/T6458823/T6458823.java b/test/langtools/tools/javac/T6458823/T6458823.java
index cd23066edc8..bb536928f5a 100644
--- a/test/langtools/tools/javac/T6458823/T6458823.java
+++ b/test/langtools/tools/javac/T6458823/T6458823.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest.java b/test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest.java
index 05317b00492..fd765b219d5 100644
--- a/test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest.java
+++ b/test/langtools/tools/javac/TryWithResources/InterruptedExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/TryWithResources/TwrAvoidNullCheck.java b/test/langtools/tools/javac/TryWithResources/TwrAvoidNullCheck.java
index 045558374c7..07b664165ab 100644
--- a/test/langtools/tools/javac/TryWithResources/TwrAvoidNullCheck.java
+++ b/test/langtools/tools/javac/TryWithResources/TwrAvoidNullCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/TryWithResources/TwrSimpleClose.java b/test/langtools/tools/javac/TryWithResources/TwrSimpleClose.java
index 11691a43040..a28a9108478 100644
--- a/test/langtools/tools/javac/TryWithResources/TwrSimpleClose.java
+++ b/test/langtools/tools/javac/TryWithResources/TwrSimpleClose.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/VarDeclarationWithAssignment.java b/test/langtools/tools/javac/VarDeclarationWithAssignment.java
index 7ee81cbc0e2..171c49274e0 100644
--- a/test/langtools/tools/javac/VarDeclarationWithAssignment.java
+++ b/test/langtools/tools/javac/VarDeclarationWithAssignment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @author turnidge
  *
  * @compile VarDeclarationWithAssignment.java
- * @run main/othervm -verify VarDeclarationWithAssignment
+ * @run main/othervm -Xverify:all VarDeclarationWithAssignment
  */
 
 public
diff --git a/test/langtools/tools/javac/annotations/crash_empty_enum_const/CrashEmptyEnumConstructorTest.java b/test/langtools/tools/javac/annotations/crash_empty_enum_const/CrashEmptyEnumConstructorTest.java
index 865c53a19c3..e21ad3d6221 100644
--- a/test/langtools/tools/javac/annotations/crash_empty_enum_const/CrashEmptyEnumConstructorTest.java
+++ b/test/langtools/tools/javac/annotations/crash_empty_enum_const/CrashEmptyEnumConstructorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/annotations/pos/AnnotationMethods.java b/test/langtools/tools/javac/annotations/pos/AnnotationMethods.java
index 129fe57b667..62ec14dff07 100644
--- a/test/langtools/tools/javac/annotations/pos/AnnotationMethods.java
+++ b/test/langtools/tools/javac/annotations/pos/AnnotationMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6400303/T6400303.java b/test/langtools/tools/javac/api/6400303/T6400303.java
index c3a01c007b3..c64bf6720c7 100644
--- a/test/langtools/tools/javac/api/6400303/T6400303.java
+++ b/test/langtools/tools/javac/api/6400303/T6400303.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6406133/T6406133.java b/test/langtools/tools/javac/api/6406133/T6406133.java
index 24ddba1e602..aee9588e68e 100644
--- a/test/langtools/tools/javac/api/6406133/T6406133.java
+++ b/test/langtools/tools/javac/api/6406133/T6406133.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6410643/T6410643.java b/test/langtools/tools/javac/api/6410643/T6410643.java
index d8f5c798249..84728988c49 100644
--- a/test/langtools/tools/javac/api/6410643/T6410643.java
+++ b/test/langtools/tools/javac/api/6410643/T6410643.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6411310/T6411310.java b/test/langtools/tools/javac/api/6411310/T6411310.java
index 2714117962f..99747453283 100644
--- a/test/langtools/tools/javac/api/6411310/T6411310.java
+++ b/test/langtools/tools/javac/api/6411310/T6411310.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6411333/T6411333.java b/test/langtools/tools/javac/api/6411333/T6411333.java
index 83726143964..101375e5f7a 100644
--- a/test/langtools/tools/javac/api/6411333/T6411333.java
+++ b/test/langtools/tools/javac/api/6411333/T6411333.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6412656/T6412656.java b/test/langtools/tools/javac/api/6412656/T6412656.java
index cfea162ae98..72a9d42088b 100644
--- a/test/langtools/tools/javac/api/6412656/T6412656.java
+++ b/test/langtools/tools/javac/api/6412656/T6412656.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6415780/T6415780.java b/test/langtools/tools/javac/api/6415780/T6415780.java
index 99c0a476bee..6887e15410b 100644
--- a/test/langtools/tools/javac/api/6415780/T6415780.java
+++ b/test/langtools/tools/javac/api/6415780/T6415780.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6418694/T6418694.java b/test/langtools/tools/javac/api/6418694/T6418694.java
index 9e8ee8e850b..acb6c148e7b 100644
--- a/test/langtools/tools/javac/api/6418694/T6418694.java
+++ b/test/langtools/tools/javac/api/6418694/T6418694.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6420409/T6420409.java b/test/langtools/tools/javac/api/6420409/T6420409.java
index d12274f5f3b..9e1456560d0 100644
--- a/test/langtools/tools/javac/api/6420409/T6420409.java
+++ b/test/langtools/tools/javac/api/6420409/T6420409.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6421111/T6421111.java b/test/langtools/tools/javac/api/6421111/T6421111.java
index 9497e2ca22f..932f3ab3bdf 100644
--- a/test/langtools/tools/javac/api/6421111/T6421111.java
+++ b/test/langtools/tools/javac/api/6421111/T6421111.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6421756/T6421756.java b/test/langtools/tools/javac/api/6421756/T6421756.java
index 00efff6971c..f28253258fb 100644
--- a/test/langtools/tools/javac/api/6421756/T6421756.java
+++ b/test/langtools/tools/javac/api/6421756/T6421756.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6422215/T6422215.java b/test/langtools/tools/javac/api/6422215/T6422215.java
index 425d47616f0..f010ba8e91a 100644
--- a/test/langtools/tools/javac/api/6422215/T6422215.java
+++ b/test/langtools/tools/javac/api/6422215/T6422215.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6422327/T6422327.java b/test/langtools/tools/javac/api/6422327/T6422327.java
index 94a31101f16..13c90a06e4d 100644
--- a/test/langtools/tools/javac/api/6422327/T6422327.java
+++ b/test/langtools/tools/javac/api/6422327/T6422327.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6423003/T6423003.java b/test/langtools/tools/javac/api/6423003/T6423003.java
index 58d055e9685..6fb07a73ecf 100644
--- a/test/langtools/tools/javac/api/6423003/T6423003.java
+++ b/test/langtools/tools/javac/api/6423003/T6423003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6431257/T6431257.java b/test/langtools/tools/javac/api/6431257/T6431257.java
index c772a3c129c..23a45cd85fc 100644
--- a/test/langtools/tools/javac/api/6431257/T6431257.java
+++ b/test/langtools/tools/javac/api/6431257/T6431257.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6437999/T6437999.java b/test/langtools/tools/javac/api/6437999/T6437999.java
index 167c7feda11..0e669b681bf 100644
--- a/test/langtools/tools/javac/api/6437999/T6437999.java
+++ b/test/langtools/tools/javac/api/6437999/T6437999.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6440333/T6440333.java b/test/langtools/tools/javac/api/6440333/T6440333.java
index 5da878273b3..c7faca8d48f 100644
--- a/test/langtools/tools/javac/api/6440333/T6440333.java
+++ b/test/langtools/tools/javac/api/6440333/T6440333.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6440528/T6440528.java b/test/langtools/tools/javac/api/6440528/T6440528.java
index 3b72fd39255..3407f819e86 100644
--- a/test/langtools/tools/javac/api/6440528/T6440528.java
+++ b/test/langtools/tools/javac/api/6440528/T6440528.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6452876/T6452876.java b/test/langtools/tools/javac/api/6452876/T6452876.java
index 49a25a3bd32..47f9501e917 100644
--- a/test/langtools/tools/javac/api/6452876/T6452876.java
+++ b/test/langtools/tools/javac/api/6452876/T6452876.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6468404/T6468404.java b/test/langtools/tools/javac/api/6468404/T6468404.java
index c06e37e84b8..2e42d3d056f 100644
--- a/test/langtools/tools/javac/api/6468404/T6468404.java
+++ b/test/langtools/tools/javac/api/6468404/T6468404.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6471599/Main.java b/test/langtools/tools/javac/api/6471599/Main.java
index fa66ecc51d3..8d88514d64b 100644
--- a/test/langtools/tools/javac/api/6471599/Main.java
+++ b/test/langtools/tools/javac/api/6471599/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/6731573/T6731573.java b/test/langtools/tools/javac/api/6731573/T6731573.java
index 892b8e63ffb..b06ae9ce4d6 100644
--- a/test/langtools/tools/javac/api/6731573/T6731573.java
+++ b/test/langtools/tools/javac/api/6731573/T6731573.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/7086261/T7086261.java b/test/langtools/tools/javac/api/7086261/T7086261.java
index 391e71c94a7..364e9bf54a5 100644
--- a/test/langtools/tools/javac/api/7086261/T7086261.java
+++ b/test/langtools/tools/javac/api/7086261/T7086261.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/8007344/Test.java b/test/langtools/tools/javac/api/8007344/Test.java
index d230fb6086b..b8d4a8bb49f 100644
--- a/test/langtools/tools/javac/api/8007344/Test.java
+++ b/test/langtools/tools/javac/api/8007344/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/DiagSpans.java b/test/langtools/tools/javac/api/DiagSpans.java
index 527fe1aad62..d6fbfa0b2fd 100644
--- a/test/langtools/tools/javac/api/DiagSpans.java
+++ b/test/langtools/tools/javac/api/DiagSpans.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/Sibling.java b/test/langtools/tools/javac/api/Sibling.java
index d70548caa63..d4007616e70 100644
--- a/test/langtools/tools/javac/api/Sibling.java
+++ b/test/langtools/tools/javac/api/Sibling.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/T6257235.java b/test/langtools/tools/javac/api/T6257235.java
index 095d2e83d3b..08c6da7a972 100644
--- a/test/langtools/tools/javac/api/T6257235.java
+++ b/test/langtools/tools/javac/api/T6257235.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/T6258271.java b/test/langtools/tools/javac/api/T6258271.java
index 2092f5825a0..c1292aae35a 100644
--- a/test/langtools/tools/javac/api/T6258271.java
+++ b/test/langtools/tools/javac/api/T6258271.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/T6265137.java b/test/langtools/tools/javac/api/T6265137.java
index 2a8a1fcb9ad..47db903a65f 100644
--- a/test/langtools/tools/javac/api/T6265137.java
+++ b/test/langtools/tools/javac/api/T6265137.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/T6306137.java b/test/langtools/tools/javac/api/T6306137.java
index fe443950e52..b96a78c6d4c 100644
--- a/test/langtools/tools/javac/api/T6306137.java
+++ b/test/langtools/tools/javac/api/T6306137.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/T6357331.java b/test/langtools/tools/javac/api/T6357331.java
index 0bc4ff98a53..bd8c0d24662 100644
--- a/test/langtools/tools/javac/api/T6357331.java
+++ b/test/langtools/tools/javac/api/T6357331.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/T6358786.java b/test/langtools/tools/javac/api/T6358786.java
index f8ffb829b2a..063f04baf2a 100644
--- a/test/langtools/tools/javac/api/T6358786.java
+++ b/test/langtools/tools/javac/api/T6358786.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/T6397104.java b/test/langtools/tools/javac/api/T6397104.java
index 7d63c322371..028776e8609 100644
--- a/test/langtools/tools/javac/api/T6397104.java
+++ b/test/langtools/tools/javac/api/T6397104.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/T6400205.java b/test/langtools/tools/javac/api/T6400205.java
index a942e7c6624..ed5511c3c1e 100644
--- a/test/langtools/tools/javac/api/T6400205.java
+++ b/test/langtools/tools/javac/api/T6400205.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/T6400207.java b/test/langtools/tools/javac/api/T6400207.java
index 47bf297ce72..6adee3d4999 100644
--- a/test/langtools/tools/javac/api/T6400207.java
+++ b/test/langtools/tools/javac/api/T6400207.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/T6407011.java b/test/langtools/tools/javac/api/T6407011.java
index 9991efd1a5d..a1ee74ca19b 100644
--- a/test/langtools/tools/javac/api/T6407011.java
+++ b/test/langtools/tools/javac/api/T6407011.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/TestEvalExpression.java b/test/langtools/tools/javac/api/TestEvalExpression.java
index 41e61548d55..d5dc383c65d 100644
--- a/test/langtools/tools/javac/api/TestEvalExpression.java
+++ b/test/langtools/tools/javac/api/TestEvalExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/TestGetTree.java b/test/langtools/tools/javac/api/TestGetTree.java
index 545645a3541..2d7659188fa 100644
--- a/test/langtools/tools/javac/api/TestGetTree.java
+++ b/test/langtools/tools/javac/api/TestGetTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/TestJavacTask.java b/test/langtools/tools/javac/api/TestJavacTask.java
index 2d86a732a41..ab0119fbe23 100644
--- a/test/langtools/tools/javac/api/TestJavacTask.java
+++ b/test/langtools/tools/javac/api/TestJavacTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/TestJavacTaskScanner.java b/test/langtools/tools/javac/api/TestJavacTaskScanner.java
index 4f920d96fb0..b391b45e459 100644
--- a/test/langtools/tools/javac/api/TestJavacTaskScanner.java
+++ b/test/langtools/tools/javac/api/TestJavacTaskScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/TestOperators.java b/test/langtools/tools/javac/api/TestOperators.java
index 99448e3e389..62d4b51341a 100644
--- a/test/langtools/tools/javac/api/TestOperators.java
+++ b/test/langtools/tools/javac/api/TestOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/TestResolveIdent.java b/test/langtools/tools/javac/api/TestResolveIdent.java
index d5f5a6bb93e..aa2d2b5dff1 100644
--- a/test/langtools/tools/javac/api/TestResolveIdent.java
+++ b/test/langtools/tools/javac/api/TestResolveIdent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/TestTreePath.java b/test/langtools/tools/javac/api/TestTreePath.java
index 7a016f42545..089bee71b21 100644
--- a/test/langtools/tools/javac/api/TestTreePath.java
+++ b/test/langtools/tools/javac/api/TestTreePath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/guide/Test.java b/test/langtools/tools/javac/api/guide/Test.java
index 5bf881a590c..7ec840aaf81 100644
--- a/test/langtools/tools/javac/api/guide/Test.java
+++ b/test/langtools/tools/javac/api/guide/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/api/taskListeners/EventsBalancedTest.java b/test/langtools/tools/javac/api/taskListeners/EventsBalancedTest.java
index 759ec8d66ac..8c6dc156c15 100644
--- a/test/langtools/tools/javac/api/taskListeners/EventsBalancedTest.java
+++ b/test/langtools/tools/javac/api/taskListeners/EventsBalancedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/boxing/T6348760.java b/test/langtools/tools/javac/boxing/T6348760.java
index 010bcbfd324..c573f858a83 100644
--- a/test/langtools/tools/javac/boxing/T6348760.java
+++ b/test/langtools/tools/javac/boxing/T6348760.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/cast/5043020/T5043020.java b/test/langtools/tools/javac/cast/5043020/T5043020.java
index 13152c57a64..0653a15f9db 100644
--- a/test/langtools/tools/javac/cast/5043020/T5043020.java
+++ b/test/langtools/tools/javac/cast/5043020/T5043020.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/cast/6302214/T6302214a.java b/test/langtools/tools/javac/cast/6302214/T6302214a.java
index eeb8735e4a4..578c20f584a 100644
--- a/test/langtools/tools/javac/cast/6302214/T6302214a.java
+++ b/test/langtools/tools/javac/cast/6302214/T6302214a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/diags/ArgTypeCompilerFactory.java b/test/langtools/tools/javac/diags/ArgTypeCompilerFactory.java
index 823a0f01a7f..92a84963d65 100644
--- a/test/langtools/tools/javac/diags/ArgTypeCompilerFactory.java
+++ b/test/langtools/tools/javac/diags/ArgTypeCompilerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/diags/CheckResourceKeys.java b/test/langtools/tools/javac/diags/CheckResourceKeys.java
index 1675d99275e..b29fffd4148 100644
--- a/test/langtools/tools/javac/diags/CheckResourceKeys.java
+++ b/test/langtools/tools/javac/diags/CheckResourceKeys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/diags/examples/AttemptToSynchronizeOnInstanceOfVbc.java b/test/langtools/tools/javac/diags/examples/AttemptToSynchronizeOnInstanceOfVbc.java
index e677c4b3b8a..53a197ab741 100644
--- a/test/langtools/tools/javac/diags/examples/AttemptToSynchronizeOnInstanceOfVbc.java
+++ b/test/langtools/tools/javac/diags/examples/AttemptToSynchronizeOnInstanceOfVbc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/diags/examples/ImportModule.java b/test/langtools/tools/javac/diags/examples/ImportModule.java
index f924a59acd4..7a7363e90d3 100644
--- a/test/langtools/tools/javac/diags/examples/ImportModule.java
+++ b/test/langtools/tools/javac/diags/examples/ImportModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotRead/module-info.java b/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotRead/module-info.java
index 8c84bc009da..3450348de58 100644
--- a/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotRead/module-info.java
+++ b/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotRead/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotReadUnnamed.java b/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotReadUnnamed.java
index d25e7593170..c00b8592fd7 100644
--- a/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotReadUnnamed.java
+++ b/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotReadUnnamed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/diags/examples/ImportModuleNotFound.java b/test/langtools/tools/javac/diags/examples/ImportModuleNotFound.java
index 7e5f98e1a36..fb52bc02188 100644
--- a/test/langtools/tools/javac/diags/examples/ImportModuleNotFound.java
+++ b/test/langtools/tools/javac/diags/examples/ImportModuleNotFound.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/diags/examples/ReturnBeforeSuperclassInit.java b/test/langtools/tools/javac/diags/examples/ReturnBeforeSuperclassInit.java
index 033a8430625..01fc5e7a5a1 100644
--- a/test/langtools/tools/javac/diags/examples/ReturnBeforeSuperclassInit.java
+++ b/test/langtools/tools/javac/diags/examples/ReturnBeforeSuperclassInit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/diags/examples/TryResourceThrowsInterruptedExc.java b/test/langtools/tools/javac/diags/examples/TryResourceThrowsInterruptedExc.java
index 6d24a6c2a83..0fbcf3e2368 100644
--- a/test/langtools/tools/javac/diags/examples/TryResourceThrowsInterruptedExc.java
+++ b/test/langtools/tools/javac/diags/examples/TryResourceThrowsInterruptedExc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/enum/6424358/T6424358.java b/test/langtools/tools/javac/enum/6424358/T6424358.java
index 6a5d403ada5..535b1ddd7f3 100644
--- a/test/langtools/tools/javac/enum/6424358/T6424358.java
+++ b/test/langtools/tools/javac/enum/6424358/T6424358.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/enum/OkFinal.java b/test/langtools/tools/javac/enum/OkFinal.java
index a37de61ae5c..385e7998617 100644
--- a/test/langtools/tools/javac/enum/OkFinal.java
+++ b/test/langtools/tools/javac/enum/OkFinal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/enum/T5075242.java b/test/langtools/tools/javac/enum/T5075242.java
index 29e90bd39fd..6ada9e94ec4 100644
--- a/test/langtools/tools/javac/enum/T5075242.java
+++ b/test/langtools/tools/javac/enum/T5075242.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/fatalErrors/ImproveFatalErrorHandling.java b/test/langtools/tools/javac/fatalErrors/ImproveFatalErrorHandling.java
index 278d8863b4a..9db0199d4b2 100644
--- a/test/langtools/tools/javac/fatalErrors/ImproveFatalErrorHandling.java
+++ b/test/langtools/tools/javac/fatalErrors/ImproveFatalErrorHandling.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/5086027/T5086027pos.java b/test/langtools/tools/javac/generics/5086027/T5086027pos.java
index e1b00372580..c8be3a6156c 100644
--- a/test/langtools/tools/javac/generics/5086027/T5086027pos.java
+++ b/test/langtools/tools/javac/generics/5086027/T5086027pos.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/6192945/Method.java b/test/langtools/tools/javac/generics/6192945/Method.java
index 0d3698ad75d..96b63e817bb 100644
--- a/test/langtools/tools/javac/generics/6192945/Method.java
+++ b/test/langtools/tools/javac/generics/6192945/Method.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/6207386/Test.java b/test/langtools/tools/javac/generics/6207386/Test.java
index 7725abb6ceb..80bf99268a4 100644
--- a/test/langtools/tools/javac/generics/6207386/Test.java
+++ b/test/langtools/tools/javac/generics/6207386/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/6227936/T6227936.java b/test/langtools/tools/javac/generics/6227936/T6227936.java
index 8a9b32261a5..1ecb0762204 100644
--- a/test/langtools/tools/javac/generics/6227936/T6227936.java
+++ b/test/langtools/tools/javac/generics/6227936/T6227936.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/6245699/T6245699c.java b/test/langtools/tools/javac/generics/6245699/T6245699c.java
index 5105684a7c2..0db1fc5a230 100644
--- a/test/langtools/tools/javac/generics/6245699/T6245699c.java
+++ b/test/langtools/tools/javac/generics/6245699/T6245699c.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/6292765/T6292765.java b/test/langtools/tools/javac/generics/6292765/T6292765.java
index c58127f15f1..331645b5bad 100644
--- a/test/langtools/tools/javac/generics/6292765/T6292765.java
+++ b/test/langtools/tools/javac/generics/6292765/T6292765.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/6332204/T6332204.java b/test/langtools/tools/javac/generics/6332204/T6332204.java
index 6c61304cc6d..fd04b9fd5d0 100644
--- a/test/langtools/tools/javac/generics/6332204/T6332204.java
+++ b/test/langtools/tools/javac/generics/6332204/T6332204.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/6413682/TestPos.java b/test/langtools/tools/javac/generics/6413682/TestPos.java
index 1da09adc591..73143545917 100644
--- a/test/langtools/tools/javac/generics/6413682/TestPos.java
+++ b/test/langtools/tools/javac/generics/6413682/TestPos.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/T6391995.java b/test/langtools/tools/javac/generics/T6391995.java
index ef01a6405b2..3e992c36762 100644
--- a/test/langtools/tools/javac/generics/T6391995.java
+++ b/test/langtools/tools/javac/generics/T6391995.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/inference/5073060/T5073060a.java b/test/langtools/tools/javac/generics/inference/5073060/T5073060a.java
index be3364099b9..07004cef0fb 100644
--- a/test/langtools/tools/javac/generics/inference/5073060/T5073060a.java
+++ b/test/langtools/tools/javac/generics/inference/5073060/T5073060a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/inference/5081782/Pos.java b/test/langtools/tools/javac/generics/inference/5081782/Pos.java
index 5a0b3eb88ee..c9ea9affa35 100644
--- a/test/langtools/tools/javac/generics/inference/5081782/Pos.java
+++ b/test/langtools/tools/javac/generics/inference/5081782/Pos.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/inference/6215213/T6215213.java b/test/langtools/tools/javac/generics/inference/6215213/T6215213.java
index 98dd5ff1e3f..cedc2368677 100644
--- a/test/langtools/tools/javac/generics/inference/6215213/T6215213.java
+++ b/test/langtools/tools/javac/generics/inference/6215213/T6215213.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/inference/6278587/T6278587.java b/test/langtools/tools/javac/generics/inference/6278587/T6278587.java
index 76d7bdb4e8b..bdb34d580b7 100644
--- a/test/langtools/tools/javac/generics/inference/6278587/T6278587.java
+++ b/test/langtools/tools/javac/generics/inference/6278587/T6278587.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/inference/6302954/T6456971.java b/test/langtools/tools/javac/generics/inference/6302954/T6456971.java
index 03ba90132ae..6b206310d98 100644
--- a/test/langtools/tools/javac/generics/inference/6302954/T6456971.java
+++ b/test/langtools/tools/javac/generics/inference/6302954/T6456971.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/inference/6359106/T6359106.java b/test/langtools/tools/javac/generics/inference/6359106/T6359106.java
index 478cbf465c2..7c87d91ad3f 100644
--- a/test/langtools/tools/javac/generics/inference/6359106/T6359106.java
+++ b/test/langtools/tools/javac/generics/inference/6359106/T6359106.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/rawOverride/AttributeSet.java b/test/langtools/tools/javac/generics/rawOverride/AttributeSet.java
index c09dbdb29ff..e9f15bc25c5 100644
--- a/test/langtools/tools/javac/generics/rawOverride/AttributeSet.java
+++ b/test/langtools/tools/javac/generics/rawOverride/AttributeSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/rawOverride/T6178365.java b/test/langtools/tools/javac/generics/rawOverride/T6178365.java
index 9a7a97c76aa..a7000ccb99c 100644
--- a/test/langtools/tools/javac/generics/rawOverride/T6178365.java
+++ b/test/langtools/tools/javac/generics/rawOverride/T6178365.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/typevars/4856983/T4856983.java b/test/langtools/tools/javac/generics/typevars/4856983/T4856983.java
index ceac89e0397..ea1419b298e 100644
--- a/test/langtools/tools/javac/generics/typevars/4856983/T4856983.java
+++ b/test/langtools/tools/javac/generics/typevars/4856983/T4856983.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/typevars/5060485/Method.java b/test/langtools/tools/javac/generics/typevars/5060485/Method.java
index 2603727b411..a428962615c 100644
--- a/test/langtools/tools/javac/generics/typevars/5060485/Method.java
+++ b/test/langtools/tools/javac/generics/typevars/5060485/Method.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/typevars/5060485/Pos.java b/test/langtools/tools/javac/generics/typevars/5060485/Pos.java
index 29cc91f0c04..167d54417de 100644
--- a/test/langtools/tools/javac/generics/typevars/5060485/Pos.java
+++ b/test/langtools/tools/javac/generics/typevars/5060485/Pos.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/wildcards/6330931/T6330931.java b/test/langtools/tools/javac/generics/wildcards/6330931/T6330931.java
index db551e72b1e..6c274619cd8 100644
--- a/test/langtools/tools/javac/generics/wildcards/6330931/T6330931.java
+++ b/test/langtools/tools/javac/generics/wildcards/6330931/T6330931.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/wildcards/T5097548.java b/test/langtools/tools/javac/generics/wildcards/T5097548.java
index 46459ffa675..1a75210fb42 100644
--- a/test/langtools/tools/javac/generics/wildcards/T5097548.java
+++ b/test/langtools/tools/javac/generics/wildcards/T5097548.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/generics/wildcards/T5097548b.java b/test/langtools/tools/javac/generics/wildcards/T5097548b.java
index 2ce974fb2ca..5048acf6176 100644
--- a/test/langtools/tools/javac/generics/wildcards/T5097548b.java
+++ b/test/langtools/tools/javac/generics/wildcards/T5097548b.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/jvm/6397652/T6397652.java b/test/langtools/tools/javac/jvm/6397652/T6397652.java
index 3b6c78f4ed5..a27083902ee 100644
--- a/test/langtools/tools/javac/jvm/6397652/T6397652.java
+++ b/test/langtools/tools/javac/jvm/6397652/T6397652.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/lambda/LambdaExpr02.java b/test/langtools/tools/javac/lambda/LambdaExpr02.java
index d3526b54373..4f8e912fa4b 100644
--- a/test/langtools/tools/javac/lambda/LambdaExpr02.java
+++ b/test/langtools/tools/javac/lambda/LambdaExpr02.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/lib/DPrinter.java b/test/langtools/tools/javac/lib/DPrinter.java
index 5092e0698c2..3f89d459166 100644
--- a/test/langtools/tools/javac/lib/DPrinter.java
+++ b/test/langtools/tools/javac/lib/DPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/modules/AddModulesTest.java b/test/langtools/tools/javac/modules/AddModulesTest.java
index 080a5edda27..6f5d671e5fb 100644
--- a/test/langtools/tools/javac/modules/AddModulesTest.java
+++ b/test/langtools/tools/javac/modules/AddModulesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java b/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java
index d02f7816814..79972723167 100644
--- a/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java
+++ b/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/modules/EdgeCases.java b/test/langtools/tools/javac/modules/EdgeCases.java
index 39b72dda03a..187ff5ed277 100644
--- a/test/langtools/tools/javac/modules/EdgeCases.java
+++ b/test/langtools/tools/javac/modules/EdgeCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/modules/QueryBeforeEnter.java b/test/langtools/tools/javac/modules/QueryBeforeEnter.java
index 293b6302eec..e37c0348e9d 100644
--- a/test/langtools/tools/javac/modules/QueryBeforeEnter.java
+++ b/test/langtools/tools/javac/modules/QueryBeforeEnter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/multicatch/Pos10.java b/test/langtools/tools/javac/multicatch/Pos10.java
index d108c8f9671..d6650cfe53e 100644
--- a/test/langtools/tools/javac/multicatch/Pos10.java
+++ b/test/langtools/tools/javac/multicatch/Pos10.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/overload/T4494762.java b/test/langtools/tools/javac/overload/T4494762.java
index bc4c7c7ab62..f1d30d432fb 100644
--- a/test/langtools/tools/javac/overload/T4494762.java
+++ b/test/langtools/tools/javac/overload/T4494762.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/patterns/Domination.java b/test/langtools/tools/javac/patterns/Domination.java
index dd9d1153696..416f75494c1 100644
--- a/test/langtools/tools/javac/patterns/Domination.java
+++ b/test/langtools/tools/javac/patterns/Domination.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/patterns/PrettyTest.java b/test/langtools/tools/javac/patterns/PrettyTest.java
index 5f9c74b760e..420d3a16020 100644
--- a/test/langtools/tools/javac/patterns/PrettyTest.java
+++ b/test/langtools/tools/javac/patterns/PrettyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/patterns/SOEDeeplyNestedBlocksTest.java b/test/langtools/tools/javac/patterns/SOEDeeplyNestedBlocksTest.java
index 8f64b4cff37..1c96f174f06 100644
--- a/test/langtools/tools/javac/patterns/SOEDeeplyNestedBlocksTest.java
+++ b/test/langtools/tools/javac/patterns/SOEDeeplyNestedBlocksTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/patterns/SyntheticVariables.java b/test/langtools/tools/javac/patterns/SyntheticVariables.java
new file mode 100644
index 00000000000..26ece40d656
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/SyntheticVariables.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8372635
+ * @enablePreview
+ * @summary Verify temporary variables created for pattern matching are
+ *          marked as synthetic.
+ * @compile -g SyntheticVariables.java
+ * @run main SyntheticVariables
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.classfile.Attributes;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.attribute.CodeAttribute;
+import java.lang.classfile.attribute.LocalVariableTableAttribute;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class SyntheticVariables {
+
+    public static void main(String[] args) throws IOException {
+        try (InputStream in = Test.class.getClassLoader().getResource(Test.class.getName().replace('.', '/') + ".class").openStream()) {
+            ClassModel model = ClassFile.of().parse(in.readAllBytes());
+            Map<String, MethodModel> name2Method = model.methods().stream().collect(Collectors.toMap(m -> m.methodName().stringValue(), m -> m));
+            assertEquals(Set.of("str", "b", "b2", "this", "l", "o"), localVars(name2Method.get("testInMethod")));
+            assertEquals(Set.of("str", "b", "b2", "l", "o"), localVars(name2Method.get("lambda$testInLambda$0")));
+        }
+    }
+
+    private static Set<String> localVars(MethodModel method) {
+        CodeAttribute code = method.findAttribute(Attributes.code()).orElseThrow();
+        LocalVariableTableAttribute lvt = code.findAttribute(Attributes.localVariableTable()).orElseThrow();
+        return lvt.localVariables()
+                  .stream()
+                  .map(info -> info.name().stringValue())
+                  .collect(Collectors.toSet());
+    }
+
+    private static void assertEquals(Set<String> expected, Set<String> actual) {
+        if (!Objects.equals(expected, actual)) {
+            throw new AssertionError("Unexpected value, expected: " + expected +
+                                     ", got: " + actual);
+        }
+    }
+
+    public record Test(Object o) {
+        private void testInMethod() {
+            Object o = create();
+
+            //synthetic variable for the instanceof's expression
+            boolean b = o.toString() instanceof String str && str.isEmpty();
+
+            System.err.println(b);
+
+            //synthetic variable for the switch's selector and index:
+            switch (create()) {
+                //synthetic variable for the nested component values,
+                //and for the synthetic catch over the getters
+                case Test(Test(String str)) when str.isEmpty() -> System.err.println(1);
+                case Test(Test(String str)) -> System.err.println(2);
+                default -> System.err.println(2);
+            }
+
+            List<Integer> l = List.of(0);
+
+            //synthetic variable for case where the static and dynamic types
+            //don't match for primitive patterns:
+            boolean b2 = l.get(0) instanceof int;
+
+            System.err.println(b2);
+        }
+
+        private void testInLambda() {
+            Object o = create();
+            Runnable r = () -> {
+
+                //synthetic variable for the instanceof's expression
+                boolean b = o.toString() instanceof String str && str.isEmpty();
+
+                System.err.println(b);
+
+                //synthetic variable for the switch's selector and index:
+                switch (create()) {
+                    //synthetic variable for the nested component values,
+                    //and for the synthetic catch over the getters
+                    case Test(Test(String str)) when str.isEmpty() -> System.err.println(1);
+                    case Test(Test(String str)) -> System.err.println(2);
+                    default -> System.err.println(2);
+                }
+
+                List<Integer> l = List.of(0);
+
+                //synthetic variable for case where the static and dynamic types
+                //don't match for primitive patterns:
+                boolean b2 = l.get(0) instanceof int;
+
+                System.err.println(b2);
+            };
+        }
+        private static String val = "v";
+        public static Test create() {
+            try {
+                return new Test(new Test(val));
+            } finally {
+                val += val;
+            }
+        }
+    }
+}
diff --git a/test/langtools/tools/javac/patterns/T8332463a.java b/test/langtools/tools/javac/patterns/T8332463a.java
index 2501a330af2..47da64366f8 100644
--- a/test/langtools/tools/javac/patterns/T8332463a.java
+++ b/test/langtools/tools/javac/patterns/T8332463a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/patterns/T8332463b.java b/test/langtools/tools/javac/patterns/T8332463b.java
index 73338b2bd8a..cfc1af8a43a 100644
--- a/test/langtools/tools/javac/patterns/T8332463b.java
+++ b/test/langtools/tools/javac/patterns/T8332463b.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/positions/T6402077.java b/test/langtools/tools/javac/positions/T6402077.java
index 66caa9c282e..2e067244658 100644
--- a/test/langtools/tools/javac/positions/T6402077.java
+++ b/test/langtools/tools/javac/positions/T6402077.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/positions/T6404194.java b/test/langtools/tools/javac/positions/T6404194.java
index 18b07ad8af1..939fcb0a7bb 100644
--- a/test/langtools/tools/javac/positions/T6404194.java
+++ b/test/langtools/tools/javac/positions/T6404194.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/positions/TreeEndPosTest.java b/test/langtools/tools/javac/positions/TreeEndPosTest.java
index dc87409f4b2..19478d268da 100644
--- a/test/langtools/tools/javac/positions/TreeEndPosTest.java
+++ b/test/langtools/tools/javac/positions/TreeEndPosTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/processing/6348499/T6348499.java b/test/langtools/tools/javac/processing/6348499/T6348499.java
index 266caa1e14f..870aacad8af 100644
--- a/test/langtools/tools/javac/processing/6348499/T6348499.java
+++ b/test/langtools/tools/javac/processing/6348499/T6348499.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/processing/6359313/T6359313.java b/test/langtools/tools/javac/processing/6359313/T6359313.java
index b3854099075..25a64245190 100644
--- a/test/langtools/tools/javac/processing/6359313/T6359313.java
+++ b/test/langtools/tools/javac/processing/6359313/T6359313.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/processing/6413690/T6413690.java b/test/langtools/tools/javac/processing/6413690/T6413690.java
index b0945991bd2..65706124b7d 100644
--- a/test/langtools/tools/javac/processing/6413690/T6413690.java
+++ b/test/langtools/tools/javac/processing/6413690/T6413690.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/processing/6414633/T6414633.java b/test/langtools/tools/javac/processing/6414633/T6414633.java
index 5ee7b5e646d..d2a88249b9d 100644
--- a/test/langtools/tools/javac/processing/6414633/T6414633.java
+++ b/test/langtools/tools/javac/processing/6414633/T6414633.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/processing/6430209/T6430209.java b/test/langtools/tools/javac/processing/6430209/T6430209.java
index 1371b7c09d6..7064d9bf428 100644
--- a/test/langtools/tools/javac/processing/6430209/T6430209.java
+++ b/test/langtools/tools/javac/processing/6430209/T6430209.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/processing/T6439826.java b/test/langtools/tools/javac/processing/T6439826.java
index fed293d4e5e..008dfd3942d 100644
--- a/test/langtools/tools/javac/processing/T6439826.java
+++ b/test/langtools/tools/javac/processing/T6439826.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/processing/T8142931.java b/test/langtools/tools/javac/processing/T8142931.java
index 8ade5e19767..77c07328124 100644
--- a/test/langtools/tools/javac/processing/T8142931.java
+++ b/test/langtools/tools/javac/processing/T8142931.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/processing/errors/TestReturnCode.java b/test/langtools/tools/javac/processing/errors/TestReturnCode.java
index 5ca6a50e3c6..10d962e1d4b 100644
--- a/test/langtools/tools/javac/processing/errors/TestReturnCode.java
+++ b/test/langtools/tools/javac/processing/errors/TestReturnCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/processing/filer/TestPackageInfo.java b/test/langtools/tools/javac/processing/filer/TestPackageInfo.java
index 1b11c75acde..214be4e0cbe 100644
--- a/test/langtools/tools/javac/processing/filer/TestPackageInfo.java
+++ b/test/langtools/tools/javac/processing/filer/TestPackageInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/processing/model/6194785/T6194785.java b/test/langtools/tools/javac/processing/model/6194785/T6194785.java
index c8f09ba8c95..918741d967c 100644
--- a/test/langtools/tools/javac/processing/model/6194785/T6194785.java
+++ b/test/langtools/tools/javac/processing/model/6194785/T6194785.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/processing/model/LocalInAnonymous.java b/test/langtools/tools/javac/processing/model/LocalInAnonymous.java
index 616062bb542..4ee869e38b0 100644
--- a/test/langtools/tools/javac/processing/model/LocalInAnonymous.java
+++ b/test/langtools/tools/javac/processing/model/LocalInAnonymous.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/processing/model/testgetallmembers/Main.java b/test/langtools/tools/javac/processing/model/testgetallmembers/Main.java
index 4d35b9ae747..f861bf7a4a3 100644
--- a/test/langtools/tools/javac/processing/model/testgetallmembers/Main.java
+++ b/test/langtools/tools/javac/processing/model/testgetallmembers/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/processing/options/TestNoteOnImplicitProcessing.java b/test/langtools/tools/javac/processing/options/TestNoteOnImplicitProcessing.java
index 181c29eeb56..df2d5bfcd52 100644
--- a/test/langtools/tools/javac/processing/options/TestNoteOnImplicitProcessing.java
+++ b/test/langtools/tools/javac/processing/options/TestNoteOnImplicitProcessing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/processing/options/Xprint.java b/test/langtools/tools/javac/processing/options/Xprint.java
index 51df77afef9..d38baad6a92 100644
--- a/test/langtools/tools/javac/processing/options/Xprint.java
+++ b/test/langtools/tools/javac/processing/options/Xprint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/processing/rounds/CompleteOnClosed.java b/test/langtools/tools/javac/processing/rounds/CompleteOnClosed.java
index f724d605e51..838ce124c99 100644
--- a/test/langtools/tools/javac/processing/rounds/CompleteOnClosed.java
+++ b/test/langtools/tools/javac/processing/rounds/CompleteOnClosed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/scope/6225935/T6225935.java b/test/langtools/tools/javac/scope/6225935/T6225935.java
index 555293ca030..9a43c047ee6 100644
--- a/test/langtools/tools/javac/scope/6225935/T6225935.java
+++ b/test/langtools/tools/javac/scope/6225935/T6225935.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/scope/6225935/T6381787.java b/test/langtools/tools/javac/scope/6225935/T6381787.java
index 7a658b9e5f8..1d18a1c3443 100644
--- a/test/langtools/tools/javac/scope/6225935/T6381787.java
+++ b/test/langtools/tools/javac/scope/6225935/T6381787.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/scope/6225935/Test.java b/test/langtools/tools/javac/scope/6225935/Test.java
index 1efc260c1fc..04fc6e3508c 100644
--- a/test/langtools/tools/javac/scope/6225935/Test.java
+++ b/test/langtools/tools/javac/scope/6225935/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/scope/6392998/T6392998.java b/test/langtools/tools/javac/scope/6392998/T6392998.java
index 353d9d56233..9360f06f5e3 100644
--- a/test/langtools/tools/javac/scope/6392998/T6392998.java
+++ b/test/langtools/tools/javac/scope/6392998/T6392998.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/sealed/SealedDiffConfigurationsTest.java b/test/langtools/tools/javac/sealed/SealedDiffConfigurationsTest.java
index ddadec7d862..d5ea509fbed 100644
--- a/test/langtools/tools/javac/sealed/SealedDiffConfigurationsTest.java
+++ b/test/langtools/tools/javac/sealed/SealedDiffConfigurationsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/sym/ElementStructureTest.java b/test/langtools/tools/javac/sym/ElementStructureTest.java
index 14fa194501a..16ab7f4fde4 100644
--- a/test/langtools/tools/javac/sym/ElementStructureTest.java
+++ b/test/langtools/tools/javac/sym/ElementStructureTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/tree/VarTree.java b/test/langtools/tools/javac/tree/VarTree.java
index 2c70d5eb317..6efd080bd4f 100644
--- a/test/langtools/tools/javac/tree/VarTree.java
+++ b/test/langtools/tools/javac/tree/VarTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/types/UnknownTypeTest.java b/test/langtools/tools/javac/types/UnknownTypeTest.java
index e79c583f142..780c23c4004 100644
--- a/test/langtools/tools/javac/types/UnknownTypeTest.java
+++ b/test/langtools/tools/javac/types/UnknownTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/unicode/FirstChar.java b/test/langtools/tools/javac/unicode/FirstChar.java
index 261538ab91b..ebe63ebdda9 100644
--- a/test/langtools/tools/javac/unicode/FirstChar.java
+++ b/test/langtools/tools/javac/unicode/FirstChar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/unit/T6198196.java b/test/langtools/tools/javac/unit/T6198196.java
index 3c75cc34477..d1a57b20ba4 100644
--- a/test/langtools/tools/javac/unit/T6198196.java
+++ b/test/langtools/tools/javac/unit/T6198196.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/unit/util/convert/EnclosingCandidates.java b/test/langtools/tools/javac/unit/util/convert/EnclosingCandidates.java
index 7a96872f663..db318315a25 100644
--- a/test/langtools/tools/javac/unit/util/convert/EnclosingCandidates.java
+++ b/test/langtools/tools/javac/unit/util/convert/EnclosingCandidates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/unit/util/list/AbstractList.java b/test/langtools/tools/javac/unit/util/list/AbstractList.java
index 38cdd7c5e78..e392f595efe 100644
--- a/test/langtools/tools/javac/unit/util/list/AbstractList.java
+++ b/test/langtools/tools/javac/unit/util/list/AbstractList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/unit/util/list/FromArray.java b/test/langtools/tools/javac/unit/util/list/FromArray.java
index eabdb71e148..cac983c63ae 100644
--- a/test/langtools/tools/javac/unit/util/list/FromArray.java
+++ b/test/langtools/tools/javac/unit/util/list/FromArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/javac/util/filemanager/TestName.java b/test/langtools/tools/javac/util/filemanager/TestName.java
index 23bb2b9c781..2435a1179d0 100644
--- a/test/langtools/tools/javac/util/filemanager/TestName.java
+++ b/test/langtools/tools/javac/util/filemanager/TestName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java b/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java
index 52db62dd41a..87099d44b48 100644
--- a/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java
+++ b/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/jnativescan/TestMissingSystemClass.java b/test/langtools/tools/jnativescan/TestMissingSystemClass.java
index 8b6266aa5d7..2d2218b38c8 100644
--- a/test/langtools/tools/jnativescan/TestMissingSystemClass.java
+++ b/test/langtools/tools/jnativescan/TestMissingSystemClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/jnativescan/cases/classpath/missingsystem/App.java b/test/langtools/tools/jnativescan/cases/classpath/missingsystem/App.java
index 05812be45ce..f863d1e6618 100644
--- a/test/langtools/tools/jnativescan/cases/classpath/missingsystem/App.java
+++ b/test/langtools/tools/jnativescan/cases/classpath/missingsystem/App.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/lib/toolbox/JavacTask.java b/test/langtools/tools/lib/toolbox/JavacTask.java
index c067764c9d3..9eaa6b62605 100644
--- a/test/langtools/tools/lib/toolbox/JavacTask.java
+++ b/test/langtools/tools/lib/toolbox/JavacTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/langtools/tools/lib/types/TypeHarness.java b/test/langtools/tools/lib/types/TypeHarness.java
index 296ea8d3f9b..8bb0981f9bf 100644
--- a/test/langtools/tools/lib/types/TypeHarness.java
+++ b/test/langtools/tools/lib/types/TypeHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/lib/jdk/test/lib/NetworkConfiguration.java b/test/lib/jdk/test/lib/NetworkConfiguration.java
index a9e6821b2e6..bd6a1360d41 100644
--- a/test/lib/jdk/test/lib/NetworkConfiguration.java
+++ b/test/lib/jdk/test/lib/NetworkConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/lib/jdk/test/lib/SA/SATestUtils.java b/test/lib/jdk/test/lib/SA/SATestUtils.java
index cdb0caf84d4..01233b5bf55 100644
--- a/test/lib/jdk/test/lib/SA/SATestUtils.java
+++ b/test/lib/jdk/test/lib/SA/SATestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/lib/jdk/test/lib/containers/cgroup/MetricsTesterCgroupV2.java b/test/lib/jdk/test/lib/containers/cgroup/MetricsTesterCgroupV2.java
index 2a756102ded..4f0aab508de 100644
--- a/test/lib/jdk/test/lib/containers/cgroup/MetricsTesterCgroupV2.java
+++ b/test/lib/jdk/test/lib/containers/cgroup/MetricsTesterCgroupV2.java
@@ -121,7 +121,8 @@ public class MetricsTesterCgroupV2 implements CgroupMetricsTester {
     private long getLongValueEntryFromFile(String file, String metric) {
         Path filePath = Paths.get(UNIFIED.getPath(), file);
         try {
-            String strVal = Files.lines(filePath).filter(l -> l.startsWith(metric)).collect(Collectors.joining());
+            String strVal = Files.lines(filePath)
+                                 .filter(l -> l.matches("^" + metric + "\\s+.*")).collect(Collectors.joining());
             if (strVal.isEmpty()) {
                 // sometimes the match for the metric does not exist, e.g. cpu.stat's nr_periods iff the controller
                 // is not enabled
diff --git a/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java b/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java
index b9ea60c9fb7..c8c396013b0 100644
--- a/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java
+++ b/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
index ec3e6d773b1..b013561be0b 100644
--- a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
+++ b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
@@ -38,6 +38,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.regex.Pattern;
 import jdk.internal.platform.Metrics;
 import jdk.test.lib.Container;
 import jdk.test.lib.Utils;
@@ -290,7 +291,9 @@ public class DockerTestUtils {
      * @throws Exception
      */
     public static void removeDockerImage(String imageNameAndTag) throws Exception {
+        if(!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
             execute(Container.ENGINE_COMMAND, "rmi", "--force", imageNameAndTag);
+        }
     }
 
 
@@ -341,6 +344,16 @@ public class DockerTestUtils {
         return output;
     }
 
+    public static void shouldMatchWithValue(OutputAnalyzer output, String metric, String value) throws Exception {
+        String pattern = "^" + Pattern.quote(metric) + ":\\s*" + Pattern.quote(value) + ".*$";
+        output.shouldMatch(pattern);
+    }
+
+    public static void shouldNotMatchWithValue(OutputAnalyzer output, String metric, String value) throws Exception {
+        String pattern = "^" + Pattern.quote(metric) + ":\\s*" + Pattern.quote(value) + ".*$";
+        output.shouldNotMatch(pattern);
+    }
+
 
     private static void writeOutputToFile(String output, String fileName) throws Exception {
         try (FileWriter fw = new FileWriter(fileName)) {
diff --git a/test/lib/jdk/test/lib/helpers/ClassFileInstaller.java b/test/lib/jdk/test/lib/helpers/ClassFileInstaller.java
index 72038191d79..ba585581e78 100644
--- a/test/lib/jdk/test/lib/helpers/ClassFileInstaller.java
+++ b/test/lib/jdk/test/lib/helpers/ClassFileInstaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/lib/jdk/test/lib/net/SimpleSSLContext.java b/test/lib/jdk/test/lib/net/SimpleSSLContext.java
index 3c26809f128..3e0d362cc23 100644
--- a/test/lib/jdk/test/lib/net/SimpleSSLContext.java
+++ b/test/lib/jdk/test/lib/net/SimpleSSLContext.java
@@ -23,61 +23,102 @@
 
 package jdk.test.lib.net;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.*;
 import java.io.*;
 import java.security.*;
-import java.security.cert.*;
-import java.util.function.Supplier;
 import javax.net.ssl.*;
 
 /**
- * Creates a simple usable SSLContext for SSLSocketFactory
- * or a HttpsServer using either a given keystore or a default
- * one in the test tree.
+ * Utility for creating a simple usable {@link SSLContext} for testing purposes.
  */
-public class SimpleSSLContext {
+public final class SimpleSSLContext {
 
-    SSLContext ssl;
+    private static final String DEFAULT_PROTOCOL = "TLS";
 
-    /**
-     * loads default keystore from SimpleSSLContext
-     * source directory
-     */
+    private static final String DEFAULT_KEY_STORE_FILE_REL_PATH = "jdk/test/lib/net/testkeys";
+
+    private final SSLContext ssl;
+
+    // Made `public` for backward compatibility
     public SimpleSSLContext() throws IOException {
-        this(() -> "TLS");
+        this.ssl = findSSLContext(DEFAULT_KEY_STORE_FILE_REL_PATH, DEFAULT_PROTOCOL);
     }
 
-    private SimpleSSLContext(Supplier<String> protocols) throws IOException {
-        String proto = protocols.get();
-        String paths = System.getProperty("test.src.path");
-        StringTokenizer st = new StringTokenizer(paths, File.pathSeparator);
-        while (st.hasMoreTokens()) {
-            String path = st.nextToken();
-            File f = new File(path, "jdk/test/lib/net/testkeys");
-            if (f.exists()) {
-                try (FileInputStream fis = new FileInputStream(f)) {
-                    init(fis, proto);
-                    break;
-                }
+    // Kept for backward compatibility
+    public SimpleSSLContext(String keyStoreFileRelPath) throws IOException {
+        this.ssl = findSSLContext(Objects.requireNonNull(keyStoreFileRelPath), DEFAULT_PROTOCOL);
+    }
+
+    /**
+     * {@return a new {@link SSLContext} instance by searching for a key store
+     * file path, and loading the first found one}
+     *
+     * @throws RuntimeException if no key store file can be found or the found
+     * one cannot be loaded
+     */
+    public static SSLContext findSSLContext() {
+        return findSSLContext(DEFAULT_PROTOCOL);
+    }
+
+    /**
+     * {@return a new {@link SSLContext} instance by searching for a key store
+     * file path, and loading the first found one}
+     *
+     * @param protocol an {@link SSLContext} protocol
+     *
+     * @throws NullPointerException if {@code protocol} is null
+     * @throws RuntimeException if no key store file can be found or the found
+     * one cannot be loaded
+     */
+    public static SSLContext findSSLContext(String protocol) {
+        Objects.requireNonNull(protocol);
+        return findSSLContext(DEFAULT_KEY_STORE_FILE_REL_PATH, protocol);
+    }
+
+    /**
+     * {@return a new {@link SSLContext} instance by searching for a key store
+     * file path, and loading the first found one}
+     *
+     * @param keyStoreFileRelPath a key store file path to be concatenated with
+     *                            the search path(s) obtained from the
+     *                            {@code test.src.path} system property
+     * @param protocol an {@link SSLContext} protocol
+     *
+     * @throws NullPointerException if {@code keyStoreFileRelPath} or {@code protocol} is null
+     * @throws RuntimeException if no key store file can be found or the found
+     * one cannot be loaded
+     */
+    public static SSLContext findSSLContext(String keyStoreFileRelPath, String protocol) {
+        Objects.requireNonNull(keyStoreFileRelPath);
+        Objects.requireNonNull(protocol);
+        var sourcePaths = System.getProperty("test.src.path");
+        for (var sourcePath : Collections.list(new StringTokenizer(sourcePaths, File.pathSeparator))) {
+            var keyStoreFileAbsPath = Path.of((String) sourcePath, keyStoreFileRelPath);
+            if (Files.exists(keyStoreFileAbsPath)) {
+                return loadSSLContext(keyStoreFileAbsPath, protocol);
             }
         }
+        throw new RuntimeException(
+                "Could not find any key store at source path(s) '%s' using key store file relative path '%s'".formatted(
+                        sourcePaths, keyStoreFileRelPath));
     }
 
     /**
-     * loads default keystore from given directory
+     * {@return a new {@link SSLContext} loaded from the provided key store file
+     * path using the given protocol}
+     *
+     * @param keyStoreFilePath a {@link KeyStore} file path
+     * @param protocol an {@link SSLContext} protocol
+     *
+     * @throws RuntimeException if loading fails
      */
-    public SimpleSSLContext(String dir) throws IOException {
-        String file = dir + "/testkeys";
-        try (FileInputStream fis = new FileInputStream(file)) {
-            init(fis, "TLS");
-        }
-    }
-
-    private void init(InputStream i, String protocol) throws IOException {
-        try {
+    private static SSLContext loadSSLContext(Path keyStoreFilePath, String protocol) {
+        try (var storeStream = Files.newInputStream(keyStoreFilePath)) {
             char[] passphrase = "passphrase".toCharArray();
             KeyStore ks = KeyStore.getInstance("PKCS12");
-            ks.load(i, passphrase);
+            ks.load(storeStream, passphrase);
 
             KeyManagerFactory kmf = KeyManagerFactory.getInstance("PKIX");
             kmf.init(ks, passphrase);
@@ -85,25 +126,30 @@ public class SimpleSSLContext {
             TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
             tmf.init(ks);
 
-            ssl = SSLContext.getInstance(protocol);
-            ssl.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-        } catch (KeyManagementException | KeyStoreException |
-                UnrecoverableKeyException | CertificateException |
-                NoSuchAlgorithmException e) {
-            throw new RuntimeException(e.getMessage());
+            var sslContext = SSLContext.getInstance(protocol);
+            sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+            return sslContext;
+        } catch (Exception e) {
+            var message = "Failed loading 'SSLContext' from key store at location '%s' for protocol '%s'".formatted(
+                    keyStoreFilePath, protocol);
+            throw new RuntimeException(message, e);
         }
     }
 
+    // Kept for backward compatibility
     public static SSLContext getContext(String protocol) throws IOException {
-        if(protocol == null || protocol.isEmpty()) {
-            return new SimpleSSLContext().get();
-        }
-        else {
-            return new SimpleSSLContext(() -> protocol).get();
+        try {
+            return protocol == null || protocol.isEmpty()
+                    ? findSSLContext()
+                    : findSSLContext(protocol);
+        } catch (RuntimeException re) {
+            throw new IOException(re);
         }
     }
 
+    // Kept for backward compatibility
     public SSLContext get() {
         return ssl;
     }
+
 }
diff --git a/test/lib/jdk/test/whitebox/WhiteBox.java b/test/lib/jdk/test/whitebox/WhiteBox.java
index 8e30c089bcb..cc570caef7c 100644
--- a/test/lib/jdk/test/whitebox/WhiteBox.java
+++ b/test/lib/jdk/test/whitebox/WhiteBox.java
@@ -77,6 +77,7 @@ public class WhiteBox {
   public native long getVMLargePageSize();
   public native long getHeapSpaceAlignment();
   public native long getHeapAlignment();
+  public native long getMinimumJavaStackSize();
 
   public native boolean  shipsFullDebugInfo();
   public native boolean  shipsPublicDebugInfo();
diff --git a/test/lib/jdk/test/whitebox/code/CodeBlob.java b/test/lib/jdk/test/whitebox/code/CodeBlob.java
index fd95b5a7e7d..a3ab74ac14f 100644
--- a/test/lib/jdk/test/whitebox/code/CodeBlob.java
+++ b/test/lib/jdk/test/whitebox/code/CodeBlob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/make/autoconf/test.m4 b/test/make/autoconf/test.m4
index 0aa002ef9bf..c4b8b0ebbac 100644
--- a/test/make/autoconf/test.m4
+++ b/test/make/autoconf/test.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/java/lang/FPComparison.java b/test/micro/org/openjdk/bench/java/lang/FPComparison.java
index 18b2b79c7bd..e6b2ab2d39a 100644
--- a/test/micro/org/openjdk/bench/java/lang/FPComparison.java
+++ b/test/micro/org/openjdk/bench/java/lang/FPComparison.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/AllocFromSliceTest.java b/test/micro/org/openjdk/bench/java/lang/foreign/AllocFromSliceTest.java
index 58c17f09997..c650be88f46 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/AllocFromSliceTest.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/AllocFromSliceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayCriticalXorOpImpl.java b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayCriticalXorOpImpl.java
index fb43bf90455..28f3e5dc716 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayCriticalXorOpImpl.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayCriticalXorOpImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayElementsXorOpImpl.java b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayElementsXorOpImpl.java
index deb121e3fa9..4b2815fb3b9 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayElementsXorOpImpl.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayElementsXorOpImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpCriticalImpl.java b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpCriticalImpl.java
index 123e6d20b7c..9bb6fc9788a 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpCriticalImpl.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpCriticalImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpImpl.java b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpImpl.java
index 481449c5f42..d1a8385dbb3 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpImpl.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpInitImpl.java b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpInitImpl.java
index 6722f21b380..61298b7bc71 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpInitImpl.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayForeignXorOpInitImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayRegionXorOpImpl.java b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayRegionXorOpImpl.java
index 937f9bfee92..bc165a05ff6 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayRegionXorOpImpl.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayRegionXorOpImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/xor/XorOp.java b/test/micro/org/openjdk/bench/java/lang/foreign/xor/XorOp.java
index 18b5f4de339..9cb1793fb50 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/xor/XorOp.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/xor/XorOp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/xor/libjnitest.c b/test/micro/org/openjdk/bench/java/lang/foreign/xor/libjnitest.c
index b311ff0617b..c58df58aedc 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/xor/libjnitest.c
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/xor/libjnitest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/java/security/Signatures.java b/test/micro/org/openjdk/bench/java/security/Signatures.java
index 1216e253663..b72a4077045 100644
--- a/test/micro/org/openjdk/bench/java/security/Signatures.java
+++ b/test/micro/org/openjdk/bench/java/security/Signatures.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (C) 2022, Tencent. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -31,84 +32,142 @@ import java.util.concurrent.TimeUnit;
 
 @BenchmarkMode(Mode.Throughput)
 @OutputTimeUnit(TimeUnit.SECONDS)
-@State(Scope.Thread)
 @Warmup(iterations = 5, time = 1)
 @Measurement(iterations = 5, time = 1)
 @Fork(jvmArgs = {"-Xms1024m", "-Xmx1024m", "-Xmn768m", "-XX:+UseParallelGC"}, value = 3)
 public class Signatures {
-    private static Signature signer;
 
-    @Param({"64", "512", "2048", "16384"})
-    private static int messageLength;
-
-    @Param({"secp256r1", "secp384r1", "secp521r1"})
-    private String algorithm;
-
-    private static byte[] message;
-
-    @Setup
-    public void setup() throws Exception {
-        message = new byte[messageLength];
-        (new Random(System.nanoTime())).nextBytes(message);
-
-        String signName = switch (algorithm) {
-            case "secp256r1" -> "SHA256withECDSA";
-            case "secp384r1" -> "SHA384withECDSA";
-            case "secp521r1" -> "SHA512withECDSA";
-            default -> throw new RuntimeException();
-        };
-
-        AlgorithmParameters params =
-                AlgorithmParameters.getInstance("EC", "SunEC");
-        params.init(new ECGenParameterSpec(algorithm));
-        ECGenParameterSpec ecParams =
-                params.getParameterSpec(ECGenParameterSpec.class);
-
-        KeyPairGenerator kpg =
-                KeyPairGenerator.getInstance("EC", "SunEC");
-        kpg.initialize(ecParams);
-        KeyPair kp = kpg.generateKeyPair();
-
-        signer = Signature.getInstance(signName, "SunEC");
-        signer.initSign(kp.getPrivate());
+    @State(Scope.Benchmark)
+    public static class test01 {
+        @Param({"64", "512", "2048", "16384"})
+        private int messageLength;
+        @Param({"secp256r1", "secp384r1", "secp521r1"})
+        private String algorithm;
+    }
+    @State(Scope.Benchmark)
+    public static class test02 {
+        @Param({"64", "512", "2048", "16384"})
+        private int messageLength;
+        @Param({"Ed25519", "Ed448"})
+        private String algorithm;
+    }
+    @State(Scope.Benchmark)
+    public static class test03 {
+        @Param({"64", "512", "2048", "16384"})
+        private int messageLength;
+        @Param({"SHA256withDSA", "SHA384withDSA", "SHA512withDSA"})
+        private String algorithm;
+    }
+    @State(Scope.Benchmark)
+    public static class test04 {
+        @Param({"64", "512", "2048", "16384"})
+        private int messageLength;
+        @Param({"SHA256withRSA", "SHA384withRSA", "SHA512withRSA"})
+        private String algorithm;
+    }
+    @State(Scope.Benchmark)
+    public static class test05 {
+        @Param({"64", "512", "2048", "16384"})
+        private int messageLength;
+        @Param({"SHA256", "SHA384", "SHA512"})
+        private String algorithm;
     }
 
     @Benchmark
-    public byte[] sign() throws SignatureException {
-        signer.update(message);
-        return signer.sign();
+    public byte[] ECDSA(s1 state) throws Exception {
+        state.signer.update(state.message);
+        return state.signer.sign();
     }
 
-    public static class EdDSA extends Signatures {
-        @Param({"Ed25519", "Ed448"})
-        private String algorithm;
+    @Benchmark
+    public byte[] EdDSA(s2 state) throws Exception {
+        state.signer.update(state.message);
+        return state.signer.sign();
+    }
+
+    @Benchmark
+    public byte[] DSA(s3 state) throws Exception {
+        state.signer.update(state.message);
+        return state.signer.sign();
+    }
+
+    @Benchmark
+    public byte[] RSA(s4 state) throws Exception {
+        state.signer.update(state.message);
+        return state.signer.sign();
+    }
+
+    @Benchmark
+    public byte[] RSASSAPSS(s5 state) throws Exception {
+        state.signer.update(state.message);
+        return state.signer.sign();
+    }
+
+    @State(Scope.Thread)
+    public static class s1 {
+        private Signature signer;
+        private byte[] message;
 
         @Setup
-        public void setup() throws Exception {
-            message = new byte[messageLength];
+        public void setup(test01 test) throws Exception {
+            message = new byte[test.messageLength];
             (new Random(System.nanoTime())).nextBytes(message);
 
+            String signName = switch (test.algorithm) {
+                case "secp256r1" -> "SHA256withECDSA";
+                case "secp384r1" -> "SHA384withECDSA";
+                case "secp521r1" -> "SHA512withECDSA";
+                default -> throw new RuntimeException();
+            };
+
+            AlgorithmParameters params =
+                    AlgorithmParameters.getInstance("EC", "SunEC");
+            params.init(new ECGenParameterSpec(test.algorithm));
+            ECGenParameterSpec ecParams =
+                    params.getParameterSpec(ECGenParameterSpec.class);
+
             KeyPairGenerator kpg =
-                    KeyPairGenerator.getInstance(algorithm, "SunEC");
-            NamedParameterSpec spec = new NamedParameterSpec(algorithm);
-            kpg.initialize(spec);
+                    KeyPairGenerator.getInstance("EC", "SunEC");
+            kpg.initialize(ecParams);
             KeyPair kp = kpg.generateKeyPair();
 
-            signer = Signature.getInstance(algorithm, "SunEC");
+            signer = Signature.getInstance(signName, "SunEC");
             signer.initSign(kp.getPrivate());
         }
     }
 
-    public static class DSA extends Signatures {
-        @Param({"SHA256withDSA", "SHA384withDSA", "SHA512withDSA"})
-        private String algorithm;
+    @State(Scope.Thread)
+    public static class s2 {
+        private Signature signer;
+        private byte[] message;
 
         @Setup
-        public void setup() throws Exception {
-            message = new byte[messageLength];
+        public void setup(test02 test) throws Exception {
+            message = new byte[test.messageLength];
             (new Random(System.nanoTime())).nextBytes(message);
 
-            int keyLength = switch (algorithm) {
+            KeyPairGenerator kpg =
+                    KeyPairGenerator.getInstance(test.algorithm, "SunEC");
+            NamedParameterSpec spec = new NamedParameterSpec(test.algorithm);
+            kpg.initialize(spec);
+            KeyPair kp = kpg.generateKeyPair();
+
+            signer = Signature.getInstance(test.algorithm, "SunEC");
+            signer.initSign(kp.getPrivate());
+        }
+    }
+
+    @State(Scope.Thread)
+    public static class s3 {
+        private Signature signer;
+        private byte[] message;
+
+        @Setup
+        public void setup(test03 test) throws Exception {
+            message = new byte[test.messageLength];
+            (new Random(System.nanoTime())).nextBytes(message);
+
+            int keyLength = switch (test.algorithm) {
                 case "SHA256withDSA" -> 2048;
                 case "SHA384withDSA" -> 3072;
                 case "SHA512withDSA" -> 3072;
@@ -119,21 +178,22 @@ public class Signatures {
             kpg.initialize(keyLength);
             KeyPair kp = kpg.generateKeyPair();
 
-            signer = Signature.getInstance(algorithm);
+            signer = Signature.getInstance(test.algorithm);
             signer.initSign(kp.getPrivate());
         }
     }
 
-    public static class RSA extends Signatures {
-        @Param({"SHA256withRSA", "SHA384withRSA", "SHA512withRSA"})
-        private String algorithm;
+    @State(Scope.Thread)
+    public static class s4 {
+        private Signature signer;
+        private byte[] message;
 
         @Setup
-        public void setup() throws Exception {
-            message = new byte[messageLength];
+        public void setup(test04 test) throws Exception {
+            message = new byte[test.messageLength];
             (new Random(System.nanoTime())).nextBytes(message);
 
-            int keyLength = switch (algorithm) {
+            int keyLength = switch (test.algorithm) {
                 case "SHA256withRSA" -> 2048;
                 case "SHA384withRSA" -> 3072;
                 case "SHA512withRSA" -> 4096;
@@ -144,28 +204,29 @@ public class Signatures {
             kpg.initialize(keyLength);
             KeyPair kp = kpg.generateKeyPair();
 
-            signer = Signature.getInstance(algorithm);
+            signer = Signature.getInstance(test.algorithm);
             signer.initSign(kp.getPrivate());
         }
     }
 
-    public static class RSASSAPSS extends Signatures {
-        @Param({"SHA256", "SHA384", "SHA512"})
-        private String algorithm;
+    @State(Scope.Thread)
+    public static class s5 {
+        private Signature signer;
+        private byte[] message;
 
         @Setup
-        public void setup() throws Exception {
-            message = new byte[messageLength];
+        public void setup(test05 test) throws Exception {
+            message = new byte[test.messageLength];
             (new Random(System.nanoTime())).nextBytes(message);
 
-            int keyLength = switch (algorithm) {
+            int keyLength = switch (test.algorithm) {
                case "SHA256" -> 2048;
                case "SHA384" -> 3072;
                case "SHA512" -> 4096;
                default -> throw new RuntimeException();
             };
 
-            PSSParameterSpec spec = switch (algorithm) {
+            PSSParameterSpec spec = switch (test.algorithm) {
                case "SHA256" ->
                        new PSSParameterSpec(
                                "SHA-256", "MGF1",
diff --git a/test/micro/org/openjdk/bench/java/text/MessageFormatterBench.java b/test/micro/org/openjdk/bench/java/text/MessageFormatterBench.java
index 5d3399cb46d..191634ad299 100644
--- a/test/micro/org/openjdk/bench/java/text/MessageFormatterBench.java
+++ b/test/micro/org/openjdk/bench/java/text/MessageFormatterBench.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2024, Alibaba Group Holding Limited. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -51,6 +52,8 @@ import java.util.concurrent.TimeUnit;
 public class MessageFormatterBench {
 
     private Object[][] values;
+    private String choicePattern;
+    private String numberPattern;
 
     @Setup
     public void setup() {
@@ -60,6 +63,8 @@ public class MessageFormatterBench {
                 new Object[]{Double.valueOf(123.89), "MyDisk3"},
                 new Object[]{Long.valueOf(1234567), "MyDisk4"},
         };
+        choicePattern = "{0,choice,0#|1#{1}|2#{1} ({2})}";
+        numberPattern = "{0,number,000}";
     }
 
     private MessageFormat messageFormat = new MessageFormat("There is {0} GB of free space on the {1}.", Locale.ENGLISH);
@@ -72,6 +77,16 @@ public class MessageFormatterBench {
         }
     }
 
+    @Benchmark
+    public MessageFormat testSubformatChoice() {
+        return new MessageFormat(choicePattern);
+    }
+
+    @Benchmark
+    public MessageFormat testSubformatNumber() {
+        return new MessageFormat(numberPattern);
+    }
+
     public static void main(String... args) throws Exception {
         Options opts = new OptionsBuilder().include(MessageFormatterBench.class.getSimpleName()).shouldDoGC(true).build();
         new Runner(opts).run();
diff --git a/test/micro/org/openjdk/bench/java/util/ImmutableColls.java b/test/micro/org/openjdk/bench/java/util/ImmutableColls.java
index 783f870ca5b..0619b58e223 100644
--- a/test/micro/org/openjdk/bench/java/util/ImmutableColls.java
+++ b/test/micro/org/openjdk/bench/java/util/ImmutableColls.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/vm/compiler/ArrayFill.java b/test/micro/org/openjdk/bench/vm/compiler/ArrayFill.java
index 90508ec79a9..29910ad0b30 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/ArrayFill.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/ArrayFill.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, Arm Limited. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/micro/org/openjdk/bench/vm/compiler/MergeStoreBench.java b/test/micro/org/openjdk/bench/vm/compiler/MergeStoreBench.java
index 88b68868813..ea4777aa693 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/MergeStoreBench.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/MergeStoreBench.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2024, Alibaba Group Holding Limited. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/micro/org/openjdk/bench/vm/compiler/TypeVectorOperations.java b/test/micro/org/openjdk/bench/vm/compiler/TypeVectorOperations.java
index fcdbb9356e0..9ef580d09c7 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/TypeVectorOperations.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/TypeVectorOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2025 IBM Corporation. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff --git a/test/micro/org/openjdk/bench/vm/compiler/VectorAliasing.java b/test/micro/org/openjdk/bench/vm/compiler/VectorAliasing.java
index 9c8270e4660..590b8560cb6 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/VectorAliasing.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorAliasing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/vm/compiler/VectorBulkOperationsArray.java b/test/micro/org/openjdk/bench/vm/compiler/VectorBulkOperationsArray.java
new file mode 100644
index 00000000000..2b055779ff6
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorBulkOperationsArray.java
@@ -0,0 +1,774 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.*;
+
+import java.util.concurrent.TimeUnit;
+import java.util.Random;
+import java.util.Arrays;
+
+/**
+ * This benchmark is here to measure vectorized peformance for some simple bulk operations:
+ * - fill
+ * - copy
+ *
+ * We may add more in the future, for example:
+ * - comparison
+ * - find index
+ * - filter
+ * - ...
+ *
+ * One important feature of this benchmark, is that we control for alignment and 4k-aliasing,
+ * something almost no benchmarks have considered up to now. But it is important to get more
+ * precise, clean and reliable results.
+ *
+ * Note, you may want to play with "-XX:-OptimizeFill" for the fill benchmarks, so that we do
+ * not use the fill-intrinsic, but auto-vectorize. Though I'm currently not seeing a difference,
+ * maybe the loop is not recognized properly? Maybe the alignment "randomization" prevents it.
+ *
+ * Please also look at the companion benchmark:
+ *   VectorBulkOperationsMemorySegment.java
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 3, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 5, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
+@Fork(value = 1)
+public class VectorBulkOperationsArray {
+    @Param({  "0",  "1",  "2",  "3",  "4",  "5",  "6",  "7",  "8",  "9",
+             "10", "11", "12", "13", "14", "15", "16", "17", "18", "19",
+             "20", "21", "22", "23", "24", "25", "26", "27", "28", "29",
+             "30", "31", "32", "33", "34", "35", "36", "37", "38", "39",
+             "40", "41", "42", "43", "44", "45", "46", "47", "48", "49",
+             "50", "51", "52", "53", "54", "55", "56", "57", "58", "59",
+             "60", "61", "62", "63", "64", "65", "66", "67", "68", "69",
+             "70", "71", "72", "73", "74", "75", "76", "77", "78", "79",
+             "80", "81", "82", "83", "84", "85", "86", "87", "88", "89",
+             "90", "91", "92", "93", "94", "95", "96", "97", "98", "99",
+            "100","101","102","103","104","105","106","107","108","109",
+            "110","111","112","113","114","115","116","117","118","119",
+            "120","121","122","123","124","125","126","127","128","129",
+            "130","131","132","133","134","135","136","137","138","139",
+            "140","141","142","143","144","145","146","147","148","149",
+            "150","151","152","153","154","155","156","157","158","159",
+            "160","161","162","163","164","165","166","167","168","169",
+            "170","171","172","173","174","175","176","177","178","179",
+            "180","181","182","183","184","185","186","187","188","189",
+            "190","191","192","193","194","195","196","197","198","199",
+            "200","201","202","203","204","205","206","207","208","209",
+            "210","211","212","213","214","215","216","217","218","219",
+            "220","221","222","223","224","225","226","227","228","229",
+            "230","231","232","233","234","235","236","237","238","239",
+            "240","241","242","243","244","245","246","247","248","249",
+            "250","251","252","253","254","255","256","257","258","259",
+            "260","261","262","263","264","265","266","267","268","269",
+            "270","271","272","273","274","275","276","277","278","279",
+            "280","281","282","283","284","285","286","287","288","289",
+            "290","291","292","293","294","295","296","297","298","299",
+            "300"})
+    public static int NUM_ACCESS_ELEMENTS;
+    // This is just a default to investigate small iteration loops.
+
+    // Every array has two regions:
+    // - read region
+    // - write region
+    // We should make sure that the region is a multiple of 4k, so that the
+    // 4k-aliasing prevention trick can work. If we used two arrays, then
+    // we would not know what the relative offset is between them, so we could
+    // not do anything about the 4k-aliasing effects.
+    // Background on 4k-aliasing: many modern CPUs have a store-to-load-forwarding
+    // mechanism that speeds up loads if the memory locations that were recently
+    // stored to. For this, the CPU needs to check if there is a store in the store
+    // buffer with the same address and size. There are various implementations
+    // with different performance characteristics on various CPUs. For x86, there
+    // is a special mechanism that quickly checks the lowest 12bits of the address,
+    // to see if there is a match. If there is a match on the 12bits, we then
+    // have to eventually check the rest of the bits. There seems to be something
+    // speculative going on, and so if we eventually find that there is a match
+    // things are really fast. But if we eventually find that the rest of the
+    // bits do not match, we have to abort and redo the load from memory/cache,
+    // and that can be slower than if we had gone to memory/cache directly. Hence,
+    // if we regularly have matches on the 12bits, but mismatches on the other
+    // bits, we can be slower than expected. 12bits of address gives us a cyclic
+    // patterns every 4k bytes. So if you load/store with a distance of 4k or
+    // a multiple, you can see slower performance than expected, you get a dip/
+    // spike in the curve that is a strange artifact. We would like to avoid this
+    // in our benchmark. That is why we make sure to have k * 4k + 2k offset
+    // between load and store.
+    //
+    // It would be ince to set REGION_SIZE statically, but we want to keep it rather small if possible,
+    // to avoid running out of cache. But it might be quite large if NUM_ACCESS_ELEMENTS is large.
+    public static int REGION_SIZE = -1024;
+    public static final int REGION_2_BYTE_OFFSET   = 1024 * 2; // prevent 4k-aliasing
+    public static final int REGION_2_SHORT_OFFSET  = REGION_2_BYTE_OFFSET / 2;
+    public static final int REGION_2_CHAR_OFFSET   = REGION_2_BYTE_OFFSET / 2;
+    public static final int REGION_2_INT_OFFSET    = REGION_2_BYTE_OFFSET / 4;
+    public static final int REGION_2_LONG_OFFSET   = REGION_2_BYTE_OFFSET / 8;
+    public static final int REGION_2_FLOAT_OFFSET  = REGION_2_BYTE_OFFSET / 4;
+    public static final int REGION_2_DOUBLE_OFFSET = REGION_2_BYTE_OFFSET / 8;
+    // For Objects, it could be 4 or 8 bytes. Dividing by 8 gives us something
+    // reasonable for both cases.
+    public static final int REGION_2_OBJECT_OFFSET = REGION_2_BYTE_OFFSET / 8;
+
+    // The arrays with the two regions each
+    private byte[] aB;
+    private short[] aS;
+    private char[] aC;
+    private int[] aI;
+    private long[] aL;
+    private float[] aF;
+    private double[] aD;
+
+    // Used when we need variable values in fill.
+    private byte varB = 42;
+    private short varS = 42;
+    private char varC = 42;
+    private int varI = 42;
+    private long varL = 42;
+    private float varF = 42;
+    private double varD = 42;
+
+    // Classes for Object arrays.
+    static class A {
+        int x;
+        A(int x) {
+            this.x = x;
+        }
+    }
+    static class B extends A {
+        int y;
+        B(int x, int y) {
+            super(x);
+            this.y = y;
+        }
+    }
+    private A[] aOA;
+    private B[] aOB;
+    private A varOA = new A(-1);
+    private B varOB = new B(-1, -1);
+
+    // Number of repetitions, to randomize the offsets.
+    public static final int REPETITIONS = 64 * 64;
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    public static int offsetLoad(int i) { return i & 63; } // bits 0-7, value from 0-63
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    public static int offsetStore(int i) { return (i >> 8) & 63; } // bits 8-15, value from 0-63
+
+    @Param("42")
+    private int seed;
+    private Random r = new Random(seed);
+
+    public static int roundUp4k(int i) {
+        return (i + 4*1024-1) & (-4*1024);
+    }
+
+    @Setup
+    public void init() {
+        // Make sure we can fit the longs, and then some whiggle room for alignment.
+        REGION_SIZE = roundUp4k(NUM_ACCESS_ELEMENTS * 8 + 1024 + REGION_2_BYTE_OFFSET);
+        aB = new byte[2 * REGION_SIZE];
+        aC = new char[2 * REGION_SIZE];
+        aS = new short[2 * REGION_SIZE];
+        aI = new int[2 * REGION_SIZE];
+        aL = new long[2 * REGION_SIZE];
+        aF = new float[2 * REGION_SIZE];
+        aD = new double[2 * REGION_SIZE];
+        aOA = new A[2 * REGION_SIZE];
+        aOB = new B[2 * REGION_SIZE];
+
+        for (int i = 0; i < 2 * REGION_SIZE; i++) {
+            aB[i] = (byte) r.nextInt();
+            aS[i] = (short) r.nextInt();
+            aC[i] = (char) r.nextInt();
+            aI[i] = r.nextInt();
+            aL[i] = r.nextLong();
+            aF[i] = r.nextFloat();
+            aD[i] = r.nextDouble();
+            aOA[i] = switch (i % 4) {
+                case 0, 1 -> new A(i);
+                case 2    -> new B(i, i);
+                default   -> null;
+            };
+            aOB[i] = (i % 3 != 0) ? new B(i, i) : null;
+        }
+    }
+
+    // -------------------------------- BYTE ------------------------------
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_zero_byte_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aB[i + offset_store] = 0;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_byte_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aB[i + offset_store] = varB;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_zero_byte_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            Arrays.fill(aB, offset_store, offset_store + NUM_ACCESS_ELEMENTS, (byte)0);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_byte_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            Arrays.fill(aB, offset_store, offset_store + NUM_ACCESS_ELEMENTS, varB);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_byte_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aB[i + offset_store] = aB[i + offset_load];
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_byte_system_arraycopy() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            System.arraycopy(aB, offset_load, aB, offset_store, NUM_ACCESS_ELEMENTS);
+        }
+    }
+
+    // -------------------------------- CHAR ------------------------------
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_zero_char_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_CHAR_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aC[i + offset_store] = 0;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_char_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_CHAR_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aC[i + offset_store] = varC;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_zero_char_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_CHAR_OFFSET;
+            Arrays.fill(aC, offset_store, offset_store + NUM_ACCESS_ELEMENTS, (char)0);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_char_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_CHAR_OFFSET;
+            Arrays.fill(aC, offset_store, offset_store + NUM_ACCESS_ELEMENTS, varC);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_char_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_CHAR_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aC[i + offset_store] = aC[i + offset_load];
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_char_system_arraycopy() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_CHAR_OFFSET;
+            System.arraycopy(aC, offset_load, aC, offset_store, NUM_ACCESS_ELEMENTS);
+        }
+    }
+
+    // -------------------------------- SHORT ------------------------------
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_zero_short_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_SHORT_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aS[i + offset_store] = 0;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_short_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_SHORT_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aS[i + offset_store] = varS;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_zero_short_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_SHORT_OFFSET;
+            Arrays.fill(aS, offset_store, offset_store + NUM_ACCESS_ELEMENTS, (short)0);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_short_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_SHORT_OFFSET;
+            Arrays.fill(aS, offset_store, offset_store + NUM_ACCESS_ELEMENTS, varS);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_short_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_SHORT_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aS[i + offset_store] = aS[i + offset_load];
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_short_system_arraycopy() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_SHORT_OFFSET;
+            System.arraycopy(aS, offset_load, aS, offset_store, NUM_ACCESS_ELEMENTS);
+        }
+    }
+
+    // -------------------------------- INT ------------------------------
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_zero_int_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_INT_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aI[i + offset_store] = 0;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_int_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_INT_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aI[i + offset_store] = varI;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_zero_int_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_INT_OFFSET;
+            Arrays.fill(aI, offset_store, offset_store + NUM_ACCESS_ELEMENTS, (int)0);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_int_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_INT_OFFSET;
+            Arrays.fill(aI, offset_store, offset_store + NUM_ACCESS_ELEMENTS, varI);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_int_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_INT_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aI[i + offset_store] = aI[i + offset_load];
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_int_system_arraycopy() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_INT_OFFSET;
+            System.arraycopy(aI, offset_load, aI, offset_store, NUM_ACCESS_ELEMENTS);
+        }
+    }
+
+    // -------------------------------- LONG ------------------------------
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_zero_long_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_LONG_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aL[i + offset_store] = 0;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_long_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_LONG_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aL[i + offset_store] = varL;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_zero_long_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_LONG_OFFSET;
+            Arrays.fill(aL, offset_store, offset_store + NUM_ACCESS_ELEMENTS, (long)0);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_long_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_LONG_OFFSET;
+            Arrays.fill(aL, offset_store, offset_store + NUM_ACCESS_ELEMENTS, varL);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_long_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_LONG_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aL[i + offset_store] = aL[i + offset_load];
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_long_system_arraycopy() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_LONG_OFFSET;
+            System.arraycopy(aL, offset_load, aL, offset_store, NUM_ACCESS_ELEMENTS);
+        }
+    }
+
+    // -------------------------------- FLOAT ------------------------------
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_zero_float_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_FLOAT_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aF[i + offset_store] = 0;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_float_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_FLOAT_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aF[i + offset_store] = varF;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_zero_float_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_FLOAT_OFFSET;
+            Arrays.fill(aF, offset_store, offset_store + NUM_ACCESS_ELEMENTS, (float)0);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_float_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_FLOAT_OFFSET;
+            Arrays.fill(aF, offset_store, offset_store + NUM_ACCESS_ELEMENTS, varF);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_float_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_FLOAT_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aF[i + offset_store] = aF[i + offset_load];
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_float_system_arraycopy() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_FLOAT_OFFSET;
+            System.arraycopy(aF, offset_load, aF, offset_store, NUM_ACCESS_ELEMENTS);
+        }
+    }
+
+    // -------------------------------- DOUBLE ------------------------------
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_zero_double_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_DOUBLE_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aD[i + offset_store] = 0;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_double_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_DOUBLE_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aD[i + offset_store] = varD;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_zero_double_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_DOUBLE_OFFSET;
+            Arrays.fill(aD, offset_store, offset_store + NUM_ACCESS_ELEMENTS, (double)0);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_double_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_DOUBLE_OFFSET;
+            Arrays.fill(aD, offset_store, offset_store + NUM_ACCESS_ELEMENTS, varD);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_double_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_DOUBLE_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aD[i + offset_store] = aD[i + offset_load];
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_double_system_arraycopy() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_DOUBLE_OFFSET;
+            System.arraycopy(aD, offset_load, aD, offset_store, NUM_ACCESS_ELEMENTS);
+        }
+    }
+
+    // -------------------------------- OBJECT ------------------------------
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_null_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_OBJECT_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aOA[i + offset_store] = null;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_A2A_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_OBJECT_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aOA[i + offset_store] = varOA;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_B2A_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_OBJECT_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aOA[i + offset_store] = varOB;
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_null_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_OBJECT_OFFSET;
+            Arrays.fill(aOA, offset_store, offset_store + NUM_ACCESS_ELEMENTS, null);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_A2A_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_OBJECT_OFFSET;
+            Arrays.fill(aOA, offset_store, offset_store + NUM_ACCESS_ELEMENTS, varOA);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_B2A_arrays_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_OBJECT_OFFSET;
+            Arrays.fill(aOA, offset_store, offset_store + NUM_ACCESS_ELEMENTS, varOB);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_A2A_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_OBJECT_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aOA[i + offset_store] = aOA[i + offset_load];
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_B2A_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_OBJECT_OFFSET;
+            for (int i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                aOA[i + offset_store] = aOB[i + offset_load];
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_A2A_system_arraycopy() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_OBJECT_OFFSET;
+            System.arraycopy(aOA, offset_load, aOA, offset_store, NUM_ACCESS_ELEMENTS);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_B2A_system_arraycopy() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            int offset_load = offsetLoad(r);
+            int offset_store = offsetStore(r) + REGION_SIZE + REGION_2_OBJECT_OFFSET;
+            System.arraycopy(aOB, offset_load, aOA, offset_store, NUM_ACCESS_ELEMENTS);
+        }
+    }
+}
diff --git a/test/micro/org/openjdk/bench/vm/compiler/VectorBulkOperationsMemorySegment.java b/test/micro/org/openjdk/bench/vm/compiler/VectorBulkOperationsMemorySegment.java
new file mode 100644
index 00000000000..fae12a4ac9d
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorBulkOperationsMemorySegment.java
@@ -0,0 +1,374 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.*;
+
+import java.lang.foreign.*;
+import java.util.concurrent.TimeUnit;
+import java.util.Random;
+import java.util.Arrays;
+
+/**
+ * This benchmark is here to measure vectorized peformance for some simple bulk operations:
+ * - fill
+ * - copy
+ *
+ * We may add more in the future, for example:
+ * - comparison
+ * - find index
+ * - filter
+ * - ...
+ *
+ * One important feature of this benchmark, is that we control for alignment and 4k-aliasing,
+ * something almost no benchmarks have considered up to now. But it is important to get more
+ * precise, clean and reliable results.
+ *
+ * Please also look at the companion benchmark:
+ *   VectorBulkOperationsArray.java
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 3, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 5, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
+@Fork(value = 1)
+public class VectorBulkOperationsMemorySegment {
+    @Param({  "0",  "1",  "2",  "3",  "4",  "5",  "6",  "7",  "8",  "9",
+             "10", "11", "12", "13", "14", "15", "16", "17", "18", "19",
+             "20", "21", "22", "23", "24", "25", "26", "27", "28", "29",
+             "30", "31", "32", "33", "34", "35", "36", "37", "38", "39",
+             "40", "41", "42", "43", "44", "45", "46", "47", "48", "49",
+             "50", "51", "52", "53", "54", "55", "56", "57", "58", "59",
+             "60", "61", "62", "63", "64", "65", "66", "67", "68", "69",
+             "70", "71", "72", "73", "74", "75", "76", "77", "78", "79",
+             "80", "81", "82", "83", "84", "85", "86", "87", "88", "89",
+             "90", "91", "92", "93", "94", "95", "96", "97", "98", "99",
+            "100","101","102","103","104","105","106","107","108","109",
+            "110","111","112","113","114","115","116","117","118","119",
+            "120","121","122","123","124","125","126","127","128","129",
+            "130","131","132","133","134","135","136","137","138","139",
+            "140","141","142","143","144","145","146","147","148","149",
+            "150","151","152","153","154","155","156","157","158","159",
+            "160","161","162","163","164","165","166","167","168","169",
+            "170","171","172","173","174","175","176","177","178","179",
+            "180","181","182","183","184","185","186","187","188","189",
+            "190","191","192","193","194","195","196","197","198","199",
+            "200","201","202","203","204","205","206","207","208","209",
+            "210","211","212","213","214","215","216","217","218","219",
+            "220","221","222","223","224","225","226","227","228","229",
+            "230","231","232","233","234","235","236","237","238","239",
+            "240","241","242","243","244","245","246","247","248","249",
+            "250","251","252","253","254","255","256","257","258","259",
+            "260","261","262","263","264","265","266","267","268","269",
+            "270","271","272","273","274","275","276","277","278","279",
+            "280","281","282","283","284","285","286","287","288","289",
+            "290","291","292","293","294","295","296","297","298","299",
+            "300"})
+    public static long NUM_ACCESS_ELEMENTS;
+
+    @Param({"native", "array_byte", "array_int", "array_long"})
+    public static String BACKING_TYPE;
+
+    // Every array has two regions:
+    // - read region
+    // - write region
+    // We should make sure that the region is a multiple of 4k, so that the
+    // 4k-aliasing prevention trick can work.
+    // See VectorBulkOperationsArray.java for a deeper explanation.
+    //
+    // It would be ince to set REGION_SIZE statically, but we want to keep it rather small if possible,
+    // to avoid running out of cache. But it might be quite large if NUM_ACCESS_ELEMENTS is large.
+    public static long REGION_SIZE = -1024;
+    public static final long REGION_2_BYTE_OFFSET   = 1024 * 2; // prevent 4k-aliasing
+
+    // TDOO: see what is still actie up here.
+
+    // Just one MemorySegment for all cases, backed by whatever BACKING_TYPE.
+    MemorySegment ms;
+
+    // Used when we need variable values in fill.
+    private byte varB = 42;
+    private short varS = 42;
+    private char varC = 42;
+    private int varI = 42;
+    private long varL = 42;
+    private float varF = 42;
+    private double varD = 42;
+
+    // Number of repetitions, to randomize the offsets.
+    public static final int REPETITIONS = 64 * 64;
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    public static long offsetLoad(long i) { return i & 63; } // bits 0-7, value from 0-63
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    public static long offsetStore(long i) { return (i >> 8) & 63; } // bits 8-15, value from 0-63
+
+    @Param("42")
+    private int seed;
+    private Random r = new Random(seed);
+
+    public static long roundUp4k(long i) {
+        return (i + 4*1024-1) & (-4*1024L);
+    }
+
+    @Setup
+    public void init() {
+        // Make sure we can fit the longs, and then some whiggle room for alignment.
+        REGION_SIZE = roundUp4k(NUM_ACCESS_ELEMENTS * 8 + 1024 + REGION_2_BYTE_OFFSET);
+        ms = switch(BACKING_TYPE) {
+            case "native"     -> Arena.ofAuto().allocate(2 * REGION_SIZE, 4 * 1024);
+            case "array_byte" -> MemorySegment.ofArray(new byte[(int)(2 * REGION_SIZE)]);
+            case "array_int"  -> MemorySegment.ofArray(new int[(int)(2 * REGION_SIZE / 4)]);
+            case "array_long" -> MemorySegment.ofArray(new long[(int)(2 * REGION_SIZE / 8)]);
+            default -> throw new RuntimeException("not implemented: " + BACKING_TYPE);
+        };
+    }
+
+    // -------------------------------- BYTE ------------------------------
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_zero_byte_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_store = offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (long i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                ms.set(ValueLayout.JAVA_BYTE, i + offset_store, (byte)0);
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_byte_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_store = offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (long i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                ms.set(ValueLayout.JAVA_BYTE, i + offset_store, varB);
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_zero_byte_MS_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_store = offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            // The API does not allow us to fill a sub-segment directly, so we have to slice.
+            MemorySegment slice = ms.asSlice(offset_store, NUM_ACCESS_ELEMENTS);
+            slice.fill((byte)0);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_byte_MS_fill() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_store = offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            // The API does not allow us to fill a sub-segment directly, so we have to slice.
+            MemorySegment slice = ms.asSlice(offset_store, NUM_ACCESS_ELEMENTS);
+            slice.fill(varB);
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_byte_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_load = offsetLoad(r);
+            long offset_store = offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (long i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                byte v = ms.get(ValueLayout.JAVA_BYTE, i + offset_load);
+                ms.set(ValueLayout.JAVA_BYTE, i + offset_store, v);
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_byte_MemorySegment_copy() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_load = offsetLoad(r);
+            long offset_store = offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            MemorySegment.copy(ms, offset_load, ms, offset_store, NUM_ACCESS_ELEMENTS);
+        }
+    }
+
+    // -------------------------------- CHAR ------------------------------
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_char_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_store = 2L * offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (long i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                ms.set(ValueLayout.JAVA_CHAR_UNALIGNED, 2L * i + offset_store, varC);
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_char_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_load = 2L * offsetLoad(r);
+            long offset_store = 2L * offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (long i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                char v = ms.get(ValueLayout.JAVA_CHAR_UNALIGNED, 2L * i + offset_load);
+                ms.set(ValueLayout.JAVA_CHAR_UNALIGNED, 2L * i + offset_store, v);
+            }
+        }
+    }
+
+    // -------------------------------- SHORT ------------------------------
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_short_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_store = 2L * offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (long i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                ms.set(ValueLayout.JAVA_SHORT_UNALIGNED, 2L * i + offset_store, varS);
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_short_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_load = 2L * offsetLoad(r);
+            long offset_store = 2L * offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (long i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                short v = ms.get(ValueLayout.JAVA_SHORT_UNALIGNED, 2L * i + offset_load);
+                ms.set(ValueLayout.JAVA_SHORT_UNALIGNED, 2L * i + offset_store, v);
+            }
+        }
+    }
+
+    // -------------------------------- INT ------------------------------
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_int_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_store = 4L * offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (long i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                ms.set(ValueLayout.JAVA_INT_UNALIGNED, 4L * i + offset_store, varI);
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_int_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_load = 4L * offsetLoad(r);
+            long offset_store = 4L * offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (long i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                int v = ms.get(ValueLayout.JAVA_INT_UNALIGNED, 4L * i + offset_load);
+                ms.set(ValueLayout.JAVA_INT_UNALIGNED, 4L * i + offset_store, v);
+            }
+        }
+    }
+
+    // -------------------------------- LONG ------------------------------
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_long_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_store = 8L * offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (long i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                ms.set(ValueLayout.JAVA_LONG_UNALIGNED, 8L * i + offset_store, varL);
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_long_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_load = 8L * offsetLoad(r);
+            long offset_store = 8L * offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (long i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                long v = ms.get(ValueLayout.JAVA_LONG_UNALIGNED, 8L * i + offset_load);
+                ms.set(ValueLayout.JAVA_LONG_UNALIGNED, 8L * i + offset_store, v);
+            }
+        }
+    }
+
+    // -------------------------------- FLOAT ------------------------------
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_float_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_store = 4L * offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (long i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                ms.set(ValueLayout.JAVA_FLOAT_UNALIGNED, 4L * i + offset_store, varS);
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_float_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_load = 4L * offsetLoad(r);
+            long offset_store = 4L * offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (long i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                float v = ms.get(ValueLayout.JAVA_FLOAT_UNALIGNED, 4L * i + offset_load);
+                ms.set(ValueLayout.JAVA_FLOAT_UNALIGNED, 4L * i + offset_store, v);
+            }
+        }
+    }
+
+    // -------------------------------- DOUBLE ------------------------------
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void fill_var_double_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_store = 8L * offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (long i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                ms.set(ValueLayout.JAVA_DOUBLE_UNALIGNED, 8L * i + offset_store, varS);
+            }
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(REPETITIONS)
+    public void copy_double_loop() {
+        for (int r = 0; r < REPETITIONS; r++) {
+            long offset_load = 8L * offsetLoad(r);
+            long offset_store = 8L * offsetStore(r) + REGION_SIZE + REGION_2_BYTE_OFFSET;
+            for (long i = 0; i < NUM_ACCESS_ELEMENTS; i++) {
+                double v = ms.get(ValueLayout.JAVA_DOUBLE_UNALIGNED, 8L * i + offset_load);
+                ms.set(ValueLayout.JAVA_DOUBLE_UNALIGNED, 8L * i + offset_store, v);
+            }
+        }
+    }
+}
diff --git a/test/micro/org/openjdk/bench/vm/compiler/VectorReduction2.java b/test/micro/org/openjdk/bench/vm/compiler/VectorReduction2.java
index 63fbf030083..9241aca1dad 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/VectorReduction2.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorReduction2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/vm/gc/systemgc/AllDead.java b/test/micro/org/openjdk/bench/vm/gc/systemgc/AllDead.java
index 5e1ef72f2c3..68d144b6976 100644
--- a/test/micro/org/openjdk/bench/vm/gc/systemgc/AllDead.java
+++ b/test/micro/org/openjdk/bench/vm/gc/systemgc/AllDead.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/vm/gc/systemgc/AllLive.java b/test/micro/org/openjdk/bench/vm/gc/systemgc/AllLive.java
index bc62d838f57..bff4beb211e 100644
--- a/test/micro/org/openjdk/bench/vm/gc/systemgc/AllLive.java
+++ b/test/micro/org/openjdk/bench/vm/gc/systemgc/AllLive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/vm/gc/systemgc/DifferentObjectSizesArray.java b/test/micro/org/openjdk/bench/vm/gc/systemgc/DifferentObjectSizesArray.java
index 2591b23763a..10e94f5e198 100644
--- a/test/micro/org/openjdk/bench/vm/gc/systemgc/DifferentObjectSizesArray.java
+++ b/test/micro/org/openjdk/bench/vm/gc/systemgc/DifferentObjectSizesArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/vm/gc/systemgc/DifferentObjectSizesHashMap.java b/test/micro/org/openjdk/bench/vm/gc/systemgc/DifferentObjectSizesHashMap.java
index 9dd39bcf783..89779701b7e 100644
--- a/test/micro/org/openjdk/bench/vm/gc/systemgc/DifferentObjectSizesHashMap.java
+++ b/test/micro/org/openjdk/bench/vm/gc/systemgc/DifferentObjectSizesHashMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/vm/gc/systemgc/DifferentObjectSizesTreeMap.java b/test/micro/org/openjdk/bench/vm/gc/systemgc/DifferentObjectSizesTreeMap.java
index 6fd1fe05555..5cce7c70ba8 100644
--- a/test/micro/org/openjdk/bench/vm/gc/systemgc/DifferentObjectSizesTreeMap.java
+++ b/test/micro/org/openjdk/bench/vm/gc/systemgc/DifferentObjectSizesTreeMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfDeadFirstPart.java b/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfDeadFirstPart.java
index ef62a269acb..16f8e6ea358 100644
--- a/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfDeadFirstPart.java
+++ b/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfDeadFirstPart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfDeadInterleaved.java b/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfDeadInterleaved.java
index 471d86b88cb..8eace715c33 100644
--- a/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfDeadInterleaved.java
+++ b/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfDeadInterleaved.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfDeadInterleavedChunks.java b/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfDeadInterleavedChunks.java
index bcf495cfd5f..f89137dc3e9 100644
--- a/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfDeadInterleavedChunks.java
+++ b/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfDeadInterleavedChunks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfDeadSecondPart.java b/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfDeadSecondPart.java
index 9340d1047ce..80e868a2c95 100644
--- a/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfDeadSecondPart.java
+++ b/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfDeadSecondPart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfHashedHalfDead.java b/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfHashedHalfDead.java
index c48bc5b1d15..6a4224ff7d3 100644
--- a/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfHashedHalfDead.java
+++ b/test/micro/org/openjdk/bench/vm/gc/systemgc/HalfHashedHalfDead.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/vm/gc/systemgc/NoObjects.java b/test/micro/org/openjdk/bench/vm/gc/systemgc/NoObjects.java
index 6f31c4014a8..4108c622f98 100644
--- a/test/micro/org/openjdk/bench/vm/gc/systemgc/NoObjects.java
+++ b/test/micro/org/openjdk/bench/vm/gc/systemgc/NoObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/vm/gc/systemgc/OneBigObject.java b/test/micro/org/openjdk/bench/vm/gc/systemgc/OneBigObject.java
index 2a213fe795b..94574f91e52 100644
--- a/test/micro/org/openjdk/bench/vm/gc/systemgc/OneBigObject.java
+++ b/test/micro/org/openjdk/bench/vm/gc/systemgc/OneBigObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it