diff --git a/test/com/sun/jdi/EnumTest.java b/test/com/sun/jdi/EnumTest.java
index be06c0f4524e6b46581d4eb0a63c48120f60c118..51d3a976ad57956d2600dc308e882b0b5154e3d6 100644
--- a/test/com/sun/jdi/EnumTest.java
+++ b/test/com/sun/jdi/EnumTest.java
@@ -29,7 +29,7 @@
  *  @author jjh
  *
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
- *  @run compile -source 1.5 -target 1.5 -g EnumTest.java
+ *  @run compile -g EnumTest.java
  *  @run main EnumTest
  */
 import com.sun.jdi.*;
diff --git a/test/com/sun/jdi/GenericsTest.java b/test/com/sun/jdi/GenericsTest.java
index 2220dd7bbfc8a7eb8f651e4965675c50a2da050d..5156e9d8e0958944bb9c2240be42b7ab3ac9f3bf 100644
--- a/test/com/sun/jdi/GenericsTest.java
+++ b/test/com/sun/jdi/GenericsTest.java
@@ -29,7 +29,7 @@
  *  @author jjh
  *
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
- *  @run compile -source 1.5 -target 1.5 -g GenericsTest.java
+ *  @run compile -g GenericsTest.java
  *  @run main GenericsTest
  */
 import com.sun.jdi.*;
diff --git a/test/com/sun/jdi/JdbVarargsTest.sh b/test/com/sun/jdi/JdbVarargsTest.sh
index 72d9561f54ceb4879780375982eeeca7b8acf653..82e0b18e60e7b1c039acd7f61b9fdaef45f9fdf3 100644
--- a/test/com/sun/jdi/JdbVarargsTest.sh
+++ b/test/com/sun/jdi/JdbVarargsTest.sh
@@ -32,7 +32,6 @@
 #  @run shell JdbVarargsTest.sh
 
 classname=JdbVarargsTest
-compileOptions="-source 1.5 -target 1.5"
 createJavaFile()
 {
     cat <<EOF > $classname.java.1
diff --git a/test/com/sun/jdi/StepTest.java b/test/com/sun/jdi/StepTest.java
index 9c2344d09dbd21e6b86ab1a74a79c6ddfb9b9fa8..041507a8b9d7a9807e1e2f797bdeda7043104ef1 100644
--- a/test/com/sun/jdi/StepTest.java
+++ b/test/com/sun/jdi/StepTest.java
@@ -27,7 +27,7 @@
  *  @author Gordon Hirsch
  *
  *  @run build TestScaffold VMConnection TargetAdapter TargetListener
- *  @run compile -g -target 1.5 MethodCalls.java
+ *  @run compile -g MethodCalls.java
  *  @run compile -g MethodCallsReflection.java
  *  @run compile -g ControlFlow.java
  *  @run build StepTest
diff --git a/test/com/sun/jdi/UTF8Test.java b/test/com/sun/jdi/UTF8Test.java
index b7b286658940039879abfbc6f218ff1ebc064976..4396770e0935cc2ef3267f00b95b78a715c14cde 100644
--- a/test/com/sun/jdi/UTF8Test.java
+++ b/test/com/sun/jdi/UTF8Test.java
@@ -29,7 +29,7 @@
  *  @author jjh
  *
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
- *  @run compile -g -source 1.5 UTF8Test.java
+ *  @run compile -g UTF8Test.java
  *  @run main UTF8Test
  */
 
diff --git a/test/com/sun/jdi/VarargsTest.java b/test/com/sun/jdi/VarargsTest.java
index ed4323e2d4f2b71c31c6a71cdbeb2afd9dcbb09b..1ea51ad245b28416ca662a12cea5590b8bd5c35e 100644
--- a/test/com/sun/jdi/VarargsTest.java
+++ b/test/com/sun/jdi/VarargsTest.java
@@ -29,7 +29,7 @@
  *  @author jjh
  *
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
- *  @run compile -g -source 1.5 -target 1.5 VarargsTest.java
+ *  @run compile -g VarargsTest.java
  *  @run main VarargsTest
  */
 import com.sun.jdi.*;