diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/EntityDaoRegistryTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/EntityDaoRegistryTest.java
index 8524efc4a0..30110a2741 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/EntityDaoRegistryTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/EntityDaoRegistryTest.java
@@ -19,11 +19,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.Dao;
 import org.thingsboard.server.dao.entity.EntityDaoRegistry;
 
+import java.util.List;
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -37,6 +39,9 @@ public class EntityDaoRegistryTest extends AbstractServiceTest {
     @Autowired
     EntityDaoRegistry entityDaoRegistry;
 
+    @Autowired
+    List<JpaRepository<?, ?>> repositories;
+
     @Test
     public void givenAllEntityTypes_whenGetDao_thenAllPresent() {
         for (EntityType entityType : EntityType.values()) {
@@ -73,4 +78,14 @@ public class EntityDaoRegistryTest extends AbstractServiceTest {
         }
     }
 
+    /*
+     * Verifying that all the repositories are successfully bootstrapped, when using Lazy Jpa bootstrap mode
+     * */
+    @Test
+    public void testJpaRepositories() {
+        for (var repository : repositories) {
+            repository.count();
+        }
+    }
+
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/JpaRepositoriesTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/JpaRepositoriesTest.java
deleted file mode 100644
index a822401aeb..0000000000
--- a/dao/src/test/java/org/thingsboard/server/dao/service/JpaRepositoriesTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright © 2016-2024 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.dao.service;
-
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.List;
-
-@Slf4j
-@DaoSqlTest
-public class JpaRepositoriesTest extends AbstractServiceTest {
-
-    @Autowired
-    List<JpaRepository<?, ?>> repositories;
-
-    /*
-     * Verifying that all the repositories are successfully bootstrapped, when using Lazy Jpa bootstrap mode
-     * */
-    @Test
-    public void testRepositories() {
-        for (var repository : repositories) {
-            repository.count();
-        }
-    }
-
-}