diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 1834ba0925e..106a0e4a7e7 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -745,7 +745,6 @@ javax/swing/JTable/4235420/bug4235420.java     8079127 generic-all
 javax/swing/JSplitPane/4201995/bug4201995.java 8079127 generic-all
 javax/swing/JTree/DnD/LastNodeLowerHalfDrop.java 8159131 linux-all
 javax/swing/JTree/4633594/JTreeFocusTest.java 8173125 macosx-all
-javax/swing/JFileChooser/8041694/bug8041694.java 8196302 windows-all,macosx-all
 javax/swing/AbstractButton/6711682/bug6711682.java 8060765 windows-all,macosx-all
 javax/swing/Action/8133039/bug8133039.java 8196089 windows-all,macosx-all
 javax/swing/JComboBox/6559152/bug6559152.java 8196090 windows-all,macosx-all
diff --git a/test/jdk/javax/swing/JFileChooser/8041694/bug8041694.java b/test/jdk/javax/swing/JFileChooser/8041694/bug8041694.java
index 311f19a44a1..3e3cb3b9658 100644
--- a/test/jdk/javax/swing/JFileChooser/8041694/bug8041694.java
+++ b/test/jdk/javax/swing/JFileChooser/8041694/bug8041694.java
@@ -57,6 +57,7 @@ public class bug8041694 {
             // Set Metal L&F to make the test compatible with OS X.
             UIManager.setLookAndFeel(new MetalLookAndFeel());
             Robot robot = new Robot();
+            robot.setAutoDelay(100);
 
             dir1 = Files.createTempDirectory("bug8041694").toFile();
             if (Platform.isWindows()) {
@@ -83,15 +84,17 @@ public class bug8041694 {
                 }
             });
 
-            robot.setAutoDelay(50);
             robot.delay(1000);
             robot.waitForIdle();
             robot.keyPress(KeyEvent.VK_D);
             robot.keyRelease(KeyEvent.VK_D);
+            robot.waitForIdle();
             robot.keyPress(KeyEvent.VK_SPACE);
             robot.keyRelease(KeyEvent.VK_SPACE);
+            robot.waitForIdle();
             robot.keyPress(KeyEvent.VK_ENTER);
             robot.keyRelease(KeyEvent.VK_ENTER);
+            robot.waitForIdle();
 
             fChooserClosedSignal.await();
             if (selectedDir == null) {