diff --git a/containersQa/InProcessCompileDemo.java b/containersQa/InProcessCompileDemo.java
index f1c6bc9..770952a 100644
--- a/containersQa/InProcessCompileDemo.java
+++ b/containersQa/InProcessCompileDemo.java
@@ -7,7 +7,8 @@
 
 public class InProcessCompileDemo {
     public static void main(String[] args) throws Exception {
-        String jvmVersion="17";
+        String version = System.getProperty("java.version");
+        String jvmVersion = version.split("\\.")[0];
         if (args.length>0) { 
            jvmVersion=args[0];
         }
@@ -35,7 +36,7 @@ public static void main(String[] args) {
         StandardJavaFileManager std = compiler.getStandardFileManager(diagnostics, null, null);
         MemoryFileManager memFM = new MemoryFileManager(std);
 
-        // compile for a specific release (22 here)
+        // compile for a specific release
         JavaCompiler.CompilationTask task = compiler.getTask(
                 null, memFM, diagnostics,
                 List.of("--release", jvmVersion), null, List.of(source));
diff --git a/containersQa/testlib.bash b/containersQa/testlib.bash
index ba97e4d..c057aeb 100644
--- a/containersQa/testlib.bash
+++ b/containersQa/testlib.bash
@@ -236,8 +236,10 @@ function runOnBaseDirBashWithMount() {
   cp -r $LIBCQA_SCRIPT_DIR/*.java "${d}"
   chmod 777 "${d}"
   ls -ld ${d}
-  ${2} $PD_PROVIDER run -v="${d}:/testsDir:Z" -i "$HASH" bash -c "${1}"
+  local r=0
+  ${2} $PD_PROVIDER run -v="${d}:/testsDir:Z" -i "$HASH" bash -c "${1}" || r=$?
   rm -rf "${d}"
+  return $r
 }
 
 function runOnBaseDirBashOtherUser() {
@@ -1183,5 +1185,5 @@ function tryJreCompilation() {
   else
     echo '17+, going on'
   fi
-  runOnBaseDirBashWithMount "java /testsDir/InProcessCompileDemo.java" "$1"
+  runOnBaseDirBashWithMount "java /testsDir/InProcessCompileDemo.java $OTOOL_JDK_VERSION" "$1"
 }