diff --git a/java_console/build.xml b/java_console/build.xml
index 45113b8869..2706cb7eeb 100644
--- a/java_console/build.xml
+++ b/java_console/build.xml
@@ -86,11 +86,7 @@
         </javac>
     </target>
 
-    <target name="native_header">
-        <javah classpath="io/src/main/java" destdir="../unit_tests/native" class="com.rusefi.native_.EngineLogic"/>
-    </target>
-
-    <target name="test" depends="compile, copy_c_sources">
+   <target name="test" depends="compile, copy_c_sources">
         <junit fork="yes"
                maxmemory="512m"
                printsummary="yes"
@@ -121,7 +117,7 @@
         </copy>
     </target>
 
-    <target name="jar" depends="compile, native_header, copy_c_sources">
+    <target name="jar" depends="compile, copy_c_sources">
         <mkdir dir="build/jar"/>
         <delete file="${jar_file}"/>
         <echo message="Building ${jar_file}"/>
diff --git a/java_console/io/build.gradle b/java_console/io/build.gradle
index 729bd59174..1dc3da1bab 100644
--- a/java_console/io/build.gradle
+++ b/java_console/io/build.gradle
@@ -31,4 +31,15 @@ dependencies {
     testFixturesImplementation global_libs.mockito
     testFixturesApi global_libs.annotations
     testFixturesApi global_libs.junit
+}
+
+compileJava {
+    doLast {
+        // gradle java plugin always generates JNI headers
+        copy {
+            from 'build/generated/sources/headers/java/main'
+            into "../../unit_tests/native"
+            include 'com*.h'
+        }
+    }
 }
\ No newline at end of file