diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/database/mongodb/domain/MongoDbModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/database/mongodb/domain/MongoDbModuleFactory.java
index a5a83e16130..9349be34916 100644
--- a/src/main/java/tech/jhipster/lite/generator/server/springboot/database/mongodb/domain/MongoDbModuleFactory.java
+++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/database/mongodb/domain/MongoDbModuleFactory.java
@@ -14,6 +14,8 @@
 public class MongoDbModuleFactory {
 
   private static final JHipsterSource SOURCE = from("server/springboot/database/mongodb");
+  private static final JHipsterSource MAIN_SOURCE = SOURCE.append("main");
+  private static final JHipsterSource TEST_SOURCE = SOURCE.append("test");
 
   private static final String MONGO_SECONDARY = "technical/infrastructure/secondary/mongodb";
   private static final String DOCKER_COMPOSE_COMMAND = "docker compose -f src/main/docker/mongodb.yml up -d";
@@ -45,15 +47,15 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
         .and()
       .files()
         .add(SOURCE.template("mongodb.yml"), toSrcMainDocker().append("mongodb.yml"))
-        .batch(SOURCE, toSrcMainJava().append(packagePath).append(MONGO_SECONDARY))
+        .batch(MAIN_SOURCE, toSrcMainJava().append(packagePath).append(MONGO_SECONDARY))
           .addTemplate("MongodbDatabaseConfiguration.java")
           .addTemplate("JSR310DateConverters.java")
           .and()
         .add(
-              SOURCE.template("JSR310DateConvertersTest.java"),
+              TEST_SOURCE.template("JSR310DateConvertersTest.java"),
               toSrcTestJava().append(packagePath).append(MONGO_SECONDARY).append("JSR310DateConvertersTest.java")
             )
-        .add(SOURCE.template("TestMongoDBManager.java"), toSrcTestJava().append(packagePath).append("TestMongoDBManager.java"))
+        .add(TEST_SOURCE.template("TestMongoDBManager.java"), toSrcTestJava().append(packagePath).append("TestMongoDBManager.java"))
         .and()
       .springMainProperties()
         .set(propertyKey("spring.data.mongodb.database"), propertyValue(properties.projectBaseName().get()))
diff --git a/src/main/resources/generator/server/springboot/database/mongodb/JSR310DateConverters.java.mustache b/src/main/resources/generator/server/springboot/database/mongodb/main/JSR310DateConverters.java.mustache
similarity index 100%
rename from src/main/resources/generator/server/springboot/database/mongodb/JSR310DateConverters.java.mustache
rename to src/main/resources/generator/server/springboot/database/mongodb/main/JSR310DateConverters.java.mustache
diff --git a/src/main/resources/generator/server/springboot/database/mongodb/MongodbDatabaseConfiguration.java.mustache b/src/main/resources/generator/server/springboot/database/mongodb/main/MongodbDatabaseConfiguration.java.mustache
similarity index 100%
rename from src/main/resources/generator/server/springboot/database/mongodb/MongodbDatabaseConfiguration.java.mustache
rename to src/main/resources/generator/server/springboot/database/mongodb/main/MongodbDatabaseConfiguration.java.mustache
diff --git a/src/main/resources/generator/server/springboot/database/mongodb/JSR310DateConvertersTest.java.mustache b/src/main/resources/generator/server/springboot/database/mongodb/test/JSR310DateConvertersTest.java.mustache
similarity index 100%
rename from src/main/resources/generator/server/springboot/database/mongodb/JSR310DateConvertersTest.java.mustache
rename to src/main/resources/generator/server/springboot/database/mongodb/test/JSR310DateConvertersTest.java.mustache
diff --git a/src/main/resources/generator/server/springboot/database/mongodb/TestMongoDBManager.java.mustache b/src/main/resources/generator/server/springboot/database/mongodb/test/TestMongoDBManager.java.mustache
similarity index 100%
rename from src/main/resources/generator/server/springboot/database/mongodb/TestMongoDBManager.java.mustache
rename to src/main/resources/generator/server/springboot/database/mongodb/test/TestMongoDBManager.java.mustache