diff --git a/jdk/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java b/jdk/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java
index 23c46ff533d..94595a1bde3 100644
--- a/jdk/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java
+++ b/jdk/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 8016551
  * @summary JMenuItem in WindowsLookAndFeel can't paint default icons
  * @author Leonid Romanov
diff --git a/jdk/test/java/awt/Checkbox/SetStateExcessEvent/SetStateExcessEvent.java b/jdk/test/java/awt/Checkbox/SetStateExcessEvent/SetStateExcessEvent.java
index f7235beeb35..3a8d65b183b 100644
--- a/jdk/test/java/awt/Checkbox/SetStateExcessEvent/SetStateExcessEvent.java
+++ b/jdk/test/java/awt/Checkbox/SetStateExcessEvent/SetStateExcessEvent.java
@@ -29,6 +29,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8074500
  * @summary Checkbox.setState() call should not post ItemEvent
  * @author Sergey Bylokhov
diff --git a/jdk/test/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java b/jdk/test/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java
index c5f78e21970..f9ab1afc722 100644
--- a/jdk/test/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java
+++ b/jdk/test/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java
@@ -22,13 +22,14 @@
  */
 
 /*
- @test
-  @bug 7159566
-  @summary The choice positioned in the top of applet when clicking the choice.
-  @author Petr Pchelko
-  @library ../../regtesthelpers
-  @build Util
-  @run main ChoiceLocationTest
+ * @test
+ * @key headful
+ * @bug 7159566
+ * @summary The choice positioned in the top of applet when clicking the choice.
+ * @author Petr Pchelko
+ * @library ../../regtesthelpers
+ * @build Util
+ * @run main ChoiceLocationTest
  */
 
 import java.awt.*;
diff --git a/jdk/test/java/awt/Choice/DragMouseOutAndRelease/DragMouseOutAndRelease.java b/jdk/test/java/awt/Choice/DragMouseOutAndRelease/DragMouseOutAndRelease.java
index 272b30ddc6d..1909392bc14 100644
--- a/jdk/test/java/awt/Choice/DragMouseOutAndRelease/DragMouseOutAndRelease.java
+++ b/jdk/test/java/awt/Choice/DragMouseOutAndRelease/DragMouseOutAndRelease.java
@@ -22,6 +22,7 @@
  */
 /*
   @test
+  @key headful
   @bug 6322625
   @summary REG:Choice does not trigger MouseReleased when dragging and releasing the mouse outside choice, XAWT
   @author andrei.dmitriev area=awt.choice
diff --git a/jdk/test/java/awt/Choice/GetSizeTest/GetSizeTest.java b/jdk/test/java/awt/Choice/GetSizeTest/GetSizeTest.java
index 583763331d1..54bb22ccd9e 100644
--- a/jdk/test/java/awt/Choice/GetSizeTest/GetSizeTest.java
+++ b/jdk/test/java/awt/Choice/GetSizeTest/GetSizeTest.java
@@ -22,6 +22,7 @@
  */
 /*
   @test
+  @key headful
   @bug 4255631
   @summary Solaris: Size returned by Choice.getSize() does not match actual size
   @author Andrei Dmitriev : area=Choice
diff --git a/jdk/test/java/awt/Choice/ResizeAutoClosesChoice/ResizeAutoClosesChoice.java b/jdk/test/java/awt/Choice/ResizeAutoClosesChoice/ResizeAutoClosesChoice.java
index 26e05aa69cb..5e6ca75caba 100644
--- a/jdk/test/java/awt/Choice/ResizeAutoClosesChoice/ResizeAutoClosesChoice.java
+++ b/jdk/test/java/awt/Choice/ResizeAutoClosesChoice/ResizeAutoClosesChoice.java
@@ -22,6 +22,7 @@
  */
 /*
   @test
+  @key headful
   @bug 6399679
   @summary Choice is not invalidated when the frame gets resized programmatically when the drop-down is visible
   @author andrei.dmitriev area=awt.choice
diff --git a/jdk/test/java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java b/jdk/test/java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java
index 322e3584260..be087417512 100644
--- a/jdk/test/java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java
+++ b/jdk/test/java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java
@@ -22,6 +22,7 @@
  */
 /*
   @test
+  @key headful
   @bug 6390103
   @summary Non-Focusable choice throws exception when selecting an item, Win32
   @author andrei.dmitriev area=awt.choice
diff --git a/jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java b/jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java
index 9c3a56af5c4..adbbe2f97a7 100644
--- a/jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java
+++ b/jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 6566434
   @library ../../regtesthelpers
   @build Util Sysout AbstractTest
diff --git a/jdk/test/java/awt/Component/DimensionEncapsulation/DimensionEncapsulation.java b/jdk/test/java/awt/Component/DimensionEncapsulation/DimensionEncapsulation.java
index 3955453ba52..c8ecadeede7 100644
--- a/jdk/test/java/awt/Component/DimensionEncapsulation/DimensionEncapsulation.java
+++ b/jdk/test/java/awt/Component/DimensionEncapsulation/DimensionEncapsulation.java
@@ -90,6 +90,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 6459798
  * @author Sergey Bylokhov
  */
diff --git a/jdk/test/java/awt/Component/InsetsEncapsulation/InsetsEncapsulation.java b/jdk/test/java/awt/Component/InsetsEncapsulation/InsetsEncapsulation.java
index 9a14a665ee6..182d5143c48 100644
--- a/jdk/test/java/awt/Component/InsetsEncapsulation/InsetsEncapsulation.java
+++ b/jdk/test/java/awt/Component/InsetsEncapsulation/InsetsEncapsulation.java
@@ -74,6 +74,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 6459800
  * @author Sergey Bylokhov
  */
diff --git a/jdk/test/java/awt/Component/PaintAll/PaintAll.java b/jdk/test/java/awt/Component/PaintAll/PaintAll.java
index 483f1a5bd5a..21b76a89c62 100644
--- a/jdk/test/java/awt/Component/PaintAll/PaintAll.java
+++ b/jdk/test/java/awt/Component/PaintAll/PaintAll.java
@@ -43,6 +43,7 @@
 
 /*
   @test
+  @key headful
   @bug 6596915
   @summary Test Component.paintAll() method
   @author sergey.bylokhov@oracle.com: area=awt.component
diff --git a/jdk/test/java/awt/Component/Revalidate/Revalidate.java b/jdk/test/java/awt/Component/Revalidate/Revalidate.java
index 386e5394c6f..211a2a85a84 100644
--- a/jdk/test/java/awt/Component/Revalidate/Revalidate.java
+++ b/jdk/test/java/awt/Component/Revalidate/Revalidate.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 7036669
   @summary Test Component.revalidate() method
   @author anthony.petrov@oracle.com: area=awt.component
diff --git a/jdk/test/java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java b/jdk/test/java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java
index c898ef7ef4b..fb3df7c77d6 100644
--- a/jdk/test/java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java
+++ b/jdk/test/java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java
@@ -31,6 +31,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8071306
  * @author Sergey Bylokhov
  */
diff --git a/jdk/test/java/awt/Container/CheckZOrderChange/CheckZOrderChange.java b/jdk/test/java/awt/Container/CheckZOrderChange/CheckZOrderChange.java
index fa888ecfec5..334191f938a 100644
--- a/jdk/test/java/awt/Container/CheckZOrderChange/CheckZOrderChange.java
+++ b/jdk/test/java/awt/Container/CheckZOrderChange/CheckZOrderChange.java
@@ -22,12 +22,14 @@
  */
 
 /*
-   @test %I% %E%
-   @bug 2161766
-   @summary Component is missing after changing the z-order of the component & focus is not transfered in
-   @author  Andrei Dmitriev : area=awt.container
-   @run main CheckZOrderChange
-*/
+ * @test %I% %E%
+ * @key headful
+ * @bug 2161766
+ * @summary Component is missing after changing the z-order of the component & focus is not transfered in
+ * @author  Andrei Dmitriev : area=awt.container
+ * @run main CheckZOrderChange
+ */
+
 import java.awt.*;
 import java.awt.event.*;
 
diff --git a/jdk/test/java/awt/Container/ValidateRoot/InvalidateMustRespectValidateRoots.java b/jdk/test/java/awt/Container/ValidateRoot/InvalidateMustRespectValidateRoots.java
index 6c03c99d0f6..dd438330508 100644
--- a/jdk/test/java/awt/Container/ValidateRoot/InvalidateMustRespectValidateRoots.java
+++ b/jdk/test/java/awt/Container/ValidateRoot/InvalidateMustRespectValidateRoots.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 6852592
   @summary invalidate() must stop when it encounters a validate root
   @author anthony.petrov@sun.com
diff --git a/jdk/test/java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java b/jdk/test/java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java
index 3e3e83f1069..20a9dd51d17 100644
--- a/jdk/test/java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java
+++ b/jdk/test/java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 6829546
   @summary tests that an always-on-top modal dialog doesn't make any windows always-on-top
   @author artem.ananiev: area=awt.modal
diff --git a/jdk/test/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java b/jdk/test/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java
index 9f72f2a14bf..e35877ceb88 100644
--- a/jdk/test/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java
+++ b/jdk/test/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 7027013
   @summary Dialog.show() should validate the window unconditionally
   @author anthony.petrov@oracle.com: area=awt.toplevel
diff --git a/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java b/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java
index 603f786506d..86207ff54a9 100644
--- a/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java
+++ b/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java
@@ -24,7 +24,8 @@
 /**
  *
  * @bug 4023283
- * @summary Checks that an Error which propogate up to the EventDispatch
+ * @key headful
+ * @summary Checks that an Error which propogates up to the EventDispatch
  * loop does not crash AWT.
  * @author Andrei Dmitriev: area=awt.event
  * @library ../../regtesthelpers
diff --git a/jdk/test/java/awt/Focus/6981400/Test1.java b/jdk/test/java/awt/Focus/6981400/Test1.java
index a78c9479e7c..730e10804fa 100644
--- a/jdk/test/java/awt/Focus/6981400/Test1.java
+++ b/jdk/test/java/awt/Focus/6981400/Test1.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug     6981400
  * @summary Tabbing between textfiled do not work properly when ALT+TAB
  * @author  anton.tarasov
diff --git a/jdk/test/java/awt/Focus/6981400/Test2.java b/jdk/test/java/awt/Focus/6981400/Test2.java
index 6afcf6f8999..acb61577599 100644
--- a/jdk/test/java/awt/Focus/6981400/Test2.java
+++ b/jdk/test/java/awt/Focus/6981400/Test2.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug     6981400
  * @summary Tabbing between textfiled do not work properly when ALT+TAB
  * @author  anton.tarasov
diff --git a/jdk/test/java/awt/Focus/6981400/Test3.java b/jdk/test/java/awt/Focus/6981400/Test3.java
index 6030071d1fd..b44ebf813b9 100644
--- a/jdk/test/java/awt/Focus/6981400/Test3.java
+++ b/jdk/test/java/awt/Focus/6981400/Test3.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug     6981400
  * @summary Tabbing between textfiled do not work properly when ALT+TAB
  * @author  anton.tarasov
diff --git a/jdk/test/java/awt/Focus/8013611/JDK8013611.java b/jdk/test/java/awt/Focus/8013611/JDK8013611.java
index 346f235071e..c8254de2154 100644
--- a/jdk/test/java/awt/Focus/8013611/JDK8013611.java
+++ b/jdk/test/java/awt/Focus/8013611/JDK8013611.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug      8013611
   @summary  Tests showing a modal dialog with requesting focus in frame.
   @author   Anton.Tarasov: area=awt.focus
diff --git a/jdk/test/java/awt/Focus/8073453/AWTFocusTransitionTest.java b/jdk/test/java/awt/Focus/8073453/AWTFocusTransitionTest.java
index e4230b1fd26..d30a28e546d 100644
--- a/jdk/test/java/awt/Focus/8073453/AWTFocusTransitionTest.java
+++ b/jdk/test/java/awt/Focus/8073453/AWTFocusTransitionTest.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 8073453
  * @summary Focus doesn't move when pressing Shift + Tab keys
  * @author Dmitry Markov
diff --git a/jdk/test/java/awt/Focus/8073453/SwingFocusTransitionTest.java b/jdk/test/java/awt/Focus/8073453/SwingFocusTransitionTest.java
index ec15cd392a7..0320edac6db 100644
--- a/jdk/test/java/awt/Focus/8073453/SwingFocusTransitionTest.java
+++ b/jdk/test/java/awt/Focus/8073453/SwingFocusTransitionTest.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 8073453
  * @summary Focus doesn't move when pressing Shift + Tab keys
  * @author Dmitry Markov
diff --git a/jdk/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java b/jdk/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java
index b760fc7283f..d693a58dd7d 100644
--- a/jdk/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java
+++ b/jdk/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug      4823903
   @summary  Tests actual focused window retaining.
   @author   Anton.Tarasov: area=awt.focus
diff --git a/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java b/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java
index f4c1c49581c..1ac186182f3 100644
--- a/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java
+++ b/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug       6187066
   @summary   Tests the Window.autoRequestFocus property for the Window.setVisible() method.
   @author    anton.tarasov: area=awt.focus
diff --git a/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java b/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java
index 5b9746f2cc1..bb9804ce6b3 100644
--- a/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java
+++ b/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug       6187066
   @summary   Tests the Window.autoRequestFocus property for the Window.toFront() method.
   @author    anton.tarasov: area=awt.focus
diff --git a/jdk/test/java/awt/Focus/ClearGlobalFocusOwnerTest/ClearGlobalFocusOwnerTest.java b/jdk/test/java/awt/Focus/ClearGlobalFocusOwnerTest/ClearGlobalFocusOwnerTest.java
index 623f75e4b81..5ff7124f4da 100644
--- a/jdk/test/java/awt/Focus/ClearGlobalFocusOwnerTest/ClearGlobalFocusOwnerTest.java
+++ b/jdk/test/java/awt/Focus/ClearGlobalFocusOwnerTest/ClearGlobalFocusOwnerTest.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 4390555
   @summary Synopsis: clearGlobalFocusOwner() is not trigerring permanent FOCUS_LOST event
   @author son@sparc.spb.su, anton.tarasov: area=awt.focus
diff --git a/jdk/test/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java b/jdk/test/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java
index cfeba585fd4..2813a3f479a 100644
--- a/jdk/test/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java
+++ b/jdk/test/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java
@@ -22,6 +22,7 @@
  */
 /*
   @test
+  @key headful
   @bug 4476629
   @library ../../../../javax/swing/regtesthelpers
   @build Util
diff --git a/jdk/test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.html b/jdk/test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.html
index 7aeced5cfc3..5ad217eb740 100644
--- a/jdk/test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.html
+++ b/jdk/test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.html
@@ -24,6 +24,7 @@
 <html>
 <!--
   @test
+  @key        headful
   @bug        5028014
   @summary    Focus request & mouse click being performed nearly synchronously shouldn't break the focus subsystem
   @author     anton.tarasov@sun.com: area=awt-focus
diff --git a/jdk/test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java b/jdk/test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java
index f3a9d8f61ee..d525adda45a 100644
--- a/jdk/test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java
+++ b/jdk/test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java
@@ -23,6 +23,7 @@
 
 /*
   test
+  @key       headful
   @bug       5028014
   @summary   Focus request & mouse click performed nearly synchronously shouldn't lead to a focus race.
   @author    anton.tarasov@sun.com: area=awt-focus
diff --git a/jdk/test/java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java b/jdk/test/java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java
index 1419d9765e6..97ad2613c8e 100644
--- a/jdk/test/java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java
+++ b/jdk/test/java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 6411406
   @summary Components automatically transfer focus on removal, even if developer requests focus elsewhere first
   @author oleg.sukhodolsky, anton.tarasov: area=awt.focus
diff --git a/jdk/test/java/awt/Focus/RollbackFocusFromAnotherWindowTest/RollbackFocusFromAnotherWindowTest.java b/jdk/test/java/awt/Focus/RollbackFocusFromAnotherWindowTest/RollbackFocusFromAnotherWindowTest.java
index a8ef953227c..939efe65b8a 100644
--- a/jdk/test/java/awt/Focus/RollbackFocusFromAnotherWindowTest/RollbackFocusFromAnotherWindowTest.java
+++ b/jdk/test/java/awt/Focus/RollbackFocusFromAnotherWindowTest/RollbackFocusFromAnotherWindowTest.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug       8139218
   @summary   Dialog that opens and closes quickly changes focus in original
              focusowner
diff --git a/jdk/test/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java b/jdk/test/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java
index 84c1f1b0ecc..0a2ed310c17 100644
--- a/jdk/test/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java
+++ b/jdk/test/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug       6385277
  * @summary   Tests that override redirect window gets activated on click.
  * @author    anton.tarasov@sun.com: area=awt.focus
diff --git a/jdk/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java b/jdk/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java
index 5512e4febb5..107a6f6537f 100644
--- a/jdk/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java
+++ b/jdk/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug       6562853
   @summary   Tests that focus transfered directy to window w/o transfering it to frame.
   @author    Oleg Sukhodolsky: area=awt.focus
diff --git a/jdk/test/java/awt/Focus/TypeAhead/TestFocusFreeze.java b/jdk/test/java/awt/Focus/TypeAhead/TestFocusFreeze.java
index 5127d009659..64d48d3d56a 100644
--- a/jdk/test/java/awt/Focus/TypeAhead/TestFocusFreeze.java
+++ b/jdk/test/java/awt/Focus/TypeAhead/TestFocusFreeze.java
@@ -22,14 +22,15 @@
  */
 
 /*
-   @test
-   @bug        6183877 6216005 6225560
-   @library    ../../regtesthelpers
-   @build      Util
-   @summary    Tests that keyboard input doesn't freeze due to type-ahead problems
-   @author     Denis.Mikhalkin, Anton.Tarasov: area=awt.focus
-   @run        main TestFocusFreeze
-*/
+ * @test
+ * @key headful
+ * @bug        6183877 6216005 6225560
+ * @library    ../../regtesthelpers
+ * @build      Util
+ * @summary    Tests that keyboard input doesn't freeze due to type-ahead problems
+ * @author     Denis.Mikhalkin, Anton.Tarasov: area=awt.focus
+ * @run        main TestFocusFreeze
+ */
 
 import java.awt.Component;
 import java.awt.DefaultKeyboardFocusManager;
diff --git a/jdk/test/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java b/jdk/test/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java
index b2a0ddc6fdc..0d0133d1607 100644
--- a/jdk/test/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java
+++ b/jdk/test/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java
@@ -29,6 +29,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary An attempt to set non-trivial background, shape, or translucency
  *          to a decorated toplevel should end with an exception.
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
diff --git a/jdk/test/java/awt/Frame/DisposeParentGC/DisposeParentGC.java b/jdk/test/java/awt/Frame/DisposeParentGC/DisposeParentGC.java
index 53aa13dee75..4bdf97a9f1c 100644
--- a/jdk/test/java/awt/Frame/DisposeParentGC/DisposeParentGC.java
+++ b/jdk/test/java/awt/Frame/DisposeParentGC/DisposeParentGC.java
@@ -30,6 +30,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Display a dialog with a parent, the dialog contains all awt components
  *          added to it & each components are setted with different cursors types.
  *          Dispose the parent & collect GC. Garbage collection should happen
diff --git a/jdk/test/java/awt/Frame/FramesGC/FramesGC.java b/jdk/test/java/awt/Frame/FramesGC/FramesGC.java
index 83b1240fcba..6f425a16ef2 100644
--- a/jdk/test/java/awt/Frame/FramesGC/FramesGC.java
+++ b/jdk/test/java/awt/Frame/FramesGC/FramesGC.java
@@ -30,6 +30,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Verify that disposed frames are collected with GC
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
  * @library ../../../../lib/testlibrary
diff --git a/jdk/test/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java b/jdk/test/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java
index 39e3c354514..39ee540e844 100644
--- a/jdk/test/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java
+++ b/jdk/test/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java
@@ -22,14 +22,15 @@
  */
 
 /*
-* @test
-* @summary To check proper WINDOW_EVENTS are triggered when Frame gains or losses the focus
-* @author Jitender(jitender.singh@eng.sun.com) area=AWT
-* @author yan
-* @library ../../../../lib/testlibrary
-* @build ExtendedRobot
-* @run main ActiveAWTWindowTest
-*/
+ * @test
+ * @key headful
+ * @summary To check proper WINDOW_EVENTS are triggered when Frame gains or losses the focus
+ * @author Jitender(jitender.singh@eng.sun.com) area=AWT
+ * @author yan
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @run main ActiveAWTWindowTest
+ */
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/jdk/test/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java b/jdk/test/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java
index 24b3ab600ed..6513a9830a0 100644
--- a/jdk/test/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java
+++ b/jdk/test/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java
@@ -22,14 +22,15 @@
  */
 
 /*
-* @test
-* @summary To check proper WINDOW_EVENTS are triggered when JFrame gains or losses the focus
-* @author Jitender(jitender.singh@eng.sun.com) area=AWT
-* @author yan
-* @library ../../../../lib/testlibrary
-* @build ExtendedRobot
-* @run main ActiveSwingWindowTest
-*/
+ * @test
+ * @key headful
+ * @summary To check proper WINDOW_EVENTS are triggered when JFrame gains or losses the focus
+ * @author Jitender(jitender.singh@eng.sun.com) area=AWT
+ * @author yan
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @run main ActiveSwingWindowTest
+ */
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/jdk/test/java/awt/Frame/MiscUndecorated/FrameCloseTest.java b/jdk/test/java/awt/Frame/MiscUndecorated/FrameCloseTest.java
index 105285bf329..8a43f651ebc 100644
--- a/jdk/test/java/awt/Frame/MiscUndecorated/FrameCloseTest.java
+++ b/jdk/test/java/awt/Frame/MiscUndecorated/FrameCloseTest.java
@@ -22,14 +22,15 @@
  */
 
 /*
-* @test
-* @summary To make sure Undecorated Frame triggers correct windows events while closing
-* @author Jitender(jitender.singh@eng.sun.com) area=AWT*
-* @author yan
-* @library ../../../../lib/testlibrary
-* @build ExtendedRobot
-* @run main FrameCloseTest
-*/
+ * @test
+ * @key headful
+ * @summary To make sure Undecorated Frame triggers correct windows events while closing
+ * @author Jitender(jitender.singh@eng.sun.com) area=AWT*
+ * @author yan
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @run main FrameCloseTest
+ */
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/jdk/test/java/awt/Frame/MiscUndecorated/RepaintTest.java b/jdk/test/java/awt/Frame/MiscUndecorated/RepaintTest.java
index 3e982fa6e50..50e09028c3c 100644
--- a/jdk/test/java/awt/Frame/MiscUndecorated/RepaintTest.java
+++ b/jdk/test/java/awt/Frame/MiscUndecorated/RepaintTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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
@@ -20,16 +20,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 /*
-* @test
-* @summary Make sure that on changing state of Undecorated Frame,
-*          all the components on it are repainted correctly
-* @author Jitender(jitender.singh@eng.sun.com) area=AWT
-* @author yan
-* @library ../../../../lib/testlibrary
-* @build ExtendedRobot
-* @run main RepaintTest
-*/
+ * @test
+ * @key headful
+ * @summary Make sure that on changing state of Undecorated Frame,
+ *          all the components on it are repainted correctly
+ * @author Jitender(jitender.singh@eng.sun.com) area=AWT
+ * @author yan
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @run main RepaintTest
+ */
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/jdk/test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java b/jdk/test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java
index 751b38e338b..7aa0f6c37a2 100644
--- a/jdk/test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java
+++ b/jdk/test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 6988428
   @summary Tests whether shape is always set
   @author anthony.petrov@oracle.com: area=awt.toplevel
diff --git a/jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java b/jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java
index 35ab7dc906f..b5b9577504a 100644
--- a/jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java
+++ b/jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6837004
  * @summary Checks that non-opaque window can be made a fullscreen window
  * @author Artem Ananiev
diff --git a/jdk/test/java/awt/Graphics2D/WhiteTextColorTest.java b/jdk/test/java/awt/Graphics2D/WhiteTextColorTest.java
index 8c2ddf41a89..9801d9aa6a8 100644
--- a/jdk/test/java/awt/Graphics2D/WhiteTextColorTest.java
+++ b/jdk/test/java/awt/Graphics2D/WhiteTextColorTest.java
@@ -27,11 +27,13 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8056009
  * @summary tests whether Graphics.setColor-calls with Color.white are ignored directly
  *          after pipeline initialization for a certain set of operations.
  * @author ceisserer
  */
+
 public class WhiteTextColorTest extends Frame {
     public static volatile boolean success = false;
 
diff --git a/jdk/test/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java b/jdk/test/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java
index 86f7a7a8b3a..4c017e50361 100644
--- a/jdk/test/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java
+++ b/jdk/test/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java
@@ -26,6 +26,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Have different components having different preferred sizes
  *          added to a grid layout. Change the rows and columns of the
  *          grid layout and check the components are re-laid out.
diff --git a/jdk/test/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java b/jdk/test/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java
index d8ceac748c8..f3cd370a741 100644
--- a/jdk/test/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java
+++ b/jdk/test/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java
@@ -26,6 +26,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Have different components having different preferred sizes
  *          added to a grid layout having various values of row/columns.
  *          Check if the compnents are correctly laid out.
diff --git a/jdk/test/java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java b/jdk/test/java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java
index 706ae38c4e9..22a68122995 100644
--- a/jdk/test/java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java
+++ b/jdk/test/java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java
@@ -38,6 +38,7 @@
 
 /*
  @test
+ @key headful
  @bug 7079254
  @summary Toolkit eventListener leaks memory
  @library ../regtesthelpers
diff --git a/jdk/test/java/awt/List/EmptyListEventTest/EmptyListEventTest.java b/jdk/test/java/awt/List/EmptyListEventTest/EmptyListEventTest.java
index 81f5378fb27..baa7df93186 100644
--- a/jdk/test/java/awt/List/EmptyListEventTest/EmptyListEventTest.java
+++ b/jdk/test/java/awt/List/EmptyListEventTest/EmptyListEventTest.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6366126
  * @summary List throws ArrayIndexOutOfBoundsException when pressing ENTER after removing all the items, Win32
  * @author Dmitry Cherepanov area=awt.list
diff --git a/jdk/test/java/awt/List/NofocusListDblClickTest/NofocusListDblClickTest.java b/jdk/test/java/awt/List/NofocusListDblClickTest/NofocusListDblClickTest.java
index 02448b24f60..298e6629675 100644
--- a/jdk/test/java/awt/List/NofocusListDblClickTest/NofocusListDblClickTest.java
+++ b/jdk/test/java/awt/List/NofocusListDblClickTest/NofocusListDblClickTest.java
@@ -22,6 +22,7 @@
  */
 /*
   @test
+  @key headful
   @bug       6240202
   @summary   Tests that non-focusable List in a Window generates ActionEvent.
   @author    anton.tarasov@sun.com: area=awt-list
diff --git a/jdk/test/java/awt/MenuBar/MenuBarSetFont/MenuBarSetFont.java b/jdk/test/java/awt/MenuBar/MenuBarSetFont/MenuBarSetFont.java
index 9199c7a03b2..1ae8eb41d8e 100644
--- a/jdk/test/java/awt/MenuBar/MenuBarSetFont/MenuBarSetFont.java
+++ b/jdk/test/java/awt/MenuBar/MenuBarSetFont/MenuBarSetFont.java
@@ -37,6 +37,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 6263470
  * @summary Tries to change font of MenuBar. Test passes if the font has changed
  * fails otherwise.
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java
index d2a21a9a93d..e37d7491e33 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks an application modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java
index e9d2b1591ee..c1ff3fb6ecb 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks an application modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java
index adc9709d928..c20a96f37cb 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks an application modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java
index 9dc6149beb4..eec804bab01 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks an application modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java
index 3bb80e399da..c7de419ad8f 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks an application modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java
index 16f03f7d7d9..75e0da8dfeb 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks an application modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java
index 4ff0bcef4dc..3816a0c54d1 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks a document modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java
index a8179c133aa..164a68e4a99 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks a document modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java
index 5b95dbc00dc..c63c735f686 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks a document modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java
index 0c5de04e49e..6fe1b77ad46 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks a document modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java
index e27c97c5db1..c42766cc5e9 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks a document modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java
index 9aa2f2ac311..6ce9d722aa3 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks a document modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java
index d3c0a687213..471de5b0c62 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  * @summary Check whether a FileDialog set to document modality behaves as expected.
  *
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal1Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal1Test.java
index f9cae23b85e..dc0004f37d5 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal1Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal1Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks a modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal2Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal2Test.java
index 037f5969081..ef43a93cf0b 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal2Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal2Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks a modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal3Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal3Test.java
index b2423e35827..ba80f71c9e7 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal3Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal3Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks a modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal4Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal4Test.java
index 0899eb39d4d..be47237783d 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal4Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal4Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks a modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal5Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal5Test.java
index d2940397a69..54e78b8a9f2 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal5Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal5Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks a modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal6Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal6Test.java
index 8cbee49e871..758aed461f7 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal6Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal6Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks a modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java
index b941c09865d..5ef0f211d7d 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  *
  * @summary Check whether FileDialog blocks a non-modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java
index a35d39f5252..11ffa9632b0 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359
  *
  * @summary Check whether FileDialog blocks a non-modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java
index 83b7a468a21..0987b6e981a 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359
  *
  * @summary Check whether FileDialog blocks a non-modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java
index b7d1641132f..0a89f8aef2d 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359
  *
  * @summary Check whether FileDialog blocks a non-modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java
index d2ff38ade9a..c7031411365 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359
  *
  * @summary Check whether FileDialog blocks a non-modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java
index 49b5ce07dac..c75a061a3f5 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359
  *
  * @summary Check whether FileDialog blocks a non-modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java
index 3712112dd3c..6fc761aab85 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359
  * @summary Check whether a modeless FileDialog behaves as expected.
  *
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java
index b9c6e05284c..5d23dab50eb 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 8055752
  *
  * @summary Check whether FileDialog blocks a toolkit modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java
index 36db1d01775..ecfe45df57a 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 8055752
  *
  * @summary Check whether FileDialog blocks a toolkit modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java
index 99a177aa386..87bf1fe38b0 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 8055752
  *
  * @summary Check whether FileDialog blocks a toolkit modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java
index abc6cb60232..0ee9b04f4b9 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 8055752
  *
  * @summary Check whether FileDialog blocks a toolkit modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java
index 8e84650dd29..f3dc2df7365 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 8055752
  *
  * @summary Check whether FileDialog blocks a toolkit modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java
index 4e0d1d1b481..bf47ece5e58 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 8055752
  *
  * @summary Check whether FileDialog blocks a toolkit modal Dialog
diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java
index f4a2ac34692..77e9ade10b6 100644
--- a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java
+++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054359 7186009
  * @summary Check whether a FileDialog set to toolkit modality behaves as expected.
  *
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java
index b04cd70db7e..a918cdc20af 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether an application modal Dialog created with a Dialog
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java
index e73867ed495..78cea798a5a 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a document modal Dialog created with a Dialog
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java
index f38c3d68898..353957d8dfb 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modeless Dialog created with a Dialog
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java
index f3f558e7170..92f224f8302 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a non-modal Dialog created with a Dialog
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java
index 3b89dadb667..5dc0a5df21b 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modal Dialog created with a Dialog
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java
index e386dc1b123..a68fa4f665e 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a toolkit modal Dialog created with a Dialog
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java
index 7ebc7657cec..9f3fa8140eb 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether an application modal Dialog created with a Frame
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java
index 790d5e03b7c..995287fc578 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modal Dialog created with a Frame
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java
index de09b5d05d2..673f230fddd 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a toolkit modal Dialog created with a Frame
  *          constructor receives focus, whether its components receives focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java
index 5c9c3f3fc77..5d6d14b08f5 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modeless Dialog created with a Frame
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java
index 430dff23d0e..cf69eb0b7dd 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modeless Dialog created with a Dialog
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java
index 58242e425cf..d929b24ef12 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a non-modal Dialog created with a Frame
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java
index acd9fb8b0ae..31ca236fafc 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a non-modal Dialog created with a Dialog
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java
index 638c67a5507..3ae730f3584 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java
@@ -28,6 +28,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Test if a document modality works as expected:
  *          whether all the windows lying down the document root
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java
index e446498c0fc..ddfea7f6889 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether an application modal Dialog created with a Frame
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java
index 1f9168fbcf2..014cb0bcd29 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a document modal Dialog created with a Frame
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java
index d63d1f3d11c..aedff9f100c 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modeless Dialog created with a Frame
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java
index f91bcfb23f9..27cafe9ab0d 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a non-modal Dialog created with a Frame
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java
index 21f1720861e..f4837b7fd5f 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modal Dialog created with a Frame
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java
index f907276fc44..f92b50178e8 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a toolkit modal Dialog created with a Frame
  *          constructor receives focus, whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java
index 8f24edc2444..6c6834e6a2b 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a document modal Dialog created with a null Frame
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java
index 41b3f07119d..d0b315ae0ac 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a document modal Dialog created with a null Dialog
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java
index 4cc992e5e1a..cbf56ee16a3 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a document modal Dialog created with a hidden Frame
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java
index a84af093f24..6003cb0fb55 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a document modal Dialog created with a hidden Dialog
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java
index 2872d59c4ed..5cb47bff2c7 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modeless Dialog created with a null Frame
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java
index d8a9417d78b..0f47b4ea47a 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modeless Dialog created with a null Dialog
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java
index b85b23df383..81dd2981267 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modeless Dialog created with a hidden Frame
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java
index 37a04b434e0..47b70251cc5 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modeless Dialog created with a hidden Dialog
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java
index 440d42882c7..e6a914f837c 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a non-modal Dialog created with a null Frame
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java
index ece48092250..6b7b2cb0980 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a non-modal Dialog created with a null Dialog
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java
index 759967a2de8..eda2f4f800a 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a non-modal Dialog created with a hidden Frame
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java
index e24f818a238..a7770159e28 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a non-modal Dialog created with a hidden Dialog
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java
index 4a840f8ca63..3a5846426e0 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether an application modal Dialog created with a null Frame
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java
index 46a37f86a62..ee0fde88f49 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether an application modal Dialog created with a null Dialog
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java
index c58fe745773..8d677129d58 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether an application modal Dialog created with a hidden Frame
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java
index 651ef125fbd..f9d7768c93d 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether an application modal Dialog created with a hidden Dialog
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java
index 0fd12ae0f1d..f960e3d54cb 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether an application modal Dialog created with a Frame
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java
index 39ae804586e..718f8bfa183 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether an application modal Dialog created with a Dialog
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java
index dbb13829c40..4af7dfbf072 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a document modal Dialog created with a Frame
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java
index da39e5db2af..db13a65f0a4 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a document modal Dialog created with a Dialog
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java
index c4b7e366e42..461d92e6d47 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modal Dialog created with a null Frame
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java
index 5eccd050d8b..0d2b5cb77fe 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modal Dialog created with a null Dialog
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java
index 7bfdc05ee95..b3ca9e9c70a 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modal Dialog created with a hidden Frame
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java
index 1019335ec6d..49079049960 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modal Dialog created with a hidden Dialog
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java
index 067cd4e0f4a..fb97a8c05b1 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modal Dialog created with a Frame
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java
index 57d43ca3043..6958db487ca 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modal Dialog created with a Dialog
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java
index 0a9d6a18ba0..a2c837e58ee 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a toolkit modal Dialog created with a null Frame
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java
index 32080274b9d..db8e50ab7b2 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a toolkit modal Dialog created with a null Dialog
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java
index 6b4aaf7e5c7..2bb2d21475b 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a toolkit modal Dialog created with a hidden Frame
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java
index f8ddae7c0d7..0b0249e8cc9 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a toolkit modal Dialog created with a hidden Dialog
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java
index cb55619792e..4e8dee96f6c 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a toolkit modal Dialog created with a Frame
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java
index 6407def149e..f4cbcf4072c 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a toolkit modal Dialog created with a Dialog
  *          constructor receives focus; whether its components receive focus
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java
index 81965d281b2..e90679e4762 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether an application modal Dialog receives focus; check
  *          if its components receive focus and respond to key events
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java
index ce4fb9d302f..edeb86b7973 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a document modal Dialog receives focus; check
  *          if its components receive focus and respond to key events
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java
index e566b718e3b..0b49687f507 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modeless Dialog receives focus; check
  *          if its components receive focus and respond to key events
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java
index 664ddc709f8..683fe42d1e6 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a non-modal Dialog receives focus; check
  *          if its components receive focus and respond to key events
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java
index 4c7996b496d..01789259e74 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a modal Dialog receives focus; check
  *          if its components receive focus and respond to key events
diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java
index 213d0297385..b3e6c93f32e 100644
--- a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8049617
  * @summary Check whether a toolkit modal Dialog receives focus; check
  *          if its components receive focus and respond to key events
diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java
index b86c2b2c2ef..ebbba07bdd7 100644
--- a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java
+++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047179 8044429
  * @summary Check whether a FileDialog blocks an application modality excluded Dialog
  *          (it shouldn't). Checks also whether setting a parent dialog to be
diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java
index c3b083b4e76..dca252c2105 100644
--- a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java
+++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7125054 8044429
  * @summary Check whether a pageDialog blocks an application modality excluded Dialog
  *          (it shouldn't). Checks also whether setting a parent dialog to be
diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java
index 8bd4330efdf..f2f5e43acc2 100644
--- a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java
+++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7125054 8044429
  * @summary Check whether a printDialog blocks an application modality excluded Dialog
  *          (it shouldn't). Checks also whether setting a parent dialog to be
diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java
index 83ebdff711d..2e0553a6281 100644
--- a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java
+++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047179 8044429
  * @summary Check whether a FileDialog blocks an application modality excluded Frame
  *          (it shouldn't). Checks also whether setting a parent frame to be
diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java
index ce34348dbc8..3965b8c72b3 100644
--- a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java
+++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7125054 8044429
  * @summary Check whether a pageDialog blocks an application modality excluded Frame
  *          (it shouldn't). Checks also whether setting a parent frame to be
diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java
index 66aeb64e08b..3763bf43b4f 100644
--- a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java
+++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7125054 8044429
  * @summary Check whether a printDialog blocks an application modality excluded Frame
  *          (it shouldn't). Checks also whether setting a parent frame to be
diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java
index 78c612d3d53..5b4db15e852 100644
--- a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java
+++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047179 8044429
  * @summary Check whether a FileDialog blocks a toolkit modality excluded Dialog
  *          (it shouldn't). Checks also whether setting a parent dialog to be
diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java
index 4e67f651c0a..aa1b7cc0646 100644
--- a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java
+++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7125054 8044429
  * @summary Check whether a pageDialog blocks a toolkit modality excluded Dialog
  *          (it shouldn't). Checks also whether setting a parent dialog to be
diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java
index 5f0bd425915..2de113bc08a 100644
--- a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java
+++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7125054 8044429
  * @summary Check whether a printDialog blocks a toolkit modality excluded Dialog
  *          (it shouldn't). Checks also whether setting a parent dialog to be
diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java
index ec845086ae4..29c7b6b714e 100644
--- a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java
+++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047179 8044429
  * @summary Check whether a FileDialog blocks a toolkit modality excluded Frame
  *          (it shouldn't). Checks also whether setting a parent frame to be
diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java
index f26bc8feaed..f5c18cda8a4 100644
--- a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java
+++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7125054 8044429
  * @summary Check whether a pageDialog blocks a toolkit modality excluded Frame
  *          (it shouldn't). Checks also whether setting a parent frame to be
diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java
index 809dd20bd10..cf6c7921006 100644
--- a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java
+++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7125054 8044429
  * @summary Check whether a printDialog blocks a toolkit modality excluded Frame
  *          (it shouldn't). Checks also whether setting a parent frame to be
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java
index 20f15fbe4de..7f16a93c8f5 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when the following
  *          happens: an application modal dialog (D) having null frame owner is shown;
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java
index bb70a4fc090..fb08782e8ad 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the
  *          following happens: a document modal dialog (D) having null frame owner is shown;
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java
index eb2ca1ecd08..98f4589c7f6 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the
  *          following happens: a modeless dialog (D) having null frame owner is shown;
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java
index 697c5c3d409..4ba23f071f8 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following
  *          happens: a non-modal dialog (D) having null frame owner is shown; a window having D
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java
index 900c3889786..22905f7e801 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: an application modal dialog (D1) having a null
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java
index 62e04584dc6..dba856753e7 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a document modal dialog (D1) having a null
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java
index 2215b5a9b36..def17c1c01d 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a modeless dialog (D1) having a null
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java
index dc87c0f4268..20b2a0bdd26 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a non-modal dialog (D1) having a null
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java
index f3fc961d460..51f189ef3d9 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a frame is shown; an application modal dialog (D)
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java
index 9a163e47bbc..ff5b1ebb5c8 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a frame is shown; a document modal dialog (D)
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java
index 41dce55fea8..e801611c566 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a frame is shown; a modeless dialog (D)
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java
index 32117624ecb..370ebf33761 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a frame is shown; a non-modal dialog (D)
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java
index 121aeb5494f..8fe9df35047 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following happens:
  *          a frame (F) is shown; a window having F as owner is shown; an application modal dialog having
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java
index ba1ff589406..8b4bbd08571 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following happens:
  *          a frame (F) is shown; a window having F as owner is shown; an application modal dialog having
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java
index 5098658d7e9..618f8c0e888 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following happens:
  *          a frame (F) is shown; a window having F as owner is shown; an application modal dialog having
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java
index f4ae06489aa..855eb8fc6ea 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following happens:
  *          a frame (F) is shown; a window having F as owner is shown; an application modal dialog having
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java
index 4f3958f98d4..dcd587cdf37 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following happens:
  *          a frame (F) is shown; a window having F as owner is shown; a document modal dialog having
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java
index f68eb0e3a63..7f2955988a7 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following happens:
  *          a frame (F) is shown; a window having F as owner is shown; a document modal dialog having
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java
index 7ad9e8e3d4a..cc0fa6aa60d 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following happens:
  *          a frame (F) is shown; a window having F as owner is shown; a document modal dialog having
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java
index d689b61be83..1fd811f6547 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following happens:
  *          a frame (F) is shown; a window having F as owner is shown; a document modal dialog having
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java
index bdf00c0ca24..f1de5654389 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following happens:
  *          a frame (F) is shown; a window having F as owner is shown; a modeless dialog having
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java
index a1d31e4328a..0d78e4ffb55 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following happens:
  *          a frame (F) is shown; a window having F as owner is shown; a modeless dialog having
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java
index 6ed6f9eab21..ae1bcd61288 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following happens:
  *          a frame (F) is shown; a window having F as owner is shown; a modeless dialog having
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java
index 956b69127bb..32cbc0892f0 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following happens:
  *          a frame (F) is shown; a window having F as owner is shown; a modeless dialog having
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java
index fd06036bce7..7b63ce7062e 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following happens:
  *          a frame (F) is shown; a window having F as owner is shown; a non-modal dialog having
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java
index 82283113c8c..241d16e0f17 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following happens:
  *          a frame (F) is shown; a window having F as owner is shown; a non-modal dialog having
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java
index 4475351ba43..9b57220aa16 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following happens:
  *          a frame (F) is shown; a window having F as owner is shown; a non-modal dialog having
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java
index 6ceed537376..548d42944ef 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8049339
  * @summary Check whether the focus transfer between windows occurs correctly when the following happens:
  *          a frame (F) is shown; a window having F as owner is shown; a non-modal dialog having
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java
index d23593634c1..8cad4285cb9 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a window having a hidden frame owner is shown;
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java
index e37420f3cdb..ff18a364f06 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367 8048263
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a window having a hidden frame owner is shown;
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java
index f75c869272a..58679b79621 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a window having a frame (F) owner is shown;
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java
index cd1e9e8f9d9..89b1ce79ee8 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a window having a hidden frame owner is shown;
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java
index 9f3a1f88cc8..6f1a848beb8 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a window having a hidden frame owner is shown;
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java
index 2c116b09677..cf8bafeaf77 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a window having a frame (F) owner is shown;
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java
index 73d36b65bf0..7113c283014 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a window having a hidden frame owner is shown;
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java
index e496e253f58..f17f2394c5b 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a window having a hidden frame owner is shown;
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java
index df3ff81dc3d..dfa56f5f62d 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a window having a frame (F) owner is shown;
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java
index c700a054136..75fbd3a7675 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a window having a hidden frame owner is shown;
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java
index 5e36b8d50a7..cac3e9603f3 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a window having a hidden frame owner is shown;
diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java
index e0d3ebbb1f2..5a05a76322b 100644
--- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java
+++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether the focus transfer between windows occurs correctly when
  *          the following happens: a window having a frame (F) owner is shown;
diff --git a/jdk/test/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java b/jdk/test/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java
index 10d445a196d..284140116ae 100644
--- a/jdk/test/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java
+++ b/jdk/test/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 6518753
   @summary Tests the functionality of modal Swing internal frames
   @author artem.ananiev: area=awt.modal
diff --git a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java
index e7fed021d78..b8fc67b3632 100644
--- a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java
+++ b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054358
  * @summary Check whether a set of dialogs created with a toolkit excluded Frame
  *          parent has a proper modal blocking behavior. Also show a document modal
diff --git a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java
index 323b4ef9538..a3e25a59651 100644
--- a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java
+++ b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054358
  * @summary Check whether a set of dialogs created with an application excluded Frame
  *          parent has a proper modal blocking behavior. Also show a document modal
diff --git a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java
index dc93cda4770..771bd5f2f57 100644
--- a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java
+++ b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054358
  * @summary Check correctness of modal blocking behavior for a chain of Dialogs
  *          having different modality types with a Frame as a document root.
diff --git a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java
index 64abf11aa1f..524dadae6c3 100644
--- a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java
+++ b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054358 8055003
  * @summary Check whether application and document modality levels for Dialog
  *          work properly. Also check whether the blocking dialogs are
diff --git a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java
index 09be71858c2..457940b6379 100644
--- a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java
+++ b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java
@@ -23,9 +23,10 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054358
  * @summary This is a simple check if a chain of dialogs having different
-  *         modality types block each other properly.
+ *          modality types block each other properly.
  *
  * @library ../helpers ../../../../lib/testlibrary/
  * @build ExtendedRobot
diff --git a/jdk/test/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java b/jdk/test/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java
index f8632ff14df..559bea01c05 100644
--- a/jdk/test/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java
+++ b/jdk/test/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java
@@ -29,6 +29,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8047367
  * @summary Check whether a Dialog set with null modality type
  *          behaves like a modeless dialog
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal1Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal1Test.java
index 9ff150c373f..ce33ec4c9a0 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal1Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether an application modal Dialog created with null Frame
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal2Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal2Test.java
index 21de602a752..4a09ac79313 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal2Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether an application modal Dialog created with null Dialog
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal3Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal3Test.java
index 9cf58c15f6c..d903fbf2ebf 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal3Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether an application modal Dialog created with hidden Frame
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal4Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal4Test.java
index 0fce109a6d8..0e938f6bb28 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal4Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether an application modal Dialog created with hidden Dialog
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal5Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal5Test.java
index ef0610a2ab9..4cc3db673a3 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal5Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal5Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether an application modal Dialog created with visible Frame
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal6Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal6Test.java
index 730d698fabe..381041601ff 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal6Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal6Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether an application modal Dialog created with visible
  *          Dialog constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal1Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal1Test.java
index c3f8f9d7a82..5ad2a45e145 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal1Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a document modal Dialog created with null Frame
  *          constructor follows normal Z order.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal2Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal2Test.java
index 8f6ff61c96e..20c4e3ef17a 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal2Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a document modal Dialog created with null Dialog
  *          constructor follows normal Z order.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal3Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal3Test.java
index e6b508bdcf3..f182e1add5a 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal3Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a document modal Dialog created with hidden Frame
  *          constructor follows normal Z order.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal4Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal4Test.java
index 486d60ed0a8..ba989c2bdcf 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal4Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a document modal Dialog created with hidden Dialog
  *          constructor follows normal Z order.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal5Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal5Test.java
index 735646e9f01..1b6e80c38ff 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal5Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal5Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a document modal Dialog created with visible Frame
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal6Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal6Test.java
index 5697006606b..cbe4e9024cc 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal6Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal6Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a document modal Dialog created with visible
  *          Dialog constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal1Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModal1Test.java
index 6f817eea416..b78e8503b4f 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopModal1Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a modal Dialog created with null Frame
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal2Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModal2Test.java
index 6e4799e1c14..805c72a5561 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopModal2Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a modal Dialog created with null Dialog
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal3Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModal3Test.java
index 5c696b37bd5..bd3f82dde78 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopModal3Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a modal Dialog created with hidden Frame
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal4Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModal4Test.java
index 770fafbf747..8284962a4d9 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopModal4Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a modal Dialog created with hidden Dialog
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal5Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModal5Test.java
index 1b6fbe765a1..67219a94b87 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopModal5Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal5Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a modal Dialog created with visible Frame
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal6Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModal6Test.java
index a7d57a69bf2..94a2f16d1fa 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopModal6Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal6Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a modal Dialog created with visible Dialog
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless1Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModeless1Test.java
index 723c1422506..f897721dc5a 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopModeless1Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a modeless Dialog created with a
  *          null Frame constructor follows normal Z Order.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless2Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModeless2Test.java
index dd7d3089d42..352a310dac3 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopModeless2Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a modeless Dialog created with a
  *          null Dialog constructor follows normal Z Order.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless3Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModeless3Test.java
index 54cf8995a6e..6373355b246 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopModeless3Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a modeless Dialog created with a
  *          hidden Frame constructor follows normal Z Order.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless4Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModeless4Test.java
index 9b5cfa41ffd..c5864ab781f 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopModeless4Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a modeless Dialog created with a
  *          hidden Dialog constructor follows normal Z Order.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless5Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModeless5Test.java
index 9df9a6289a9..ef5d40f90fb 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopModeless5Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless5Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a modeless Dialog created with a
  *          visible Frame constructor follows normal Z Order.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless6Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModeless6Test.java
index e03e6cd2ccc..1feef2a0537 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopModeless6Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless6Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a modeless Dialog created with a visible Dialog
  *          constructor follows a normal Z order.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal1Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal1Test.java
index 5ab64a6dd7c..eb1d702d8a0 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal1Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a toolkit modal Dialog created with null Frame
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal2Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal2Test.java
index 904e509442f..e743570e575 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal2Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a toolkit modal Dialog created with null Dialog
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal3Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal3Test.java
index 2ecb970104f..3d6a9088f51 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal3Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a toolkit modal Dialog created with hidden Frame
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal4Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal4Test.java
index f535ab27106..2434879e01a 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal4Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a toolkit modal Dialog created with hidden Dialog
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal5Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal5Test.java
index 52f860de8f4..c5e85d201d0 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal5Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal5Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a toolkit modal Dialog created with visible Frame
  *          constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal6Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal6Test.java
index eda000fbccb..e35a499f821 100644
--- a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal6Test.java
+++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal6Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8052012
  * @summary Check whether a toolkit modal Dialog created with visible
  *          Dialog constructor stays on top of the windows it blocks.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal1Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal1Test.java
index 9d60a6d15bf..bba8d40d9aa 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal1Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether an application modal dialog having a null Frame
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal2Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal2Test.java
index d6915355e7c..d992375f307 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal2Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether an application modal dialog having a null Dialog
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal3Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal3Test.java
index 9db72a778bc..ab57cd7e8ab 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal3Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether an application modal dialog having a hidden Frame
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal4Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal4Test.java
index eef0e92fa21..7a20e916c0b 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal4Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether an application modal dialog having a hidden Dialog
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal5Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal5Test.java
index a1b845a8340..8772441cee2 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal5Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal5Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether an application modal dialog having a visible Frame
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal6Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal6Test.java
index fccb53cf267..a5f71fe8355 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal6Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal6Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether an application modal dialog having a visible Dialog
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal1Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal1Test.java
index 27efa65d88d..b7dea73ca5c 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal1Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check if toBack method works correctly for
  *          a document modal dialog with null Frame parent.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal2Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal2Test.java
index 646b5ef2a22..21c324441c5 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal2Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check if toBack method works correctly for
  *          a document modal dialog with null Dialog parent.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal3Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal3Test.java
index d79387f3eaa..729942814ca 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal3Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check if toBack method works correctly for
  *          a document modal dialog with hidden Frame parent.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal4Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal4Test.java
index 2ace15343e1..e1de93015f9 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal4Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check if toBack method works correctly for
  *          a document modal dialog with hidden Dialog parent.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal5Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal5Test.java
index b2925ea06d0..625680633fc 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal5Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal5Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a document modal dialog having a visible Frame
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal6Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal6Test.java
index 6dfc7fbc3d7..feedec222c7 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal6Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal6Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a document modal dialog having a visible Dialog
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal1Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModal1Test.java
index f0c4b3751a2..0ac34f3301f 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackModal1Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackModal1Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a modal dialog having a null Frame
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal2Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModal2Test.java
index 15a45e2c517..c7f76cb551b 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackModal2Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackModal2Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a modal dialog having a null Dialog
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal3Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModal3Test.java
index dea6a8a6e8a..425ab3a1e27 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackModal3Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackModal3Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a modal dialog having a hidden Frame
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal4Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModal4Test.java
index d9e8577ef45..a6a18ac8fb5 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackModal4Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackModal4Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a modal dialog having a hidden Dialog
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal5Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModal5Test.java
index caf58ee60d2..fb5d219a397 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackModal5Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackModal5Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a modal dialog having a visible Frame
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal6Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModal6Test.java
index 692f90428b2..f4d2a094229 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackModal6Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackModal6Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a modal dialog having a visible Dialog
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless1Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModeless1Test.java
index 18562547ced..a05c9434998 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackModeless1Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackModeless1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a modeless dialog having a null Frame constructor
  *          goes behind other windows when toBack is called for it.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless2Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModeless2Test.java
index b9b0356d77c..40681897696 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackModeless2Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackModeless2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a modeless dialog having a null Dialog constructor
  *          goes behind other windows when toBack is called for it.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless3Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModeless3Test.java
index b6a93800036..df9885fbe0d 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackModeless3Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackModeless3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a modeless dialog having a hidden Frame constructor
  *          goes behind other windows when toBack is called for it.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless4Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModeless4Test.java
index 282b509ff37..22218de59d6 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackModeless4Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackModeless4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a modeless dialog having a hidden Dialog constructor
  *          goes behind other windows when toBack is called for it.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless5Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModeless5Test.java
index 1c38e21b875..950418bc3ce 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackModeless5Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackModeless5Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check if toBack method works correctly for a modeless dialog
  *          having a visible Frame constructor.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless6Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModeless6Test.java
index c5c53059dda..df56012a029 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackModeless6Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackModeless6Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check if toBack method works correctly for a modeless dialog
  *          having a visible Dialog constructor.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal1Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal1Test.java
index 12ea002a1d7..c175449f159 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal1Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal1Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a non-modal dialog having a null Frame constructor
  *          goes behind other windows when toBack is called for it.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal2Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal2Test.java
index 5ccf7a71743..e5b8edcfba2 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal2Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal2Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a non-modal dialog having a null Dialog constructor
  *          goes behind other windows when toBack is called for it.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal3Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal3Test.java
index 7bb68293543..6b9781a9565 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal3Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal3Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a non-modal dialog having a hidden Frame constructor
  *          goes behind other windows when toBack is called for it.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal4Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal4Test.java
index d2efc41b7ef..00839a61ebf 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal4Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal4Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a non-modal dialog having a hidden Dialog constructor
  *          goes behind other windows when toBack is called for it.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal5Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal5Test.java
index ad1646d1943..c3fac48e66e 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal5Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal5Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check if toBack method works correctly for a non-modal dialog
  *          having a visible Frame constructor.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal6Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal6Test.java
index b8204da2991..dda242073c7 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal6Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal6Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check if toBack method works correctly for a non-modal dialog
  *          having a visible Dialog constructor.
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal1Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal1Test.java
index 80520537b25..e0eeec648dd 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal1Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a toolkit modal dialog having a null Frame
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal2Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal2Test.java
index f2ffdaa941f..9914428b95b 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal2Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a toolkit modal dialog having a null Dialog
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal3Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal3Test.java
index 675fb24b9b6..763489c3231 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal3Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a toolkit modal dialog having a hidden Frame
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal4Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal4Test.java
index c78e26d5358..bb521df59ff 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal4Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a toolkit modal dialog having a hidden Dialog
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal5Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal5Test.java
index 5aa519c892c..675fdc3e35d 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal5Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal5Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a toolkit modal dialog having a visible Frame
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal6Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal6Test.java
index 6e373a937c9..d8015a424eb 100644
--- a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal6Test.java
+++ b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal6Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8054143
  * @summary Check whether a toolkit modal dialog having a visible Dialog
  *          constructor still stays on top of the blocked windows even
diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java
index 41d27d979f3..863ceaad159 100644
--- a/jdk/test/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java
+++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a dialog in presence of
  *          blocking application modal dialog does not bring it to the top
diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java
index 65cf9ffc71b..a79b620ee76 100644
--- a/jdk/test/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java
+++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a dialog in presence of
  *          blocking document modal dialog does not bring it to the top
diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontModalTest.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontModalTest.java
index 6c20549cf63..8833302c524 100644
--- a/jdk/test/java/awt/Modal/ToFront/DialogToFrontModalTest.java
+++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontModalTest.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a dialog in presence of
  *          blocking modal dialog does not bring it to the top
diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java
index be5da090994..56d32dc20bd 100644
--- a/jdk/test/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method does not bring a dialog to the top
  *          of a child modeless dialog.
diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java
index 6e6b70f83df..ef89f22a4cf 100644
--- a/jdk/test/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java
+++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method does not bring a dialog to the top
  *          of a non-modal child dialog.
diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java
index c48eac093ca..c5d3505afb3 100644
--- a/jdk/test/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java
+++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a dialog in presence of
  *          blocking toolkit modal dialog does not bring it to the top
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java
index 0b32758a3ae..b2192ef8448 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a frame in presence of
  *          blocking application modal dialog having a null Frame parent
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java
index 7a8e8ebea4e..e3882ac0fd5 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a frame in presence of
  *          blocking application modal dialog having a null Dialog parent
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java
index d57d1e32d02..012ee2431b3 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a frame in presence of
  *          blocking application modal dialog having a hidden Frame parent
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java
index 447a13ec0c7..7e26568ba80 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a frame in presence of
  *          blocking application modal dialog having a hidden Dialog parent
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java
index 3165711cddb..295e0a4fb96 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a frame in presence of
  *          blocking application modal dialog having a visible Frame parent
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java
index 357be00b444..dd5a7d1ff94 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a frame in presence of
  *          blocking document modal dialog having a visible Frame parent
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java
index 4524afbbe87..66d24faf69c 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check if toFront method works correctly for a document modal dialog.
  *
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal1Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal1Test.java
index eb1d4e7dff0..eb05af8a831 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal1Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal1Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a frame in presence of
  *          blocking modal dialog having a null Frame parent
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal2Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal2Test.java
index 4e1ab89ec66..bddabdd3a13 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal2Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal2Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a frame in presence of
  *          blocking modal dialog having a null Dialog parent
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal3Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal3Test.java
index da6dc06e1c9..84dfe451e42 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal3Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal3Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a frame in presence of
  *          blocking modal dialog having a hidden Frame parent
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal4Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal4Test.java
index e967d4b63fd..793ad63ccb3 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal4Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal4Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a frame in presence of
  *          blocking modal dialog having a hidden Dialog parent
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal5Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal5Test.java
index ba3ae7d9338..a7e8feafa1b 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal5Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal5Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a frame in presence of
  *          blocking modal dialog having a visible Frame parent
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java
index 29be38f5cfa..cf04e33e6e3 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method does not bring a frame to the top of
  *          a modeless child dialog.
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java
index 5e16f141446..dcc79268751 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method does not bring a frame to the top
  *          of a non-modal child dialog.
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java
index 528847e7e68..6972f4b903e 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a frame in presence of
  *          blocking modal toolkit dialog having a null Frame parent
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java
index 7cd3122d2c8..72db1dc2b3d 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a frame in presence of
  *          blocking toolkit modal dialog having a null Dialog parent
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java
index 90eff046b4e..689bc0d8b21 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a frame in presence of
  *          blocking toolkit modal dialog having a hidden Frame parent
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java
index 625ced92854..b88d0cddeca 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a frame in presence of
  *          blocking toolkit modal dialog having a hidden Dialog parent
diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java
index 1e91e9a5488..5b044914ce2 100644
--- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java
+++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java
@@ -25,6 +25,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8050885
  * @summary Check that calling toFront method for a frame in presence of
  *          blocking toolkit modal dialog having a visible Frame parent
diff --git a/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java b/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java
index 8f386fa136a..1648df9c065 100644
--- a/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java
+++ b/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7154048
  * @summary Window created under a mouse does not receive mouse enter event.
  *     Mouse Entered/Exited events should be generated during dragging the window
diff --git a/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowTest.java b/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowTest.java
index 909559a5f92..4067bcea32e 100644
--- a/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowTest.java
+++ b/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowTest.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7154048
  * @summary Window created under a mouse does not receive mouse enter event.
  *     Mouse Entered/Exited events are wrongly generated during dragging the window
diff --git a/jdk/test/java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java b/jdk/test/java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java
index 2591b390611..51e5dd353a9 100644
--- a/jdk/test/java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java
+++ b/jdk/test/java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7154048
  * @summary Programmatically resized  window does not receive mouse entered/exited events
  * @author  alexandr.scherbatiy area=awt.event
diff --git a/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java b/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java
index 3cb1b735837..a466c031ccd 100644
--- a/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java
+++ b/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java
@@ -29,6 +29,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8012026
  * @summary Component.getMousePosition() does not work in an applet on MacOS
  * @author Petr Pchelko
diff --git a/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java b/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
index cb8d2572d85..28f1faa82ee 100644
--- a/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
+++ b/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
@@ -30,6 +30,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8012026 8027154
  * @summary Component.getMousePosition() does not work in an applet on MacOS
  * @author Petr Pchelko
diff --git a/jdk/test/java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java b/jdk/test/java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java
index 07b798f91d0..3c4eb32998f 100644
--- a/jdk/test/java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java
+++ b/jdk/test/java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8032872
  * @summary Tests JComboBox selection via the mouse
  * @author Dmitry Markov
diff --git a/jdk/test/java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java b/jdk/test/java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java
index 272b21144d3..72f00caf6a2 100644
--- a/jdk/test/java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java
+++ b/jdk/test/java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java
@@ -26,6 +26,7 @@
 import javax.swing.*;
 /*
  * @test
+ * @key headful
  * @bug 8080137
  * @summary Dragged events for extra mouse buttons (4,5,6) are not generated
  *            on JSplitPane
diff --git a/jdk/test/java/awt/Mouse/RemovedComponentMouseListener/RemovedComponentMouseListener.java b/jdk/test/java/awt/Mouse/RemovedComponentMouseListener/RemovedComponentMouseListener.java
index 7c5d8b21e80..8e95cbb9506 100644
--- a/jdk/test/java/awt/Mouse/RemovedComponentMouseListener/RemovedComponentMouseListener.java
+++ b/jdk/test/java/awt/Mouse/RemovedComponentMouseListener/RemovedComponentMouseListener.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8061636
  * @summary fix for 7079254 changes behavior of MouseListener, MouseMotionListener
  * @library ../../regtesthelpers
diff --git a/jdk/test/java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java b/jdk/test/java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java
index da79c617269..cf916deff7d 100644
--- a/jdk/test/java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java
+++ b/jdk/test/java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 4453162
   @summary MouseAdapter should implement MouseMotionListener and MouseWheelListener
   @author andrei.dmitriev: area=
diff --git a/jdk/test/java/awt/MouseInfo/JContainerMousePositionTest.java b/jdk/test/java/awt/MouseInfo/JContainerMousePositionTest.java
index 028d2e180cb..50ae4325a4b 100644
--- a/jdk/test/java/awt/MouseInfo/JContainerMousePositionTest.java
+++ b/jdk/test/java/awt/MouseInfo/JContainerMousePositionTest.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @summary unit test for a new method in Container class: getMousePosition(boolean)
   @author dav@sparc.spb.su: area=
   @bug 4009555
diff --git a/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java b/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java
index 705f253bfd6..07b13302d63 100644
--- a/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java
+++ b/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java
@@ -22,15 +22,16 @@
  */
 
 /*
- @test
- @bug 6232687
- @summary Tests that Window.setLocationRelativeTo() method works correctly
-for different multiscreen configurations
- @author artem.ananiev, area=awt.multiscreen
- @library ../../regtesthelpers
- @build Util
- @run main LocationRelativeToTest
-*/
+ * @test
+ * @key headful
+ * @bug 6232687
+ * @summary Tests that Window.setLocationRelativeTo() method works correctly
+ *          for different multiscreen configurations
+ * @author artem.ananiev, area=awt.multiscreen
+ * @library ../../regtesthelpers
+ * @build Util
+ * @run main LocationRelativeToTest
+ */
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/jdk/test/java/awt/Multiscreen/TranslucencyThrowsExceptionWhenFullScreen/TranslucencyThrowsExceptionWhenFullScreen.java b/jdk/test/java/awt/Multiscreen/TranslucencyThrowsExceptionWhenFullScreen/TranslucencyThrowsExceptionWhenFullScreen.java
index 137f48d1ac3..9ba0f8ebf89 100644
--- a/jdk/test/java/awt/Multiscreen/TranslucencyThrowsExceptionWhenFullScreen/TranslucencyThrowsExceptionWhenFullScreen.java
+++ b/jdk/test/java/awt/Multiscreen/TranslucencyThrowsExceptionWhenFullScreen/TranslucencyThrowsExceptionWhenFullScreen.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 6838089
   @summary Translucent windows should throw exception in FS mode
   @author dmitry.cherepanov@oracle.com: area=awt-multiscreen
diff --git a/jdk/test/java/awt/Paint/ExposeOnEDT.java b/jdk/test/java/awt/Paint/ExposeOnEDT.java
index 21f7dc00c29..971735f487d 100644
--- a/jdk/test/java/awt/Paint/ExposeOnEDT.java
+++ b/jdk/test/java/awt/Paint/ExposeOnEDT.java
@@ -26,6 +26,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 7090424
  * @author Sergey Bylokhov
  * @library ../../../lib/testlibrary/
diff --git a/jdk/test/java/awt/Paint/PaintNativeOnUpdate.java b/jdk/test/java/awt/Paint/PaintNativeOnUpdate.java
index 6036cd5c54c..a1fb63df577 100644
--- a/jdk/test/java/awt/Paint/PaintNativeOnUpdate.java
+++ b/jdk/test/java/awt/Paint/PaintNativeOnUpdate.java
@@ -31,6 +31,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 7157680
  * @library ../../../lib/testlibrary
  * @build ExtendedRobot
diff --git a/jdk/test/java/awt/Paint/bug8024864.java b/jdk/test/java/awt/Paint/bug8024864.java
index 42580a4c94f..e39ff5df702 100644
--- a/jdk/test/java/awt/Paint/bug8024864.java
+++ b/jdk/test/java/awt/Paint/bug8024864.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 8024864 8031422
  * @summary [macosx] Problems with rendering of controls
  * @author Petr Pchelko
diff --git a/jdk/test/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java b/jdk/test/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java
index 156b76499a4..c1ded4726c2 100644
--- a/jdk/test/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java
+++ b/jdk/test/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java
@@ -23,6 +23,7 @@
 
 /*
   @test %I% %E%
+  @key headful
   @bug 6315717
   @summary verifies that Robot is accepting extra mouse buttons
   @author Andrei Dmitriev : area=awt.mouse
diff --git a/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java b/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java
index 1e941473061..43e37ef21f2 100644
--- a/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java
+++ b/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java
@@ -36,6 +36,7 @@
 
 /*
  * @test 8155742
+ * @key headful
  * @summary Make sure that modifier key mask is set when robot press
  *          some key with one or more modifiers.
  * @library ../../../../lib/testlibrary/
diff --git a/jdk/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java b/jdk/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java
index 94f1d911f89..fbd1ce81276 100644
--- a/jdk/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java
+++ b/jdk/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java
@@ -26,7 +26,9 @@
  */
 
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 7129742
  * @summary Focus in non-editable TextArea is not shown on Linux.
  * @author Sean Chou
diff --git a/jdk/test/java/awt/TextArea/TextAreaEditing/TextAreaEditing.java b/jdk/test/java/awt/TextArea/TextAreaEditing/TextAreaEditing.java
index f3306784ef8..9eaf23cabec 100644
--- a/jdk/test/java/awt/TextArea/TextAreaEditing/TextAreaEditing.java
+++ b/jdk/test/java/awt/TextArea/TextAreaEditing/TextAreaEditing.java
@@ -23,6 +23,7 @@
 
 /*
  @test
+ @key headful
  @bug 8040322
  @summary Test TextArea APIs replaceRange, insert, append & setText
  @run main TextAreaEditing
diff --git a/jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh b/jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh
index f772c25245f..5b71b0d1771 100644
--- a/jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh
+++ b/jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh
@@ -25,6 +25,7 @@
 
 #
 #   @test       ShowExitTest.sh
+#   @key        headful
 #   @bug        6513421
 #   @summary    Java process does not terminate on closing the Main Application Frame
 #
diff --git a/jdk/test/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java b/jdk/test/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java
index 37aef352a15..edd8e0ec6f6 100644
--- a/jdk/test/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java
+++ b/jdk/test/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java
@@ -26,6 +26,7 @@
 
 /*
   @test
+  @key headful
   @summary verify LOCK buttons toogle
   @author Yuri.Nesterenko, Dmitriy.Ermashov
   @library ../../../../lib/testlibrary
diff --git a/jdk/test/java/awt/Toolkit/SecurityTest/SecurityTest2.java b/jdk/test/java/awt/Toolkit/SecurityTest/SecurityTest2.java
index 3424d02501d..4fa3a7c294a 100644
--- a/jdk/test/java/awt/Toolkit/SecurityTest/SecurityTest2.java
+++ b/jdk/test/java/awt/Toolkit/SecurityTest/SecurityTest2.java
@@ -22,13 +22,14 @@
  */
 
 /*
-  @test
-  @bug 6599601
-  @summary tests that a simple GUI application runs without any
-exceptions thrown
-  @author Artem.Ananiev area=awt.Toolkit
-  @run main SecurityTest2
-*/
+ * @test
+ * @key headful
+ * @bug 6599601
+ * @summary tests that a simple GUI application runs without any
+ *          exceptions thrown
+ * @author Artem.Ananiev area=awt.Toolkit
+ * @run main SecurityTest2
+ */
 
 import java.awt.*;
 
diff --git a/jdk/test/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java b/jdk/test/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java
index 5220546fd63..1b607817698 100644
--- a/jdk/test/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java
+++ b/jdk/test/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java
@@ -23,6 +23,7 @@
 
 /*
  @test
+ @key headful
   @bug 8007220
   @summary Reference to the popup leaks after the TrayIcon is removed
   @author Petr Pchelko
diff --git a/jdk/test/java/awt/Window/8027025/Test8027025.java b/jdk/test/java/awt/Window/8027025/Test8027025.java
index e798354264f..5436b9d6e5a 100644
--- a/jdk/test/java/awt/Window/8027025/Test8027025.java
+++ b/jdk/test/java/awt/Window/8027025/Test8027025.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 8027025
  * @summary [macosx] getLocationOnScreen returns 0 if parent invisible
  * @author Petr Pchelko
diff --git a/jdk/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopFieldTest.java b/jdk/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopFieldTest.java
index 5cfaa00419c..dfba6da9adf 100644
--- a/jdk/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopFieldTest.java
+++ b/jdk/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopFieldTest.java
@@ -26,6 +26,7 @@
 import java.awt.Window;
 /**
  * @test
+ * @key headful
  * @bug 7081594
  * @author Alexander Scherbatiy
  * @summary Windows owned by an always-on-top window DO NOT automatically become always-on-top
@@ -37,7 +38,7 @@ public static void main(String[] args) {
         Robot robot;
         try {
             robot = new Robot();
-        }catch(Exception ex) {
+        } catch(Exception ex) {
             ex.printStackTrace();
             throw new RuntimeException("Unexpected failure");
         }
diff --git a/jdk/test/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java b/jdk/test/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java
index 07843be5ea6..9ba503f38b3 100644
--- a/jdk/test/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java
+++ b/jdk/test/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 4632143
   @summary Unit test for the RFE window/frame/dialog always on top
   @author dom@sparc.spb.su: area=awt.toplevel
diff --git a/jdk/test/java/awt/Window/MaximizeOffscreen/MaximizeOffscreenTest.java b/jdk/test/java/awt/Window/MaximizeOffscreen/MaximizeOffscreenTest.java
index 78155f3b9b3..31d931ef244 100644
--- a/jdk/test/java/awt/Window/MaximizeOffscreen/MaximizeOffscreenTest.java
+++ b/jdk/test/java/awt/Window/MaximizeOffscreen/MaximizeOffscreenTest.java
@@ -23,6 +23,7 @@
 
 /**
  * @test @summary JVM crash if the frame maximized from offscreen
+ * @key headful
  * @bug 8020210
  * @author Petr Pchelko
  * @library ../../regtesthelpers
diff --git a/jdk/test/java/awt/Window/OwnedWindowsSerialization/OwnedWindowsSerialization.java b/jdk/test/java/awt/Window/OwnedWindowsSerialization/OwnedWindowsSerialization.java
index 9100c500674..0b3b7995593 100644
--- a/jdk/test/java/awt/Window/OwnedWindowsSerialization/OwnedWindowsSerialization.java
+++ b/jdk/test/java/awt/Window/OwnedWindowsSerialization/OwnedWindowsSerialization.java
@@ -28,7 +28,9 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 8027152
  * @summary Checks that ownedWindowList is serialized and deserialized properly and alwaysOnTop works after deserialization
  * @author Petr Pchelko
diff --git a/jdk/test/java/awt/Window/TopLevelLocation/TopLevelLocation.java b/jdk/test/java/awt/Window/TopLevelLocation/TopLevelLocation.java
index 9e229b7198f..15301882151 100644
--- a/jdk/test/java/awt/Window/TopLevelLocation/TopLevelLocation.java
+++ b/jdk/test/java/awt/Window/TopLevelLocation/TopLevelLocation.java
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8027628
  * @author Oleg Pekhovskiy
  * @summary JWindow jumps to (0, 0) after mouse clicked
diff --git a/jdk/test/java/awt/Window/WindowGCInFullScreen/WindowGCInFullScreen.java b/jdk/test/java/awt/Window/WindowGCInFullScreen/WindowGCInFullScreen.java
index 2b044def4b0..edc7bcedd19 100644
--- a/jdk/test/java/awt/Window/WindowGCInFullScreen/WindowGCInFullScreen.java
+++ b/jdk/test/java/awt/Window/WindowGCInFullScreen/WindowGCInFullScreen.java
@@ -32,6 +32,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8019591
  * @author Sergey Bylokhov
  */
diff --git a/jdk/test/java/awt/Window/WindowJumpingTest/WindowJumpingTest.java b/jdk/test/java/awt/Window/WindowJumpingTest/WindowJumpingTest.java
index f2e210053e7..f73f0585450 100644
--- a/jdk/test/java/awt/Window/WindowJumpingTest/WindowJumpingTest.java
+++ b/jdk/test/java/awt/Window/WindowJumpingTest/WindowJumpingTest.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 8080729
  * @summary Dialogs on multiscreen jump to parent frame on focus gain
  * @author Dmitry Markov
diff --git a/jdk/test/java/awt/Window/WindowsLeak/WindowsLeak.java b/jdk/test/java/awt/Window/WindowsLeak/WindowsLeak.java
index 3f44687251b..8d5f72f4e9c 100644
--- a/jdk/test/java/awt/Window/WindowsLeak/WindowsLeak.java
+++ b/jdk/test/java/awt/Window/WindowsLeak/WindowsLeak.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8013563 8028486
  * @summary Tests that windows are removed from windows list
  * @library /javax/swing/regtesthelpers
diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/NullDataFlavorTest.java b/jdk/test/java/awt/datatransfer/DataFlavor/NullDataFlavorTest.java
index 6880f3e2551..4b7ab8498ac 100644
--- a/jdk/test/java/awt/datatransfer/DataFlavor/NullDataFlavorTest.java
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/NullDataFlavorTest.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 4682039
   @summary Tests that DataTransferer.getFormatsForFlavors() does not throw
            NullPointerException if some of given as parameter data flavors
diff --git a/jdk/test/java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java b/jdk/test/java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java
index b8bfb44bfd0..4722f0709cc 100644
--- a/jdk/test/java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java
+++ b/jdk/test/java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8029979
  * @summary Checks if acceptDrop() can be called several times
  * @library ../../regtesthelpers
diff --git a/jdk/test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java b/jdk/test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java
index 16d938f98f6..cafd01b0daa 100644
--- a/jdk/test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java
+++ b/jdk/test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8024163
  * @summary Checks the dragEnter event is correctly generated
  * @library ../../regtesthelpers
diff --git a/jdk/test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java b/jdk/test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java
index 3863667c8b2..7b53573b10d 100644
--- a/jdk/test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java
+++ b/jdk/test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8024163
  * @summary Checks that dragExit is generated when the new DropTarget is created under the drag
  * @library ../../regtesthelpers
diff --git a/jdk/test/java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java b/jdk/test/java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java
index 8854c7d74a5..5a5b225f5a4 100644
--- a/jdk/test/java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java
+++ b/jdk/test/java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8027913
  * @library ../../regtesthelpers
  * @build Util
diff --git a/jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java b/jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java
index 741c4813903..811d27cf8d7 100644
--- a/jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java
+++ b/jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java
@@ -22,12 +22,13 @@
  */
 
 /*
-@test
-@bug 8068283
-@summary Checks that <Alt>+Char accelerators work when pressed in a text component
-@author Anton Nashatyrev
-@run main AltCharAcceleratorTest
-*/
+ * @test
+ * @key headful
+ * @bug 8068283
+ * @summary Checks that <Alt>+Char accelerators work when pressed in a text component
+ * @author Anton Nashatyrev
+ * @run main AltCharAcceleratorTest
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java b/jdk/test/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java
index 259f1fcd458..9b2c9045b85 100644
--- a/jdk/test/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java
+++ b/jdk/test/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 6451578
   @library ../../../regtesthelpers
   @build Sysout AbstractTest Util
diff --git a/jdk/test/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java b/jdk/test/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java
index 8acf2e44afe..8c4a38eb647 100644
--- a/jdk/test/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java
+++ b/jdk/test/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java
@@ -28,6 +28,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8007156 8025126
  * @summary Extended key code is not set for a key event
  * @author Alexandr Scherbatiy
diff --git a/jdk/test/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java b/jdk/test/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java
index f6b00c4c1cf..ec56f475f02 100644
--- a/jdk/test/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java
+++ b/jdk/test/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8043126
  * @summary Check whether
  *          1. correct extended modifiers are returned
@@ -268,4 +269,3 @@ public static void main(String[] args) throws Exception {
         test.doTest();
     }
 }
-
diff --git a/jdk/test/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java b/jdk/test/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java
index 3400444ebbd..2b8dc0d2f72 100644
--- a/jdk/test/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java
+++ b/jdk/test/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8043126
  * @summary Check whether KeyEvent.getModifiers() returns correct modifiers
  *          when Ctrl, Alt or Shift keys are pressed.
diff --git a/jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java b/jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java
index 310e78f9ff8..15a2501148d 100644
--- a/jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java
+++ b/jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug       7154072 7161320
   @summary   Tests that key events with modifiers are not swallowed.
   @author    anton.tarasov: area=awt.focus
diff --git a/jdk/test/java/awt/event/MouseEvent/DisabledComponents/DisabledComponentsTest.java b/jdk/test/java/awt/event/MouseEvent/DisabledComponents/DisabledComponentsTest.java
index 3da25c6d9c0..d16cd41088e 100644
--- a/jdk/test/java/awt/event/MouseEvent/DisabledComponents/DisabledComponentsTest.java
+++ b/jdk/test/java/awt/event/MouseEvent/DisabledComponents/DisabledComponentsTest.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 4173714
   @summary java.awt.button behaves differently under Win32/Solaris
   @author tdv@sparc.spb.su
diff --git a/jdk/test/java/awt/event/MouseEvent/EnterAsGrabbedEvent/EnterAsGrabbedEvent.java b/jdk/test/java/awt/event/MouseEvent/EnterAsGrabbedEvent/EnterAsGrabbedEvent.java
index 8f62e4ffd8a..9757b4032fd 100644
--- a/jdk/test/java/awt/event/MouseEvent/EnterAsGrabbedEvent/EnterAsGrabbedEvent.java
+++ b/jdk/test/java/awt/event/MouseEvent/EnterAsGrabbedEvent/EnterAsGrabbedEvent.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 6317481 8012325
   @summary REG:Pressing the mouse, dragging and releasing it outside the button triggers ActionEvent, XAWT
   @author Dmitry.Cherepanov@SUN.COM area=awt.event
diff --git a/jdk/test/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java b/jdk/test/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java
index 850679c6d44..8733b3af7f1 100644
--- a/jdk/test/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java
+++ b/jdk/test/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java
@@ -40,6 +40,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8043126
  * @summary Check whether MouseEvent.getModifiers(), MouseEvent.getModifiersEx()
  *          and KeyEvent.getModifiers() return correct modifiers when pressing
diff --git a/jdk/test/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java b/jdk/test/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java
index cc36b0c35b8..49459e49404 100644
--- a/jdk/test/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java
+++ b/jdk/test/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java
@@ -38,6 +38,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8043126
  * @summary Check whether getButton() returns correct mouse button
  *          number when the mouse buttons are pressed and getModifiers()
diff --git a/jdk/test/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java b/jdk/test/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java
index df143b78c05..11527a3d047 100644
--- a/jdk/test/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java
+++ b/jdk/test/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java
@@ -32,6 +32,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8043126
  * @summary Check whether correct modifiers set when multiple mouse buttons were pressed;
  *          check number of received events.
diff --git a/jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java b/jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java
index 42695a51763..d942395bc8a 100644
--- a/jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java
+++ b/jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 6479820
   @library ../../../regtesthelpers
   @build Util
diff --git a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java
index f0efaf12cc6..e2c42d3940a 100644
--- a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java
+++ b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 6480024
   @library ../../../regtesthelpers
   @build Util Sysout AbstractTest
diff --git a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java
index 0b6639a073e..c5f7d174be6 100644
--- a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java
+++ b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 6480024
   @library ../../../regtesthelpers
   @build Util Sysout AbstractTest
diff --git a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java
index bf8fa1bb112..5dd576f7ff3 100644
--- a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java
+++ b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 6480024
   @library ../../../regtesthelpers
   @build Util Sysout AbstractTest
diff --git a/jdk/test/java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java b/jdk/test/java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java
index 28fd50a2664..8f16b03747e 100644
--- a/jdk/test/java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java
+++ b/jdk/test/java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java
@@ -21,11 +21,14 @@
  * questions.
  */
 
-/* @test
+/*
+   @test
+   @key headful
    @bug 8041470
    @summary JButtons stay pressed after they have lost focus if you use the mouse wheel
    @author Anton Nashatyrev
-*/
+ */
+
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
diff --git a/jdk/test/java/awt/event/TextEvent/TextEventSequenceTest/TextEventSequenceTest.java b/jdk/test/java/awt/event/TextEvent/TextEventSequenceTest/TextEventSequenceTest.java
index 0c06ba162eb..416d88e900b 100644
--- a/jdk/test/java/awt/event/TextEvent/TextEventSequenceTest/TextEventSequenceTest.java
+++ b/jdk/test/java/awt/event/TextEvent/TextEventSequenceTest/TextEventSequenceTest.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4028580
  * @summary TextArea does not send TextEvent when setText. Does for insert
  * @author kdm@sparc.spb.su: area= awt.TextAvent
diff --git a/jdk/test/java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java b/jdk/test/java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java
index 88103514d2c..04b21ecbff0 100644
--- a/jdk/test/java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java
+++ b/jdk/test/java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 6539458
   @summary JPopupMenu does not display if invoker is instance of JWindow
   @author oleg.sukhodolsky area=awt.grab
diff --git a/jdk/test/java/awt/im/memoryleak/InputContextMemoryLeakTest.java b/jdk/test/java/awt/im/memoryleak/InputContextMemoryLeakTest.java
index 04e4a333cdd..a557702b669 100644
--- a/jdk/test/java/awt/im/memoryleak/InputContextMemoryLeakTest.java
+++ b/jdk/test/java/awt/im/memoryleak/InputContextMemoryLeakTest.java
@@ -36,6 +36,7 @@
 
 /*
  @test
+ @key headful
  @bug 7079260
  @summary XInputContext leaks memory by needRecetXXIClient field
  @author Petr Pchelko
diff --git a/jdk/test/javax/swing/AbstractButton/6711682/bug6711682.java b/jdk/test/javax/swing/AbstractButton/6711682/bug6711682.java
index 3e1553799a8..72808d46296 100644
--- a/jdk/test/javax/swing/AbstractButton/6711682/bug6711682.java
+++ b/jdk/test/javax/swing/AbstractButton/6711682/bug6711682.java
@@ -21,12 +21,14 @@
  * questions.
  */
 
-/* @test
-   @bug 6711682
-   @summary  JCheckBox in JTable: checkbox doesn't alaways respond to the first mouse click
-   @author Alexander Potochkin
-   @run main bug6711682
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 6711682
+ * @summary  JCheckBox in JTable: checkbox doesn't alaways respond to the first mouse click
+ * @author Alexander Potochkin
+ * @run main bug6711682
+ */
 
 import javax.swing.*;
 import javax.swing.event.CellEditorListener;
diff --git a/jdk/test/javax/swing/AncestorNotifier/7193219/bug7193219.java b/jdk/test/javax/swing/AncestorNotifier/7193219/bug7193219.java
index 9fc6a7df619..1b773435d33 100644
--- a/jdk/test/javax/swing/AncestorNotifier/7193219/bug7193219.java
+++ b/jdk/test/javax/swing/AncestorNotifier/7193219/bug7193219.java
@@ -21,11 +21,13 @@
  * questions.
  */
 
-/* @test
-   @bug 7193219
-   @summary JComboBox serialization fails in JDK 1.7
-   @author Anton Litvinov
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 7193219
+ * @summary JComboBox serialization fails in JDK 1.7
+ * @author Anton Litvinov
+ */
 
 import java.io.*;
 
diff --git a/jdk/test/javax/swing/JButton/4368790/bug4368790.java b/jdk/test/javax/swing/JButton/4368790/bug4368790.java
index 9a90fb7ab05..a071fb521fb 100644
--- a/jdk/test/javax/swing/JButton/4368790/bug4368790.java
+++ b/jdk/test/javax/swing/JButton/4368790/bug4368790.java
@@ -21,12 +21,14 @@
  * questions.
  */
 
-/* @test
-   @bug 4368790
-   @summary JButton stays pressed when focus stolen
-   @author Alexander Potochkin
-   @run main bug4368790
-*/
+/*
+ * @test
+ * @key headful
+ *    @bug 4368790
+ *    @summary JButton stays pressed when focus stolen
+ *    @author Alexander Potochkin
+ *    @run main bug4368790
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java b/jdk/test/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java
index e0182a5fc03..9f016626312 100644
--- a/jdk/test/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java
+++ b/jdk/test/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java
@@ -33,6 +33,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8009919
  * @author Sergey Bylokhov
  * @library ../../../../lib/testlibrary/
diff --git a/jdk/test/javax/swing/JColorChooser/Test6541987.java b/jdk/test/javax/swing/JColorChooser/Test6541987.java
index 7a946e1b25d..84053cd1b8f 100644
--- a/jdk/test/javax/swing/JColorChooser/Test6541987.java
+++ b/jdk/test/javax/swing/JColorChooser/Test6541987.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6541987
  * @summary Tests closing by ESC
  * @author Sergey Malenkov
diff --git a/jdk/test/javax/swing/JColorChooser/Test6559154.java b/jdk/test/javax/swing/JColorChooser/Test6559154.java
index ab2a8ba130c..1ebc4d94dd0 100644
--- a/jdk/test/javax/swing/JColorChooser/Test6559154.java
+++ b/jdk/test/javax/swing/JColorChooser/Test6559154.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6559154
  * @summary Tests EDT hanging
  * @author Sergey Malenkov
diff --git a/jdk/test/javax/swing/JColorChooser/Test6827032.java b/jdk/test/javax/swing/JColorChooser/Test6827032.java
index 4d8998793e9..fff9834d687 100644
--- a/jdk/test/javax/swing/JColorChooser/Test6827032.java
+++ b/jdk/test/javax/swing/JColorChooser/Test6827032.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6827032
  * @summary Color chooser with drag enabled shouldn't throw NPE
  * @author Peter Zhelezniakov
diff --git a/jdk/test/javax/swing/JColorChooser/Test7194184.java b/jdk/test/javax/swing/JColorChooser/Test7194184.java
index 70201764032..460aefaf3b5 100644
--- a/jdk/test/javax/swing/JColorChooser/Test7194184.java
+++ b/jdk/test/javax/swing/JColorChooser/Test7194184.java
@@ -27,6 +27,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7194184
  * @summary Tests JColorChooser Swatch keyboard accessibility.
  * @author Sean Chou
diff --git a/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java b/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java
index 83392bae45b..32aa367a1c6 100644
--- a/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java
+++ b/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java
@@ -21,14 +21,16 @@
  * questions.
  */
 
-/* @test
+/*
+   @test
+   @key headful
    @bug 4199622
    @summary RFE: JComboBox shouldn't send ActionEvents for keyboard navigation
    @author Vladislav Karnaukhov
    @library ../../../../lib/testlibrary
    @build jdk.testlibrary.OSInfo
    @run main bug4199622
-*/
+ */
 
 import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
 import jdk.testlibrary.OSInfo;
diff --git a/jdk/test/javax/swing/JComboBox/4515752/DefaultButtonTest.java b/jdk/test/javax/swing/JComboBox/4515752/DefaultButtonTest.java
index 88abb7b574b..eeb87ce5d8c 100644
--- a/jdk/test/javax/swing/JComboBox/4515752/DefaultButtonTest.java
+++ b/jdk/test/javax/swing/JComboBox/4515752/DefaultButtonTest.java
@@ -27,6 +27,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 4515752 4337071
  * @author Mark Davidson
  * @summary Tests the invocation of the default button within the JComboBox.
diff --git a/jdk/test/javax/swing/JComboBox/4523758/bug4523758.java b/jdk/test/javax/swing/JComboBox/4523758/bug4523758.java
index 423f89d8bff..25e5ee6755f 100644
--- a/jdk/test/javax/swing/JComboBox/4523758/bug4523758.java
+++ b/jdk/test/javax/swing/JComboBox/4523758/bug4523758.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 4523758
  * @summary Directly check that torn-off combo works
  * @library ../../../../lib/testlibrary
diff --git a/jdk/test/javax/swing/JComboBox/4743225/bug4743225.java b/jdk/test/javax/swing/JComboBox/4743225/bug4743225.java
index 76c2f1cea27..76ace04857a 100644
--- a/jdk/test/javax/swing/JComboBox/4743225/bug4743225.java
+++ b/jdk/test/javax/swing/JComboBox/4743225/bug4743225.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 4743225
  * @summary Size of JComboBox list is wrong when list is populated via PopupMenuListener
  * @author Alexander Potochkin
diff --git a/jdk/test/javax/swing/JComboBox/6236162/bug6236162.java b/jdk/test/javax/swing/JComboBox/6236162/bug6236162.java
index 66d6cb73282..56b85ff1b1a 100644
--- a/jdk/test/javax/swing/JComboBox/6236162/bug6236162.java
+++ b/jdk/test/javax/swing/JComboBox/6236162/bug6236162.java
@@ -20,16 +20,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* @test
-   @bug 6236162
-   @summary Checks that there is no an inconsistence in combo box
-            behavior when user points an item in combo popup
-            by mouse and then uses UP/DOWN keys.
-   @library ../../regtesthelpers
-   @build Util
-   @author Mikhail Lapshin
-   @run main bug6236162
-*/
+
+/*
+ * @test
+ * @key headful
+ * @bug 6236162
+ * @summary Checks that there is no an inconsistence in combo box
+ *          behavior when user points an item in combo popup
+ *          by mouse and then uses UP/DOWN keys.
+ * @library ../../regtesthelpers
+ * @build Util
+ * @author Mikhail Lapshin
+ * @run main bug6236162
+ */
 
 import javax.swing.*;
 import javax.swing.plaf.basic.*;
diff --git a/jdk/test/javax/swing/JComboBox/6406264/bug6406264.java b/jdk/test/javax/swing/JComboBox/6406264/bug6406264.java
index 91356c3d476..75de8c97e2e 100644
--- a/jdk/test/javax/swing/JComboBox/6406264/bug6406264.java
+++ b/jdk/test/javax/swing/JComboBox/6406264/bug6406264.java
@@ -23,11 +23,13 @@
  * questions.
  */
 
-/* @test
-   @bug 6406264
-   @summary Tests that JComboBox's focusable popup can be shown.
-   @author Mikhail Lapshin
-   @run main bug6406264
+/*
+ * @test
+ * @key headful
+ * @bug 6406264
+ * @summary Tests that JComboBox's focusable popup can be shown.
+ * @author Mikhail Lapshin
+ * @run main bug6406264
  */
 
 import javax.swing.JComboBox;
diff --git a/jdk/test/javax/swing/JComboBox/6559152/bug6559152.java b/jdk/test/javax/swing/JComboBox/6559152/bug6559152.java
index d04e6004a8f..a857f968073 100644
--- a/jdk/test/javax/swing/JComboBox/6559152/bug6559152.java
+++ b/jdk/test/javax/swing/JComboBox/6559152/bug6559152.java
@@ -20,15 +20,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* @test
-   @bug 6559152
-   @summary Checks that you can select an item in JComboBox with keyboard
-            when it is a JTable cell editor.
-   @author Mikhail Lapshin
-   @library ../../../../lib/testlibrary
-   @build ExtendedRobot
-   @run main bug6559152
-*/
+
+/*
+ * @test
+ * @key headful
+ * @bug 6559152
+ * @summary Checks that you can select an item in JComboBox with keyboard
+ *          when it is a JTable cell editor.
+ * @author Mikhail Lapshin
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @run main bug6559152
+ */
 
 import javax.swing.*;
 import javax.swing.table.DefaultTableModel;
diff --git a/jdk/test/javax/swing/JComboBox/6607130/bug6607130.java b/jdk/test/javax/swing/JComboBox/6607130/bug6607130.java
index 86850f308b7..f80da53692a 100644
--- a/jdk/test/javax/swing/JComboBox/6607130/bug6607130.java
+++ b/jdk/test/javax/swing/JComboBox/6607130/bug6607130.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 6607130
  * @summary Checks that JComboBox cell editor is hidden if the same
  *          item is selected with keyboard.
diff --git a/jdk/test/javax/swing/JComboBox/7195179/Test7195179.java b/jdk/test/javax/swing/JComboBox/7195179/Test7195179.java
index f22084a87bc..7680bea4535 100644
--- a/jdk/test/javax/swing/JComboBox/7195179/Test7195179.java
+++ b/jdk/test/javax/swing/JComboBox/7195179/Test7195179.java
@@ -35,6 +35,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7195179
  * @summary Tests that combobox works with generified renderers
  * @author Sergey Malenkov
diff --git a/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java b/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java
index 37a8c0d6404..5a6b411cfd9 100644
--- a/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java
+++ b/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java
@@ -38,8 +38,9 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8015300
- * @summary Tests that editable combobox select all text
+ * @summary Tests that editable combobox selects all text.
  * @author Sergey Malenkov
  * @library ../../../../lib/testlibrary/
  * @build ExtendedRobot
diff --git a/jdk/test/javax/swing/JComboBox/8032878/bug8032878.java b/jdk/test/javax/swing/JComboBox/8032878/bug8032878.java
index a15119c68e8..84607d0ea48 100644
--- a/jdk/test/javax/swing/JComboBox/8032878/bug8032878.java
+++ b/jdk/test/javax/swing/JComboBox/8032878/bug8032878.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 8032878 8078855
  * @summary Checks that JComboBox as JTable cell editor processes key events
  *          even where setSurrendersFocusOnKeystroke flag in JTable is false and
diff --git a/jdk/test/javax/swing/JComboBox/8033069/bug8033069NoScrollBar.java b/jdk/test/javax/swing/JComboBox/8033069/bug8033069NoScrollBar.java
index dfe87ba8a64..2d757073ddb 100644
--- a/jdk/test/javax/swing/JComboBox/8033069/bug8033069NoScrollBar.java
+++ b/jdk/test/javax/swing/JComboBox/8033069/bug8033069NoScrollBar.java
@@ -35,7 +35,9 @@
 import javax.swing.UIManager.LookAndFeelInfo;
 import javax.swing.UnsupportedLookAndFeelException;
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 8033069
  * @summary Checks that JComboBox popup does not close when mouse wheel is
  *          rotated over combo box and over its popup. The case where popup
diff --git a/jdk/test/javax/swing/JComboBox/8033069/bug8033069ScrollBar.java b/jdk/test/javax/swing/JComboBox/8033069/bug8033069ScrollBar.java
index 7644c80ab23..00f9846951b 100644
--- a/jdk/test/javax/swing/JComboBox/8033069/bug8033069ScrollBar.java
+++ b/jdk/test/javax/swing/JComboBox/8033069/bug8033069ScrollBar.java
@@ -23,7 +23,9 @@
 
 import java.awt.AWTException;
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 8033069
  * @summary Checks that JComboBox popup does not close when mouse wheel is
  *          rotated over combo box and over its popup. The case where
diff --git a/jdk/test/javax/swing/JComboBox/8057893/bug8057893.java b/jdk/test/javax/swing/JComboBox/8057893/bug8057893.java
index 76944ed902c..de8efce5b88 100644
--- a/jdk/test/javax/swing/JComboBox/8057893/bug8057893.java
+++ b/jdk/test/javax/swing/JComboBox/8057893/bug8057893.java
@@ -33,6 +33,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8057893
  * @author Alexander Scherbatiy
  * @summary JComboBox actionListener never receives "comboBoxEdited"
diff --git a/jdk/test/javax/swing/JComboBox/8072767/bug8072767.java b/jdk/test/javax/swing/JComboBox/8072767/bug8072767.java
index 826e4631dab..9cfddd46cec 100644
--- a/jdk/test/javax/swing/JComboBox/8072767/bug8072767.java
+++ b/jdk/test/javax/swing/JComboBox/8072767/bug8072767.java
@@ -37,6 +37,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8072767
  * @author Alexander Scherbatiy
  * @summary DefaultCellEditor for comboBox creates ActionEvent with wrong source
diff --git a/jdk/test/javax/swing/JComboBox/8136998/bug8136998.java b/jdk/test/javax/swing/JComboBox/8136998/bug8136998.java
index e7d9e0ac465..8da5d361edf 100644
--- a/jdk/test/javax/swing/JComboBox/8136998/bug8136998.java
+++ b/jdk/test/javax/swing/JComboBox/8136998/bug8136998.java
@@ -38,7 +38,9 @@
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.WindowConstants;
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 8136998
  * @summary Checks that JComboBox does not prevent mouse-wheel scrolling JScrollPane.
  * @library ../../regtesthelpers
diff --git a/jdk/test/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java b/jdk/test/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java
index ab283691dc5..e9c8281d710 100644
--- a/jdk/test/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java
+++ b/jdk/test/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java
@@ -30,6 +30,7 @@
 
 /*
   @test
+  @key headful
   @bug 8031485 8058193
   @summary Combo box consuming escape and enter key events
   @author Petr Pchelko
diff --git a/jdk/test/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java b/jdk/test/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java
index 52b9e71ea29..df2ac320ddc 100644
--- a/jdk/test/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java
+++ b/jdk/test/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java
@@ -21,12 +21,14 @@
  * questions.
  */
 
-/* @test
-   @bug 8006417
-   @summary JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X
-   @author Anton Litvinov
-   @run main ShowPopupAfterHidePopupTest
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 8006417
+ * @summary JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X
+ * @author Anton Litvinov
+ * @run main ShowPopupAfterHidePopupTest
+ */
 
 import java.awt.*;
 
diff --git a/jdk/test/javax/swing/JComponent/6989617/bug6989617.java b/jdk/test/javax/swing/JComponent/6989617/bug6989617.java
index a13201df761..ff6bd7f10b5 100644
--- a/jdk/test/javax/swing/JComponent/6989617/bug6989617.java
+++ b/jdk/test/javax/swing/JComponent/6989617/bug6989617.java
@@ -21,12 +21,14 @@
  * questions.
  */
 
-/* @test
-   @bug 6989617
-   @summary Enable JComponent to control repaintings of its children
-   @author Alexander Potochkin
-   @run main bug6989617
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 6989617
+ * @summary Enable JComponent to control repaintings of its children
+ * @author Alexander Potochkin
+ * @run main bug6989617
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/JComponent/7154030/bug7154030.java b/jdk/test/javax/swing/JComponent/7154030/bug7154030.java
index dab2d3c9ba9..b671a1fee8d 100644
--- a/jdk/test/javax/swing/JComponent/7154030/bug7154030.java
+++ b/jdk/test/javax/swing/JComponent/7154030/bug7154030.java
@@ -40,7 +40,9 @@
 import java.awt.Toolkit;
 import java.awt.image.BufferedImage;
 
-/* @test 1.1 2012/04/12
+/*
+ * @test
+ * @key headful
  * @bug 7154030
  * @summary Swing components fail to hide after calling hide()
  * @author Jonathan Lu
diff --git a/jdk/test/javax/swing/JDialog/WrongBackgroundColor/WrongBackgroundColor.java b/jdk/test/javax/swing/JDialog/WrongBackgroundColor/WrongBackgroundColor.java
index 63b6e71cbf5..a910e0df877 100644
--- a/jdk/test/javax/swing/JDialog/WrongBackgroundColor/WrongBackgroundColor.java
+++ b/jdk/test/javax/swing/JDialog/WrongBackgroundColor/WrongBackgroundColor.java
@@ -33,6 +33,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8033786
  * @summary JDialog should update background color of the native peer.
  * @author Sergey Bylokhov
diff --git a/jdk/test/javax/swing/JEditorPane/4492274/bug4492274.java b/jdk/test/javax/swing/JEditorPane/4492274/bug4492274.java
index 369f05f17a7..179450d963a 100644
--- a/jdk/test/javax/swing/JEditorPane/4492274/bug4492274.java
+++ b/jdk/test/javax/swing/JEditorPane/4492274/bug4492274.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 4492274
  * @summary  Tests if JEditorPane.getPage() correctly returns anchor reference.
  * @author Denis Sharypov
diff --git a/jdk/test/javax/swing/JEditorPane/6917744/bug6917744.java b/jdk/test/javax/swing/JEditorPane/6917744/bug6917744.java
index 75af9834b91..8eaa5256f63 100644
--- a/jdk/test/javax/swing/JEditorPane/6917744/bug6917744.java
+++ b/jdk/test/javax/swing/JEditorPane/6917744/bug6917744.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 6917744
  * @summary JScrollPane Page Up/Down keys do not handle correctly html tables with different cells contents
  * @author Pavel Porvatov
diff --git a/jdk/test/javax/swing/JFileChooser/4524490/bug4524490.java b/jdk/test/javax/swing/JFileChooser/4524490/bug4524490.java
index 81a5259e420..5fdb1642f3e 100644
--- a/jdk/test/javax/swing/JFileChooser/4524490/bug4524490.java
+++ b/jdk/test/javax/swing/JFileChooser/4524490/bug4524490.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4524490
  * @summary Tests if in JFileChooser, ALT+L does not bring focus to 'Files' selection list in Motif LAF
  * @author Konstantin Eremin
diff --git a/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java b/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java
index a4df9535d97..87985896367 100644
--- a/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java
+++ b/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6396844
  * @summary Tests memory leak for 20000 files
  * @author Sergey Malenkov
diff --git a/jdk/test/javax/swing/JFileChooser/7199708/bug7199708.java b/jdk/test/javax/swing/JFileChooser/7199708/bug7199708.java
index 2b10137366a..641ddfa3ffa 100644
--- a/jdk/test/javax/swing/JFileChooser/7199708/bug7199708.java
+++ b/jdk/test/javax/swing/JFileChooser/7199708/bug7199708.java
@@ -40,6 +40,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 7199708
  * @author Alexander Scherbatiy
  * @summary FileChooser crashs when opening large folder
diff --git a/jdk/test/javax/swing/JFileChooser/8002077/bug8002077.java b/jdk/test/javax/swing/JFileChooser/8002077/bug8002077.java
index 4a76b7dd228..d9fcdcf4781 100644
--- a/jdk/test/javax/swing/JFileChooser/8002077/bug8002077.java
+++ b/jdk/test/javax/swing/JFileChooser/8002077/bug8002077.java
@@ -30,6 +30,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8002077
  * @author Alexander Scherbatiy
  * @summary Possible mnemonic issue on JFileChooser Save button on nimbus L&F
diff --git a/jdk/test/javax/swing/JFileChooser/8021253/bug8021253.java b/jdk/test/javax/swing/JFileChooser/8021253/bug8021253.java
index 3839c5abf9e..831711b260f 100644
--- a/jdk/test/javax/swing/JFileChooser/8021253/bug8021253.java
+++ b/jdk/test/javax/swing/JFileChooser/8021253/bug8021253.java
@@ -35,6 +35,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8021253
  * @author Alexander Scherbatiy
  * @summary JFileChooser does not react on pressing enter since java 7
diff --git a/jdk/test/javax/swing/JFrame/HangNonVolatileBuffer/HangNonVolatileBuffer.java b/jdk/test/javax/swing/JFrame/HangNonVolatileBuffer/HangNonVolatileBuffer.java
index c61be1cb0fc..db8d0de2500 100644
--- a/jdk/test/javax/swing/JFrame/HangNonVolatileBuffer/HangNonVolatileBuffer.java
+++ b/jdk/test/javax/swing/JFrame/HangNonVolatileBuffer/HangNonVolatileBuffer.java
@@ -28,6 +28,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8029455
  * @summary Swing should not hang if non-volatile image is used as a backbuffer.
  * @run main/othervm -Dswing.volatileImageBufferEnabled=false HangNonVolatileBuffer
diff --git a/jdk/test/javax/swing/JInternalFrame/5066752/bug5066752.java b/jdk/test/javax/swing/JInternalFrame/5066752/bug5066752.java
index 3ed42fc59ec..4182cca6278 100644
--- a/jdk/test/javax/swing/JInternalFrame/5066752/bug5066752.java
+++ b/jdk/test/javax/swing/JInternalFrame/5066752/bug5066752.java
@@ -22,6 +22,7 @@
  */
 /*
   @test
+  @key headful
   @bug 5066752
   @summary  Transparent JDesktopPane impossible because isOpaque() returns true
   @author mb50250: area=JDesktopPane
diff --git a/jdk/test/javax/swing/JInternalFrame/6647340/bug6647340.java b/jdk/test/javax/swing/JInternalFrame/6647340/bug6647340.java
index 8bb1ffc92e1..283e40fc39b 100644
--- a/jdk/test/javax/swing/JInternalFrame/6647340/bug6647340.java
+++ b/jdk/test/javax/swing/JInternalFrame/6647340/bug6647340.java
@@ -22,6 +22,7 @@
  */
 
 /* @test
+ * @key headful
  * @bug 6647340
  * @summary Checks that iconified internal frame follows
  *          the main frame borders properly.
diff --git a/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java b/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java
index 6fb9b655b77..4dc6f0d8ab8 100644
--- a/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java
+++ b/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java
@@ -22,6 +22,7 @@
  */
 
 /* @test
+ * @key headful
  * @bug 6725409
  * @summary Checks that JInternalFrame's system menu
  *          can be localized during run-time
diff --git a/jdk/test/javax/swing/JInternalFrame/8020708/bug8020708.java b/jdk/test/javax/swing/JInternalFrame/8020708/bug8020708.java
index 9aaa5afe2e0..a379c153661 100644
--- a/jdk/test/javax/swing/JInternalFrame/8020708/bug8020708.java
+++ b/jdk/test/javax/swing/JInternalFrame/8020708/bug8020708.java
@@ -35,6 +35,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8020708
  * @author Alexander Scherbatiy
  * @summary NLS: mnemonics missing in SwingSet2/JInternalFrame demo
diff --git a/jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java b/jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java
index a00812602fd..df332e2a044 100644
--- a/jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java
+++ b/jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java
@@ -21,11 +21,13 @@
  * questions.
  */
 
- /* @test
-    @bug 8012004
-    @summary JINTERNALFRAME NOT BEING FINALIZED AFTER CLOSING
-    @author mcherkas
-    @run main InternalFrameIsNotCollectedTest
+/*
+ * @test
+ * @key headful
+ * @bug 8012004
+ * @summary JINTERNALFRAME NOT BEING FINALIZED AFTER CLOSING
+ * @author mcherkas
+ * @run main InternalFrameIsNotCollectedTest
  */
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/JInternalFrame/Test6505027.java b/jdk/test/javax/swing/JInternalFrame/Test6505027.java
index 36c3db3b2d7..23971408184 100644
--- a/jdk/test/javax/swing/JInternalFrame/Test6505027.java
+++ b/jdk/test/javax/swing/JInternalFrame/Test6505027.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6505027
  * @summary Tests focus problem inside internal frame
  * @author Sergey Malenkov
diff --git a/jdk/test/javax/swing/JInternalFrame/Test6802868.java b/jdk/test/javax/swing/JInternalFrame/Test6802868.java
index 61e17174e7b..1222e8780f9 100644
--- a/jdk/test/javax/swing/JInternalFrame/Test6802868.java
+++ b/jdk/test/javax/swing/JInternalFrame/Test6802868.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6802868
  * @summary JInternalFrame is not maximized when maximized parent frame
  * @author Alexander Potochkin
diff --git a/jdk/test/javax/swing/JLabel/6596966/bug6596966.java b/jdk/test/javax/swing/JLabel/6596966/bug6596966.java
index d28551be0b1..e804b29529e 100644
--- a/jdk/test/javax/swing/JLabel/6596966/bug6596966.java
+++ b/jdk/test/javax/swing/JLabel/6596966/bug6596966.java
@@ -21,15 +21,17 @@
  * questions.
  */
 
-/* @test
-   @bug 6596966
-   @summary Some JFileChooser mnemonics do not work with sticky keys
-   @library ../../regtesthelpers
-   @library ../../../../lib/testlibrary
-   @build Util jdk.testlibrary.OSInfo
-   @run main bug6596966
-   @author Pavel Porvatov
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 6596966
+ * @summary Some JFileChooser mnemonics do not work with sticky keys
+ * @library ../../regtesthelpers
+ * @library ../../../../lib/testlibrary
+ * @build Util jdk.testlibrary.OSInfo
+ * @run main bug6596966
+ * @author Pavel Porvatov
+ */
 
 import java.awt.*;
 import java.awt.event.KeyEvent;
diff --git a/jdk/test/javax/swing/JLabel/7004134/bug7004134.java b/jdk/test/javax/swing/JLabel/7004134/bug7004134.java
index 63464b2738a..ae7db3f4ca0 100644
--- a/jdk/test/javax/swing/JLabel/7004134/bug7004134.java
+++ b/jdk/test/javax/swing/JLabel/7004134/bug7004134.java
@@ -21,11 +21,13 @@
  * questions.
  */
 
-/* @test
-   @bug 7004134
-   @summary JLabel containing a ToolTipText does no longer show ToolTip after browser refresh
-   @author Pavel Porvatov
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 7004134
+ * @summary JLabel containing a ToolTipText does no longer show ToolTip after browser refresh
+ * @author Pavel Porvatov
+ */
 
 import sun.awt.SunToolkit;
 
diff --git a/jdk/test/javax/swing/JLayer/6824395/bug6824395.java b/jdk/test/javax/swing/JLayer/6824395/bug6824395.java
index f2040f4b327..822395f83d0 100644
--- a/jdk/test/javax/swing/JLayer/6824395/bug6824395.java
+++ b/jdk/test/javax/swing/JLayer/6824395/bug6824395.java
@@ -23,6 +23,7 @@
 
  /*
  * @test
+ * @key headful
  * @summary Checks that JLayer inside JViewport works is correctly laid out
  * @author Alexander Potochkin
  * @library ../../../../lib/testlibrary/
diff --git a/jdk/test/javax/swing/JLayer/6872503/bug6872503.java b/jdk/test/javax/swing/JLayer/6872503/bug6872503.java
index c48f014d0b5..82744b1637b 100644
--- a/jdk/test/javax/swing/JLayer/6872503/bug6872503.java
+++ b/jdk/test/javax/swing/JLayer/6872503/bug6872503.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 6872503
  * @summary Checks that JLayer correctly works with its AWTEventListener
  * @author Alexander Potochkin
diff --git a/jdk/test/javax/swing/JList/6462008/bug6462008.java b/jdk/test/javax/swing/JList/6462008/bug6462008.java
index 9ecd674b0ce..77febbc283f 100644
--- a/jdk/test/javax/swing/JList/6462008/bug6462008.java
+++ b/jdk/test/javax/swing/JList/6462008/bug6462008.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6462008
  * @summary Tests that mouse/keyboard work properly on JList with lead < 0 or > list.getModel().getSize()
  * @author Shannon Hickey
diff --git a/jdk/test/javax/swing/JList/6510999/bug6510999.java b/jdk/test/javax/swing/JList/6510999/bug6510999.java
index 76c871b158d..1269de28a5e 100644
--- a/jdk/test/javax/swing/JList/6510999/bug6510999.java
+++ b/jdk/test/javax/swing/JList/6510999/bug6510999.java
@@ -20,12 +20,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* @test
-   @bug 6510999
-   @summary Selection in a JList with both scrollbars visible jumps on arrowkey-down
-   @author Alexander Potochkin
-   @run main bug6510999
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 6510999
+ * @summary Selection in a JList with both scrollbars visible jumps on arrowkey-down
+ * @author Alexander Potochkin
+ * @run main bug6510999
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/JMenu/4417601/bug4417601.java b/jdk/test/javax/swing/JMenu/4417601/bug4417601.java
index 44c10f80ab0..dc647023416 100644
--- a/jdk/test/javax/swing/JMenu/4417601/bug4417601.java
+++ b/jdk/test/javax/swing/JMenu/4417601/bug4417601.java
@@ -20,14 +20,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* @test
-   @bug 4417601
-   @summary JMenus with no items paint a tiny menu.
-   @author Alexander Potochkin
-   @library ../../../../lib/testlibrary
-   @build ExtendedRobot
-   @run main bug4417601
-*/
+
+/*
+ * @test
+ * @key headful
+ * @bug 4417601
+ * @summary JMenus with no items paint a tiny menu.
+ * @author Alexander Potochkin
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @run main bug4417601
+ */
 
 import javax.swing.*;
 import java.awt.event.*;
diff --git a/jdk/test/javax/swing/JMenu/4515762/bug4515762.java b/jdk/test/javax/swing/JMenu/4515762/bug4515762.java
index 8b0cae273a4..67387c8fc4b 100644
--- a/jdk/test/javax/swing/JMenu/4515762/bug4515762.java
+++ b/jdk/test/javax/swing/JMenu/4515762/bug4515762.java
@@ -27,6 +27,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 4515762
  * @author Mark Davidson
  * @summary Tests the ability to support duplicate mnemonics
diff --git a/jdk/test/javax/swing/JMenu/4692443/bug4692443.java b/jdk/test/javax/swing/JMenu/4692443/bug4692443.java
index ac61b72899b..9d522158618 100644
--- a/jdk/test/javax/swing/JMenu/4692443/bug4692443.java
+++ b/jdk/test/javax/swing/JMenu/4692443/bug4692443.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @library ../../regtesthelpers
  * @build Util
  * @bug 4692443 7105030
diff --git a/jdk/test/javax/swing/JMenu/6359669/bug6359669.java b/jdk/test/javax/swing/JMenu/6359669/bug6359669.java
index 1dc562eb706..941fced5088 100644
--- a/jdk/test/javax/swing/JMenu/6359669/bug6359669.java
+++ b/jdk/test/javax/swing/JMenu/6359669/bug6359669.java
@@ -20,14 +20,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* @test
-   @bug 6359669
-   @summary REGRESSION: Submenu does not work if populated in PopupMenuListener.popupMenuWillBecomeVisible
-   @author Alexander Potochkin
-   @library ../../../../lib/testlibrary
-   @build ExtendedRobot
-   @run main bug6359669
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 6359669
+ * @summary REGRESSION: Submenu does not work if populated in PopupMenuListener.popupMenuWillBecomeVisible
+ * @author Alexander Potochkin
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @run main bug6359669
+ */
 
 import javax.swing.*;
 import javax.swing.event.PopupMenuListener;
diff --git a/jdk/test/javax/swing/JMenu/6470128/bug6470128.java b/jdk/test/javax/swing/JMenu/6470128/bug6470128.java
index 20a298dbed2..0c323e2e33e 100644
--- a/jdk/test/javax/swing/JMenu/6470128/bug6470128.java
+++ b/jdk/test/javax/swing/JMenu/6470128/bug6470128.java
@@ -20,14 +20,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* @test
-   @bug 6470128
-   @summary Escape Key causes JMenu Selection to Disappear
-   @author Alexander Potochkin
-   @library ../../../../lib/testlibrary
-   @build jdk.testlibrary.OSInfo
-   @run main bug6470128
-*/
+
+/*
+ * @test
+ * @key headful
+ * @bug 6470128
+ * @summary Escape Key causes JMenu Selection to Disappear
+ * @author Alexander Potochkin
+ * @library ../../../../lib/testlibrary
+ * @build jdk.testlibrary.OSInfo
+ * @run main bug6470128
+ */
+
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.KeyEvent;
diff --git a/jdk/test/javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java b/jdk/test/javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java
index cf02f6f2126..49920e79d7d 100644
--- a/jdk/test/javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java
+++ b/jdk/test/javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java
@@ -22,12 +22,13 @@
  */
 
 /*
-@test
-@bug 8072900
-@summary Mouse events are captured by the wrong menu in OS X
-@author Anton Nashatyrev
-@run main WrongSelectionOnMouseOver
-*/
+ * @test
+ * @key headful
+ * @bug 8072900
+ * @summary Mouse events are captured by the wrong menu in OS X
+ * @author Anton Nashatyrev
+ * @run main WrongSelectionOnMouseOver
+ */
 
 import javax.swing.*;
 import javax.swing.event.MenuEvent;
diff --git a/jdk/test/javax/swing/JMenuBar/4750590/bug4750590.java b/jdk/test/javax/swing/JMenuBar/4750590/bug4750590.java
index 7e249d3737d..d2d7019e6d8 100644
--- a/jdk/test/javax/swing/JMenuBar/4750590/bug4750590.java
+++ b/jdk/test/javax/swing/JMenuBar/4750590/bug4750590.java
@@ -21,13 +21,15 @@
  * questions.
  */
 
-/* @test
- @library ../../regtesthelpers
- @build Util
- @bug 4750590 8015597
- @summary SwingSet: Cannot change Themes using menu accelerators
- @author Alexander Zuev
- @run main bug4750590
+/*
+ * @test
+ * @key headful
+ * @library ../../regtesthelpers
+ * @build Util
+ * @bug 4750590 8015597
+ * @summary SwingSet: Cannot change Themes using menu accelerators
+ * @author Alexander Zuev
+ * @run main bug4750590
  */
 
 import javax.swing.*;
diff --git a/jdk/test/javax/swing/JMenuBar/MisplacedBorder/MisplacedBorder.java b/jdk/test/javax/swing/JMenuBar/MisplacedBorder/MisplacedBorder.java
index 43a7dc31533..95819c21f15 100644
--- a/jdk/test/javax/swing/JMenuBar/MisplacedBorder/MisplacedBorder.java
+++ b/jdk/test/javax/swing/JMenuBar/MisplacedBorder/MisplacedBorder.java
@@ -40,6 +40,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8073795
  * @summary JMenuBar has incorrect border when the window is on retina display.
  * @author Sergey Bylokhov
diff --git a/jdk/test/javax/swing/JMenuItem/4171437/bug4171437.java b/jdk/test/javax/swing/JMenuItem/4171437/bug4171437.java
index 29d1736b783..43914ca77ee 100644
--- a/jdk/test/javax/swing/JMenuItem/4171437/bug4171437.java
+++ b/jdk/test/javax/swing/JMenuItem/4171437/bug4171437.java
@@ -20,13 +20,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* @test
-   @bug 4171437
-   @library ../../regtesthelpers
-   @build Util
-   @author Georges Saab
-   @run main bug4171437
-*/
+
+/*
+ * @test
+ * @key headful
+ * @bug 4171437
+ * @library ../../regtesthelpers
+ * @build Util
+ * @author Georges Saab
+ * @run main bug4171437
+ */
+
 import java.awt.*;
 import java.awt.event.*;
 import java.util.ArrayList;
diff --git a/jdk/test/javax/swing/JMenuItem/4654927/bug4654927.java b/jdk/test/javax/swing/JMenuItem/4654927/bug4654927.java
index 34abf3ffd40..8a4384e4b54 100644
--- a/jdk/test/javax/swing/JMenuItem/4654927/bug4654927.java
+++ b/jdk/test/javax/swing/JMenuItem/4654927/bug4654927.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4654927
  * @summary Clicking on Greyed Menuitems closes the Menubar Dropdown
  * @author Alexander Potochkin
diff --git a/jdk/test/javax/swing/JMenuItem/6209975/bug6209975.java b/jdk/test/javax/swing/JMenuItem/6209975/bug6209975.java
index a2f13ab6433..00d0e8865d7 100644
--- a/jdk/test/javax/swing/JMenuItem/6209975/bug6209975.java
+++ b/jdk/test/javax/swing/JMenuItem/6209975/bug6209975.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6209975
  * @summary regression: JMenuItem icons overimposed on JMenuItem labels under Metal LAF
  * @author Alexander Zuev
diff --git a/jdk/test/javax/swing/JMenuItem/6249972/bug6249972.java b/jdk/test/javax/swing/JMenuItem/6249972/bug6249972.java
index 5139e26c600..7a02490efa9 100644
--- a/jdk/test/javax/swing/JMenuItem/6249972/bug6249972.java
+++ b/jdk/test/javax/swing/JMenuItem/6249972/bug6249972.java
@@ -20,13 +20,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* @test
-   @bug 6249972
-   @summary Tests that JMenuItem(String,int) handles lower-case mnemonics properly.
-   @library ../../../../lib/testlibrary
-   @build ExtendedRobot
-   @author Mikhail Lapshin
-   @run main bug6249972
+
+/*
+ * @test
+ * @key headful
+ * @bug 6249972
+ * @summary Tests that JMenuItem(String,int) handles lower-case mnemonics properly.
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @author Mikhail Lapshin
+ * @run main bug6249972
  */
 
 import javax.swing.*;
diff --git a/jdk/test/javax/swing/JOptionPane/6428694/bug6428694.java b/jdk/test/javax/swing/JOptionPane/6428694/bug6428694.java
index fa065af15e7..749118986d0 100644
--- a/jdk/test/javax/swing/JOptionPane/6428694/bug6428694.java
+++ b/jdk/test/javax/swing/JOptionPane/6428694/bug6428694.java
@@ -21,13 +21,14 @@
  * questions.
  */
 /*
-@test
-@bug 6428694
-@summary Checks that double click closes JOptionPane's input dialog.
-@library ../../../../lib/testlibrary
-@build ExtendedRobot
-@author Mikhail Lapshin
-@run main bug6428694
+ * @test
+ * @key headful
+ * @bug 6428694
+ * @summary Checks that double click closes JOptionPane's input dialog.
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @author Mikhail Lapshin
+ * @run main bug6428694
 */
 
 import javax.swing.JFrame;
diff --git a/jdk/test/javax/swing/JOptionPane/6464022/bug6464022.java b/jdk/test/javax/swing/JOptionPane/6464022/bug6464022.java
index 9554ae9828e..0e907aef52c 100644
--- a/jdk/test/javax/swing/JOptionPane/6464022/bug6464022.java
+++ b/jdk/test/javax/swing/JOptionPane/6464022/bug6464022.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6464022
  * @summary Memory leak in JOptionPane.createDialog
  * @author Pavel Porvatov
diff --git a/jdk/test/javax/swing/JOptionPane/7138665/bug7138665.java b/jdk/test/javax/swing/JOptionPane/7138665/bug7138665.java
index 16b4228cdfe..11a38c8a4ac 100644
--- a/jdk/test/javax/swing/JOptionPane/7138665/bug7138665.java
+++ b/jdk/test/javax/swing/JOptionPane/7138665/bug7138665.java
@@ -21,11 +21,13 @@
  * questions.
  */
 
-/* @test
-   @bug 7138665
-   @summary JOptionPane.getValue() unexpected change between JRE 1.6 and JRE 1.7
-   @author Pavel Porvatov
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 7138665
+ * @summary JOptionPane.getValue() unexpected change between JRE 1.6 and JRE 1.7
+ * @author Pavel Porvatov
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/JPopupMenu/4458079/bug4458079.java b/jdk/test/javax/swing/JPopupMenu/4458079/bug4458079.java
index 3dc95fcfa4b..d4f21b5036e 100644
--- a/jdk/test/javax/swing/JPopupMenu/4458079/bug4458079.java
+++ b/jdk/test/javax/swing/JPopupMenu/4458079/bug4458079.java
@@ -20,14 +20,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* @test
-   @bug 4458079
-   @library ../../regtesthelpers
-   @build Util
-   @summary Tests calling removeAll() from PopupMenuListener
-   @author Peter Zhelezniakov
-   @run main bug4458079
-*/
+
+/*
+ * @test
+ * @key headful
+ * @bug 4458079
+ * @library ../../regtesthelpers
+ * @build Util
+ * @summary Tests calling removeAll() from PopupMenuListener
+ * @author Peter Zhelezniakov
+ * @run main bug4458079
+ */
+
 import java.awt.Robot;
 import java.awt.Toolkit;
 import java.awt.event.*;
diff --git a/jdk/test/javax/swing/JPopupMenu/4966112/bug4966112.java b/jdk/test/javax/swing/JPopupMenu/4966112/bug4966112.java
index 3d1727400a2..a569d654e23 100644
--- a/jdk/test/javax/swing/JPopupMenu/4966112/bug4966112.java
+++ b/jdk/test/javax/swing/JPopupMenu/4966112/bug4966112.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4966112
  * @summary Some Composite components does not show the Context Popup.
  * @library ../../regtesthelpers
diff --git a/jdk/test/javax/swing/JPopupMenu/6415145/bug6415145.java b/jdk/test/javax/swing/JPopupMenu/6415145/bug6415145.java
index c288300e94d..4714bbf92ad 100644
--- a/jdk/test/javax/swing/JPopupMenu/6415145/bug6415145.java
+++ b/jdk/test/javax/swing/JPopupMenu/6415145/bug6415145.java
@@ -21,14 +21,15 @@
  * questions.
  */
 /*
-@test
-@bug 6415145
-@summary REGRESSION: Selected item is not being updated while dragging above popup menu
-@library ../../../../lib/testlibrary
-@build ExtendedRobot
-@author Mikhail Lapshin
-@run main bug6415145
-*/
+ * @test
+ * @key headful
+ * @bug 6415145
+ * @summary REGRESSION: Selected item is not being updated while dragging above popup menu
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @author Mikhail Lapshin
+ * @run main bug6415145
+ */
 
 import javax.swing.*;
 import java.awt.event.*;
diff --git a/jdk/test/javax/swing/JPopupMenu/6495920/bug6495920.java b/jdk/test/javax/swing/JPopupMenu/6495920/bug6495920.java
index f8f79310e28..3fe704982dc 100644
--- a/jdk/test/javax/swing/JPopupMenu/6495920/bug6495920.java
+++ b/jdk/test/javax/swing/JPopupMenu/6495920/bug6495920.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6495920
  * @summary Tests that if the JPopupMenu.setVisible method throws an exception,
             interaction with GNOME is not crippled
diff --git a/jdk/test/javax/swing/JPopupMenu/6515446/bug6515446.java b/jdk/test/javax/swing/JPopupMenu/6515446/bug6515446.java
index b26aa0395a4..74a49f51266 100644
--- a/jdk/test/javax/swing/JPopupMenu/6515446/bug6515446.java
+++ b/jdk/test/javax/swing/JPopupMenu/6515446/bug6515446.java
@@ -21,14 +21,15 @@
  * questions.
  */
 /*
-@test
-@bug 6515446
-@summary JMenuItems in JPopupMenus not receiving ActionEvents - incompat with 1.5
-@author Alexander Potochkin
-@library ../../../../lib/testlibrary
-@build ExtendedRobot
-@run main bug6515446
-*/
+ * @test
+ * @key headful
+ * @bug 6515446
+ * @summary JMenuItems in JPopupMenus not receiving ActionEvents - incompat with 1.5
+ * @author Alexander Potochkin
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @run main bug6515446
+ */
 
 import javax.swing.*;
 import java.awt.event.*;
diff --git a/jdk/test/javax/swing/JPopupMenu/6544309/bug6544309.java b/jdk/test/javax/swing/JPopupMenu/6544309/bug6544309.java
index ee30642f069..a5123d07bf7 100644
--- a/jdk/test/javax/swing/JPopupMenu/6544309/bug6544309.java
+++ b/jdk/test/javax/swing/JPopupMenu/6544309/bug6544309.java
@@ -20,7 +20,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* @test
+/*
+   @test
+  @key headful
    @bug 6544309
    @summary Checks that 'Select Input Method' popup menu allows to select
             items with keyboard.
diff --git a/jdk/test/javax/swing/JPopupMenu/6580930/bug6580930.java b/jdk/test/javax/swing/JPopupMenu/6580930/bug6580930.java
index cbc805c01c9..1f9772920c6 100644
--- a/jdk/test/javax/swing/JPopupMenu/6580930/bug6580930.java
+++ b/jdk/test/javax/swing/JPopupMenu/6580930/bug6580930.java
@@ -21,14 +21,15 @@
  * questions.
  */
 /*
-@test
-@bug 6580930 7184956
-@summary Swing Popups should overlap taskbar
-@author Alexander Potochkin
-@library ../../../../lib/testlibrary
-@build ExtendedRobot
-@run main bug6580930
-*/
+ * @test
+ * @key headful
+ * @bug 6580930 7184956
+ * @summary Swing Popups should overlap taskbar
+ * @author Alexander Potochkin
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @run main bug6580930
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/JPopupMenu/6583251/bug6583251.java b/jdk/test/javax/swing/JPopupMenu/6583251/bug6583251.java
index d44c221093d..b91313391e3 100644
--- a/jdk/test/javax/swing/JPopupMenu/6583251/bug6583251.java
+++ b/jdk/test/javax/swing/JPopupMenu/6583251/bug6583251.java
@@ -24,12 +24,13 @@
  */
 
 /*
-@test
-@bug 6583251
-@summary One more ClassCastException in Swing with TrayIcon
-@author Alexander Potochkin
-@run main bug6583251
-*/
+ * @test
+ * @key headful
+ * @bug 6583251
+ * @summary One more ClassCastException in Swing with TrayIcon
+ * @author Alexander Potochkin
+ * @run main bug6583251
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/JPopupMenu/6691503/bug6691503.java b/jdk/test/javax/swing/JPopupMenu/6691503/bug6691503.java
index f07ebd19a35..f6f3d9746ac 100644
--- a/jdk/test/javax/swing/JPopupMenu/6691503/bug6691503.java
+++ b/jdk/test/javax/swing/JPopupMenu/6691503/bug6691503.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6691503
  * @summary Checks that there is no opportunity for a malicious applet
  * to show a popup menu which has whole screen size.
diff --git a/jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java b/jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java
index 52e94f1188b..12612f8352c 100644
--- a/jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java
+++ b/jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6694823
  * @summary Checks that popup menu cannot be partially hidden
  * by the task bar in applets.
diff --git a/jdk/test/javax/swing/JPopupMenu/6800513/bug6800513.java b/jdk/test/javax/swing/JPopupMenu/6800513/bug6800513.java
index 097e28ddd9a..098defe2eb7 100644
--- a/jdk/test/javax/swing/JPopupMenu/6800513/bug6800513.java
+++ b/jdk/test/javax/swing/JPopupMenu/6800513/bug6800513.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6800513
  * @summary GTK-LaF renders menus incompletely
  * @author Mario Torre
diff --git a/jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java b/jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java
index 77c05fe206e..f40508e2d9d 100644
--- a/jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java
+++ b/jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6827786
  * @summary Tests duplicate mnemonics
  * @author Peter Zhelezniakov
diff --git a/jdk/test/javax/swing/JPopupMenu/6987844/bug6987844.java b/jdk/test/javax/swing/JPopupMenu/6987844/bug6987844.java
index 2fd16e214db..97790cac652 100644
--- a/jdk/test/javax/swing/JPopupMenu/6987844/bug6987844.java
+++ b/jdk/test/javax/swing/JPopupMenu/6987844/bug6987844.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6987844
  * @summary Incorrect width of JComboBox drop down
  * @author Alexander Potochkin
diff --git a/jdk/test/javax/swing/JPopupMenu/7156657/bug7156657.java b/jdk/test/javax/swing/JPopupMenu/7156657/bug7156657.java
index 6bddc2aefcb..3075859310e 100644
--- a/jdk/test/javax/swing/JPopupMenu/7156657/bug7156657.java
+++ b/jdk/test/javax/swing/JPopupMenu/7156657/bug7156657.java
@@ -29,7 +29,9 @@
 import java.awt.image.BufferedImage;
 import java.util.concurrent.Callable;
 
-/* @test
+/*
+   @test
+  @key headful
    @bug 7156657
    @summary Version 7 doesn't support translucent popup menus against a translucent window
    @library ../../regtesthelpers
diff --git a/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java b/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java
index 490a5d5f866..d88c38f009a 100644
--- a/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java
+++ b/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java
@@ -23,6 +23,7 @@
 
  /*
  * @test
+ * @key headful
  * @library ../../regtesthelpers
  * @build Util
  * @bug 8033699 8226892
diff --git a/jdk/test/javax/swing/JRadioButton/8041561/bug8041561.java b/jdk/test/javax/swing/JRadioButton/8041561/bug8041561.java
index 9a7e3bd2d0b..12efa8b5cac 100644
--- a/jdk/test/javax/swing/JRadioButton/8041561/bug8041561.java
+++ b/jdk/test/javax/swing/JRadioButton/8041561/bug8041561.java
@@ -36,6 +36,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8041561
  * @author Alexander Scherbatiy
  * @summary Inconsistent opacity behaviour between JCheckBox and JRadioButton
diff --git a/jdk/test/javax/swing/JRadioButton/8075609/bug8075609.java b/jdk/test/javax/swing/JRadioButton/8075609/bug8075609.java
index 6cd17215be4..664f5b4b2c1 100644
--- a/jdk/test/javax/swing/JRadioButton/8075609/bug8075609.java
+++ b/jdk/test/javax/swing/JRadioButton/8075609/bug8075609.java
@@ -23,6 +23,7 @@
 
  /*
  * @test
+ * @key headful
  * @library ../../regtesthelpers
  * @build Util
  * @bug 8075609
diff --git a/jdk/test/javax/swing/JRootPane/4670486/bug4670486.java b/jdk/test/javax/swing/JRootPane/4670486/bug4670486.java
index d967d4527df..150396e978f 100644
--- a/jdk/test/javax/swing/JRootPane/4670486/bug4670486.java
+++ b/jdk/test/javax/swing/JRootPane/4670486/bug4670486.java
@@ -27,6 +27,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 4670486
  * @author Mark Davidson
  * @summary Regression: Popup menu bindings doesn't work when a default button has been defined.
diff --git a/jdk/test/javax/swing/JScrollBar/4708809/bug4708809.java b/jdk/test/javax/swing/JScrollBar/4708809/bug4708809.java
index 144b22881ee..829df8dc93f 100644
--- a/jdk/test/javax/swing/JScrollBar/4708809/bug4708809.java
+++ b/jdk/test/javax/swing/JScrollBar/4708809/bug4708809.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4708809
  * @summary JScrollBar functionality slightly different from native scrollbar
  * @author Andrey Pikalev
diff --git a/jdk/test/javax/swing/JScrollBar/4865918/bug4865918.java b/jdk/test/javax/swing/JScrollBar/4865918/bug4865918.java
index 2bf5be45b2d..d624923f02e 100644
--- a/jdk/test/javax/swing/JScrollBar/4865918/bug4865918.java
+++ b/jdk/test/javax/swing/JScrollBar/4865918/bug4865918.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4865918
  * @summary REGRESSION:JCK1.4a-runtime api/javax_swing/interactive/JScrollBarTests.html#JScrollBar
  * @author Andrey Pikalev
diff --git a/jdk/test/javax/swing/JScrollBar/6542335/bug6542335.java b/jdk/test/javax/swing/JScrollBar/6542335/bug6542335.java
index 2f0346390d9..8b443232199 100644
--- a/jdk/test/javax/swing/JScrollBar/6542335/bug6542335.java
+++ b/jdk/test/javax/swing/JScrollBar/6542335/bug6542335.java
@@ -21,12 +21,14 @@
  * questions.
  */
 
-/* @test
-   @bug 6542335
-   @summary different behavior on knob of scroll bar between 1.4.2 and 5.0
-   @author  Alexander Potochkin
-   @run main bug6542335
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 6542335
+ * @summary different behavior on knob of scroll bar between 1.4.2 and 5.0
+ * @author  Alexander Potochkin
+ * @run main bug6542335
+ */
 
 import javax.swing.*;
 import javax.swing.plaf.basic.BasicScrollBarUI;
diff --git a/jdk/test/javax/swing/JScrollBar/7163696/Test7163696.java b/jdk/test/javax/swing/JScrollBar/7163696/Test7163696.java
index 2ca34b52136..0d65a701620 100644
--- a/jdk/test/javax/swing/JScrollBar/7163696/Test7163696.java
+++ b/jdk/test/javax/swing/JScrollBar/7163696/Test7163696.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7163696
  * @summary Tests that JScrollBar scrolls to the left
  * @author Sergey Malenkov
diff --git a/jdk/test/javax/swing/JScrollBar/bug4202954/bug4202954.java b/jdk/test/javax/swing/JScrollBar/bug4202954/bug4202954.java
index 915a8023124..995e5732cb9 100644
--- a/jdk/test/javax/swing/JScrollBar/bug4202954/bug4202954.java
+++ b/jdk/test/javax/swing/JScrollBar/bug4202954/bug4202954.java
@@ -20,14 +20,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* @test
+/*
+   @test
+   @key headful
    @bug 4202954
    @library ../../../../lib/testlibrary
    @library ../../regtesthelpers
    @build Util jdk.testlibrary.OSInfo
    @author Michael C. Albers
    @run main bug4202954
-*/
+ */
 
 import java.awt.*;
 import java.awt.event.InputEvent;
diff --git a/jdk/test/javax/swing/JScrollPane/6274267/bug6274267.java b/jdk/test/javax/swing/JScrollPane/6274267/bug6274267.java
index 1783c0f81b1..a141c43ac2a 100644
--- a/jdk/test/javax/swing/JScrollPane/6274267/bug6274267.java
+++ b/jdk/test/javax/swing/JScrollPane/6274267/bug6274267.java
@@ -23,13 +23,15 @@
  * questions.
  */
 
-/* @test
-   @bug 6274267
-   @summary Checks that ScrollPaneLayout properly calculates preferred
-   layout size.
-   @author Mikhail Lapshin
-   @run main bug6274267
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 6274267
+ * @summary Checks that ScrollPaneLayout properly calculates preferred
+ * layout size.
+ * @author Mikhail Lapshin
+ * @run main bug6274267
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/JScrollPane/HorizontalMouseWheelOnShiftPressed/HorizontalMouseWheelOnShiftPressed.java b/jdk/test/javax/swing/JScrollPane/HorizontalMouseWheelOnShiftPressed/HorizontalMouseWheelOnShiftPressed.java
index 3c42ec7ec62..abdb4ea9314 100644
--- a/jdk/test/javax/swing/JScrollPane/HorizontalMouseWheelOnShiftPressed/HorizontalMouseWheelOnShiftPressed.java
+++ b/jdk/test/javax/swing/JScrollPane/HorizontalMouseWheelOnShiftPressed/HorizontalMouseWheelOnShiftPressed.java
@@ -35,6 +35,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8033000 8147994
  * @author Alexander Scherbatiy
  * @summary No Horizontal Mouse Wheel Support In BasicScrollPaneUI
diff --git a/jdk/test/javax/swing/JScrollPane/Test6526631.java b/jdk/test/javax/swing/JScrollPane/Test6526631.java
index f7f1633f4a5..df7512ef5c6 100644
--- a/jdk/test/javax/swing/JScrollPane/Test6526631.java
+++ b/jdk/test/javax/swing/JScrollPane/Test6526631.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6526631
  * @summary Resizes right-oriented scroll pane
  * @author Sergey Malenkov
diff --git a/jdk/test/javax/swing/JSlider/6348946/bug6348946.java b/jdk/test/javax/swing/JSlider/6348946/bug6348946.java
index 588097a1a87..1bc0cb1142f 100644
--- a/jdk/test/javax/swing/JSlider/6348946/bug6348946.java
+++ b/jdk/test/javax/swing/JSlider/6348946/bug6348946.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6348946
  * @summary Tests that JSlider's thumb moves in the right direction
  *          when it is used as a JTable cell editor.
diff --git a/jdk/test/javax/swing/JSlider/6401380/bug6401380.java b/jdk/test/javax/swing/JSlider/6401380/bug6401380.java
index 8cb70db5f93..1a11dc4758d 100644
--- a/jdk/test/javax/swing/JSlider/6401380/bug6401380.java
+++ b/jdk/test/javax/swing/JSlider/6401380/bug6401380.java
@@ -20,14 +20,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* @test
-   @bug 6401380
-   @summary JSlider - mouse click ont the left side of the knob is ignored.
-   @library ../../../../lib/testlibrary
-   @build ExtendedRobot
-   @author Alexander Potochkin
-   @run main bug6401380
-*/
+
+/*
+ * @test
+ * @key headful
+ * @bug 6401380
+ * @summary JSlider - mouse click ont the left side of the knob is ignored.
+ * @library ../../../../lib/testlibrary
+ * @build ExtendedRobot
+ * @author Alexander Potochkin
+ * @run main bug6401380
+ */
 
 import javax.swing.*;
 import javax.swing.plaf.basic.BasicSliderUI;
diff --git a/jdk/test/javax/swing/JSlider/6794831/bug6794831.java b/jdk/test/javax/swing/JSlider/6794831/bug6794831.java
index 27aa09ffb04..c9f19ef3b26 100644
--- a/jdk/test/javax/swing/JSlider/6794831/bug6794831.java
+++ b/jdk/test/javax/swing/JSlider/6794831/bug6794831.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 6794831
  * @summary Infinite loop while painting ticks on Slider with maximum=MAX_INT
  * @author Pavel Porvatov
diff --git a/jdk/test/javax/swing/JSlider/6848475/bug6848475.java b/jdk/test/javax/swing/JSlider/6848475/bug6848475.java
index a27f02499fa..e4f5bfccc69 100644
--- a/jdk/test/javax/swing/JSlider/6848475/bug6848475.java
+++ b/jdk/test/javax/swing/JSlider/6848475/bug6848475.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 6848475
  * @summary JSlider does not display the correct value of its BoundedRangeModel
  * @author Pavel Porvatov
diff --git a/jdk/test/javax/swing/JSlider/6918861/bug6918861.java b/jdk/test/javax/swing/JSlider/6918861/bug6918861.java
index d1b49448dc3..b965e823acc 100644
--- a/jdk/test/javax/swing/JSlider/6918861/bug6918861.java
+++ b/jdk/test/javax/swing/JSlider/6918861/bug6918861.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 6918861
  * @summary SynthSliderUI.uninstallDefaults() is not called when UI is uninstalled
  * @author Pavel Porvatov
diff --git a/jdk/test/javax/swing/JSlider/6923305/bug6923305.java b/jdk/test/javax/swing/JSlider/6923305/bug6923305.java
index 6079d7e127c..20a32986e0b 100644
--- a/jdk/test/javax/swing/JSlider/6923305/bug6923305.java
+++ b/jdk/test/javax/swing/JSlider/6923305/bug6923305.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 6923305
  * @summary SynthSliderUI paints the slider track when the slider's "paintTrack" property is set to false
  * @author Pavel Porvatov
diff --git a/jdk/test/javax/swing/JSpinner/4973721/bug4973721.java b/jdk/test/javax/swing/JSpinner/4973721/bug4973721.java
index 9bbc381d568..9c18583c6ba 100644
--- a/jdk/test/javax/swing/JSpinner/4973721/bug4973721.java
+++ b/jdk/test/javax/swing/JSpinner/4973721/bug4973721.java
@@ -20,14 +20,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* @test
+/*
+   @test
+   @key headful
    @bug 4973721
    @summary Up and Down Arrow key buttons are not working for the JSpinner in Synth LAF
    @library ../../regtesthelpers
    @build Util
    @author Oleg Mokhovikov
    @run main bug4973721
-*/
+ */
 
 import java.awt.Robot;
 import javax.swing.event.ChangeListener;
diff --git a/jdk/test/javax/swing/JSpinner/6532833/bug6532833.java b/jdk/test/javax/swing/JSpinner/6532833/bug6532833.java
index 80013da7a81..5e27e71fd15 100644
--- a/jdk/test/javax/swing/JSpinner/6532833/bug6532833.java
+++ b/jdk/test/javax/swing/JSpinner/6532833/bug6532833.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 6532833 7077259
  * @summary PIT: Metal LAF - The right side border is not shown for the Spinner after the removing the buttons
  * @author Pavel Porvatov
diff --git a/jdk/test/javax/swing/JSpinner/8008657/bug8008657.java b/jdk/test/javax/swing/JSpinner/8008657/bug8008657.java
index 3cbe7a61d03..4fec49cf60d 100644
--- a/jdk/test/javax/swing/JSpinner/8008657/bug8008657.java
+++ b/jdk/test/javax/swing/JSpinner/8008657/bug8008657.java
@@ -35,6 +35,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8008657
  * @author Alexander Scherbatiy
  * @summary JSpinner setComponentOrientation doesn't affect on text orientation
diff --git a/jdk/test/javax/swing/JSplitPane/4816114/bug4816114.java b/jdk/test/javax/swing/JSplitPane/4816114/bug4816114.java
index 11296836916..1e9c3fe6d65 100644
--- a/jdk/test/javax/swing/JSplitPane/4816114/bug4816114.java
+++ b/jdk/test/javax/swing/JSplitPane/4816114/bug4816114.java
@@ -20,12 +20,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* @test
-   @bug 4816114
-   @summary REGRESSION: Regression in divider location behavior when JSplitPane is resized
-   @author Andrey Pikalev
-   @run main bug4816114
-*/
+
+/*
+ * @test
+ * @key headful
+ * @bug 4816114
+ * @summary REGRESSION: Regression in divider location behavior when JSplitPane is resized
+ * @author Andrey Pikalev
+ * @run main bug4816114
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/JSplitPane/4885629/bug4885629.java b/jdk/test/javax/swing/JSplitPane/4885629/bug4885629.java
index 97fc5c7beb5..59db07057a9 100644
--- a/jdk/test/javax/swing/JSplitPane/4885629/bug4885629.java
+++ b/jdk/test/javax/swing/JSplitPane/4885629/bug4885629.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4885629
  * @summary With JSplitPane in VERTICAL_SPLIT, SplitPaneBorder draws bottom edge of divider
  * @author Andrey Pikalev
diff --git a/jdk/test/javax/swing/JTabbedPane/4361477/bug4361477.java b/jdk/test/javax/swing/JTabbedPane/4361477/bug4361477.java
index a617ccccd11..20ca62e410f 100644
--- a/jdk/test/javax/swing/JTabbedPane/4361477/bug4361477.java
+++ b/jdk/test/javax/swing/JTabbedPane/4361477/bug4361477.java
@@ -28,6 +28,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4361477
  * @summary JTabbedPane throws ArrayOutOfBoundsException
  * @author Oleg Mokhovikov
diff --git a/jdk/test/javax/swing/JTabbedPane/4624207/bug4624207.java b/jdk/test/javax/swing/JTabbedPane/4624207/bug4624207.java
index 9476df05902..6b7aa04270f 100644
--- a/jdk/test/javax/swing/JTabbedPane/4624207/bug4624207.java
+++ b/jdk/test/javax/swing/JTabbedPane/4624207/bug4624207.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4624207
  * @summary JTabbedPane mnemonics don't work from outside the tabbed pane
  * @author Oleg Mokhovikov
diff --git a/jdk/test/javax/swing/JTabbedPane/6495408/bug6495408.java b/jdk/test/javax/swing/JTabbedPane/6495408/bug6495408.java
index 8f7f6678827..25da3f8487a 100644
--- a/jdk/test/javax/swing/JTabbedPane/6495408/bug6495408.java
+++ b/jdk/test/javax/swing/JTabbedPane/6495408/bug6495408.java
@@ -25,6 +25,7 @@
 import java.awt.*;
 /*
  * @test
+ * @key headful
  * @bug 6495408
  * @summary REGRESSION: JTabbedPane throws ArrayIndexOutOfBoundsException
  * @author Alexander Potochkin
diff --git a/jdk/test/javax/swing/JTabbedPane/7024235/Test7024235.java b/jdk/test/javax/swing/JTabbedPane/7024235/Test7024235.java
index e18f4aac8c4..7e1c3aab28a 100644
--- a/jdk/test/javax/swing/JTabbedPane/7024235/Test7024235.java
+++ b/jdk/test/javax/swing/JTabbedPane/7024235/Test7024235.java
@@ -38,6 +38,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7024235
  * @summary Tests JFrame.pack() with the JTabbedPane
  * @library ../../../../lib/testlibrary/
diff --git a/jdk/test/javax/swing/JTabbedPane/7161568/bug7161568.java b/jdk/test/javax/swing/JTabbedPane/7161568/bug7161568.java
index 46571abd93a..1904a3f1726 100644
--- a/jdk/test/javax/swing/JTabbedPane/7161568/bug7161568.java
+++ b/jdk/test/javax/swing/JTabbedPane/7161568/bug7161568.java
@@ -26,6 +26,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 7161568
  * @author Alexander Scherbatiy
  * @summary Tests that navigating tabs in the JTAbbedPane does not throw NPE
diff --git a/jdk/test/javax/swing/JTabbedPane/8007563/Test8007563.java b/jdk/test/javax/swing/JTabbedPane/8007563/Test8007563.java
index aa2307df050..218e2f12c7e 100644
--- a/jdk/test/javax/swing/JTabbedPane/8007563/Test8007563.java
+++ b/jdk/test/javax/swing/JTabbedPane/8007563/Test8007563.java
@@ -33,6 +33,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8007563
  * @summary Tests JTabbedPane background
  * @author Sergey Malenkov
diff --git a/jdk/test/javax/swing/JTable/4220171/bug4220171.java b/jdk/test/javax/swing/JTable/4220171/bug4220171.java
index 2b4ecb5baa6..0dc904b26e3 100644
--- a/jdk/test/javax/swing/JTable/4220171/bug4220171.java
+++ b/jdk/test/javax/swing/JTable/4220171/bug4220171.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4220171
  * @author Konstantin Eremin
  * @summary Tests
diff --git a/jdk/test/javax/swing/JTable/6263446/bug6263446.java b/jdk/test/javax/swing/JTable/6263446/bug6263446.java
index 9089e3f1c5e..917fa33cdde 100644
--- a/jdk/test/javax/swing/JTable/6263446/bug6263446.java
+++ b/jdk/test/javax/swing/JTable/6263446/bug6263446.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6263446
  * @summary Tests that double-clicking to edit a cell doesn't select the content.
  * @author Shannon Hickey
diff --git a/jdk/test/javax/swing/JTable/6777378/bug6777378.java b/jdk/test/javax/swing/JTable/6777378/bug6777378.java
index 973da5af995..b353249df36 100644
--- a/jdk/test/javax/swing/JTable/6777378/bug6777378.java
+++ b/jdk/test/javax/swing/JTable/6777378/bug6777378.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+   @test
+  @key headful
    @bug 6777378
    @summary NullPointerException in XPDefaultRenderer.paint()
    @author Alexander Potochkin
diff --git a/jdk/test/javax/swing/JTable/6913768/bug6913768.java b/jdk/test/javax/swing/JTable/6913768/bug6913768.java
index 331ff70ccfb..6f49d7948fe 100644
--- a/jdk/test/javax/swing/JTable/6913768/bug6913768.java
+++ b/jdk/test/javax/swing/JTable/6913768/bug6913768.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 6913768
  * @summary With default SynthLookAndFeel instance installed new JTable creation leads to throwing NPE
  * @author Pavel Porvatov
diff --git a/jdk/test/javax/swing/JTable/7055065/bug7055065.java b/jdk/test/javax/swing/JTable/7055065/bug7055065.java
index 4b589715bdf..f88a6ec473b 100644
--- a/jdk/test/javax/swing/JTable/7055065/bug7055065.java
+++ b/jdk/test/javax/swing/JTable/7055065/bug7055065.java
@@ -25,7 +25,9 @@
  * Portions Copyright (c) 2012 IBM Corporation
  */
 
-/* @test 1.1 2012/04/19
+/*
+ * @test
+ * @key headful
  * @bug 7055065
  * @summary NullPointerException when sorting JTable with empty cell
  * @author Jonathan Lu
diff --git a/jdk/test/javax/swing/JTable/7068740/bug7068740.java b/jdk/test/javax/swing/JTable/7068740/bug7068740.java
index d0c8fbd814f..b03768400fc 100644
--- a/jdk/test/javax/swing/JTable/7068740/bug7068740.java
+++ b/jdk/test/javax/swing/JTable/7068740/bug7068740.java
@@ -21,12 +21,14 @@
  * questions.
  */
 
-/* @test
-   @bug 7068740
-   @summary JTable wrapped in JLayer can't use PGUP/PGDOWN keys
-   @author Vladislav Karnaukhov
-   @run main bug7068740
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 7068740
+ * @summary JTable wrapped in JLayer can't use PGUP/PGDOWN keys
+ * @author Vladislav Karnaukhov
+ * @run main bug7068740
+ */
 
 import javax.swing.*;
 import javax.swing.plaf.LayerUI;
diff --git a/jdk/test/javax/swing/JTable/7124218/SelectEditTableCell.java b/jdk/test/javax/swing/JTable/7124218/SelectEditTableCell.java
index 7644c4dbba7..455c29c4696 100644
--- a/jdk/test/javax/swing/JTable/7124218/SelectEditTableCell.java
+++ b/jdk/test/javax/swing/JTable/7124218/SelectEditTableCell.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 7124218
  * @summary verifies different behaviour of SPACE and ENTER in JTable
  * @library ../../regtesthelpers
diff --git a/jdk/test/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java b/jdk/test/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java
index da9262f9582..a1a3b641170 100644
--- a/jdk/test/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java
+++ b/jdk/test/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java
@@ -25,7 +25,9 @@
  * Portions Copyright (c) 2012 IBM Corporation
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 7188612
  * @summary AccessibleTableHeader and AccessibleJTableCell should stick to
  *    AccessibleComponent.getLocationOnScreen api.
diff --git a/jdk/test/javax/swing/JTable/8032874/bug8032874.java b/jdk/test/javax/swing/JTable/8032874/bug8032874.java
index 1116aebe267..7b7ca4a44e3 100644
--- a/jdk/test/javax/swing/JTable/8032874/bug8032874.java
+++ b/jdk/test/javax/swing/JTable/8032874/bug8032874.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 8032874
  * @summary Test whether ArrayIndexOutOfBoundsException is thrown or not,
  *          once selected row is removed from JTable with Sorter and Filter
diff --git a/jdk/test/javax/swing/JTableHeader/6884066/bug6884066.java b/jdk/test/javax/swing/JTableHeader/6884066/bug6884066.java
index 3e1fe84c1d5..1217d96e2c5 100644
--- a/jdk/test/javax/swing/JTableHeader/6884066/bug6884066.java
+++ b/jdk/test/javax/swing/JTableHeader/6884066/bug6884066.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+   @test
+  @key headful
    @bug 6884066
    @summary JTableHeader listens mouse in disabled state and doesn't work when not attached to a table
    @author Alexander Potochkin
diff --git a/jdk/test/javax/swing/JTableHeader/6889007/bug6889007.java b/jdk/test/javax/swing/JTableHeader/6889007/bug6889007.java
index c416d634472..d24072b2321 100644
--- a/jdk/test/javax/swing/JTableHeader/6889007/bug6889007.java
+++ b/jdk/test/javax/swing/JTableHeader/6889007/bug6889007.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+   @test
+  @key headful
    @bug 6889007
    @summary No resize cursor during hovering mouse over JTable
    @author Alexander Potochkin
diff --git a/jdk/test/javax/swing/JTextArea/4697612/bug4697612.java b/jdk/test/javax/swing/JTextArea/4697612/bug4697612.java
index 715da745071..5f4f3e7bf06 100644
--- a/jdk/test/javax/swing/JTextArea/4697612/bug4697612.java
+++ b/jdk/test/javax/swing/JTextArea/4697612/bug4697612.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4697612 6244705
  * @author Peter Zhelezniakov
  * @library ../../regtesthelpers
diff --git a/jdk/test/javax/swing/JTextArea/7049024/bug7049024.java b/jdk/test/javax/swing/JTextArea/7049024/bug7049024.java
index 36d328fe1e8..74a76098048 100644
--- a/jdk/test/javax/swing/JTextArea/7049024/bug7049024.java
+++ b/jdk/test/javax/swing/JTextArea/7049024/bug7049024.java
@@ -25,7 +25,9 @@
  * Portions Copyright (c) 2011 IBM Corporation
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 7049024
  * @summary DnD fails with JTextArea and JTextField
  * @author Sean Chou
diff --git a/jdk/test/javax/swing/JTextArea/Test6593649.java b/jdk/test/javax/swing/JTextArea/Test6593649.java
index f27057c4b08..854e500df1b 100644
--- a/jdk/test/javax/swing/JTextArea/Test6593649.java
+++ b/jdk/test/javax/swing/JTextArea/Test6593649.java
@@ -21,12 +21,14 @@
  * questions.
  */
 
-/* @test
-   @bug 6593649
-   @summary Word wrap does not work in JTextArea: long lines are not wrapped
-   @author Lillian Angel
-   @run main Test6593649
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 6593649
+ * @summary Word wrap does not work in JTextArea: long lines are not wrapped
+ * @author Lillian Angel
+ * @run main Test6593649
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/JTextArea/TextViewOOM/TextViewOOM.java b/jdk/test/javax/swing/JTextArea/TextViewOOM/TextViewOOM.java
index e75c7053d08..6c31f281d68 100644
--- a/jdk/test/javax/swing/JTextArea/TextViewOOM/TextViewOOM.java
+++ b/jdk/test/javax/swing/JTextArea/TextViewOOM/TextViewOOM.java
@@ -29,6 +29,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8072775
  * @run main/othervm -Xmx80m TextViewOOM
  */
diff --git a/jdk/test/javax/swing/JTextField/8036819/bug8036819.java b/jdk/test/javax/swing/JTextField/8036819/bug8036819.java
index 214f13cd19b..052b383a10d 100644
--- a/jdk/test/javax/swing/JTextField/8036819/bug8036819.java
+++ b/jdk/test/javax/swing/JTextField/8036819/bug8036819.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @library ../../regtesthelpers
  * @build Util
  * @bug 8036819
diff --git a/jdk/test/javax/swing/JTextPane/JTextPaneDocumentAlignment.java b/jdk/test/javax/swing/JTextPane/JTextPaneDocumentAlignment.java
index 909dde0bb0f..499462c1b42 100644
--- a/jdk/test/javax/swing/JTextPane/JTextPaneDocumentAlignment.java
+++ b/jdk/test/javax/swing/JTextPane/JTextPaneDocumentAlignment.java
@@ -21,11 +21,13 @@
  * questions.
  */
 
-/* @test
-   @bug 8132136
-   @summary [PIT] RTL orientation in JEditorPane is broken
-   @author Semyon Sadetsky
-  */
+/*
+ * @test
+ * @key headful
+ * @bug 8132136
+ * @summary [PIT] RTL orientation in JEditorPane is broken
+ * @author Semyon Sadetsky
+ */
 
 import javax.swing.*;
 import javax.swing.text.BadLocationException;
diff --git a/jdk/test/javax/swing/JTextPane/JTextPaneDocumentWrapping.java b/jdk/test/javax/swing/JTextPane/JTextPaneDocumentWrapping.java
index ba7aee423ed..0f6a70a253a 100644
--- a/jdk/test/javax/swing/JTextPane/JTextPaneDocumentWrapping.java
+++ b/jdk/test/javax/swing/JTextPane/JTextPaneDocumentWrapping.java
@@ -21,11 +21,13 @@
  * questions.
  */
 
-/* @test
-   @bug 8133108
-   @summary [PIT] Container size is wrong in JEditorPane
-   @author Semyon Sadetsky
-  */
+/*
+ * @test
+ * @key headful
+ * @bug 8133108
+ * @summary [PIT] Container size is wrong in JEditorPane
+ * @author Semyon Sadetsky
+ */
 
 import javax.swing.*;
 import javax.swing.text.BadLocationException;
diff --git a/jdk/test/javax/swing/JToolBar/4247996/bug4247996.java b/jdk/test/javax/swing/JToolBar/4247996/bug4247996.java
index 63eaccbac99..9670e862fc8 100644
--- a/jdk/test/javax/swing/JToolBar/4247996/bug4247996.java
+++ b/jdk/test/javax/swing/JToolBar/4247996/bug4247996.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 4247996 4260485
  * @summary Test that rollover toolbar doesn't corrupt buttons
  * @author Peter Zhelezniakov
diff --git a/jdk/test/javax/swing/JToolBar/4529206/bug4529206.java b/jdk/test/javax/swing/JToolBar/4529206/bug4529206.java
index 61e96b728b0..0b05ded2f3f 100644
--- a/jdk/test/javax/swing/JToolBar/4529206/bug4529206.java
+++ b/jdk/test/javax/swing/JToolBar/4529206/bug4529206.java
@@ -23,12 +23,14 @@
  * questions.
  */
 
-/* @test
-   @bug     4529206
-   @summary JToolBar - setFloating does not work correctly
-   @author  Konstantin Eremin
-   @run     main bug4529206
-*/
+/*
+ * @test
+ * @key headful
+ * @bug     4529206
+ * @summary JToolBar - setFloating does not work correctly
+ * @author  Konstantin Eremin
+ * @run     main bug4529206
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/JToolTip/4846413/bug4846413.java b/jdk/test/javax/swing/JToolTip/4846413/bug4846413.java
index a18b2bee37b..4fac3c59991 100644
--- a/jdk/test/javax/swing/JToolTip/4846413/bug4846413.java
+++ b/jdk/test/javax/swing/JToolTip/4846413/bug4846413.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4846413
  * @summary Checks if No tooltip modification when no KeyStroke modifier
  * @library ../../regtesthelpers
diff --git a/jdk/test/javax/swing/JTree/4330357/bug4330357.java b/jdk/test/javax/swing/JTree/4330357/bug4330357.java
index 810c88666fb..2f6a76a8fab 100644
--- a/jdk/test/javax/swing/JTree/4330357/bug4330357.java
+++ b/jdk/test/javax/swing/JTree/4330357/bug4330357.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4330357
  * @summary Tests that real editor in JTree cleans up after editing was stopped
  * @library ../../regtesthelpers
diff --git a/jdk/test/javax/swing/JTree/4908142/bug4908142.java b/jdk/test/javax/swing/JTree/4908142/bug4908142.java
index 2b6fbd7a8b3..1556d671d6d 100644
--- a/jdk/test/javax/swing/JTree/4908142/bug4908142.java
+++ b/jdk/test/javax/swing/JTree/4908142/bug4908142.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4908142
  * @summary JList doesn't handle search function appropriately
  * @author Andrey Pikalev
diff --git a/jdk/test/javax/swing/JTree/4927934/bug4927934.java b/jdk/test/javax/swing/JTree/4927934/bug4927934.java
index c4f739e6bdd..d4dee0c41b1 100644
--- a/jdk/test/javax/swing/JTree/4927934/bug4927934.java
+++ b/jdk/test/javax/swing/JTree/4927934/bug4927934.java
@@ -20,7 +20,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/* @test
+/*
+   @test
+  @key headful
    @bug 4927934
    @summary JTree traversal is unlike Native windows tree traversal
    @author Andrey Pikalev
diff --git a/jdk/test/javax/swing/JTree/6263446/bug6263446.java b/jdk/test/javax/swing/JTree/6263446/bug6263446.java
index 2e13599b540..698255a44e4 100644
--- a/jdk/test/javax/swing/JTree/6263446/bug6263446.java
+++ b/jdk/test/javax/swing/JTree/6263446/bug6263446.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6263446
  * @summary Tests that double-clicking to edit a cell doesn't select the content.
  * @author Shannon Hickey
diff --git a/jdk/test/javax/swing/JTree/6505523/bug6505523.java b/jdk/test/javax/swing/JTree/6505523/bug6505523.java
index 21a1043257f..7e501bc28b0 100644
--- a/jdk/test/javax/swing/JTree/6505523/bug6505523.java
+++ b/jdk/test/javax/swing/JTree/6505523/bug6505523.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6505523
  * @summary NullPointerException in BasicTreeUI when a node is removed by expansion listener
  * @author Alexandr Scherbatiy
diff --git a/jdk/test/javax/swing/JTree/6578666/bug6578666.java b/jdk/test/javax/swing/JTree/6578666/bug6578666.java
index 708ce548ebb..89664fe1245 100644
--- a/jdk/test/javax/swing/JTree/6578666/bug6578666.java
+++ b/jdk/test/javax/swing/JTree/6578666/bug6578666.java
@@ -22,6 +22,7 @@
  */
 /*
  * @test
+ * @key headful
  * @bug 6578666
  * @summary REGRESSION: Exception occurs when updateUI for JTree is triggered by KeyEvent
  * @run main bug6578666
diff --git a/jdk/test/javax/swing/JTree/8003400/Test8003400.java b/jdk/test/javax/swing/JTree/8003400/Test8003400.java
index 7f09751b4d3..a4b91145b38 100644
--- a/jdk/test/javax/swing/JTree/8003400/Test8003400.java
+++ b/jdk/test/javax/swing/JTree/8003400/Test8003400.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8003400
  * @summary Tests that JTree shows the last row
  * @author Sergey Malenkov
diff --git a/jdk/test/javax/swing/JTree/8004298/bug8004298.java b/jdk/test/javax/swing/JTree/8004298/bug8004298.java
index ae2251ced5e..6a8c186f2c1 100644
--- a/jdk/test/javax/swing/JTree/8004298/bug8004298.java
+++ b/jdk/test/javax/swing/JTree/8004298/bug8004298.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8004298
  * @summary NPE in WindowsTreeUI.ensureRowsAreVisible
  * @author Alexander Scherbatiy
diff --git a/jdk/test/javax/swing/JViewport/7107099/bug7107099.java b/jdk/test/javax/swing/JViewport/7107099/bug7107099.java
index a6bdce4b445..f91a74db97c 100644
--- a/jdk/test/javax/swing/JViewport/7107099/bug7107099.java
+++ b/jdk/test/javax/swing/JViewport/7107099/bug7107099.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+   @test
+  @key headful
    @bug 7107099
    @summary JScrollBar does not show up even if there are enough lebgth of textstring in textField
    @author Pavel Porvatov
diff --git a/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java b/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java
index fed42ceb012..7d70f550f58 100644
--- a/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java
+++ b/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java
@@ -27,6 +27,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Check if a per-pixel translucent window shows up with correct translucency
  * @author mrkam
  * @library ../../../../lib/testlibrary
diff --git a/jdk/test/javax/swing/KeyboardManager/8013370/Test8013370.java b/jdk/test/javax/swing/KeyboardManager/8013370/Test8013370.java
index 2b9856f7272..1cd424fcce2 100644
--- a/jdk/test/javax/swing/KeyboardManager/8013370/Test8013370.java
+++ b/jdk/test/javax/swing/KeyboardManager/8013370/Test8013370.java
@@ -41,6 +41,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8013370
  * @summary Ensure that key stroke is not null
  * @author Sergey Malenkov
diff --git a/jdk/test/javax/swing/Popup/6514582/bug6514582.java b/jdk/test/javax/swing/Popup/6514582/bug6514582.java
index 94fee3f4f82..b2d5d57984f 100644
--- a/jdk/test/javax/swing/Popup/6514582/bug6514582.java
+++ b/jdk/test/javax/swing/Popup/6514582/bug6514582.java
@@ -23,12 +23,14 @@
  * questions.
  */
 
-/* @test
-   @bug 6514582
-   @summary SubMenu of a JMenu with no items paints a single pixel tiny menu.
-   @author Alexander Potochkin
-   @run main bug6514582
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 6514582
+ * @summary SubMenu of a JMenu with no items paints a single pixel tiny menu.
+ * @author Alexander Potochkin
+ * @run main bug6514582
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/Popup/TaskbarPositionTest.java b/jdk/test/javax/swing/Popup/TaskbarPositionTest.java
index 0f30c2ae745..c72a15b8ed6 100644
--- a/jdk/test/javax/swing/Popup/TaskbarPositionTest.java
+++ b/jdk/test/javax/swing/Popup/TaskbarPositionTest.java
@@ -28,6 +28,7 @@
 
 /**
  * @test @bug 4245587 4474813 4425878 4767478 8015599
+ * @key headful
  * @author Mark Davidson
  * @summary Tests the location of the heavy weight popup portion of JComboBox,
  * JMenu and JPopupMenu.
diff --git a/jdk/test/javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java b/jdk/test/javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java
index 256ad4ef818..245eecf6058 100644
--- a/jdk/test/javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java
+++ b/jdk/test/javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 6276087
  * @author Romain Guy
  * @summary Tests opacity of a popup menu.
diff --git a/jdk/test/javax/swing/PopupFactory/8048506/bug8048506.java b/jdk/test/javax/swing/PopupFactory/8048506/bug8048506.java
index 66167ec08dc..0c5a0c396f1 100644
--- a/jdk/test/javax/swing/PopupFactory/8048506/bug8048506.java
+++ b/jdk/test/javax/swing/PopupFactory/8048506/bug8048506.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8048506
  * @summary Tests that popup with null-owner does not throw NPE
  * @author Dmitry Markov
diff --git a/jdk/test/javax/swing/RepaintManager/IconifyTest/IconifyTest.java b/jdk/test/javax/swing/RepaintManager/IconifyTest/IconifyTest.java
index 5d4198cc669..7c540c31b11 100644
--- a/jdk/test/javax/swing/RepaintManager/IconifyTest/IconifyTest.java
+++ b/jdk/test/javax/swing/RepaintManager/IconifyTest/IconifyTest.java
@@ -22,6 +22,7 @@
  */
 /*
  * @test
+ * @key headful
  * @bug 4665214
  * @summary Makes sure that RepaintManager doesn't attempt to repaint
  *          a frame when it is iconified.
diff --git a/jdk/test/javax/swing/Security/6657138/ComponentTest.java b/jdk/test/javax/swing/Security/6657138/ComponentTest.java
index 2ee7b84bbfa..307791b86c3 100644
--- a/jdk/test/javax/swing/Security/6657138/ComponentTest.java
+++ b/jdk/test/javax/swing/Security/6657138/ComponentTest.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6657138
  * @summary Verifies that buttons and labels work well after the fix for 6657138
  * @author Alexander Potochkin
diff --git a/jdk/test/javax/swing/SwingUtilities/4917669/bug4917669.java b/jdk/test/javax/swing/SwingUtilities/4917669/bug4917669.java
index ed438928be4..7eaba0cb142 100644
--- a/jdk/test/javax/swing/SwingUtilities/4917669/bug4917669.java
+++ b/jdk/test/javax/swing/SwingUtilities/4917669/bug4917669.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4917669
  * @summary 1.4 REGRESSION: MenuItem accelerator doesn't work if parent menu is in JDialog
  * @author Alexander Zuev
diff --git a/jdk/test/javax/swing/SwingUtilities/7088744/bug7088744.java b/jdk/test/javax/swing/SwingUtilities/7088744/bug7088744.java
index 9d2962c8f36..6c2b27d44fe 100644
--- a/jdk/test/javax/swing/SwingUtilities/7088744/bug7088744.java
+++ b/jdk/test/javax/swing/SwingUtilities/7088744/bug7088744.java
@@ -21,11 +21,13 @@
  * questions.
  */
 
-/* @test
-   @bug 7088744
-   @summary SwingUtilities.isMiddleMouseButton does not work with ALT/Meta keys
-   @author Pavel Porvatov
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 7088744
+ * @summary SwingUtilities.isMiddleMouseButton does not work with ALT/Meta keys
+ * @author Pavel Porvatov
+ */
 
 import sun.awt.SunToolkit;
 
diff --git a/jdk/test/javax/swing/SwingUtilities/7146377/bug7146377.java b/jdk/test/javax/swing/SwingUtilities/7146377/bug7146377.java
index 5114b77e079..20045efbd04 100644
--- a/jdk/test/javax/swing/SwingUtilities/7146377/bug7146377.java
+++ b/jdk/test/javax/swing/SwingUtilities/7146377/bug7146377.java
@@ -21,11 +21,13 @@
  * questions.
  */
 
-/* @test
-   @bug 7146377
-   @summary closed/javax/swing/DataTransfer/4876520/bug4876520.java failed since b08 in jdk 8
-   @author Pavel Porvatov
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 7146377
+ * @summary closed/javax/swing/DataTransfer/4876520/bug4876520.java failed since b08 in jdk 8
+ * @author Pavel Porvatov
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java b/jdk/test/javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java
index 59806a33a0a..198a55b3d1c 100644
--- a/jdk/test/javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java
+++ b/jdk/test/javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java
@@ -36,6 +36,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8015085
  * @summary Shortening via " ... " is broken for Strings containing a combining
  *          diaeresis.
diff --git a/jdk/test/javax/swing/ToolTipManager/Test6256140.java b/jdk/test/javax/swing/ToolTipManager/Test6256140.java
index ca90d815a79..3456c0ecec8 100644
--- a/jdk/test/javax/swing/ToolTipManager/Test6256140.java
+++ b/jdk/test/javax/swing/ToolTipManager/Test6256140.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6256140
  * @summary Esc key doesn't restore old value in JFormattedtextField when ToolTip is set
  * @author Alexander Potochkin
diff --git a/jdk/test/javax/swing/dnd/7171812/bug7171812.java b/jdk/test/javax/swing/dnd/7171812/bug7171812.java
index 8de55bd701f..ff985b1a426 100644
--- a/jdk/test/javax/swing/dnd/7171812/bug7171812.java
+++ b/jdk/test/javax/swing/dnd/7171812/bug7171812.java
@@ -21,11 +21,13 @@
  * questions.
  */
 
-/* @test
-   @bug 7171812
-   @summary [macosx] Views keep scrolling back to the drag position after DnD
-   @author Alexander Zuev
-   @run main bug7171812
+/*
+ * @test
+ * @key headful
+ * @bug 7171812
+ * @summary [macosx] Views keep scrolling back to the drag position after DnD
+ * @author Alexander Zuev
+ * @run main bug7171812
  */
 
 import java.awt.*;
diff --git a/jdk/test/javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java b/jdk/test/javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java
index 26c943230b3..79f9b53fd8c 100644
--- a/jdk/test/javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java
+++ b/jdk/test/javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4251579
  * @summary  Tests if style sheets are working in JLabel
  * @run main bug4251579
diff --git a/jdk/test/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java b/jdk/test/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java
index 666f0be73b2..1ccb5e6a01c 100644
--- a/jdk/test/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java
+++ b/jdk/test/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java
@@ -21,14 +21,16 @@
  * questions.
  */
 
-/* @test
-   @bug 4983388 8015600
-   @summary shortcuts on menus do not work on JDS
-   @author Oleg Mokhovikov
-   @library ../../../../regtesthelpers
-   @build Util
-   @run main bug4983388
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 4983388 8015600
+ * @summary shortcuts on menus do not work on JDS
+ * @author Oleg Mokhovikov
+ * @library ../../../../regtesthelpers
+ * @build Util
+ * @run main bug4983388
+ */
 
 import java.awt.*;
 import javax.swing.*;
diff --git a/jdk/test/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java b/jdk/test/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java
index 1095aced9f9..aff399b3aa7 100644
--- a/jdk/test/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java
+++ b/jdk/test/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8023474
  * @summary Tests that the first mouse press starts editing in JTree
  * @author Dmitry Markov
diff --git a/jdk/test/javax/swing/plaf/gtk/crash/RenderBadPictureCrash.java b/jdk/test/javax/swing/plaf/gtk/crash/RenderBadPictureCrash.java
index 0ef16996cf5..65137da189c 100644
--- a/jdk/test/javax/swing/plaf/gtk/crash/RenderBadPictureCrash.java
+++ b/jdk/test/javax/swing/plaf/gtk/crash/RenderBadPictureCrash.java
@@ -23,6 +23,7 @@
 
 /*
  @test
+ @key headful
  @bug 8056151
  @summary Switching to GTK L&F on-the-fly leads to X Window System error RenderBadPicture
  @run main/othervm -Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel -Dsun.java2d.xrender=T RenderBadPictureCrash
diff --git a/jdk/test/javax/swing/plaf/nimbus/8041642/bug8041642.java b/jdk/test/javax/swing/plaf/nimbus/8041642/bug8041642.java
index 4ed00df642d..af8bdae987a 100644
--- a/jdk/test/javax/swing/plaf/nimbus/8041642/bug8041642.java
+++ b/jdk/test/javax/swing/plaf/nimbus/8041642/bug8041642.java
@@ -21,11 +21,13 @@
  * questions.
  */
 
-/* @test
-   @bug 8041642
-   @summary Incorrect paint of JProgressBar in Nimbus LF
-   @author Semyon Sadetsky
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 8041642
+ * @summary Incorrect paint of JProgressBar in Nimbus LF
+ * @author Semyon Sadetsky
+ */
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/jdk/test/javax/swing/plaf/nimbus/8041725/bug8041725.java b/jdk/test/javax/swing/plaf/nimbus/8041725/bug8041725.java
index d668a3411de..5556f5bdb7b 100644
--- a/jdk/test/javax/swing/plaf/nimbus/8041725/bug8041725.java
+++ b/jdk/test/javax/swing/plaf/nimbus/8041725/bug8041725.java
@@ -21,11 +21,13 @@
  * questions.
  */
 
-/* @test
-   @bug 8041725
-   @summary JList selection colors are not UIResource instances in Nimbus L&F
-   @author Anton Litvinov
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 8041725
+ * @summary JList selection colors are not UIResource instances in Nimbus L&F
+ * @author Anton Litvinov
+ */
 
 import java.awt.*;
 import javax.swing.*;
diff --git a/jdk/test/javax/swing/plaf/nimbus/Test6919629.java b/jdk/test/javax/swing/plaf/nimbus/Test6919629.java
index 6fe98facf28..a7b3365b5a4 100644
--- a/jdk/test/javax/swing/plaf/nimbus/Test6919629.java
+++ b/jdk/test/javax/swing/plaf/nimbus/Test6919629.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+   @test
+   @key headful
    @bug 6919629
    @summary Tests that components with Nimbus.Overrides are GC'ed properly
    @author Peter Zhelezniakov
diff --git a/jdk/test/javax/swing/plaf/synth/7158712/bug7158712.java b/jdk/test/javax/swing/plaf/synth/7158712/bug7158712.java
index 06653628905..2ef8899bf40 100644
--- a/jdk/test/javax/swing/plaf/synth/7158712/bug7158712.java
+++ b/jdk/test/javax/swing/plaf/synth/7158712/bug7158712.java
@@ -21,12 +21,14 @@
  * questions.
  */
 
-/* @test
-   @bug 7158712
-   @summary Synth Property "ComboBox.popupInsets" is ignored
-   @library ../../../regtesthelpers
-   @author Pavel Porvatov
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 7158712
+ * @summary Synth Property "ComboBox.popupInsets" is ignored
+ * @library ../../../regtesthelpers
+ * @author Pavel Porvatov
+ */
 
 import javax.swing.*;
 import javax.swing.plaf.basic.BasicComboPopup;
diff --git a/jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java b/jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java
index 1031e5ef4fa..a4171fe955d 100644
--- a/jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java
+++ b/jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java
@@ -22,6 +22,7 @@
  */
 /**
  * @test 1.4 08/08/05
+ * @key headful
  * @bug 6276188
  * @library ../../../../regtesthelpers
  * @build Util
diff --git a/jdk/test/javax/swing/plaf/synth/Test8015926.java b/jdk/test/javax/swing/plaf/synth/Test8015926.java
index 01751fee499..2d17b4031be 100644
--- a/jdk/test/javax/swing/plaf/synth/Test8015926.java
+++ b/jdk/test/javax/swing/plaf/synth/Test8015926.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8015926
  * @summary Tests that there are no NPE during painting
  * @author Sergey Malenkov
diff --git a/jdk/test/javax/swing/reliability/TaskUndJFrameProperties.java b/jdk/test/javax/swing/reliability/TaskUndJFrameProperties.java
index 4cea8f995f7..cec296fd3f0 100644
--- a/jdk/test/javax/swing/reliability/TaskUndJFrameProperties.java
+++ b/jdk/test/javax/swing/reliability/TaskUndJFrameProperties.java
@@ -26,6 +26,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Construct a Undecorated JFrame, try to change the properties
  *          using setVisible() method.
  * @author Aruna Samji
diff --git a/jdk/test/javax/swing/reliability/TaskZoomJFrameChangeState.java b/jdk/test/javax/swing/reliability/TaskZoomJFrameChangeState.java
index d8a3374f4cf..1ab5df63913 100644
--- a/jdk/test/javax/swing/reliability/TaskZoomJFrameChangeState.java
+++ b/jdk/test/javax/swing/reliability/TaskZoomJFrameChangeState.java
@@ -26,6 +26,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Construct a JFrame, zoom it from the normal state and back forth
  *          using Frame.ZOOMED and Frame.NORMAL. Iconofy from the zoomed
  *          state and back forth using Frame.ICONIFIED and Frame.NORMAL and
diff --git a/jdk/test/javax/swing/reliability/TaskZoomJFrameRepaint.java b/jdk/test/javax/swing/reliability/TaskZoomJFrameRepaint.java
index 54e434bf272..0099210c73b 100644
--- a/jdk/test/javax/swing/reliability/TaskZoomJFrameRepaint.java
+++ b/jdk/test/javax/swing/reliability/TaskZoomJFrameRepaint.java
@@ -26,6 +26,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Construct a jframe with some components and zoom the frame and bring it back to normal state.
  * @author Aruna Samji
  * @library ../../../lib/testlibrary
diff --git a/jdk/test/javax/swing/text/AbstractDocument/6968363/Test6968363.java b/jdk/test/javax/swing/text/AbstractDocument/6968363/Test6968363.java
index 333bfeddb94..5d1eb6cbc52 100644
--- a/jdk/test/javax/swing/text/AbstractDocument/6968363/Test6968363.java
+++ b/jdk/test/javax/swing/text/AbstractDocument/6968363/Test6968363.java
@@ -42,6 +42,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6968363
  * @summary Ensures that a custom document may not extend AbstractDocument
  * @author Sergey Malenkov
diff --git a/jdk/test/javax/swing/text/CSSBorder/6796710/bug6796710.java b/jdk/test/javax/swing/text/CSSBorder/6796710/bug6796710.java
index 46cfd90980f..1cd3c7143e2 100644
--- a/jdk/test/javax/swing/text/CSSBorder/6796710/bug6796710.java
+++ b/jdk/test/javax/swing/text/CSSBorder/6796710/bug6796710.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6796710 7124242
  * @summary Html content in JEditorPane is overlapping on swing components while resizing the application.
  * @library ../../../regtesthelpers
diff --git a/jdk/test/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java b/jdk/test/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java
index 07b79d641b9..65cf42c5da0 100644
--- a/jdk/test/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java
+++ b/jdk/test/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test Jan 16, 2003
+/*
+ * @test
+ * @key headful
  * @bug 4278839
  * @summary Incorrect cursor movement between words at the end of line
  * @author Anton Nashatyrev
diff --git a/jdk/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java b/jdk/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java
index 15619c9909f..6ccd8d837fc 100644
--- a/jdk/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java
+++ b/jdk/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6636983
  * @summary test that composed text at the line starts is handled correctly
  * @author Sergey Groznyh
diff --git a/jdk/test/javax/swing/text/JTextComponent/5074573/bug5074573.java b/jdk/test/javax/swing/text/JTextComponent/5074573/bug5074573.java
index a2067bbacf9..bdadb11170e 100644
--- a/jdk/test/javax/swing/text/JTextComponent/5074573/bug5074573.java
+++ b/jdk/test/javax/swing/text/JTextComponent/5074573/bug5074573.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 5074573
  * @summary tests delte-next-word and delete-prev-word actions for all text compnents and all look&feels
  * @author Igor Kushnirskiy
diff --git a/jdk/test/javax/swing/text/NavigationFilter/6735293/bug6735293.java b/jdk/test/javax/swing/text/NavigationFilter/6735293/bug6735293.java
index 08658b4f35d..431baac2f07 100644
--- a/jdk/test/javax/swing/text/NavigationFilter/6735293/bug6735293.java
+++ b/jdk/test/javax/swing/text/NavigationFilter/6735293/bug6735293.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 6735293
  * @summary javax.swing.text.NavigationFilter.getNextVisualPositionFrom() not always throws BadLocationException
  * @author Pavel Porvatov
diff --git a/jdk/test/javax/swing/text/Utilities/bug7045593.java b/jdk/test/javax/swing/text/Utilities/bug7045593.java
index 1de7cc142c2..3f882a6872a 100644
--- a/jdk/test/javax/swing/text/Utilities/bug7045593.java
+++ b/jdk/test/javax/swing/text/Utilities/bug7045593.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7045593
  * @summary Possible Regression : JTextfield cursor placement behavior algorithm has changed
  * @author Pavel Porvatov
diff --git a/jdk/test/javax/swing/text/View/8014863/bug8014863.java b/jdk/test/javax/swing/text/View/8014863/bug8014863.java
index 892d5aaec5d..9205349895e 100644
--- a/jdk/test/javax/swing/text/View/8014863/bug8014863.java
+++ b/jdk/test/javax/swing/text/View/8014863/bug8014863.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8014863
  * @bug 8024395
  * @summary  Tests the calculation of the line breaks when a text is inserted
diff --git a/jdk/test/javax/swing/text/View/8048110/bug8048110.java b/jdk/test/javax/swing/text/View/8048110/bug8048110.java
index 85ae35708e5..17d18cb565e 100644
--- a/jdk/test/javax/swing/text/View/8048110/bug8048110.java
+++ b/jdk/test/javax/swing/text/View/8048110/bug8048110.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 8048110
  * @summary Using tables in JTextPane leads to infinite loop in FlowLayout.layoutRow
  * @author Dmitry Markov
diff --git a/jdk/test/javax/swing/text/html/7189299/bug7189299.java b/jdk/test/javax/swing/text/html/7189299/bug7189299.java
index 609635c4fc5..46ec4e503a3 100644
--- a/jdk/test/javax/swing/text/html/7189299/bug7189299.java
+++ b/jdk/test/javax/swing/text/html/7189299/bug7189299.java
@@ -39,6 +39,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8008289
  * @summary Shared ButtonModel instance should deregister previous listeners.
  * @author Frank Ding
diff --git a/jdk/test/javax/swing/text/html/8034955/bug8034955.java b/jdk/test/javax/swing/text/html/8034955/bug8034955.java
index 3e7bba2130e..2d78e41a7a2 100644
--- a/jdk/test/javax/swing/text/html/8034955/bug8034955.java
+++ b/jdk/test/javax/swing/text/html/8034955/bug8034955.java
@@ -27,6 +27,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8034955
  * @author Alexander Scherbatiy
  * @summary JLabel/JToolTip throw ClassCastException for "<html>a<title>"
diff --git a/jdk/test/javax/swing/text/html/CSS/4530474/bug4530474.java b/jdk/test/javax/swing/text/html/CSS/4530474/bug4530474.java
index 4f23b2848f2..7803f9309eb 100644
--- a/jdk/test/javax/swing/text/html/CSS/4530474/bug4530474.java
+++ b/jdk/test/javax/swing/text/html/CSS/4530474/bug4530474.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 4530474
  * @summary  Tests if background-color CSS attribute in HTML font tag in class attribute
  * @author Denis Sharypov
diff --git a/jdk/test/javax/swing/text/html/HTMLDocument/8058120/bug8058120.java b/jdk/test/javax/swing/text/html/HTMLDocument/8058120/bug8058120.java
index 86ebdbb963f..54608c4d912 100644
--- a/jdk/test/javax/swing/text/html/HTMLDocument/8058120/bug8058120.java
+++ b/jdk/test/javax/swing/text/html/HTMLDocument/8058120/bug8058120.java
@@ -22,6 +22,7 @@
  */
 
 /* @test
+ * @key headful
  * @bug 8058120
  * @summary Rendering / caret errors with HTMLDocument
  * @author Dmitry Markov
diff --git a/jdk/test/javax/swing/text/html/HTMLEditorKit/4242228/bug4242228.java b/jdk/test/javax/swing/text/html/HTMLEditorKit/4242228/bug4242228.java
index 835990fa142..b3145e787a3 100644
--- a/jdk/test/javax/swing/text/html/HTMLEditorKit/4242228/bug4242228.java
+++ b/jdk/test/javax/swing/text/html/HTMLEditorKit/4242228/bug4242228.java
@@ -21,11 +21,13 @@
  * questions.
  */
 
-/* @test
-   @bug 4242228
-   @summary Tests that HTMLEditorKit.setText() doesn't throw exceptions
-   @author Peter Zhelezniakov
-*/
+/*
+ * @test
+ * @key headful
+ * @bug 4242228
+ * @summary Tests that HTMLEditorKit.setText() doesn't throw exceptions
+ * @author Peter Zhelezniakov
+ */
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
diff --git a/jdk/test/javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java b/jdk/test/javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java
index 39f114977ee..cdce0dab584 100644
--- a/jdk/test/javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java
+++ b/jdk/test/javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 5043626
  * @summary  Tests pressing Home or Ctrl+Home set cursor to invisible element <head>
  * @run main bug5043626
diff --git a/jdk/test/sun/awt/dnd/8024061/bug8024061.java b/jdk/test/sun/awt/dnd/8024061/bug8024061.java
index 3ab27e94b53..3591e3787f1 100644
--- a/jdk/test/sun/awt/dnd/8024061/bug8024061.java
+++ b/jdk/test/sun/awt/dnd/8024061/bug8024061.java
@@ -21,7 +21,9 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @key headful
  * @bug 8024061
  * @summary Checks that no exception is thrown if dragGestureRecognized
  *          takes a while to complete.
diff --git a/jdk/test/sun/java2d/ClassCastExceptionForInvalidSurface.java b/jdk/test/sun/java2d/ClassCastExceptionForInvalidSurface.java
index 956815e6e35..5018ed9d046 100644
--- a/jdk/test/sun/java2d/ClassCastExceptionForInvalidSurface.java
+++ b/jdk/test/sun/java2d/ClassCastExceptionForInvalidSurface.java
@@ -40,6 +40,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8158072 7172749
  */
 public final class ClassCastExceptionForInvalidSurface {
diff --git a/jdk/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java b/jdk/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java
index 6dcfe8a2ead..25f1950dfd6 100644
--- a/jdk/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java
+++ b/jdk/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug 6244574
   @bug 6258142
   @bug 6395165
diff --git a/jdk/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh b/jdk/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh
index 9c1b4f81156..00180af8110 100644
--- a/jdk/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh
+++ b/jdk/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh
@@ -23,6 +23,7 @@
 #
 
 # @test
+# @key headful
 # @bug 6363434 6588884
 # @summary Verify that shared memory pixmaps are not broken
 # by filling a VolatileImage with red color and copying it