diff --git a/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java b/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
--- a/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
+++ b/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
@@ -162,7 +162,7 @@
      * {@inheritDoc}
      */
     protected void generateClassFiles(ClassDoc[] arr, ClassTree classtree) {
-        Arrays.sort(arr);
+        Arrays.sort(arr, utils.makeGeneralPurposeComparator());
         for(int i = 0; i < arr.length; i++) {
             if (!(configuration.isGeneratedDoc(arr[i]) && arr[i].isIncluded())) {
                 continue;
diff --git a/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java b/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
--- a/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
+++ b/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
@@ -90,9 +90,7 @@
         this.visibleMemberMap = new VisibleMemberMap(classDoc, memberType,
             configuration);
         this.members = new ArrayList<>(this.visibleMemberMap.getMembersFor(classDoc));
-        if (configuration.getMemberComparator() != null) {
-            Collections.sort(this.members, configuration.getMemberComparator());
-        }
+        Collections.sort(this.members, utils.makeGeneralPurposeComparator());
     }