diff --git a/html2xdoc/maven.xml b/html2xdoc/maven.xml
deleted file mode 100644
index 672530e1..00000000
--- a/html2xdoc/maven.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- 
-/*
- * 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.
- */
- -->
-<project default="plugin:install">
-
-  <!-- copies unit testing stuff: don't know why we need this! -->
-  <postGoal name="test:compile">
-    <copy todir="target/test-classes">
-      <fileset dir="src/test">
-        <include name="**/*.html"/>
-        <include name="**/*.xml"/>
-      </fileset>
-    </copy>
-  </postGoal>
-</project>
diff --git a/html2xdoc/project.xml b/html2xdoc/project.xml
index 60c91e98..e651614a 100644
--- a/html2xdoc/project.xml
+++ b/html2xdoc/project.xml
@@ -110,4 +110,20 @@
       <tag>MAVEN_HTML2XDOC_1_2</tag>
     </version>
   </versions>
+  <build>
+    <unitTest>
+      <includes>
+        <include>**/Test*.java</include>
+      </includes>
+      <resources>
+        <resource>
+          <directory>src/test</directory>
+          <includes>
+            <include>**/*.xml</include>
+            <include>**/*.html</include>
+          </includes>
+        </resource>
+      </resources>
+    </unitTest>
+  </build>
 </project>
diff --git a/html2xdoc/src/test/org/apache/maven/html2xdoc/codeinpara.xml b/html2xdoc/src/test/org/apache/maven/html2xdoc/codeinpara.xml
index d8fedea4..ad45b68e 100644
--- a/html2xdoc/src/test/org/apache/maven/html2xdoc/codeinpara.xml
+++ b/html2xdoc/src/test/org/apache/maven/html2xdoc/codeinpara.xml
@@ -1,20 +1,3 @@
-<!-- 
-/*
- * 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.
- */
- -->
 <document>
   <properties>
     <title>A title</title>
diff --git a/html2xdoc/src/test/org/apache/maven/html2xdoc/comment.xml b/html2xdoc/src/test/org/apache/maven/html2xdoc/comment.xml
index 88bbad2b..c7ad5d6f 100644
--- a/html2xdoc/src/test/org/apache/maven/html2xdoc/comment.xml
+++ b/html2xdoc/src/test/org/apache/maven/html2xdoc/comment.xml
@@ -1,20 +1,3 @@
-<!-- 
-/*
- * 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.
- */
- -->
 <document>
   <properties>
     <title>A title</title>
diff --git a/html2xdoc/src/test/org/apache/maven/html2xdoc/h1h2.xml b/html2xdoc/src/test/org/apache/maven/html2xdoc/h1h2.xml
index 273944b4..7e7748d7 100644
--- a/html2xdoc/src/test/org/apache/maven/html2xdoc/h1h2.xml
+++ b/html2xdoc/src/test/org/apache/maven/html2xdoc/h1h2.xml
@@ -1,20 +1,3 @@
-<!-- 
-/*
- * 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.
- */
- -->
 <document>
   <properties>
     <title>A title</title>
diff --git a/html2xdoc/src/test/org/apache/maven/html2xdoc/link.xml b/html2xdoc/src/test/org/apache/maven/html2xdoc/link.xml
index 4921fa3c..972a8f0e 100644
--- a/html2xdoc/src/test/org/apache/maven/html2xdoc/link.xml
+++ b/html2xdoc/src/test/org/apache/maven/html2xdoc/link.xml
@@ -1,20 +1,3 @@
-<!-- 
-/*
- * 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.
- */
- -->
 <document>
   <properties>
     <title>A title</title>
diff --git a/html2xdoc/src/test/org/apache/maven/html2xdoc/linkInHeading.xml b/html2xdoc/src/test/org/apache/maven/html2xdoc/linkInHeading.xml
index 4a628007..a87e43f2 100644
--- a/html2xdoc/src/test/org/apache/maven/html2xdoc/linkInHeading.xml
+++ b/html2xdoc/src/test/org/apache/maven/html2xdoc/linkInHeading.xml
@@ -1,20 +1,3 @@
-<!-- 
-/*
- * 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.
- */
- -->
 <document>
   <properties>
     <title>A title</title>
diff --git a/html2xdoc/src/test/org/apache/maven/html2xdoc/missingParaBug.xml b/html2xdoc/src/test/org/apache/maven/html2xdoc/missingParaBug.xml
index 42b60f5a..d02f53d9 100644
--- a/html2xdoc/src/test/org/apache/maven/html2xdoc/missingParaBug.xml
+++ b/html2xdoc/src/test/org/apache/maven/html2xdoc/missingParaBug.xml
@@ -1,20 +1,3 @@
-<!-- 
-/*
- * 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.
- */
- -->
 <document>
   <properties>
     <title>A title</title>
diff --git a/html2xdoc/src/test/org/apache/maven/html2xdoc/output1.xml b/html2xdoc/src/test/org/apache/maven/html2xdoc/output1.xml
index 08a9e6bb..804ab17b 100644
--- a/html2xdoc/src/test/org/apache/maven/html2xdoc/output1.xml
+++ b/html2xdoc/src/test/org/apache/maven/html2xdoc/output1.xml
@@ -1,20 +1,3 @@
-<!-- 
-/*
- * 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.
- */
- -->
 <document>
   <properties>
     <title>A title</title>
@@ -30,4 +13,4 @@
 			<source>hi there</source>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>