diff --git a/java_console/ui/build.gradle b/java_console/ui/build.gradle
index 8266951566..fec3c87661 100644
--- a/java_console/ui/build.gradle
+++ b/java_console/ui/build.gradle
@@ -15,7 +15,6 @@ dependencies {
     implementation files('../lib/dfu/IntelHexParser.jar')
 
     testImplementation global_libs.mockito
-    testImplementation project(':proxy_server')
     testImplementation testFixtures(project(':ecu_io'))
 }
 
diff --git a/java_console/ui/src/test/java/com/rusefi/BackendTestHelper.java b/java_tools/proxy_server/src/test/java/com/rusefi/BackendTestHelper.java
similarity index 100%
rename from java_console/ui/src/test/java/com/rusefi/BackendTestHelper.java
rename to java_tools/proxy_server/src/test/java/com/rusefi/BackendTestHelper.java
diff --git a/java_console/ui/src/test/java/com/rusefi/FullServerTest.java b/java_tools/proxy_server/src/test/java/com/rusefi/FullServerTest.java
similarity index 100%
rename from java_console/ui/src/test/java/com/rusefi/FullServerTest.java
rename to java_tools/proxy_server/src/test/java/com/rusefi/FullServerTest.java
diff --git a/java_console/ui/src/test/java/com/rusefi/ServerTest.java b/java_tools/proxy_server/src/test/java/com/rusefi/ServerTest.java
similarity index 100%
rename from java_console/ui/src/test/java/com/rusefi/ServerTest.java
rename to java_tools/proxy_server/src/test/java/com/rusefi/ServerTest.java
diff --git a/java_console/ui/src/test/java/com/rusefi/proxy/NetworkConnectorTest.java b/java_tools/proxy_server/src/test/java/com/rusefi/proxy/NetworkConnectorTest.java
similarity index 100%
rename from java_console/ui/src/test/java/com/rusefi/proxy/NetworkConnectorTest.java
rename to java_tools/proxy_server/src/test/java/com/rusefi/proxy/NetworkConnectorTest.java
diff --git a/java_console/ui/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java b/java_tools/proxy_server/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java
similarity index 97%
rename from java_console/ui/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java
rename to java_tools/proxy_server/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java
index 2b23b73960..5eb7c3eca0 100644
--- a/java_console/ui/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java
+++ b/java_tools/proxy_server/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java
@@ -56,7 +56,7 @@ public class LocalApplicationProxyTest {
         assertLatch(backendCreated);
 
         SessionDetails sessionDetails = TestHelper.createTestSession(TEST_TOKEN_1, Fields.TS_SIGNATURE);
-        ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, createTestUserResolver().apply(TEST_TOKEN_1));
+        ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, BackendTestHelper.createTestUserResolver().apply(TEST_TOKEN_1));
 
         CountDownLatch disconnected = new CountDownLatch(1);
         LocalApplicationProxy.startAndRun(context, applicationRequest, -1, (String message) -> disconnected.countDown(), LocalApplicationProxy.ConnectionListener.VOID);
@@ -72,7 +72,7 @@ public class LocalApplicationProxyTest {
 
         try (ServerSocketReference ignored1 = createMockBackend(context, gaugePokes)) {
             SessionDetails sessionDetails = TestHelper.createTestSession(TEST_TOKEN_1, Fields.TS_SIGNATURE);
-            ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, createTestUserResolver().apply(TEST_TOKEN_1));
+            ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, BackendTestHelper.createTestUserResolver().apply(TEST_TOKEN_1));
 
             try (ServerSocketReference ignored2 = LocalApplicationProxy.startAndRun(context, applicationRequest, -1, TcpIoStream.DisconnectListener.VOID, LocalApplicationProxy.ConnectionListener.VOID)) {
                 TcpIoStream applicationConnection = new TcpIoStream("mock application ", new Socket(LOCALHOST, context.authenticatorPort()));
@@ -113,7 +113,7 @@ public class LocalApplicationProxyTest {
         try (ServerSocketReference ignored1 = createMockBackend(context, gaugePokes)) {
 
             SessionDetails sessionDetails = TestHelper.createTestSession(TEST_TOKEN_1, Fields.TS_SIGNATURE);
-            ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, createTestUserResolver().apply(TEST_TOKEN_1));
+            ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, BackendTestHelper.createTestUserResolver().apply(TEST_TOKEN_1));
 
             CountDownLatch disconnected = new CountDownLatch(1);