diff --git a/aspectj/plugin.jelly b/aspectj/plugin.jelly
index 64164791..8751a198 100644
--- a/aspectj/plugin.jelly
+++ b/aspectj/plugin.jelly
@@ -148,7 +148,7 @@
         </j:when>
         <!-- if aspectSourceDirectory is not defined in pom -->
         <j:otherwise>
-            <log:info>Aspect source directory not specified</log:info>
+            <log:info>Aspect source directory not defined</log:info>
             <j:set var="aspectSourcesPresent" value="false"/>
         </j:otherwise>
     </j:choose>
@@ -207,7 +207,7 @@
   <goal name="aspectj:test-compile" prereqs="aspectj:compile"
     description="Weave tests with AspectJ">
 
-    <j:if test="${shouldWeave == 'true'}">
+    <j:if test="${(shouldWeave == 'true') and (pom.build.unitTestSourceDirectory != '')}">
 
       <!-- By calling a goal from the test plugin we ensure that all its 
            properties are loaded and are thus accessible from this plugin -->
diff --git a/aspectj/xdocs/changes.xml b/aspectj/xdocs/changes.xml
index 6bc77cf7..3c2e8cd9 100644
--- a/aspectj/xdocs/changes.xml
+++ b/aspectj/xdocs/changes.xml
@@ -28,6 +28,7 @@
   </properties>
   <body>
     <release version="3.1.1" date="in CVS">
+      <action dev="carlos" type="fix" issue="MPASPECTJ-11">Check that unitTestSourceDirectory is defined in pom</action>
       <action dev="carlos" type="add">Output messages to log</action>
       <action dev="carlos" type="fix">Check that aspectSourceDirectory is defined in pom</action>
     </release>
