diff --git a/maven-core/src/test/java/org/apache/maven/plugin/AbstractTestPlugin.java b/maven-core/src/test/java/org/apache/maven/plugin/AbstractTestPlugin.java
deleted file mode 100644
index 4039ef32b0..0000000000
--- a/maven-core/src/test/java/org/apache/maven/plugin/AbstractTestPlugin.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.apache.maven.plugin;
-
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
-
-/**
- *
- *
- * @author Jason van Zyl
- *
- * @version $Id$
- */
-public class AbstractTestPlugin
-{
- protected boolean executed;
-
- protected String name;
-
- protected String artifactId;
-
- protected String foo;
-
- public boolean hasExecuted()
- {
- return executed;
- }
-
- public String getName()
- {
- return name;
- }
-
- public String getArtifactId()
- {
- return artifactId;
- }
-
- public String getFoo()
- {
- return foo;
- }
-
- public void setName( String name )
- {
- this.name = name;
- }
-
- public void setArtifactId( String artifactId )
- {
- this.artifactId = artifactId;
- }
-
- public void setFoo( String foo )
- {
- this.foo = foo;
- }
-}
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/GoalDecorationAndResolutionTestPlugin.java b/maven-core/src/test/java/org/apache/maven/plugin/GoalDecorationAndResolutionTestPlugin.java
deleted file mode 100644
index 225106c266..0000000000
--- a/maven-core/src/test/java/org/apache/maven/plugin/GoalDecorationAndResolutionTestPlugin.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.maven.plugin;
-
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed 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.
- */
-
-import org.apache.maven.monitor.logging.Log;
-
-/**
- * @author jdcasey
- */
-public class GoalDecorationAndResolutionTestPlugin implements Plugin
-{
-
- private boolean executed = false;
-
- private Log log;
-
- public void execute(PluginExecutionRequest request) throws PluginExecutionException {
- this.executed = true;
- }
-
- public void setLog( Log log )
- {
- this.log = log;
- }
-
- public boolean executed() {
- return executed;
- }
-
-}
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/IntegratedPlugin.java b/maven-core/src/test/java/org/apache/maven/plugin/IntegratedPlugin.java
deleted file mode 100644
index c312ca34f9..0000000000
--- a/maven-core/src/test/java/org/apache/maven/plugin/IntegratedPlugin.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.apache.maven.plugin;
-
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
-
-import org.apache.maven.monitor.logging.Log;
-
-/**
- *
- *
- * @author Jason van Zyl
- *
- * @version $Id$
- */
-public class IntegratedPlugin
- extends AbstractTestPlugin
- implements Plugin
-{
- private Log log;
-
- public void execute( PluginExecutionRequest request )
- throws PluginExecutionException
- {
- name = (String) request.getParameter( "name" );
-
- artifactId = (String) request.getParameter( "artifactId" );
-
- foo = (String) request.getParameter( "foo" );
-
- executed = true;
- }
-
- public void setLog( Log log )
- {
- this.log = log;
- }
-}
diff --git a/maven-core/src/test/resources/META-INF/maven/plugin.xml b/maven-core/src/test/resources/META-INF/maven/plugin.xml
deleted file mode 100644
index 1d51ebabe5..0000000000
--- a/maven-core/src/test/resources/META-INF/maven/plugin.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-
- resolveTest
-
-
-
- resolveTest:t1-preGoal
- org.apache.maven.plugin.GoalDecorationAndResolutionTestPlugin
- singleton
-
-
- resolveTest:t1-main
- org.apache.maven.plugin.GoalDecorationAndResolutionTestPlugin
- singleton
-
-
- resolveTest:t1-postGoal
- org.apache.maven.plugin.GoalDecorationAndResolutionTestPlugin
- singleton
-
-
-
-
-
- resolveTest:t2-prereq
- org.apache.maven.plugin.GoalDecorationAndResolutionTestPlugin
- singleton
-
-
- resolveTest:t2-main
- org.apache.maven.plugin.GoalDecorationAndResolutionTestPlugin
- singleton
-
- resolveTest:t2-prereq
-
-
-
-
-
-
- resolveTest:t3-preGoal
- org.apache.maven.plugin.GoalDecorationAndResolutionTestPlugin
- singleton
-
-
- resolveTest:t3-prereq
- org.apache.maven.plugin.GoalDecorationAndResolutionTestPlugin
- singleton
-
-
- resolveTest:t3-main
- org.apache.maven.plugin.GoalDecorationAndResolutionTestPlugin
- singleton
-
- resolveTest:t3-prereq
-
-
-
- resolveTest:t3-postGoal
- org.apache.maven.plugin.GoalDecorationAndResolutionTestPlugin
- singleton
-
-
-
-
-
- resolveTest:t4-prereq-preGoal
- org.apache.maven.plugin.GoalDecorationAndResolutionTestPlugin
- singleton
-
-
- resolveTest:t4-prereq
- org.apache.maven.plugin.GoalDecorationAndResolutionTestPlugin
- singleton
-
-
- resolveTest:t4-main
- org.apache.maven.plugin.GoalDecorationAndResolutionTestPlugin
- singleton
-
- resolveTest:t4-prereq
-
-
-
- resolveTest:t4-prereq-postGoal
- org.apache.maven.plugin.GoalDecorationAndResolutionTestPlugin
- singleton
-
-
-
-
-
-
- resolveTest:t5-prereq
- org.apache.maven.plugin.GoalDecorationAndResolutionTestPlugin
- singleton
-
-
- resolveTest:t5-preGoal
- org.apache.maven.plugin.GoalDecorationAndResolutionTestPlugin
- singleton
-
- resolveTest:t5-prereq
-
-
-
- resolveTest:t5-main
- org.apache.maven.plugin.GoalDecorationAndResolutionTestPlugin
- singleton
-
- resolveTest:t5-prereq
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/maven-core/src/test/resources/org/apache/maven/plugin/integrated-plugin.xml b/maven-core/src/test/resources/org/apache/maven/plugin/integrated-plugin.xml
deleted file mode 100644
index badad63649..0000000000
--- a/maven-core/src/test/resources/org/apache/maven/plugin/integrated-plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
- integrated-plugin
- org.apache.maven.plugin.IntegratedPlugin
- singleton
- integrated
-
-
- integrated-execute
-
-
- name
- #project.name
-
-
- artifactId
- #project.artifactId
-
-
- foo
- #foo
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/maven-plugin/src/test/java/org/apache/maven/plugin/TestPlugin.java b/maven-plugin/src/test/java/org/apache/maven/plugin/TestPlugin.java
deleted file mode 100644
index 7aafb0128b..0000000000
--- a/maven-plugin/src/test/java/org/apache/maven/plugin/TestPlugin.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.apache.maven.plugin;
-
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
-
-import org.apache.maven.monitor.logging.Log;
-
-/**
- *
- *
- * @author Jason van Zyl
- *
- * @version $Id$
- */
-public class TestPlugin
- implements Plugin
-{
- protected boolean executed;
-
- protected String name;
-
- protected String artifactId;
-
- protected String foo;
-
- private Log log;
-
- public boolean hasExecuted()
- {
- return executed;
- }
-
- public String getName()
- {
- return name;
- }
-
- public String getArtifactId()
- {
- return artifactId;
- }
-
- public String getFoo()
- {
- return foo;
- }
-
- public void execute( PluginExecutionRequest request )
- throws PluginExecutionException
- {
- name = (String) request.getParameter( "name" );
-
- artifactId = (String) request.getParameter( "artifactId" );
-
- foo = (String) request.getParameter( "foo" );
-
- executed = true;
- }
-
- public void setLog( Log log )
- {
- this.log = log;
- }
-}
diff --git a/maven-plugin/src/test/java/org/apache/maven/plugin/TestPluginTest.java b/maven-plugin/src/test/java/org/apache/maven/plugin/TestPluginTest.java
deleted file mode 100644
index b78a640bc5..0000000000
--- a/maven-plugin/src/test/java/org/apache/maven/plugin/TestPluginTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.apache.maven.plugin;
-
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
-
-import junit.framework.TestCase;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Jason van Zyl
- * @version $Id$
- */
-public class TestPluginTest
- extends TestCase
-{
- public void testIntegratedPluginExecution()
- throws Exception
- {
- TestPlugin plugin = new TestPlugin();
-
- Map parameters = new HashMap();
-
- parameters.put( "name", "Maven" );
-
- parameters.put( "artifactId", "maven-core" );
-
- parameters.put( "foo", "bar" );
-
- PluginExecutionRequest request = new PluginExecutionRequest( parameters );
-
- plugin.execute( request );
-
- assertTrue( plugin.hasExecuted() );
-
- assertEquals( "Maven", plugin.getName() );
-
- assertEquals( "maven-core", plugin.getArtifactId() );
-
- assertEquals( "bar", plugin.getFoo() );
- }
-}