diff --git a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageBuildGetDataResponseTest.java b/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageBuildGetDataResponseTest.java
index 5a65f435c4..ef11f5e07f 100644
--- a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageBuildGetDataResponseTest.java
+++ b/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageBuildGetDataResponseTest.java
@@ -44,6 +44,9 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -53,11 +56,6 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.withSettings;
 
-
-
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
 public class P2PDataStorageBuildGetDataResponseTest {
     abstract static class P2PDataStorageBuildGetDataResponseTestBase {
         // GIVEN null & non-null supportedCapabilities
@@ -240,7 +238,10 @@ public class P2PDataStorageBuildGetDataResponseTest {
             Assert.assertEquals(getDataRequest instanceof GetUpdatedDataRequest, getDataResponse.isGetUpdatedDataResponse());
             Assert.assertEquals(getDataResponse.getSupportedCapabilities(), Capabilities.app);
             Assert.assertEquals(1, getDataResponse.getPersistableNetworkPayloadSet().size());
-            Assert.assertTrue(getDataResponse.getPersistableNetworkPayloadSet().contains(onlyLocal1));
+            Set<PersistableNetworkPayload> persistableNetworkPayloadSet = getDataResponse.getPersistableNetworkPayloadSet();
+
+            // We use a set at the filter so it is not deterministic which item get truncated
+            Assert.assertEquals(1, persistableNetworkPayloadSet.size());
             Assert.assertTrue(getDataResponse.getDataSet().isEmpty());
         }
 
diff --git a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageRequestDataTest.java b/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageRequestDataTest.java
index 27e522daaa..c897691371 100644
--- a/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageRequestDataTest.java
+++ b/p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageRequestDataTest.java
@@ -35,13 +35,15 @@ import java.security.NoSuchAlgorithmException;
 
 import java.util.Set;
 
+import org.mockito.MockitoAnnotations;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.mockito.MockitoAnnotations;
-
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class P2PDataStorageRequestDataTest {
     private TestState testState;
diff --git a/p2p/src/test/java/bisq/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java b/p2p/src/test/java/bisq/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java
index 155e4708be..00d893b8f2 100644
--- a/p2p/src/test/java/bisq/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java
+++ b/p2p/src/test/java/bisq/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java
@@ -21,7 +21,6 @@ import bisq.network.p2p.storage.P2PDataStorage;
 import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
 import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -31,17 +30,16 @@ import java.util.Map;
  * @see <a href="https://martinfowler.com/articles/mocksArentStubs.html#TheDifferenceBetweenMocksAndStubs">Reference</a>
  */
 public class AppendOnlyDataStoreServiceFake extends AppendOnlyDataStoreService {
-    private final Map<P2PDataStorage.ByteArray, PersistableNetworkPayload> map;
 
     public AppendOnlyDataStoreServiceFake() {
-        map = new HashMap<>();
+        addService(new MapStoreServiceFake());
     }
 
     public Map<P2PDataStorage.ByteArray, PersistableNetworkPayload> getMap() {
-        return map;
+        return super.getMap();
     }
 
     public void put(P2PDataStorage.ByteArray hashAsByteArray, PersistableNetworkPayload payload) {
-        map.put(hashAsByteArray, payload);
+        super.put(hashAsByteArray, payload);
     }
 }