diff --git a/ejb/plugin.jelly b/ejb/plugin.jelly
index fd4886cb..29eefca0 100644
--- a/ejb/plugin.jelly
+++ b/ejb/plugin.jelly
@@ -46,7 +46,15 @@
 
     <j:choose>
       <j:when test="${sourcesPresent == 'true'}">
-        <attainGoal name="test:test"/>
+        <j:choose>
+          <j:when test="${unitTestSourcesPresent == 'true' and context.getVariable('maven.test.skip') != 'true'}">
+            <attainGoal name="test:test"/>
+          </j:when>
+          <j:otherwise>
+            <attainGoal name="java:compile"/>
+            <attainGoal name="java:jar-resources"/>
+          </j:otherwise>
+        </j:choose>
       </j:when>
       <j:otherwise>
         <!-- Make sure we always copy the resources whether there are sources or 
diff --git a/ejb/xdocs/changes.xml b/ejb/xdocs/changes.xml
index 71f07979..474feffd 100644
--- a/ejb/xdocs/changes.xml
+++ b/ejb/xdocs/changes.xml
@@ -27,6 +27,7 @@
     <release version="1.7.3-SNAPSHOT" date="In SVN">
     </release>
     <release version="1.7.2" date="2006-03-05">
+      <action dev="shinobu" type="fix" issue="MPEJB-23">Java sources are not compiled when used with maven-test-plugin-1.8 and maven.test.skip=true.</action>
       <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
         <ul>
           <li>commons-logging v1.0.3 -&gt; v1.0.4</li>