diff --git a/osgi-app.properties b/osgi-app.properties
index 05254917a3..44eb3e247f 100644
--- a/osgi-app.properties
+++ b/osgi-app.properties
@@ -26,7 +26,7 @@ testBundles=\
 productsPaths=\
   dbeaver/product/community/DBeaver.product;\
   cloudbeaver/server/product/web-server/CloudbeaverServer.product:../../opt/cloudbeaver;\
-  cloudbeaver/server/product/web-server-test/CloudbeaverServerTest.product:../../opt/cloudbeaver;
+  cloudbeaver/server/product/web-server-test/CloudbeaverServerUnitTest.product:../../opt/cloudbeaver;
 ideaConfigurationFilesPaths=\
   dbeaver/.ide/.idea;
 additionalModuleRoots=\
diff --git a/server/product/web-server-test/CloudbeaverServerTest.product b/server/product/web-server-test/CloudbeaverServerUnitTest.product
similarity index 100%
rename from server/product/web-server-test/CloudbeaverServerTest.product
rename to server/product/web-server-test/CloudbeaverServerUnitTest.product
diff --git a/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/CloudbeaverMockTest.java b/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/CloudbeaverMockTest.java
index 2b6e9f8a36..16cdc181f4 100644
--- a/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/CloudbeaverMockTest.java
+++ b/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/CloudbeaverMockTest.java
@@ -12,7 +12,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import java.net.CookieManager;
 import java.net.http.HttpClient;
 
-@RunWithProduct("CloudbeaverServerTest.product")
+@RunWithProduct("CloudbeaverServerUnitTest.product")
 @RunnerProxy(MockitoJUnitRunner.class)
 @RunWith(OSGITestRunner.class)
 @RunWithApplication(bundleName = "io.cloudbeaver.server.ce", registryName = "io.cloudbeaver.product.ce.application", args = {"-web-config", "workspace/conf/cloudbeaver.conf"})
diff --git a/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/model/rm/RMNIOTest.java b/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/model/rm/RMNIOTest.java
index 8ea616144c..4348d45401 100644
--- a/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/model/rm/RMNIOTest.java
+++ b/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/model/rm/RMNIOTest.java
@@ -16,6 +16,7 @@
  */
 package io.cloudbeaver.model.rm;
 
+import io.cloudbeaver.CloudbeaverMockTest;
 import io.cloudbeaver.app.CEAppStarter;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.server.CBConstants;
@@ -46,7 +47,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-public class RMNIOTest {
+public class RMNIOTest extends CloudbeaverMockTest {
 
     private static WebSession webSession;
     private static RMProject testProject;
diff --git a/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/model/rm/lock/RMLockTest.java b/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/model/rm/lock/RMLockTest.java
index 0b37eeaa78..a92f0a701b 100644
--- a/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/model/rm/lock/RMLockTest.java
+++ b/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/model/rm/lock/RMLockTest.java
@@ -16,11 +16,10 @@
  */
 package io.cloudbeaver.model.rm.lock;
 
+import io.cloudbeaver.CloudbeaverMockTest;
 import io.cloudbeaver.app.CEAppStarter;
 import org.jkiss.dbeaver.Log;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.*;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
@@ -32,7 +31,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-public class RMLockTest {
+public class RMLockTest extends CloudbeaverMockTest {
     private static final Log log = Log.getLog(RMLockTest.class);
     private final String project1 = "s_fakeProject1";
     private final String project2 = "s_fakeProject2";
@@ -43,6 +42,11 @@ public class RMLockTest {
         executor.shutdown();
     }
 
+    @BeforeClass
+    public static void startServer() throws Exception {
+        CEAppStarter.startServerIfNotStarted();
+    }
+
     @Test
     public void testProjectAccessUsingSeveralControllers() throws Throwable {
         var lockController1 = new TestLockController(CEAppStarter.getTestApp(), 1);
diff --git a/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/test/platform/SQLQueryTranslatorTest.java b/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/test/platform/SQLQueryTranslatorTest.java
index f8af2eca03..d4c4c28746 100644
--- a/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/test/platform/SQLQueryTranslatorTest.java
+++ b/server/test/io.cloudbeaver.test.platform/src/io/cloudbeaver/test/platform/SQLQueryTranslatorTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 import java.util.HashMap;
 import java.util.Map;
 
-public class SQLQueryTranslatorTest extends CloudbeaverMockTest {
+public class    SQLQueryTranslatorTest extends CloudbeaverMockTest {
     @Test
     public void createSimpleTable() throws DBException {
         var basicSql = "CREATE TABLE CB_AUTH_SUBJECT (SUBJECT_ID VARCHAR(128) NOT NULL," +
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index a1fa5bdb77..c96a086ef3 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -16547,13 +16547,13 @@ __metadata:
 
 "react-data-grid@file:./artifacts::locator=%40dbeaver%2Freact-data-grid%40workspace%3A..%2Fcommon-react%2F%40dbeaver%2Freact-data-grid":
   version: 7.0.0-beta.50
-  resolution: "react-data-grid@file:./artifacts#./artifacts::hash=f67a36&locator=%40dbeaver%2Freact-data-grid%40workspace%3A..%2Fcommon-react%2F%40dbeaver%2Freact-data-grid"
+  resolution: "react-data-grid@file:./artifacts#./artifacts::hash=6ae017&locator=%40dbeaver%2Freact-data-grid%40workspace%3A..%2Fcommon-react%2F%40dbeaver%2Freact-data-grid"
   dependencies:
     clsx: "npm:^2.0.0"
   peerDependencies:
     react: ^19.0
     react-dom: ^19.0
-  checksum: 10c0/5591a564d6c3f4772dd87b8bfda111b0aafb8f748f1337f492db7ab5fc3f5dd5da3088aa4856ce581d943202ca8ed508e2828fc3e1453441b3061fa56a62ae95
+  checksum: 10c0/774a4760688888a8a5139af409e3c3c1c45e1dc9aefafe39ae8abfce9996724d1b0a7643921a30e99305b0d28b960d2b1bddfde4c3d03db9770313be750805bf
   languageName: node
   linkType: hard