diff --git a/ear/src/plugin-test/test04/maven.xml b/ear/src/plugin-test/appXmlBundledTest/maven.xml
similarity index 100%
rename from ear/src/plugin-test/test04/maven.xml
rename to ear/src/plugin-test/appXmlBundledTest/maven.xml
diff --git a/ear/src/plugin-test/test04/project.properties b/ear/src/plugin-test/appXmlBundledTest/project.properties
similarity index 100%
rename from ear/src/plugin-test/test04/project.properties
rename to ear/src/plugin-test/appXmlBundledTest/project.properties
diff --git a/ear/src/plugin-test/test04/project.xml b/ear/src/plugin-test/appXmlBundledTest/project.xml
similarity index 90%
rename from ear/src/plugin-test/test04/project.xml
rename to ear/src/plugin-test/appXmlBundledTest/project.xml
index 548f2e5f..3a749021 100644
--- a/ear/src/plugin-test/test04/project.xml
+++ b/ear/src/plugin-test/appXmlBundledTest/project.xml
@@ -19,8 +19,8 @@
 
 <project>
   <pomVersion>3</pomVersion>
-  <name>Test project for Maven Ear Plugin 04</name>
-  <artifactId>test-maven-ear-plugin-04</artifactId>
+  <name>Ear Plugin - AppXml Bundled Test</name>
+  <artifactId>test-maven-ear-plugin-appXmlBundledTest</artifactId>
   <inceptionYear>2004</inceptionYear>
   <shortDescription>Tests that application.xml is correctly bundled</shortDescription>
   <description>Tests that application.xml is correctly bundled when it is not generated (see issue MPEAR-7)</description>
diff --git a/ear/src/plugin-test/test04/src/application/META-INF/application.xml b/ear/src/plugin-test/appXmlBundledTest/src/application/META-INF/application.xml
similarity index 100%
rename from ear/src/plugin-test/test04/src/application/META-INF/application.xml
rename to ear/src/plugin-test/appXmlBundledTest/src/application/META-INF/application.xml
diff --git a/ear/src/plugin-test/test03/src/application/bogus.jar b/ear/src/plugin-test/appXmlBundledTest/src/application/bogus.jar
similarity index 100%
rename from ear/src/plugin-test/test03/src/application/bogus.jar
rename to ear/src/plugin-test/appXmlBundledTest/src/application/bogus.jar
diff --git a/ear/src/plugin-test/test03/maven.xml b/ear/src/plugin-test/appXmlLocationTest/maven.xml
similarity index 100%
rename from ear/src/plugin-test/test03/maven.xml
rename to ear/src/plugin-test/appXmlLocationTest/maven.xml
diff --git a/ear/src/plugin-test/test03/project.properties b/ear/src/plugin-test/appXmlLocationTest/project.properties
similarity index 100%
rename from ear/src/plugin-test/test03/project.properties
rename to ear/src/plugin-test/appXmlLocationTest/project.properties
diff --git a/ear/src/plugin-test/test03/project.xml b/ear/src/plugin-test/appXmlLocationTest/project.xml
similarity index 90%
rename from ear/src/plugin-test/test03/project.xml
rename to ear/src/plugin-test/appXmlLocationTest/project.xml
index 4482dcab..8daf1922 100644
--- a/ear/src/plugin-test/test03/project.xml
+++ b/ear/src/plugin-test/appXmlLocationTest/project.xml
@@ -19,8 +19,8 @@
 
 <project>
   <pomVersion>3</pomVersion>
-  <name>Test project for Maven Ear Plugin 03</name>
-  <artifactId>test-maven-ear-plugin-03</artifactId>
+  <name>Ear Plugin - AppXml Location Test</name>
+  <artifactId>test-maven-ear-plugin-appXmlLocationTest</artifactId>
   <inceptionYear>2004</inceptionYear>
   <shortDescription>Tests that application.xml is not generated at maven.ear.src</shortDescription>
   <description>Tests that application.xml is not generated at maven.ear.src (see issue MPEAR-7)</description>
diff --git a/ear/src/plugin-test/test04/src/application/bogus.jar b/ear/src/plugin-test/appXmlLocationTest/src/application/bogus.jar
similarity index 100%
rename from ear/src/plugin-test/test04/src/application/bogus.jar
rename to ear/src/plugin-test/appXmlLocationTest/src/application/bogus.jar
diff --git a/ear/src/plugin-test/test02/maven.xml b/ear/src/plugin-test/bundlePropertiesTest/maven.xml
similarity index 100%
rename from ear/src/plugin-test/test02/maven.xml
rename to ear/src/plugin-test/bundlePropertiesTest/maven.xml
diff --git a/ear/src/plugin-test/test02/project.properties b/ear/src/plugin-test/bundlePropertiesTest/project.properties
similarity index 100%
rename from ear/src/plugin-test/test02/project.properties
rename to ear/src/plugin-test/bundlePropertiesTest/project.properties
diff --git a/ear/src/plugin-test/test02/project.xml b/ear/src/plugin-test/bundlePropertiesTest/project.xml
similarity index 95%
rename from ear/src/plugin-test/test02/project.xml
rename to ear/src/plugin-test/bundlePropertiesTest/project.xml
index cdaad635..f614af35 100644
--- a/ear/src/plugin-test/test02/project.xml
+++ b/ear/src/plugin-test/bundlePropertiesTest/project.xml
@@ -20,8 +20,8 @@
 
 <project>
   <pomVersion>3</pomVersion>
-  <name>Test project for Maven Ear Plugin 02</name>
-  <artifactId>test-maven-ear-plugin-02</artifactId>
+  <name>Ear Plugin - Bundle Properties Test</name>
+  <artifactId>test-maven-ear-plugin-bundlePropertiesTest</artifactId>
   <organization>
     <name>Queensland Government</name>
     <url>www.qld.gov.au</url>
diff --git a/ear/src/plugin-test/maven.xml b/ear/src/plugin-test/maven.xml
index 339f04bd..d8759f91 100644
--- a/ear/src/plugin-test/maven.xml
+++ b/ear/src/plugin-test/maven.xml
@@ -17,6 +17,6 @@
  -->
 <project xmlns:util="jelly:util" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:assert="assert" xmlns:ant="jelly:ant">
   <goal name="testPlugin">
-    <maven:reactor basedir="${basedir}" includes="test*/project.xml" goals="testPlugin" banner="Test" ignoreFailures="false"/>
+    <maven:reactor basedir="${basedir}" includes="*Test/project.xml" goals="testPlugin" banner="Test" ignoreFailures="false"/>
   </goal>
 </project>
diff --git a/ear/src/plugin-test/test06/maven.xml b/ear/src/plugin-test/sarBundledTest/maven.xml
similarity index 100%
rename from ear/src/plugin-test/test06/maven.xml
rename to ear/src/plugin-test/sarBundledTest/maven.xml
diff --git a/ear/src/plugin-test/test06/project.properties b/ear/src/plugin-test/sarBundledTest/project.properties
similarity index 100%
rename from ear/src/plugin-test/test06/project.properties
rename to ear/src/plugin-test/sarBundledTest/project.properties
diff --git a/ear/src/plugin-test/test06/project.xml b/ear/src/plugin-test/sarBundledTest/project.xml
similarity index 93%
rename from ear/src/plugin-test/test06/project.xml
rename to ear/src/plugin-test/sarBundledTest/project.xml
index 80a76365..3e283cb8 100644
--- a/ear/src/plugin-test/test06/project.xml
+++ b/ear/src/plugin-test/sarBundledTest/project.xml
@@ -19,8 +19,8 @@
 
 <project>
   <pomVersion>3</pomVersion>
-  <name>Test project for Maven Ear Plugin 06</name>
-  <artifactId>test-maven-ear-plugin-06</artifactId>
+  <name>Ear Plugin - SAR Bundled Test</name>
+  <artifactId>test-maven-ear-plugin-sarBundledTest</artifactId>
   <inceptionYear>2004</inceptionYear>
   <shortDescription>Makes sure a SAR dependency is bundled</shortDescription>
   <description>Makes sure a SAR dependency is bundled (see issues MPEAR-3 and MPEAR-10). This is also a test for dependencies defined by maven.jar.overrides (see issue MPEAR-27)</description>
diff --git a/ear/src/plugin-test/test01/LICENSE.txt b/ear/src/plugin-test/simpleTest/LICENSE.txt
similarity index 100%
rename from ear/src/plugin-test/test01/LICENSE.txt
rename to ear/src/plugin-test/simpleTest/LICENSE.txt
diff --git a/ear/src/plugin-test/test01/maven.xml b/ear/src/plugin-test/simpleTest/maven.xml
similarity index 100%
rename from ear/src/plugin-test/test01/maven.xml
rename to ear/src/plugin-test/simpleTest/maven.xml
diff --git a/ear/src/plugin-test/test01/project.properties b/ear/src/plugin-test/simpleTest/project.properties
similarity index 100%
rename from ear/src/plugin-test/test01/project.properties
rename to ear/src/plugin-test/simpleTest/project.properties
diff --git a/ear/src/plugin-test/test01/project.xml b/ear/src/plugin-test/simpleTest/project.xml
similarity index 91%
rename from ear/src/plugin-test/test01/project.xml
rename to ear/src/plugin-test/simpleTest/project.xml
index a698c920..692661eb 100644
--- a/ear/src/plugin-test/test01/project.xml
+++ b/ear/src/plugin-test/simpleTest/project.xml
@@ -20,16 +20,16 @@
 
 <project>
   <pomVersion>3</pomVersion>
-  <name>Test project for Maven Ear Plugin 01</name>
-  <artifactId>test-maven-ear-plugin-01</artifactId>
+  <name>Ear Plugin - Simple Test</name>
+  <artifactId>test-maven-ear-plugin-simpleTest</artifactId>
   <organization>
     <name>Nettec</name>
     <url>http://www.nettec.net</url>
   </organization>
   <inceptionYear>2002</inceptionYear>
   <package>net.nettec.marsh.begin</package>
-  <shortDescription>Marsh Begin TTS Maven</shortDescription>
-  <description>TTS Begin</description>
+  <shortDescription>Simple Test for generated EAR file</shortDescription>
+  <description>Simple Test for generated EAR file</description>
   <url/>
   <developers>
     <developer>
diff --git a/ear/src/plugin-test/test01/src/application/META-INF/.cvsignore b/ear/src/plugin-test/simpleTest/src/application/META-INF/.cvsignore
similarity index 100%
rename from ear/src/plugin-test/test01/src/application/META-INF/.cvsignore
rename to ear/src/plugin-test/simpleTest/src/application/META-INF/.cvsignore
diff --git a/ear/src/plugin-test/test01/src/application/META-INF/MANIFEST.MF b/ear/src/plugin-test/simpleTest/src/application/META-INF/MANIFEST.MF
similarity index 100%
rename from ear/src/plugin-test/test01/src/application/META-INF/MANIFEST.MF
rename to ear/src/plugin-test/simpleTest/src/application/META-INF/MANIFEST.MF
diff --git a/ear/src/plugin-test/test01/src/resources/resource.txt b/ear/src/plugin-test/simpleTest/src/resources/resource.txt
similarity index 100%
rename from ear/src/plugin-test/test01/src/resources/resource.txt
rename to ear/src/plugin-test/simpleTest/src/resources/resource.txt
diff --git a/ear/src/plugin-test/test05/.cvsignore b/ear/src/plugin-test/srcResourcesTest/.cvsignore
similarity index 100%
rename from ear/src/plugin-test/test05/.cvsignore
rename to ear/src/plugin-test/srcResourcesTest/.cvsignore
diff --git a/ear/src/plugin-test/test05/maven.xml b/ear/src/plugin-test/srcResourcesTest/maven.xml
similarity index 100%
rename from ear/src/plugin-test/test05/maven.xml
rename to ear/src/plugin-test/srcResourcesTest/maven.xml
diff --git a/ear/src/plugin-test/test05/project.properties b/ear/src/plugin-test/srcResourcesTest/project.properties
similarity index 100%
rename from ear/src/plugin-test/test05/project.properties
rename to ear/src/plugin-test/srcResourcesTest/project.properties
diff --git a/ear/src/plugin-test/test05/project.xml b/ear/src/plugin-test/srcResourcesTest/project.xml
similarity index 91%
rename from ear/src/plugin-test/test05/project.xml
rename to ear/src/plugin-test/srcResourcesTest/project.xml
index 25fd605a..1e843ba0 100644
--- a/ear/src/plugin-test/test05/project.xml
+++ b/ear/src/plugin-test/srcResourcesTest/project.xml
@@ -19,8 +19,8 @@
 
 <project>
   <pomVersion>3</pomVersion>
-  <name>Test project for Maven Ear Plugin 05</name>
-  <artifactId>test-maven-ear-plugin-05</artifactId>
+  <name>Ear Plugin - Src/Resource Test</name>
+  <artifactId>test-maven-ear-plugin-srcResourceTest</artifactId>
   <inceptionYear>2004</inceptionYear>
   <shortDescription>Makes sure maven.src.dir and maven.ear.resources are not the same</shortDescription>
   <description>Makes sure the maven.src.dir and maven.ear.resources properties do not have the same value (see issue MPEAR-24)</description>