diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
index 2bd5168b04..fe97688b07 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
@@ -1759,7 +1759,7 @@ public class ChangeIT extends AbstractDaemonTest {
     // Added reviewers not notified by default.
     PushOneCommit.Result r = createWorkInProgressChange();
     gApi.changes().id(r.getChangeId()).addReviewer(in);
-    assertThat(sender.getMessages()).hasSize(0);
+    assertThat(sender.getMessages()).isEmpty();
 
     // Default notification handling can be overridden.
     r = createWorkInProgressChange();
@@ -1773,7 +1773,7 @@ public class ChangeIT extends AbstractDaemonTest {
     // that should be ignored.
     r = createWorkInProgressChange();
     gApi.changes().id(r.getChangeId()).revision("current").review(batchIn);
-    assertThat(sender.getMessages()).hasSize(0);
+    assertThat(sender.getMessages()).isEmpty();
 
     // Top-level notify property can force notifications when adding reviewer
     // via PostReview.
diff --git a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
index b9821d4683..237560767b 100644
--- a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
@@ -746,7 +746,7 @@ public class RevisionIT extends AbstractDaemonTest {
     input.notify = NotifyHandling.NONE;
     sender.clear();
     gApi.changes().id(changeId).current().cherryPick(input);
-    assertThat(sender.getMessages()).hasSize(0);
+    assertThat(sender.getMessages()).isEmpty();
 
     // Disable the notification. The user provided in the 'notifyDetails' should still be notified.
     TestAccount userToNotify = accountCreator.user2();
diff --git a/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java b/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java
index bd76efa6c6..b8eedbb80b 100644
--- a/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java
@@ -878,7 +878,7 @@ public class CommentsIT extends AbstractDaemonTest {
     // PS2 has comments [c6, c9].
     assertThat(getRevisionComments(changeId, ps2)).hasSize(2);
     // PS3 has no comment.
-    assertThat(getRevisionComments(changeId, ps3)).hasSize(0);
+    assertThat(getRevisionComments(changeId, ps3)).isEmpty();
     // PS4 has comments [c7, c8].
     assertThat(getRevisionComments(changeId, ps4)).hasSize(2);
 
diff --git a/javatests/com/google/gerrit/server/group/db/AuditLogReaderTest.java b/javatests/com/google/gerrit/server/group/db/AuditLogReaderTest.java
index 309d710e52..120f026b27 100644
--- a/javatests/com/google/gerrit/server/group/db/AuditLogReaderTest.java
+++ b/javatests/com/google/gerrit/server/group/db/AuditLogReaderTest.java
@@ -53,7 +53,7 @@ public final class AuditLogReaderTest extends AbstractGroupTest {
   @Test
   public void createGroupAsServerIdent() throws Exception {
     InternalGroup group = createGroup(1, "test-group", serverIdent, null);
-    assertThat(auditLogReader.getMembersAudit(allUsersRepo, group.getGroupUUID())).hasSize(0);
+    assertThat(auditLogReader.getMembersAudit(allUsersRepo, group.getGroupUUID())).isEmpty();
   }
 
   @Test