diff --git a/javadoc/src/plugin-test/test01/maven.xml b/javadoc/src/plugin-test/test01/maven.xml
index 26d63ced..6ab35768 100644
--- a/javadoc/src/plugin-test/test01/maven.xml
+++ b/javadoc/src/plugin-test/test01/maven.xml
@@ -21,9 +21,7 @@
          xmlns:assert="assert"
          xmlns:ant="jelly:ant">
         
-  <goal name="testPlugin">
-    <delete dir="${maven.build.dir}" failonerror="false"/>
-    <delete file="${maven.build.dir}/${maven.final.name}_javadoc.jar" failonerror="false"/>
+  <goal name="testPlugin" prereqs="clean">
     <attainGoal name="javadoc:jar"/>
     <assert:assertFileExists file="${maven.javadoc.destdir}/index.html"/>
     <!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
diff --git a/javadoc/src/plugin-test/test02/maven.xml b/javadoc/src/plugin-test/test02/maven.xml
index c55091f4..8c11917a 100644
--- a/javadoc/src/plugin-test/test02/maven.xml
+++ b/javadoc/src/plugin-test/test02/maven.xml
@@ -21,8 +21,7 @@
          xmlns:assert="assert"
          xmlns:ant="jelly:ant">
          
-  <goal name="testPlugin">
-    <delete dir="${maven.build.dir}" failonerror="false"/>
+  <goal name="testPlugin" prereqs="clean">
     <attainGoal name="maven-javadoc-plugin:report"/>
     <assert:assertFileExists file="${maven.javadoc.destdir}/index.html"/>
     <!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
diff --git a/javadoc/src/plugin-test/test03/maven.xml b/javadoc/src/plugin-test/test03/maven.xml
index b162a7ab..4ca96cc1 100644
--- a/javadoc/src/plugin-test/test03/maven.xml
+++ b/javadoc/src/plugin-test/test03/maven.xml
@@ -21,8 +21,7 @@
          xmlns:assert="assert"
          xmlns:ant="jelly:ant">
          
-  <goal name="testPlugin">
-    <delete dir="${maven.build.dir}" failonerror="false"/>
+  <goal name="testPlugin" prereqs="clean">
     <ant:path id="test.src.set">
       <ant:pathelement path="${basedir}/src/opt"/>
     </ant:path>
diff --git a/javadoc/src/plugin-test/test04/maven.xml b/javadoc/src/plugin-test/test04/maven.xml
index ca8bba7f..9833a86a 100644
--- a/javadoc/src/plugin-test/test04/maven.xml
+++ b/javadoc/src/plugin-test/test04/maven.xml
@@ -21,9 +21,7 @@
          xmlns:assert="assert"
          xmlns:ant="jelly:ant">
          
-  <goal name="testPlugin">
-    <delete dir="${maven.build.dir}" failonerror="false"/>
-    <delete file="${maven.build.dir}/${maven.final.name}_javadoc.jar" failonerror="false"/>
+  <goal name="testPlugin" prereqs="clean">
     <attainGoal name="javadoc"/>
     <assert:assertFileExists file="${maven.javadoc.destdir}/index.html"/>
     <!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
diff --git a/javadoc/src/plugin-test/test05/maven.xml b/javadoc/src/plugin-test/test05/maven.xml
index 9df1e5b0..1f0a2331 100644
--- a/javadoc/src/plugin-test/test05/maven.xml
+++ b/javadoc/src/plugin-test/test05/maven.xml
@@ -21,9 +21,7 @@
          xmlns:assert="assert"
          xmlns:ant="jelly:ant">
          
-  <goal name="testPlugin">
-    <delete dir="${maven.build.dir}" failonerror="false"/>
-    <delete file="${maven.build.dir}/${maven.final.name}_javadoc.jar" failonerror="false"/>
+  <goal name="testPlugin" prereqs="clean">
     <attainGoal name="javadoc"/>
     <assert:assertFileExists file="${maven.javadoc.destdir}/index.html"/>
     <!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
diff --git a/javadoc/src/plugin-test/test06/maven.xml b/javadoc/src/plugin-test/test06/maven.xml
index 58dd4b62..6a256677 100644
--- a/javadoc/src/plugin-test/test06/maven.xml
+++ b/javadoc/src/plugin-test/test06/maven.xml
@@ -21,8 +21,7 @@
          xmlns:assert="assert"
          xmlns:ant="jelly:ant">
          
-  <goal name="testPlugin">
-    <delete dir="${maven.build.dir}" failonerror="false"/>
+  <goal name="testPlugin" prereqs="clean">
     <attainGoal name="site"/>
     <assert:assertFileExists file="${maven.docs.dest}/javadoc-warnings-report.html"/>
   </goal>
diff --git a/javadoc/src/plugin-test/test07/maven.xml b/javadoc/src/plugin-test/test07/maven.xml
index ef909034..54846121 100644
--- a/javadoc/src/plugin-test/test07/maven.xml
+++ b/javadoc/src/plugin-test/test07/maven.xml
@@ -21,8 +21,7 @@
          xmlns:assert="assert"
          xmlns:ant="jelly:ant">
          
-  <goal name="testPlugin">
-    <delete dir="${maven.build.dir}" failonerror="false"/>
+  <goal name="testPlugin" prereqs="clean">
     <attainGoal name="javadoc:jar"/>
   </goal>
 
diff --git a/javadoc/src/plugin-test/test08/maven.xml b/javadoc/src/plugin-test/test08/maven.xml
index eed13b8a..613dbf61 100644
--- a/javadoc/src/plugin-test/test08/maven.xml
+++ b/javadoc/src/plugin-test/test08/maven.xml
@@ -21,7 +21,7 @@
          xmlns:assert="assert"
          xmlns:ant="jelly:ant">
         
-  <goal name="testPlugin">
+  <goal name="testPlugin" prereqs="clean">
     <!-- so far we just need to make sure javadoc:generate completes without failing -->
     <attainGoal name="javadoc:generate"/>
   </goal>
diff --git a/javadoc/src/plugin-test/test09/maven.xml b/javadoc/src/plugin-test/test09/maven.xml
index a7a14c56..f7a40be0 100644
--- a/javadoc/src/plugin-test/test09/maven.xml
+++ b/javadoc/src/plugin-test/test09/maven.xml
@@ -21,9 +21,7 @@
          xmlns:assert="assert"
          xmlns:ant="jelly:ant">
         
-  <goal name="testPlugin">
-    <delete dir="${maven.build.dir}" failonerror="false"/>
-    <delete file="${maven.build.dir}/${maven.final.name}_javadoc.jar" failonerror="false"/>
+  <goal name="testPlugin" prereqs="clean">
     <attainGoal name="javadoc"/>
     <assert:assertFileContains file="${maven.javadoc.destdir}/org/apache/maven/Dummy.html" match="My Javadoc Header"/>
     <assert:assertFileContains file="${maven.javadoc.destdir}/org/apache/maven/Dummy2.html" match="My Javadoc Header"/>