diff --git a/eclipse/src/plugin-resources/templates/classpath.jelly b/eclipse/src/plugin-resources/templates/classpath.jelly
index d92c4e83..b9927dce 100644
--- a/eclipse/src/plugin-resources/templates/classpath.jelly
+++ b/eclipse/src/plugin-resources/templates/classpath.jelly
@@ -21,8 +21,7 @@
     <!-- Eclipse supports an output directory per input directory -->
     <j:set var="testOutputDir" value="${maven.eclipse.test.output.dir}"/>
     <j:if test="${empty testOutputDir}">
-      <j:set var="testOutputDir" 
-             value="${pom.getPluginContext('maven-test-plugin').getVariable('maven.test.dest')}"/>      
+      <maven:pluginVar var="testOutputDir" plugin='maven-test-plugin' property='maven.test.dest'/>      
     </j:if>
 
     <maven:makeRelativePath var="testOutputDir" basedir="${basedir}" path="${testOutputDir}" />
@@ -47,7 +46,8 @@
       -->
     <j:set var="verX" value="${maven.eclipse.junit}X"/>
 
-    <j:set var="depVersion">${pom.getPluginContext('maven-test-plugin').getVariable('plugin').getDependency('junit').getVersion()}</j:set>
+    <maven:pluginVar var="testPlugin" plugin='maven-test-plugin' property='plugin' />
+    <j:set var="depVersion">${testPlugin.getDependency('junit').getVersion()}</j:set>
   
     <j:if test="${pom.getDependency('junit') != null}">
       <j:set var="depVersion" value="${pom.getDependency('junit').getVersion()}"/>
@@ -66,20 +66,20 @@
     </j:if>
   </j:if>
 
-  <j:set var="cactusSrcDir"
-      value="${pom.getPluginContext('maven-cactus-plugin').getVariable('cactus.src.dir')}"/>
-    <util:available file="${cactusSrcDir}">
-      <j:set var="cactusSourcePresent" value="true"/>
-    </util:available>
+  <maven:pluginVar var="cactusSrcDir" plugin='maven-cactus-plugin' property='cactus.src.dir' />
+  <util:available file="${cactusSrcDir}">
+    <j:set var="cactusSourcePresent" value="true"/>
+  </util:available>
 
-    <j:if test="${cactusSourcePresent == 'true'}">
-      <ant:echo>Contains Cactus Tests!</ant:echo>
-      <maven:makeRelativePath var="testSrcDir" basedir="${basedir}" path="${cactusSrcDir}" />
-      <classpathentry kind="src" path="${testSrcDir}"/>
-    
-      <j:set var="depVersion">${pom.getPluginContext('maven-cactus-plugin').getVariable('plugin').getDependency('cactus').getVersion()}</j:set>
-      <classpathentry kind="var" path="MAVEN_REPO/cactus/jars/cactus-${depVersion}.jar"/>
-    </j:if>
+  <j:if test="${cactusSourcePresent == 'true'}">
+    <ant:echo>Contains Cactus Tests!</ant:echo>
+    <maven:makeRelativePath var="testSrcDir" basedir="${basedir}" path="${cactusSrcDir}" />
+    <classpathentry kind="src" path="${testSrcDir}"/>
+
+    <maven:pluginVar var="cactusPlugin" plugin='maven-cactus-plugin' property='plugin' />
+    <j:set var="depVersion">${cactusPlugin.getDependency('cactus').getVersion()}</j:set>
+    <classpathentry kind="var" path="MAVEN_REPO/cactus/jars/cactus-${depVersion}.jar"/>
+  </j:if>
 
   <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
     <j:forEach var="lib" items="${pom.artifacts}">