diff --git a/jdk/make/java/java/Makefile b/jdk/make/java/java/Makefile
index 8755a4c3a6e..b0e40530f4e 100644
--- a/jdk/make/java/java/Makefile
+++ b/jdk/make/java/java/Makefile
@@ -390,7 +390,7 @@ clean::
 LOCALES_GEN_SH = localelist.sh
 
 $(GENSRCDIR)/sun/util/CoreResourceBundleControl.java: \
-	$(SHARE_SRC)/classes/sun/util/CoreResourceBundleControl-XLocales.java $(LOCALES_GEN_SH)
+	$(SHARE_SRC)/classes/sun/util/CoreResourceBundleControl-XLocales.java.template $(LOCALES_GEN_SH)
 	@$(prep-target) 
 	NAWK="$(NAWK)" SED="$(SED)" $(SH) $(LOCALES_GEN_SH) "$(JRE_NONEXIST_LOCALES)" \
 		$< $@ 
diff --git a/jdk/make/java/java/genlocales.gmk b/jdk/make/java/java/genlocales.gmk
index bda003b9ce1..3adb769490d 100644
--- a/jdk/make/java/java/genlocales.gmk
+++ b/jdk/make/java/java/genlocales.gmk
@@ -68,7 +68,7 @@ NonEuro_Resources_properties := $(FILES_compiled_properties)
 FILES_java := $(FILES_java_orig)
 FILES_compiled_properties := $(FILES_compiled_properties_orig)
 
-LocaleDataMetaInfo_Src=$(SHARE_SRC)/classes/sun/util/LocaleDataMetaInfo-XLocales.java
+LocaleDataMetaInfo_Src=$(SHARE_SRC)/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template
 LocaleDataMetaInfo_Dest=$(GENSRCDIR)/sun/util/LocaleDataMetaInfo.java
 LOCALEGEN_SH=localegen.sh
 RESOURCE_NAMES="FormatData CollationData TimeZoneNames LocaleNames CurrencyNames CalendarData"
diff --git a/jdk/make/java/java/localegen.sh b/jdk/make/java/java/localegen.sh
index 8f79eaebb88..a21c515dc1a 100644
--- a/jdk/make/java/java/localegen.sh
+++ b/jdk/make/java/java/localegen.sh
@@ -27,7 +27,7 @@
 
 #
 # This script is to generate the supported locale list string and replace the
-# LocaleDataMetaInfo-XLocales.java in <ws>/src/share/classes/sun/util
+# LocaleDataMetaInfo-XLocales.java.template in <ws>/src/share/classes/sun/util
 # 
 # SORT, NAWK & SED is passed in as environment variables.
 #
diff --git a/jdk/make/java/nio/Makefile b/jdk/make/java/nio/Makefile
index e0cb40839e8..455d7529f67 100644
--- a/jdk/make/java/nio/Makefile
+++ b/jdk/make/java/nio/Makefile
@@ -834,7 +834,7 @@ $(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE)
 GENCSSRC = $(BUILDDIR)/tools/CharsetMapping
 CHARSETMAPPING_JARFILE = $(BUILDTOOLJARDIR)/charsetmapping.jar
 
-$(FILES_gensbcs_out): $(GENCSSRC)/SingleByte-X.java $(GENCSSRC)/sbcs
+$(FILES_gensbcs_out): $(GENCSSRC)/SingleByte-X.java.template $(GENCSSRC)/sbcs
 	@$(prep-target)
 	$(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSSRC) $(SCS_GEN) sbcs
 
diff --git a/jdk/make/netbeans/README b/jdk/make/netbeans/README
index 9c713190034..8f68dce0ee5 100644
--- a/jdk/make/netbeans/README
+++ b/jdk/make/netbeans/README
@@ -411,7 +411,7 @@ Creating your own NetBeans project
             java/util/regex/,\
             java/util/spi/,\
             java/util/zip/,\
-            **/*-XLocales.java
+            **/*-XLocales.java.template
         jtreg.tests=\
             java/util/**/*Collection/ \
             java/util/**/*Map/ \
diff --git a/jdk/make/sun/nio/Makefile b/jdk/make/sun/nio/Makefile
index e83c6f1f36d..4b46a1fb76d 100644
--- a/jdk/make/sun/nio/Makefile
+++ b/jdk/make/sun/nio/Makefile
@@ -82,7 +82,9 @@ $(FILES_DAT): $(FILES_MAP)
 		$(FILES_MAP) $(FILES_DAT) sjis0213
 
 
-$(FILES_genout_extcs): $(GENCSDATASRC)/SingleByte-X.java  $(GENCSDATASRC)/DoubleByte-X.java \
+$(FILES_genout_extcs): \
+                $(GENCSDATASRC)/SingleByte-X.java.template  \
+		$(GENCSDATASRC)/DoubleByte-X.java.template \
 		$(GENCSDATASRC)/extsbcs $(GENCSDATASRC)/dbcs
 	@$(prep-target)
 	$(RM) -r $(GENCSEXT)
diff --git a/jdk/make/tools/CharsetMapping/DoubleByte-X.java b/jdk/make/tools/CharsetMapping/DoubleByte-X.java.template
similarity index 100%
rename from jdk/make/tools/CharsetMapping/DoubleByte-X.java
rename to jdk/make/tools/CharsetMapping/DoubleByte-X.java.template
diff --git a/jdk/make/tools/CharsetMapping/SingleByte-X.java b/jdk/make/tools/CharsetMapping/SingleByte-X.java.template
similarity index 100%
rename from jdk/make/tools/CharsetMapping/SingleByte-X.java
rename to jdk/make/tools/CharsetMapping/SingleByte-X.java.template
diff --git a/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java b/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java
index f38e759c456..27dc8719b95 100644
--- a/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java
+++ b/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java
@@ -63,7 +63,7 @@ public class GenerateDBCS {
             int    b2Min    = toInteger(fields[8]);
             int    b2Max    = toInteger(fields[9]);
             System.out.printf("%s,%s,%s,%b,%s%n", clzName, csName, hisName, isASCII, pkgName);
-            genClass(args[0], args[1], "DoubleByte-X.java",
+            genClass(args[0], args[1], "DoubleByte-X.java.template",
                     clzName, csName, hisName, pkgName,
                     isASCII, type,
                     b1Min, b1Max, b2Min, b2Max);
diff --git a/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java b/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java
index 8a57a6521bc..cb6496e0a99 100644
--- a/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java
+++ b/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java
@@ -55,7 +55,7 @@ public class GenerateSBCS {
             String pkgName  = fields[4];
             System.out.printf("%s,%s,%s,%b,%s%n", clzName, csName, hisName, isASCII, pkgName);
 
-            genClass(args[0], args[1], "SingleByte-X.java",
+            genClass(args[0], args[1], "SingleByte-X.java.template",
                      clzName, csName, hisName, pkgName, isASCII);
         }
     }
diff --git a/jdk/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java b/jdk/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template
similarity index 100%
rename from jdk/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java
rename to jdk/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template
diff --git a/jdk/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java b/jdk/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template
similarity index 100%
rename from jdk/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java
rename to jdk/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template
diff --git a/jdk/test/Makefile b/jdk/test/Makefile
index b6fee3c59e2..25f0dc1ed6f 100644
--- a/jdk/test/Makefile
+++ b/jdk/test/Makefile
@@ -282,11 +282,23 @@ STATS_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/$(STATS_TXT_NAME)
 RUNLIST   = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/runlist.txt
 PASSLIST  = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/passlist.txt
 FAILLIST  = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/faillist.txt
+EXITCODE  = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/exitcode.txt
+
+TESTEXIT = \
+  if [ ! -s $(EXITCODE) ] ; then \
+    $(ECHO) "ERROR: EXITCODE file not filled in."; \
+    $(ECHO) "1" > $(EXITCODE); \
+  fi ; \
+  testExitCode=`$(CAT) $(EXITCODE)`; \
+  $(ECHO) "EXIT CODE: $${testExitCode}"; \
+  exit ${testExitCode}
+
 BUNDLE_UP_AND_EXIT = \
 ( \
-  exitCode=$$? && \
+  jtregExitCode=$$? && \
   _summary="$(SUMMARY_TXT)"; \
-  $(RM) -f $(STATS_TXT) $(RUNLIST) $(PASSLIST) $(FAILLIST); \
+  $(RM) -f $(STATS_TXT) $(RUNLIST) $(PASSLIST) $(FAILLIST) $(EXITCODE); \
+  $(ECHO) "$${jtregExitCode}" > $(EXITCODE); \
   if [ -r "$${_summary}" ] ; then \
     $(ECHO) "Summary: $${_summary}" > $(STATS_TXT); \
     $(EXPAND) $${_summary} | $(EGREP) -v ' Not run\.' > $(RUNLIST); \
@@ -297,10 +309,13 @@ BUNDLE_UP_AND_EXIT = \
       $(EGREP) ' Error\.' $(RUNLIST); \
       $(EGREP) -v ' Passed\.' $(RUNLIST) ) \
       | $(SORT) | $(UNIQ) > $(FAILLIST); \
-    if [ $${exitCode} != 0 -o -s $(FAILLIST) ] ; then \
+    if [ $${jtregExitCode} != 0 -o -s $(FAILLIST) ] ; then \
       $(EXPAND) $(FAILLIST) \
         | $(CUT) -d' ' -f1 \
         | $(SED) -e 's@^@FAILED: @' >> $(STATS_TXT); \
+      if [ $${jtregExitCode} = 0 ] ; then \
+        jtregExitCode=1; \
+      fi; \
     fi; \
     runc="`$(CAT) $(RUNLIST)      | $(WC) -l | $(AWK) '{print $$1;}'`"; \
     passc="`$(CAT) $(PASSLIST)    | $(WC) -l | $(AWK) '{print $$1;}'`"; \
@@ -312,8 +327,8 @@ BUNDLE_UP_AND_EXIT = \
     $(ECHO) "Missing file: $${_summary}" >> $(STATS_TXT); \
   fi; \
   $(CAT) $(STATS_TXT); \
-  $(ZIP_UP_RESULTS) && $(KILL_DISPLAY) && \
-  exit $${exitCode} \
+  $(ZIP_UP_RESULTS) && $(KILL_DISPLAY) ; \
+  $(TESTEXIT) \
 )
 
 ################################################################
@@ -598,7 +613,7 @@ jtreg_tests: prep $(PRODUCT_HOME) $(JTREG) $(EXCLUDELIST)
               $(JTREG_TEST_OPTIONS)                                          \
               $(TESTDIRS)                                                    \
 	  ) ; $(BUNDLE_UP_AND_EXIT)                                          \
-	) 2>&1 | $(TEE) $(ABS_TEST_OUTPUT_DIR)/output.txt
+	) 2>&1 | $(TEE) $(ABS_TEST_OUTPUT_DIR)/output.txt ; $(TESTEXIT)
 
 PHONY_LIST += jtreg_tests
 
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 1867d67a218..2edcfd4d595 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -1099,6 +1099,14 @@ sun/tools/jps/jps-lm.sh						generic-all
 sun/tools/jps/jps-Vvml_2.sh					generic-all
 sun/tools/jps/jps-m_2.sh					generic-all
 
+# Fails on OpenSolaris "Could not synchronize with target"
+sun/tools/jps/jps-Defaults.sh					generic-all
+sun/tools/jps/jps-V_2.sh					generic-all
+sun/tools/jps/jps-Vm_2.sh					generic-all
+sun/tools/jps/jps-Vvm.sh					generic-all
+sun/tools/jps/jps-Vvml.sh					generic-all
+sun/tools/jps/jps-m.sh						generic-all
+
 # Server name error, port 2098 problem?
 sun/tools/jstatd/jstatdServerName.sh				generic-all
 
diff --git a/jdk/test/com/sun/jdi/BadHandshakeTest.java b/jdk/test/com/sun/jdi/BadHandshakeTest.java
index 6601b427230..e03aeb1001c 100644
--- a/jdk/test/com/sun/jdi/BadHandshakeTest.java
+++ b/jdk/test/com/sun/jdi/BadHandshakeTest.java
@@ -110,9 +110,10 @@ public class BadHandshakeTest {
         String exe =   System.getProperty("java.home")
                      + File.separator + "bin" + File.separator;
         String arch = System.getProperty("os.arch");
-        if (arch.equals("sparcv9")) {
+        String osname = System.getProperty("os.name");
+        if (osname.equals("SunOS") && arch.equals("sparcv9")) {
             exe += "sparcv9/java";
-        } else if (arch.equals("amd64")) {
+        } else if (osname.equals("SunOS") && arch.equals("amd64")) {
             exe += "amd64/java";
         } else {
             exe += "java";
diff --git a/jdk/test/com/sun/jdi/DoubleAgentTest.java b/jdk/test/com/sun/jdi/DoubleAgentTest.java
index f76b17c154e..bb06b89b9e2 100644
--- a/jdk/test/com/sun/jdi/DoubleAgentTest.java
+++ b/jdk/test/com/sun/jdi/DoubleAgentTest.java
@@ -92,9 +92,10 @@ public class DoubleAgentTest {
         String exe =   System.getProperty("java.home")
                      + File.separator + "bin" + File.separator;
         String arch = System.getProperty("os.arch");
-        if (arch.equals("sparcv9")) {
+        String osname = System.getProperty("os.name");
+        if (osname.equals("SunOS") && arch.equals("sparcv9")) {
             exe += "sparcv9/java";
-        } else if (arch.equals("amd64")) {
+        } else if (osname.equals("SunOS") && arch.equals("amd64")) {
             exe += "amd64/java";
         } else {
             exe += "java";
diff --git a/jdk/test/com/sun/jdi/ExclusiveBind.java b/jdk/test/com/sun/jdi/ExclusiveBind.java
index 0f56d072e2d..c3690e62e40 100644
--- a/jdk/test/com/sun/jdi/ExclusiveBind.java
+++ b/jdk/test/com/sun/jdi/ExclusiveBind.java
@@ -99,9 +99,10 @@ public class ExclusiveBind {
         String exe = System.getProperty("java.home") + File.separator + "bin" +
             File.separator;
         String arch = System.getProperty("os.arch");
-        if (arch.equals("sparcv9")) {
+        String osname = System.getProperty("os.name");
+        if (osname.equals("SunOS") && arch.equals("sparcv9")) {
             exe += "sparcv9/java";
-        } else if (arch.equals("amd64")) {
+        } else if (osname.equals("SunOS") && arch.equals("amd64")) {
             exe += "amd64/java";
         } else {
             exe += "java";
diff --git a/jdk/test/com/sun/jdi/RunToExit.java b/jdk/test/com/sun/jdi/RunToExit.java
index 9495e451669..c5f11f724a2 100644
--- a/jdk/test/com/sun/jdi/RunToExit.java
+++ b/jdk/test/com/sun/jdi/RunToExit.java
@@ -115,9 +115,10 @@ public class RunToExit {
         String exe =   System.getProperty("java.home")
                      + File.separator + "bin" + File.separator;
         String arch = System.getProperty("os.arch");
-        if (arch.equals("sparcv9")) {
+        String osname = System.getProperty("os.name");
+        if (osname.equals("SunOS") && arch.equals("sparcv9")) {
             exe += "sparcv9/java";
-        } else if (arch.equals("amd64")) {
+        } else if (osname.equals("SunOS") && arch.equals("amd64")) {
             exe += "amd64/java";
         } else {
             exe += "java";
diff --git a/jdk/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java b/jdk/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java
index 858cbc71187..82bc3b07b96 100644
--- a/jdk/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java
+++ b/jdk/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java
@@ -145,9 +145,10 @@ public class SimpleLaunchingConnector implements LaunchingConnector {
         String exe = System.getProperty("java.home") + File.separator + "bin" +
             File.separator;
         String arch = System.getProperty("os.arch");
-        if (arch.equals("sparcv9")) {
+        String osname = System.getProperty("os.name");
+        if (osname.equals("SunOS") && arch.equals("sparcv9")) {
             exe += "sparcv9/java";
-        } else if (arch.equals("amd64")) {
+        } else if (osname.equals("SunOS") && arch.equals("amd64")) {
             exe += "amd64/java";
         } else {
             exe += "java";
diff --git a/jdk/test/demo/jvmti/hprof/CpuOldTest.java b/jdk/test/demo/jvmti/hprof/CpuOldTest.java
index 378083a2561..252aa05be16 100644
--- a/jdk/test/demo/jvmti/hprof/CpuOldTest.java
+++ b/jdk/test/demo/jvmti/hprof/CpuOldTest.java
@@ -26,7 +26,7 @@
  * @bug 5012882 6299047
  * @summary Test jvmti hprof
  *
- * @compile -source 1.5 -g HelloWorld.java ../DemoRun.java
+ * @compile -g HelloWorld.java ../DemoRun.java
  * @build CpuOldTest
  * @run main CpuOldTest HelloWorld
  */
diff --git a/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java b/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java
index 0c5317184ec..d06d4cff332 100644
--- a/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java
+++ b/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java
@@ -26,7 +26,7 @@
  * @bug 5012882
  * @summary Test jvmti hprof
  *
- * @compile -source 1.5 -g:lines HelloWorld.java ../DemoRun.java
+ * @compile -g:lines HelloWorld.java ../DemoRun.java
  * @build CpuSamplesTest
  * @run main CpuSamplesTest HelloWorld
  */
diff --git a/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java b/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java
index 5a1b7d08b37..63cfcb3e5c4 100644
--- a/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java
+++ b/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java
@@ -26,7 +26,7 @@
  * @bug 5097131 6299047
  * @summary Test jvmti hprof
  *
- * @compile -source 1.5 -g HelloWorld.java DefineClass.java ../DemoRun.java
+ * @compile -g HelloWorld.java DefineClass.java ../DemoRun.java
  * @build CpuTimesDefineClassTest
  * @run main CpuTimesDefineClassTest DefineClass
  *
diff --git a/jdk/test/demo/jvmti/hprof/CpuTimesTest.java b/jdk/test/demo/jvmti/hprof/CpuTimesTest.java
index 7a9d10e8159..a99d384494b 100644
--- a/jdk/test/demo/jvmti/hprof/CpuTimesTest.java
+++ b/jdk/test/demo/jvmti/hprof/CpuTimesTest.java
@@ -26,7 +26,7 @@
  * @bug 5012882 6299047
  * @summary Test jvmti hprof
  *
- * @compile -source 1.5 -g HelloWorld.java ../DemoRun.java
+ * @compile -g HelloWorld.java ../DemoRun.java
  * @build CpuTimesTest
  * @run main CpuTimesTest HelloWorld
  */
diff --git a/jdk/test/demo/jvmti/hprof/HeapAllTest.java b/jdk/test/demo/jvmti/hprof/HeapAllTest.java
index ce4431f5032..8de8714a02c 100644
--- a/jdk/test/demo/jvmti/hprof/HeapAllTest.java
+++ b/jdk/test/demo/jvmti/hprof/HeapAllTest.java
@@ -26,7 +26,7 @@
  * @bug 5012882 6299047
  * @summary Test jvmti hprof
  *
- * @compile -source 1.5 -g HelloWorld.java ../DemoRun.java
+ * @compile -g HelloWorld.java ../DemoRun.java
  * @build HeapAllTest
  * @run main HeapAllTest HelloWorld
  */
diff --git a/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java b/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java
index 5f4f7b92b33..1d3366cfd9f 100644
--- a/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java
+++ b/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java
@@ -26,7 +26,7 @@
  * @bug 4965057 6313381
  * @summary Test jvmti hprof format=b
  *
- * @compile -source 1.5 -g:source HelloWorld.java ../DemoRun.java
+ * @compile -g:source HelloWorld.java ../DemoRun.java
  * @build HeapBinaryFormatTest
  * @run main HeapBinaryFormatTest HelloWorld
  */
diff --git a/jdk/test/demo/jvmti/hprof/HeapDumpTest.java b/jdk/test/demo/jvmti/hprof/HeapDumpTest.java
index 1faca7ee6a9..01cce608313 100644
--- a/jdk/test/demo/jvmti/hprof/HeapDumpTest.java
+++ b/jdk/test/demo/jvmti/hprof/HeapDumpTest.java
@@ -26,7 +26,7 @@
  * @bug 5012882 6299047
  * @summary Test jvmti hprof
  *
- * @compile -source 1.5 -g:source HelloWorld.java ../DemoRun.java
+ * @compile -g:source HelloWorld.java ../DemoRun.java
  * @build HeapDumpTest
  * @run main HeapDumpTest HelloWorld
  */
diff --git a/jdk/test/demo/jvmti/hprof/HeapSitesTest.java b/jdk/test/demo/jvmti/hprof/HeapSitesTest.java
index 31a3d7ef02d..c0205e23776 100644
--- a/jdk/test/demo/jvmti/hprof/HeapSitesTest.java
+++ b/jdk/test/demo/jvmti/hprof/HeapSitesTest.java
@@ -26,7 +26,7 @@
  * @bug 5012882 6299047
  * @summary Test jvmti hprof
  *
- * @compile -source 1.5 -g:vars HelloWorld.java ../DemoRun.java
+ * @compile -g:vars HelloWorld.java ../DemoRun.java
  * @build HeapSitesTest
  * @run main HeapSitesTest HelloWorld
  */
diff --git a/jdk/test/demo/jvmti/hprof/OptionsTest.java b/jdk/test/demo/jvmti/hprof/OptionsTest.java
index eae8276fcf5..e1cac9ccd56 100644
--- a/jdk/test/demo/jvmti/hprof/OptionsTest.java
+++ b/jdk/test/demo/jvmti/hprof/OptionsTest.java
@@ -26,7 +26,7 @@
  * @bug 5083441 6299047
  * @summary Test jvmti hprof
  *
- * @compile -source 1.5 -g:lines HelloWorld.java ../DemoRun.java
+ * @compile -g:lines HelloWorld.java ../DemoRun.java
  * @build OptionsTest
  * @run main OptionsTest HelloWorld
  */
diff --git a/jdk/test/java/io/Serializable/enum/array/Test.java b/jdk/test/java/io/Serializable/enum/array/Test.java
index 705de3a44df..95d9cac890d 100644
--- a/jdk/test/java/io/Serializable/enum/array/Test.java
+++ b/jdk/test/java/io/Serializable/enum/array/Test.java
@@ -25,9 +25,6 @@
  * @bug 4838379
  * @summary Verify that serialization of enum constant arrays functions
  *          properly.
- *
- * @compile -source 1.5 Test.java
- * @run main Test
  */
 
 import java.io.*;
diff --git a/jdk/test/java/io/Serializable/enum/badResolve/Write.java b/jdk/test/java/io/Serializable/enum/badResolve/Write.java
index 24e0242d5fa..dcdd5fa5aa6 100644
--- a/jdk/test/java/io/Serializable/enum/badResolve/Write.java
+++ b/jdk/test/java/io/Serializable/enum/badResolve/Write.java
@@ -26,10 +26,10 @@
  * @summary Verify that enum classes present in a serialization stream cannot
  *          be resolved by the receiver to non-enum classes, and vice-versa.
  *
- * @compile -source 1.5 Write.java
+ * @compile Write.java
  * @run main Write
  * @clean Write
- * @compile -source 1.5 Read.java
+ * @compile Read.java
  * @run main Read
  * @clean Read
  */
diff --git a/jdk/test/java/io/Serializable/enum/basic/Test.java b/jdk/test/java/io/Serializable/enum/basic/Test.java
index b8677750bb9..5e8e8679c5a 100644
--- a/jdk/test/java/io/Serializable/enum/basic/Test.java
+++ b/jdk/test/java/io/Serializable/enum/basic/Test.java
@@ -25,9 +25,6 @@
  * @bug 4838379
  * @summary Verify that basic serialization of non-specialized enum constants
  *          functions properly.
- *
- * @compile -source 1.5 Test.java
- * @run main Test
  */
 
 import java.io.*;
diff --git a/jdk/test/java/io/Serializable/enum/classObject/Test.java b/jdk/test/java/io/Serializable/enum/classObject/Test.java
index e0f6ea2bd96..8d341c04470 100644
--- a/jdk/test/java/io/Serializable/enum/classObject/Test.java
+++ b/jdk/test/java/io/Serializable/enum/classObject/Test.java
@@ -25,9 +25,6 @@
  * @bug 4838379
  * @summary Verify that serialization of Class objects for enum types works
  *          properly.
- *
- * @compile -source 1.5 Test.java
- * @run main Test
  */
 
 import java.io.*;
diff --git a/jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java b/jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java
index 18dcfb56854..349125cc9e5 100644
--- a/jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java
+++ b/jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java
@@ -26,10 +26,10 @@
  * @summary Verify that serialization of enum constants that are instances of
  *          constant-specific subclasses functions properly.
  *
- * @compile -source 1.5 Write.java
+ * @compile Write.java
  * @run main Write
  * @clean Write
- * @compile -source 1.5 Read.java
+ * @compile Read.java
  * @run main Read
  * @clean Read
  */
diff --git a/jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java b/jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java
index 2780a283e57..d5326af0d2e 100644
--- a/jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java
+++ b/jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java
@@ -25,9 +25,6 @@
  * @bug 4838379
  * @summary Verify that serialVersionUID and serialPersistentFields
  *          declarations made by enum types and constants are ignored.
- *
- * @compile -source 1.5 Test.java
- * @run main Test
  */
 
 import java.io.*;
diff --git a/jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java b/jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java
index 39bde6e255b..a1f9bbc6c74 100644
--- a/jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java
+++ b/jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java
@@ -25,9 +25,6 @@
  * @bug 4838379
  * @summary Verify that custom serialization methods defined by enum types are
  *          not invoked during serialization or deserialization.
- *
- * @compile -source 1.5 Test.java
- * @run main Test
  */
 
 import java.io.*;
diff --git a/jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java b/jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java
index f050cd964de..7197581700b 100644
--- a/jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java
+++ b/jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java
@@ -26,9 +26,6 @@
  * @summary Verify that TC_OBJECT followed by a class descriptor for an enum
  *          class results in an InvalidClassException, as does TC_ENUM followed
  *          by a class descriptor for a non-enum class.
- *
- * @compile -source 1.5 Test.java
- * @run main Test
  */
 
 import java.io.*;
diff --git a/jdk/test/java/io/Serializable/enum/missingConstant/Write.java b/jdk/test/java/io/Serializable/enum/missingConstant/Write.java
index 2939520636a..fb66b4ce4da 100644
--- a/jdk/test/java/io/Serializable/enum/missingConstant/Write.java
+++ b/jdk/test/java/io/Serializable/enum/missingConstant/Write.java
@@ -26,10 +26,10 @@
  * @summary Verify that deserialization of an enum constant that does not exist
  *          on the receiving side results in an InvalidObjectException.
  *
- * @compile -source 1.5 Write.java
+ * @compile Write.java
  * @run main Write
  * @clean Write
- * @compile -source 1.5 Read.java
+ * @compile Read.java
  * @run main Read
  * @clean Read
  */
diff --git a/jdk/test/java/io/Serializable/enum/unshared/Test.java b/jdk/test/java/io/Serializable/enum/unshared/Test.java
index c4bdde9bc01..036e6e8b8ac 100644
--- a/jdk/test/java/io/Serializable/enum/unshared/Test.java
+++ b/jdk/test/java/io/Serializable/enum/unshared/Test.java
@@ -25,9 +25,6 @@
  * @bug 4838379
  * @summary Verify that unshared write and read operations work properly with
  *          enum constants.
- *
- * @compile -source 1.5 Test.java
- * @run main Test
  */
 
 import java.io.*;
diff --git a/jdk/test/java/lang/Boolean/MakeBooleanComparable.java b/jdk/test/java/lang/Boolean/MakeBooleanComparable.java
index b84a4a27f59..21840de3924 100644
--- a/jdk/test/java/lang/Boolean/MakeBooleanComparable.java
+++ b/jdk/test/java/lang/Boolean/MakeBooleanComparable.java
@@ -26,9 +26,6 @@
  * @bug     4329937
  * @summary Basic test for making Boolean implement Comparable
  * @author  Josh Bloch
- *
- * @compile -source 1.5 MakeBooleanComparable.java
- * @run main MakeBooleanComparable
  */
 
 import java.util.*;
diff --git a/jdk/test/java/lang/Class/Cast.java b/jdk/test/java/lang/Class/Cast.java
index 0f57c221c46..ec413f044e5 100644
--- a/jdk/test/java/lang/Class/Cast.java
+++ b/jdk/test/java/lang/Class/Cast.java
@@ -25,9 +25,6 @@
  * @test
  * @bug 4881275
  * @summary (reflect) Class.cast() - typesafe cast desired
- *
- * @compile -source 1.5 Cast.java
- * @run main Cast
  */
 
 public class Cast {
diff --git a/jdk/test/java/lang/Class/IsEnum.java b/jdk/test/java/lang/Class/IsEnum.java
index 1b4ccb70511..08d1e58d78b 100644
--- a/jdk/test/java/lang/Class/IsEnum.java
+++ b/jdk/test/java/lang/Class/IsEnum.java
@@ -26,8 +26,6 @@
  * @bug 4891872 4989735 4990789 5020490
  * @summary Check isEnum() method
  * @author Joseph D. Darcy
- * @compile -source 1.5 IsEnum.java
- * @run main IsEnum
  */
 
 import java.lang.annotation.*;
diff --git a/jdk/test/java/lang/Class/asSubclass/BasicUnit.java b/jdk/test/java/lang/Class/asSubclass/BasicUnit.java
index 68cf1c36bfd..e9e8b68e853 100644
--- a/jdk/test/java/lang/Class/asSubclass/BasicUnit.java
+++ b/jdk/test/java/lang/Class/asSubclass/BasicUnit.java
@@ -27,7 +27,7 @@
  * @summary please add a typesafe cast for Class<?> types
  * @author gafter
  *
- * @compile -Xlint:unchecked -Werror -source 1.5 BasicUnit.java
+ * @compile -Xlint:unchecked -Werror BasicUnit.java
  * @run main BasicUnit
  */
 
diff --git a/jdk/test/java/lang/ClassLoader/Assert.sh b/jdk/test/java/lang/ClassLoader/Assert.sh
index 4744defce37..95dd51f1465 100644
--- a/jdk/test/java/lang/ClassLoader/Assert.sh
+++ b/jdk/test/java/lang/ClassLoader/Assert.sh
@@ -47,7 +47,7 @@ cp ${TESTSRC}/Assert.java .
 cp -R ${TESTSRC}/package1 .
 cp -R ${TESTSRC}/package2 .
 
-${TESTJAVA}/bin/javac -source 1.4 Assert.java 
+${TESTJAVA}/bin/javac Assert.java 
 
 ${TESTJAVA}/bin/java Assert
 
diff --git a/jdk/test/java/lang/Integer/BitTwiddle.java b/jdk/test/java/lang/Integer/BitTwiddle.java
index 4904ea5aa3d..35d61efd3a5 100644
--- a/jdk/test/java/lang/Integer/BitTwiddle.java
+++ b/jdk/test/java/lang/Integer/BitTwiddle.java
@@ -26,9 +26,6 @@
  * @bug     4495754
  * @summary Basic test for int bit twiddling
  * @author  Josh Bloch
- *
- * @compile -source 1.5 BitTwiddle.java
- * @run main BitTwiddle
  */
 
 import java.util.Random;
diff --git a/jdk/test/java/lang/Long/BitTwiddle.java b/jdk/test/java/lang/Long/BitTwiddle.java
index fb1affd41dd..eefa9e83282 100644
--- a/jdk/test/java/lang/Long/BitTwiddle.java
+++ b/jdk/test/java/lang/Long/BitTwiddle.java
@@ -26,9 +26,6 @@
  * @bug     4495754
  * @summary Basic test for long bit twiddling
  * @author  Josh Bloch
- *
- * @compile -source 1.5 BitTwiddle.java
- * @run main BitTwiddle
  */
 
 import java.util.Random;
diff --git a/jdk/test/java/lang/Math/Atan2Tests.java b/jdk/test/java/lang/Math/Atan2Tests.java
index 0660ff3744c..ed81283b36d 100644
--- a/jdk/test/java/lang/Math/Atan2Tests.java
+++ b/jdk/test/java/lang/Math/Atan2Tests.java
@@ -25,8 +25,6 @@
  * @test
  * @bug 4984407
  * @summary Tests for {Math, StrictMath}.atan2
- * @compile -source 1.5 Atan2Tests.java
- * @run main Atan2Tests
  * @author Joseph D. Darcy
  */
 
diff --git a/jdk/test/java/lang/Math/IeeeRecommendedTests.java b/jdk/test/java/lang/Math/IeeeRecommendedTests.java
index 4123451ed5d..f35d76ef3b8 100644
--- a/jdk/test/java/lang/Math/IeeeRecommendedTests.java
+++ b/jdk/test/java/lang/Math/IeeeRecommendedTests.java
@@ -26,8 +26,6 @@
  * @bug 4860891 4826732 4780454 4939441 4826652
  * @summary Tests for IEEE 754[R] recommended functions and similar methods
  * @author Joseph D. Darcy
- * @compile -source 1.5 IeeeRecommendedTests.java
- * @run main IeeeRecommendedTests
  */
 
 import sun.misc.FpUtils;
diff --git a/jdk/test/java/lang/Math/PowTests.java b/jdk/test/java/lang/Math/PowTests.java
index 79764765e33..872de407d13 100644
--- a/jdk/test/java/lang/Math/PowTests.java
+++ b/jdk/test/java/lang/Math/PowTests.java
@@ -25,8 +25,6 @@
  * @test
  * @bug 4984407 5033578
  * @summary Tests for {Math, StrictMath}.pow
- * @compile -source 1.5 PowTests.java
- * @run main PowTests
  * @author Joseph D. Darcy
  */
 
diff --git a/jdk/test/java/lang/Math/TanTests.java b/jdk/test/java/lang/Math/TanTests.java
index f603fb872a0..75d44631cd2 100644
--- a/jdk/test/java/lang/Math/TanTests.java
+++ b/jdk/test/java/lang/Math/TanTests.java
@@ -25,8 +25,6 @@
  * @test
  * @bug 5033578
  * @summary Tests for {Math, StrictMath}.tan
- * @compile -source 1.5 TanTests.java
- * @run main TanTests
  * @author Joseph D. Darcy
  */
 
diff --git a/jdk/test/java/lang/Runtime/exec/WinCommand.java b/jdk/test/java/lang/Runtime/exec/WinCommand.java
index 37e17a1f316..b51489b76ad 100644
--- a/jdk/test/java/lang/Runtime/exec/WinCommand.java
+++ b/jdk/test/java/lang/Runtime/exec/WinCommand.java
@@ -25,9 +25,6 @@
  * @bug 5006520
  * @summary Check many different ways to run Windows programs
  * @author Martin Buchholz
- *
- * @compile -source 1.5 WinCommand.java
- * @run main WinCommand
  */
 
 import java.io.*;
diff --git a/jdk/test/java/lang/Thread/GenerifyStackTraces.java b/jdk/test/java/lang/Thread/GenerifyStackTraces.java
index e10080c004f..632228cf82c 100644
--- a/jdk/test/java/lang/Thread/GenerifyStackTraces.java
+++ b/jdk/test/java/lang/Thread/GenerifyStackTraces.java
@@ -26,9 +26,6 @@
  * @bug     4919105
  * @summary Generified basic unit test of Thread.getAllStackTraces()
  * @author  Mandy Chung
- *
- * @compile -source 1.5 GenerifyStackTraces.java
- * @run main GenerifyStackTraces
  */
 
 import java.util.*;
diff --git a/jdk/test/java/lang/Thread/UncaughtExceptions.sh b/jdk/test/java/lang/Thread/UncaughtExceptions.sh
index 43b56c8e6fe..51aa0c58935 100644
--- a/jdk/test/java/lang/Thread/UncaughtExceptions.sh
+++ b/jdk/test/java/lang/Thread/UncaughtExceptions.sh
@@ -121,7 +121,7 @@ public class Seppuku extends Thread implements Runnable {
 }
 EOJAVA
 
-    Sys "$javac" "-source" "1.5" "Seppuku.java"
+    Sys "$javac" "Seppuku.java"
     CheckCommandResults "$expectedRC" "$expectedOut" "$expectedErr" \
 	"$java" "Seppuku"
     Cleanup
diff --git a/jdk/test/java/lang/annotation/UnitTest.java b/jdk/test/java/lang/annotation/UnitTest.java
index ed8b05c3cc0..160ebe683a7 100644
--- a/jdk/test/java/lang/annotation/UnitTest.java
+++ b/jdk/test/java/lang/annotation/UnitTest.java
@@ -26,8 +26,6 @@
  * @bug     4906359 4963461 4965058 4965039 4986770
  * @summary Unit test for annotation reading
  * @author  Josh Bloch
- * @compile -source 1.5 UnitTest.java
- * @run main UnitTest
  */
 
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/jdk/test/java/lang/annotation/package-info.java b/jdk/test/java/lang/annotation/package-info.java
index 78afb3f6c0a..d2bef02dde0 100644
--- a/jdk/test/java/lang/annotation/package-info.java
+++ b/jdk/test/java/lang/annotation/package-info.java
@@ -27,7 +27,7 @@
  * @summary Package annotations
  * @author gafter
  *
- * @compile -source 1.5 package-info.java PackageMain.java
+ * @compile package-info.java PackageMain.java
  * @run main PackageMain
  */
 
diff --git a/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java b/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java
index d833e5eb9ab..8002188024a 100644
--- a/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java
+++ b/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java
@@ -29,7 +29,7 @@
  *          the input CompositeData is invalid.
  * @author  Mandy Chung
  *
- * @compile -source 1.5 OpenTypeConverter.java
+ * @compile OpenTypeConverter.java
  * @build MemoryNotifInfoCompositeData
  * @run main MemoryNotifInfoCompositeData
  */
diff --git a/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java b/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java
index 6c3cb0d044a..31be3a1596a 100644
--- a/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java
+++ b/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java
@@ -29,7 +29,7 @@
  *          the input CompositeData is invalid.
  * @author  Mandy Chung
  *
- * @compile -source 1.5 OpenTypeConverter.java
+ * @compile OpenTypeConverter.java
  * @build ThreadInfoCompositeData
  * @run main ThreadInfoCompositeData
  */
diff --git a/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java b/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java
index afd6618e62a..4a829fe76de 100644
--- a/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java
+++ b/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java
@@ -26,9 +26,6 @@
  * @bug     5024531
  * @summary Basic Test for ManagementFactory.newPlatformMXBean().
  * @author  Mandy Chung
- *
- * @compile -source 1.5 MXBeanProxyTest.java
- * @run main MXBeanProxyTest
  */
 import javax.management.*;
 import java.lang.management.ClassLoadingMXBean;
diff --git a/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java b/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java
index 7deb892569a..939ac86a764 100644
--- a/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java
+++ b/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java
@@ -26,9 +26,6 @@
  * @bug     4947536
  * @summary Basic unit test of ManagementFactory.getPlatformMBeanServer()
  * @author  Mandy Chung
- *
- * @compile -source 1.5 PlatformMBeanServerTest.java
- * @run main PlatformMBeanServerTest
  */
 
 import java.lang.management.*;
diff --git a/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java b/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java
index 5be25106827..1feba9e13f6 100644
--- a/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java
+++ b/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java
@@ -27,9 +27,6 @@
  * @summary Test type mapping of the platform MXBean proxy
  *          returned from Management.newPlatformMXBeanProxy().
  * @author  Mandy Chung
- *
- * @compile -source 1.5 ProxyExceptions.java
- * @run main ProxyExceptions
  */
 import java.lang.management.*;
 import javax.management.*;
diff --git a/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java b/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java
index eb48825736c..a4111b2e6ef 100644
--- a/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java
+++ b/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java
@@ -28,7 +28,7 @@
  *          returned from Management.newPlatformMXBeanProxy().
  * @author  Mandy Chung
  *
- * @compile -source 1.5 ProxyTypeMapping.java
+ * @compile ProxyTypeMapping.java
  * @run main/othervm -verbose:gc ProxyTypeMapping
  */
 import java.lang.management.*;
diff --git a/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java b/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java
index 68d5304b91c..d4fd4ea4a94 100644
--- a/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java
+++ b/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java
@@ -28,7 +28,7 @@
  *          MBeanServer.
  * @author  Mandy Chung
  *
- * @compile -source 1.5 ValidateOpenTypes.java
+ * @compile ValidateOpenTypes.java
  * @run main/othervm -verbose:gc ValidateOpenTypes
  */
 import java.lang.management.*;
diff --git a/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java b/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java
index 5a655378462..c411192f080 100644
--- a/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java
+++ b/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java
@@ -26,9 +26,6 @@
  * @bug     4990512
  * @summary Basic Test for RuntimeMXBean.getSystemProperties().
  * @author  Mandy Chung
- *
- * @compile -source 1.5 GetSystemProperties.java
- * @run main GetSystemProperties
  */
 
 import java.lang.management.ManagementFactory;
diff --git a/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh b/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh
index f1fb705f377..e38817ec3fc 100644
--- a/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh
+++ b/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh
@@ -27,7 +27,7 @@
 # @summary 
 # @author  Mandy Chung
 #
-# @run compile -source 1.5 InputArgument.java
+# @run compile InputArgument.java
 # @run shell TestInputArgument.sh
 #
 
diff --git a/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java b/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java
index 49709884f56..59ed2dbfa95 100644
--- a/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java
+++ b/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java
@@ -26,8 +26,6 @@
  * @bug 5033583 6316717 6470106
  * @summary Check toGenericString() and toString() methods
  * @author Joseph D. Darcy
- * @compile -source 1.5 GenericStringTest.java
- * @run main GenericStringTest
  */
 
 import java.lang.reflect.*;
diff --git a/jdk/test/java/lang/reflect/Field/GenericStringTest.java b/jdk/test/java/lang/reflect/Field/GenericStringTest.java
index f25a6ca36f2..148e69a7068 100644
--- a/jdk/test/java/lang/reflect/Field/GenericStringTest.java
+++ b/jdk/test/java/lang/reflect/Field/GenericStringTest.java
@@ -26,8 +26,6 @@
  * @bug 5033583
  * @summary Check toGenericString() method
  * @author Joseph D. Darcy
- * @compile -source 1.5 GenericStringTest.java
- * @run main GenericStringTest
  */
 
 import java.lang.reflect.*;
diff --git a/jdk/test/java/lang/reflect/Generics/StringsAndBounds.java b/jdk/test/java/lang/reflect/Generics/StringsAndBounds.java
index d49a5ea628e..dac18fb7cb2 100644
--- a/jdk/test/java/lang/reflect/Generics/StringsAndBounds.java
+++ b/jdk/test/java/lang/reflect/Generics/StringsAndBounds.java
@@ -26,8 +26,6 @@
  * @bug 5015676 4987888 4997464
  * @summary Testing upper bounds and availability of toString methods
  * @author Joseph D. Darcy
- * @compile -source 1.5 StringsAndBounds.java
- * @run main StringsAndBounds
  */
 
 import java.lang.reflect.*;
diff --git a/jdk/test/java/lang/reflect/Generics/TestC1.java b/jdk/test/java/lang/reflect/Generics/TestC1.java
index 756a4c63ec2..8a9fbe37031 100644
--- a/jdk/test/java/lang/reflect/Generics/TestC1.java
+++ b/jdk/test/java/lang/reflect/Generics/TestC1.java
@@ -26,7 +26,7 @@
 * @bug 4891872
 * @summary Some tests for the generic core reflection api.
 * @author Gilad Bracha
-* @compile -source 1.5 TestC1.java
+* @compile TestC1.java
 * @run main/othervm -ea TestC1
 */
 
diff --git a/jdk/test/java/lang/reflect/Generics/TestC2.java b/jdk/test/java/lang/reflect/Generics/TestC2.java
index d42671b3d3d..c2e574a2fa5 100644
--- a/jdk/test/java/lang/reflect/Generics/TestC2.java
+++ b/jdk/test/java/lang/reflect/Generics/TestC2.java
@@ -26,7 +26,7 @@
 * @bug 4891872
 * @summary Some tests for the generic core reflection api.
 * @author Gilad Bracha
-* @compile -source 1.5 TestC2.java
+* @compile TestC2.java
 * @run main/othervm -ea TestC2
 */
 
diff --git a/jdk/test/java/lang/reflect/Generics/TestN1.java b/jdk/test/java/lang/reflect/Generics/TestN1.java
index d2dc8b253f7..014a09f956d 100644
--- a/jdk/test/java/lang/reflect/Generics/TestN1.java
+++ b/jdk/test/java/lang/reflect/Generics/TestN1.java
@@ -26,7 +26,7 @@
 * @bug 4891872
 * @summary Some tests for the generic core reflection api.
 * @author Gilad Bracha
-* @compile -source 1.5 TestN1.java
+* @compile TestN1.java
 * @run main/othervm -ea TestN1
 */
 
diff --git a/jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java b/jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java
index 1427563f85e..77a71013fbf 100644
--- a/jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java
+++ b/jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java
@@ -26,8 +26,6 @@
  * @bug 4981727
  * @summary
  * @author Joseph D. Darcy
- * @compile -source 1.5 exceptionCauseTest.java
- * @run main exceptionCauseTest
  */
 
 import java.io.PrintStream;
diff --git a/jdk/test/java/lang/reflect/Generics/getAnnotationTest.java b/jdk/test/java/lang/reflect/Generics/getAnnotationTest.java
index d7f5d6de7da..f7a60f26d69 100644
--- a/jdk/test/java/lang/reflect/Generics/getAnnotationTest.java
+++ b/jdk/test/java/lang/reflect/Generics/getAnnotationTest.java
@@ -26,8 +26,6 @@
  * @bug 4979440
  * @summary Test for signature parsing corner case
  * @author Joseph D. Darcy
- * @compile -source 1.5 getAnnotationTest.java
- * @run main getAnnotationTest
  */
 
 import java.lang.reflect.*;
diff --git a/jdk/test/java/lang/reflect/Method/Equals.java b/jdk/test/java/lang/reflect/Method/Equals.java
index 2bcb4ecf4e3..7f7bd70f32f 100644
--- a/jdk/test/java/lang/reflect/Method/Equals.java
+++ b/jdk/test/java/lang/reflect/Method/Equals.java
@@ -27,7 +27,7 @@
  * @summary Generic framework to test Method.equals.
  *
  * @clean A
- * @compile -source 1.5 Equals.java
+ * @compile Equals.java
  * @run main Equals
  */
 
diff --git a/jdk/test/java/lang/reflect/Method/GenericStringTest.java b/jdk/test/java/lang/reflect/Method/GenericStringTest.java
index 361e3db8c7a..3894252a52f 100644
--- a/jdk/test/java/lang/reflect/Method/GenericStringTest.java
+++ b/jdk/test/java/lang/reflect/Method/GenericStringTest.java
@@ -26,8 +26,6 @@
  * @bug 5033583 6316717 6470106
  * @summary Check toGenericString() and toString() methods
  * @author Joseph D. Darcy
- * @compile -source 1.5 GenericStringTest.java
- * @run main GenericStringTest
  */
 
 import java.lang.reflect.*;
diff --git a/jdk/test/java/math/BigDecimal/DivideTests.java b/jdk/test/java/math/BigDecimal/DivideTests.java
index 7d04a60ca4b..5265f6d32f8 100644
--- a/jdk/test/java/math/BigDecimal/DivideTests.java
+++ b/jdk/test/java/math/BigDecimal/DivideTests.java
@@ -26,8 +26,6 @@
  * @bug 4851776 4907265 6177836 6876282
  * @summary Some tests for the divide methods.
  * @author Joseph D. Darcy
- * @compile -source 1.5 DivideTests.java
- * @run main DivideTests
  */
 
 import java.math.*;
diff --git a/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java b/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java
index 100eca40cce..6ce5a900453 100644
--- a/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java
+++ b/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java
@@ -25,8 +25,6 @@
  * @bug 4904082 4917089 6337226
  * @summary Tests that integral division and related methods return the proper result and scale.
  * @author Joseph D. Darcy
- * @compile -source 1.5 IntegralDivisionTests.java
- * @run main IntegralDivisionTests
  */
 import java.math.*;
 public class IntegralDivisionTests {
diff --git a/jdk/test/java/math/BigDecimal/PowTests.java b/jdk/test/java/math/BigDecimal/PowTests.java
index 9623b70bc11..78b3b6a5702 100644
--- a/jdk/test/java/math/BigDecimal/PowTests.java
+++ b/jdk/test/java/math/BigDecimal/PowTests.java
@@ -26,8 +26,6 @@
  * @bug 4916097
  * @summary Some exponent over/undeflow tests for the pow method
  * @author Joseph D. Darcy
- * @compile -source 1.5 PowTests.java
- * @run main PowTests
  */
 
 import java.math.*;
diff --git a/jdk/test/java/math/BigDecimal/ToPlainStringTests.java b/jdk/test/java/math/BigDecimal/ToPlainStringTests.java
index aca745b7e4b..9343b0dbab1 100644
--- a/jdk/test/java/math/BigDecimal/ToPlainStringTests.java
+++ b/jdk/test/java/math/BigDecimal/ToPlainStringTests.java
@@ -26,8 +26,6 @@
  * @bug 4984872
  * @summary Basic tests of toPlainString method
  * @author Joseph D. Darcy
- * @compile -source 1.5 ToPlainStringTests.java
- * @run main ToPlainStringTests
  */
 
 import java.math.*;
diff --git a/jdk/test/java/math/BigDecimal/ZeroScalingTests.java b/jdk/test/java/math/BigDecimal/ZeroScalingTests.java
index a48e005a4b1..abd5451e068 100644
--- a/jdk/test/java/math/BigDecimal/ZeroScalingTests.java
+++ b/jdk/test/java/math/BigDecimal/ZeroScalingTests.java
@@ -26,8 +26,6 @@
  * @bug 4902952 4905407 4916149
  * @summary Tests that the scale of zero is propagated properly and has the proper effect.
  * @author Joseph D. Darcy
- * @compile -source 1.5 ZeroScalingTests.java
- * @run main ZeroScalingTests
  */
 
 import java.math.*;
diff --git a/jdk/test/java/math/RoundingMode/RoundingModeTests.java b/jdk/test/java/math/RoundingMode/RoundingModeTests.java
index 03fd5e7ac80..8a7cd1aa0c9 100644
--- a/jdk/test/java/math/RoundingMode/RoundingModeTests.java
+++ b/jdk/test/java/math/RoundingMode/RoundingModeTests.java
@@ -26,8 +26,6 @@
  * @bug 4851776 4891522 4905335
  * @summary Basic tests for the RoundingMode class.
  * @author Joseph D. Darcy
- * @compile -source 1.5 RoundingModeTests.java
- * @run main RoundingModeTests
  */
 
 import java.math.RoundingMode;
diff --git a/jdk/test/java/net/ProxySelector/ProxyTest.java b/jdk/test/java/net/ProxySelector/ProxyTest.java
index 869eb3fab27..18be010f619 100644
--- a/jdk/test/java/net/ProxySelector/ProxyTest.java
+++ b/jdk/test/java/net/ProxySelector/ProxyTest.java
@@ -27,7 +27,7 @@
  * @summary HTTP client: Improve proxy server configuration and selection
  * @library ../../../sun/net/www/httptest/
  * @build ClosedChannelList HttpServer HttpTransaction HttpCallback
- * @compile -source 1.5 ProxyTest.java
+ * @compile ProxyTest.java
  * @run main/othervm -Dhttp.proxyHost=inexistant -Dhttp.proxyPort=8080 ProxyTest
  */
 
diff --git a/jdk/test/java/net/URL/PerConnectionProxy.java b/jdk/test/java/net/URL/PerConnectionProxy.java
index 0640ec4bb87..9a8cdf2616f 100644
--- a/jdk/test/java/net/URL/PerConnectionProxy.java
+++ b/jdk/test/java/net/URL/PerConnectionProxy.java
@@ -26,7 +26,7 @@
  * @summary Needs per connection proxy support for URLs
  * @library ../../../sun/net/www/httptest/
  * @build ClosedChannelList HttpServer HttpTransaction HttpCallback
- * @compile -source 1.5 PerConnectionProxy.java
+ * @compile PerConnectionProxy.java
  * @run main/othervm -Dhttp.proxyHost=inexistant -Dhttp.proxyPort=8080 PerConnectionProxy
  */
 
diff --git a/jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java b/jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java
index 14b8b0698eb..b9f172fb2f6 100644
--- a/jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java
+++ b/jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java
@@ -24,7 +24,7 @@
 /**
  * @test
  * @test 4422738
- * @compile -source 1.4 -target 1.4 InvalidParameters.java
+ * @compile -source 1.4 InvalidParameters.java
  * @run main InvalidParameters
  * @summary Make sure PKIXBuilderParameters(Set) detects invalid
  *          parameters and throws correct exceptions
diff --git a/jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java b/jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java
index d3e3c5ab786..01946d6e2e0 100644
--- a/jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java
+++ b/jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java
@@ -24,7 +24,7 @@
 /**
  * @test
  * @test 4422738
- * @compile -source 1.4 -target 1.4 InvalidParameters.java
+ * @compile -source 1.4 InvalidParameters.java
  * @run main InvalidParameters
  * @summary Make sure PKIXParameters(Set) and setTrustAnchors() detects invalid
  *          parameters and throws correct exceptions
diff --git a/jdk/test/java/util/AbstractList/CheckForComodification.java b/jdk/test/java/util/AbstractList/CheckForComodification.java
index 156c7898270..790a4bb6c4e 100644
--- a/jdk/test/java/util/AbstractList/CheckForComodification.java
+++ b/jdk/test/java/util/AbstractList/CheckForComodification.java
@@ -28,8 +28,6 @@
  * @author  Josh Bloch
  *
  * @ignore Bug fix temporarily removed as it uncovered other bugs (4992226)
- * @compile -source 1.5 CheckForComodification.java
- * @run main CheckForComodification
  */
 
 import java.util.*;
diff --git a/jdk/test/java/util/Collections/AddAll.java b/jdk/test/java/util/Collections/AddAll.java
index ef66b007591..48bbc799a5d 100644
--- a/jdk/test/java/util/Collections/AddAll.java
+++ b/jdk/test/java/util/Collections/AddAll.java
@@ -26,9 +26,6 @@
  * @bug     4822887
  * @summary Basic test for Collections.addAll
  * @author  Josh Bloch
- *
- * @compile -source 1.5 AddAll.java
- * @run main AddAll
  */
 
 import java.util.*;
diff --git a/jdk/test/java/util/Collections/Disjoint.java b/jdk/test/java/util/Collections/Disjoint.java
index 8d820f10015..ada965efa6a 100644
--- a/jdk/test/java/util/Collections/Disjoint.java
+++ b/jdk/test/java/util/Collections/Disjoint.java
@@ -26,9 +26,6 @@
  * @bug     4339792
  * @summary Basic test for Collections.disjoint
  * @author  Josh Bloch
- *
- * @compile -source 1.5 Disjoint.java
- * @run main Disjoint
  */
 
 import java.util.*;
diff --git a/jdk/test/java/util/Collections/Frequency.java b/jdk/test/java/util/Collections/Frequency.java
index a21265720f3..71938c561cf 100644
--- a/jdk/test/java/util/Collections/Frequency.java
+++ b/jdk/test/java/util/Collections/Frequency.java
@@ -26,9 +26,6 @@
  * @bug     4193200
  * @summary Basic test for Collections.frequency
  * @author  Josh Bloch
- *
- * @compile -source 1.5 Frequency.java
- * @run main Frequency
  */
 
 import java.util.*;
diff --git a/jdk/test/java/util/EnumMap/EnumMapBash.java b/jdk/test/java/util/EnumMap/EnumMapBash.java
index 4dd51b13327..1182bf6c446 100644
--- a/jdk/test/java/util/EnumMap/EnumMapBash.java
+++ b/jdk/test/java/util/EnumMap/EnumMapBash.java
@@ -27,9 +27,6 @@
  * @summary Unit test for EnumMap
  * @author  Josh Bloch
  * @author  Yo Yo Ma
- *
- * @compile -source 1.5 EnumMapBash.java
- * @run main EnumMapBash
  */
 
 import java.util.*;
diff --git a/jdk/test/java/util/EnumSet/AllOf.java b/jdk/test/java/util/EnumSet/AllOf.java
index 712fbc37719..28e471b0bfe 100644
--- a/jdk/test/java/util/EnumSet/AllOf.java
+++ b/jdk/test/java/util/EnumSet/AllOf.java
@@ -26,9 +26,6 @@
  * @bug     4946090
  * @summary AllOf static factory is broken in Regular and Jumbo enum set
  * @author  Josh Bloch
- *
- * @compile -source 1.5 AllOf.java
- * @run main AllOf
  */
 
 import java.util.*;
diff --git a/jdk/test/java/util/EnumSet/ComplementOf.java b/jdk/test/java/util/EnumSet/ComplementOf.java
index 35251792eed..3a9fe377a4e 100644
--- a/jdk/test/java/util/EnumSet/ComplementOf.java
+++ b/jdk/test/java/util/EnumSet/ComplementOf.java
@@ -26,9 +26,6 @@
  * @bug     4946096
  * @summary ComplementOf static factory is broken in Regular and Jumbo enum set
  * @author  Josh Bloch
- *
- * @compile -source 1.5 ComplementOf.java
- * @run main ComplementOf
  */
 
 import java.util.*;
diff --git a/jdk/test/java/util/EnumSet/EnumSetBash.java b/jdk/test/java/util/EnumSet/EnumSetBash.java
index fd61f119755..51dd8cbfef6 100644
--- a/jdk/test/java/util/EnumSet/EnumSetBash.java
+++ b/jdk/test/java/util/EnumSet/EnumSetBash.java
@@ -28,9 +28,6 @@
  * @author  Josh Bloch
  * @author  Neal Gafter
  * @author  Yo Ma Ma
- *
- * @compile -source 1.5 EnumSetBash.java
- * @run main EnumSetBash
  */
 
 import java.util.*;
diff --git a/jdk/test/java/util/EnumSet/JumboRange.java b/jdk/test/java/util/EnumSet/JumboRange.java
index eec95657234..55be9784dc6 100644
--- a/jdk/test/java/util/EnumSet/JumboRange.java
+++ b/jdk/test/java/util/EnumSet/JumboRange.java
@@ -26,9 +26,6 @@
  * @bug     4958003
  * @summary Range static factory fails to compute size in Jumbo enum set
  * @author  Josh Bloch
- *
- * @compile -source 1.5 JumboRange.java
- * @run main JumboRange
  */
 
 import java.util.*;
diff --git a/jdk/test/java/util/EnumSet/Range.java b/jdk/test/java/util/EnumSet/Range.java
index 2a0301b68bc..ad4ab959c3f 100644
--- a/jdk/test/java/util/EnumSet/Range.java
+++ b/jdk/test/java/util/EnumSet/Range.java
@@ -26,9 +26,6 @@
  * @bug     4952736
  * @summary Range static factory is broken in Regular and Jumbo enum set
  * @author  Josh Bloch
- *
- * @compile -source 1.5 Range.java
- * @run main Range
  */
 
 import java.util.*;
diff --git a/jdk/test/java/util/Formattable/StockName.java b/jdk/test/java/util/Formattable/StockName.java
index 30a06da8217..d4b092e802a 100644
--- a/jdk/test/java/util/Formattable/StockName.java
+++ b/jdk/test/java/util/Formattable/StockName.java
@@ -21,11 +21,9 @@
  * have any questions.
  */
 
-/**
+/*
  * @test
  * @bug 4965770 4992540 5030716
- * @compile -source 1.5 StockName.java
- * @run main StockName
  */
 
 import java.nio.CharBuffer;
diff --git a/jdk/test/java/util/Formatter/Basic-X.java b/jdk/test/java/util/Formatter/Basic-X.java.template
similarity index 100%
rename from jdk/test/java/util/Formatter/Basic-X.java
rename to jdk/test/java/util/Formatter/Basic-X.java.template
diff --git a/jdk/test/java/util/Formatter/genBasic.sh b/jdk/test/java/util/Formatter/genBasic.sh
index 2c352ad39cf..819afe7cd39 100644
--- a/jdk/test/java/util/Formatter/genBasic.sh
+++ b/jdk/test/java/util/Formatter/genBasic.sh
@@ -27,10 +27,10 @@ javac -d . ../../../../make/tools/src/build/tools/spp/Spp.java
 
 gen() {
 #  if [ $3 = "true" ]
-#  then $SPP -K$1 -Dtype=$1 -DType=$2 -Kprim<Basic-X.java >Basic$2.java
-#  else $SPP -K$1 -Dtype=$1 -DType=$2 -K$3 <Basic-X.java >Basic$2.java
+#  then $SPP -K$1 -Dtype=$1 -DType=$2 -Kprim<Basic-X.java.template >Basic$2.java
+#  else $SPP -K$1 -Dtype=$1 -DType=$2 -K$3 <Basic-X.java.template >Basic$2.java
 #  fi
-    java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -K$3 -K$4 -K$5 -K$6 <Basic-X.java >Basic$2.java
+    java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -K$3 -K$4 -K$5 -K$6 <Basic-X.java.template >Basic$2.java
 }
 
 gen boolean Boolean       prim  ""  ""   ""
diff --git a/jdk/test/java/util/IdentityHashMap/ToString.java b/jdk/test/java/util/IdentityHashMap/ToString.java
index 794ccb9982b..8b22e3013f3 100644
--- a/jdk/test/java/util/IdentityHashMap/ToString.java
+++ b/jdk/test/java/util/IdentityHashMap/ToString.java
@@ -26,9 +26,6 @@
  * @bug     4973432
  * @summary Test that toString on entrySet Iterator/Entry behaves reasonably
  * @author  Josh Bloch
- *
- * @compile -source 1.5 ToString.java
- * @run main ToString
  */
 
 
diff --git a/jdk/test/java/util/Locale/Bug4175998Test.java b/jdk/test/java/util/Locale/Bug4175998Test.java
index 96335255d0f..37ebee4860e 100644
--- a/jdk/test/java/util/Locale/Bug4175998Test.java
+++ b/jdk/test/java/util/Locale/Bug4175998Test.java
@@ -23,7 +23,7 @@
 /*
     @test
     @summary test ISO639-2 language codes
-    @compile -encoding ascii -source 1.4 -target 1.4 Bug4175998Test.java
+    @compile -encoding ascii -source 5 Bug4175998Test.java
     @run main Bug4175998Test
     @bug 4175998
 */
diff --git a/jdk/test/java/util/UUID/UUIDTest.java b/jdk/test/java/util/UUID/UUIDTest.java
index c71f6a41062..2dde63c655c 100644
--- a/jdk/test/java/util/UUID/UUIDTest.java
+++ b/jdk/test/java/util/UUID/UUIDTest.java
@@ -23,8 +23,6 @@
 
 /* @test
  * @bug 4173528 5068772
- * @compile -source 1.4 -target 1.4 UUIDTest.java
- * @run main UUIDTest
  * @summary Unit tests for java.util.UUID
  */
 
diff --git a/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java
index 98ac5d744e2..b704bb12c35 100644
--- a/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java
+++ b/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 CancelledProducerConsumerLoops.java
+ * @compile CancelledProducerConsumerLoops.java
  * @run main/timeout=7000 CancelledProducerConsumerLoops
  * @summary Checks for responsiveness of blocking queues to cancellation.
  * Runs under the assumption that ITERS computations require more than
diff --git a/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java
index 8b7db5a945d..31db3a1dde1 100644
--- a/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java
+++ b/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 MultipleProducersSingleConsumerLoops.java
+ * @compile MultipleProducersSingleConsumerLoops.java
  * @run main/timeout=3600 MultipleProducersSingleConsumerLoops
  * @summary  multiple producers and single consumer using blocking queues
  */
diff --git a/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java
index 761990d3a92..c6ca42e9ffc 100644
--- a/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java
+++ b/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 ProducerConsumerLoops.java
+ * @compile ProducerConsumerLoops.java
  * @run main/timeout=3600 ProducerConsumerLoops
  * @summary  multiple producers and consumers using blocking queues
  */
diff --git a/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java
index c99a664b787..f365dea71a6 100644
--- a/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java
+++ b/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 SingleProducerMultipleConsumerLoops.java
+ * @compile SingleProducerMultipleConsumerLoops.java
  * @run main/timeout=600 SingleProducerMultipleConsumerLoops
  * @summary  check ordering for blocking queues with 1 producer and multiple consumers
  */
diff --git a/jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java b/jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java
index 1c77f5bb166..9a476194362 100644
--- a/jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java
+++ b/jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 MapCheck.java
+ * @compile MapCheck.java
  * @run main/timeout=240 MapCheck
  * @summary Times and checks basic map operations
  */
diff --git a/jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java b/jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java
index e6c310ff157..f7aeab10f81 100644
--- a/jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java
+++ b/jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 MapLoops.java
+ * @compile MapLoops.java
  * @run main/timeout=1600 MapLoops
  * @summary Exercise multithreaded maps, by default ConcurrentHashMap.
  * Multithreaded hash table test.  Each thread does a random walk
diff --git a/jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java b/jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java
index 53f987381cc..43763426a0a 100644
--- a/jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java
+++ b/jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 ExchangeLoops.java
+ * @compile ExchangeLoops.java
  * @run main/timeout=720 ExchangeLoops
  * @summary checks to make sure a pipeline of exchangers passes data.
  */
diff --git a/jdk/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java b/jdk/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java
index fe713fe0791..35e183395aa 100644
--- a/jdk/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java
+++ b/jdk/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4965960
- * @compile -source 1.5 ExecutorCompletionServiceLoops.java
+ * @compile ExecutorCompletionServiceLoops.java
  * @run main/timeout=3600 ExecutorCompletionServiceLoops
  * @summary  Exercise ExecutorCompletionServiceLoops
  */
diff --git a/jdk/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java b/jdk/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java
index a3d1536d11d..c05dd0bcda0 100644
--- a/jdk/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java
+++ b/jdk/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 CancelledFutureLoops.java
+ * @compile CancelledFutureLoops.java
  * @run main/timeout=2000 CancelledFutureLoops
  * @summary Checks for responsiveness of futures to cancellation.
  * Runs under the assumption that ITERS computations require more than
diff --git a/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java b/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java
index 42a7587dbe2..055d0259dc3 100644
--- a/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java
+++ b/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java
@@ -24,8 +24,6 @@
 /*
  * @test
  * @bug 4992443 4994819
- * @compile -source 1.5 VMSupportsCS8.java
- * @run main VMSupportsCS8
  * @summary Checks that the value of VMSupportsCS8 matches system properties.
  */
 
diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java
index fb1c7b5b5ca..fc98478117b 100644
--- a/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java
+++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 CancelledLockLoops.java
+ * @compile CancelledLockLoops.java
  * @run main/timeout=2800 CancelledLockLoops
  * @summary tests lockInterruptibly.
  * Checks for responsiveness of locks to interrupts. Runs under that
diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java
index 444c55e82f8..361ea1a372d 100644
--- a/jdk/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java
+++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 LockOncePerThreadLoops.java
+ * @compile LockOncePerThreadLoops.java
  * @run main/timeout=15000 LockOncePerThreadLoops
  * @summary Checks for missed signals by locking and unlocking each of an array of locks once per thread
  */
diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java
index ead5c960f15..37641686ef0 100644
--- a/jdk/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java
+++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 SimpleReentrantLockLoops.java
+ * @compile SimpleReentrantLockLoops.java
  * @run main/timeout=4500 SimpleReentrantLockLoops
  * @summary multiple threads using a single lock
  */
diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java
index d1edcc911d0..d0df653fb8f 100644
--- a/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java
+++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java
@@ -34,8 +34,6 @@
 /*
  * @test
  * @bug 4486658 5031862
- * @compile -source 1.5 TimeoutLockLoops.java
- * @run main TimeoutLockLoops
  * @summary Checks for responsiveness of locks to timeouts.
  * Runs under the assumption that ITERS computations require more than
  * TIMEOUT msecs to complete, which seems to be a safe assumption for
diff --git a/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java
index a6e710b0b28..6596ed5a7dc 100644
--- a/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java
+++ b/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 MapLoops.java
+ * @compile MapLoops.java
  * @run main/timeout=4700 MapLoops
  * @summary Exercise multithreaded maps, by default ConcurrentHashMap.
  * Multithreaded hash table test.  Each thread does a random walk
diff --git a/jdk/test/sun/management/AgentCheckTest.java b/jdk/test/sun/management/AgentCheckTest.java
index 8d3f17edd9a..d480f5b0226 100644
--- a/jdk/test/sun/management/AgentCheckTest.java
+++ b/jdk/test/sun/management/AgentCheckTest.java
@@ -27,9 +27,6 @@
  *  @summary Localize log messages from the management agents
  *
  *  @author Tim Bell
- *
- *  @run compile -source 1.5 -g AgentCheckTest.java
- *  @run main AgentCheckTest
  */
 import sun.management.Agent;
 
diff --git a/jdk/test/sun/security/krb5/auto/SSL.java b/jdk/test/sun/security/krb5/auto/SSL.java
index 44a80a60ae9..d8e361a00e0 100644
--- a/jdk/test/sun/security/krb5/auto/SSL.java
+++ b/jdk/test/sun/security/krb5/auto/SSL.java
@@ -36,33 +36,32 @@ import sun.security.jgss.GSSUtil;
 public class SSL {
 
     private static final String KRB5_CIPHER = "TLS_KRB5_WITH_3DES_EDE_CBC_SHA";
-    private static final int PORT = 4569;
     private static final int LOOP_LIMIT = 1;
     private static final char[] PASS = "secret".toCharArray();
     private static int loopCount = 0;
-
-    private static String SERVER;
+    private static volatile String server;
+    private static volatile int port;
 
     public static void main(String[] args) throws Exception {
 
         KDC kdc = KDC.create(OneKDC.REALM);
         // Run this after KDC, so our own DNS service can be started
         try {
-            SERVER = InetAddress.getLocalHost().getHostName();
+            server = InetAddress.getLocalHost().getHostName().toLowerCase();
         } catch (java.net.UnknownHostException e) {
-            SERVER = "localhost";
+            server = "localhost";
         }
 
         kdc.addPrincipal(OneKDC.USER, OneKDC.PASS);
         kdc.addPrincipalRandKey("krbtgt/" + OneKDC.REALM);
-        kdc.addPrincipal("host/" + SERVER, PASS);
+        kdc.addPrincipal("host/" + server, PASS);
         KDC.saveConfig(OneKDC.KRB5_CONF, kdc);
         System.setProperty("java.security.krb5.conf", OneKDC.KRB5_CONF);
 
         final Context c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false);
-        final Context s = Context.fromUserPass("host/" + SERVER, PASS, true);
+        final Context s = Context.fromUserPass("host/" + server, PASS, true);
 
-        c.startAsClient("host/" + SERVER, GSSUtil.GSS_KRB5_MECH_OID);
+        c.startAsClient("host/" + server, GSSUtil.GSS_KRB5_MECH_OID);
         s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID);
 
         new Thread(new Runnable() {
@@ -87,7 +86,7 @@ public class SSL {
         public byte[] run(Context s, byte[] input) throws Exception {
             SSLSocketFactory sslsf =
                 (SSLSocketFactory) SSLSocketFactory.getDefault();
-            SSLSocket sslSocket = (SSLSocket) sslsf.createSocket(SERVER, PORT);
+            SSLSocket sslSocket = (SSLSocket) sslsf.createSocket(server, port);
 
             // Enable only a KRB5 cipher suite.
             String enabledSuites[] = {KRB5_CIPHER};
@@ -124,7 +123,8 @@ public class SSL {
             SSLServerSocketFactory sslssf =
                 (SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
             SSLServerSocket sslServerSocket =
-                (SSLServerSocket) sslssf.createServerSocket(PORT);
+                (SSLServerSocket) sslssf.createServerSocket(0); // any port
+            port = sslServerSocket.getLocalPort();
 
             // Enable only a KRB5 cipher suite.
             String enabledSuites[] = {KRB5_CIPHER};
diff --git a/jdk/test/sun/security/util/Oid/S11N.sh b/jdk/test/sun/security/util/Oid/S11N.sh
index 77341e8a91b..081cd52298f 100644
--- a/jdk/test/sun/security/util/Oid/S11N.sh
+++ b/jdk/test/sun/security/util/Oid/S11N.sh
@@ -99,7 +99,7 @@ esac
 
 # the test code
 
-${TESTJAVA}${FS}bin${FS}javac -source 1.3 -target 1.3 -d . ${TESTSRC}${FS}SerialTest.java || exit 10
+${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}SerialTest.java || exit 10
 
 OLDJAVA="
     /java/re/j2se/1.6.0/latest/binaries/${PF}
diff --git a/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh b/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh
index d2a34bb2a89..a5d211d5141 100644
--- a/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh
+++ b/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh
@@ -98,7 +98,7 @@ env
 set -vx
 #
 #Compile.  jconsole.jar is required on the classpath.
-${TESTJAVA}/bin/javac -source 1.5 -d "${TESTCLASSES}" ${CP} -g \
+${TESTJAVA}/bin/javac -d "${TESTCLASSES}" ${CP} -g \
                          "${TESTSRC}"/"${TARGETCLASS}".java
 #
 #Run the test class, again with the classpath we need: