diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
index f97a572b1..add82be07 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
@@ -67,6 +67,7 @@ import org.apache.tools.ant.taskdefs.LogStreamHandler;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.util.JavaEnvUtils;
 
 /**
  *  Invokes the ANTLR Translator generator on a grammar file.
@@ -110,7 +111,7 @@ public class ANTLR extends Task {
     private File workingdir = null;
 
     public ANTLR() {
-        commandline.setVm("java");
+        commandline.setVm(JavaEnvUtils.getJdkExecutable("java"));
         commandline.setClassname("antlr.Tool");
     }
 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
index 913bbc2e5..aab1a69a9 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
@@ -108,7 +108,7 @@ public class ExecuteWatchdogTest extends TestCase {
 
     private Process getProcess(int timetorun) throws Exception {
         String[] cmdArray = {
-            "java", "-classpath", TEST_CLASSPATH,
+            JavaEnvUtils.getJdkExecutable("java"), "-classpath", TEST_CLASSPATH,
             TimeProcess.class.getName(), String.valueOf(timetorun)
         };
         //System.out.println("Testing with classpath: " + System.getProperty("java.class.path"));