diff --git a/java_console/autotest/src/com/rusefi/AutoTest.java b/java_console/autotest/src/com/rusefi/FunctionalTestsSuite.java
similarity index 99%
rename from java_console/autotest/src/com/rusefi/AutoTest.java
rename to java_console/autotest/src/com/rusefi/FunctionalTestsSuite.java
index b0ac3ef895..6dd7c133e0 100644
--- a/java_console/autotest/src/com/rusefi/AutoTest.java
+++ b/java_console/autotest/src/com/rusefi/FunctionalTestsSuite.java
@@ -27,12 +27,12 @@ import static com.rusefi.waves.EngineReport.isCloseEnough;
  * @author Andrey Belomutskiy
  * 3/5/14
  */
-public class AutoTest {
+public class FunctionalTestsSuite {
 
     private final LinkManager linkManager;
     private final EcuTestHelper ecu;
 
-    public AutoTest(LinkManager linkManager, CommandQueue commandQueue) {
+    public FunctionalTestsSuite(LinkManager linkManager, CommandQueue commandQueue) {
         ecu = new EcuTestHelper(commandQueue);
         this.linkManager = linkManager;
     }
diff --git a/java_console/autotest/src/com/rusefi/RealHwTest.java b/java_console/autotest/src/com/rusefi/RealHardwareTestLauncher.java
similarity index 92%
rename from java_console/autotest/src/com/rusefi/RealHwTest.java
rename to java_console/autotest/src/com/rusefi/RealHardwareTestLauncher.java
index 09fa18a982..9a82eff854 100644
--- a/java_console/autotest/src/com/rusefi/RealHwTest.java
+++ b/java_console/autotest/src/com/rusefi/RealHardwareTestLauncher.java
@@ -20,8 +20,8 @@ import static com.rusefi.Timeouts.SECOND;
  * Andrey Belomutskiy, (c) 2013-2020
  * 2/22/2015
  */
-public class RealHwTest {
-    private static final Logging log = getLogging(RealHwTest.class);
+public class RealHardwareTestLauncher {
+    private static final Logging log = getLogging(RealHardwareTestLauncher.class);
     public static final String HW_TESTS_START_UP_SLEEP = "hw_tests_start_up_sleep";
     private static final int STARTUP_SLEEP = Integer.getInteger(HW_TESTS_START_UP_SLEEP, 0);
 
@@ -69,6 +69,6 @@ public class RealHwTest {
             throw new IllegalStateException("firmwareVersion has not arrived");
 
         // now run common part of the test which should be same on real hardware and simulator
-        new AutoTest(linkManager, linkManager.getCommandQueue()).mainTestBody();
+        new FunctionalTestsSuite(linkManager, linkManager.getCommandQueue()).mainTestBody();
     }
 }
diff --git a/java_console/autotest/src/com/rusefi/SimulatorFunctionalTest.java b/java_console/autotest/src/com/rusefi/SimulatorFunctionalTestLaunche.java
similarity index 84%
rename from java_console/autotest/src/com/rusefi/SimulatorFunctionalTest.java
rename to java_console/autotest/src/com/rusefi/SimulatorFunctionalTestLaunche.java
index 345c92b8de..abc9e15ee8 100644
--- a/java_console/autotest/src/com/rusefi/SimulatorFunctionalTest.java
+++ b/java_console/autotest/src/com/rusefi/SimulatorFunctionalTestLaunche.java
@@ -2,7 +2,11 @@ package com.rusefi;
 
 import com.rusefi.io.LinkManager;
 
-public class SimulatorFunctionalTest {
+/**
+ * this class runs rusEFI functional tests against rusEFI simulator
+ * As of Dec 2020 this seems very broken?
+ */
+public class SimulatorFunctionalTestLaunche {
     public static void main(String[] args) {
         Thread.setDefaultUncaughtExceptionHandler((t, e) -> {
             e.printStackTrace();
@@ -18,7 +22,7 @@ public class SimulatorFunctionalTest {
         try {
             LinkManager linkManager = new LinkManager();
             IoUtil.connectToSimulator(linkManager, startSimulator);
-            new AutoTest(linkManager, linkManager.getCommandQueue()).mainTestBody();
+            new FunctionalTestsSuite(linkManager, linkManager.getCommandQueue()).mainTestBody();
         } catch (Throwable e) {
             e.printStackTrace();
             failed = true;
diff --git a/java_console/build.xml b/java_console/build.xml
index ce40d414a2..bb7d8fd430 100644
--- a/java_console/build.xml
+++ b/java_console/build.xml
@@ -1,4 +1,4 @@
-<project default="jar">
+<project default="build">
     <property name="jar_file_folder" value="../java_console_binary"/>
     <property name="jar_file" value="${jar_file_folder}/rusefi_console.jar"/>
     <property name="server_jar_file" value="${jar_file_folder}/rusefi_server.jar"/>
@@ -24,6 +24,8 @@
         </javac>
     </target>
 
+    <target name="build" depends="jar, test"/>
+
     <target name="autoupdate_jar" depends="autoupdate_compile">
         <tstamp>
             <format property="TODAY" pattern="yyyy-MM-dd HH:mm:ss"/>
@@ -71,7 +73,9 @@
                         <compilerarg line="- -add-exports java.xml/com.sun.org.apache.xml.internal.serialize=ALL-UNNAMED"/>
                         -->
         </javac>
+    </target>
 
+    <target name="test" depends="compile">
         <junit fork="no"
                maxmemory="512m"
                printsummary="yes"
@@ -83,6 +87,7 @@
             <classpath
                     path="build/classes:lib/junit.jar:${lib_list}:lib/commons-logging.jar"/>
             <batchtest todir="build">
+<!--                at the moment we do NOT have any tests matching this pattern - all hardware tests are not inside 'test' folders -->
                 <fileset dir="autotest/src" includes="**/test/**/*Test.java"/>
                 <fileset dir="autoupdate/src" includes="**/test/**/*Test.java"/>
                 <fileset dir="io/src/test/java" includes="**/test/**/*Test.java"/>
@@ -93,7 +98,6 @@
                 <fileset dir="logging/src" includes="**/test/**/*Test.java"/>
             </batchtest>
         </junit>
-
     </target>
 
     <target name="server_jar" depends="jar">
@@ -181,8 +185,23 @@
     </target>
 
     <target name="real_hardware_functional_test" depends="jar">
-        <java classpath="${jar_file}" classname="com.rusefi.RealHwTest" failonerror="true">
+        <java classpath="${jar_file}" classname="com.rusefi.RealHardwareTestLauncher" failonerror="true">
         </java>
+
+        <junit fork="no"
+               maxmemory="512m"
+               printsummary="yes"
+               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="build">
+                <fileset dir="autotest/src" includes="**/*Test.java"/>
+            </batchtest>
+        </junit>
     </target>
 
     <target name="before_IDEA_Build">
diff --git a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java
index be108f3fe5..44599c3801 100644
--- a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java
+++ b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java
@@ -5,7 +5,6 @@ import com.rusefi.autoupdate.AutoupdateUtil;
 import com.rusefi.io.LinkManager;
 import com.rusefi.io.serial.BaudRateHolder;
 import com.rusefi.maintenance.*;
-import com.rusefi.ts_plugin.AudioPlayback;
 import com.rusefi.ui.util.HorizontalLine;
 import com.rusefi.ui.util.URLLabel;
 import com.rusefi.ui.util.UiUtils;
@@ -266,7 +265,7 @@ public class StartupFrame {
             }
 
             private void runFunctionalHardwareTest() {
-                boolean isSuccess = RealHwTest.runHardwareTest();
+                boolean isSuccess = RealHardwareTestLauncher.runHardwareTest();
                 JOptionPane.showMessageDialog(null, "Function test passed: " + isSuccess + "\nSee log folder for details.");
             }
         };
diff --git a/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java b/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
index e065297cf5..45141c567d 100644
--- a/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
+++ b/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
@@ -2,7 +2,6 @@ package com.rusefi.tools;
 
 import com.fathzer.soft.javaluator.DoubleEvaluator;
 import com.opensr5.ConfigurationImage;
-import com.opensr5.Logger;
 import com.opensr5.ini.IniFileModel;
 import com.opensr5.io.ConfigurationImageFile;
 import com.rusefi.*;
@@ -214,7 +213,7 @@ public class ConsoleTools {
     private static void runFunctionalTest(String[] args) throws InterruptedException {
         // passing port argument if it was specified
         String[] toolArgs = args.length == 1 ? new String[0] : new String[]{args[1]};
-        RealHwTest.main(toolArgs);
+        RealHardwareTestLauncher.main(toolArgs);
     }
 
     private static void runHeadless(String[] args) {
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java
index 40b7fd07e8..c35c4b5b23 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java
@@ -1,7 +1,7 @@
 package com.rusefi.ui.widgets;
 
 import com.fathzer.soft.javaluator.DoubleEvaluator;
-import com.rusefi.AutoTest;
+import com.rusefi.FunctionalTestsSuite;
 import com.rusefi.FileLog;
 import com.rusefi.InfixConverter;
 import com.rusefi.NamedThreadFactory;
@@ -189,7 +189,7 @@ public class AnyCommand {
                         return null;
                     }
                 };
-                AutoTest.assertRpmDoesNotJump(rpm, settleTime, durationTime, callback, linkManager.getCommandQueue());
+                FunctionalTestsSuite.assertRpmDoesNotJump(rpm, settleTime, durationTime, callback, linkManager.getCommandQueue());
             }
         }).start();
     }