--- a/jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java	Wed Jul 20 11:25:57 2016 +0530
+++ b/jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java	Wed Jul 20 14:17:41 2016 +0530
@@ -21,8 +21,8 @@
  * questions.
  */
 
-/* @test
- @bug 8129940 8132770
+ /* @test
+ @bug 8129940 8132770 8161470
  @summary JRadioButton should run custom FocusTraversalKeys for all LaFs
  @run main FocusTraversal
  */
@@ -60,7 +60,7 @@
     public static void main(String[] args) throws Exception {
 
         robot = new Robot();
-        robot.delay(2000);
+        robot.waitForIdle();
         UIManager.LookAndFeelInfo[] lookAndFeelArray
                 = UIManager.getInstalledLookAndFeels();
         for (UIManager.LookAndFeelInfo lookAndFeelItem : lookAndFeelArray) {
@@ -72,11 +72,11 @@
             throws Exception {
         if (tryLookAndFeel(lookAndFeelString)) {
             createUI(lookAndFeelString);
-            robot.delay(2000);
+            robot.waitForIdle();
             runTestCase();
-            robot.delay(2000);
+            robot.waitForIdle();
             cleanUp();
-            robot.delay(2000);
+            robot.waitForIdle();
         }
     }