diff --git a/test/java/awt/InputMethods/DiacriticsTest/DiacriticsTest.html b/test/java/awt/InputMethods/DiacriticsTest/DiacriticsTest.html
new file mode 100644
index 0000000000000000000000000000000000000000..89dab3d87ef16cc111dd9235fb01fc6705bab829
--- /dev/null
+++ b/test/java/awt/InputMethods/DiacriticsTest/DiacriticsTest.html
@@ -0,0 +1,45 @@
+
+
+
+
+ DiacriticsTest
+
+
+
+
+Test run requires the following keyboard layouts to be installed:
+Linux OS: English (US, alternative international)
+Windows OS: Hungarian
+
+To test JDK-8000423 fix (Linux only!):
+please switch to US alternative international layout and try to type diacritics
+(using the following combinations: `+e; `+u; etc.)
+
+To test JDK-7197619 fix (Windows only!):
+please switch to Hungarian keyboard layout and try to type diacritics
+(Ctrl+Alt+2 e; Ctrl+Alt+2 E)
+
+If you can do that then the test is passed; otherwise failed.
+
+
diff --git a/test/java/awt/InputMethods/DiacriticsTest/DiacriticsTest.java b/test/java/awt/InputMethods/DiacriticsTest/DiacriticsTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..7c610e4791f3373458c7472d4c060a400a871520
--- /dev/null
+++ b/test/java/awt/InputMethods/DiacriticsTest/DiacriticsTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2013, 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 8000423 7197619 8025649
+ @summary Check if diacritical signs could be typed for TextArea and TextField
+ @run applet/manual=yesno DiacriticsTest.html
+*/
+
+
+import java.applet.Applet;
+import java.awt.*;
+import javax.swing.JPanel;
+
+
+public class DiacriticsTest extends Applet {
+
+ public void init() {
+ this.setLayout(new BorderLayout());
+ }
+
+ public void start() {
+
+ setSize(350, 200);
+
+ JPanel panel = new JPanel();
+ panel.setLayout(new GridLayout(2, 1));
+
+ TextArea txtArea = new TextArea();
+ panel.add(txtArea);
+
+ TextField txtField = new TextField();
+ panel.add(txtField);
+
+ add(panel, BorderLayout.CENTER);
+
+ validate();
+ setVisible(true);
+ }
+}
+