diff --git a/aspectj/plugin.jelly b/aspectj/plugin.jelly
index bc1e8059..636485f5 100644
--- a/aspectj/plugin.jelly
+++ b/aspectj/plugin.jelly
@@ -33,7 +33,7 @@
   xmlns:ant="jelly:ant"
   xmlns:define="jelly:define"
   xmlns:log="jelly:log"
-  xmlns:test="test"
+  xmlns:maven="jelly:maven"
   xmlns:aspectj="aspectj">
 
   <!--
@@ -209,11 +209,9 @@
 
     <j:if test="${(shouldWeave == 'true') and (pom.build.unitTestSourceDirectory != '')}">
 
-      <!-- By calling a goal from the test plugin we ensure that all its 
-           properties are loaded and are thus accessible from this plugin -->
-      <!-- FIXME: remove and use maven:get tag -->
-      <test:dependency-handle/>
-      <j:set var="testPlugin" value="${pom.getPluginContext('maven-test-plugin')}"/>
+      <maven:get var="maven.test.compile.src.set"
+        plugin="maven-test-plugin"
+        property="maven.test.compile.src.set"/>
 
       <!-- Weave test classes -->
       <ant:path id="testClasspath">