--- a/jdk/test/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI/7089914/bug7089914.java	Wed Aug 12 09:36:43 2015 -0700
+++ b/jdk/test/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI/7089914/bug7089914.java	Thu Aug 13 14:20:36 2015 +0300
@@ -27,6 +27,8 @@
 
 /* @test
  * @bug 7089914
+ * @requires (os.family == "windows")
+ * @modules java.desktop/com.sun.java.swing.plaf.windows
  * @summary Focus on image icons are not visible in javaws cache with high contrast mode
  * @author Sean Chou
  */

--- a/jdk/test/java/awt/Modal/LWModalTest/LWModalTest.java	Wed Aug 12 09:36:43 2015 -0700
+++ b/jdk/test/java/awt/Modal/LWModalTest/LWModalTest.java	Thu Aug 13 14:20:36 2015 +0300
@@ -40,8 +40,6 @@
 
 import javax.swing.*;
 
-import sun.awt.*;
-
 import test.java.awt.regtesthelpers.Util;
 
 public class LWModalTest

--- a/jdk/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java	Wed Aug 12 09:36:43 2015 -0700
+++ b/jdk/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java	Thu Aug 13 14:20:36 2015 +0300
@@ -29,8 +29,10 @@
 /* @test
  * @bug 7129742
  * @summary Focus in non-editable TextArea is not shown on Linux.
+ * @requires (os.family == "linux" | os.name == "solaris")
  * @modules java.desktop/sun.awt
  *          java.desktop/java.awt.peer
+ *          java.desktop/sun.awt.X11
  * @author Sean Chou
  */
 

--- a/jdk/test/java/awt/WMSpecificTests/Metacity/FullscreenDialogModality.java	Wed Aug 12 09:36:43 2015 -0700
+++ b/jdk/test/java/awt/WMSpecificTests/Metacity/FullscreenDialogModality.java	Thu Aug 13 14:20:36 2015 +0300
@@ -25,6 +25,8 @@
  * @test
  * @bug 8012586
  * @summary verify that modal dialog will appeared above fullscreen window under Metacity WM.
+ * @requires (os.name == "linux" | os.name == "solaris")
+ * @modules java.desktop/sun.awt.X11
  * @library ../../regtesthelpers
  * @build Util
  * @run main FullscreenDialogModality

--- a/jdk/test/java/awt/WMSpecificTests/Mutter/MutterMaximizeTest.java	Wed Aug 12 09:36:43 2015 -0700
+++ b/jdk/test/java/awt/WMSpecificTests/Mutter/MutterMaximizeTest.java	Thu Aug 13 14:20:36 2015 +0300
@@ -28,6 +28,8 @@
   @bug      7043963
   @summary  Tests  that the screen location of windows is
             updated properly after a maximize.
+  @requires (os.name == "linux" | os.name == "solaris")
+  @modules java.desktop/sun.awt.X11
   @author   Denis Lila
   @library  ../../regtesthelpers
   @build    Util

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/font/FontNames/GetLCIDFromLocale.java	Thu Aug 13 14:20:36 2015 +0300
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4351212
+ * @modules java.desktop/sun.font
+ * @summary Verify that new getLCIDFromLocale method works
+ */
+
+import java.lang.reflect.Method;
+import java.util.Locale;
+
+public class GetLCIDFromLocale {
+
+     static Method getLCIDMethod = null;
+     public static void main(String args[]) {
+        try {
+            Class ttClass = Class.forName("sun.font.TrueTypeFont");
+            getLCIDMethod =
+                ttClass.getDeclaredMethod("getLCIDFromLocale",
+                                           java.util.Locale.class);
+            getLCIDMethod.setAccessible(true); // its private
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("Reflection failed");
+        }
+        if (getLCIDMethod == null) {
+            throw new RuntimeException("No method found");
+        }
+
+        test(Locale.US, 0x0409);
+        test(Locale.GERMAN, 0x0407);
+        test(Locale.GERMANY, 0x0407);
+        test(new Locale("de", "AT"), 0x0c07);
+        test(new Locale("ar"), 0x0401);
+        test(new Locale("ar", "SA"), 0x0401);
+        test(new Locale("ar", "EG"), 0x0c01);
+        test(new Locale("??"), 0x0409);
+        test(new Locale("??", "??"), 0x0409);
+        test(Locale.KOREA, 0x0412);
+    }
+
+    private static void test(Locale locale, int expectedLCID) {
+        try {
+            short lcid = (Short)getLCIDMethod.invoke(null, locale);
+            System.out.println("lcid="+lcid+" expected="+expectedLCID);
+            if (lcid != expectedLCID) {
+                 throw new RuntimeException();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("Method invocation exception");
+        }
+    }
+}