diff --git a/network/src/test/java/com/arcadedb/remote/RemoteImmutableDocumentTest.java b/network/src/test/java/com/arcadedb/remote/RemoteImmutableDocumentTest.java
index b7d1115a6d..8c3a09a498 100644
--- a/network/src/test/java/com/arcadedb/remote/RemoteImmutableDocumentTest.java
+++ b/network/src/test/java/com/arcadedb/remote/RemoteImmutableDocumentTest.java
@@ -18,6 +18,7 @@
  */
 package com.arcadedb.remote;
 
+import com.arcadedb.database.RID;
 import com.arcadedb.schema.DocumentType;
 import com.arcadedb.schema.Property;
 import org.junit.jupiter.api.BeforeEach;
@@ -48,6 +49,7 @@ void setUp() {
     when(mockSchema.getType("TestDoc")).thenReturn(mockType);
     when(mockType.getName()).thenReturn("TestDoc");
     when(mockType.getPolymorphicPropertyIfExists(ArgumentMatchers.anyString())).thenReturn(null);
+    when(mockDatabase.newRID(ArgumentMatchers.anyString())).thenAnswer(inv -> new RID(inv.getArgument(0)));
 
     final Map<String, Object> attributes = new HashMap<>();
     attributes.put(Property.TYPE_PROPERTY, "TestDoc");
diff --git a/network/src/test/java/com/arcadedb/remote/RemoteImmutableEdgeTest.java b/network/src/test/java/com/arcadedb/remote/RemoteImmutableEdgeTest.java
index 7c84f6a5ae..08799a3ea1 100644
--- a/network/src/test/java/com/arcadedb/remote/RemoteImmutableEdgeTest.java
+++ b/network/src/test/java/com/arcadedb/remote/RemoteImmutableEdgeTest.java
@@ -18,6 +18,7 @@
  */
 package com.arcadedb.remote;
 
+import com.arcadedb.database.RID;
 import com.arcadedb.graph.Edge;
 import com.arcadedb.schema.Property;
 import org.junit.jupiter.api.BeforeEach;
@@ -47,6 +48,7 @@ void setUp() {
     when(mockSchema.getType("TestEdge")).thenReturn(mockType);
     when(mockType.getName()).thenReturn("TestEdge");
     when(mockType.getPolymorphicPropertyIfExists(ArgumentMatchers.anyString())).thenReturn(null);
+    when(mockDatabase.newRID(ArgumentMatchers.anyString())).thenAnswer(inv -> new RID(inv.getArgument(0)));
 
     final Map<String, Object> attributes = new HashMap<>();
     attributes.put(Property.TYPE_PROPERTY, "TestEdge");
diff --git a/network/src/test/java/com/arcadedb/remote/RemoteImmutableVertexTest.java b/network/src/test/java/com/arcadedb/remote/RemoteImmutableVertexTest.java
index e63175d2b1..bcb4bad573 100644
--- a/network/src/test/java/com/arcadedb/remote/RemoteImmutableVertexTest.java
+++ b/network/src/test/java/com/arcadedb/remote/RemoteImmutableVertexTest.java
@@ -18,6 +18,7 @@
  */
 package com.arcadedb.remote;
 
+import com.arcadedb.database.RID;
 import com.arcadedb.graph.Vertex;
 import com.arcadedb.schema.Property;
 import org.junit.jupiter.api.BeforeEach;
@@ -47,6 +48,7 @@ void setUp() {
     when(mockSchema.getType("TestVertex")).thenReturn(mockType);
     when(mockType.getName()).thenReturn("TestVertex");
     when(mockType.getPolymorphicPropertyIfExists(ArgumentMatchers.anyString())).thenReturn(null);
+    when(mockDatabase.newRID(ArgumentMatchers.anyString())).thenAnswer(inv -> new RID(inv.getArgument(0)));
 
     final Map<String, Object> attributes = new HashMap<>();
     attributes.put(Property.TYPE_PROPERTY, "TestVertex");
diff --git a/network/src/test/java/com/arcadedb/remote/RemoteMutableEdgeTest.java b/network/src/test/java/com/arcadedb/remote/RemoteMutableEdgeTest.java
index d7a97059de..e32d1aedb5 100644
--- a/network/src/test/java/com/arcadedb/remote/RemoteMutableEdgeTest.java
+++ b/network/src/test/java/com/arcadedb/remote/RemoteMutableEdgeTest.java
@@ -18,6 +18,7 @@
  */
 package com.arcadedb.remote;
 
+import com.arcadedb.database.RID;
 import com.arcadedb.graph.Edge;
 import com.arcadedb.graph.Vertex;
 import com.arcadedb.query.sql.executor.Result;
@@ -50,6 +51,7 @@ void setUp() {
     when(mockDatabase.getSchema()).thenReturn(mockSchema);
     when(mockSchema.getType("TestEdge")).thenReturn(mockEdgeType);
     when(mockEdgeType.getName()).thenReturn("TestEdge");
+    when(mockDatabase.newRID(ArgumentMatchers.anyString())).thenAnswer(inv -> new RID(inv.getArgument(0)));
 
     // Build an immutable edge to use as source for the mutable edge
     final Map<String, Object> attributes = new HashMap<>();