--- old/java/awt/List/KeyEventsTest/KeyEventsTest.java	2014-12-04 12:31:07.000000000 +0300
+++ new/java/awt/List/KeyEventsTest/KeyEventsTest.java	2014-12-04 12:31:07.000000000 +0300
@@ -3,6 +3,8 @@
   @bug 6190768 6190778
   @summary Tests that triggering events on AWT list by pressing CTRL + HOME, CTRL + END, PG-UP, PG-DOWN similar Motif behavior
   @author Dmitry.Cherepanov@SUN.COM area=awt.list
+  @library ../../../../lib/testlibrary
+  @build jdk.testlibrary.OSInfo
   @run applet KeyEventsTest.html
 */
 
@@ -17,7 +19,8 @@
 import java.awt.event.*;
 import java.util.Set;
 import java.lang.reflect.*;
-import sun.awt.SunToolkit;
+
+import jdk.testlibrary.OSInfo;
 
 public class KeyEventsTest extends Applet implements ItemListener, FocusListener, KeyListener
 {
@@ -233,7 +236,7 @@
                 r.keyRelease(KeyEvent.VK_CONTROL);
             }
 
-            ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+            r.waitForIdle();
             r.delay(200);
 
             if (currentState.getTemplate() != currentState.getAction())
@@ -246,8 +249,13 @@
     private void doTest()
       throws InterruptedException, InvocationTargetException {
 
-        final String os = System.getProperty("os.name");
-        final boolean isWin = os.startsWith("Win");
+        boolean isWin = false;
+        if (OSInfo.getOSType() == OSInfo.OSType.WINDOWS) {
+            isWin = true;
+        }else if(OSInfo.getOSType() == OSInfo.OSType.MACOSX) {
+            System.out.println("Not for OS X");
+            return;
+        }
 
         System.out.println("multiple? selectedMoved? ?scrollMoved keyID? template? action?");
         test(new TestState(false, false, false, KeyEvent.VK_PAGE_UP, isWin?false:false));