diff -r 000000000000 -r 959103a6100f test/com/sun/javadoc/testHeadings/TestHeadings.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/com/sun/javadoc/testHeadings/TestHeadings.java	Wed Apr 27 01:34:52 2016 +0800
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2003, 2010, 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      4905786 6259611
+ * @summary  Make sure that headings use the TH tag instead of the TD tag.
+ * @author   jamieh
+ * @library  ../lib/
+ * @build    JavadocTester
+ * @build    TestHeadings
+ * @run main TestHeadings
+ */
+
+public class TestHeadings extends JavadocTester {
+
+    //Test information.
+    private static final String BUG_ID = "4905786-6259611";
+
+    //Javadoc arguments.
+    private static final String[] ARGS = new String[] {
+        "-d", BUG_ID, "-sourcepath", SRC_DIR, "-use", "-header", "Test Files",
+        "pkg1", "pkg2"
+    };
+
+    //Input for string search tests.
+    private static final String[][] TEST = {
+        //Package summary
+        {BUG_ID + FS + "pkg1" + FS + "package-summary.html",
+            "<th class=\"colFirst\" scope=\"col\">" +
+            "Class</th>" + NL + "<th class=\"colLast\" scope=\"col\"" +
+            ">Description</th>"
+        },
+
+        // Class documentation
+        {BUG_ID + FS + "pkg1" + FS + "C1.html",
+            "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>" + NL +
+            "<th class=\"colLast\" scope=\"col\">Field and Description</th>"
+        },
+        {BUG_ID + FS + "pkg1" + FS + "C1.html",
+            "<h3>Methods inherited from class&nbsp;java.lang.Object</h3>"
+        },
+
+        // Class use documentation
+        {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html",
+            "<th class=\"colFirst\" scope=\"col\">Package</th>" + NL +
+            "<th class=\"colLast\" scope=\"col\">Description</th>"
+        },
+        {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html",
+            "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>" + NL +
+            "<th class=\"colLast\" scope=\"col\">Field and Description</th>"
+        },
+
+        // Deprecated
+        {BUG_ID + FS + "deprecated-list.html",
+            "<th class=\"colOne\" scope=\"col\">Method and Description</th>"
+        },
+
+        // Constant values
+        {BUG_ID + FS + "constant-values.html",
+            "<th class=\"colFirst\" scope=\"col\">" +
+            "Modifier and Type</th>" + NL + "<th scope=\"col\">Constant Field</th>" + NL +
+            "<th class=\"colLast\" scope=\"col\">Value</th>"
+        },
+
+        // Serialized Form
+        {BUG_ID + FS + "serialized-form.html",
+            "<h2 title=\"Package\">Package&nbsp;pkg1</h2>"
+        },
+        {BUG_ID + FS + "serialized-form.html",
+            "<h3>Class <a href=\"pkg1/C1.html\" title=\"class in pkg1\">" +
+            "pkg1.C1</a> extends java.lang.Object implements Serializable</h3>"
+        },
+        {BUG_ID + FS + "serialized-form.html",
+            "<h3>Serialized Fields</h3>"
+        },
+
+        // Overview Frame
+        {BUG_ID + FS + "overview-frame.html",
+            "<h1 title=\"Test Files\" class=\"bar\">Test Files</h1>"
+        },
+        {BUG_ID + FS + "overview-frame.html",
+            "<title>Overview List</title>"
+        },
+
+        // Overview Summary
+        {BUG_ID + FS + "overview-summary.html",
+            "<title>Overview</title>"
+        },
+
+    };
+    private static final String[][] NEGATED_TEST = NO_TEST;
+
+    /**
+     * The entry point of the test.
+     * @param args the array of command line arguments.
+     */
+    public static void main(String[] args) {
+        TestHeadings tester = new TestHeadings();
+        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.printSummary();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getBugId() {
+        return BUG_ID;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getBugName() {
+        return getClass().getName();
+    }
+}