diff --git a/test/jdk/java/awt/CacheTest.java b/test/jdk/java/awt/CacheTest.java
new file mode 100644
index 00000000000..9e80bd14336
--- /dev/null
+++ b/test/jdk/java/awt/CacheTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2001, 2023, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4429261
+ * @summary Checks AWTKeyStroke is cached
+ * @run main CacheTest
+*/
+
+import java.awt.AWTKeyStroke;
+import java.awt.EventQueue;
+import java.awt.event.KeyEvent;
+import java.awt.event.InputEvent;
+
+public class CacheTest {
+
+    public static void main(String[] args) throws Exception {
+        EventQueue.invokeAndWait(() -> {
+            if (AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_X,
+                                             InputEvent.ALT_DOWN_MASK) !=
+                AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_X,
+                                             InputEvent.ALT_DOWN_MASK)) {
+                throw new RuntimeException("KeyStroke is not cached");
+            }
+        });
+    }
+}// class CacheTest
diff --git a/test/jdk/java/awt/Frame/RemoveNotifyTest.java b/test/jdk/java/awt/Frame/RemoveNotifyTest.java
new file mode 100644
index 00000000000..eb848f5e842
--- /dev/null
+++ b/test/jdk/java/awt/Frame/RemoveNotifyTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 1999, 2023, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+  @test
+  @bug 4154099
+  @summary Tests that calling removeNotify() on a Frame and then reshowing
+            the Frame does not crash or lockup
+  @key headful
+  @run main RemoveNotifyTest
+*/
+
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Menu;
+import java.awt.MenuBar;
+import java.awt.MenuItem;
+
+public class RemoveNotifyTest {
+    static Frame f;
+
+    public static void main(String[] args) throws Exception {
+        EventQueue.invokeAndWait(() -> {
+            for (int i = 0; i < 100; i++) {
+                try {
+                    f = new Frame();
+                    f.setBounds(10, 10, 100, 100);
+                    MenuBar bar = new MenuBar();
+                    Menu menu = new Menu();
+                    menu.add(new MenuItem("foo"));
+                    bar.add(menu);
+                    f.setMenuBar(bar);
+
+                    for (int j = 0; j < 5; j++) {
+                        f.setVisible(true);
+                        f.removeNotify();
+                    }
+                } finally {
+                    if (f != null) {
+                        f.dispose();
+                    }
+                }
+            }
+        });
+
+      System.out.println("done");
+
+    }
+
+ }// class RemoveNotifyTest
diff --git a/test/jdk/java/awt/Icon/NullIconImageTest.java b/test/jdk/java/awt/Icon/NullIconImageTest.java
new file mode 100644
index 00000000000..5d96cf851cb
--- /dev/null
+++ b/test/jdk/java/awt/Icon/NullIconImageTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2004, 2023, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+ * @test
+ * @bug 4633887
+ * @summary setting a null Image in setIconImage should not cause exception.
+ * @key headful
+ * @run main NullIconImageTest
+*/
+
+import java.awt.EventQueue;
+import java.awt.Frame;
+
+public class NullIconImageTest {
+    static Frame f;
+
+    public static void main(String[] args) throws Exception {
+        EventQueue.invokeAndWait(() -> {
+            try {
+                f = new Frame();
+                f.setVisible(true);
+                f.setIconImage(null); // This call should not cause an exception.
+            } finally {
+                if (f != null) {
+                    f.dispose();
+                }
+            }
+        });
+    }
+
+ }// class NullIconImageTest