diff --git a/akka-actor-tests/src/test/java/akka/actor/StashJavaAPITestActors.java b/akka-actor-tests/src/test/java/akka/actor/StashJavaAPITestActors.java
index 8a5cf818f4..5a76eb348f 100644
--- a/akka-actor-tests/src/test/java/akka/actor/StashJavaAPITestActors.java
+++ b/akka-actor-tests/src/test/java/akka/actor/StashJavaAPITestActors.java
@@ -25,8 +25,8 @@ public class StashJavaAPITestActors {
         return count + 1;
       }
     } else if (msg instanceof Integer) {
-      int value = ((Integer) msg).intValue();
-      assertEquals(value, 5);
+      int value = (Integer) msg;
+      assertEquals(5, value);
     }
     return count;
   }
diff --git a/akka-actor-tests/src/test/java/akka/actor/setup/ActorSystemSetupTest.java b/akka-actor-tests/src/test/java/akka/actor/setup/ActorSystemSetupTest.java
index 6c1d89692a..2f00376fde 100644
--- a/akka-actor-tests/src/test/java/akka/actor/setup/ActorSystemSetupTest.java
+++ b/akka-actor-tests/src/test/java/akka/actor/setup/ActorSystemSetupTest.java
@@ -28,6 +28,6 @@ public class ActorSystemSetupTest extends JUnitSuite {
         ActorSystemSetup.create().withSetup(javaSetting).get(JavaSetup.class);
 
     assertTrue(result.isPresent());
-    assertEquals(result.get(), javaSetting);
+    assertEquals(javaSetting, result.get());
   }
 }
diff --git a/akka-persistence-typed-tests/src/test/java/akka/persistence/typed/ReplicatedEventSourcingTest.java b/akka-persistence-typed-tests/src/test/java/akka/persistence/typed/ReplicatedEventSourcingTest.java
index c66d1b3704..560f694c05 100644
--- a/akka-persistence-typed-tests/src/test/java/akka/persistence/typed/ReplicatedEventSourcingTest.java
+++ b/akka-persistence-typed-tests/src/test/java/akka/persistence/typed/ReplicatedEventSourcingTest.java
@@ -180,8 +180,8 @@ public class ReplicatedEventSourcingTest extends JUnitSuite {
           replicaA.tell(new TestBehavior.GetState(probe.ref().narrow()));
           TestBehavior.State reply = probe.expectMessageClass(TestBehavior.State.class);
           assertEquals(
-              reply.texts,
-              new HashSet<String>(Arrays.asList("stored-to-a", "stored-to-b", "stored-to-c")));
+              new HashSet<>(Arrays.asList("stored-to-a", "stored-to-b", "stored-to-c")),
+              reply.texts);
           return null;
         });
     probe.awaitAssert(
@@ -189,8 +189,8 @@ public class ReplicatedEventSourcingTest extends JUnitSuite {
           replicaB.tell(new TestBehavior.GetState(probe.ref().narrow()));
           TestBehavior.State reply = probe.expectMessageClass(TestBehavior.State.class);
           assertEquals(
-              reply.texts,
-              new HashSet<String>(Arrays.asList("stored-to-a", "stored-to-b", "stored-to-c")));
+              new HashSet<>(Arrays.asList("stored-to-a", "stored-to-b", "stored-to-c")),
+              reply.texts);
           return null;
         });
     probe.awaitAssert(
@@ -198,8 +198,8 @@ public class ReplicatedEventSourcingTest extends JUnitSuite {
           replicaC.tell(new TestBehavior.GetState(probe.ref().narrow()));
           TestBehavior.State reply = probe.expectMessageClass(TestBehavior.State.class);
           assertEquals(
-              reply.texts,
-              new HashSet<String>(Arrays.asList("stored-to-a", "stored-to-b", "stored-to-c")));
+              new HashSet<>(Arrays.asList("stored-to-a", "stored-to-b", "stored-to-c")),
+              reply.texts);
           return null;
         });
   }
diff --git a/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedAuctionExampleTest.java b/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedAuctionExampleTest.java
index 13bbe89fe4..1012441777 100644
--- a/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedAuctionExampleTest.java
+++ b/akka-persistence-typed-tests/src/test/java/jdocs/akka/persistence/typed/ReplicatedAuctionExampleTest.java
@@ -70,7 +70,7 @@ public class ReplicatedAuctionExampleTest extends JUnitSuite {
         () -> {
           replicaA.tell(new GetHighestBid(replyProbe.ref()));
           Bid bid = replyProbe.expectMessageClass(Bid.class);
-          assertEquals(bid.offer, 202);
+          assertEquals(202, bid.offer);
           return bid;
         });