diff --git a/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java b/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java
index dd5bc492..c648bc4b 100644
--- a/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java
+++ b/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java
@@ -20,10 +20,10 @@ protected int expectedWarnings() {
         } else if (javaVersion.contains("18")
                 || javaVersion.contains("19")
                 || javaVersion.contains("20")
+                || javaVersion.contains("21")
+                || javaVersion.contains("22")
                 || javaVersion.contains("23")) {
             return 5;
-        } else if (javaVersion.contains("21") || javaVersion.contains("22")) {
-            return 6;
         }
         return 2;
     }
diff --git a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java
index cf952bfd..d1e89f1b 100644
--- a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java
+++ b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java
@@ -27,9 +27,7 @@ public class JavaxToolsCompilerTest extends AbstractJavacCompilerTest {
     @Override
     protected int expectedWarnings() {
         String javaVersion = getJavaVersion();
-        if (javaVersion.contains("21") || javaVersion.contains("22")) {
-            return 8;
-        } else if (javaVersion.contains("23")) {
+        if (javaVersion.contains("21") || javaVersion.contains("22") || javaVersion.contains("23")) {
             return 1;
         } else {
             return super.expectedWarnings();
diff --git a/pom.xml b/pom.xml
index 1e94f9cd..27d8e3e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,8 @@
     <mavenVersion>3.6.3</mavenVersion>
     <minimalMavenBuildVersion>${mavenVersion}</minimalMavenBuildVersion>
     <errorprone.version>2.29.2</errorprone.version>
+    <eclipse.sisu.version>0.9.0.M3</eclipse.sisu.version>
+    <sisuMavenPluginVersion>${eclipse.sisu.version}</sisuMavenPluginVersion>
     <trimStackTrace>false</trimStackTrace>
     <preparationGoals>clean install</preparationGoals>
     <maven.compiler.version>3.13.0</maven.compiler.version>
@@ -121,12 +123,12 @@
       <dependency>
         <groupId>org.eclipse.sisu</groupId>
         <artifactId>org.eclipse.sisu.plexus</artifactId>
-        <version>0.9.0.M2</version>
+        <version>${eclipse.sisu.version}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.sisu</groupId>
         <artifactId>org.eclipse.sisu.inject</artifactId>
-        <version>0.9.0.M2</version>
+        <version>${eclipse.sisu.version}</version>
       </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>