diff -r 7a98b1bd40c3 nbbuild/antsrc/org/netbeans/nbbuild/ShorterPaths.java
--- a/nbbuild/antsrc/org/netbeans/nbbuild/ShorterPaths.java	Mon Jun 04 20:05:05 2012 +0200
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/ShorterPaths.java	Mon Jun 04 21:32:16 2012 +0200
@@ -199,6 +199,8 @@
                         pw.println(name.replaceFirst("^test-(unit|qa-functional)-sys-prop\\.", "test-sys-prop.") + "=" + outProp);
                     } else if (name.startsWith("test.config")) {
                         pw.println(name + "=" + properties.get(name));
+                    } else if ("requires.nb.javac".equals(name)) {
+                        pw.println(name + "=" + properties.get(name));
                     }
                 }
                 pw.println("extra.test.libs=" + externalLibBuf.toString());
diff -r 7a98b1bd40c3 nbbuild/testdist/release/one-module.xml
--- a/nbbuild/testdist/release/one-module.xml	Mon Jun 04 20:05:05 2012 +0200
+++ b/nbbuild/testdist/release/one-module.xml	Mon Jun 04 21:32:16 2012 +0200
@@ -80,6 +80,34 @@
             <available classname="org.testng.annotations.Test" classpath="${extra.test.libs}"/>
         </condition>
         <validatepath pathref="test.cp" failedproperty="wrong.classpath"/>
+        <pathconvert property="retouche.javac.api">
+            <fileset dir="${netbeans.dest.dir}">
+                <include name="java/modules/ext/*javac*api*.jar"/>
+            </fileset>
+        </pathconvert>
+        <pathconvert property="retouche.javac.impl">
+            <fileset dir="${netbeans.dest.dir}">
+                <include name="java/modules/ext/*javac*impl*.jar"/>
+            </fileset>
+            <fileset dir="${nbjdk.home}/../Classes" erroronmissingdir="false">
+                <include name="*.jar"/>
+            </fileset>
+        </pathconvert>
+        <!-- When requires.nb.javac property is true, prepend javac-api on bootclasspath to allow override the default annotation
+             processing API located in rt.jar. On Mac, prepend also javac-impl, so that tests are built against correct version of javac. -->
+        <condition property="bootclasspath.prepend" value="${retouche.javac.api}:${retouche.javac.impl}">
+            <and>
+                <os family="mac"/>
+                <istrue value="${requires.nb.javac}"/>
+            </and>
+        </condition>
+        <condition property="bootclasspath.prepend" value="${retouche.javac.api}">
+            <istrue value="${requires.nb.javac}"/>
+        </condition>
+        <condition property="test.bootclasspath.prepend.args" value="-Xbootclasspath/p:${bootclasspath.prepend}">
+            <isset property="bootclasspath.prepend"/>
+        </condition>
+        <property name="test.bootclasspath.prepend.args" value=""/>
     </target>
 
     <target name="init-data" if="exists.test.data">
@@ -102,6 +130,7 @@
                     <syspropertyset refid="test.properties"/>
                     <sysproperty key="nbjunit.workdir" path="${nbjunit.workdir}"/>
                     <sysproperty key="nbjunit.hard.timeout" value="${test.timeout}"/>
+                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
                     <jvmarg line="${test.run.args}"/>
                     <formatter type="brief" usefile="false"/>
                     <formatter type="xml"/>
@@ -123,6 +152,7 @@
                     <classfileset dir="${test.classes.dir}" includes="${test.includes}" excludes="${test.excludes}"/>
                     <propertyset refid="test.properties"/>
                     <classpath refid="test.cp"/>
+                    <jvmarg line="${test.bootclasspath.prepend.args}"/>
                     <jvmarg line="${test.run.args}"/>
                     <sysproperty key="nbjunit.workdir" path="${nbjunit.workdir}"/>
                     <sysproperty key="nbjunit.hard.timeout" value="${test.timeout}"/>