diff --git a/ant/src/test/plugin-test/.cvsignore b/ant/src/plugin-test/.cvsignore
similarity index 100%
rename from ant/src/test/plugin-test/.cvsignore
rename to ant/src/plugin-test/.cvsignore
diff --git a/ant/src/test/plugin-test/maven.xml b/ant/src/plugin-test/maven.xml
similarity index 100%
rename from ant/src/test/plugin-test/maven.xml
rename to ant/src/plugin-test/maven.xml
diff --git a/ant/src/test/plugin-test/project.xml b/ant/src/plugin-test/project.xml
similarity index 100%
rename from ant/src/test/plugin-test/project.xml
rename to ant/src/plugin-test/project.xml
diff --git a/changes/src/test/plugin-test/.cvsignore b/changes/src/plugin-test/.cvsignore
similarity index 100%
rename from changes/src/test/plugin-test/.cvsignore
rename to changes/src/plugin-test/.cvsignore
diff --git a/changes/src/test/plugin-test/maven.xml b/changes/src/plugin-test/maven.xml
similarity index 100%
rename from changes/src/test/plugin-test/maven.xml
rename to changes/src/plugin-test/maven.xml
diff --git a/changes/src/test/plugin-test/project.xml b/changes/src/plugin-test/project.xml
similarity index 100%
rename from changes/src/test/plugin-test/project.xml
rename to changes/src/plugin-test/project.xml
diff --git a/changes/src/test/plugin-test/xdocs/changes.xml b/changes/src/plugin-test/xdocs/changes.xml
similarity index 100%
rename from changes/src/test/plugin-test/xdocs/changes.xml
rename to changes/src/plugin-test/xdocs/changes.xml
diff --git a/checkstyle/src/test/plugin-test/.cvsignore b/checkstyle/src/plugin-test/.cvsignore
similarity index 100%
rename from checkstyle/src/test/plugin-test/.cvsignore
rename to checkstyle/src/plugin-test/.cvsignore
diff --git a/checkstyle/src/test/plugin-test/LICENSE.txt b/checkstyle/src/plugin-test/LICENSE.txt
similarity index 100%
rename from checkstyle/src/test/plugin-test/LICENSE.txt
rename to checkstyle/src/plugin-test/LICENSE.txt
diff --git a/checkstyle/src/test/plugin-test/maven.xml b/checkstyle/src/plugin-test/maven.xml
similarity index 100%
rename from checkstyle/src/test/plugin-test/maven.xml
rename to checkstyle/src/plugin-test/maven.xml
diff --git a/checkstyle/src/test/plugin-test/project.xml b/checkstyle/src/plugin-test/project.xml
similarity index 100%
rename from checkstyle/src/test/plugin-test/project.xml
rename to checkstyle/src/plugin-test/project.xml
diff --git a/checkstyle/src/test/plugin-test/src/main/org/apache/maven/Dummy.java b/checkstyle/src/plugin-test/src/main/org/apache/maven/Dummy.java
similarity index 100%
rename from checkstyle/src/test/plugin-test/src/main/org/apache/maven/Dummy.java
rename to checkstyle/src/plugin-test/src/main/org/apache/maven/Dummy.java
diff --git a/clean/clean/src/test/plugin-test/.cvsignore b/clean/clean/src/plugin-test/.cvsignore
similarity index 100%
rename from clean/clean/src/test/plugin-test/.cvsignore
rename to clean/clean/src/plugin-test/.cvsignore
diff --git a/clean/clean/src/test/plugin-test/maven.xml b/clean/clean/src/plugin-test/maven.xml
similarity index 100%
rename from clean/clean/src/test/plugin-test/maven.xml
rename to clean/clean/src/plugin-test/maven.xml
diff --git a/clean/clean/src/test/plugin-test/project.xml b/clean/clean/src/plugin-test/project.xml
similarity index 100%
rename from clean/clean/src/test/plugin-test/project.xml
rename to clean/clean/src/plugin-test/project.xml
diff --git a/clean/src/test/plugin-test/.cvsignore b/clean/src/plugin-test/.cvsignore
similarity index 100%
rename from clean/src/test/plugin-test/.cvsignore
rename to clean/src/plugin-test/.cvsignore
diff --git a/clean/src/test/plugin-test/maven.xml b/clean/src/plugin-test/maven.xml
similarity index 100%
rename from clean/src/test/plugin-test/maven.xml
rename to clean/src/plugin-test/maven.xml
diff --git a/clean/src/test/plugin-test/project.xml b/clean/src/plugin-test/project.xml
similarity index 100%
rename from clean/src/test/plugin-test/project.xml
rename to clean/src/plugin-test/project.xml