--- old/test/ProblemList.txt	2012-07-02 06:49:06.000000000 -0700
+++ new/test/ProblemList.txt	2012-07-02 06:49:05.000000000 -0700
@@ -163,24 +163,6 @@
 
 # 7162111
 demo/jvmti/mtrace/TraceJFrame.java                              macosx-all
-javax/script/CauseExceptionTest.java                            macosx-all
-javax/script/GetInterfaceTest.java                              macosx-all
-javax/script/JavaScriptScopeTest.java                           macosx-all
-javax/script/NullUndefinedVarTest.java                          macosx-all
-javax/script/PluggableContextTest.java                          macosx-all
-javax/script/ProviderTest.sh                                    macosx-all
-javax/script/RhinoExceptionTest.java                            macosx-all
-javax/script/StringWriterPrintTest.java                         macosx-all
-javax/script/Test1.java                                         macosx-all
-javax/script/Test2.java                                         macosx-all
-javax/script/Test3.java                                         macosx-all
-javax/script/Test4.java                                         macosx-all
-javax/script/Test5.java                                         macosx-all
-javax/script/Test6.java                                         macosx-all
-javax/script/Test7.java                                         macosx-all
-javax/script/Test8.java                                         macosx-all
-javax/script/UnescapedBracketRegExTest.java                     macosx-all
-javax/script/VersionTest.java                                   macosx-all
 ############################################################################
 
 # jdk_net
--- old/test/javax/script/CauseExceptionTest.java	2012-07-02 06:49:06.000000000 -0700
+++ new/test/javax/script/CauseExceptionTest.java	2012-07-02 06:49:06.000000000 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 6869617
  * @summary RhinoScriptEngine bug : ScriptException cause not set (with fix)
+ * @run main/othervm -Djava.awt.headless=true CauseExceptionTest
  */
 
 import javax.script.*;
--- old/test/javax/script/GetInterfaceTest.java	2012-07-02 06:49:07.000000000 -0700
+++ new/test/javax/script/GetInterfaceTest.java	2012-07-02 06:49:06.000000000 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 6960211
  * @summary JavaScript engine allows creation of interface although methods not available.
+ * @run main/othervm -Djava.awt.headless=true GetInterfaceTest
  */
 
 import javax.script.*;
--- old/test/javax/script/JavaScriptScopeTest.java	2012-07-02 06:49:07.000000000 -0700
+++ new/test/javax/script/JavaScriptScopeTest.java	2012-07-02 06:49:07.000000000 -0700
@@ -28,6 +28,7 @@
  * get affected by default scope assignments. Also, verify
  * that script globals can be created and accessed from Java
  * as well as JavaScript.
+ * @run main/othervm -Djava.awt.headless=true JavaScriptScopeTest
  */
 
 import javax.script.*;
--- old/test/javax/script/NullUndefinedVarTest.java	2012-07-02 06:49:08.000000000 -0700
+++ new/test/javax/script/NullUndefinedVarTest.java	2012-07-02 06:49:08.000000000 -0700
@@ -26,6 +26,7 @@
  * @bug 6346732 6705893
  * @summary should be able to assign null and undefined
  * value to JavaScript global variables.
+ * @run main/othervm -Djava.awt.headless=true NullUndefinedVarTest
  */
 
 import javax.script.*;
--- old/test/javax/script/PluggableContextTest.java	2012-07-02 06:49:08.000000000 -0700
+++ new/test/javax/script/PluggableContextTest.java	2012-07-02 06:49:08.000000000 -0700
@@ -26,6 +26,7 @@
  * @bug 6398614 6705893
  * @summary Create a user defined ScriptContext and check
  * that script can access variables from non-standard scopes
+ * @run main/othervm -Djava.awt.headless=true PluggableContextTest
  */
 
 import javax.script.*;
--- old/test/javax/script/ProviderTest.sh	2012-07-02 06:49:09.000000000 -0700
+++ new/test/javax/script/ProviderTest.sh	2012-07-02 06:49:09.000000000 -0700
@@ -45,6 +45,6 @@
 
 echo "Running test ..."
 
-$JAVA -classpath \
+$JAVA -Djava.awt.headless=true -classpath \
   "${TESTCLASSES}${PS}${TESTCLASSES}/dummy.jar" \
   ProviderTest
--- old/test/javax/script/RhinoExceptionTest.java	2012-07-02 06:49:09.000000000 -0700
+++ new/test/javax/script/RhinoExceptionTest.java	2012-07-02 06:49:09.000000000 -0700
@@ -26,6 +26,7 @@
  * @bug 6474943 6705893
  * @summary Test that Rhino exception messages are
  * available from ScriptException.
+ * @run main/othervm -Djava.awt.headless=true RhinoExceptionTest
  */
 
 import java.io.*;
--- old/test/javax/script/StringWriterPrintTest.java	2012-07-02 06:49:10.000000000 -0700
+++ new/test/javax/script/StringWriterPrintTest.java	2012-07-02 06:49:10.000000000 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 6759414
  * @summary javascript engine can not write to StringWriter.
+ * @run main/othervm -Djava.awt.headless=true StringWriterPrintTest
  */
 
 import javax.script.*;
--- old/test/javax/script/Test1.java	2012-07-02 06:49:10.000000000 -0700
+++ new/test/javax/script/Test1.java	2012-07-02 06:49:10.000000000 -0700
@@ -26,6 +26,7 @@
  * @bug 6249843 6705893
  * @summary Create JavaScript engine and execute a simple script.
  * Tests script engine discovery mechanism.
+ * @run main/othervm -Djava.awt.headless=true Test1
  */
 
 import javax.script.*;
--- old/test/javax/script/Test2.java	2012-07-02 06:49:11.000000000 -0700
+++ new/test/javax/script/Test2.java	2012-07-02 06:49:11.000000000 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 6249843
  * @summary Test exposing a Java object to script
+ * @run main/othervm -Djava.awt.headless=true Test2
  */
 
 import javax.script.*;
--- old/test/javax/script/Test3.java	2012-07-02 06:49:12.000000000 -0700
+++ new/test/javax/script/Test3.java	2012-07-02 06:49:11.000000000 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 6249843 6705893
  * @summary Test engine and global scopes
+ * @run main/othervm -Djava.awt.headless=true Test3
  */
 
 import javax.script.*;
--- old/test/javax/script/Test4.java	2012-07-02 06:49:12.000000000 -0700
+++ new/test/javax/script/Test4.java	2012-07-02 06:49:12.000000000 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 6249843 6705893
  * @summary Test script functions implementing Java interface
+ * @run main/othervm -Djava.awt.headless=true Test4
  */
 
 import javax.script.*;
--- old/test/javax/script/Test5.java	2012-07-02 06:49:13.000000000 -0700
+++ new/test/javax/script/Test5.java	2012-07-02 06:49:12.000000000 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 6249843 6705893
  * @summary Tests engine, global scopes and scope hiding.
+ * @run main/othervm -Djava.awt.headless=true Test5
  */
 
 import java.io.*;
--- old/test/javax/script/Test6.java	2012-07-02 06:49:13.000000000 -0700
+++ new/test/javax/script/Test6.java	2012-07-02 06:49:13.000000000 -0700
@@ -26,6 +26,7 @@
  * @bug 6249843 6705893
  * @summary Test basic script compilation. Value eval'ed from
  * compiled and interpreted scripts should be same.
+ * @run main/othervm -Djava.awt.headless=true Test6
  */
 
 import java.io.*;
--- old/test/javax/script/Test7.java	2012-07-02 06:49:14.000000000 -0700
+++ new/test/javax/script/Test7.java	2012-07-02 06:49:14.000000000 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 6249843 6705893
  * @summary Tests importPackage and java access in script
+ * @run main/othervm -Djava.awt.headless=true Test7
  */
 
 import java.io.*;
--- old/test/javax/script/Test8.java	2012-07-02 06:49:14.000000000 -0700
+++ new/test/javax/script/Test8.java	2012-07-02 06:49:14.000000000 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 6249843 6705893
  * @summary Test invoking script function or method from Java
+ * @run main/othervm -Djava.awt.headless=true Test8
  */
 
 import javax.script.*;
--- old/test/javax/script/UnescapedBracketRegExTest.java	2012-07-02 06:49:15.000000000 -0700
+++ new/test/javax/script/UnescapedBracketRegExTest.java	2012-07-02 06:49:15.000000000 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 7012701
  * @summary 7012701 Add a test to check that Rhino's RegExp parser accepts unescaped '['
+ * @run main/othervm -Djava.awt.headless=true UnescapedBracketRegExTest
  */
 
 import javax.script.*;
--- old/test/javax/script/VersionTest.java	2012-07-02 06:49:15.000000000 -0700
+++ new/test/javax/script/VersionTest.java	2012-07-02 06:49:15.000000000 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 6346729 6705893
  * @summary Create JavaScript engine and check language and engine version
+ * @run main/othervm -Djava.awt.headless=true VersionTest
  */
 
 import javax.script.*;
--- old/test/sun/tools/jrunscript/jrunscript-DTest.sh	2012-07-02 06:49:16.000000000 -0700
+++ new/test/sun/tools/jrunscript/jrunscript-DTest.sh	2012-07-02 06:49:16.000000000 -0700
@@ -43,7 +43,7 @@
 # to script as java.lang.System property.  sysProps is
 # jrunscript shell built-in variable for System properties.
 
-${JRUNSCRIPT} -Djrunscript.foo=bar <<EOF
+${JRUNSCRIPT} -J-Djava.awt.headless=true -Djrunscript.foo=bar <<EOF
 if (sysProps["jrunscript.foo"] == "bar") { println("Passed"); exit(0); }
 // unexpected value
 println("Unexpected System property value");
--- old/test/sun/tools/jrunscript/jrunscript-cpTest.sh	2012-07-02 06:49:17.000000000 -0700
+++ new/test/sun/tools/jrunscript/jrunscript-cpTest.sh	2012-07-02 06:49:16.000000000 -0700
@@ -46,7 +46,7 @@
 # work with jrunscript. Script should be able to
 # access Java class "Hello".
 
-${JRUNSCRIPT} -cp . <<EOF
+${JRUNSCRIPT} -J-Djava.awt.headless=true -cp . <<EOF
 var v;  
 try { v = new Packages.Hello(); } catch (e) { println(e); exit(1) }
 if (v.string != 'hello') { println("Unexpected property value"); exit(1); }
@@ -58,7 +58,7 @@
 
 # -classpath and -cp are synonyms
 
-${JRUNSCRIPT} -classpath . <<EOF
+${JRUNSCRIPT} -J-Djava.awt.headless=true -classpath . <<EOF
 var v;
 try { v = new Packages.Hello(); } catch (e) { println(e); exit(1) }
 if (v.string != 'hello') { println("unexpected property value"); exit(1); }