diff --git a/test/plugin.jelly b/test/plugin.jelly
index f99567ab..caf7c224 100644
--- a/test/plugin.jelly
+++ b/test/plugin.jelly
@@ -322,10 +322,10 @@
             <j:forEach var="someEnv" items="${listOfEnv}">
               <env key="${someEnv}" value="${context.getVariable(someEnv)}"/>
             </j:forEach>
-            <maven:pluginVar var="jvmargs" plugin="maven-test-plugin" property="maven.junit.jvmargs" />
-            <j:if test="${!empty(jvmArgs)}">
-                <jvmarg line="${jvmargs}"/>
-            </j:if>
+            <u:tokenize var="listOfJvmArgs" delim=" ">${maven.junit.jvmargs}</u:tokenize>
+            <j:forEach var="somejvmarg" items="${listOfJvmArgs}">
+              <jvmarg value="${somejvmarg}"/>
+            </j:forEach>
             <formatter type="xml"/>
             <formatter type="${maven.junit.format}" usefile="${maven.junit.usefile}"/>
 
diff --git a/test/project.xml b/test/project.xml
index 0dc2743c..ea558bf3 100644
--- a/test/project.xml
+++ b/test/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-test-plugin</id>
   <name>Maven Test Plug-in</name>
-  <currentVersion>1.6.1</currentVersion>
+  <currentVersion>1.7-SNAPSHOT</currentVersion>
   <description>Run JUnit tests. Requires Maven 1.0 RC2.</description>
   <shortDescription>Run JUnit tests</shortDescription>
   <url>http://maven.apache.org/reference/plugins/test/</url>
diff --git a/test/xdocs/changes.xml b/test/xdocs/changes.xml
index b62815fe..75c5c901 100644
--- a/test/xdocs/changes.xml
+++ b/test/xdocs/changes.xml
@@ -24,6 +24,9 @@
     <author email="dion@multitask.com.au">dIon Gillard</author>
   </properties>
   <body>
+    <release version="1.7-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="fix" issue="MPTEST-31">handle JVM args correctly in test:match</action>
+    </release>
     <release version="1.6.1" date="2004-05-19">
       <action dev="brett" type="fix">only add xml-apis to classpath when forking to avoid classloader issues</action>
     </release>
