diff --git a/test/plugin.jelly b/test/plugin.jelly
index 1349820d..c3262386 100644
--- a/test/plugin.jelly
+++ b/test/plugin.jelly
@@ -64,9 +64,9 @@
           <pathelement path="${plugin.getDependencyPath('junit')}"/>
           <j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
             <pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
+            <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
+            <pathelement location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
           </j:if>
-          <pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
-          <pathelement location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
         </classpath>
         <src>
           <path refid="maven.test.compile.src.set"/>
@@ -186,10 +186,10 @@
           <path refid="maven.dependency.classpath"/>
           <pathelement path="${plugin.getDependencyPath('junit')}"/>
           <j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
-  	        <pathelement path="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
+            <pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
+            <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
+            <pathelement location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
           </j:if>
-          <pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
-          <pathelement path="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
           <j:if test="${not empty(context.getVariable('maven.test.classpath'))}">
             <pathelement path="${maven.test.classpath}"/>
           </j:if>
@@ -256,10 +256,10 @@
         <path refid="maven.dependency.classpath"/>
         <pathelement path="${plugin.getDependencyPath('junit')}"/>
         <j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
-			    <pathelement path="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
+            <pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
+            <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
+            <pathelement location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
         </j:if>
-        <pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
-        <pathelement path="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
         <j:if test="${not empty(context.getVariable('maven.test.classpath'))}">
           <pathelement path="${maven.test.classpath}"/>
         </j:if>
@@ -342,10 +342,10 @@
               <path refid="maven.dependency.classpath"/>
               <pathelement path="${plugin.getDependencyPath('junit')}"/>
               <j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
-					      <pathelement path="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
+                <pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
+                <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
+                <pathelement location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
               </j:if>
-              <pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
-              <pathelement path="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
               <j:if test="${not empty(context.getVariable('maven.test.classpath'))}">
                 <pathelement path="${maven.test.classpath}"/>
               </j:if>
@@ -454,10 +454,10 @@
               <path refid="maven.dependency.classpath"/>
               <pathelement path="${plugin.getDependencyPath('junit')}"/>
               <j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
-  			        <pathelement path="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
+                <pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
+                <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
+                <pathelement location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
               </j:if>
-              <pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
-              <pathelement path="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
               <j:if test="${not empty(context.getVariable('maven.test.classpath'))}">
                 <pathelement path="${maven.test.classpath}"/>
               </j:if>
diff --git a/test/project.xml b/test/project.xml
index db145a5b..77cb5b54 100644
--- a/test/project.xml
+++ b/test/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-test-plugin</id>
   <name>Maven Test Plugin</name>
-  <currentVersion>1.8.1</currentVersion>
+  <currentVersion>1.8.2-SNAPSHOT</currentVersion>
   <description>Run JUnit tests.</description>
   <shortDescription>Run JUnit tests</shortDescription>
   <versions>
diff --git a/test/xdocs/changes.xml b/test/xdocs/changes.xml
index 0598f844..5dd7c101 100644
--- a/test/xdocs/changes.xml
+++ b/test/xdocs/changes.xml
@@ -24,6 +24,13 @@
     <author email="dion@multitask.com.au">dIon Gillard</author> 
   </properties>  
   <body> 
+    <release version="1.8.2-SNAPSHOT" date="in SVN"> 
+      <action dev="ltheussl" type="fix">
+        <description>Memory leak and performance degradation in test plugin 1.8.</description>
+        <fixes issue="MPTEST-63"/>
+        <fixes issue="MPTEST-64"/>
+      </action> 
+    </release>  
     <release version="1.8.1" date="2007-05-07"> 
       <action dev="ltheussl" type="update" issue="MPTEST-66">Document a backward-compat problem affecting version 1.8 of the plugin.</action>  
       <action dev="ltheussl" type="add" issue="MPTEST-71">New property to halt a build on test failures but after all tests have been run.</action>