diff --git a/maven-core-it/README.txt b/maven-core-it/README.txt
index 6717505052..8c9a898ea7 100644
--- a/maven-core-it/README.txt
+++ b/maven-core-it/README.txt
@@ -19,9 +19,6 @@ it0004: The simplest of pom installation. We have a pom and we install it in
 it0005: The simplest of pom installation. We have a snapshot pom and we install
         it in local repository.
 
-it0006: Simple goal decoration. We introduce a preGoal and a postGoal to the
-		'compiler:compile' goal.
-
 it0007: We specify a parent in the POM and make sure that it is downloaded as
         part of the process.        
 
diff --git a/maven-core-it/it0000/pom.xml b/maven-core-it/it0000/pom.xml
index 4df0fb3210..ec25c7480f 100644
--- a/maven-core-it/it0000/pom.xml
+++ b/maven-core-it/it0000/pom.xml
@@ -8,7 +8,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
-      <type>test</type>
+      <scope>test</scope>
     </dependency>
   </dependencies>  
 </project>
diff --git a/maven-core-it/it0001/pom.xml b/maven-core-it/it0001/pom.xml
index 7fa364fc43..1dcfded8ff 100644
--- a/maven-core-it/it0001/pom.xml
+++ b/maven-core-it/it0001/pom.xml
@@ -8,7 +8,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
-      <type>test</type>
+      <scope>test</scope>
     </dependency>
   </dependencies>  
 </project>
diff --git a/maven-core-it/it0002/pom.xml b/maven-core-it/it0002/pom.xml
index a316f54664..d16fe69e97 100644
--- a/maven-core-it/it0002/pom.xml
+++ b/maven-core-it/it0002/pom.xml
@@ -8,7 +8,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
-      <type>test</type>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>maven</groupId>
diff --git a/maven-core-it/it0003/pom.xml b/maven-core-it/it0003/pom.xml
index f2c4ae4e7b..0b4461e9b0 100644
--- a/maven-core-it/it0003/pom.xml
+++ b/maven-core-it/it0003/pom.xml
@@ -8,7 +8,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
-      <type>test</type>
+      <scope>test</scope>
     </dependency>
   </dependencies>  
 </project>
diff --git a/maven-core-it/it0006/.cvsignore b/maven-core-it/it0006/.cvsignore
deleted file mode 100644
index dabb615d50..0000000000
--- a/maven-core-it/it0006/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-*~
-*.log
-target
-*.ipr
-*.iws
-dist
-target
-.classpath
-.project
-log.txt
diff --git a/maven-core-it/it0006/expected-results.txt b/maven-core-it/it0006/expected-results.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/maven-core-it/it0006/goals.txt b/maven-core-it/it0006/goals.txt
deleted file mode 100644
index 582d9721c9..0000000000
--- a/maven-core-it/it0006/goals.txt
+++ /dev/null
@@ -1 +0,0 @@
-compile
diff --git a/maven-core-it/it0006/pom.xml b/maven-core-it/it0006/pom.xml
deleted file mode 100644
index bb37ce3e40..0000000000
--- a/maven-core-it/it0006/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>maven</groupId>
-  <artifactId>maven-core-it0006</artifactId>
-  <version>1.0</version>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <type>test</type>
-    </dependency>
-  </dependencies>  
-  
-  <preGoals>
-    <preGoal>
-        <name>compiler:compile</name>
-        <attain>clean:clean</attain>
-    </preGoal>
-  </preGoals>
-  
-  <postGoals>
-    <postGoal>
-        <name>compiler:compile</name>
-        <attain>jar:jar</attain>
-    </postGoal>
-  </postGoals>
-</project>
diff --git a/maven-core-it/it0006/src/main/java/org/apache/maven/it0000/Person.java b/maven-core-it/it0006/src/main/java/org/apache/maven/it0000/Person.java
deleted file mode 100644
index a9fb4bc9d2..0000000000
--- a/maven-core-it/it0006/src/main/java/org/apache/maven/it0000/Person.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.maven.it0000;
-
-public class Person
-{
-    private String name;
-    
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-    
-    public String getName()
-    {
-        return name;
-    }
-}
diff --git a/maven-core-it/it0006/src/test/java/org/apache/maven/it0000/PersonTest.java b/maven-core-it/it0006/src/test/java/org/apache/maven/it0000/PersonTest.java
deleted file mode 100644
index 354f917f46..0000000000
--- a/maven-core-it/it0006/src/test/java/org/apache/maven/it0000/PersonTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.maven.it0000;
-
-import junit.framework.TestCase;
-
-public class PersonTest
-    extends TestCase
-{
-    public void testPerson()
-    {
-        Person person = new Person();
-        
-        person.setName( "foo" );
-        
-        assertEquals( "foo", person.getName() );
-    }
-}
diff --git a/maven-core-it/it0007/pom.xml b/maven-core-it/it0007/pom.xml
index 7eab7df7b8..71cf75d70f 100644
--- a/maven-core-it/it0007/pom.xml
+++ b/maven-core-it/it0007/pom.xml
@@ -13,7 +13,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
-      <type>test</type>
+      <scope>test</scope>
     </dependency>
   </dependencies>  
 </project>
diff --git a/maven-core-it/it0008/pom.xml b/maven-core-it/it0008/pom.xml
index 5d7a8bd442..1b2bf51aff 100644
--- a/maven-core-it/it0008/pom.xml
+++ b/maven-core-it/it0008/pom.xml
@@ -8,7 +8,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
-      <type>test</type>
+      <scope>test</scope>
     </dependency>
   </dependencies>  
   
diff --git a/maven-core-it/it0010/pom.xml b/maven-core-it/it0010/pom.xml
index ab607cf2bd..270c9f1fcc 100644
--- a/maven-core-it/it0010/pom.xml
+++ b/maven-core-it/it0010/pom.xml
@@ -13,7 +13,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
-      <type>test</type>
+      <scope>test</scope>
     </dependency>
   </dependencies>  
   
diff --git a/maven-core-it/it1003/pom.xml b/maven-core-it/it1003/pom.xml
index 013a8b143a..6a848ef562 100644
--- a/maven-core-it/it1003/pom.xml
+++ b/maven-core-it/it1003/pom.xml
@@ -8,7 +8,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
-      <type>test</type>
+      <scope>test</scope>
     </dependency>
   </dependencies>  
 </project>