diff --git a/src/it/MPMD-304-toolchain-support/invoker.properties b/src/it/MPMD-304-toolchain-support/invoker.properties
index 7c1dbe35..00277220 100644
--- a/src/it/MPMD-304-toolchain-support/invoker.properties
+++ b/src/it/MPMD-304-toolchain-support/invoker.properties
@@ -15,15 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# the jdk toolchain "11" is selected in pom.xml
-invoker.toolchain.jdk.version = 11
-
+invoker.toolchain.jdk.version = 17
 invoker.goals = clean verify
-
-# Restricting this test to maven 3 only, which is compatible with Java 8.
-# With the toolchain setting, PmdExecutor will be called with Java 11
-# and uses classes from Maven (e.g. MojoExecutionException). Maven 4 requires
-# at least Java 17, so maven-pmd-plugin/PMD can't be executed anymore on
-# Java 11.
-# TODO: Make toolchain support maven4 compatible
-invoker.maven.version=!4+
diff --git a/src/it/MPMD-304-toolchain-support/pom.xml b/src/it/MPMD-304-toolchain-support/pom.xml
index 8e2de9d8..41ca8c6f 100644
--- a/src/it/MPMD-304-toolchain-support/pom.xml
+++ b/src/it/MPMD-304-toolchain-support/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <javaVersion>11</javaVersion>
+    <javaVersion>17</javaVersion>
   </properties>
 
   <build>