diff --git a/jbuilder/plugin.jelly b/jbuilder/plugin.jelly
index 1ea2f513..55ac1aa2 100644
--- a/jbuilder/plugin.jelly
+++ b/jbuilder/plugin.jelly
@@ -437,15 +437,10 @@
     <!-- Finally, if there are unit tests and we still do not have a specific
          dependency on jUnit, use the version from the test plugin. -->
     <j:if test="${unitTestSourcesPresent and junitArtifact == null}" >
-      <!-- This goal forces the test plugin to be loaded.
-           TODO: In Maven beta 9, use the special test:eclipse tag instead. -->
-      <attainGoal name="test:prepare-filesystem" />
-      <j:set var="testPluginProject" value="${pom.getPluginContext('maven-test-plugin').getVariable('plugin')}"/>
-      <j:forEach var="testPluginArtifact" items="${testPluginProject.artifacts}">
-        <j:if test="${testPluginArtifact.dependency.artifactId == 'junit'}">
-          <j:set var="junitArtifact" value="${testPluginArtifact}"/>
-        </j:if>
-      </j:forEach>
+      
+      <maven:pluginVar var="testPlugin" plugin='maven-test-plugin' property='plugin' />
+      <j:set var="junitArtifact">${testPlugin.getDependency('junit')}</j:set>
+      
       <jbuilder:generateArtifactLibrary
         artifact="${junitArtifact}"
         userHome="${jbUserHome}"