diff --git a/src/it/integration_tests_Scala3_parent/pom.xml b/src/it/integration_tests_Scala3_parent/pom.xml
new file mode 100644
index 00000000..2148ad44
--- /dev/null
+++ b/src/it/integration_tests_Scala3_parent/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>it.scoverage-maven-plugin</groupId>
+        <artifactId>integration_tests_parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../integration_tests_parent/pom.xml</relativePath>
+    </parent>
+
+    <artifactId>integration_tests_Scala3_parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Scoverage Plugin Integration Tests for Scala 3 Parent</name>
+    <description>Scoverage Plugin Integration Tests for Scala 3 Parent</description>
+
+    <properties>
+        <scala.compat.version>3</scala.compat.version>
+        <scala.version>3.5.2</scala.version>
+        <scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
+    </properties>
+
+</project>
diff --git a/src/it/integration_tests_parent/pom.xml b/src/it/integration_tests_parent/pom.xml
index a97eda34..251290e9 100644
--- a/src/it/integration_tests_parent/pom.xml
+++ b/src/it/integration_tests_parent/pom.xml
@@ -11,20 +11,24 @@
     <name>Scoverage Plugin Integration Tests Parent</name>
     <description>Scoverage Plugin Integration Tests Parent</description>
 
+    <prerequisites>
+        <maven>3.6.3</maven>
+    </prerequisites>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <junit.version>4.13.1</junit.version>
+        <junit.version>4.13.2</junit.version>
         <scalatest.version>3.2.17</scalatest.version>
 
-        <compiler.plugin.version>3.11.0</compiler.plugin.version>
-        <surefire.plugin.version>3.1.2</surefire.plugin.version>
-        <scala.plugin.version>4.9.1</scala.plugin.version>
-        <scalatest.plugin.version>2.0.0</scalatest.plugin.version>
-        <project-info-reports.plugin.version>3.5.0</project-info-reports.plugin.version>
+        <compiler.plugin.version>3.13.0</compiler.plugin.version>
+        <surefire.plugin.version>3.5.2</surefire.plugin.version>
+        <scala.plugin.version>4.9.2</scala.plugin.version>
+        <scalatest.plugin.version>2.2.0</scalatest.plugin.version>
+        <project-info-reports.plugin.version>3.8.0</project-info-reports.plugin.version>
         <site.plugin.version>3.21.0</site.plugin.version>
 
         <scala.compat.version>2.13</scala.compat.version>
-        <scala.minor.version>14</scala.minor.version>
+        <scala.minor.version>15</scala.minor.version>
         <scala.version>${scala.compat.version}.${scala.minor.version}</scala.version>
         <scala.library.artifact.id>scala-library</scala.library.artifact.id>
     </properties>
diff --git a/src/it/test_Scala3_multimodule/invoker.properties b/src/it/test_ScalaMavenPlugin_Scala2_12_JUnit/invoker.properties
similarity index 100%
rename from src/it/test_Scala3_multimodule/invoker.properties
rename to src/it/test_ScalaMavenPlugin_Scala2_12_JUnit/invoker.properties
diff --git a/src/it/test_ScalaMavenPlugin_Scala212_JUnit/pom.xml b/src/it/test_ScalaMavenPlugin_Scala2_12_JUnit/pom.xml
similarity index 96%
rename from src/it/test_ScalaMavenPlugin_Scala212_JUnit/pom.xml
rename to src/it/test_ScalaMavenPlugin_Scala2_12_JUnit/pom.xml
index d981bf59..5d6e88f3 100644
--- a/src/it/test_ScalaMavenPlugin_Scala212_JUnit/pom.xml
+++ b/src/it/test_ScalaMavenPlugin_Scala2_12_JUnit/pom.xml
@@ -11,7 +11,7 @@
         <relativePath>../integration_tests_parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>test_ScalaMavenPlugin_Scala212_JUnit</artifactId>
+    <artifactId>test_ScalaMavenPlugin_Scala2_12_JUnit</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Test Scoverage Report using scala-maven-plugin, Scala 2.12 and JUnit</name>
diff --git a/src/it/test_ScalaMavenPlugin_Scala212_JUnit/src/main/scala/HelloServiceScala.scala b/src/it/test_ScalaMavenPlugin_Scala2_12_JUnit/src/main/scala/HelloServiceScala.scala
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala212_JUnit/src/main/scala/HelloServiceScala.scala
rename to src/it/test_ScalaMavenPlugin_Scala2_12_JUnit/src/main/scala/HelloServiceScala.scala
diff --git a/src/it/test_ScalaMavenPlugin_Scala212_JUnit/src/test/scala/HelloServiceScalaTest.scala b/src/it/test_ScalaMavenPlugin_Scala2_12_JUnit/src/test/scala/HelloServiceScalaTest.scala
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala212_JUnit/src/test/scala/HelloServiceScalaTest.scala
rename to src/it/test_ScalaMavenPlugin_Scala2_12_JUnit/src/test/scala/HelloServiceScalaTest.scala
diff --git a/src/it/test_ScalaMavenPlugin_Scala212_JUnit/validate.groovy b/src/it/test_ScalaMavenPlugin_Scala2_12_JUnit/validate.groovy
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala212_JUnit/validate.groovy
rename to src/it/test_ScalaMavenPlugin_Scala2_12_JUnit/validate.groovy
diff --git a/src/it/test_ScalaMavenPlugin_Scala212_JUnit/invoker.properties b/src/it/test_ScalaMavenPlugin_Scala2_12_ScalaTest/invoker.properties
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala212_JUnit/invoker.properties
rename to src/it/test_ScalaMavenPlugin_Scala2_12_ScalaTest/invoker.properties
diff --git a/src/it/test_ScalaMavenPlugin_Scala212_ScalaTest/pom.xml b/src/it/test_ScalaMavenPlugin_Scala2_12_ScalaTest/pom.xml
similarity index 95%
rename from src/it/test_ScalaMavenPlugin_Scala212_ScalaTest/pom.xml
rename to src/it/test_ScalaMavenPlugin_Scala2_12_ScalaTest/pom.xml
index d3966f96..21c7262f 100644
--- a/src/it/test_ScalaMavenPlugin_Scala212_ScalaTest/pom.xml
+++ b/src/it/test_ScalaMavenPlugin_Scala2_12_ScalaTest/pom.xml
@@ -11,7 +11,7 @@
         <relativePath>../integration_tests_parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>test_ScalaMavenPlugin_Scala212_ScalaTest</artifactId>
+    <artifactId>test_ScalaMavenPlugin_Scala2_12_ScalaTest</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Test Scoverage Report using scala-maven-plugin, Scala 2.12 and ScalaTest</name>
diff --git a/src/it/test_ScalaMavenPlugin_Scala212_ScalaTest/src/main/scala/HelloServiceScala.scala b/src/it/test_ScalaMavenPlugin_Scala2_12_ScalaTest/src/main/scala/HelloServiceScala.scala
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala212_ScalaTest/src/main/scala/HelloServiceScala.scala
rename to src/it/test_ScalaMavenPlugin_Scala2_12_ScalaTest/src/main/scala/HelloServiceScala.scala
diff --git a/src/it/test_ScalaMavenPlugin_Scala212_ScalaTest/src/test/scala/HelloServiceScalaTest.scala b/src/it/test_ScalaMavenPlugin_Scala2_12_ScalaTest/src/test/scala/HelloServiceScalaTest.scala
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala212_ScalaTest/src/test/scala/HelloServiceScalaTest.scala
rename to src/it/test_ScalaMavenPlugin_Scala2_12_ScalaTest/src/test/scala/HelloServiceScalaTest.scala
diff --git a/src/it/test_ScalaMavenPlugin_Scala212_ScalaTest/validate.groovy b/src/it/test_ScalaMavenPlugin_Scala2_12_ScalaTest/validate.groovy
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala212_ScalaTest/validate.groovy
rename to src/it/test_ScalaMavenPlugin_Scala2_12_ScalaTest/validate.groovy
diff --git a/src/it/test_ScalaMavenPlugin_Scala212_ScalaTest/invoker.properties b/src/it/test_ScalaMavenPlugin_Scala2_13_JUnit/invoker.properties
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala212_ScalaTest/invoker.properties
rename to src/it/test_ScalaMavenPlugin_Scala2_13_JUnit/invoker.properties
diff --git a/src/it/test_ScalaMavenPlugin_Scala213_JUnit/pom.xml b/src/it/test_ScalaMavenPlugin_Scala2_13_JUnit/pom.xml
similarity index 95%
rename from src/it/test_ScalaMavenPlugin_Scala213_JUnit/pom.xml
rename to src/it/test_ScalaMavenPlugin_Scala2_13_JUnit/pom.xml
index 188777b3..3a961be0 100644
--- a/src/it/test_ScalaMavenPlugin_Scala213_JUnit/pom.xml
+++ b/src/it/test_ScalaMavenPlugin_Scala2_13_JUnit/pom.xml
@@ -11,7 +11,7 @@
         <relativePath>../integration_tests_parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>test_ScalaMavenPlugin_Scala213_JUnit</artifactId>
+    <artifactId>test_ScalaMavenPlugin_Scala2_13_JUnit</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Test Scoverage Report using scala-maven-plugin, Scala 2.13 and JUnit</name>
diff --git a/src/it/test_ScalaMavenPlugin_Scala213_JUnit/src/main/scala/HelloServiceScala.scala b/src/it/test_ScalaMavenPlugin_Scala2_13_JUnit/src/main/scala/HelloServiceScala.scala
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala213_JUnit/src/main/scala/HelloServiceScala.scala
rename to src/it/test_ScalaMavenPlugin_Scala2_13_JUnit/src/main/scala/HelloServiceScala.scala
diff --git a/src/it/test_ScalaMavenPlugin_Scala213_JUnit/src/test/scala/HelloServiceScalaTest.scala b/src/it/test_ScalaMavenPlugin_Scala2_13_JUnit/src/test/scala/HelloServiceScalaTest.scala
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala213_JUnit/src/test/scala/HelloServiceScalaTest.scala
rename to src/it/test_ScalaMavenPlugin_Scala2_13_JUnit/src/test/scala/HelloServiceScalaTest.scala
diff --git a/src/it/test_ScalaMavenPlugin_Scala213_JUnit/validate.groovy b/src/it/test_ScalaMavenPlugin_Scala2_13_JUnit/validate.groovy
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala213_JUnit/validate.groovy
rename to src/it/test_ScalaMavenPlugin_Scala2_13_JUnit/validate.groovy
diff --git a/src/it/test_ScalaMavenPlugin_Scala213_JUnit/invoker.properties b/src/it/test_ScalaMavenPlugin_Scala2_13_ScalaTest/invoker.properties
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala213_JUnit/invoker.properties
rename to src/it/test_ScalaMavenPlugin_Scala2_13_ScalaTest/invoker.properties
diff --git a/src/it/test_ScalaMavenPlugin_Scala213_ScalaTest/pom.xml b/src/it/test_ScalaMavenPlugin_Scala2_13_ScalaTest/pom.xml
similarity index 95%
rename from src/it/test_ScalaMavenPlugin_Scala213_ScalaTest/pom.xml
rename to src/it/test_ScalaMavenPlugin_Scala2_13_ScalaTest/pom.xml
index 7dc0a7fd..4485596c 100644
--- a/src/it/test_ScalaMavenPlugin_Scala213_ScalaTest/pom.xml
+++ b/src/it/test_ScalaMavenPlugin_Scala2_13_ScalaTest/pom.xml
@@ -11,7 +11,7 @@
         <relativePath>../integration_tests_parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>test_ScalaMavenPlugin_Scala213_ScalaTest</artifactId>
+    <artifactId>test_ScalaMavenPlugin_Scala2_13_ScalaTest</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Test Scoverage Report using scala-maven-plugin, Scala 2.13 and ScalaTest</name>
diff --git a/src/it/test_ScalaMavenPlugin_Scala213_ScalaTest/src/main/scala/HelloServiceScala.scala b/src/it/test_ScalaMavenPlugin_Scala2_13_ScalaTest/src/main/scala/HelloServiceScala.scala
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala213_ScalaTest/src/main/scala/HelloServiceScala.scala
rename to src/it/test_ScalaMavenPlugin_Scala2_13_ScalaTest/src/main/scala/HelloServiceScala.scala
diff --git a/src/it/test_ScalaMavenPlugin_Scala213_ScalaTest/src/test/scala/HelloServiceScalaTest.scala b/src/it/test_ScalaMavenPlugin_Scala2_13_ScalaTest/src/test/scala/HelloServiceScalaTest.scala
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala213_ScalaTest/src/test/scala/HelloServiceScalaTest.scala
rename to src/it/test_ScalaMavenPlugin_Scala2_13_ScalaTest/src/test/scala/HelloServiceScalaTest.scala
diff --git a/src/it/test_ScalaMavenPlugin_Scala213_ScalaTest/validate.groovy b/src/it/test_ScalaMavenPlugin_Scala2_13_ScalaTest/validate.groovy
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala213_ScalaTest/validate.groovy
rename to src/it/test_ScalaMavenPlugin_Scala2_13_ScalaTest/validate.groovy
diff --git a/src/it/test_ScalaMavenPlugin_Scala213_ScalaTest/invoker.properties b/src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest/invoker.properties
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala213_ScalaTest/invoker.properties
rename to src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest/invoker.properties
diff --git a/src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest/pom.xml b/src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest/pom.xml
similarity index 76%
rename from src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest/pom.xml
rename to src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest/pom.xml
index c1a64586..fa271e60 100644
--- a/src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest/pom.xml
+++ b/src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest/pom.xml
@@ -6,23 +6,17 @@
 
     <parent>
         <groupId>it.scoverage-maven-plugin</groupId>
-        <artifactId>integration_tests_parent</artifactId>
+        <artifactId>integration_tests_Scala3_parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../integration_tests_parent/pom.xml</relativePath>
+        <relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>test_ScalaMavenPlugin_Scala32Plus_ScalaTest</artifactId>
+    <artifactId>test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Test Scoverage Report using scala-maven-plugin, Scala 3.2+ and ScalaTest</name>
     <description>Test Scoverage Report using scala-maven-plugin, Scala 3.2+ and ScalaTest</description>
 
-    <properties>
-        <scala.compat.version>3</scala.compat.version>
-        <scala.version>3.3.1</scala.version>
-        <scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
diff --git a/src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest/src/main/scala/HelloServiceScala.scala b/src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest/src/main/scala/HelloServiceScala.scala
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest/src/main/scala/HelloServiceScala.scala
rename to src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest/src/main/scala/HelloServiceScala.scala
diff --git a/src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest/src/test/scala/HelloServiceScalaTest.scala b/src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest/src/test/scala/HelloServiceScalaTest.scala
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest/src/test/scala/HelloServiceScalaTest.scala
rename to src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest/src/test/scala/HelloServiceScalaTest.scala
diff --git a/src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest/validate.groovy b/src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest/validate.groovy
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest/validate.groovy
rename to src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest/validate.groovy
diff --git a/src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest/invoker.properties b/src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest_ScalaVersion_Not_Set/invoker.properties
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest/invoker.properties
rename to src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest_ScalaVersion_Not_Set/invoker.properties
diff --git a/src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest_ScalaVersion_Not_Set/pom.xml b/src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest_ScalaVersion_Not_Set/pom.xml
similarity index 81%
rename from src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest_ScalaVersion_Not_Set/pom.xml
rename to src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest_ScalaVersion_Not_Set/pom.xml
index 57e2b500..f107653b 100644
--- a/src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest_ScalaVersion_Not_Set/pom.xml
+++ b/src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest_ScalaVersion_Not_Set/pom.xml
@@ -6,28 +6,26 @@
 
     <parent>
         <groupId>it.scoverage-maven-plugin</groupId>
-        <artifactId>integration_tests_parent</artifactId>
+        <artifactId>integration_tests_Scala3_parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../integration_tests_parent/pom.xml</relativePath>
+        <relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>test_ScalaMavenPlugin_Scala32Plus_ScalaTest_ScalaVersion_Not_Set</artifactId>
+    <artifactId>test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest_ScalaVersion_Not_Set</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Test Scoverage Report using scala-maven-plugin, Scala 3.2+ and ScalaTest when scala.version is not set</name>
     <description>Test Scoverage Report using scala-maven-plugin, Scala 3.2+ and ScalaTest when scala.version is not set</description>
 
     <properties>
-        <scala.compat.version>3</scala.compat.version>
         <scala.version/>
-        <scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>${scala.library.artifact.id}</artifactId>
-            <version>3.3.1</version>
+            <version>3.5.2</version>
         </dependency>
     </dependencies>
 
diff --git a/src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest_ScalaVersion_Not_Set/src/main/scala/HelloServiceScala.scala b/src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest_ScalaVersion_Not_Set/src/main/scala/HelloServiceScala.scala
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest_ScalaVersion_Not_Set/src/main/scala/HelloServiceScala.scala
rename to src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest_ScalaVersion_Not_Set/src/main/scala/HelloServiceScala.scala
diff --git a/src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest_ScalaVersion_Not_Set/src/test/scala/HelloServiceScalaTest.scala b/src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest_ScalaVersion_Not_Set/src/test/scala/HelloServiceScalaTest.scala
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest_ScalaVersion_Not_Set/src/test/scala/HelloServiceScalaTest.scala
rename to src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest_ScalaVersion_Not_Set/src/test/scala/HelloServiceScalaTest.scala
diff --git a/src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest_ScalaVersion_Not_Set/validate.groovy b/src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest_ScalaVersion_Not_Set/validate.groovy
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest_ScalaVersion_Not_Set/validate.groovy
rename to src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest_ScalaVersion_Not_Set/validate.groovy
diff --git a/src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest_ScalaVersion_Not_Set/invoker.properties b/src/it/test_aggregate_Scala3/invoker.properties
similarity index 100%
rename from src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest_ScalaVersion_Not_Set/invoker.properties
rename to src/it/test_aggregate_Scala3/invoker.properties
diff --git a/src/it/test_Scala3_multimodule/module01/pom.xml b/src/it/test_aggregate_Scala3/module01/pom.xml
similarity index 90%
rename from src/it/test_Scala3_multimodule/module01/pom.xml
rename to src/it/test_aggregate_Scala3/module01/pom.xml
index 66016f7d..7afab62f 100644
--- a/src/it/test_Scala3_multimodule/module01/pom.xml
+++ b/src/it/test_aggregate_Scala3/module01/pom.xml
@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>it.scoverage-maven-plugin</groupId>
-        <artifactId>test_Scala3_multimodule</artifactId>
+        <artifactId>test_aggregate_Scala3</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/src/it/test_Scala3_multimodule/module01/src/main/scala/pkg01/HelloService1.scala b/src/it/test_aggregate_Scala3/module01/src/main/scala/pkg01/HelloService1.scala
similarity index 100%
rename from src/it/test_Scala3_multimodule/module01/src/main/scala/pkg01/HelloService1.scala
rename to src/it/test_aggregate_Scala3/module01/src/main/scala/pkg01/HelloService1.scala
diff --git a/src/it/test_Scala3_multimodule/module01/src/test/scala/pkg01/HelloServiceTest.scala b/src/it/test_aggregate_Scala3/module01/src/test/scala/pkg01/HelloServiceTest.scala
similarity index 100%
rename from src/it/test_Scala3_multimodule/module01/src/test/scala/pkg01/HelloServiceTest.scala
rename to src/it/test_aggregate_Scala3/module01/src/test/scala/pkg01/HelloServiceTest.scala
diff --git a/src/it/test_Scala3_multimodule/pom.xml b/src/it/test_aggregate_Scala3/pom.xml
similarity index 79%
rename from src/it/test_Scala3_multimodule/pom.xml
rename to src/it/test_aggregate_Scala3/pom.xml
index 5b8e49c3..1da24f18 100644
--- a/src/it/test_Scala3_multimodule/pom.xml
+++ b/src/it/test_aggregate_Scala3/pom.xml
@@ -6,24 +6,17 @@
 
     <parent>
         <groupId>it.scoverage-maven-plugin</groupId>
-        <artifactId>integration_tests_parent</artifactId>
+        <artifactId>integration_tests_Scala3_parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../integration_tests_parent/pom.xml</relativePath>
+        <relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>test_Scala3_multimodule</artifactId>
+    <artifactId>test_aggregate_Scala3</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Test Scala 3 Multi-Module</name>
     <description>Test Scala 3 Multi-Module</description>
 
-    <properties>
-        <scala.compat.version>3</scala.compat.version>
-        <scala.version>3.3.1</scala.version>
-        <scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <modules>
         <module>module01</module>
     </modules>
diff --git a/src/it/test_Scala3_multimodule/validate.groovy b/src/it/test_aggregate_Scala3/validate.groovy
similarity index 100%
rename from src/it/test_Scala3_multimodule/validate.groovy
rename to src/it/test_aggregate_Scala3/validate.groovy
diff --git a/src/it/test_exclusion_Scala3_3_3/pom.xml b/src/it/test_exclusion_Scala3_3_3/pom.xml
index 511eca15..210acf19 100644
--- a/src/it/test_exclusion_Scala3_3_3/pom.xml
+++ b/src/it/test_exclusion_Scala3_3_3/pom.xml
@@ -6,9 +6,9 @@
 
     <parent>
         <groupId>it.scoverage-maven-plugin</groupId>
-        <artifactId>integration_tests_parent</artifactId>
+        <artifactId>integration_tests_Scala3_parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../integration_tests_parent/pom.xml</relativePath>
+        <relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>test_exclusion</artifactId>
@@ -18,10 +18,7 @@
     <description>Test Scoverage exclusion</description>
 
     <properties>
-        <scala.compat.version>3</scala.compat.version>
         <scala.version>3.3.3</scala.version>
-        <scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <build>
diff --git a/src/it/test_exclusion_Scala3_3_4/pom.xml b/src/it/test_exclusion_Scala3_3_4/pom.xml
index 49948b39..624cb0c8 100644
--- a/src/it/test_exclusion_Scala3_3_4/pom.xml
+++ b/src/it/test_exclusion_Scala3_3_4/pom.xml
@@ -6,9 +6,9 @@
 
     <parent>
         <groupId>it.scoverage-maven-plugin</groupId>
-        <artifactId>integration_tests_parent</artifactId>
+        <artifactId>integration_tests_Scala3_parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../integration_tests_parent/pom.xml</relativePath>
+        <relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>test_exclusion</artifactId>
@@ -18,10 +18,7 @@
     <description>Test Scoverage exclusion</description>
 
     <properties>
-        <scala.compat.version>3</scala.compat.version>
         <scala.version>3.3.4</scala.version>
-        <scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <build>
diff --git a/src/it/test_exclusion_Scala3_4_1/pom.xml b/src/it/test_exclusion_Scala3_4_1/pom.xml
index 44457d19..6e205b1d 100644
--- a/src/it/test_exclusion_Scala3_4_1/pom.xml
+++ b/src/it/test_exclusion_Scala3_4_1/pom.xml
@@ -6,9 +6,9 @@
 
     <parent>
         <groupId>it.scoverage-maven-plugin</groupId>
-        <artifactId>integration_tests_parent</artifactId>
+        <artifactId>integration_tests_Scala3_parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../integration_tests_parent/pom.xml</relativePath>
+        <relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>test_exclusion</artifactId>
@@ -18,10 +18,7 @@
     <description>Test Scoverage exclusion</description>
 
     <properties>
-        <scala.compat.version>3</scala.compat.version>
         <scala.version>3.4.1</scala.version>
-        <scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <build>
diff --git a/src/it/test_exclusion_Scala3_4_2/pom.xml b/src/it/test_exclusion_Scala3_4_2/pom.xml
index 94c2ef0a..4e7a86c9 100644
--- a/src/it/test_exclusion_Scala3_4_2/pom.xml
+++ b/src/it/test_exclusion_Scala3_4_2/pom.xml
@@ -6,9 +6,9 @@
 
     <parent>
         <groupId>it.scoverage-maven-plugin</groupId>
-        <artifactId>integration_tests_parent</artifactId>
+        <artifactId>integration_tests_Scala3_parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../integration_tests_parent/pom.xml</relativePath>
+        <relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>test_exclusion</artifactId>
@@ -18,10 +18,7 @@
     <description>Test Scoverage exclusion</description>
 
     <properties>
-        <scala.compat.version>3</scala.compat.version>
         <scala.version>3.4.2</scala.version>
-        <scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <build>