diff --git a/test/plugin.jelly b/test/plugin.jelly
index 5bbc7f0b..6bd5ff2a 100644
--- a/test/plugin.jelly
+++ b/test/plugin.jelly
@@ -37,6 +37,7 @@
           <setProperty name="source" value="${maven.test.source}" />
         </j:if>
         <classpath>
+          <pathelement path="${maven.test.dest}"/>
           <pathelement path="${maven.build.dest}"/>
           <path refid="maven.dependency.classpath"/>
           <pathelement path="${plugin.getDependencyPath('junit')}"/>
@@ -104,9 +105,9 @@
         <formatter type="xml"/>
         <formatter type="plain" usefile="${maven.junit.usefile}"/>
         <classpath>
-          <path refid="maven.dependency.classpath"/>
-          <pathelement location="${maven.build.dest}"/>
           <pathelement location="${maven.test.dest}"/>
+          <pathelement location="${maven.build.dest}"/>
+          <path refid="maven.dependency.classpath"/>
           <pathelement path="${plugin.getDependencyPath('junit')}"/>
         </classpath>
         <batchtest todir="${maven.test.reportsDirectory}">
@@ -153,9 +154,9 @@
         <jvmarg value="${somejvmarg}"/>
       </j:forEach>
       <classpath>
-        <path refid="maven.dependency.classpath"/>
-        <pathelement location="${maven.build.dest}"/>
         <pathelement location="${maven.test.dest}"/>
+        <pathelement location="${maven.build.dest}"/>
+        <path refid="maven.dependency.classpath"/>
         <pathelement path="${plugin.getDependencyPath('junit')}"/>
       </classpath>
       <arg value="-noloading"/>
@@ -205,9 +206,9 @@
             <formatter type="plain" usefile="true"/>
 
             <classpath>
-              <path refid="maven.dependency.classpath"/>
-              <pathelement location="${maven.build.dest}"/>
               <pathelement location="${maven.test.dest}"/>
+              <pathelement location="${maven.build.dest}"/>
+              <path refid="maven.dependency.classpath"/>
               <pathelement path="${plugin.getDependencyPath('junit')}"/>
             </classpath>
 
@@ -270,9 +271,9 @@
             <formatter type="plain" usefile="true"/>
 
             <classpath>
-              <path refid="maven.dependency.classpath"/>
-              <pathelement location="${maven.build.dest}"/>
               <pathelement location="${maven.test.dest}"/>
+              <pathelement location="${maven.build.dest}"/>
+              <path refid="maven.dependency.classpath"/>
               <pathelement path="${plugin.getDependencyPath('junit')}"/>
             </classpath>
 
diff --git a/test/xdocs/changes.xml b/test/xdocs/changes.xml
index dd7956f9..c0d36e58 100644
--- a/test/xdocs/changes.xml
+++ b/test/xdocs/changes.xml
@@ -7,6 +7,10 @@
 
   <body>
     <release version="1.5" date="in CVS">
+      <action dev="dion" type="update">
+        Apply MAVEN-309. Reorganise classpaths so that it's test, build, dependencies
+        and then JUnit
+      </action>
       <action dev="jstrachan" type="fix">
         You can now specify whether the source (java) or classes (class) files
         are searched when using the test plugin via the property:
