diff --git a/simian/src/plugin-resources/simian.jsl b/simian/src/plugin-resources/simian.jsl
index 08810790..ff5d4cee 100755
--- a/simian/src/plugin-resources/simian.jsl
+++ b/simian/src/plugin-resources/simian.jsl
@@ -99,7 +99,7 @@
 			<j:set var="testDirLength" value="${testDir.length() + 1}"/>
                         <j:set var="testIndex" value="${name.lastIndexOf(testDir)}"/>
                         <j:choose>
-                          <j:when test="${testIndex > 0}">
+                          <j:when test="${testIndex > -1}">
 				<j:set var="name" value="${name.substring(mavenTool.toInteger(testDirLength.toString()))}"/>
 			  </j:when>
 			  <j:otherwise>
@@ -114,21 +114,21 @@
                             <j:set var="nameWithoutJavaExtension" value="${name.substring(0, index)}"/>
                             <util:replace var="nameWithoutJavaExtension" value="${nameWithoutJavaExtension}" oldChar="\\" newChar="/"/>
 				<j:choose>
-				  <j:when test="${testIndex > 0}">
-				    <li><a href="xref/${nameWithoutJavaExtension}.html#${duplicationArea.attribute('startLineNumber').getValue()}">${nameWithoutJavaExtension} ( ${duplicationArea.attribute('startLineNumber').getValue()} - ${duplicationArea.attribute('endLineNumber').getValue()} )</a></li>
+				  <j:when test="${testIndex > -1}">
+				    <li><a href="xref-test/${nameWithoutJavaExtension}.html#${duplicationArea.attribute('startLineNumber').getValue()}">${nameWithoutJavaExtension} ( ${duplicationArea.attribute('startLineNumber').getValue()} - ${duplicationArea.attribute('endLineNumber').getValue()} )</a></li>
 				  </j:when>
 				  <j:otherwise>
-				    <li><a href="xref-test/${nameWithoutJavaExtension}.html#${duplicationArea.attribute('startLineNumber').getValue()}">${nameWithoutJavaExtension} ( ${duplicationArea.attribute('startLineNumber').getValue()} - ${duplicationArea.attribute('endLineNumber').getValue()} )</a></li>
+				    <li><a href="xref/${nameWithoutJavaExtension}.html#${duplicationArea.attribute('startLineNumber').getValue()}">${nameWithoutJavaExtension} ( ${duplicationArea.attribute('startLineNumber').getValue()} - ${duplicationArea.attribute('endLineNumber').getValue()} )</a></li>
 				  </j:otherwise>
 				</j:choose>
                           </j:when>
                           <j:otherwise>
 				<j:choose>
-				  <j:when test="${testIndex > 0}">
-	                            <li><a href="xref/${name}.html#${duplicationArea.attribute('startLineNumber').getValue()}">${nameWithoutJavaExtension} ( ${duplicationArea.attribute('startLineNumber').getValue()} - ${duplicationArea.attribute('endLineNumber').getValue()} )</a></li>
+				  <j:when test="${testIndex > -1}">
+	                            <li><a href="xref-test/${name}.html#${duplicationArea.attribute('startLineNumber').getValue()}">${nameWithoutJavaExtension} ( ${duplicationArea.attribute('startLineNumber').getValue()} - ${duplicationArea.attribute('endLineNumber').getValue()} )</a></li>
 				  </j:when>
 				  <j:otherwise>
-	                            <li><a href="xref-test/${name}.html#${duplicationArea.attribute('startLineNumber').getValue()}">${nameWithoutJavaExtension} ( ${duplicationArea.attribute('startLineNumber').getValue()} - ${duplicationArea.attribute('endLineNumber').getValue()} )</a></li>
+	                            <li><a href="xref/${name}.html#${duplicationArea.attribute('startLineNumber').getValue()}">${nameWithoutJavaExtension} ( ${duplicationArea.attribute('startLineNumber').getValue()} - ${duplicationArea.attribute('endLineNumber').getValue()} )</a></li>
 				  </j:otherwise>
 				</j:choose>
                           </j:otherwise>
diff --git a/simian/xdocs/changes.xml b/simian/xdocs/changes.xml
index 50df640c..b4a98514 100644
--- a/simian/xdocs/changes.xml
+++ b/simian/xdocs/changes.xml
@@ -25,6 +25,9 @@
     <author email="maurice@maguyane.net">Maurice Montg?nie</author>
   </properties>
   <body>
+    <release version="1.6" date="SVN">
+      <action dev="epugh" type="fix" issue="MPSIMIAN-12" due-to="James Dickinson">Simian report contains broken links to xref/xref-test directories</action>
+    </release>
     <release version="1.5" date="2005-07-11">
       <action dev="epugh" type="add" issue="MPSIMIAN-7">Add include/exclude pattern for test directories.</action>
       <action dev="benoitx" type="update" issue="MPSIMIAN-14">Upgrade to Simian 2.2.4 and XML file output from Simian.</action>