diff --git a/ant/project.xml b/ant/project.xml
index 595c0b30..b2ad4b2e 100644
--- a/ant/project.xml
+++ b/ant/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-ant-plugin</id>
   <name>Maven Ant Plug-in</name>
-  <currentVersion>1.5</currentVersion>
+  <currentVersion>1.6-SNAPSHOT</currentVersion>
   <description>Generates ant build files from a maven project, so that plain ant users can build your project</description>
   <shortDescription>Generate Ant build file</shortDescription>
   <url>http://maven.apache.org/reference/plugins/ant/</url>
diff --git a/ant/src/plugin-resources/templates/build.jelly b/ant/src/plugin-resources/templates/build.jelly
index 9a847139..7a4c1166 100644
--- a/ant/src/plugin-resources/templates/build.jelly
+++ b/ant/src/plugin-resources/templates/build.jelly
@@ -12,7 +12,10 @@
   <j:set var="repo">${repos[0]}</j:set>
   <!-- set up relative paths -->
   <maven:makeRelativePath var="srcDir" basedir="${basedir}" path="${pom.build.sourceDirectory}" separator="/"/>
-  <maven:makeRelativePath var="testSrcDir" basedir="${basedir}" path="${pom.build.unitTestSourceDirectory}" separator="/"/>
+
+  <j:if test="${unitTestSourcesPresent == 'true'}">
+    <maven:makeRelativePath var="testSrcDir" basedir="${basedir}" path="${pom.build.unitTestSourceDirectory}" separator="/"/>
+  </j:if>
 
 
   <x:comment>
@@ -25,8 +28,11 @@
   <property name="defaulttargetdir" value="target"/> 
   <property name="libdir" value="target/lib" />
   <property name="classesdir" value="target/classes"/>
-  <property name="testclassesdir" value="target/test-classes"/>
-  <property name="testreportdir" value="target/test-reports"/>
+
+  <j:if test="${unitTestSourcesPresent == 'true'}">
+    <property name="testclassesdir" value="target/test-classes"/>
+    <property name="testreportdir" value="target/test-reports"/>
+  </j:if>
 
   <property name="distdir" value="dist"/>
   <property name="javadocdir" value="dist/docs/api"/>
diff --git a/ant/xdocs/changes.xml b/ant/xdocs/changes.xml
index 56ff57de..a9a104a4 100644
--- a/ant/xdocs/changes.xml
+++ b/ant/xdocs/changes.xml
@@ -7,7 +7,13 @@
 
   <body>
   
-    <release version="1.5" date="in CVS">
+    <release version="1.6" date="in CVS">
+      <action dev="dion" type="fix">
+        Check unit test source dir exists before making relative path
+      </action>
+    </release>
+
+    <release version="1.5" date="Unknown">
       <action dev="dion" type="fix">
         Make relative paths output for various pom values. MAVEN-909
       </action>
