diff -r c9208633ed4e java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java
--- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java	Thu Aug 07 16:02:01 2008 +0200
+++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java	Thu Aug 07 20:32:12 2008 +0200
@@ -482,19 +482,14 @@
             FileObject[] files = findTestSourcesForSources(context);
             targetNames = setupDebugTestSingle(p, files);
         }
-        else if ( command.equals( SingleMethod.COMMAND_RUN_SINGLE_METHOD ) ) {
+        else if ( command.equals( SingleMethod.COMMAND_RUN_SINGLE_METHOD )
+               || command.equals( SingleMethod.COMMAND_DEBUG_SINGLE_METHOD ) ) {
             SingleMethod[] methodSpecs = findTestMethods(context);
             if ((methodSpecs == null) || (methodSpecs.length != 1)) {
                 return new String[0];
             }
-            targetNames = setupRunSingleTestMethod(p, methodSpecs[0]);
-        }
-        else if ( command.equals( SingleMethod.COMMAND_DEBUG_SINGLE_METHOD ) ) {
-            SingleMethod[] methodSpecs = findTestMethods(context);
-            if ((methodSpecs == null) || (methodSpecs.length != 1)) {
-                return new String[0];
-            }
-            targetNames = setupDebugSingleTestMethod(p, methodSpecs[0]);
+            boolean debug = command.equals(SingleMethod.COMMAND_DEBUG_SINGLE_METHOD);
+            targetNames = setupRunSingleTestMethod(p, methodSpecs[0], debug);
         }
         else if ( command.equals( JavaProjectConstants.COMMAND_DEBUG_FIX ) ) {
             FileObject[] files = findSources( context );
@@ -785,32 +780,16 @@
         return new String[] {"debug-test"}; // NOI18N
     }
 
-    private String[] setupRunSingleTestMethod(Properties p, SingleMethod methodSpec) {
-        return setupTestSingle(p, new FileObject[] {methodSpec.getFile()});
-
-        //FileObject[] testSrcPath = project.getTestSourceRoots().getRoots();
-        //FileObject testFile = methodSpec.getFile();
-        //FileObject root = getRoot(testSrcPath, testFile);
-        //String relPath = FileUtil.getRelativePath(root, testFile);
-        //String className = getClassName(relPath);
-        //p.setProperty("javac.includes", relPath); // NOI18N
-        //p.setProperty("test.class", className); // NOI18N
-        //p.setProperty("test.method", methodSpec.getMethodName()); // NOI18N
-        //return new String[] {"test-single-method"}; // NOI18N
-    }
-
-    private String[] setupDebugSingleTestMethod(Properties p, SingleMethod methodSpec) {
-        return setupDebugTestSingle(p, new FileObject[] {methodSpec.getFile()});
-
-        //FileObject[] testSrcPath = project.getTestSourceRoots().getRoots();
-        //FileObject testFile = methodSpec.getFile();
-        //FileObject root = getRoot(testSrcPath, testFile);
-        //String relPath = FileUtil.getRelativePath(root, testFile);
-        //String className = getClassName(relPath);
-        //p.setProperty("javac.includes", relPath); // NOI18N
-        //p.setProperty("test.class", className); // NOI18N
-        //p.setProperty("test.method", methodSpec.getMethodName()); // NOI18N
-        //return new String[] {"debug-test-method"}; // NOI18N
+    private String[] setupRunSingleTestMethod(Properties p, SingleMethod methodSpec, boolean debug) {
+        FileObject[] testSrcPath = project.getTestSourceRoots().getRoots();
+        FileObject testFile = methodSpec.getFile();
+        FileObject root = getRoot(testSrcPath, testFile);
+        String relPath = FileUtil.getRelativePath(root, testFile);
+        String className = getClassName(relPath);
+        p.setProperty("javac.includes", relPath); // NOI18N
+        p.setProperty("test.class", className); // NOI18N
+        p.setProperty("test.method", methodSpec.getMethodName()); // NOI18N
+        return new String[] {debug ? "debug-test" : "test-single"}; // NOI18N
     }
 
     private static String getClassName(String relPath) {
@@ -854,12 +833,8 @@
             return fos != null && fos.length == 1;
         } else if (command.equals(SingleMethod.COMMAND_RUN_SINGLE_METHOD)
                 || command.equals(SingleMethod.COMMAND_DEBUG_SINGLE_METHOD)) {
-            if (isCompileOnSaveEnabled(J2SEProjectProperties.DISABLE_COMPILE_ON_SAVE)) {
-                SingleMethod[] methodSpecs = findTestMethods(context);
-                return (methodSpecs != null) && (methodSpecs.length == 1);
-            } else {
-                return false;
-            }
+            SingleMethod[] methodSpecs = findTestMethods(context);
+            return (methodSpecs != null) && (methodSpecs.length == 1);
         } else {
             // other actions are global
             return true;
diff -r c9208633ed4e java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl
--- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl	Thu Aug 07 16:02:01 2008 +0200
+++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl	Thu Aug 07 20:32:12 2008 +0200
@@ -2,7 +2,7 @@
 <!--
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
 
 
 The contents of this file are subject to the terms of either the GNU
@@ -26,7 +26,7 @@
 Contributor(s):
 
 The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
 Microsystems, Inc. All Rights Reserved.
 
 If you wish your version of this file to be governed by only the CDDL
@@ -448,6 +448,10 @@
                         <xsl:attribute name="name">testincludes</xsl:attribute>
                         <xsl:attribute name="default">**</xsl:attribute>
                     </attribute>
+                    <element>
+                        <xsl:attribute name="name">customize</xsl:attribute>
+                        <xsl:attribute name="optional">true</xsl:attribute>
+                    </element>
                     <sequential>
                         <junit>
                             <xsl:attribute name="showoutput">true</xsl:attribute>
@@ -459,6 +463,7 @@
                                 <xsl:attribute name="jvm">${platform.java}</xsl:attribute>
                             </xsl:if>
                             <batchtest todir="${{build.test.results.dir}}">
+                                <xsl:attribute name="unless">test.method</xsl:attribute>
                                 <xsl:call-template name="createFilesets">
                                     <xsl:with-param name="roots" select="/p:project/p:configuration/j2seproject3:data/j2seproject3:test-roots"/>
                                     <xsl:with-param name="includes">@{includes}</xsl:with-param>
@@ -466,6 +471,7 @@
                                     <xsl:with-param name="excludes">@{excludes}</xsl:with-param>
                                 </xsl:call-template>
                             </batchtest>
+                            <customize/>
                             <classpath>
                                 <path path="${{run.test.classpath}}"/>
                             </classpath>
@@ -574,6 +580,10 @@
                         <xsl:attribute name="name">customize</xsl:attribute>
                         <xsl:attribute name="optional">true</xsl:attribute>
                     </element>
+                    <element>
+                        <xsl:attribute name="name">classpath-prepend</xsl:attribute>
+                        <xsl:attribute name="optional">true</xsl:attribute>
+                    </element>
                     <sequential>
                         <java fork="true" classname="@{{classname}}">
                             <xsl:attribute name="dir">${work.dir}</xsl:attribute>
@@ -584,6 +594,7 @@
                             <jvmarg value="-Xrunjdwp:transport=${{debug-transport}},address=${{jpda.address}}"/>
                             <jvmarg line="${{run.jvmargs}}"/>
                             <classpath>
+                                <classpath-prepend/>
                                 <path path="@{{classpath}}"/>
                             </classpath>
                             <syspropertyset>
@@ -1236,11 +1247,51 @@
                 <mkdir dir="${{build.test.results.dir}}"/>
             </target>
             
-            <target name="-do-test-run-single">
+            <target name="-check-can-run-tests">
                 <xsl:attribute name="if">have.tests</xsl:attribute>
                 <xsl:attribute name="depends">init,compile-test-single,-pre-test-run-single</xsl:attribute>
+                <condition property="run.test.method">
+                    <isset property="test.method"/>
+                </condition>
+                <condition property="run.test.class">
+                    <not>
+                        <isset property="test.method"/>
+                    </not>
+                </condition>
+            </target>
+            
+            <target name="-do-test-run-single-class">
+                <xsl:attribute name="if">run.test.class</xsl:attribute>
+                <xsl:attribute name="depends">-check-can-run-tests</xsl:attribute>
                 <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
                 <j2seproject3:junit includes="${{test.includes}}" excludes=""/>
+            </target>
+
+            <target name="-do-test-run-single-method">
+                <xsl:attribute name="if">run.test.method</xsl:attribute>
+                <xsl:attribute name="depends">-check-can-run-tests</xsl:attribute>
+                <fail unless="test.class">Must also set test.class if test.method is specified</fail>
+                <fail message="Execution of a single test method is not supported by this version of Ant.">
+                    <condition>
+                        <not>
+                            <available classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultParser">
+                                <classpath path="${{run.test.classpath}}"/>
+                            </available>
+                        </not>
+                    </condition>
+                </fail>
+                <j2seproject3:junit>
+                    <customize>
+                        <test name="${{test.class}}">
+                            <xsl:attribute name="methods">${test.method}</xsl:attribute>
+                            <xsl:attribute name="todir">${build.test.results.dir}</xsl:attribute>
+                        </test>
+                    </customize>
+                </j2seproject3:junit>
+            </target>
+
+            <target name="-do-test-run-single">
+                <xsl:attribute name="depends">-do-test-run-single-method,-do-test-run-single-class</xsl:attribute>
             </target>
             
             <target name="-post-test-run-single">
@@ -1260,9 +1311,22 @@
                 =======================
             </xsl:comment>
             
-            <target name="-debug-start-debuggee-test">
+            <target name="-check-can-debug-tests">
                 <xsl:attribute name="if">have.tests</xsl:attribute>
                 <xsl:attribute name="depends">init,compile-test</xsl:attribute>
+                <condition property="debug.test.method">
+                    <isset property="test.method"/>
+                </condition>
+                <condition property="debug.test.class">
+                    <not>
+                        <isset property="test.method"/>
+                    </not>
+                </condition>
+            </target>
+            
+            <target name="-debug-start-debuggee-test-class">
+                <xsl:attribute name="if">debug.test.class</xsl:attribute>
+                <xsl:attribute name="depends">-check-can-debug-tests</xsl:attribute>
                 <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
                 <property name="test.report.file" location="${{build.test.results.dir}}/TEST-${{test.class}}.xml"/>
                 <delete file="${{test.report.file}}"/>
@@ -1280,6 +1344,54 @@
                         <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${{test.report.file}}"/>
                     </customize>
                 </j2seproject3:debug>
+            </target>
+
+            <target name="-debug-start-debuggee-test-method">
+                <xsl:attribute name="if">debug.test.method</xsl:attribute>
+                <xsl:attribute name="depends">-check-can-debug-tests</xsl:attribute>
+                <fail unless="test.class">Must also set test.class if test.method is specified</fail>
+                <fail message="Execution of a single test method is not supported by this version of Ant.">
+                    <condition>
+                        <not>
+                            <available classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultParser">
+                                <classpath>
+                                    <fileset>
+                                        <xsl:attribute name="dir">${ant.home}</xsl:attribute>
+                                        <xsl:attribute name="includes">patches/*.jar</xsl:attribute>
+                                    </fileset>
+                                    <path path="${{ant.home}}/lib/ant.jar:${{ant.home}}/lib/ant-junit.jar"/>
+                                </classpath>
+                            </available>
+                        </not>
+                    </condition>
+                </fail>
+                <property name="test.report.file" location="${{build.test.results.dir}}/TEST-${{test.class}}.xml"/>
+                <delete file="${{test.report.file}}"/>
+                <mkdir dir="${{build.test.results.dir}}"/>
+                <!--Ugly, puts ant and ant-junit to the test classpath, but there is probably no other solution how to run the XML formatter -->
+                <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${{ant.home}}/lib/ant.jar:${{ant.home}}/lib/ant-junit.jar:${{debug.test.classpath}}">
+                    <classpath-prepend>
+                        <fileset>
+                            <xsl:attribute name="dir">${ant.home}</xsl:attribute>
+                            <xsl:attribute name="includes">patches/*.jar</xsl:attribute>
+                        </fileset>
+                    </classpath-prepend>
+                    <customize>
+                        <syspropertyset>
+                            <propertyref prefix="test-sys-prop."/>
+                            <mapper type="glob" from="test-sys-prop.*" to="*"/>
+                        </syspropertyset>
+                        <arg value="${{test.class}}"/>
+                        <arg value="methods=${{test.method}}"/>
+                        <arg value="showoutput=true"/>
+                        <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+                        <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${{test.report.file}}"/>
+                    </customize>
+                </j2seproject3:debug>
+            </target>
+
+            <target name="-debug-start-debuggee-test">
+                <xsl:attribute name="depends">-debug-start-debuggee-test-method,-debug-start-debuggee-test-class</xsl:attribute>
             </target>
             
             <target name="-debug-start-debugger-test">