diff --git a/.github/workflows/client-test.yml b/.github/workflows/client-test.yml
index 8959c7861..df0ef6ab4 100644
--- a/.github/workflows/client-test.yml
+++ b/.github/workflows/client-test.yml
@@ -57,11 +57,13 @@ jobs:
         ./client/target/bin/sbtn --sbt-script=$(pwd)/sbt about
         ./client/target/bin/sbtn --sbt-script=$(pwd)/sbt shutdown
         # test launcher script
-        echo build using JDK 8 test using JDK 8 and JDK 11
+        echo build using JDK 8 test using JDK 8 and JDK 25
         cd launcher-package
         sbt -Dsbt.build.version=$TEST_SBT_VER rpm:packageBin debian:packageBin
         sbt -Dsbt.build.version=$TEST_SBT_VER integrationTest/test
         cd citest && ./test.sh
+        JAVA_HOME="$JAVA_HOME_25_X64"
+        PATH="$JAVA_HOME_25_X64/bin:$PATH"
         java -Xmx32m -version
         ./test.sh
     - name: Client test (macOS)
@@ -86,11 +88,10 @@ jobs:
         ./client/target/bin/sbtn --sbt-script=$(pwd)/launcher-package/src/universal/bin/sbt.bat about
         ./client/target/bin/sbtn --sbt-script=$(pwd)/launcher-package/src/universal/bin/sbt.bat shutdown
         # test launcher script
-        echo build using JDK 8, test using JDK 8, on Windows
+        echo build using JDK 8 test using JDK 8 and JDK 25
         cd launcher-package
         bin/coursier.bat resolve
         sbt -Dsbt.build.version=$TEST_SBT_VER integrationTest/test
         cd citest
         ./test.bat
-        java -Xmx32m -version
         test3/test3.bat
diff --git a/launcher-package/citest/test3/.jvmopts b/launcher-package/citest/test3/.jvmopts
index ecacefc9a..a18306841 100644
--- a/launcher-package/citest/test3/.jvmopts
+++ b/launcher-package/citest/test3/.jvmopts
@@ -1,3 +1,3 @@
--XX:+CMSClassUnloadingEnabled
+#-XX:+CMSClassUnloadingEnabled
 #-XX:ReservedCodeCacheSize=192m
 #-Duser.timezone=GMT
\ No newline at end of file
diff --git a/launcher-package/citest/test3/build.sbt b/launcher-package/citest/test3/build.sbt
index 6cba9926c..dbe7fe7f9 100755
--- a/launcher-package/citest/test3/build.sbt
+++ b/launcher-package/citest/test3/build.sbt
@@ -27,19 +27,19 @@ lazy val root = (project in file("."))
       assert(ys.size == 1, s"ys has more than one item: $ys")
       assert(ys(0) startsWith "Java HotSpot(TM) 64-Bit Server VM warning")
     },
-    checkNumericVersion = {
+    checkNumericVersion := {
       val xs = IO.readLines(file("numericVersion.txt")).toVector
       val expectedVersion = "^"+versionRegEx+"$"
 
       assert(xs(0).matches(expectedVersion))
     },
-    checkScriptVersion = {
+    checkScriptVersion := {
       val xs = IO.readLines(file("scriptVersion.txt")).toVector
       val expectedVersion = "^"+versionRegEx+"$"
 
       assert(xs(0).matches(expectedVersion))
     },
-    checkVersion = {
+    checkVersion := {
       val out = IO.readLines(file("version.txt")).toVector.mkString("\n")
 
       val expectedVersion =
diff --git a/launcher-package/citest/test3/test3.bat b/launcher-package/citest/test3/test3.bat
index 38b1bde4f..52f489a0f 100644
--- a/launcher-package/citest/test3/test3.bat
+++ b/launcher-package/citest/test3/test3.bat
@@ -2,16 +2,18 @@
 
 SETLOCAL
 
-SET JAVA_HOME=C:\jdk11
-SET PATH=C:\jdk11\bin;%PATH%
+SET JAVA_HOME=%JAVA_HOME_25_X64%
+SET PATH=%JAVA_HOME_25_X64%\bin;%PATH%
 SET SBT_OPTS=-Xmx4g -Dfile.encoding=UTF8
 
 SET BASE_DIR=%CD%
 SET SCRIPT_DIR=%~dp0
 
 CD %SCRIPT_DIR%
-"%BASE_DIR%freshly-baked\sbt\bin\sbt" about 1> output.txt 2> err.txt
-"%BASE_DIR%freshly-baked\sbt\bin\sbt" check
+"%BASE_DIR%\freshly-baked\sbt\bin\sbt" about 1> output.txt 2> err.txt
+"%BASE_DIR%\freshly-baked\sbt\bin\sbt" check
 CD %BASE_DIR%
 
 ENDLOCAL
+
+IF %errorlevel% NEQ 0 EXIT /b %errorlevel%
diff --git a/launcher-package/src/universal/bin/sbt.bat b/launcher-package/src/universal/bin/sbt.bat
index a8414490b..3c3468e2f 100755
--- a/launcher-package/src/universal/bin/sbt.bat
+++ b/launcher-package/src/universal/bin/sbt.bat
@@ -688,8 +688,7 @@ if defined sbt_args_no_server (
 
 if not defined sbt_args_no_hide_jdk_warnings (
   if /I !JAVA_VERSION! EQU 25 (
-    call :addJava --sun-misc-unsafe-memory-access=allow
-    call :addJava --enable-native-access=ALL-UNNAMED
+    set _SBT_OPTS=--sun-misc-unsafe-memory-access=allow --enable-native-access=ALL-UNNAMED !_SBT_OPTS!
   )
 )