--- plugin.jelly.orig	2004-04-05 20:06:46.000000000 -0600
+++ plugin.jelly	2004-04-05 20:12:44.000000000 -0600
@@ -98,6 +98,10 @@
         <j:forEach var="someProperty" items="${listOfProperties}">
           <sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/>
         </j:forEach>
+        <u:tokenize var="listOfEnv" delim=" ">${maven.junit.envvars}</u:tokenize>
+        <j:forEach var="someEnv" items="${listOfEnv}">
+          <env key="${someEnv}" value="${context.getVariable(someEnv)}"/>
+        </j:forEach>
         <u:tokenize var="listOfJvmArgs" delim=" ">${maven.junit.jvmargs}</u:tokenize>
         <j:forEach var="somejvmarg" items="${listOfJvmArgs}">
           <jvmarg value="${somejvmarg}"/>
@@ -149,6 +153,10 @@
       <j:forEach var="someProperty" items="${listOfProperties}">
         <sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/>
       </j:forEach>
+      <u:tokenize var="listOfEnv" delim=" ">${maven.junit.envvars}</u:tokenize>
+      <j:forEach var="someEnv" items="${listOfEnv}">
+        <env key="${someEnv}" value="${context.getVariable(someEnv)}"/>
+      </j:forEach>
       <u:tokenize var="listOfJvmArgs" delim=" ">${maven.junit.jvmargs}</u:tokenize>
       <j:forEach var="somejvmarg" items="${listOfJvmArgs}">
         <jvmarg value="${somejvmarg}"/>
@@ -197,6 +205,10 @@
             <j:forEach var="someProperty" items="${listOfProperties}">
               <sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/>
             </j:forEach>
+            <u:tokenize var="listOfEnv" delim=" ">${maven.junit.envvars}</u:tokenize>
+            <j:forEach var="someEnv" items="${listOfEnv}">
+              <env key="${someEnv}" value="${context.getVariable(someEnv)}"/>
+            </j:forEach>
             <u:tokenize var="listOfJvmArgs" delim=" ">${maven.junit.jvmargs}</u:tokenize>
             <j:forEach var="somejvmarg" items="${listOfJvmArgs}">
               <jvmarg value="${somejvmarg}"/>
@@ -261,6 +273,10 @@
             <j:forEach var="someProperty" items="${listOfProperties}">
               <sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/>
             </j:forEach>
+            <u:tokenize var="listOfEnv" delim=" ">${maven.junit.envvars}</u:tokenize>
+            <j:forEach var="someEnv" items="${listOfEnv}">
+              <env key="${someEnv}" value="${context.getVariable(someEnv)}"/>
+            </j:forEach>
             <j:set var="jvmargs"
                value="${pom.getPluginContext('maven-test-plugin').getVariable('maven.junit.jvmargs')}"/>
             <j:if test="$">