diff --git a/.github/workflows/hardware-ci.yaml b/.github/workflows/hardware-ci.yaml
index 2792eb6920..c1671e4c99 100644
--- a/.github/workflows/hardware-ci.yaml
+++ b/.github/workflows/hardware-ci.yaml
@@ -12,7 +12,6 @@ jobs:
 
         include:
           - build-target: f407-discovery
-            script: hardware_ci_f4_discovery
             runs-on: hw-ci-f4-discovery
             test-suite: com.rusefi.HwCiF4Discovery
             folder: f407-discovery
@@ -22,7 +21,6 @@ jobs:
             serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_2B003B000A51343033393930-if01
 
           - build-target: proteus_f4
-            script: hardware_ci_proteus
             runs-on: hw-ci-proteus
             test-suite: com.rusefi.HwCiF4Proteus
             folder: proteus
@@ -93,8 +91,6 @@ jobs:
       working-directory: ./java_tools
       run: ./gradlew :autotest:shadowJar
 
-    # This both compiles and runs HW CI tests
     - name: Run Hardware CI
-      working-directory: ./java_console
-      run: ant ${{matrix.script}}
+      run: java -cp java_console/autotest/build/libs/autotest-all.jar com.rusefi.HwCiF4Proteus ${{matrix.test-suite}}
 
diff --git a/java_console/autotest/src/main/java/com/rusefi/RusefiTestBase.java b/java_console/autotest/src/main/java/com/rusefi/RusefiTestBase.java
index 99504795c2..0501c22cf8 100644
--- a/java_console/autotest/src/main/java/com/rusefi/RusefiTestBase.java
+++ b/java_console/autotest/src/main/java/com/rusefi/RusefiTestBase.java
@@ -19,7 +19,8 @@ public class RusefiTestBase {
 
     @After
     public void checkStackUsage() {
-        ecu.sendCommand("threadsinfo");
+        if (ecu != null)
+            ecu.sendCommand("threadsinfo");
     }
 
     protected EngineChart nextChart() {
diff --git a/java_console/build.xml b/java_console/build.xml
index d78602f3f8..8b7345ae23 100644
--- a/java_console/build.xml
+++ b/java_console/build.xml
@@ -186,48 +186,6 @@
 
     </target>
 
-    <target name="hardware_ci_f4_discovery" depends="jar">
-        <mkdir dir="${hw_tests}"/>
-        <junit fork="no"
-               maxmemory="512m"
-               printsummary="yes"
-               showoutput="true"
-               haltonfailure="yes">
-
-            <jvmarg value="-ea"/>
-            <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError"/>
-            <formatter type="brief"/>
-            <classpath
-                    path="build/classes:lib/junit.jar:${lib_list}:lib/commons-logging.jar"/>
-            <batchtest todir="${hw_tests}">
-                <fileset dir="autotest/src/main/java" includes="**/common/*.java"/>
-                <fileset dir="autotest/src/main/java" includes="**/f4discovery/*.java"/>
-            </batchtest>
-            <formatter type="plain" usefile="false" /> <!-- to screen -->
-        </junit>
-    </target>
-
-    <target name="hardware_ci_proteus" depends="jar">
-        <mkdir dir="${hw_tests}"/>
-        <junit fork="no"
-               maxmemory="512m"
-               printsummary="yes"
-               showoutput="true"
-               haltonfailure="yes">
-
-            <jvmarg value="-ea"/>
-            <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError"/>
-            <formatter type="brief"/>
-            <classpath
-                    path="build/classes:lib/junit.jar:${lib_list}:lib/commons-logging.jar"/>
-            <batchtest todir="${hw_tests}">
-                <fileset dir="autotest/src/main/java" includes="**/common/*.java"/>
-                <fileset dir="autotest/src/main/java" includes="**/proteus/*.java"/>
-            </batchtest>
-            <formatter type="plain" usefile="false" /> <!-- to screen -->
-        </junit>
-    </target>
-
     <target name="before_IDEA_Build">
         <copy todir=".">
             <fileset dir="../firmware/tunerstudio" includes="rusefi.ini"/>