--- old/test/java/awt/List/ActionEventTest/ActionEventTest.java	2016-10-07 17:01:35.000000000 +0530
+++ new/test/java/awt/List/ActionEventTest/ActionEventTest.java	2016-10-07 17:01:35.000000000 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016 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
@@ -24,7 +24,7 @@
 /*
  * @test
  * @key headful
- * @bug 6191390
+ * @bug 6191390 8158380
  * @summary Verify that ActionEvent is received with correct modifiers set.
  * @run main ActionEventTest
  */
@@ -81,14 +81,20 @@
 
         list.select(0);
         robot.keyPress(KeyEvent.VK_ALT);
+        robot.waitForIdle();
         robot.keyPress(KeyEvent.VK_SHIFT);
+        robot.waitForIdle();
         robot.keyPress(KeyEvent.VK_CONTROL);
+        robot.waitForIdle();
         // Press Enter on list item, to generate action event.
         robot.keyPress(KeyEvent.VK_ENTER);
+        robot.waitForIdle();
         robot.keyRelease(KeyEvent.VK_ENTER);
         robot.waitForIdle();
         robot.keyRelease(KeyEvent.VK_ALT);
+        robot.waitForIdle();
         robot.keyRelease(KeyEvent.VK_SHIFT);
+        robot.waitForIdle();
         robot.keyRelease(KeyEvent.VK_CONTROL);
         robot.waitForIdle();
     }
--- old/test/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java	2016-10-07 17:01:36.000000000 +0530
+++ new/test/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java	2016-10-07 17:01:36.000000000 +0530
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, 2016 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
@@ -23,7 +24,7 @@
 
 /*
   test
-  @bug       6380743
+  @bug       6380743 8158380
   @summary   Submenu should be shown by mnemonic key press.
   @author    anton.tarasov@...: area=awt.focus
   @run       applet SubMenuShowTest.html
@@ -99,6 +100,8 @@
         robot.keyRelease(KeyEvent.VK_F);
         robot.delay(20);
         robot.keyRelease(KeyEvent.VK_ALT);
+        Util.waitForIdle(robot);
+        
         if (isMacOSX) {
             robot.keyRelease(KeyEvent.VK_CONTROL);
             robot.delay(20);