diff --git a/jalopy/plugin.jelly b/jalopy/plugin.jelly
index 4b702e4b..1fe56299 100644
--- a/jalopy/plugin.jelly
+++ b/jalopy/plugin.jelly
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
 
 <project
-  xmlns:ant="jelly:ant">
+  xmlns:ant="jelly:ant"
+  xmlns:j="jelly:core">
 
   <!--==================================================================-->
   <!-- J A L O P Y (source code formatter)                              -->
@@ -45,9 +46,16 @@
             failonerror="${maven.jalopy.failOnError}"
             threads="${maven.jalopy.nbThread}"
             classpathref="project.classpath">
-      <ant:fileset dir="${pom.build.sourceDirectory}" >
-        <ant:include name="${maven.jalopy.filesetInclude}" />
-      </ant:fileset>
+      <j:if test="${sourcesPresent == 'true'}">
+        <ant:fileset dir="${pom.build.sourceDirectory}" >
+          <ant:include name="${maven.jalopy.filesetInclude}" />
+        </ant:fileset>
+      </j:if>
+      <j:if test="${unitTestSourcesPresent == 'true'}">
+        <ant:fileset dir="${pom.build.unitTestSourceDirectory}" >
+          <ant:include name="${maven.jalopy.filesetInclude}" />
+        </ant:fileset>
+      </j:if>
     </ant:jalopy>
   </goal>
 
diff --git a/jalopy/xdocs/changes.xml b/jalopy/xdocs/changes.xml
index e869ff7d..9994440e 100644
--- a/jalopy/xdocs/changes.xml
+++ b/jalopy/xdocs/changes.xml
@@ -7,6 +7,9 @@
 
   <body>
 	<release version="1.1" date="in CVS">
+      <action dev="evenisse" type="fix">
+        Fixed MAVEN-798. Add Test source formatting.
+      </action>
       <action dev="dion" type="update">
         Move to oro 2.0.7
       </action>
