diff --git a/src/etc/testcases/core/antclassloader.xml b/src/etc/testcases/core/antclassloader.xml
index 5e138dae8..cafc823b9 100644
--- a/src/etc/testcases/core/antclassloader.xml
+++ b/src/etc/testcases/core/antclassloader.xml
@@ -56,8 +56,13 @@
 package org.example;
 public class Foo {}
 ]]></echo>
+      <available property="jdk1.6+" classname="java.net.CookieStore"/>
+      <condition property="source" value="6">
+        <isset property="jdk1.6+"/>
+      </condition>
+      <property name="source" value="1.4"/>
       <javac srcdir="${tmp.dir.nonascii}"
-             destdir="${tmp.dir.nonascii}" source="1.4"/>
+             destdir="${tmp.dir.nonascii}" source="${source}"/>
       <tempfile property="test.jar" destdir="${tmp.dir}" suffix="test" prefix=".jar" deleteonexit="true"/>
       <jar destfile="${test.jar}">
         <fileset dir="${tmp.dir.nonascii}" includes="**/*.class"/>
diff --git a/src/etc/testcases/taskdefs/optional/junit.xml b/src/etc/testcases/taskdefs/optional/junit.xml
index d976abf43..82f2d445d 100644
--- a/src/etc/testcases/taskdefs/optional/junit.xml
+++ b/src/etc/testcases/taskdefs/optional/junit.xml
@@ -339,7 +339,13 @@
       public void bad() {
       throw new RuntimeException("failed");}
       }</echo>
-    <javac srcdir="${tmp.dir}" destdir="${tmp.dir}" includes="T1.java,T2.java" source="5">
+    <available property="jdk1.6+" classname="java.net.CookieStore"/>
+    <condition property="source" value="6">
+      <isset property="jdk1.6+"/>
+    </condition>
+    <property name="source" value="1.4"/>
+    <javac srcdir="${tmp.dir}" destdir="${tmp.dir}" includes="T1.java,T2.java"
+           source="${source}">
 
     </javac>
     <junit fork="false" printsummary="true" haltonerror="true">