diff --git a/java-checks-testkit/src/main/java/org/sonar/java/checks/verifier/internal/InternalCheckVerifier.java b/java-checks-testkit/src/main/java/org/sonar/java/checks/verifier/internal/InternalCheckVerifier.java
index ac3f8474c7d..4943505c3a6 100644
--- a/java-checks-testkit/src/main/java/org/sonar/java/checks/verifier/internal/InternalCheckVerifier.java
+++ b/java-checks-testkit/src/main/java/org/sonar/java/checks/verifier/internal/InternalCheckVerifier.java
@@ -404,7 +404,7 @@ private void assertComponentIssue(Set<AnalyzerMessage> issues) {
       || (expectations.expectIssueAtFileLevel() && !issue.getInputComponent().isFile())) {
       throw new AssertionError(String.format("Expected the issue to be raised at %s level, not at %s level", component, otherComponent));
     }
-    if (!expectedMessage.equals(issue.getMessage())) {
+    if (!Objects.equals(expectedMessage, issue.getMessage())) {
       throw new AssertionError(String.format("Expected the issue message to be:%n\t\"%s\"%nbut was:%n\t\"%s\"", expectedMessage, issue.getMessage()));
     }
   }
@@ -484,7 +484,7 @@ private void assertSuperfluousFlows() {
   }
 
   private static void assertAttributeMatch(AnalyzerMessage issue, Object value, Map<Expectations.IssueAttribute, Object> attributes, Expectations.IssueAttribute attribute) {
-    if (attributes.containsKey(attribute) && !value.equals(attribute.get(attributes))) {
+    if (attributes.containsKey(attribute) && !Objects.equals(value, attribute.get(attributes))) {
       throw new AssertionError(
         String.format("line %d attribute mismatch for '%s'. Expected: '%s', but was: '%s'",
           issue.getLine(),