diff --git a/its/ruling/src/test/resources/mall/java-S2160.json b/its/ruling/src/test/resources/mall/java-S2160.json
new file mode 100644
index 00000000000..b8807da7619
--- /dev/null
+++ b/its/ruling/src/test/resources/mall/java-S2160.json
@@ -0,0 +1,5 @@
+{
+"com.macro.mall:mall:mall-admin/src/main/java/com/macro/mall/dto/PmsProductResult.java": [
+11
+]
+}
diff --git a/its/ruling/src/test/resources/mall/java-S6212.json b/its/ruling/src/test/resources/mall/java-S6212.json
index c6d156b68d3..5f0a1d58d7a 100644
--- a/its/ruling/src/test/resources/mall/java-S6212.json
+++ b/its/ruling/src/test/resources/mall/java-S6212.json
@@ -10,6 +10,7 @@
 65,
 69,
 76,
+91,
 107
 ],
 "com.macro.mall:mall:mall-admin/src/main/java/com/macro/mall/controller/OssController.java": [
diff --git a/java-checks-test-sources/default/src/main/java/checks/AlmostJavadocCheckSample.java b/java-checks-test-sources/default/src/main/java/checks/AlmostJavadocCheckSample.java
index 32695186b26..36c7a30e2a8 100644
--- a/java-checks-test-sources/default/src/main/java/checks/AlmostJavadocCheckSample.java
+++ b/java-checks-test-sources/default/src/main/java/checks/AlmostJavadocCheckSample.java
@@ -121,6 +121,49 @@ public String toString() {
     return name;
   }
 
+  /*
+   * (non-Javadoc)
+   * @see java.lang.Object#hashCode()
+   */
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  /* (non-Javadoc)
+   * @see java.lang.Object#equals(java.lang.Object)
+   */
+  @Override
+  public boolean equals(Object other) {
+    return this == other;
+  }
+
+  /* (non-Javadoc)
+   * @param ignored this Eclipse stub still contains a Javadoc tag
+   */
+  public void eclipseMarkerWithoutSee(int ignored) {
+  }
+
+  // Noncompliant@+1
+  /* @see java.lang.Object#clone() */
+  public Object seeWithoutEclipseMarker() {
+    return this;
+  }
+
+  // Noncompliant@+1
+  /* (non-javadoc) @see java.lang.Object#wait() */
+  public void lowercaseMarkerLookalike() {
+  }
+
+  // (non-Javadoc) {@link Object} */
+  public void eclipseMarkerLineComment() {
+  }
+
+  /* (non-Javadoc) returns </code> */
+  public String eclipseMarkerWithHtml() {
+    return name;
+  }
+
   record Point(int x, int y) {
     // Noncompliant@+1
     /* @param x the x coordinate */
diff --git a/java-checks/src/main/java/org/sonar/java/checks/AlmostJavadocCheck.java b/java-checks/src/main/java/org/sonar/java/checks/AlmostJavadocCheck.java
index dbb292499df..cd99cc030db 100644
--- a/java-checks/src/main/java/org/sonar/java/checks/AlmostJavadocCheck.java
+++ b/java-checks/src/main/java/org/sonar/java/checks/AlmostJavadocCheck.java
@@ -132,6 +132,9 @@ private static Tree previousSibling(Tree tree) {
 
   private static boolean isAlmostJavadoc(SyntaxTrivia trivia) {
     String text = trivia.comment().stripTrailing();
+    if (text.contains("(non-Javadoc)")) {
+      return false;
+    }
     if (trivia.isComment(CommentKind.BLOCK)) {
       return hasTag(text);
     }
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9355.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9355.html
index 466fe27486e..81a69eb17ec 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9355.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9355.html
@@ -15,6 +15,7 @@ <h3>Exceptions</h3>
   <code>&lt;/a&gt;</code>, <code>&lt;/strong&gt;</code>, <code>&lt;/i&gt;</code>, <code>&lt;/pre&gt;</code>, or <code>&lt;/code&gt;</code>.</li>
   <li>The comment does not immediately precede a documentable declaration.</li>
   <li>The declaration already has a documentation comment.</li>
+  <li>The comment contains the Eclipse <code>(non-Javadoc)</code> marker.</li>
 </ul>
 <h3>Code examples</h3>
 <h4>Noncompliant code example</h4>