diff --git a/maven-core-integration-tests/src/test/resources/it0045/subproject/pom.xml b/maven-core-integration-tests/src/test/resources/it0045/subproject/pom.xml
index 36e4fbe7ee..35550ba919 100644
--- a/maven-core-integration-tests/src/test/resources/it0045/subproject/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0045/subproject/pom.xml
@@ -1,10 +1,10 @@
 <model>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-core-it0045</artifactId>
+    <groupId>org.apache.maven.its</groupId>
+    <artifactId>maven-it-it0045</artifactId>
     <version>1.0</version>
   </parent>
-  <artifactId>maven-core-it0045-subproject</artifactId>
+  <artifactId>maven-it-it0045-subproject</artifactId>
   <packaging>jar</packaging>
 </model>
diff --git a/maven-core-integration-tests/src/test/resources/it0046/subproject/pom.xml b/maven-core-integration-tests/src/test/resources/it0046/subproject/pom.xml
index 5980c9966c..7c369724b9 100644
--- a/maven-core-integration-tests/src/test/resources/it0046/subproject/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0046/subproject/pom.xml
@@ -1,11 +1,11 @@
 <model>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-core-it0046</artifactId>
+    <groupId>org.apache.maven.its</groupId>
+    <artifactId>maven-it-it0046</artifactId>
     <version>1.0</version>
   </parent>
-  <artifactId>maven-core-it0046-subproject</artifactId>
+  <artifactId>maven-it-it0046-subproject</artifactId>
   <packaging>jar</packaging>
 
   <build>
@@ -14,7 +14,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-core-it-plugin</artifactId>
         <version>1.0-SNAPSHOT</version>
-
         <configuration>
           <fail>true</fail>
         </configuration>
diff --git a/maven-core-integration-tests/src/test/resources/it0046/subproject2/pom.xml b/maven-core-integration-tests/src/test/resources/it0046/subproject2/pom.xml
index 969864332c..89d4334b54 100644
--- a/maven-core-integration-tests/src/test/resources/it0046/subproject2/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0046/subproject2/pom.xml
@@ -1,10 +1,10 @@
 <model>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-core-it0046</artifactId>
+    <groupId>org.apache.maven.its</groupId>
+    <artifactId>maven-it-it0046</artifactId>
     <version>1.0</version>
   </parent>
-  <artifactId>maven-core-it0046-subproject2</artifactId>
+  <artifactId>maven-it-it0046-subproject2</artifactId>
   <packaging>jar</packaging>
 </model>
diff --git a/maven-core-integration-tests/src/test/resources/it0058/subproject/pom.xml b/maven-core-integration-tests/src/test/resources/it0058/subproject/pom.xml
index 0920d108d6..826b84f0c3 100644
--- a/maven-core-integration-tests/src/test/resources/it0058/subproject/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0058/subproject/pom.xml
@@ -1,11 +1,11 @@
 <model>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.it</groupId>
-    <artifactId>maven-core-it0058</artifactId>
+    <groupId>org.apache.maven.its</groupId>
+    <artifactId>maven-it-it0058</artifactId>
     <version>1.0</version>
   </parent>
-  <artifactId>maven-core-it0058-subproject</artifactId>
+  <artifactId>maven-it-it0058-subproject</artifactId>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
diff --git a/maven-core-integration-tests/src/test/resources/it0060/subproject/pom.xml b/maven-core-integration-tests/src/test/resources/it0060/subproject/pom.xml
index 09a3fc64ae..605948c59b 100644
--- a/maven-core-integration-tests/src/test/resources/it0060/subproject/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0060/subproject/pom.xml
@@ -1,11 +1,11 @@
 <model>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.it</groupId>
-    <artifactId>maven-core-it0060</artifactId>
+    <groupId>org.apache.maven.its</groupId>
+    <artifactId>maven-it-it0060</artifactId>
     <version>1.0</version>
   </parent>
-  <artifactId>maven-core-it0060-subproject</artifactId>
+  <artifactId>maven-it-it0060-subproject</artifactId>
   <packaging>jar</packaging>
   <version>1.0</version>
 
diff --git a/maven-core-integration-tests/src/test/resources/it0075/sub1/pom.xml b/maven-core-integration-tests/src/test/resources/it0075/sub1/pom.xml
index 672caeba7e..b15bde92e3 100644
--- a/maven-core-integration-tests/src/test/resources/it0075/sub1/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0075/sub1/pom.xml
@@ -1,11 +1,11 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.it</groupId>
-    <artifactId>maven-core-it0075-root</artifactId>
+    <groupId>org.apache.maven.its</groupId>
+    <artifactId>maven-it-it0075</artifactId>
     <version>1.0</version>
   </parent>
 
-  <artifactId>maven-core-it0075-sub1</artifactId>
+  <artifactId>maven-it-it0075-sub1</artifactId>
 
 </project>
diff --git a/maven-core-integration-tests/src/test/resources/it0075/sub2/pom.xml b/maven-core-integration-tests/src/test/resources/it0075/sub2/pom.xml
index f4e247cc5c..d2b14e1d67 100644
--- a/maven-core-integration-tests/src/test/resources/it0075/sub2/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0075/sub2/pom.xml
@@ -1,11 +1,11 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.it</groupId>
-    <artifactId>maven-core-it0075-root</artifactId>
+    <groupId>org.apache.maven.its</groupId>
+    <artifactId>maven-it-it0075</artifactId>
     <version>1.0</version>
   </parent>
 
-  <artifactId>maven-core-it0075-sub2</artifactId>
+  <artifactId>maven-it-it0075-sub2</artifactId>
 
 </project>
diff --git a/maven-core-integration-tests/src/test/resources/it0085/dep/pom.xml b/maven-core-integration-tests/src/test/resources/it0085/dep/pom.xml
index aa8b72fd79..f7c0d41aa4 100644
--- a/maven-core-integration-tests/src/test/resources/it0085/dep/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0085/dep/pom.xml
@@ -1,12 +1,11 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.it</groupId>
-    <artifactId>it0085-parent</artifactId>
+    <groupId>org.apache.maven.its</groupId>
+    <artifactId>maven-it-it0085</artifactId>
     <version>1.0</version>
   </parent>
   <artifactId>it0085-dep</artifactId>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.it</groupId>
diff --git a/maven-core-integration-tests/src/test/resources/it0085/war/pom.xml b/maven-core-integration-tests/src/test/resources/it0085/war/pom.xml
index 885aed6f41..26edeb9163 100644
--- a/maven-core-integration-tests/src/test/resources/it0085/war/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0085/war/pom.xml
@@ -1,8 +1,8 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.it</groupId>
-    <artifactId>it0085-parent</artifactId>
+    <groupId>org.apache.maven.its</groupId>
+    <artifactId>maven-it-it0085</artifactId>
     <version>1.0</version>
   </parent>
   <artifactId>it0085-war</artifactId>
@@ -15,7 +15,7 @@
       <version>3.8.1</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.it</groupId>
+      <groupId>org.apache.maven.its</groupId>
       <artifactId>it0085-dep</artifactId>
       <version>1.0</version>
       <scope>provided</scope>
diff --git a/maven-core-integration-tests/src/test/resources/it0099/child/pom.xml b/maven-core-integration-tests/src/test/resources/it0099/child/pom.xml
index 3e7560e6a5..8af747a2d4 100644
--- a/maven-core-integration-tests/src/test/resources/it0099/child/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0099/child/pom.xml
@@ -1,8 +1,8 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.it0099</groupId>
-    <artifactId>maven-it0099-parent</artifactId>
+    <groupId>org.apache.maven.its</groupId>
+    <artifactId>maven-it-it0099</artifactId>
     <version>1</version>
   </parent>
   <artifactId>maven-it0099-child</artifactId>
diff --git a/maven-core-integration-tests/src/test/resources/it0103/level1/level2/level3/pom.xml b/maven-core-integration-tests/src/test/resources/it0103/level1/level2/level3/pom.xml
index 12d7490fbd..9fbcbde0c4 100644
--- a/maven-core-integration-tests/src/test/resources/it0103/level1/level2/level3/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0103/level1/level2/level3/pom.xml
@@ -1,12 +1,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.it0103</groupId>
+    <groupId>org.apache.maven.its</groupId>
     <artifactId>level1</artifactId>
     <version>1</version>
   </parent>
-  <groupId>org.apache.maven.it0103</groupId>
   <artifactId>level3</artifactId>
   <version>1</version>
-
 </project>
diff --git a/maven-core-integration-tests/src/test/resources/it0103/level1/level2/pom.xml b/maven-core-integration-tests/src/test/resources/it0103/level1/level2/pom.xml
index 36c55114e1..77d5c5238a 100644
--- a/maven-core-integration-tests/src/test/resources/it0103/level1/level2/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0103/level1/level2/pom.xml
@@ -1,7 +1,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.it0103</groupId>
+    <groupId>org.apache.maven.its</groupId>
     <artifactId>level1</artifactId>
     <version>1</version>
   </parent>
diff --git a/maven-core-integration-tests/src/test/resources/it0103/level1/pom.xml b/maven-core-integration-tests/src/test/resources/it0103/level1/pom.xml
index 437160cab9..57d215e3c6 100644
--- a/maven-core-integration-tests/src/test/resources/it0103/level1/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0103/level1/pom.xml
@@ -1,8 +1,8 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.it0103</groupId>
-    <artifactId>root</artifactId>
+    <groupId>org.apache.maven.its</groupId>
+    <artifactId>maven-it-it0103</artifactId>
     <version>1</version>
   </parent>
   <artifactId>level1</artifactId>