diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0061Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0061Test.java
index ccb799e44a..dcdb1ec121 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0061Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0061Test.java
@@ -37,13 +37,15 @@ public class MavenIT0061Test
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0061" );
+
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "deploy" );
+        verifier.setAutoclean( false );
+        verifier.deleteDirectory( "target" );
+        verifier.executeGoal( "validate" );
         verifier.assertFilePresent( "target/test-repo/org.apache.maven.its.it0061/jars/maven-it-it0061-1.0.jar" );
         verifier.assertFilePresent( "target/test-repo/org.apache.maven.its.it0061/poms/maven-it-it0061-1.0.pom" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
-
     }
-}
 
+}
diff --git a/its/core-it-suite/src/test/resources/it0061/artifact.jar b/its/core-it-suite/src/test/resources/it0061/artifact.jar
new file mode 100644
index 0000000000..522440900e
Binary files /dev/null and b/its/core-it-suite/src/test/resources/it0061/artifact.jar differ
diff --git a/its/core-it-suite/src/test/resources/it0061/pom.xml b/its/core-it-suite/src/test/resources/it0061/pom.xml
index b6306eb2d3..b71c0752a1 100644
--- a/its/core-it-suite/src/test/resources/it0061/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0061/pom.xml
@@ -1,13 +1,38 @@
+<?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.
+-->
+
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <name>Maven Integration Test :: it0061</name> 
+
   <groupId>org.apache.maven.its.it0061</groupId>
   <artifactId>maven-it-it0061</artifactId>
-  <description>Verify that deployment of artifacts to a legacy-layout repository
-        results in a groupId directory of 'the.full.group.id' instead of
-        'the/full/group/id'.</description>
-  <packaging>jar</packaging>
   <version>1.0</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: it0061</name> 
+  <description>
+    Verify that deployment of artifacts to a legacy-layout repository
+    results in a groupId directory of 'the.full.group.id' instead of
+    'the/full/group/id'.
+  </description>
 
   <distributionManagement>
     <repository>
@@ -17,13 +42,27 @@
     </repository>
   </distributionManagement>
 
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <type>jar</type>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-artifact</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <mainFile>artifact.jar</mainFile>
+        </configuration>
+        <executions>
+          <execution>
+            <id>deploy</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>set</goal>
+              <goal>attach-pom</goal>
+              <goal>deploy</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/its/core-it-suite/src/test/resources/it0061/src/main/java/org/apache/maven/it0061/Person.java b/its/core-it-suite/src/test/resources/it0061/src/main/java/org/apache/maven/it0061/Person.java
deleted file mode 100644
index ac1f96a874..0000000000
--- a/its/core-it-suite/src/test/resources/it0061/src/main/java/org/apache/maven/it0061/Person.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.maven.it0061;
-
-public class Person
-{
-    private String name;
-    
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-    
-    public String getName()
-    {
-        return name;
-    }
-}
diff --git a/its/core-it-suite/src/test/resources/it0061/src/main/resources/it0061.properties b/its/core-it-suite/src/test/resources/it0061/src/main/resources/it0061.properties
deleted file mode 100644
index f54f8ab106..0000000000
--- a/its/core-it-suite/src/test/resources/it0061/src/main/resources/it0061.properties
+++ /dev/null
@@ -1 +0,0 @@
-name = jason