diff --git a/maven-core-integration-tests/src/test/resources/it0080/test-component-a/pom.xml b/maven-core-integration-tests/src/test/resources/it0080/test-component-a/pom.xml
index 2bf032090e..c6cdc46397 100644
--- a/maven-core-integration-tests/src/test/resources/it0080/test-component-a/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0080/test-component-a/pom.xml
@@ -5,8 +5,6 @@
     <groupId>org.apache.maven.its.it0080</groupId>
     <version>0.1</version>
   </parent>
-
-  <groupId>test</groupId>
   <artifactId>test-component-a</artifactId>
   <version>0.1</version>
   <name>Test Component A</name>
diff --git a/maven-core-integration-tests/src/test/resources/it0080/test-component-b/pom.xml b/maven-core-integration-tests/src/test/resources/it0080/test-component-b/pom.xml
index e9f7ff9113..42c81ec40f 100644
--- a/maven-core-integration-tests/src/test/resources/it0080/test-component-b/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0080/test-component-b/pom.xml
@@ -5,13 +5,10 @@
     <groupId>org.apache.maven.its.it0080</groupId>
     <version>0.1</version>
   </parent>
-
-  <groupId>test</groupId>
   <artifactId>test-component-b</artifactId>
   <version>0.1</version>
   <name>Test Component B</name>
   <packaging>war</packaging>
-
   <dependencies>
     <dependency>
       <groupId>test</groupId>
diff --git a/maven-core-integration-tests/src/test/resources/it0080/test-component-c/pom.xml b/maven-core-integration-tests/src/test/resources/it0080/test-component-c/pom.xml
index 8eff500234..38244af7ce 100644
--- a/maven-core-integration-tests/src/test/resources/it0080/test-component-c/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0080/test-component-c/pom.xml
@@ -5,13 +5,10 @@
     <groupId>org.apache.maven.its.it0080</groupId>
     <version>0.1</version>
   </parent>
-
-  <groupId>test</groupId>
   <artifactId>test-component-c</artifactId>
   <version>0.1</version>
   <name>Test Component C</name>
   <packaging>ear</packaging>
-
   <dependencies>
     <dependency>
       <groupId>test</groupId>
diff --git a/maven-core-integration-tests/src/test/resources/it0081/test-plugin/pom.xml b/maven-core-integration-tests/src/test/resources/it0081/test-plugin/pom.xml
index a276dfc219..403a0d665e 100644
--- a/maven-core-integration-tests/src/test/resources/it0081/test-plugin/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0081/test-plugin/pom.xml
@@ -5,7 +5,6 @@
     <groupId>org.apache.maven.its.it0081</groupId>
     <version>0.1</version>
   </parent>
-  <groupId>test</groupId>
   <artifactId>test-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <version>0.1</version>
diff --git a/maven-core-integration-tests/src/test/resources/it0082/test-component-c/pom.xml b/maven-core-integration-tests/src/test/resources/it0082/test-component-c/pom.xml
index 314db465d6..d07b54d971 100644
--- a/maven-core-integration-tests/src/test/resources/it0082/test-component-c/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0082/test-component-c/pom.xml
@@ -1,17 +1,14 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>test-components</artifactId>
-    <groupId>test</groupId>
-    <version>0.1</version>
+   <parent>
+     <artifactId>maven-it-it0082</artifactId>
+     <groupId>org.apache.maven.its.it0082</groupId>
+     <version>0.1</version>
   </parent>
-
-  <groupId>test</groupId>
   <artifactId>test-component-c</artifactId>
   <version>0.1</version>
   <name>Test Component C</name>
   <packaging>war</packaging>
-
   <build>
     <plugins>
       <plugin>
diff --git a/maven-core-integration-tests/src/test/resources/it0082/test-plugin/pom.xml b/maven-core-integration-tests/src/test/resources/it0082/test-plugin/pom.xml
index 6a1d4834be..9a775643a6 100644
--- a/maven-core-integration-tests/src/test/resources/it0082/test-plugin/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0082/test-plugin/pom.xml
@@ -1,8 +1,8 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>test-components</artifactId>
-		<groupId>test</groupId>
+		<artifactId>maven-it-it0082</artifactId>
+		<groupId>org.apache.maven.its.it0082</groupId>
 		<version>0.1</version>
 	</parent>
 
diff --git a/maven-core-integration-tests/src/test/resources/it0083/test-component-a/pom.xml b/maven-core-integration-tests/src/test/resources/it0083/test-component-a/pom.xml
index 2e6df5cfcb..78f5d63f97 100644
--- a/maven-core-integration-tests/src/test/resources/it0083/test-component-a/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0083/test-component-a/pom.xml
@@ -1,12 +1,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>test-components</artifactId>
-		<groupId>test</groupId>
-		<version>0.1</version>
-	</parent>
-
-  <groupId>test</groupId>
+   <parent>
+     <artifactId>maven-it-it0083</artifactId>
+     <groupId>org.apache.maven.its.it0083</groupId>
+     <version>0.1</version>
+  </parent>
   <artifactId>test-component-a</artifactId>
   <version>0.1</version>
   <name>Test Component A</name>
diff --git a/maven-core-integration-tests/src/test/resources/it0083/test-component-b/pom.xml b/maven-core-integration-tests/src/test/resources/it0083/test-component-b/pom.xml
index 64745ad784..b62bbedd22 100644
--- a/maven-core-integration-tests/src/test/resources/it0083/test-component-b/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0083/test-component-b/pom.xml
@@ -1,12 +1,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>test-components</artifactId>
-		<groupId>test</groupId>
-		<version>0.1</version>
-	</parent>
-
-  <groupId>test</groupId>
+   <parent>
+     <artifactId>maven-it-it0083</artifactId>
+     <groupId>org.apache.maven.its.it0083</groupId>
+     <version>0.1</version>
+  </parent>
   <artifactId>test-component-b</artifactId>
   <version>0.1</version>
   <name>Test Component B</name>
diff --git a/maven-core-integration-tests/src/test/resources/it0083/test-component-c/pom.xml b/maven-core-integration-tests/src/test/resources/it0083/test-component-c/pom.xml
index 389cd90954..eafdfb997b 100644
--- a/maven-core-integration-tests/src/test/resources/it0083/test-component-c/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0083/test-component-c/pom.xml
@@ -1,12 +1,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>test-components</artifactId>
-		<groupId>test</groupId>
-		<version>0.1</version>
-	</parent>
-
-  <groupId>test</groupId>
+   <parent>
+     <artifactId>maven-it-it0083</artifactId>
+     <groupId>org.apache.maven.its.it0083</groupId>
+     <version>0.1</version>
+  </parent>
   <artifactId>test-component-c</artifactId>
   <version>0.1</version>
   <name>Test Component C</name>
diff --git a/maven-core-integration-tests/src/test/resources/it0084/test-component-a/pom.xml b/maven-core-integration-tests/src/test/resources/it0084/test-component-a/pom.xml
index 6b2f81817a..06097d7d9e 100644
--- a/maven-core-integration-tests/src/test/resources/it0084/test-component-a/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0084/test-component-a/pom.xml
@@ -1,21 +1,19 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>test-components</artifactId>
-		<groupId>test</groupId>
-		<version>0.1</version>
-	</parent>
-
-  <groupId>test</groupId>
+   <parent>
+     <artifactId>maven-it-it0084</artifactId>
+     <groupId>org.apache.maven.its.it0084</groupId>
+     <version>0.1</version>
+  </parent>
   <artifactId>test-component-a</artifactId>
   <version>0.1</version>
   <name>Test Component A</name>
   <packaging>jar</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-core-it-support</artifactId>
-			<version>1.4</version>
-		</dependency>
-	</dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+	 <artifactId>maven-core-it-support</artifactId>
+	 <version>1.4</version>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/maven-core-integration-tests/src/test/resources/it0084/test-component-b/pom.xml b/maven-core-integration-tests/src/test/resources/it0084/test-component-b/pom.xml
index 9b4f685f71..cee75b9d09 100644
--- a/maven-core-integration-tests/src/test/resources/it0084/test-component-b/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0084/test-component-b/pom.xml
@@ -1,12 +1,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>test-components</artifactId>
-		<groupId>test</groupId>
-		<version>0.1</version>
-	</parent>
-
-  <groupId>test</groupId>
+   <parent>
+     <artifactId>maven-it-it0084</artifactId>
+     <groupId>org.apache.maven.its.it0084</groupId>
+     <version>0.1</version>
+  </parent>
   <artifactId>test-component-b</artifactId>
   <version>0.1</version>
   <name>Test Component B</name>
diff --git a/maven-core-integration-tests/src/test/resources/it0084/test-component-c/pom.xml b/maven-core-integration-tests/src/test/resources/it0084/test-component-c/pom.xml
index 30344f6100..a9b928c93e 100644
--- a/maven-core-integration-tests/src/test/resources/it0084/test-component-c/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0084/test-component-c/pom.xml
@@ -1,12 +1,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>test-components</artifactId>
-		<groupId>test</groupId>
-		<version>0.1</version>
-	</parent>
-
-  <groupId>test</groupId>
+   <parent>
+     <artifactId>maven-it-it0084</artifactId>
+     <groupId>org.apache.maven.its.it0084</groupId>
+     <version>0.1</version>
+  </parent>
   <artifactId>test-component-c</artifactId>
   <version>0.1</version>
   <name>Test Component C</name>