diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
index 9f1d0f84f7..8b86ade79e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
@@ -54,7 +54,10 @@ public class MavenITmng3284UsingCachedPluginsTest
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng3284" );
-        verifier.executeGoal( "validate" ); 
+        verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+        verifier.getCliOptions().add( "--settings" );
+        verifier.getCliOptions().add( "settings.xml" );
+        verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
diff --git a/its/core-it-suite/src/test/resources/mng-3284/mod-a/pom.xml b/its/core-it-suite/src/test/resources/mng-3284/mod-a/pom.xml
index 74783f886d..dc2f7e9b87 100644
--- a/its/core-it-suite/src/test/resources/mng-3284/mod-a/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3284/mod-a/pom.xml
@@ -32,31 +32,6 @@ under the License.
 
   <name>Maven Integration Test :: MNG-3284 :: Module A</name> 
 
-  <repositories>
-    <repository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <checksumPolicy>ignore</checksumPolicy>
-      </snapshots>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <checksumPolicy>ignore</checksumPolicy>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-
   <build>
     <plugins>
       <plugin>
diff --git a/its/core-it-suite/src/test/resources/mng-3284/mod-a/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3284/mod-a/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/maven-metadata.xml
deleted file mode 100644
index dd53260b43..0000000000
--- a/its/core-it-suite/src/test/resources/mng-3284/mod-a/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/maven-metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-  <groupId>org.apache.maven.its.mng3284</groupId>
-  <artifactId>maven-it-plugin-version</artifactId>
-  <version>0.1</version>
-  <versioning>
-    <latest>0.1</latest>
-    <release>0.1</release>
-    <versions>
-      <version>0.1</version>
-    </versions>
-    <lastUpdated>20081024153135</lastUpdated>
-  </versioning>
-</metadata>
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/mng-3284/mod-b/pom.xml b/its/core-it-suite/src/test/resources/mng-3284/mod-b/pom.xml
index 362338172d..61e3c55151 100644
--- a/its/core-it-suite/src/test/resources/mng-3284/mod-b/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3284/mod-b/pom.xml
@@ -32,31 +32,6 @@ under the License.
 
   <name>Maven Integration Test :: MNG-3284 :: Module B</name> 
 
-  <repositories>
-    <repository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <checksumPolicy>ignore</checksumPolicy>
-      </snapshots>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <checksumPolicy>ignore</checksumPolicy>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-
   <build>
     <plugins>
       <plugin>
diff --git a/its/core-it-suite/src/test/resources/mng-3284/mod-b/repo/org/apache/maven/its/mng3284/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3284/mod-b/repo/org/apache/maven/its/mng3284/maven-metadata.xml
deleted file mode 100644
index 2264625663..0000000000
--- a/its/core-it-suite/src/test/resources/mng-3284/mod-b/repo/org/apache/maven/its/mng3284/maven-metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-  <plugins>
-    <plugin>
-      <name>Maven Integration Test Plugin :: Version</name>
-      <prefix>itversion</prefix>
-      <artifactId>maven-it-plugin-version</artifactId>
-    </plugin>
-  </plugins>
-</metadata>
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/mng-3284/mod-a/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/0.1/maven-it-plugin-version-0.1.jar b/its/core-it-suite/src/test/resources/mng-3284/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/0.1/maven-it-plugin-version-0.1.jar
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-3284/mod-a/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/0.1/maven-it-plugin-version-0.1.jar
rename to its/core-it-suite/src/test/resources/mng-3284/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/0.1/maven-it-plugin-version-0.1.jar
diff --git a/its/core-it-suite/src/test/resources/mng-3284/mod-a/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/0.1/maven-it-plugin-version-0.1.pom b/its/core-it-suite/src/test/resources/mng-3284/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/0.1/maven-it-plugin-version-0.1.pom
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-3284/mod-a/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/0.1/maven-it-plugin-version-0.1.pom
rename to its/core-it-suite/src/test/resources/mng-3284/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/0.1/maven-it-plugin-version-0.1.pom
diff --git a/its/core-it-suite/src/test/resources/mng-3284/mod-b/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/0.2/maven-it-plugin-version-0.2.jar b/its/core-it-suite/src/test/resources/mng-3284/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/0.2/maven-it-plugin-version-0.2.jar
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-3284/mod-b/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/0.2/maven-it-plugin-version-0.2.jar
rename to its/core-it-suite/src/test/resources/mng-3284/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/0.2/maven-it-plugin-version-0.2.jar
diff --git a/its/core-it-suite/src/test/resources/mng-3284/mod-b/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/0.2/maven-it-plugin-version-0.2.pom b/its/core-it-suite/src/test/resources/mng-3284/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/0.2/maven-it-plugin-version-0.2.pom
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-3284/mod-b/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/0.2/maven-it-plugin-version-0.2.pom
rename to its/core-it-suite/src/test/resources/mng-3284/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/0.2/maven-it-plugin-version-0.2.pom
diff --git a/its/core-it-suite/src/test/resources/mng-3284/mod-b/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3284/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/maven-metadata.xml
similarity index 77%
rename from its/core-it-suite/src/test/resources/mng-3284/mod-b/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/maven-metadata.xml
rename to its/core-it-suite/src/test/resources/mng-3284/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/maven-metadata.xml
index bffb867482..0aba111f4f 100644
--- a/its/core-it-suite/src/test/resources/mng-3284/mod-b/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/maven-metadata.xml
+++ b/its/core-it-suite/src/test/resources/mng-3284/repo/org/apache/maven/its/mng3284/maven-it-plugin-version/maven-metadata.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
   <groupId>org.apache.maven.its.mng3284</groupId>
   <artifactId>maven-it-plugin-version</artifactId>
   <version>0.2</version>
@@ -7,7 +8,8 @@
     <release>0.2</release>
     <versions>
       <version>0.2</version>
+      <version>0.1</version>
     </versions>
     <lastUpdated>20081024153034</lastUpdated>
   </versioning>
-</metadata>
\ No newline at end of file
+</metadata>
diff --git a/its/core-it-suite/src/test/resources/mng-3284/mod-a/repo/org/apache/maven/its/mng3284/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-3284/repo/org/apache/maven/its/mng3284/maven-metadata.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-3284/mod-a/repo/org/apache/maven/its/mng3284/maven-metadata.xml
rename to its/core-it-suite/src/test/resources/mng-3284/repo/org/apache/maven/its/mng3284/maven-metadata.xml
diff --git a/its/core-it-suite/src/test/resources/mng-3284/settings-template.xml b/its/core-it-suite/src/test/resources/mng-3284/settings-template.xml
new file mode 100644
index 0000000000..cde4215860
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/mng-3284/settings-template.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<settings>
+  <profiles>
+    <profile>
+      <id>maven-core-it-repo</id>
+      <repositories>
+        <repository>
+          <id>maven-core-it</id>
+          <url>@baseurl@/repo</url>
+          <releases>
+            <checksumPolicy>ignore</checksumPolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>maven-core-it</id>
+          <url>@baseurl@/repo</url>
+          <releases>
+            <checksumPolicy>ignore</checksumPolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <activeProfile>maven-core-it-repo</activeProfile>
+  </activeProfiles>
+</settings>