diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java
index c1b5b78a804e..9681a2ec55b8 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java
@@ -29,7 +29,6 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
@@ -693,10 +692,9 @@ public void chooseSingleNodeRackWithUsedAndExcludeNodes()
         excludedNodes, null, nodeNum, 0, 5);
     assertEquals(nodeNum, datanodeDetails.size());
 
-    assertTrue(cluster.isSameParent(
-        datanodes.get(0), datanodeDetails.get(0)) &&
-        cluster.isSameParent(datanodes.get(1), datanodeDetails.get(0)) &&
-        excludedNodes.get(0).getUuid() != datanodeDetails.get(0).getUuid());
+    assertTrue(cluster.isSameParent(datanodes.get(0), datanodeDetails.get(0)));
+    assertTrue(cluster.isSameParent(datanodes.get(1), datanodeDetails.get(0)));
+    assertNotEquals(excludedNodes.get(0), datanodeDetails.get(0));
 
     // Required 2 DN for 2 replica
     nodeNum = 2;
@@ -709,9 +707,8 @@ public void chooseSingleNodeRackWithUsedAndExcludeNodes()
         excludedNodes, null, nodeNum, 0, 5);
     assertEquals(nodeNum, datanodeDetails.size());
 
-    assertTrue(excludedNodes.get(0).getUuid() !=
-        datanodeDetails.get(0).getUuid() &&
-        excludedNodes.get(0).getUuid() != datanodeDetails.get(1).getUuid());
+    assertNotEquals(excludedNodes.get(0), datanodeDetails.get(0));
+    assertNotEquals(excludedNodes.get(0), datanodeDetails.get(1));
 
     nodeNum = 3;
     // No replica exist
@@ -721,9 +718,8 @@ public void chooseSingleNodeRackWithUsedAndExcludeNodes()
         excludedNodes, null, nodeNum, 0, 5);
     assertEquals(nodeNum, datanodeDetails.size());
 
-    assertTrue(excludedNodes.get(0).getUuid() !=
-        datanodeDetails.get(0).getUuid() &&
-        excludedNodes.get(0).getUuid() != datanodeDetails.get(1).getUuid());
+    assertNotEquals(excludedNodes.get(0), datanodeDetails.get(0));
+    assertNotEquals(excludedNodes.get(0), datanodeDetails.get(1));
   }
 
   @ParameterizedTest
@@ -747,9 +743,8 @@ public void chooseNodeWithUsedAndExcludeNodesMultipleRack(int datanodeCount)
     assertEquals(nodeNum, datanodeDetails.size());
 
     // Exclude node should not be returned
-    assertTrue(excludedNodes.get(0).getUuid() !=
-        datanodeDetails.get(0).getUuid() && excludedNodes.get(0).getUuid() !=
-        datanodeDetails.get(1).getUuid());
+    assertNotEquals(excludedNodes.get(0), datanodeDetails.get(0));
+    assertNotEquals(excludedNodes.get(0), datanodeDetails.get(1));
 
     usedNodes.clear();
     excludedNodes.clear();
@@ -764,13 +759,11 @@ public void chooseNodeWithUsedAndExcludeNodesMultipleRack(int datanodeCount)
 
     assertEquals(nodeNum, datanodeDetails.size());
 
-    assertTrue(excludedNodes.get(0).getUuid() !=
-        datanodeDetails.get(0).getUuid() && excludedNodes.get(1).getUuid() !=
-        datanodeDetails.get(0).getUuid());
+    assertNotEquals(excludedNodes.get(0), datanodeDetails.get(0));
+    assertNotEquals(excludedNodes.get(1), datanodeDetails.get(0));
 
-    assertTrue(excludedNodes.get(0).getUuid() !=
-        datanodeDetails.get(1).getUuid() && excludedNodes.get(1).getUuid() !=
-        datanodeDetails.get(1).getUuid());
+    assertNotEquals(excludedNodes.get(0), datanodeDetails.get(1));
+    assertNotEquals(excludedNodes.get(1), datanodeDetails.get(1));
   }
 
   @ParameterizedTest
@@ -790,9 +783,8 @@ public void chooseNodeWithOnlyExcludeAndNoUsedNodes(int datanodeCount)
     assertEquals(nodeNum, datanodeDetails.size());
 
     // Exclude node should not be returned
-    assertTrue(excludedNodes.get(0).getUuid() !=
-        datanodeDetails.get(0).getUuid() && excludedNodes.get(0).getUuid() !=
-        datanodeDetails.get(1).getUuid());
+    assertNotEquals(excludedNodes.get(0), datanodeDetails.get(0));
+    assertNotEquals(excludedNodes.get(0), datanodeDetails.get(1));
 
     excludedNodes.clear();
     // Multiple exclude nodes
@@ -805,13 +797,11 @@ public void chooseNodeWithOnlyExcludeAndNoUsedNodes(int datanodeCount)
     assertEquals(nodeNum, datanodeDetails.size());
 
     // Exclude node should not be returned
-    assertTrue(excludedNodes.get(0).getUuid() !=
-        datanodeDetails.get(0).getUuid() && excludedNodes.get(0).getUuid() !=
-        datanodeDetails.get(1).getUuid());
+    assertNotEquals(excludedNodes.get(0), datanodeDetails.get(0));
+    assertNotEquals(excludedNodes.get(0), datanodeDetails.get(1));
 
-    assertTrue(excludedNodes.get(1).getUuid() !=
-        datanodeDetails.get(0).getUuid() && excludedNodes.get(1).getUuid() !=
-        datanodeDetails.get(1).getUuid());
+    assertNotEquals(excludedNodes.get(1), datanodeDetails.get(0));
+    assertNotEquals(excludedNodes.get(1), datanodeDetails.get(1));
   }
 
   @ParameterizedTest
@@ -881,7 +871,7 @@ public void chooseNodeWithUsedAndFavouredNodesMultipleRack()
 
     // Favoured node should be returned,
     // as favoured node is in the different rack as used nodes.
-    assertSame(favouredNodes.get(0).getUuid(), datanodeDetails.get(0).getUuid());
+    assertEquals(favouredNodes.get(0), datanodeDetails.get(0));
 
   }
 }