diff --git a/pom.xml b/pom.xml
index 029975a..b68130f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,122 +70,38 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-plugin-plugin</artifactId>
-        <executions>
-          <!-- FIXME: Disable execution, makes IT preparation fail (for whatever reason...) -->
-          <execution>
-            <id>generated-helpmojo</id>
-            <configuration>
-              <extractors>
-                <extractor/>
-              </extractors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
   <profiles>
     <profile>
       <id>run-its</id>
-
-      <properties>
-        <test.remote.repo.url>file://${project.build.testOutputDirectory}/remote-repository</test.remote.repo.url>
-      </properties>
-  
       <build>
-        <testResources>
-          <testResource>
-            <directory>src/it/projects</directory>
-            <targetPath>projects</targetPath>
-          </testResource>
-          <testResource>
-            <directory>src/it/it-project-parent</directory>
-            <targetPath>it-project-parent</targetPath>
-            <filtering>true</filtering>
-          </testResource>
-          <testResource>
-            <directory>src/it/remote-repository</directory>
-            <targetPath>remote-repository</targetPath>
-          </testResource>
-        </testResources>
         <plugins>
           <plugin>
-            <artifactId>maven-clean-plugin</artifactId>
-            <configuration>
-              <filesets>
-                <fileset>
-                  <directory>src/it</directory>
-                  <includes>
-                    <include>**/build.log</include>
-                  </includes>
-                </fileset>
-              </filesets>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-component-it-plugin</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <executions>
-              <execution>
-                <id>stage-plugin</id>
-                <goals>
-                  <goal>stage</goal>
-                </goals>
-                <configuration>
-                  <pluginVersion>testing</pluginVersion>
-                  <repositoryDirectory>${project.build.directory}/local-repository</repositoryDirectory>
-                  <skipUnitTests>true</skipUnitTests>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
+            <configuration>
+              <debug>true</debug>
+              <projectsDirectory>src/it</projectsDirectory>
+              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+              <pomIncludes>
+                <pomInclude>*/pom.xml</pomInclude>
+              </pomIncludes>
+              <preBuildHookScript>setup.bsh</preBuildHookScript>
+              <postBuildHookScript>verify.bsh</postBuildHookScript>
+              <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+              <settingsFile>src/it/settings.xml</settingsFile>
+              <goals>
+                <goal>clean</goal>
+                <goal>initialize</goal>
+              </goals>
+            </configuration>
             <executions>
               <execution>
-                <id>setup-integration-test-parent</id>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <suppressSummaries>true</suppressSummaries>
-                  <goals>
-                    <goal>install</goal>
-                  </goals>
-                  <localRepositoryPath>${project.build.directory}/local-repository</localRepositoryPath>
-                  <pom>${project.build.testOutputDirectory}/it-project-parent/pom.xml</pom>
-                  <streamLogs>true</streamLogs>
-                </configuration>
-              </execution>
-              <execution>
                 <id>integration-test</id>
-                <phase>integration-test</phase>
                 <goals>
+                  <goal>install</goal>
                   <goal>run</goal>
                 </goals>
-                <configuration>
-                  <debug>true</debug>
-                  <projectsDirectory>${project.build.testOutputDirectory}/projects</projectsDirectory>
-                  <pomIncludes>
-                    <pomInclude>**/pom.xml</pomInclude>
-                  </pomIncludes>
-                  <pomExcludes>
-                    <pomExclude>**/child*/pom.xml</pomExclude>
-                    <pomExclude>**/module*/pom.xml</pomExclude>
-                  </pomExcludes>
-                  <postBuildHookScript>verify.bsh</postBuildHookScript>
-                  <localRepositoryPath>${project.build.directory}/local-repository</localRepositoryPath>
-                </configuration>
               </execution>
-           </executions>
+            </executions>
           </plugin>
         </plugins>
       </build>
diff --git a/src/it/projects/apply/apply-single-patch/pom.xml b/src/it/apply-single-patch/pom.xml
similarity index 90%
rename from src/it/projects/apply/apply-single-patch/pom.xml
rename to src/it/apply-single-patch/pom.xml
index 54d4859..eb6bce5 100644
--- a/src/it/projects/apply/apply-single-patch/pom.xml
+++ b/src/it/apply-single-patch/pom.xml
@@ -20,20 +20,21 @@
   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>org.apache.maven.plugins.patch.it</groupId>
-    <artifactId>it-project-parent</artifactId>
-    <version>1</version>
-  </parent>
-  
+  <groupId>test</groupId>
   <artifactId>apply-single-patch</artifactId>
   <name>apply-single-patch</name>
-  
+  <version>1.0-SNAPSHOT</version>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-patch-plugin</artifactId>
+        <version>@pom.version@</version>
         
         <configuration>
           <targetDirectory>${basedir}</targetDirectory>
diff --git a/src/it/projects/apply/apply-single-patch/src/main/patches/first.patch b/src/it/apply-single-patch/src/main/patches/first.patch
similarity index 100%
rename from src/it/projects/apply/apply-single-patch/src/main/patches/first.patch
rename to src/it/apply-single-patch/src/main/patches/first.patch
diff --git a/src/it/projects/apply/apply-single-patch/verify.bsh b/src/it/apply-single-patch/verify.bsh
similarity index 100%
rename from src/it/projects/apply/apply-single-patch/verify.bsh
rename to src/it/apply-single-patch/verify.bsh
diff --git a/src/it/projects/apply/apply-two-patches-in-order/pom.xml b/src/it/apply-two-patches-in-order/pom.xml
similarity index 90%
rename from src/it/projects/apply/apply-two-patches-in-order/pom.xml
rename to src/it/apply-two-patches-in-order/pom.xml
index 944efe5..f158be4 100644
--- a/src/it/projects/apply/apply-two-patches-in-order/pom.xml
+++ b/src/it/apply-two-patches-in-order/pom.xml
@@ -20,20 +20,21 @@
   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>org.apache.maven.plugins.patch.it</groupId>
-    <artifactId>it-project-parent</artifactId>
-    <version>1</version>
-  </parent>
-  
+  <groupId>test</groupId>
   <artifactId>apply-two-patches-in-order</artifactId>
   <name>apply-two-patches-in-order</name>
-  
+  <version>1.0-SNAPSHOT</version>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-patch-plugin</artifactId>
+        <version>@pom.version@</version>
         
         <configuration>
           <targetDirectory>${basedir}</targetDirectory>
diff --git a/src/it/projects/apply/apply-two-patches-in-order/src/main/patches/first.patch b/src/it/apply-two-patches-in-order/src/main/patches/first.patch
similarity index 100%
rename from src/it/projects/apply/apply-two-patches-in-order/src/main/patches/first.patch
rename to src/it/apply-two-patches-in-order/src/main/patches/first.patch
diff --git a/src/it/projects/apply/apply-two-patches-in-order/src/main/patches/second.patch b/src/it/apply-two-patches-in-order/src/main/patches/second.patch
similarity index 100%
rename from src/it/projects/apply/apply-two-patches-in-order/src/main/patches/second.patch
rename to src/it/apply-two-patches-in-order/src/main/patches/second.patch
diff --git a/src/it/projects/apply/apply-two-patches-in-order/verify.bsh b/src/it/apply-two-patches-in-order/verify.bsh
similarity index 100%
rename from src/it/projects/apply/apply-two-patches-in-order/verify.bsh
rename to src/it/apply-two-patches-in-order/verify.bsh
diff --git a/src/it/it-project-parent/pom.xml b/src/it/it-project-parent/pom.xml
deleted file mode 100644
index 00a05a5..0000000
--- a/src/it/it-project-parent/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-      http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<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>
-  <groupId>org.apache.maven.plugins.patch.it</groupId>
-  <artifactId>it-project-parent</artifactId>
-  <packaging>pom</packaging>
-  <version>1</version>
-  <name>it-project-parent</name>
-
-  <repositories>
-    <repository>
-      <id>integration.test.repo</id>
-      <url>${test.remote.repo.url}</url>
-    </repository>
-  </repositories>
-
-  <distributionManagement>
-    <repository>
-      <id>integration.test.repo</id>
-      <url>${test.remote.repo.url}</url>
-    </repository>
-  </distributionManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-patch-plugin</artifactId>
-        <version>testing</version>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/src/it/projects/path with spaces/pom.xml b/src/it/path with spaces/pom.xml
similarity index 91%
rename from src/it/projects/path with spaces/pom.xml
rename to src/it/path with spaces/pom.xml
index 02f07d0..b5e05d5 100644
--- a/src/it/projects/path with spaces/pom.xml
+++ b/src/it/path with spaces/pom.xml
@@ -20,20 +20,21 @@
   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>org.apache.maven.plugins.patch.it</groupId>
-    <artifactId>it-project-parent</artifactId>
-    <version>1</version>
-  </parent>
-  
+  <groupId>test</groupId>
   <artifactId>path-with-spaces</artifactId>
   <name>path-with-spaces</name>
-  
+  <version>1.0-SNAPSHOT</version>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-patch-plugin</artifactId>
+        <version>@pom.version@</version>
         <executions>
           <execution>
             <id>apply-patch-0</id>
diff --git a/src/it/projects/path with spaces/src/main/patches/first.patch b/src/it/path with spaces/src/main/patches/first.patch
similarity index 100%
rename from src/it/projects/path with spaces/src/main/patches/first.patch
rename to src/it/path with spaces/src/main/patches/first.patch
diff --git a/src/it/projects/path with spaces/src/main/patches/second.patch b/src/it/path with spaces/src/main/patches/second.patch
similarity index 100%
rename from src/it/projects/path with spaces/src/main/patches/second.patch
rename to src/it/path with spaces/src/main/patches/second.patch
diff --git a/src/it/projects/path with spaces/verify.bsh b/src/it/path with spaces/verify.bsh
similarity index 100%
rename from src/it/projects/path with spaces/verify.bsh
rename to src/it/path with spaces/verify.bsh
diff --git a/src/it/projects/apply/apply-single-patch/goals.txt b/src/it/projects/apply/apply-single-patch/goals.txt
deleted file mode 100644
index dfc317d..0000000
--- a/src/it/projects/apply/apply-single-patch/goals.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-clean
-initialize
diff --git a/src/it/projects/apply/apply-two-patches-in-order/goals.txt b/src/it/projects/apply/apply-two-patches-in-order/goals.txt
deleted file mode 100644
index dfc317d..0000000
--- a/src/it/projects/apply/apply-two-patches-in-order/goals.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-clean
-initialize
diff --git a/src/it/projects/autoskip/skip-when-patch-enum-missing/goals.txt b/src/it/projects/autoskip/skip-when-patch-enum-missing/goals.txt
deleted file mode 100644
index dfc317d..0000000
--- a/src/it/projects/autoskip/skip-when-patch-enum-missing/goals.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-clean
-initialize
diff --git a/src/it/projects/autoskip/skip-when-patch-tracking-file-present/goals.txt b/src/it/projects/autoskip/skip-when-patch-tracking-file-present/goals.txt
deleted file mode 100644
index dfc317d..0000000
--- a/src/it/projects/autoskip/skip-when-patch-tracking-file-present/goals.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-clean
-initialize
diff --git a/src/it/projects/path with spaces/goals.txt b/src/it/projects/path with spaces/goals.txt
deleted file mode 100644
index dfc317d..0000000
--- a/src/it/projects/path with spaces/goals.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-clean
-initialize
diff --git a/src/it/projects/remove-empty-files/goals.txt b/src/it/projects/remove-empty-files/goals.txt
deleted file mode 100644
index dfc317d..0000000
--- a/src/it/projects/remove-empty-files/goals.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-clean
-initialize
diff --git a/src/it/projects/remove-empty-files/pom.xml b/src/it/remove-empty-files/pom.xml
similarity index 90%
rename from src/it/projects/remove-empty-files/pom.xml
rename to src/it/remove-empty-files/pom.xml
index d911a74..5ebcf0a 100644
--- a/src/it/projects/remove-empty-files/pom.xml
+++ b/src/it/remove-empty-files/pom.xml
@@ -20,20 +20,21 @@
   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>org.apache.maven.plugins.patch.it</groupId>
-    <artifactId>it-project-parent</artifactId>
-    <version>1</version>
-  </parent>
-  
+  <groupId>test</groupId>
   <artifactId>remove-empty-files</artifactId>
   <name>remove-empty-files</name>
-  
+  <version>1.0-SNAPSHOT</version>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-patch-plugin</artifactId>
+        <version>@pom.version@</version>
         <executions>
           <execution>
             <id>apply-patch-0</id>
diff --git a/src/it/projects/remove-empty-files/src/main/patches/first.patch b/src/it/remove-empty-files/src/main/patches/first.patch
similarity index 100%
rename from src/it/projects/remove-empty-files/src/main/patches/first.patch
rename to src/it/remove-empty-files/src/main/patches/first.patch
diff --git a/src/it/projects/remove-empty-files/src/main/patches/second.patch b/src/it/remove-empty-files/src/main/patches/second.patch
similarity index 100%
rename from src/it/projects/remove-empty-files/src/main/patches/second.patch
rename to src/it/remove-empty-files/src/main/patches/second.patch
diff --git a/src/it/projects/remove-empty-files/verify.bsh b/src/it/remove-empty-files/verify.bsh
similarity index 100%
rename from src/it/projects/remove-empty-files/verify.bsh
rename to src/it/remove-empty-files/verify.bsh
diff --git a/src/it/settings.xml b/src/it/settings.xml
new file mode 100644
index 0000000..a1c1028
--- /dev/null
+++ b/src/it/settings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings>
+  <profiles>
+    <profile>
+      <id>it-repo</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <repositories>
+        <repository>
+          <id>local.central</id>
+          <url>file://@localRepository@</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>local.central</id>
+          <url>file://@localRepository@</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+</settings>
diff --git a/src/it/projects/autoskip/skip-when-patch-enum-missing/pom.xml b/src/it/skip-when-patch-enum-missing/pom.xml
similarity index 89%
rename from src/it/projects/autoskip/skip-when-patch-enum-missing/pom.xml
rename to src/it/skip-when-patch-enum-missing/pom.xml
index 1c55a39..15b9026 100644
--- a/src/it/projects/autoskip/skip-when-patch-enum-missing/pom.xml
+++ b/src/it/skip-when-patch-enum-missing/pom.xml
@@ -20,20 +20,21 @@
   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>org.apache.maven.plugins.patch.it</groupId>
-    <artifactId>it-project-parent</artifactId>
-    <version>1</version>
-  </parent>
-  
+  <groupId>test</groupId>
   <artifactId>apply-single-patch</artifactId>
   <name>apply-single-patch</name>
-  
+  <version>1.0-SNAPSHOT</version>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-patch-plugin</artifactId>
+        <version>@pom.version@</version>
         
         <configuration>
           <targetDirectory>${basedir}</targetDirectory>
diff --git a/src/it/projects/autoskip/skip-when-patch-enum-missing/src/main/patches/first.patch b/src/it/skip-when-patch-enum-missing/src/main/patches/first.patch
similarity index 100%
rename from src/it/projects/autoskip/skip-when-patch-enum-missing/src/main/patches/first.patch
rename to src/it/skip-when-patch-enum-missing/src/main/patches/first.patch
diff --git a/src/it/projects/autoskip/skip-when-patch-enum-missing/verify.bsh b/src/it/skip-when-patch-enum-missing/verify.bsh
similarity index 100%
rename from src/it/projects/autoskip/skip-when-patch-enum-missing/verify.bsh
rename to src/it/skip-when-patch-enum-missing/verify.bsh
diff --git a/src/it/projects/autoskip/skip-when-patch-tracking-file-present/pom.xml b/src/it/skip-when-patch-tracking-file-present/pom.xml
similarity index 90%
rename from src/it/projects/autoskip/skip-when-patch-tracking-file-present/pom.xml
rename to src/it/skip-when-patch-tracking-file-present/pom.xml
index 355f684..a75ba9d 100644
--- a/src/it/projects/autoskip/skip-when-patch-tracking-file-present/pom.xml
+++ b/src/it/skip-when-patch-tracking-file-present/pom.xml
@@ -20,20 +20,21 @@
   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>org.apache.maven.plugins.patch.it</groupId>
-    <artifactId>it-project-parent</artifactId>
-    <version>1</version>
-  </parent>
-  
+  <groupId>test</groupId>
   <artifactId>skip-when-patch-tracking-file-present</artifactId>
   <name>skip-when-patch-tracking-file-present</name>
-  
+  <version>1.0-SNAPSHOT</version>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-patch-plugin</artifactId>
+        <version>@pom.version@</version>
         
         <configuration>
           <targetDirectory>${basedir}</targetDirectory>
diff --git a/src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/main/patches/first.patch b/src/it/skip-when-patch-tracking-file-present/src/main/patches/first.patch
similarity index 100%
rename from src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/main/patches/first.patch
rename to src/it/skip-when-patch-tracking-file-present/src/main/patches/first.patch
diff --git a/src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/main/patches/patches-applied.txt b/src/it/skip-when-patch-tracking-file-present/src/main/patches/patches-applied.txt
similarity index 100%
rename from src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/main/patches/patches-applied.txt
rename to src/it/skip-when-patch-tracking-file-present/src/main/patches/patches-applied.txt
diff --git a/src/it/projects/autoskip/skip-when-patch-tracking-file-present/verify.bsh b/src/it/skip-when-patch-tracking-file-present/verify.bsh
similarity index 100%
rename from src/it/projects/autoskip/skip-when-patch-tracking-file-present/verify.bsh
rename to src/it/skip-when-patch-tracking-file-present/verify.bsh