--- old/test/jdk/java/awt/Window/HandleWindowDestroyTest/HandleWindowDestroyTest.java	2018-11-26 17:45:08.000000000 -0800
+++ new/test/jdk/java/awt/Window/HandleWindowDestroyTest/HandleWindowDestroyTest.java	2018-11-26 17:45:08.000000000 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -24,30 +24,23 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 6260648
   @summary Tests that WINDOW_DESTROY event can be handled by overriding handleEvent(). Also,
 tests that handleEvent() is not called by AWT if any listener is added to the component
 (i. e. when post-1.1 events schema is used)
-  @author artem.ananiev: area=awt.event
-  @run applet HandleWindowDestroyTest.html
+  @run main HandleWindowDestroyTest
 */
 
-import java.applet.*;
-
 import java.awt.*;
 import java.awt.event.*;
 
-public class HandleWindowDestroyTest extends Applet
-{
-    private volatile boolean handleEventCalled;
-
-    public void start ()
-    {
-        setSize (200,200);
-        setVisible(true);
-        validate();
+public class HandleWindowDestroyTest {
+
+    private static volatile boolean handleEventCalled;
 
+    public static void main(final String[] args) {
         Robot robot;
         try {
             robot = new Robot();