diff --git a/java_console/build.xml b/java_console/build.xml
index 64f866f021..3fb8a774a4 100644
--- a/java_console/build.xml
+++ b/java_console/build.xml
@@ -1,11 +1,13 @@
 <project default="build">
     <property name="jar_file_folder" value="../java_console_binary"/>
+    <property name="hw_tests" value="build_hw"/>
     <property name="jar_file" value="${jar_file_folder}/rusefi_console.jar"/>
     <property name="server_jar_file" value="${jar_file_folder}/rusefi_server.jar"/>
     <property name="lib_list" value="lib/mockito-all-1.10.19.jar:../java_tools/configuration_definition/lib/snakeyaml.jar:lib/log4j-api-2.13.3.jar:lib/log4j-core-2.13.3.jar:lib/jsr305-2.0.1.jar:lib/dfu/dfu_java.jar:lib/dfu/IntelHexParser.jar:lib/json-simple-1.1.1.jar:lib/server/javax.json.jar:lib/server/cactoos.jar:lib/server/takes.jar:lib/json-simple-1.1.1.jar:lib/jaxb-api.jar:lib/httpclient.jar:lib/httpmime.jar:lib/httpcore.jar:lib/jSerialComm.jar:lib/jcip-annotations-1.0.jar:lib/jlatexmath-1.0.6.jar:lib/swing-layout-1.0.jar:lib/jep.jar:lib/log4j.jar:lib/junit.jar:lib/SteelSeries-3.9.30.jar:lib/annotations.jar:lib/miglayout-4.0.jar:lib/surfaceplotter-2.0.1.jar"/>
 
     <target name="clean">
         <delete dir="build"/>
+        <delete dir="${hw_tests}"/>
     </target>
 
     <target name="clean_out_folder">
@@ -188,6 +190,7 @@
         <java classpath="${jar_file}" classname="com.rusefi.RealHardwareTestLauncher" failonerror="true">
         </java>
 
+        <mkdir dir="${hw_tests}"/>
         <junit fork="no"
                maxmemory="512m"
                printsummary="yes"
@@ -199,7 +202,7 @@
             <formatter type="brief"/>
             <classpath
                     path="build/classes:lib/junit.jar:${lib_list}:lib/commons-logging.jar"/>
-            <batchtest todir="build">
+            <batchtest todir="${hw_tests}">
                 <fileset dir="autotest/src" includes="**/*Test.java"/>
             </batchtest>
         </junit>