diff -r 5af9fa90cd7b -r 48b88b9c11eb test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
--- a/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java	Wed Nov 27 12:18:40 2019 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java	Wed Nov 27 13:08:16 2019 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug      4131628 4664607 7025314 8023700 7198273 8025633 8026567 8081854 8150188 8151743 8196027 8182765
- *           8196200 8196202
+ *           8196200 8196202 8223378
  * @summary  Make sure the Next/Prev Class links iterate through all types.
  *           Make sure the navagation is 2 columns, not 3.
  * @author   jamieh
@@ -85,26 +85,23 @@
         // Remaining tests check for additional padding to offset the fixed navigation bar.
         checkOutput("pkg/A.html", true,
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<script type=\"text/javascript\"><!--\n"
-                + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
-                + "//-->\n"
-                + "</script>\n"
+                + "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n"
+                + "<!--   -->\n"
+                + "</a></div>\n"
                 + "</nav>\n"
                 + "</header>\n"
+                + "<div class=\"flexContent\">\n"
+                + "<main role=\"main\">\n"
                 + "<!-- ======== START OF CLASS DATA ======== -->");
 
         checkOutput("pkg/package-summary.html", true,
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<script type=\"text/javascript\"><!--\n"
-                + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
-                + "//-->\n"
-                + "</script>\n"
+                + "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n"
+                + "<!--   -->\n"
+                + "</a></div>\n"
                 + "</nav>\n"
                 + "</header>\n"
+                + "<div class=\"flexContent\">\n"
                 + "<main role=\"main\">\n"
                 + "<div class=\"header\">");
     }
@@ -121,24 +118,20 @@
 
         checkOutput("pkg/A.html", true,
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<script type=\"text/javascript\"><!--\n"
-                + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
-                + "//-->\n"
-                + "</script>\n"
+                + "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n"
+                + "<!--   -->\n"
+                + "</a></div>\n"
                 + "</nav>\n"
                 + "</header>\n"
+                + "<div class=\"flexContent\">\n"
+                + "<main role=\"main\">\n"
                 + "<!-- ======== START OF CLASS DATA ======== -->");
 
         checkOutput("pkg/package-summary.html", true,
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<script type=\"text/javascript\"><!--\n"
-                + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
-                + "//-->\n"
-                + "</script>\n"
+                + "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n"
+                + "<!--   -->\n"
+                + "</a></div>\n"
                 + "</nav>");
     }
 
@@ -155,11 +148,9 @@
         checkOutput("pkg/A.html", false,
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
                 + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<script type=\"text/javascript\"><!--\n"
-                + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
-                + "//-->\n"
-                + "</script>\n"
+                + "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n"
+                + "<!--   -->\n"
+                + "</a></div>\n"
                 + "</nav>\n"
                 + "</header>\n"
                 + "<!-- ======== START OF CLASS DATA ======== -->");
@@ -167,11 +158,9 @@
         checkOutput("pkg/package-summary.html", false,
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
                 + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<script type=\"text/javascript\"><!--\n"
-                + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
-                + "//-->\n"
-                + "</script>\n"
+                + "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n"
+                + "<!--   -->\n"
+                + "</a></div>\n"
                 + "</nav>");
     }