diff --git a/.gitignore b/.gitignore
index b25b5c32ae..2395e1fd71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 build/
 build_kinetis/
 out/
+logs/
 blbuild/
 Debug_EMS/
 Release_EMS/
diff --git a/firmware/run_hw_test.bat b/firmware/run_hw_test.bat
new file mode 100644
index 0000000000..df13deab29
--- /dev/null
+++ b/firmware/run_hw_test.bat
@@ -0,0 +1,3 @@
+set port=%1
+echo "Port (optional): %port%"
+java -jar ../java_console_binary/rusefi_console.jar functional_test %port%
diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java
index e3acacefbf..25b82cbdf5 100644
--- a/java_console/ui/src/com/rusefi/Launcher.java
+++ b/java_console/ui/src/com/rusefi/Launcher.java
@@ -324,7 +324,9 @@ public class Launcher {
         String toolName = args.length == 0 ? null : args[0];
 
         if (TOOL_NAME_FUNCTIONAL_TEST.equals(toolName)) {
-            RealHwTest.main(new String[0]);
+            // passing port argument if it was specified
+            String[] toolArgs = args.length == 1 ? new String[0] : new String[]{args[1]};
+            RealHwTest.main(toolArgs);
             return;
         }