diff --git a/datastore/src/main/java/net/jami/datastore/dao/UserProfileDAO.java b/datastore/src/main/java/net/jami/datastore/dao/UserProfileDAO.java
index 6d1477f8f37ea09f9c8f62966ad26b89b4072c8e..423234722da15a88a9c1b3f07f118eb0a9eb9096 100644
--- a/datastore/src/main/java/net/jami/datastore/dao/UserProfileDAO.java
+++ b/datastore/src/main/java/net/jami/datastore/dao/UserProfileDAO.java
@@ -16,7 +16,7 @@ public class UserProfileDAO extends AbstractDao<UserProfile> {
     public UserProfileDAO() {
         SQLConnection connection = DataStore.connectionPool.getConnection();
         try {
-            this.setTableName("system");
+            this.setTableName("local_directory");
             this.setTClass(UserProfile.class);
             String createTable = "CREATE TABLE directory (" +
                     "username varchar(255), " +
diff --git a/datastore/src/test/java/net/jami/datastore/dao/ContactDaoTest.java b/datastore/src/test/java/net/jami/datastore/dao/ContactDaoTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..c3709baac20bcbe5546515bf79428398dbb31f3b
--- /dev/null
+++ b/datastore/src/test/java/net/jami/datastore/dao/ContactDaoTest.java
@@ -0,0 +1,7 @@
+package net.jami.datastore.dao;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class ContactDaoTest {
+
+}
\ No newline at end of file
diff --git a/datastore/src/test/java/net/jami/datastore/dao/SystemDaoTest.java b/datastore/src/test/java/net/jami/datastore/dao/SystemDaoTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..f5e04fe96f7f538e399dc8481220abd633a71824
--- /dev/null
+++ b/datastore/src/test/java/net/jami/datastore/dao/SystemDaoTest.java
@@ -0,0 +1,7 @@
+package net.jami.datastore.dao;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class SystemDaoTest {
+
+}
\ No newline at end of file