diff --git a/test/jdk/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java b/test/jdk/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java
index 78c83185cbe..5bff03d5b34 100644
--- a/test/jdk/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java
+++ b/test/jdk/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java
@@ -25,7 +25,7 @@
  * @test
  * @key headful
  * @bug 7159566
- * @summary The choice positioned in the top of applet when clicking the choice.
+ * @summary The choice positioned in the top of window when clicking the choice.
  * @author Petr Pchelko
  * @library ../../regtesthelpers
  * @build Util
diff --git a/test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java b/test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java
index 4db2d52e4ea..93bf59d2757 100644
--- a/test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java
+++ b/test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java
@@ -32,7 +32,7 @@ import java.util.concurrent.atomic.AtomicReference;
  * @test
  * @key headful
  * @bug 8043705
- * @summary Can't exit color chooser dialog when running as an applet
+ * @summary Can't exit color chooser dialog when running in non-default AppContext
  * @modules java.desktop/sun.awt
  * @run main CloseDialogTest
  */
diff --git a/test/jdk/java/awt/Focus/ChoiceFocus/ChoiceFocus.java b/test/jdk/java/awt/Focus/ChoiceFocus/ChoiceFocus.java
index 904992f96b2..2456379f0f9 100644
--- a/test/jdk/java/awt/Focus/ChoiceFocus/ChoiceFocus.java
+++ b/test/jdk/java/awt/Focus/ChoiceFocus/ChoiceFocus.java
@@ -32,7 +32,6 @@
   @run main ChoiceFocus
 */
 
-import java.applet.*;
 import java.awt.*;
 import java.awt.event.*;
 import test.java.awt.regtesthelpers.Util;
diff --git a/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java b/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java
index 1efcee3e675..69bd1dd6c83 100644
--- a/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java
+++ b/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java
@@ -127,4 +127,4 @@ public class FirstItemRemoveTest extends Frame
 
     }
 
-}// class AutomaticAppletTest
+}
diff --git a/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java b/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java
index 67926b5fe19..1b1d4e4b5c4 100644
--- a/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java
+++ b/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java
@@ -99,4 +99,4 @@ public class FocusEmptyListTest extends Frame {
 
     }// start()
 
-}// class AutomaticAppletTest
+}
diff --git a/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java
index b380af149f6..fb3ea40a531 100644
--- a/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java
+++ b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java
@@ -31,7 +31,7 @@ import javax.swing.SwingUtilities;
  * @test
  * @key headful
  * @bug 8012026 8196435
- * @summary Component.getMousePosition() does not work in an applet on MacOS
+ * @summary Component.getMousePosition() does not work in some cases on MacOS
  * @run main GetMousePositionWithOverlay
  */
 
diff --git a/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
index 5bfadc6fbe7..663942b7630 100644
--- a/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
+++ b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
@@ -33,7 +33,7 @@ import javax.swing.SwingUtilities;
  * @test
  * @key headful
  * @bug 8012026 8027154
- * @summary Component.getMousePosition() does not work in an applet on MacOS
+ * @summary Component.getMousePosition() does not work in some cases on MacOS
  *
  * @requires (os.family == "windows")
  * @run main/othervm -Dsun.java2d.uiScale.enabled=true -Dsun.java2d.uiScale=1 GetMousePositionWithPopup
@@ -48,7 +48,7 @@ import javax.swing.SwingUtilities;
  * @test
  * @key headful
  * @bug 8012026 8027154
- * @summary Component.getMousePosition() does not work in an applet on MacOS
+ * @summary Component.getMousePosition() does not work in some cases on MacOS
  *
  * @requires (os.family == "mac" | os.family == "linux")
  * @run main/othervm -Dsun.java2d.uiScale.enabled=true -Dsun.java2d.uiScale=1 GetMousePositionWithPopup
diff --git a/test/jdk/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java b/test/jdk/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java
index 9fbf48f3eb4..bc392ab9efe 100644
--- a/test/jdk/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java
+++ b/test/jdk/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java
@@ -34,7 +34,6 @@ import java.awt.*;
 import java.awt.print.*;
 import java.awt.event.*;
 import javax.swing.*;
-import java.applet.*;
 
 public class PageSetupDlgBlockingTest extends Panel {
     public static Frame frame = new TestFrame("Test Frame");
diff --git a/test/jdk/java/awt/TextArea/TextScrollTest.java b/test/jdk/java/awt/TextArea/TextScrollTest.java
index 4a92391e7af..fbd5c022580 100644
--- a/test/jdk/java/awt/TextArea/TextScrollTest.java
+++ b/test/jdk/java/awt/TextArea/TextScrollTest.java
@@ -38,7 +38,7 @@ import java.awt.TextArea;
 public class TextScrollTest extends Frame {
     private static final String INSTRUCTIONS = """
             1. A TextArea whose content starts with the text ",
-               'Scroll till the' will appear on the applet ",
+               'Scroll till the' will appear on the window ",
             2. Use the Horizontal thumb button of the TextArea to view the entire",
                content of the TextArea",
             3. While scrolling, if the text 'Scroll till the' appears repeatedly, Click Fail  ",
diff --git a/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java
index 18159dce64f..aa785f54733 100644
--- a/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java
+++ b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java
@@ -101,7 +101,6 @@ public class DragUnicodeBetweenJVMTest {
         processResults.printProcessStandartOutput(System.out);
     }
 
-    //We cannot make an instance of the applet without the default constructor
     public DragUnicodeBetweenJVMTest () {
         super();
     }
diff --git a/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java b/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java
index 0254a3f0d41..3502cd4f9c5 100644
--- a/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java
+++ b/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java
@@ -123,7 +123,6 @@ public class MissedHtmlAndRtfBug {
         processResults.printProcessStandartOutput(System.out);
     }
 
-    //We cannot make an instance of the applet without the default constructor
     public MissedHtmlAndRtfBug() {
         super();
     }
diff --git a/test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java b/test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java
index 51129f26408..b106deac73c 100644
--- a/test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java
+++ b/test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java
@@ -42,7 +42,7 @@ public class DnDFileGroupDescriptor {
             When the test starts, a RED panel appears.
             1. Start MS Outlook program. Find and open the mail form with attachments.
 
-            2. Select attachments from the mail and drag into a red field of applet.
+            2. Select attachments from the mail and drag into a red field of the window.
                 When the mouse enters the field during the process of drag, the application
                 should change the cursor form to OLE-copy and field color to yellow.
 
diff --git a/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java b/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java
index 6fc7b9e049d..102ff501040 100644
--- a/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java
+++ b/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java
@@ -80,7 +80,6 @@ public class FileListBetweenJVMsTest {
         processResults.printProcessStandartOutput(System.out);
     }
 
-    //We cannot make an instance of the applet without the default constructor
     public FileListBetweenJVMsTest () {
         super();
     }
diff --git a/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java b/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java
index e847752ee6a..6de649f846f 100644
--- a/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java
+++ b/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java
@@ -89,7 +89,6 @@ public class URIListBetweenJVMsTest {
         processResults.printProcessStandartOutput(System.out);
     }
 
-    //We cannot make an instance of the applet without the default constructor
     public URIListBetweenJVMsTest () {
         super();
     }
diff --git a/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java b/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java
index f2e34493b8b..d9b6bd5e87c 100644
--- a/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java
+++ b/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java
@@ -77,7 +77,6 @@ public class URIListToFileListBetweenJVMsTest {
         processResults.printProcessStandartOutput(System.out);
     }
 
-    //We cannot make an instance of the applet without the default constructor
     public URIListToFileListBetweenJVMsTest() {
         super();
     }
diff --git a/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java b/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java
index e0cfbaba1bb..41dc4709fc2 100644
--- a/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java
+++ b/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java
@@ -150,4 +150,4 @@ public class MenuDragMouseEventAbsoluteCoordsTest implements MouseListener
             }
         System.out.println(message);
     }
-}// class AutomaticAppletTest
+}
diff --git a/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java
index 7db513eeac8..6022ed32094 100644
--- a/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java
+++ b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java
@@ -27,21 +27,17 @@
   @bug 6480024
   @library ../../../regtesthelpers
   @build Util Sysout AbstractTest
-  @summary stack overflow on mouse wheel rotation within JApplet
+  @summary stack overflow on mouse wheel rotation within a Window
   @run main InfiniteRecursion_2
 */
 
 /**
  * InfiniteRecursion_2.java
  *
- * summary: put a JButton into JPanel and then put JPanel into Applet.
- * Add MouseWheelListener to Applet.
+ * summary: put a JButton into JPanel and then put JPanel into the Window.
+ * Add MouseWheelListener to the Window
  * Add MouseListener to JPanel.
  * Rotating a wheel over the JButton would result in stack overflow.
-
- * summary: put a JButton into JApplet.
- * Add MouseWheelListener to JApplet.
- * Rotating a wheel over the JButton would result in stack overflow.
  */
 
 import java.awt.*;
@@ -79,7 +75,7 @@ public class InfiniteRecursion_2 extends Frame {
         this.addMouseWheelListener(new MouseWheelListener() {
                 public void mouseWheelMoved(MouseWheelEvent e)
                 {
-                    System.out.println("Wheel moved on APPLET : "+e);
+                    System.out.println("Wheel moved on Window : "+e);
                     actualEvents++;
                 }
             });
diff --git a/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java
index 911e7c10864..e1f2991a2fb 100644
--- a/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java
+++ b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java
@@ -27,15 +27,15 @@
   @bug 6480024
   @library ../../../regtesthelpers
   @build Util Sysout AbstractTest
-  @summary stack overflow on mouse wheel rotation within JApplet
+  @summary stack overflow on mouse wheel rotation within a Window
   @run main InfiniteRecursion_3
 */
 
 /**
  * InfiniteRecursion_3.java
  *
- * summary: put a JButton into Applet.
- * Add MouseWheelListener to Applet.
+ * summary: put a JButton into the Window.
+ * Add MouseWheelListener to the Window.
  * Rotating a wheel over the JButton would result in stack overflow.
  */
 
@@ -72,7 +72,7 @@ public class InfiniteRecursion_3 extends Frame {
         this.addMouseWheelListener(new MouseWheelListener() {
                 public void mouseWheelMoved(MouseWheelEvent e)
                 {
-                    System.out.println("Wheel moved on APPLET : "+e);
+                    System.out.println("Wheel moved on Window : "+e);
                     actualEvents++;
                 }
             });
diff --git a/test/jdk/java/awt/event/helpers/lwcomponents/LWButton.java b/test/jdk/java/awt/event/helpers/lwcomponents/LWButton.java
index 866844e1ce7..e45d3d5f430 100644
--- a/test/jdk/java/awt/event/helpers/lwcomponents/LWButton.java
+++ b/test/jdk/java/awt/event/helpers/lwcomponents/LWButton.java
@@ -116,16 +116,8 @@ public class LWButton extends LWComponent {
         repaint();
       }
     }
-    try {
-      unClicker uc = new unClicker();
-      new Thread(uc).start();
-    } catch (Exception e) {
-      // In case we're in an applet and the security has not been
-      // turned off (in which case we can't start a new thread)
-      // we can catch that and set the flag back to how it should be.
-      isInClick = false;
-      repaint();
-    }
+    unClicker uc = new unClicker();
+    new Thread(uc).start();
   }
 
   /**
diff --git a/test/jdk/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java b/test/jdk/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java
index fd2acaad396..7942402af4f 100644
--- a/test/jdk/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java
+++ b/test/jdk/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java
@@ -25,7 +25,7 @@
   @test
   @key headful
   @bug 6359129
-  @summary REGRESSION: Popup menus dont respond to selections when extend outside Applet
+  @summary REGRESSION: Popup menus dont respond to selections when extend outside EmbeddedFrame
   @author oleg.sukhodolsky area=awt.grab
   @modules java.desktop/java.awt.peer
            java.desktop/sun.awt
@@ -38,7 +38,7 @@
 /**
  * EmbeddedFrameTest1.java
  *
- * summary: REGRESSION: Popup menus dont respond to selections when extend outside Applet
+ * summary: REGRESSION: Popup menus dont respond to selections when extend outside EmbeddedFrame
  */
 
 import java.awt.BorderLayout;
diff --git a/test/jdk/java/awt/im/8041990/bug8041990.java b/test/jdk/java/awt/im/8041990/bug8041990.java
index 303fde5a459..d4bf847592d 100644
--- a/test/jdk/java/awt/im/8041990/bug8041990.java
+++ b/test/jdk/java/awt/im/8041990/bug8041990.java
@@ -26,7 +26,7 @@
  * @test
  * @key headful
  * @bug 8041990
- * @summary Language specific keys does not work in applets when opened outside the browser
+ * @summary Language specific keys does not work in non-default AppContexts of top-level windows
  * @author Petr Pchelko
  * @modules java.desktop/sun.awt
  */
diff --git a/test/jdk/java/awt/print/Dialog/DialogOrient.java b/test/jdk/java/awt/print/Dialog/DialogOrient.java
index 6650ced64f4..b89f3950e99 100644
--- a/test/jdk/java/awt/print/Dialog/DialogOrient.java
+++ b/test/jdk/java/awt/print/Dialog/DialogOrient.java
@@ -34,9 +34,6 @@ import java.awt.event.*;
 import java.awt.geom.*;
 import java.awt.print.*;
 
-// This test is a "main" test as applets would need Runtime permission
-// "queuePrintJob".
-
 public class DialogOrient implements Printable {
 
    private static void init() throws Exception {
diff --git a/test/jdk/java/awt/print/PrinterJob/PrintDialog.java b/test/jdk/java/awt/print/PrinterJob/PrintDialog.java
index fa9569e1aa7..395312aaa45 100644
--- a/test/jdk/java/awt/print/PrinterJob/PrintDialog.java
+++ b/test/jdk/java/awt/print/PrinterJob/PrintDialog.java
@@ -42,9 +42,6 @@ import java.awt.*;
 import java.awt.event.*;
 import java.awt.print.*;
 
-// This test is a "main" test as applets would need Runtime permission
-// "queuePrintJob".
-
 public class PrintDialog {
 
 
diff --git a/test/jdk/java/awt/print/PrinterJob/PrintDialogCancel.java b/test/jdk/java/awt/print/PrinterJob/PrintDialogCancel.java
index b2d3d3a2230..9a1884a5f54 100644
--- a/test/jdk/java/awt/print/PrinterJob/PrintDialogCancel.java
+++ b/test/jdk/java/awt/print/PrinterJob/PrintDialogCancel.java
@@ -43,9 +43,6 @@ import java.awt.*;
 import java.awt.event.*;
 import java.awt.print.*;
 
-// This test is a "main" test as applets would need Runtime permission
-// "queuePrintJob".
-
 public class PrintDialogCancel {
 
 
diff --git a/test/jdk/java/awt/print/PrinterJob/ThinLines.java b/test/jdk/java/awt/print/PrinterJob/ThinLines.java
index f8e4e60b319..95cbfed8796 100644
--- a/test/jdk/java/awt/print/PrinterJob/ThinLines.java
+++ b/test/jdk/java/awt/print/PrinterJob/ThinLines.java
@@ -42,9 +42,6 @@ import java.awt.*;
 import java.awt.event.*;
 import java.awt.print.*;
 
-// This test is a "main" test as applets would need Runtime permission
-// "queuePrintJob".
-
 public class ThinLines implements Printable {
 
    private static final int INCH = 72;
diff --git a/test/jdk/java/awt/regtesthelpers/AbstractTest.java b/test/jdk/java/awt/regtesthelpers/AbstractTest.java
index f5c34cc6fbd..fbf66e45e3b 100644
--- a/test/jdk/java/awt/regtesthelpers/AbstractTest.java
+++ b/test/jdk/java/awt/regtesthelpers/AbstractTest.java
@@ -30,8 +30,6 @@
      @build AbstractTest
      @run main YourTest
    </pre>
- * Note that if you are about to create a test based on
- * Applet-template, then put those lines into html-file, not in java-file.
  * <p> And put an
  * import test.java.awt.regtesthelpers.AbstractTest;
  * into the java source.
diff --git a/test/jdk/java/awt/regtesthelpers/Util.java b/test/jdk/java/awt/regtesthelpers/Util.java
index 6d570e903b6..45d9c89ee46 100644
--- a/test/jdk/java/awt/regtesthelpers/Util.java
+++ b/test/jdk/java/awt/regtesthelpers/Util.java
@@ -31,8 +31,6 @@ package test.java.awt.regtesthelpers;
      @build Util
      @run main YourTest
    </pre>
- * Note that if you are about to create a test based on
- * Applet-template, then put those lines into html-file, not in java-file.
  * <p> And put an
  * import test.java.awt.regtesthelpers.Util;
  * into the java source of test.
diff --git a/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java b/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java
index d6806947af2..3b173009d23 100644
--- a/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java
+++ b/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java
@@ -31,7 +31,7 @@ import java.io.*;
  *  behavior such as DnD data transfer, Clipboard data transfer, focus
  *  transfer etc., you could use the next scenario:
  *
- *  1. Write an implementation for the parent JVM, using applet test.
+ *  1. Write an implementation for the parent JVM
  *  2. Write an implementation for the child JVM or native application, using
  *     main() function.
  *  3. Execute child process using  ProcessCommunicator.executeChildProcess()
diff --git a/test/jdk/javax/sound/sampled/Clip/ClipFlushCrash.java b/test/jdk/javax/sound/sampled/Clip/ClipFlushCrash.java
index a72509fdf53..2baeb499eac 100644
--- a/test/jdk/javax/sound/sampled/Clip/ClipFlushCrash.java
+++ b/test/jdk/javax/sound/sampled/Clip/ClipFlushCrash.java
@@ -35,7 +35,7 @@ import javax.sound.sampled.Mixer;
  * @test
  * @key sound
  * @bug 4946945
- * @summary Crash in javasound while running TicTacToe demo applet tiger b26
+ * @summary Crash in javasound while running TicTacToe demo tiger b26
  */
 public class ClipFlushCrash {
     static int frameCount = 441000; // lets say 10 seconds
diff --git a/test/jdk/javax/sound/sampled/LinuxBlock/PlaySine.java b/test/jdk/javax/sound/sampled/LinuxBlock/PlaySine.java
index ab567dacb23..ceead0dae62 100644
--- a/test/jdk/javax/sound/sampled/LinuxBlock/PlaySine.java
+++ b/test/jdk/javax/sound/sampled/LinuxBlock/PlaySine.java
@@ -36,7 +36,7 @@ import javax.sound.sampled.SourceDataLine;
  * @test
  * @key sound
  * @bug 4834461
- * @summary Applet hang when you load it during sound card is in use
+ * @summary App hang when you load it during sound card is in use
  * @run main/manual PlaySine
  */
 public class PlaySine {
diff --git a/test/jdk/javax/swing/JPopupMenu/bug4212464.java b/test/jdk/javax/swing/JPopupMenu/bug4212464.java
index c1c434f6b16..cbfecc989cc 100644
--- a/test/jdk/javax/swing/JPopupMenu/bug4212464.java
+++ b/test/jdk/javax/swing/JPopupMenu/bug4212464.java
@@ -36,7 +36,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import javax.swing.JApplet;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
diff --git a/test/jdk/javax/swing/JTextArea/4697612/bug4697612.java b/test/jdk/javax/swing/JTextArea/4697612/bug4697612.java
index ed7f3dba73f..ee01c38ed67 100644
--- a/test/jdk/javax/swing/JTextArea/4697612/bug4697612.java
+++ b/test/jdk/javax/swing/JTextArea/4697612/bug4697612.java
@@ -224,7 +224,7 @@ public class bug4697612 {
         text = new JTextArea();
         try {
             InputStream is =
-                    bug4697612.class.getResourceAsStream("bug4697612.txt");
+                    bug4697612.class.getResourceAsStream("bug4697612.java");
             text.read(new InputStreamReader(is), null);
         } catch (IOException e) {
             throw new Error(e);
diff --git a/test/jdk/javax/swing/JTextArea/4697612/bug4697612.txt b/test/jdk/javax/swing/JTextArea/4697612/bug4697612.txt
deleted file mode 100644
index f7273541285..00000000000
--- a/test/jdk/javax/swing/JTextArea/4697612/bug4697612.txt
+++ /dev/null
@@ -1,221 +0,0 @@
-                                   README
-
-                      Java(TM) 2 SDK, Standard Edition
-                             Version 1.4.2 Beta
-
-     For a more extensive HTML version of this file, see README.html.
-
-Contents
-
-   * Introduction
-   * Release Notes
-   * Bug Reports and Feedback
-   * Java 2 SDK Documentation
-   * Redistribution
-   * Web Pages
-
-
-Introduction
-
-     Thank you for downloading this release of the Java(TM) 2 SDK,
-     Standard Edition. The Java 2 SDK is a development environment for
-     building applications, applets, and components that can be
-     deployed on the Java platform.
-
-     The Java 2 SDK software includes tools useful for developing and
-     testing programs written in the Java programming language and
-     running on the Java platform. These tools are designed to be used
-     from the command line. Except for appletviewer, these tools do not
-     provide a graphical user interface.
-
-
-Release Notes
-
-      See the Release Notes on the Java Software web site for additional 
-      information pertaining to this release. 
- 
-      http://java.sun.com/j2se/1.4.2/relnotes.html
-
-      The on-line release notes will be updated as needed, so you should 
-      check it occasionally for the latest information. 
-
-
-Bug Reports and Feedback
-
-      The Bug Parade Web Page on the Java Developer Connection(SM) web 
-      site lets you search for and examine existing bug reports, submit 
-      your own bug reports, and tell us which bug fixes matter most to you. 
-
-      http://java.sun.com/jdc/bugParade/
-
-      To directly submit a bug or request a feature, fill out this form: 
-
-      http://java.sun.com/cgi-bin/bugreport.cgi 
-
-      You can also send comments directly to Java Software engineering 
-      team email addresses. 
-
-      http://java.sun.com/mail/
-
-
-Java 2 SDK Documentation
-
-     The on-line Java 2 SDK Documentation contains API specifications,
-     feature descriptions, developer guides, tool reference pages, demos, 
-     and links to related information. It is located at
-
-     http://java.sun.com/j2se/1.4.2/docs/
-
-     The Java 2 SDK documentation is also available in a download bundle 
-     which you can install locally on your machine. See the 
-     Java 2 SDK download page: 
-     
-     http://java.sun.com/j2se/1.4.2/download.html
-
-
-Redistribution
-
-      The term "vendors" used here refers to licensees, developers, 
-      and independent software vendors (ISVs) who license and 
-      distribute the Java 2 Runtime Environment with their programs. 
-      Vendors must follow the terms of the Java 2 SDK, Standard 
-      Edition, Binary Code License agreement. 
-      Required vs. Optional Files
-
-      The files that make up the Java 2 SDK, Standard Edition, are
-      divided into two categories: required and optional. Optional 
-      files may be excluded from redistributions of the Java 2 SDK 
-      at the vendor's discretion. The following section contains a 
-      list of the files and directories that may optionally be 
-      omitted from redistributions of the Java 2 SDK. All files not 
-      in these lists of optional files must be included in 
-      redistributions of the Java 2 SDK. 
-
-      Optional Files and Directories
-
-      The following files may be optionally excluded from 
-      redistributions:
-
-      jre/lib/charsets.jar 
-            Character conversion classes 
-      jre/lib/ext/ 
-            sunjce_provider.jar - the SunJCE provider for Java 
-              Cryptography APIs
-            localedata.jar - contains many of the resources 
-              needed for non US English locales
-            ldapsec.jar - contains security features supported 
-              by the LDAP service provider
-            dnsns.jar - for the InetAddress wrapper of JNDI DNS 
-              provider
-      bin/rmid and jre/bin/rmid 
-            Java RMI Activation System Daemon 
-      bin/rmiregistry and jre/bin/rmiregistry 
-            Java Remote Object Registry 
-      bin/tnameserv and jre/bin/tnameserv 
-            Java IDL Name Server 
-      bin/keytool and jre/bin/keytool 
-            Key and Certificate Management Tool 
-      bin/kinit and jre/bin/kinit
-            Used to obtain and cache Kerberos ticket-granting tickets
-      bin/klist and jre/bin/klist
-            Kerberos display entries in credentials cache and keytab
-      bin/ktab and jre/bin/ktab
-            Kerberos key table manager
-      bin/policytool and jre/bin/policytool 
-            Policy File Creation and Management Tool 
-      bin/orbd and jre/bin/orbd 
-            Object Request Broker Daemon 
-      bin/servertool and jre/bin/servertool 
-            Java IDL Server Tool 
-      src.zip 
-            Archive of source files 
-
-      In addition, the Java Web Start product may be excluded from
-      redistributions. The Java Web Start product is contained in a 
-      file named javaws-1_2-solaris-sparc-i.zip,
-      javaws-1_2-solaris-i586-i.zip,
-      javaws-1_2-linux-i586-i.zip, or
-      javaws-1_2-windows-i586-i.exe, depending on the platform. 
-
-
-      Unlimited Strength Java Cryptography Extension
-
-      Due to import control restrictions for some countries, the 
-      Java Cryptography Extension (JCE) policy files shipped with 
-      the Java 2 SDK, Standard Edition and the Java 2 Runtime 
-      Environment allow strong but limited cryptography to be 
-      used.  These files are located at
-
-      <java-home>/lib/security/local_policy.jar
-      <java-home>/lib/security/US_export_policy.jar
-
-      where <java-home> is the jre directory of the Java 2 
-      SDK or the top-level directory of the Java 2 Runtime 
-      Environment.
-
-      An unlimited strength version of these files indicating 
-      no restrictions on cryptographic strengths is available 
-      on the Java 2 SDK web site for those living in eligible 
-      countries.  Those living in eligible countries may download 
-      the unlimited strength version and replace the strong 
-      cryptography jar files with the unlimited strength files.
-
-
-      Endorsed Standards Override Mechanism
-
-      An endorsed standard is a Java API defined through a standards
-      process other than the Java Community Process(SM) (JCP(SM)).
-      Because endorsed standards are defined outside the JCP, it is
-      anticipated that such standards will be revised between 
-      releases of the Java 2 Platform. In order to take advantage of 
-      new revisions to endorsed standards, developers and software
-      vendors may use the Endorsed Standards Override Mechanism to
-      provide newer versions of an endorsed standard than those
-      included in the Java 2 Platform as released by Sun Microsystems.
-
-      For more information on the Endorsed Standards Override
-      Mechanism, including the list of platform packages that it may 
-      be used to override, see 
-
-            http://java.sun.com/j2se/1.4.2/docs/guide/standards/ 
-
-      Classes in the packages listed on that web page may be replaced
-      only by classes implementing a more recent version of the API 
-      as defined by the appropriate standards body. 
-
-      In addition to the packages listed in the document at the above 
-      URL, which are part of the Java 2 Platform, Standard Edition 
-      (J2SE(TM)) specification, redistributors of Sun's J2SE 
-      Reference Implementation are allowed to override classes whose 
-      sole purpose is to implement the functionality provided by 
-      public APIs defined in these Endorsed Standards packages.  
-      Redistributors may also override classes in the org.w3c.dom.* 
-      packages, or other classes whose sole purpose is to implement 
-      these APIs. 
-
-
-Sun Java Web Pages
-
-     For additional information, refer to these Sun Microsystems pages
-     on the World Wide Web:
-
-     http://java.sun.com/
-          The Java Software web site, with the latest information on
-          Java technology, product information, news, and features.
-     http://java.sun.com/docs
-          Java Platform Documentation provides access to white papers,
-          the Java Tutorial and other documents.
-     http://java.sun.com/jdc
-          The Java Developer Connection(SM) web site. (Free registration
-          required.) Additional technical information, news, and
-          features; user forums; support information, and much more.
-     http://java.sun.com/products/
-          Java Technology Products & API
-
-
-------------------------------------------------------------------------
-The Java 2 SDK, Standard Edition, is a product of Sun Microsystems(TM), 
-Inc.  This product includes code licensed from RSA Security.
-
-Copyright 2003 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 
-California 95054, U.S.A.  All rights reserved.
diff --git a/test/jdk/javax/swing/text/html/parser/Parser/6990651/bug6990651.java b/test/jdk/javax/swing/text/html/parser/Parser/6990651/bug6990651.java
index b939f3e148f..9dada22ba60 100644
--- a/test/jdk/javax/swing/text/html/parser/Parser/6990651/bug6990651.java
+++ b/test/jdk/javax/swing/text/html/parser/Parser/6990651/bug6990651.java
@@ -23,7 +23,7 @@
 
 /* @test
    @bug 6990651
-   @summary Regression: NPE when refreshing applet since 6u22-b01
+   @summary Regression: NPE when refreshing embedded window since 6u22-b01
    @author Pavel Porvatov
    @modules java.desktop/sun.awt
 */
diff --git a/test/jdk/performance/client/SwingMark/src/AbstractSwingTest.java b/test/jdk/performance/client/SwingMark/src/AbstractSwingTest.java
index 52394054f29..8a62d196857 100644
--- a/test/jdk/performance/client/SwingMark/src/AbstractSwingTest.java
+++ b/test/jdk/performance/client/SwingMark/src/AbstractSwingTest.java
@@ -86,15 +86,6 @@ public abstract class AbstractSwingTest {
           */
         public abstract void runTest();
 
-        /**
-          * This method is used to determine if a test can be run from within
-          * an applet.  If your test will cause security exceptions when run as
-          * an applet then you should return false from this method.
-          */
-        public boolean canRunInApplet() {
-                return true;
-        }
-
    public int getPaintCount() {
       return paintCount;
    }
diff --git a/test/jdk/performance/client/SwingMark/src/JMTest_01.java b/test/jdk/performance/client/SwingMark/src/JMTest_01.java
index 83127e3bc21..fcc5fe309ba 100644
--- a/test/jdk/performance/client/SwingMark/src/JMTest_01.java
+++ b/test/jdk/performance/client/SwingMark/src/JMTest_01.java
@@ -66,14 +66,6 @@ public class JMTest_01 extends AbstractSwingTest {
     int             DOWN = 40;
     int             UP = 38;
 
-    /**
-    * This test cannot run as an applet because it
-    * posts events to the event queue
-    */
-    public boolean canRunInApplet() {
-            return false;
-    }
-
     public JComponent getTestComponent() {
         JPanel panel = new JPanel();
 
diff --git a/test/jdk/performance/client/SwingMark/src/JMTest_02.java b/test/jdk/performance/client/SwingMark/src/JMTest_02.java
index b77844162ab..680ada9f1df 100644
--- a/test/jdk/performance/client/SwingMark/src/JMTest_02.java
+++ b/test/jdk/performance/client/SwingMark/src/JMTest_02.java
@@ -67,14 +67,6 @@ public class JMTest_02 extends AbstractSwingTest {
 
     int      repeat = 15;
 
-    /**
-      * This test cannot run as an applet because it
-      * posts events to the event queue
-      */
-    public boolean canRunInApplet() {
-        return false;
-    }
-
     public JComponent getTestComponent() {
         JPanel panel = new JPanel();
 
diff --git a/test/jdk/performance/client/SwingMark/src/JMTest_03.java b/test/jdk/performance/client/SwingMark/src/JMTest_03.java
index eed96da1e93..38f5dff43bc 100644
--- a/test/jdk/performance/client/SwingMark/src/JMTest_03.java
+++ b/test/jdk/performance/client/SwingMark/src/JMTest_03.java
@@ -65,14 +65,6 @@ public class JMTest_03 extends AbstractSwingTest {
     int             DOWN = 40;
     int             UP = 38;
 
-    /**
-     * This test cannot run as an applet because it
-     * posts events to the event queue
-     */
-    public boolean canRunInApplet() {
-        return false;
-    }
-
     public JComponent getTestComponent() {
         JPanel panel = new JPanel();
 
diff --git a/test/jdk/performance/client/SwingMark/src/JMTest_04.java b/test/jdk/performance/client/SwingMark/src/JMTest_04.java
index 4c4c7f65d32..cbb32e5b916 100644
--- a/test/jdk/performance/client/SwingMark/src/JMTest_04.java
+++ b/test/jdk/performance/client/SwingMark/src/JMTest_04.java
@@ -70,14 +70,6 @@ public class JMTest_04 extends AbstractSwingTest {
     String MENU_ITEM_STRING =  "JMenuItem";
     String SUB_MENU_STRING =  "SubMenu";
 
-    /**
-     * This test cannot run as an applet because it
-     * posts events to the event queue
-     */
-    public boolean canRunInApplet() {
-        return false;
-    }
-
     public JComponent getTestComponent() {
         loadBundle();
         JPanel panel = new JPanel();
diff --git a/test/jdk/performance/client/SwingMark/src/JMTest_05.java b/test/jdk/performance/client/SwingMark/src/JMTest_05.java
index bd4eea45f9b..dc2a0bd1489 100644
--- a/test/jdk/performance/client/SwingMark/src/JMTest_05.java
+++ b/test/jdk/performance/client/SwingMark/src/JMTest_05.java
@@ -65,14 +65,6 @@ public class JMTest_05 extends AbstractSwingTest {
     int             DOWN = 40;
     int             UP = 38;
 
-    /**
-     * This test cannot run as an applet because it
-     * posts events to the event queue
-     */
-    public boolean canRunInApplet() {
-        return false;
-    }
-
     public JComponent getTestComponent() {
         JPanel panel = new JPanel();
 
diff --git a/test/jdk/performance/client/SwingMark/src/MenuTest.java b/test/jdk/performance/client/SwingMark/src/MenuTest.java
index 9d9d8751d3e..91ce63e7667 100644
--- a/test/jdk/performance/client/SwingMark/src/MenuTest.java
+++ b/test/jdk/performance/client/SwingMark/src/MenuTest.java
@@ -69,14 +69,6 @@ public class MenuTest extends AbstractSwingTest {
 
    int repeat = 50;
 
-   /**
-     * This test cannot run as an applet because it
-     * posts events to the event queue
-     */
-   public boolean canRunInApplet() {
-      return false;
-   }
-
    public JComponent getTestComponent() {
       listener = new MyListener();
 
diff --git a/test/jdk/performance/client/SwingMark/src/TypingTest.java b/test/jdk/performance/client/SwingMark/src/TypingTest.java
index 0019f7bd2c4..440b8b09e87 100644
--- a/test/jdk/performance/client/SwingMark/src/TypingTest.java
+++ b/test/jdk/performance/client/SwingMark/src/TypingTest.java
@@ -52,10 +52,6 @@ public class TypingTest extends AbstractSwingTest {
         return panel;
     }
 
-    public boolean canRunInApplet() {
-        return false;
-    }
-
     public String getTestName() {
         return "Typing";
     }