--- a/test/jdk/ProblemList.txt	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/ProblemList.txt	Wed Feb 21 12:49:00 2018 -0800
@@ -111,6 +111,8 @@
 
 # jdk_awt
 
+java/awt/BasicStroke/DashScaleMinWidth.java 8198411 windows-all
+java/awt/BasicStroke/DashZeroWidth.java 8198411 windows-all
 java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.html 8168389 windows-all,macosx-all
 java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java 8168408 windows-all
 java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java 8081489 generic-all
@@ -120,6 +122,7 @@
 java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java 8022302 generic-all
 
 java/awt/FileDialog/FileDialogIconTest/FileDialogIconTest.java 8160558 windows-all
+java/awt/FileDialog/8003399/bug8003399.java 8198334 windows-all
 java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java 8060176 windows-all,macosx-all
 java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java 8060176 windows-all,macosx-all
 java/awt/dnd/BadSerializaionTest/BadSerializationTest.java 8039082 generic-all
@@ -135,11 +138,13 @@
 java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java 8049405 generic-all
 java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java 6829264 generic-all
 java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java 8080982 generic-all
+java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java 8079268 linux-all
 java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java 6829250 windows-all
 java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java 8159252 windows-all
 java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java 6990210 generic-all
 java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html 4931413 windows-all
 java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java 7019055 windows-all
+java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java 8198335 windows-all
 java/awt/Focus/8013611/JDK8013611.java 8175366 windows-all
 java/awt/Focus/6981400/Test1.java 8029675 windows-all
 java/awt/Focus/6981400/Test3.java 8173264 generic-all
@@ -175,12 +180,20 @@
 java/awt/Window/Grab/GrabTest.java 8196019 windows-all
 java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucentWindowClick.java 8196020 windows-all
 java/awt/font/TextLayout/CombiningPerf.java 8192931 generic-all
+java/awt/font/TextLayout/TextLayoutBounds.java 8169188 macosx-all
+java/awt/font/MonospacedGlyphWidth/MonospacedGlyphWidthTest.java 8198412 linux-all,solaris-all
+java/awt/font/StyledMetrics/BoldSpace.java 8198422 linux-all
+java/awt/FontMetrics/FontCrash.java 8198336 windows-all
 java/awt/image/DrawImage/IncorrectAlphaSurface2SW.java 8056077 generic-all
 java/awt/image/DrawImage/IncorrectClipXorModeSW2Surface.java 8196025 windows-all
 java/awt/image/DrawImage/IncorrectClipXorModeSurface2Surface.java 8196025 windows-all
 java/awt/image/DrawImage/IncorrectSourceOffset.java 8196086 windows-all
 java/awt/image/DrawImage/IncorrectUnmanagedImageRotatedClip.java 8196087 windows-all
+java/awt/image/MultiResolutionImage/MultiResolutionDrawImageWithTransformTest.java 8198390 generic-all
 java/awt/print/Headless/HeadlessPrinterJob.java 8196088 windows-all
+java/awt/print/PrinterJob/TestPgfmtSetMPA.java 8198343 generic-all
+sun/awt/datatransfer/SuplementaryCharactersTransferTest.java 8011371 generic-all
+sun/awt/shell/ShellFolderMemoryLeak.java 8197794 windows-all
 sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java 8022403 generic-all
 sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java 8196102 generic-all
 sun/java2d/DirectX/RenderingToCachedGraphicsTest/RenderingToCachedGraphicsTest.java 8196180 windows-all
@@ -196,10 +209,14 @@
 java/awt/FullScreen/NonExistentDisplayModeTest/NonExistentDisplayModeTest.java 8196187 windows-all
 java/awt/Graphics/ClippedCopyAreaTest/ClippedCopyAreaTest.java 8196436 linux-all
 java/awt/Graphics/CopyScaledArea/CopyScaledAreaTest.java 8196189 windows-all
+java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java 8197796 generic-all
 java/awt/GraphicsDevice/CloneConfigsTest.java 8196190 windows-all
 java/awt/TextArea/TextAreaScrolling/TextAreaScrolling.java 8196300 windows-all
 java/awt/print/PrinterJob/Margins.java 8196301 windows-all
+java/awt/print/PrinterJob/PSQuestionMark.java 7003378 windows-all
+java/awt/print/PrinterJob/GlyphPositions.java 7003378 windows-all
 java/awt/Choice/PopupPosTest/PopupPosTest.html 8192930 windows-all
+java/awt/Component/CreateImage/CreateImage.java 8198334  windows-all
 java/awt/Component/GetScreenLocTest.java 4753654 windows-all
 java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.html 8192929 windows-all
 java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java 7054586 windows-all
@@ -266,6 +283,8 @@
 java/awt/Modal/ToBack/ToBackTKModal4Test.java 8196441 linux-all
 java/awt/List/SingleModeDeselect/SingleModeDeselect.java 8196301 windows-all
 
+javax/print/PrintSEUmlauts/PrintSEUmlauts.java 8135174 generic-all
+
 
 ############################################################################
 
@@ -400,6 +419,9 @@
 
 # jdk_swing
 
+com/sun/java/swing/plaf/windows/Test8173145.java 8198334 windows-all
+
+javax/swing/border/Test6981576.java 8198339 generic-all
 javax/swing/JComponent/7154030/bug7154030.java 7190978 generic-all
 javax/swing/JInternalFrame/8160248/JInternalFrameDraggingTest.java 8186513 generic-all
 javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java 8067986 generic-all
@@ -411,6 +433,7 @@
 javax/swing/JComboBox/8033069/bug8033069ScrollBar.java 8163367 generic-all
 javax/swing/JColorChooser/Test6541987.java 8143021 windows-all,linux-all
 javax/swing/JTable/7124218/SelectEditTableCell.java 8148958 linux-all
+javax/swing/JTable/4235420/bug4235420.java 8079127 linux-all,macosx-all
 javax/swing/JTree/DnD/LastNodeLowerHalfDrop.java 8159131 linux-all
 javax/swing/JFileChooser/8041694/bug8041694.java 8196302 windows-all
 javax/swing/JInternalFrame/8069348/bug8069348.java 8196303 windows-all
@@ -422,6 +445,7 @@
 javax/swing/JComboBox/8057893/bug8057893.java 8169953 windows-all
 javax/swing/JComboBox/8072767/bug8072767.java 8196093 windows-all
 javax/swing/JComponent/4337267/bug4337267.java 8146451 windows-all
+javax/swing/JEditorPane/5076514/bug5076514.java 8198321 generic-all
 javax/swing/JEditorPane/6917744/bug6917744.java 8194767 generic-all
 javax/swing/JFileChooser/4524490/bug4524490.java 8042380 generic-all
 javax/swing/JFileChooser/8002077/bug8002077.java 8196094 windows-all
@@ -434,18 +458,34 @@
 javax/swing/JTabbedPane/8007563/Test8007563.java 8051591 generic-all
 javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java 8160720 generic-all
 javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java 8196098 windows-all
+javax/swing/plaf/basic/Test6984643.java 8198340 windows-all
 javax/swing/text/CSSBorder/6796710/bug6796710.java 8196099 windows-all
 javax/swing/text/DefaultCaret/HidingSelection/HidingSelectionTest.java 8194048 windows-all
 javax/swing/text/JTextComponent/5074573/bug5074573.java 8196100 windows-all
 javax/swing/JFileChooser/6798062/bug6798062.java 8146446 windows-all
-javax/swing/plaf/basic/BasicGraphicsUtils/8132119/bug8132119.java 8196434 linux-all
+javax/swing/plaf/basic/BasicGraphicsUtils/8132119/bug8132119.java 8196434 linux-all,solaris-all
 javax/swing/JComboBox/8032878/bug8032878.java 8196439 linux-all
 javax/swing/JComboBox/8182031/ComboPopupTest.java 8196465 linux-all
-javax/swing/JFileChooser/6738668/bug6738668.java 8194946 linux-all,macosx-all
+javax/swing/JFileChooser/6738668/bug6738668.java 8194946 generic-all
 javax/swing/JFileChooser/8021253/bug8021253.java 8169954 windows-all,linux-all
-javax/swing/JFileChooser/8062561/bug8062561.java 8196466 linux-all
+javax/swing/JFileChooser/8062561/bug8062561.java 8196466 linux-all,macosx-all
+javax/swing/JFileChooser/FileSystemView/FileSystemViewListenerLeak.java 8198342 generic-all
 javax/swing/JInternalFrame/Test6325652.java 8196467 linux-all
-
+javax/swing/MultiUIDefaults/Test6860438.java 8198391 generic-all
+javax/swing/UITest/UITest.java 8198392 generic-all
+javax/swing/plaf/basic/BasicComboBoxEditor/Test8015336.java 8198394 linux-all,macosx-all
+javax/swing/plaf/metal/MetalLookAndFeel/Test8039750.java 8198395 generic-all
+javax/swing/text/DevanagariEditor.java 8198397 linux-all
+javax/swing/JColorChooser/Test6199676.java 8198398 linux-all,macosx-all
+javax/swing/JTable/6735286/bug6735286.java 8198398 linux-all,macosx-all
+javax/swing/SpringLayout/4726194/bug4726194.java 8198399 generic-all
+javax/swing/SwingUtilities/6797139/bug6797139.java 8198400 generic-all
+javax/swing/text/html/parser/Parser/6836089/bug6836089.java 8198401 linux-all,macosx-all
+javax/swing/JTable/8133919/DrawGridLinesTest.java 8198407 generic-all
+javax/swing/text/html/StyleSheet/BackgroundImage/BackgroundImagePosition.java 8198409 generic-all
+javax/swing/text/AbstractDocument/DocumentInsert/DocumentInsertAtWrongPositionTest.java 8198396 generic-all
+javax/swing/JFileChooser/6868611/bug6868611.java 7059834 windows-all
+javax/swing/SwingWorker/6493680/bug6493680.java 8198410 windows-all
 
 ############################################################################
 

--- a/test/jdk/java/awt/Desktop/8064934/bug8064934.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/Desktop/8064934/bug8064934.java	Wed Feb 21 12:49:00 2018 -0800
@@ -23,6 +23,8 @@
 
 /* @test
  * @bug 8064934
+ * @key headful
+ * @requires (os.family == "windows")
  * @summary Incorrect Exception message from java.awt.Desktop.open()
  * @author Dmitry Markov
  * @library ../../../../lib/testlibrary

--- a/test/jdk/java/awt/Desktop/OpenByUNCPathNameTest/OpenByUNCPathNameTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/Desktop/OpenByUNCPathNameTest/OpenByUNCPathNameTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -23,6 +23,8 @@
 
 /* @test
    @bug 6550588
+   @key headful
+   @requires (os.family == "windows")
    @summary java.awt.Desktop cannot open file with Windows UNC filename
    @author Anton Litvinov
 */

--- a/test/jdk/java/awt/EmbeddedFrame/GraphicsConfigTest/GraphicsConfigTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/EmbeddedFrame/GraphicsConfigTest/GraphicsConfigTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6356322
+ * @key headful
  * @summary Tests that embedded frame's graphics configuration is updated
  *          correctly when it is moved to another screen in multiscreen system,
  *          XToolkit

--- a/test/jdk/java/awt/FileDialog/ISCthrownByFileListTest/ISCthrownByFileListTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/FileDialog/ISCthrownByFileListTest/ISCthrownByFileListTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -24,6 +24,7 @@
 /*
   @test
   @bug 6304979
+  @key headful
   @summary REG: File Dialog throws ArrayIndexOutOfBounds Exception on XToolkit with b45
   @author Dmitry Cherepanov: area=awt.filedialog
   @run main/othervm -Dsun.awt.disableGtkFileDialogs=true ISCthrownByFileListTest

--- a/test/jdk/java/awt/Focus/SortingFPT/JDK8048887.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/Focus/SortingFPT/JDK8048887.java	Wed Feb 21 12:49:00 2018 -0800
@@ -23,6 +23,7 @@
 
 /*
   @test
+  @key headful
   @bug       8048887 8164937
   @summary   Tests SortingFTP for an exception caused by the tim-sort algo.
   @author    anton.tarasov: area=awt.focus

--- a/test/jdk/java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -23,8 +23,8 @@
 
 /**
  * @test
- * @bug 6358034
- * @bug 6568560
+ * @bug 6358034 6568560
+ * @key headful
  * @summary Tests that no exception is thrown when display mode is changed
  *          externally
  * @compile UninitializedDisplayModeChangeTest.java DisplayModeChanger.java

--- a/test/jdk/java/awt/Graphics2D/ScaledTransform/ScaledTransform.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/Graphics2D/ScaledTransform/ScaledTransform.java	Wed Feb 21 12:49:00 2018 -0800
@@ -33,6 +33,7 @@
 /*
  * @test
  * @bug 8069361
+ * @key headful
  * @summary SunGraphics2D.getDefaultTransform() does not include scale factor
  * @author Alexander Scherbatiy
  * @run main ScaledTransform

--- a/test/jdk/java/awt/List/SetBackgroundTest/SetBackgroundTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/List/SetBackgroundTest/SetBackgroundTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -24,6 +24,8 @@
 /*
   @test
   @bug 6246467
+  @key headful
+  @requires (os.family == "linux") | (os.family == "solaris")
   @summary List does not honor user specified background, foreground colors on XToolkit
   @author Dmitry Cherepanov  area=awt.list
   @library ../../../../lib/testlibrary

--- a/test/jdk/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java	Wed Feb 21 12:49:00 2018 -0800
@@ -22,7 +22,7 @@
  */
 
 /*
-  @test %I% %E%
+  @test
   @key headful
   @bug 6315717
   @summary verifies that drag events are coming for every button if the property is set to true

--- a/test/jdk/java/awt/Paint/PaintNativeOnUpdate.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/Paint/PaintNativeOnUpdate.java	Wed Feb 21 12:49:00 2018 -0800
@@ -36,7 +36,7 @@
  * @library ../../../lib/testlibrary
  * @build ExtendedRobot
  * @author Sergey Bylokhov
- @ @run main PaintNativeOnUpdate
+ * @run main PaintNativeOnUpdate
  */
 public final class PaintNativeOnUpdate extends Label {
 

--- a/test/jdk/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java	Wed Feb 21 12:49:00 2018 -0800
@@ -22,7 +22,7 @@
  */
 
 /*
-  @test %I% %E%
+  @test
   @key headful
   @bug 6315717
   @summary verifies that Robot is accepting extra mouse buttons

--- a/test/jdk/java/awt/TextArea/DisposeTest/TestDispose.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TextArea/DisposeTest/TestDispose.java	Wed Feb 21 12:49:00 2018 -0800
@@ -27,6 +27,7 @@
 
 /* @test
  * @bug 7155298
+ * @key headful
  * @run main/othervm/timeout=60 TestDispose
  * @summary Editable TextArea blocks GUI application from exit.
  * @author Sean Chou

--- a/test/jdk/java/awt/TextField/DisposeTest/TestDispose.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TextField/DisposeTest/TestDispose.java	Wed Feb 21 12:49:00 2018 -0800
@@ -27,6 +27,7 @@
 
 /* @test
  * @bug 7155298
+ * @key headful
  * @run main/othervm/timeout=60 TestDispose
  * @summary Editable TextField blocks GUI application from exit.
  * @author Sean Chou

--- a/test/jdk/java/awt/Toolkit/RealSync/Test.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/Toolkit/RealSync/Test.java	Wed Feb 21 12:49:00 2018 -0800
@@ -24,6 +24,7 @@
 /*
   @test
   @bug 6252005
+  @key headful
   @summary Tests that realSync feature works
   @author denis.mikhalkin: area=awt.toolkit
   @modules java.desktop/sun.awt
@@ -150,7 +151,7 @@
             }
         }
         errors.clear();
-        System.exit(1);
+        throw new Error();
     }
 
     public static void asser(boolean value) {

--- a/test/jdk/java/awt/TrayIcon/8072769/bug8072769.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/8072769/bug8072769.java	Wed Feb 21 12:49:00 2018 -0800
@@ -23,6 +23,8 @@
 
 /* @test
    @bug 8072769
+   @key headful
+   @requires (os.family == "windows")
    @summary System tray icon title freezes java
    @author Semyon Sadetsky
    @library ../../../../lib/testlibrary

--- a/test/jdk/java/awt/TrayIcon/ActionCommand/ActionCommand.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/ActionCommand/ActionCommand.java	Wed Feb 21 12:49:00 2018 -0800
@@ -26,6 +26,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Check the return value of the getActionCommand method
  *          of the ActionEvent triggered when TrayIcon is double clicked
  *          (single clicked, on Mac)

--- a/test/jdk/java/awt/TrayIcon/ActionEventMask/ActionEventMask.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/ActionEventMask/ActionEventMask.java	Wed Feb 21 12:49:00 2018 -0800
@@ -27,6 +27,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Check if ActionEvent triggered when a TrayIcon is double
  *          (single, on Mac) clicked is visible by an AWTEventListener
  *          added to the Toolkit. It also checks if all listeners are

--- a/test/jdk/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6191390 8154328
+ * @key headful
  * @summary Verify that ActionEvent is received with correct modifiers set.
  * @modules java.desktop/java.awt:open
  * @modules java.desktop/java.awt.peer

--- a/test/jdk/java/awt/TrayIcon/CtorTest/CtorTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/CtorTest/CtorTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -24,6 +24,7 @@
 /*
   @test
   @bug 6759726
+  @key headful
   @summary TrayIcon constructor throws NPE instead of documented IAE
   @author Dmitry Cherepanov area=awt.tray
   @run main CtorTest

--- a/test/jdk/java/awt/TrayIcon/GetTrayIconsTest/GetTrayIcons.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/GetTrayIconsTest/GetTrayIcons.java	Wed Feb 21 12:49:00 2018 -0800
@@ -26,6 +26,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Check the getTrayIcons method of the SystemTray
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
  * @run main GetTrayIcons

--- a/test/jdk/java/awt/TrayIcon/InterJVMTest/InterJVM.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/InterJVMTest/InterJVM.java	Wed Feb 21 12:49:00 2018 -0800
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Check if TrayIcon added by a JVM is not visible
  *          in another JVM
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)

--- a/test/jdk/java/awt/TrayIcon/ModalityTest/ModalityTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/ModalityTest/ModalityTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -27,6 +27,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Check for MouseEvents with all mouse buttons
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
  * @modules java.desktop/java.awt:open

--- a/test/jdk/java/awt/TrayIcon/MouseEventMask/MouseEventMaskTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/MouseEventMask/MouseEventMaskTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -27,6 +27,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Check if MouseEvents triggered by TrayIcon are visible
  *          by an AWTEventListener added to the Toolkit. It also
  *          checks if all listeners are triggered when AWTEventListeners

--- a/test/jdk/java/awt/TrayIcon/MouseMovedTest/MouseMovedTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/MouseMovedTest/MouseMovedTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -27,6 +27,7 @@
 
 /*
  * @test
+ * @key headful
  * @bug 7153700
  * @summary Check for mouseMoved event for java.awt.TrayIcon
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)

--- a/test/jdk/java/awt/TrayIcon/PropertyChangeListenerTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/PropertyChangeListenerTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -28,6 +28,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Check if custom property change listener added
  *          to system tray works correctly
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)

--- a/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java	Wed Feb 21 12:49:00 2018 -0800
@@ -27,6 +27,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Check for MouseEvents with all mouse buttons
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
  * @modules java.desktop/java.awt:open

--- a/test/jdk/java/awt/TrayIcon/SecurityCheck/NoPermissionTest/NoPermissionTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/SecurityCheck/NoPermissionTest/NoPermissionTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -26,6 +26,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Check for SecurityException occurrence if no permissions for system tray granted
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
  * @run main/othervm/policy=tray.policy -Djava.security.manager NoPermissionTest

--- a/test/jdk/java/awt/TrayIcon/SecurityCheck/PermissionTest/PermissionTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/SecurityCheck/PermissionTest/PermissionTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -26,6 +26,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Check for no Exception occurrence if permissions for system tray granted
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
  * @run main/othervm/policy=tray.policy -Djava.security.manager PermissionTest

--- a/test/jdk/java/awt/TrayIcon/TrayIconAddTest/TrayIconAddTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/TrayIconAddTest/TrayIconAddTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -27,6 +27,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Tests the add method of the SystemTray. Checks if it
  *          throws proper exceptions in case of invalid arguments and adds the
  *          TrayIcon correctly in case of a proper argument

--- a/test/jdk/java/awt/TrayIcon/TrayIconEvents/TrayIconEventsTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/TrayIconEvents/TrayIconEventsTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -28,6 +28,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Check for MouseEvents with all mouse buttons
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
  * @modules java.desktop/java.awt:open

--- a/test/jdk/java/awt/TrayIcon/TrayIconMethodsTest/TrayIconMethodsTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/TrayIconMethodsTest/TrayIconMethodsTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -27,6 +27,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Check various methods of the TrayIcon - whether the methods
  *          return the proper values, throws the proper exceptions etc
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)

--- a/test/jdk/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -31,6 +31,7 @@
 /*
  * @test
  * @bug 6384991
+ * @key headful
  * @summary Check if ActionEvent is triggered by a TrayIcon when
  *          it is double clicked with mouse button 1 on windows
  *          or single clicked with button 3 on Mac OS X

--- a/test/jdk/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupClickTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupClickTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -34,6 +34,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Check if a action performed event is received when TrayIcon display
  *          message is clicked on.
  * @author Shashidhara Veerabhadraiah (shashidhara.veerabhadraiah@oracle.com)

--- a/test/jdk/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -26,6 +26,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Check if a JPopupMenu can be displayed when TrayIcon is
  *          right clicked. It uses a JWindow as the parent of the JPopupMenu
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)

--- a/test/jdk/java/awt/TrayIcon/TrayIconRemoveTest/TrayIconRemoveTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/TrayIconRemoveTest/TrayIconRemoveTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -26,6 +26,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Test the remove method of the TrayIcon
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
  * @run main TrayIconRemoveTest

--- a/test/jdk/java/awt/TrayIcon/TrayIconSizeTest/TrayIconSizeTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/TrayIconSizeTest/TrayIconSizeTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -27,6 +27,7 @@
 
 /*
  * @test
+ * @key headful
  * @summary Test the methods TrayIcon.getSize and SystemTray.getTrayIconSize.
  *          There is no way to check whether the values returned are correct,
  *          so its checked whether the value is greater than a minimum

--- a/test/jdk/java/awt/TrayIcon/UpdatePopupMenu/UpdatePopupMenu.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/TrayIcon/UpdatePopupMenu/UpdatePopupMenu.java	Wed Feb 21 12:49:00 2018 -0800
@@ -24,6 +24,7 @@
 /*
  @test
  @bug 8147841
+ @key headful
  @summary Updating Tray Icon popup menu does not update menu items on Mac OS X
  @run main/manual UpdatePopupMenu
  */

--- a/test/jdk/java/awt/Window/GetScreenLocation/GetScreenLocationTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/Window/GetScreenLocation/GetScreenLocationTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -22,7 +22,8 @@
  */
 
 /**
- * @test @summary setLocationRelativeTo stopped working in Ubuntu 13.10 (Unity)
+ * @test
+ * @summary setLocationRelativeTo stopped working in Ubuntu 13.10 (Unity)
  * @key headful
  * @bug 8036915 8161273
  * @run main/othervm -Dsun.java2d.uiScale=1 GetScreenLocationTest

--- a/test/jdk/java/awt/Window/MultiWindowApp/ChildAlwaysOnTopTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/Window/MultiWindowApp/ChildAlwaysOnTopTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -22,8 +22,10 @@
  */
 
 /**
- * @test @summary setAlwaysOnTop doesn't behave correctly in Linux/Solaris under
- *                certain scenarios
+ * @test
+ * @key headful
+ * @summary setAlwaysOnTop doesn't behave correctly in Linux/Solaris under
+ *          certain scenarios
  * @bug 8021961
  * @author Semyon Sadetsky
  * @run main ChildAlwaysOnTopTest

--- a/test/jdk/java/awt/Window/MultiWindowApp/MultiWindowAppTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/Window/MultiWindowApp/MultiWindowAppTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -22,7 +22,8 @@
  */
 
 /**
- * @test @summary After calling frame.toBack() dialog goes to the back on Ubuntu 12.04
+ * @test
+ * @summary After calling frame.toBack() dialog goes to the back on Ubuntu 12.04
  * @key headful
  * @bug 8022334
  * @author Semyon Sadetsky

--- a/test/jdk/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -22,7 +22,8 @@
  */
 
 /**
- * @test @summary JVM crash if the frame is disposed in DropTargetListener
+ * @test
+ * @summary JVM crash if the frame is disposed in DropTargetListener
  * @key headful
  * @author Petr Pchelko
  * @library ../../regtesthelpers

--- a/test/jdk/java/awt/font/TextLayout/TestAATMorxFont.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/font/TextLayout/TestAATMorxFont.java	Wed Feb 21 12:49:00 2018 -0800
@@ -23,6 +23,7 @@
  */
 
 /* @test
+ * @key headful
  * @summary verify rendering of MORX fonts on OS X.
  * @bug 8031462
  */

--- a/test/jdk/java/awt/image/MultiResolutionImageCommonTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/image/MultiResolutionImageCommonTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -34,7 +34,8 @@
 import java.awt.image.MultiResolutionImage;
 
 /**
- * @test @bug 8011059
+ * @test
+ * @bug 8011059
  * @author Alexander Scherbatiy
  * @summary Test MultiResolution image loading and painting with various scaling
  *          combinations

--- a/test/jdk/java/awt/image/MultiResolutionImageTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/image/MultiResolutionImageTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -40,7 +40,8 @@
 import java.awt.image.MultiResolutionImage;
 
 /**
- * @test @bug 8011059
+ * @test
+ * @bug 8011059
  * @key headful
  * @author Alexander Scherbatiy
  * @summary [macosx] Make JDK demos look perfect on retina displays

--- a/test/jdk/java/awt/print/PrinterJob/DeviceScale.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/print/PrinterJob/DeviceScale.java	Wed Feb 21 12:49:00 2018 -0800
@@ -23,6 +23,7 @@
 
 /* @test 1.2 02/05/15
    @bug 4810363 4924441
+   @key printer
    @run main DeviceScale
    @summary check the peek scale is the same as the device scale, and that the
    clips are also the same

--- a/test/jdk/java/awt/print/PrinterJob/DummyPrintTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/print/PrinterJob/DummyPrintTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -23,6 +23,7 @@
 /*
  * @test
  * @bug      6921664
+ * @key printer
  * @summary  Verifies number of copies and the job name are passed to a
  *           3rd party PrintService.
  * @run      main DummyPrintTest

--- a/test/jdk/java/awt/print/PrinterJob/HeadlessPrintingTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/java/awt/print/PrinterJob/HeadlessPrintingTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 4936867
+ * @key printer
  * @summary Printing crashes in headless mode.
  * @run main/othervm HeadlessPrintingTest
  */

--- a/test/jdk/javax/imageio/plugins/shared/ImageWriterCompressionTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/javax/imageio/plugins/shared/ImageWriterCompressionTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -42,7 +42,8 @@
 import javax.imageio.stream.ImageOutputStream;
 
 /**
- * @test @bug 6488522
+ * @test
+ * @bug 6488522
  * @summary Check the compression support in imageio ImageWriters
  * @run main ImageWriterCompressionTest
  */

--- a/test/jdk/javax/print/PrintServiceLookup/CountPrintServices.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/javax/print/PrintServiceLookup/CountPrintServices.java	Wed Feb 21 12:49:00 2018 -0800
@@ -32,6 +32,7 @@
 /*
  * @test
  * @bug 8032693
+ * @key printer
  * @summary Test that lpstat and JDK agree whether there are printers.
  */
 public class CountPrintServices {

--- a/test/jdk/javax/print/attribute/ChromaticityValues.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/javax/print/attribute/ChromaticityValues.java	Wed Feb 21 12:49:00 2018 -0800
@@ -23,6 +23,8 @@
 /*
  * @test
  * @bug 4446106
+ * @key printer
+ * @requires (os.family == "windows")
  * @summary Test for chromaticity values.
  * @run main ChromaticityValues
 */

--- a/test/jdk/javax/swing/JEditorPane/8080972/TestJEditor.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/javax/swing/JEditorPane/8080972/TestJEditor.java	Wed Feb 21 12:49:00 2018 -0800
@@ -40,6 +40,7 @@
  * @summary Audit Core Reflection in module java.desktop for places that will
  *          require changes to work with modules
  * @author Alexander Scherbatiy
+ * @run main/othervm TestJEditor
  */
 public class TestJEditor {
 

--- a/test/jdk/javax/swing/JEditorPane/bug4714674.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/javax/swing/JEditorPane/bug4714674.java	Wed Feb 21 12:49:00 2018 -0800
@@ -27,7 +27,7 @@
    @author Peter Zhelezniakov
    @modules java.desktop
             jdk.httpserver
-   @run main bug4714674
+   @run main/othervm bug4714674
 */
 
 import javax.swing.*;

--- a/test/jdk/javax/swing/JFileChooser/6520101/bug6520101.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/javax/swing/JFileChooser/6520101/bug6520101.java	Wed Feb 21 12:49:00 2018 -0800
@@ -22,7 +22,7 @@
  */
 
 /*
- * @test @(#)bug6520101
+ * @test
  * @key headful
  * @bug 6520101
  * @summary JFileChooser throws OOM in 1.4.2, 5.0u4 and 1.6.0

--- a/test/jdk/javax/swing/JFileChooser/8062561/bug8062561.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/javax/swing/JFileChooser/8062561/bug8062561.java	Wed Feb 21 12:49:00 2018 -0800
@@ -36,6 +36,8 @@
 /**
  * @test
  * @bug 8062561
+ * @key headful
+ * @requires (os.family == "windows")
  * @summary File system view returns null default directory
  * @library ../../../../lib/testlibrary
  * @modules java.desktop/sun.awt

--- a/test/jdk/javax/swing/JMenuItem/6883341/bug6883341.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/javax/swing/JMenuItem/6883341/bug6883341.java	Wed Feb 21 12:49:00 2018 -0800
@@ -24,6 +24,7 @@
  /*
  * @test
  * @bug 6883341
+ * @key headful
  * @summary Checks that menu items with no text don't throw an exception
  * @author Alexander Potochkin
  * @run main bug6883341

--- a/test/jdk/javax/swing/JTable/8031971/bug8031971.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/javax/swing/JTable/8031971/bug8031971.java	Wed Feb 21 12:49:00 2018 -0800
@@ -32,7 +32,7 @@
  * @bug 8031971 8039750
  * @author Alexander Scherbatiy
  * @summary Use only public methods in the SwingLazyValue
- * @run main bug8031971
+ * @run main/othervm bug8031971
  */
 public class bug8031971 {
 

--- a/test/jdk/javax/swing/Popup/TaskbarPositionTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/javax/swing/Popup/TaskbarPositionTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -27,7 +27,8 @@
 import javax.swing.event.*;
 
 /**
- * @test @bug 4245587 4474813 4425878 4767478 8015599
+ * @test
+ * @bug 4245587 4474813 4425878 4767478 8015599
  * @key headful
  * @author Mark Davidson
  * @summary Tests the location of the heavy weight popup portion of JComboBox,

--- a/test/jdk/javax/swing/RepaintManager/DisplayListenerLeak/DisplayListenerLeak.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/javax/swing/RepaintManager/DisplayListenerLeak/DisplayListenerLeak.java	Wed Feb 21 12:49:00 2018 -0800
@@ -34,6 +34,7 @@
 /**
  * @test
  * @bug 8041654
+ * @key headful
  * @modules java.desktop/sun.java2d
  * @run main/othervm -Xmx80m DisplayListenerLeak
  */

--- a/test/jdk/javax/swing/UIDefaults/6622002/bug6622002.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/javax/swing/UIDefaults/6622002/bug6622002.java	Wed Feb 21 12:49:00 2018 -0800
@@ -26,6 +26,7 @@
  * @bug 6622002
  * @author Alexander Potochkin
  * @summary UIDefault.ProxyLazyValue has unsafe reflection usage
+ * @run main/othervm bug6622002
  */
 
 import javax.swing.*;

--- a/test/jdk/javax/swing/UIDefaults/8080972/TestProxyLazyValue.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/javax/swing/UIDefaults/8080972/TestProxyLazyValue.java	Wed Feb 21 12:49:00 2018 -0800
@@ -28,6 +28,7 @@
  * @summary Audit Core Reflection in module java.desktop for places that will
  *          require changes to work with modules
  * @author Alexander Scherbatiy
+ * @run main/othervm TestProxyLazyValue
  */
 
 public class TestProxyLazyValue {

--- a/test/jdk/javax/swing/plaf/nimbus/TestDisabledToolTipBorder.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/javax/swing/plaf/nimbus/TestDisabledToolTipBorder.java	Wed Feb 21 12:49:00 2018 -0800
@@ -21,7 +21,8 @@
  * questions.
  */
 /**
- * @test @bug 8058785
+ * @test
+ * @bug 8058785
  * @summary Displaying border around the disabled component's tool tip text
  * @run main/manual TestDisabledToolTipBorder
  */

--- a/test/jdk/javax/swing/text/View/8080972/TestObjectView.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/javax/swing/text/View/8080972/TestObjectView.java	Wed Feb 21 12:49:00 2018 -0800
@@ -36,6 +36,7 @@
  * @summary Audit Core Reflection in module java.desktop for places that will
  *          require changes to work with modules
  * @author Alexander Scherbatiy
+ * @run main/othervm TestObjectView
  */
 
 public class TestObjectView {

--- a/test/jdk/sun/java2d/marlin/TextClipErrorTest.java	Tue Feb 20 21:49:06 2018 -0800
+++ b/test/jdk/sun/java2d/marlin/TextClipErrorTest.java	Wed Feb 21 12:49:00 2018 -0800
@@ -50,7 +50,8 @@
 import javax.imageio.ImageIO;
 
 /**
- * @test @bug 8144718
+ * @test
+ * @bug 8144718
  * @summary Check the Stroker.drawBezApproxForArc() bug (stoke with round
  * joins): if cosext2 > 0.5, it generates curves with NaN coordinates
  * @run main TextClipErrorTest