diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryIT.java
index e76518ac9384..38e26fa28fc3 100644
--- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryIT.java
+++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryIT.java
@@ -86,11 +86,11 @@ public void setUp() {
 
     @Test
     public void testFindById() {
-        // test findById (ID id) cross partition
-        final Address result = repository.findById(TEST_ADDRESS1_PARTITION1.getPostalCode()).get();
+        // test findById (ID id) cross partition using a postal code that is unique across all test addresses
+        final Address result = repository.findById(TEST_ADDRESS1_PARTITION2.getPostalCode()).get();
         assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull();
         assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics().toString().contains("\"requestOperationType\":\"Query\"")).isTrue();
-        assertThat(result).isEqualTo(TEST_ADDRESS1_PARTITION1);
+        assertThat(result).isEqualTo(TEST_ADDRESS1_PARTITION2);
     }
 
     @Test
@@ -150,7 +150,7 @@ public void testFindByPostalCodeAndCityIn() {
         final List<Address> result = TestUtils.toList(repository.findByPostalCodeInAndCity(postalCodes, city));
 
         assertThat(result.size()).isEqualTo(2);
-        assertThat(result).isEqualTo(Lists.newArrayList(TEST_ADDRESS1_PARTITION1, TEST_ADDRESS2_PARTITION1));
+        assertThat(result).containsExactlyInAnyOrder(TEST_ADDRESS1_PARTITION1, TEST_ADDRESS2_PARTITION1);
     }
 
     @Test
@@ -367,12 +367,10 @@ public void testFindTopByOrderByStreetDesc() {
 
     @Test
     public void testFindAllByStreetNotNull() {
-        Address TEST_ADDRESS_TEMP = new Address(
-            TestConstants.POSTAL_CODE, null, TestConstants.CITY);
         final List<Address> result = TestUtils.toList(repository.findAllByStreetNotNull());
         assertThat(result.size()).isEqualTo(4);
-        assertThat(result).isEqualTo(Lists.newArrayList(TEST_ADDRESS1_PARTITION1, TEST_ADDRESS1_PARTITION2,
-            TEST_ADDRESS2_PARTITION1, TEST_ADDRESS4_PARTITION3));
+        assertThat(result).containsExactlyInAnyOrder(TEST_ADDRESS1_PARTITION1, TEST_ADDRESS1_PARTITION2,
+            TEST_ADDRESS2_PARTITION1, TEST_ADDRESS4_PARTITION3);
 
     }
 
@@ -393,8 +391,6 @@ public void testFindTop3ByOrderByStreetDesc() {
 
     @Test
     public void testCountByStreetNotNull() {
-        Address TEST_ADDRESS_TEMP = new Address(
-            TestConstants.POSTAL_CODE, null, TestConstants.CITY);
         final Long result = repository.countByStreetNotNull();
         assertThat(result).isEqualTo(4);
     }