diff --git a/jdk/test/java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java b/jdk/test/java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java
index 88f01802428..37396a79fa4 100644
--- a/jdk/test/java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java
+++ b/jdk/test/java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java
@@ -36,6 +36,7 @@ import java.awt.event.InputEvent;
 
 /**
  * @test
+ * @key headful
  * @bug 8176448
  * @run main/timeout=300 ChoicePopupLocation
  */
diff --git a/jdk/test/java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java b/jdk/test/java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java
index 6f0a6317f1b..1d678c915c9 100644
--- a/jdk/test/java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java
+++ b/jdk/test/java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8169589 8171909
  * @summary Activating a dialog puts to back another dialog owned by the same frame
  * @author Dmitry Markov
diff --git a/jdk/test/java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java b/jdk/test/java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java
index eb20f189a7e..b4acec4c563 100644
--- a/jdk/test/java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java
+++ b/jdk/test/java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8171952
  * @summary Tests that getMousePosition() returns null for obscured component.
  * @author Dmitry Markov
diff --git a/jdk/test/java/awt/PopupMenu/PopupMenuLocation.java b/jdk/test/java/awt/PopupMenu/PopupMenuLocation.java
index ec1714f56ea..713eb1d706a 100644
--- a/jdk/test/java/awt/PopupMenu/PopupMenuLocation.java
+++ b/jdk/test/java/awt/PopupMenu/PopupMenuLocation.java
@@ -38,6 +38,7 @@ import java.awt.event.*;
 
 /**
  * @test
+ * @key headful
  * @bug 8160270
  * @run main/timeout=300 PopupMenuLocation
  */
diff --git a/jdk/test/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureTest.java b/jdk/test/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureTest.java
index 7be3a918117..50e01c6376e 100644
--- a/jdk/test/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureTest.java
+++ b/jdk/test/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureTest.java
@@ -23,6 +23,7 @@
 
  /*
  * @test
+ * @key headful
  * @bug 8162959
  * @summary Validate output of createMultiResolutionScreenCapture
  *          new API which returns MultiResolutionImage.
diff --git a/jdk/test/java/awt/Robot/MultiScreenRobotPosition/MultiScreenRobotPosition.java b/jdk/test/java/awt/Robot/MultiScreenRobotPosition/MultiScreenRobotPosition.java
index eb9d1b2f117..f1ab6078dbc 100644
--- a/jdk/test/java/awt/Robot/MultiScreenRobotPosition/MultiScreenRobotPosition.java
+++ b/jdk/test/java/awt/Robot/MultiScreenRobotPosition/MultiScreenRobotPosition.java
@@ -31,6 +31,7 @@ import java.awt.event.MouseEvent;
 
 /**
  * @test
+ * @key headful
  * @bug 8176009
  */
 public class MultiScreenRobotPosition {
diff --git a/jdk/test/java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java b/jdk/test/java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java
index 01e4783adc4..a49993d9df0 100644
--- a/jdk/test/java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java
+++ b/jdk/test/java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8176490
  * @summary Tests that there is no hang or deadlock when the visibility
  *      of parent and child windows is changed.
diff --git a/jdk/test/java/awt/font/TextLayout/ArabicDiacriticTest.java b/jdk/test/java/awt/font/TextLayout/ArabicDiacriticTest.java
index b060707131f..de1fb1373db 100644
--- a/jdk/test/java/awt/font/TextLayout/ArabicDiacriticTest.java
+++ b/jdk/test/java/awt/font/TextLayout/ArabicDiacriticTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -22,6 +22,7 @@
  */
 
 /* @test
+ * @key headful
  * @summary verify Arab Diacritic Positioning
  * @bug 8168759
  */
diff --git a/jdk/test/javax/accessibility/JList/AccessibleJListChildNPETest.java b/jdk/test/javax/accessibility/JList/AccessibleJListChildNPETest.java
index 118519565d6..fbdb5c87551 100644
--- a/jdk/test/javax/accessibility/JList/AccessibleJListChildNPETest.java
+++ b/jdk/test/javax/accessibility/JList/AccessibleJListChildNPETest.java
@@ -35,6 +35,7 @@ import javax.swing.SwingUtilities;
 import javax.swing.WindowConstants;
 
 /* @test
+   @key headful
    @bug 8076249
    @summary  NPE in AccessBridge while editing JList model
    @author Mikhail Cherkasov
diff --git a/jdk/test/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java b/jdk/test/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java
index bff91376ad2..12c69288e6a 100644
--- a/jdk/test/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java
+++ b/jdk/test/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java
@@ -30,6 +30,7 @@ import javax.swing.SwingUtilities;
 
 /**
  * @test
+ * @key headful
  * @bug 8175301
  * @summary Java GUI hangs on Windows when Display set to 125%
  * @run main/othervm -Dsun.java2d.uiScale=2 ScaledFrameBackgroundTest
diff --git a/jdk/test/javax/swing/JFrame/AlwaysOnTop/AlwaysOnTopImeTest.java b/jdk/test/javax/swing/JFrame/AlwaysOnTop/AlwaysOnTopImeTest.java
index a8d375106b9..5197650b382 100644
--- a/jdk/test/javax/swing/JFrame/AlwaysOnTop/AlwaysOnTopImeTest.java
+++ b/jdk/test/javax/swing/JFrame/AlwaysOnTop/AlwaysOnTopImeTest.java
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key headful
  * @bug 8179665
  * @summary [Windows] java.awt.IllegalComponentStateException: component must
  *          be showing on the screen to determine its location
diff --git a/jdk/test/javax/swing/JLightweightFrame/JLightweightFrameRoundTest.java b/jdk/test/javax/swing/JLightweightFrame/JLightweightFrameRoundTest.java
index f02bcc0e0dd..6a96241dd88 100644
--- a/jdk/test/javax/swing/JLightweightFrame/JLightweightFrameRoundTest.java
+++ b/jdk/test/javax/swing/JLightweightFrame/JLightweightFrameRoundTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 8170387
  * @summary JLightweightFrame#syncCopyBuffer() may throw IOOBE
  * @modules java.desktop/sun.swing
diff --git a/jdk/test/javax/swing/JRadioButton/ButtonGroupFocus/ButtonGroupFocusTest.java b/jdk/test/javax/swing/JRadioButton/ButtonGroupFocus/ButtonGroupFocusTest.java
index f7118aa3fba..c696b166dd0 100644
--- a/jdk/test/javax/swing/JRadioButton/ButtonGroupFocus/ButtonGroupFocusTest.java
+++ b/jdk/test/javax/swing/JRadioButton/ButtonGroupFocus/ButtonGroupFocusTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -22,6 +22,7 @@
  */
 
 /* @test
+ * @key headful
  * @bug 8074883
  * @summary Tab key should move to focused button in a button group
  * @run main ButtonGroupFocusTest
diff --git a/jdk/test/javax/swing/JTree/4633594/JTreeFocusTest.java b/jdk/test/javax/swing/JTree/4633594/JTreeFocusTest.java
index 800bf10be4d..1af659362e1 100644
--- a/jdk/test/javax/swing/JTree/4633594/JTreeFocusTest.java
+++ b/jdk/test/javax/swing/JTree/4633594/JTreeFocusTest.java
@@ -21,6 +21,7 @@
  * questions.
  */
 /* @test
+   @key headful
    @bug 4633594 8172012
    @summary No way to pass focus from a JTree to a GUI placed inside the tree node
    @run main JTreeFocusTest
diff --git a/jdk/test/javax/swing/plaf/basic/BasicComboPopup/JComboBoxPopupLocation/JComboBoxPopupLocation.java b/jdk/test/javax/swing/plaf/basic/BasicComboPopup/JComboBoxPopupLocation/JComboBoxPopupLocation.java
index 20db73fa371..588abd90861 100644
--- a/jdk/test/javax/swing/plaf/basic/BasicComboPopup/JComboBoxPopupLocation/JComboBoxPopupLocation.java
+++ b/jdk/test/javax/swing/plaf/basic/BasicComboPopup/JComboBoxPopupLocation/JComboBoxPopupLocation.java
@@ -39,6 +39,7 @@ import javax.swing.UIManager;
 
 /**
  * @test
+ * @key headful
  * @bug 8176448
  * @run main/timeout=600 JComboBoxPopupLocation
  */
diff --git a/jdk/test/javax/swing/text/html/StyleSheet/bug4936917.java b/jdk/test/javax/swing/text/html/StyleSheet/bug4936917.java
index e490f93baf0..b81d7ce2cf3 100644
--- a/jdk/test/javax/swing/text/html/StyleSheet/bug4936917.java
+++ b/jdk/test/javax/swing/text/html/StyleSheet/bug4936917.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -21,6 +21,7 @@
  * questions.
  */
 /* @test
+   @key headful
    @bug 4936917 7190578 8174717
    @summary  Tests if background is correctly painted when <BODY> has css margins
    @author Denis Sharypov