diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9f02dff25..859dc6a9c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -37,5 +37,6 @@ server:
 network-store-server:
   base-uri: http://localhost:8080
 
-dbName: networkmodifications
+dbName: gridsuite
+query: ?currentSchema=networkmodifications
 dbApi: jdbc
diff --git a/src/test/resources/application-default.yml b/src/test/resources/application-default.yml
index 8fae606c9..13ec139d6 100644
--- a/src/test/resources/application-default.yml
+++ b/src/test/resources/application-default.yml
@@ -17,7 +17,7 @@ logging:
     org.hibernate.type.descriptor.sql.BasicBinder: TRACE
 
 dbVendor: h2:mem
-query: ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+query: ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS networkmodifications\;SET SCHEMA networkmodifications
 hostPort: