diff --git a/test/jdk/javax/swing/JTableHeader/6884066/bug6884066.java b/test/jdk/javax/swing/JTableHeader/6884066/bug6884066.java
index 58926f64211..2ea4ba7f9f3 100644
--- a/test/jdk/javax/swing/JTableHeader/6884066/bug6884066.java
+++ b/test/jdk/javax/swing/JTableHeader/6884066/bug6884066.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2023, 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,56 +23,74 @@
 
 /*
    @test
-  @key headful
+   @key headful
    @bug 6884066
    @summary JTableHeader listens mouse in disabled state and doesn't work when not attached to a table
-   @author Alexander Potochkin
    @run main bug6884066
 */
 
-import javax.swing.*;
+import java.awt.event.InputEvent;
+import java.awt.Point;
+import java.awt.Robot;
+import javax.swing.JFrame;
+import javax.swing.JTable;
 import javax.swing.table.JTableHeader;
 import javax.swing.table.TableColumnModel;
 import javax.swing.table.TableColumn;
-import java.awt.*;
-import java.awt.event.InputEvent;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 
 public class bug6884066 {
+    private static JFrame frame;
     private static JTableHeader header;
+    private static volatile Point point;
 
     public static void main(String[] args) throws Exception {
+        try {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 
-        UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-
-        Robot robot = new Robot();
-        robot.setAutoDelay(20);
-        SwingUtilities.invokeAndWait(new Runnable() {
-            public void run() {
-                // just to quickly grab a column model
-                JTable table = new JTable(10, 5);
-                header = new JTableHeader(table.getColumnModel());
-                checkColumn(0, "A");
-                JFrame frame = new JFrame("standalone header");
-                frame.add(header);
-                frame.pack();
-                frame.setVisible(true);
-                frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+            Robot robot = new Robot();
+            robot.setAutoDelay(100);
+            SwingUtilities.invokeAndWait(new Runnable() {
+                public void run() {
+                    // just to quickly grab a column model
+                    JTable table = new JTable(10, 5);
+                    header = new JTableHeader(table.getColumnModel());
+                    checkColumn(0, "A");
+                    frame = new JFrame("standalone header");
+                    frame.add(header);
+                    frame.pack();
+                    frame.setLocationRelativeTo(null);
+                    frame.setVisible(true);
+                    frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+                }
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                point = header.getLocationOnScreen();
+            });
+            robot.mouseMove(point.x + 3, point.y + 3);
+            robot.waitForIdle();
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            for (int i = 0; i < header.getWidth() - 3; i++) {
+                robot.mouseMove(point.x + i, point.y + 3);
             }
-        });
-        robot.waitForIdle();
-        Point point = header.getLocationOnScreen();
-        robot.mouseMove(point.x + 3, point.y + 3);
-        robot.mousePress(InputEvent.BUTTON1_MASK);
-        for (int i = 0; i < header.getWidth() - 3; i++) {
-            robot.mouseMove(point.x + i, point.y + 3);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+            SwingUtilities.invokeAndWait(new Runnable() {
+                public void run() {
+                    TableColumnModel model = header.getColumnModel();
+                    checkColumn(model.getColumnCount() - 1, "A");
+                }
+            });
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
         }
-        robot.mouseRelease(InputEvent.BUTTON1_MASK);
-        SwingUtilities.invokeAndWait(new Runnable() {
-            public void run() {
-                TableColumnModel model = header.getColumnModel();
-                checkColumn(model.getColumnCount() - 1, "A");
-            }
-        });
     }
 
     private static void checkColumn(int index, String str) {