diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 311d6b6cc..ccc2ba5b1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -80,5 +80,6 @@ network-store-server:
   preloading-strategy: COLLECTION
   base-uri: http://localhost:8080/
 
-dbName: study
+dbName: gridsuite
+query: ?currentSchema=study
 dbApi: jdbc
diff --git a/src/test/resources/application-default.yml b/src/test/resources/application-default.yml
index 88ff10230..f91294144 100644
--- a/src/test/resources/application-default.yml
+++ b/src/test/resources/application-default.yml
@@ -15,7 +15,8 @@ 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 study\;SET SCHEMA study
+
 hostPort: