diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 5f741be1556..b14e882665a 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -343,32 +343,29 @@ java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java 8196431
 java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java 8196431 linux-all,macosx-all
 java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java 8058813 windows-all
 java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java 8196191 windows-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java 8196432 linux-all,macosx-all
+
+java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java 8196432 macosx-all
 java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java 8196432 linux-all
 java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java 8196432 linux-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java 8196432 linux-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java 8196432 linux-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java 8196432 linux-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java 8196432 linux-all,macosx-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java 8196432 linux-all
-java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java 8196432 linux-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java 8196432 macosx-all
+java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java 8196432 macosx-all
+
 java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java 8198665 macosx-all
 java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java 8198665 macosx-all
 java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java 8198665 macosx-all
diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsTest.java
index 322dd6b94d4..d99f7bf9876 100644
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsTest.java
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsTest.java
@@ -185,9 +185,10 @@ public class FocusTransferDialogsTest {
             javax.imageio.ImageIO.write(img, "jpg", new java.io.File("NOK.jpg"));
 
             throw e;
-        }
+        } finally {
 
-        robot.waitForIdle(delay);
-        EventQueue.invokeAndWait(this::closeAll);
+            robot.waitForIdle(delay);
+            EventQueue.invokeAndWait(this::closeAll);
+        }
     }
 }
diff --git a/test/jdk/java/awt/Modal/helpers/TestDialog.java b/test/jdk/java/awt/Modal/helpers/TestDialog.java
index a56ce1f5164..6d5972205fa 100644
--- a/test/jdk/java/awt/Modal/helpers/TestDialog.java
+++ b/test/jdk/java/awt/Modal/helpers/TestDialog.java
@@ -219,9 +219,9 @@ public class TestDialog extends Dialog implements ActionListener,
             dummyButton.equals(b)) && robot != null) {
             robot.mouseMove((int) b.getLocationOnScreen().x + b.getSize().width / 2,
                             (int) b.getLocationOnScreen().y + b.getSize().height / 2);
-            robot.delay(delay);
+            robot.waitForIdle(delay);
             robot.click();
-            robot.delay(delay);
+            robot.waitForIdle(delay);
         }
     }
 
@@ -292,9 +292,9 @@ public class TestDialog extends Dialog implements ActionListener,
         if (robot != null) {
             robot.mouseMove((int) topPanel.getLocationOnScreen().x + topPanel.getSize().width / 2,
                             (int) topPanel.getLocationOnScreen().y + topPanel.getSize().height / 2);
-            robot.delay(delay);
+            robot.waitForIdle(delay);
             robot.click();
-            robot.delay(delay);
+            robot.waitForIdle(delay);
         }
     }
 
diff --git a/test/jdk/java/awt/Modal/helpers/TestFrame.java b/test/jdk/java/awt/Modal/helpers/TestFrame.java
index d002d6faf8e..d0cc7a827b1 100644
--- a/test/jdk/java/awt/Modal/helpers/TestFrame.java
+++ b/test/jdk/java/awt/Modal/helpers/TestFrame.java
@@ -209,9 +209,9 @@ public class TestFrame extends Frame implements ActionListener,
             dummyButton.equals(b)) && robot != null) {
             robot.mouseMove((int) b.getLocationOnScreen().x + b.getSize().width / 2,
                             (int) b.getLocationOnScreen().y + b.getSize().height / 2);
-            robot.delay(delay);
+            robot.waitForIdle(delay);
             robot.click();
-            robot.delay(delay);
+            robot.waitForIdle(delay);
         }
     }
 
@@ -280,9 +280,9 @@ public class TestFrame extends Frame implements ActionListener,
         if (robot != null) {
             robot.mouseMove((int) topPanel.getLocationOnScreen().x + topPanel.getSize().width / 2,
                             (int) topPanel.getLocationOnScreen().y + topPanel.getSize().height / 2);
-            robot.delay(delay);
+            robot.waitForIdle(delay);
             robot.click();
-            robot.delay(delay);
+            robot.waitForIdle(delay);
         }
     }
 
diff --git a/test/jdk/java/awt/Modal/helpers/TestWindow.java b/test/jdk/java/awt/Modal/helpers/TestWindow.java
index 249f56ead7d..f747bc19000 100644
--- a/test/jdk/java/awt/Modal/helpers/TestWindow.java
+++ b/test/jdk/java/awt/Modal/helpers/TestWindow.java
@@ -215,9 +215,9 @@ public class TestWindow extends Window implements ActionListener,
             dummyButton.equals(b)) && robot != null) {
             robot.mouseMove((int) b.getLocationOnScreen().x + b.getSize().width / 2,
                             (int) b.getLocationOnScreen().y + b.getSize().height / 2);
-            robot.delay(delay);
+            robot.waitForIdle(delay);
             robot.click();
-            robot.delay(delay);
+            robot.waitForIdle(delay);
         }
     }