--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javah/ModuleClass.java	Thu Mar 17 19:04:28 2016 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2012, 2016, 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 8049811
+ * @summary javah should accept module/class names
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.jdeps/com.sun.tools.javap
+ * @build ToolBox
+ * @run main ModuleClass
+ */
+
+import java.util.List;
+
+public class ModuleClass {
+    static public void main(String[] args) throws Exception {
+        ToolBox tb = new ToolBox();
+        check(tb, "java.lang.Object");
+        check(tb, "java.base/java.io.File");
+    }
+
+    static void check(ToolBox tb, String name) throws Exception {
+        tb.new JavahTask()
+                .classes(name)
+                .run();
+
+        int sep = name.indexOf("/");
+        String className = (sep == -1) ? name : name.substring(sep + 1);
+        String file = className.replace(".", "_") + ".h";
+        List<String> outObject = tb.readAllLines(file);
+
+        String text = "#ifndef _Included_" + className.replace(".", "_");
+        if (!outObject.contains(text)) {
+            throw new Exception("expected line not found");
+        }
+    }
+}
+