diff --git a/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelHiDPITest.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelHiDPITest.java
index d6e2d748258..3faf208b79c 100644
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelHiDPITest.java
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/JFXPanelHiDPITest.java
@@ -32,6 +32,8 @@
 import java.util.concurrent.TimeUnit;
 
 import com.sun.javafx.PlatformUtil;
+import com.sun.javafx.application.PlatformImpl;
+
 import javafx.application.Platform;
 import javafx.embed.swing.JFXPanel;
 import javafx.embed.swing.JFXPanelShim;
@@ -82,7 +84,7 @@ public static void setupOnce() throws Exception {
         launchLatch = new CountDownLatch(1);
 
         // Start the Application
-        SwingUtilities.invokeAndWait(() -> myApp = new MyApp());
+        SwingUtilities.invokeLater(() -> myApp = new MyApp());
 
         assertTrue("Timeout waiting for Application to launch",
                 launchLatch.await(5 * TIMEOUT, TimeUnit.MILLISECONDS));
@@ -149,7 +151,7 @@ public MyApp() {
         }
 
         private void createScene(final JFXPanel fxPanel) {
-            Platform.runLater(() -> {
+            PlatformImpl.runAndWait(() -> {
                 StackPane root = new StackPane();
 
                 Rectangle rect = new Rectangle(PANEL_WIDTH - 100, (double) PANEL_HEIGHT / 8);