diff --git a/javadoc/src/plugin-test/maven.xml b/javadoc/src/plugin-test/maven.xml
index 169675c7..62dc2fc0 100644
--- a/javadoc/src/plugin-test/maven.xml
+++ b/javadoc/src/plugin-test/maven.xml
@@ -21,7 +21,10 @@
          xmlns:assert="assert"
          xmlns:ant="jelly:ant">
          
-  <goal name="testPlugin" prereqs="test-javadoc,test-javadoc-multi-src,test-javadoc-jar">
+  <goal name="testPlugin">
+    <attainGoal name="test-javadoc"/>
+    <attainGoal name="test-javadoc-multi-src"/>
+    <attainGoal name="test-javadoc-jar"/>
   </goal>
   
   <goal name="test-javadoc">
@@ -31,14 +34,13 @@
     <!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
     <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/doc-files/example.txt"/>
     <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven2/doc-files/example.txt"/>
-    <!-- assert that javadoc for classes Dummy, Dummy2, Dummy3, Dummy5, Dummy6 are generated -->
+    <!-- assert that javadoc for classes Dummy, Dummy2, Dummy3 are generated -->
     <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/Dummy.html"/>
     <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/Dummy2.html"/>
     <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven2/Dummy3.html"/>
   </goal>
   
   <goal name="test-javadoc-multi-src">
-    <!--
     <delete dir="${maven.build.dir}" failonerror="false"/>
     <ant:path id="maven.javadoc.src.set">
       <ant:fileset dir="${basedir}/src/main"/>
@@ -47,18 +49,17 @@
     <maven:addPath id="maven.compile.src.set" refid="maven.javadoc.src.set"/>
     <attainGoal name="maven-javadoc-plugin:report"/>
     <assert:assertFileExists file="${maven.javadoc.destdir}/index.html"/>
-    -->
     <!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
-    <!--    
     <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/doc-files/example.txt"/>
     <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven2/doc-files/example.txt"/>
+    <!--
     <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven3/doc-files/example.txt"/>
     -->
-    <!-- assert that javadoc for classes Dummy, Dummy2, Dummy3, Dummy5, Dummy6 are generated -->
-    <!--    
+    <!-- assert that javadoc for classes Dummy, Dummy2, Dummy3, Dummy5, Dummy6 are generated -->   
     <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/Dummy.html"/>
     <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven/Dummy2.html"/>
     <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven2/Dummy3.html"/>
+    <!--    
     <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven3/Dummy5.html"/>
     <assert:assertFileExists file="${maven.javadoc.destdir}/org/apache/maven3/Dummy6.html"/>
     -->
diff --git a/javadoc/src/plugin-test/project.properties b/javadoc/src/plugin-test/project.properties
new file mode 100644
index 00000000..52a51758
--- /dev/null
+++ b/javadoc/src/plugin-test/project.properties
@@ -0,0 +1 @@
+#maven.compile.src.set=${basedir}/src/main${path.separator}${basedir}/src/opt
\ No newline at end of file
diff --git a/javadoc/src/plugin-test/project.xml b/javadoc/src/plugin-test/project.xml
index 38724fcc..81513814 100644
--- a/javadoc/src/plugin-test/project.xml
+++ b/javadoc/src/plugin-test/project.xml
@@ -30,7 +30,7 @@
     <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
   <inceptionYear>2001</inceptionYear>
-  <package>org.apache.maven</package>
+  <package>org.apache</package>
   <logo>http://maven.apache.org/images/maven.jpg</logo>
   <description>Test for Maven JavaDoc plugin</description>
   <shortDescription>Test for Maven JavaDoc plugin</shortDescription>