diff --git a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java
index 0aecba43463d1..13cfb28111132 100644
--- a/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java
+++ b/tools/src/test/java/org/apache/kafka/tools/ConfigCommandTest.java
@@ -424,8 +424,8 @@ public void testParseConfigsToBeAddedForAddConfigFile() throws IOException {
     public void testExpectedEntityTypeNames(List<String> expectedTypes, List<String> expectedNames, List<String> connectOpts, String... args) {
         ConfigCommand.ConfigCommandOptions createOpts = new ConfigCommand.ConfigCommandOptions(toArray(List.of(connectOpts.get(0), connectOpts.get(1), "--describe"), List.of(args)));
         createOpts.checkArgs();
-        assertEquals(createOpts.entityTypes().toSeq(), seq(expectedTypes));
-        assertEquals(createOpts.entityNames().toSeq(), seq(expectedNames));
+        assertEquals(seq(expectedTypes), createOpts.entityTypes().toSeq());
+        assertEquals(seq(expectedNames), createOpts.entityNames().toSeq());
     }
 
     @Test
@@ -1177,8 +1177,8 @@ public void shouldNotUpdateConfigIfNonExistingConfigIsDeleted() {
             public synchronized DescribeConfigsResult describeConfigs(Collection<ConfigResource> resources, DescribeConfigsOptions options) {
                 assertEquals(1, resources.size());
                 ConfigResource res = resources.iterator().next();
-                assertEquals(res.type(), ConfigResource.Type.TOPIC);
-                assertEquals(res.name(), resourceName);
+                assertEquals(ConfigResource.Type.TOPIC, res.type());
+                assertEquals(resourceName, res.name());
                 return describeResult;
             }
         };
diff --git a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java
index 2e3ebf6a7bd08..8809e3ca174b1 100644
--- a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java
+++ b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java
@@ -124,8 +124,8 @@ public void testDeprecatedAdminConfig() throws Exception {
             mockedAdmin.verify(() -> Admin.create(argumentCaptor.capture()));
             // verify that properties provided to admin client are the overridden properties
             final Properties actualProps = argumentCaptor.getValue();
-            assertEquals(actualProps.get(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG), requestTimeoutMs);
-            assertEquals(actualProps.get(AdminClientConfig.DEFAULT_API_TIMEOUT_MS_CONFIG), defaultApiTimeoutMs);
+            assertEquals(requestTimeoutMs, actualProps.get(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG));
+            assertEquals(defaultApiTimeoutMs, actualProps.get(AdminClientConfig.DEFAULT_API_TIMEOUT_MS_CONFIG));
         }
     }
 
diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java
index bbcfb6e35c16a..503a5bea217e9 100644
--- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java
+++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ResetConsumerGroupOffsetTest.java
@@ -909,7 +909,7 @@ private void resetAndAssertOffsetsCommitted(ClusterInstance cluster,
         Map<String, Map<TopicPartition, OffsetAndMetadata>> allResetOffsets = resetOffsets(service);
 
         allResetOffsets.forEach((group, offsetsInfo) -> offsetsInfo.forEach((tp, offsetMetadata) -> {
-            assertEquals(offsetMetadata.offset(), expectedOffsets.get(tp));
+            assertEquals(expectedOffsets.get(tp), offsetMetadata.offset());
             assertEquals(expectedOffsets, committedOffsets(cluster, topic, group));
         }));
     }
diff --git a/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java
index 4f1e116437e63..9ec961ebe77cc 100644
--- a/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java
+++ b/tools/src/test/java/org/apache/kafka/tools/streams/StreamsGroupCommandTest.java
@@ -504,9 +504,9 @@ private static void assertThrow(final String wrongState) {
 
         final String[] exceptionMessage = exception.getMessage().split(" Valid states are: ");
         assertEquals("Invalid state list '" + wrongState + "'.", exceptionMessage[0]);
-        assertEquals(Arrays.stream(exceptionMessage[1].split(","))
+        assertEquals(validStates, Arrays.stream(exceptionMessage[1].split(","))
             .map(String::trim)
-            .collect(Collectors.toSet()), validStates);
+            .collect(Collectors.toSet()));
     }
 
     private DescribeStreamsGroupsResult describeStreamsResult(String groupId, GroupState groupState) {