diff --git a/java_console/autotest/src/com/rusefi/EnduranceTestUtility.java b/java_console/autotest/src/com/rusefi/EnduranceTestUtility.java
index 2e0e47cdee..b7a9920fac 100644
--- a/java_console/autotest/src/com/rusefi/EnduranceTestUtility.java
+++ b/java_console/autotest/src/com/rusefi/EnduranceTestUtility.java
@@ -1,5 +1,6 @@
 package com.rusefi;
 
+import com.rusefi.autotest.ControllerConnectorState;
 import com.rusefi.config.generated.Fields;
 import com.rusefi.functional_tests.EcuTestHelper;
 import com.rusefi.io.CommandQueue;
diff --git a/java_console/autotest/src/com/rusefi/IoUtil.java b/java_console/autotest/src/com/rusefi/IoUtil.java
index 7521ea89bf..64f8f556fa 100644
--- a/java_console/autotest/src/com/rusefi/IoUtil.java
+++ b/java_console/autotest/src/com/rusefi/IoUtil.java
@@ -152,7 +152,7 @@ public class IoUtil {
         }
     }
 
-    static void realHardwareConnect(LinkManager linkManager, String port) {
+    public static void realHardwareConnect(LinkManager linkManager, String port) {
         linkManager.getEngineState().registerStringValueAction(Fields.PROTOCOL_OUTPIN, (EngineState.ValueCallback<String>) EngineState.ValueCallback.VOID);
         linkManager.getEngineState().registerStringValueAction(AverageAnglesUtil.KEY, (EngineState.ValueCallback<String>) EngineState.ValueCallback.VOID);
 
diff --git a/java_console/autotest/src/com/rusefi/TestingUtils.java b/java_console/autotest/src/com/rusefi/TestingUtils.java
index 0a927730bb..444df50047 100644
--- a/java_console/autotest/src/com/rusefi/TestingUtils.java
+++ b/java_console/autotest/src/com/rusefi/TestingUtils.java
@@ -27,7 +27,7 @@ import static com.rusefi.waves.EngineReport.isCloseEnough;
 public class TestingUtils {
     private static final Logging log = getLogging(TestingUtils.class);
 
-    static boolean isRealHardware;
+    public static boolean isRealHardware;
 
     static void assertTrue(String msg, boolean b) {
         if (!b)
diff --git a/java_console/autotest/src/com/rusefi/ControllerConnectorState.java b/java_console/autotest/src/com/rusefi/autotest/ControllerConnectorState.java
similarity index 81%
rename from java_console/autotest/src/com/rusefi/ControllerConnectorState.java
rename to java_console/autotest/src/com/rusefi/autotest/ControllerConnectorState.java
index c8a77917b6..1e7bf9b35d 100644
--- a/java_console/autotest/src/com/rusefi/ControllerConnectorState.java
+++ b/java_console/autotest/src/com/rusefi/autotest/ControllerConnectorState.java
@@ -1,5 +1,8 @@
-package com.rusefi;
+package com.rusefi.autotest;
 
+import com.rusefi.FileLog;
+import com.rusefi.IoUtil;
+import com.rusefi.TestingUtils;
 import com.rusefi.autodetect.PortDetector;
 import com.rusefi.config.generated.Fields;
 import com.rusefi.core.EngineState;
@@ -33,8 +36,11 @@ public class ControllerConnectorState {
         TestingUtils.isRealHardware = true;
         FileLog.MAIN.start();
         String port = System.getProperty("ecu.port");
-        if (port == null)
-            port = PortDetector.autoDetectPort(null);
+        if (port == null) {
+            port = PortDetector.autoDetectSerial(null);
+            if (port == null)
+                throw new IllegalStateException("ECU serial not detected");
+        }
 
         IoUtil.realHardwareConnect(linkManager, port);
         ControllerConnectorState.linkManager = linkManager;
diff --git a/java_console/autotest/src/com/rusefi/f4discovery/VssHardwareLoopTest.java b/java_console/autotest/src/com/rusefi/f4discovery/VssHardwareLoopTest.java
index f031813535..209738cb32 100644
--- a/java_console/autotest/src/com/rusefi/f4discovery/VssHardwareLoopTest.java
+++ b/java_console/autotest/src/com/rusefi/f4discovery/VssHardwareLoopTest.java
@@ -1,6 +1,6 @@
 package com.rusefi.f4discovery;
 
-import com.rusefi.ControllerConnectorState;
+import com.rusefi.autotest.ControllerConnectorState;
 import com.rusefi.RusefiTestBase;
 import com.rusefi.Timeouts;
 import com.rusefi.config.generated.Fields;
@@ -10,7 +10,6 @@ import com.rusefi.functional_tests.EcuTestHelper;
 import org.junit.Test;
 
 import static com.rusefi.IoUtil.getDisableCommand;
-import static com.rusefi.IoUtil.getEnableCommand;
 import static com.rusefi.binaryprotocol.BinaryProtocol.sleep;
 import static com.rusefi.config.generated.Fields.*;
 
diff --git a/java_console/autotest/src/com/rusefi/functional_tests/EcuTestHelper.java b/java_console/autotest/src/com/rusefi/functional_tests/EcuTestHelper.java
index 63ea9064a8..255b76bcc0 100644
--- a/java_console/autotest/src/com/rusefi/functional_tests/EcuTestHelper.java
+++ b/java_console/autotest/src/com/rusefi/functional_tests/EcuTestHelper.java
@@ -1,9 +1,8 @@
 package com.rusefi.functional_tests;
 
 import com.devexperts.logging.Logging;
-import com.rusefi.ControllerConnectorState;
+import com.rusefi.autotest.ControllerConnectorState;
 import com.rusefi.IoUtil;
-import com.rusefi.TestingUtils;
 import com.rusefi.Timeouts;
 import com.rusefi.config.generated.Fields;
 import com.rusefi.core.ISensorCentral;