diff --git a/java_console/build.xml b/java_console/build.xml
index e0671254d6..88ff3c5d2a 100644
--- a/java_console/build.xml
+++ b/java_console/build.xml
@@ -48,6 +48,7 @@
             <src path="inifile/src"/>
             <src path="shared_ui/src"/>
             <src path="ui/src/main/java"/>
+            <src path="ui/src/test/java"/>
             <src path="romraider/src"/>
             <src path="opensr5/src"/>
             <src path="logging/src"/>
@@ -75,7 +76,7 @@
                 <fileset dir="autoupdate/src" includes="**/test/**/*Test.java"/>
                 <fileset dir="io/src" includes="**/test/**/*Test.java"/>
                 <fileset dir="models/src" includes="**/test/**/*Test.java"/>
-                <fileset dir="ui/src/main/java" includes="**/test/**/*Test.java"/>
+                <fileset dir="ui/src/test/java" includes="**/*Test.java"/>
                 <fileset dir="romraider/src" includes="**/test/**/*Test.java"/>
                 <fileset dir="opensr5/src" includes="**/test/**/*Test.java"/>
                 <fileset dir="logging/src" includes="**/test/**/*Test.java"/>
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/engine/test/UpDownSandbox.java b/java_console/ui/src/test/java/com/rusefi/ui/engine/test/UpDownSandbox.java
similarity index 100%
rename from java_console/ui/src/main/java/com/rusefi/ui/engine/test/UpDownSandbox.java
rename to java_console/ui/src/test/java/com/rusefi/ui/engine/test/UpDownSandbox.java
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/test/EngineSnifferPanelTest.java b/java_console/ui/src/test/java/com/rusefi/ui/test/EngineSnifferPanelTest.java
similarity index 100%
rename from java_console/ui/src/main/java/com/rusefi/ui/test/EngineSnifferPanelTest.java
rename to java_console/ui/src/test/java/com/rusefi/ui/test/EngineSnifferPanelTest.java
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/test/FlexibleControlsSandbox.java b/java_console/ui/src/test/java/com/rusefi/ui/test/FlexibleControlsSandbox.java
similarity index 100%
rename from java_console/ui/src/main/java/com/rusefi/ui/test/FlexibleControlsSandbox.java
rename to java_console/ui/src/test/java/com/rusefi/ui/test/FlexibleControlsSandbox.java
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/test/RpmModelTest.java b/java_console/ui/src/test/java/com/rusefi/ui/test/RpmModelTest.java
similarity index 100%
rename from java_console/ui/src/main/java/com/rusefi/ui/test/RpmModelTest.java
rename to java_console/ui/src/test/java/com/rusefi/ui/test/RpmModelTest.java
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/test/WavePanelSandbox.java b/java_console/ui/src/test/java/com/rusefi/ui/test/WavePanelSandbox.java
similarity index 100%
rename from java_console/ui/src/main/java/com/rusefi/ui/test/WavePanelSandbox.java
rename to java_console/ui/src/test/java/com/rusefi/ui/test/WavePanelSandbox.java
diff --git a/java_console/ui/ui.iml b/java_console/ui/ui.iml
index ee5ef7d9dd..80b21b382b 100644
--- a/java_console/ui/ui.iml
+++ b/java_console/ui/ui.iml
@@ -3,10 +3,12 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/resources/com/rusefi" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />