diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml
index fc3ded0877..d075a420bb 100644
--- a/.github/workflows/build-firmware.yaml
+++ b/.github/workflows/build-firmware.yaml
@@ -202,10 +202,12 @@ jobs:
 
           - build-target: f429-discovery
             folder: f429-discovery
+            skip-rate: 90
 
           - build-target: core8
             folder: core8
             ini-file: rusefi_core8.ini
+            skip-rate: 90
 
           - build-target: atlas
             folder: atlas
diff --git a/java_tools/configuration_definition/build.xml b/java_tools/configuration_definition/build.xml
index 7b857aaac2..8fde735ba4 100644
--- a/java_tools/configuration_definition/build.xml
+++ b/java_tools/configuration_definition/build.xml
@@ -53,6 +53,7 @@
             <classpath path="build/classes:lib/junit.jar:lib/annotations.jar:lib/snakeyaml.jar:lib/antlr-4.9.3-complete.jar"/>
             <batchtest todir="build">
                 <fileset dir="src/main/java" includes="**/test/**/*Test.java"/>
+                <fileset dir="src/test/java" includes="**/*Test.java"/>
                 <fileset dir="../enum_to_string/src/main/java" includes="**/test/**/*Test.java"/>
             </batchtest>
         </junit>
diff --git a/java_tools/configuration_definition/configuration_definition.iml b/java_tools/configuration_definition/configuration_definition.iml
index bebf62e35b..541a692568 100644
--- a/java_tools/configuration_definition/configuration_definition.iml
+++ b/java_tools/configuration_definition/configuration_definition.iml
@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/out" />
     </content>
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/test/BitParsingTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/BitParsingTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/test/BitParsingTest.java
rename to java_tools/configuration_definition/src/test/java/com/rusefi/test/BitParsingTest.java
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigDefinitionOutputTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigDefinitionOutputTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigDefinitionOutputTest.java
rename to java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigDefinitionOutputTest.java
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigDefinitionTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigDefinitionTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigDefinitionTest.java
rename to java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigDefinitionTest.java
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigFieldParserIssue1057Test.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserIssue1057Test.java
similarity index 100%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigFieldParserIssue1057Test.java
rename to java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserIssue1057Test.java
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigFieldParserTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigFieldParserTest.java
rename to java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/test/EnumAsTsVariable.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/EnumAsTsVariable.java
similarity index 100%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/test/EnumAsTsVariable.java
rename to java_tools/configuration_definition/src/test/java/com/rusefi/test/EnumAsTsVariable.java
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/test/FiringOrderTSLogicTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/FiringOrderTSLogicTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/test/FiringOrderTSLogicTest.java
rename to java_tools/configuration_definition/src/test/java/com/rusefi/test/FiringOrderTSLogicTest.java
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/test/OutputsTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/test/OutputsTest.java
rename to java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/test/TSProjectConsumerTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/TSProjectConsumerTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/test/TSProjectConsumerTest.java
rename to java_tools/configuration_definition/src/test/java/com/rusefi/test/TSProjectConsumerTest.java
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/test/TestJavaFieldsConsumer.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/TestJavaFieldsConsumer.java
similarity index 100%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/test/TestJavaFieldsConsumer.java
rename to java_tools/configuration_definition/src/test/java/com/rusefi/test/TestJavaFieldsConsumer.java
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/test/TestTSProjectConsumer.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/TestTSProjectConsumer.java
similarity index 100%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/test/TestTSProjectConsumer.java
rename to java_tools/configuration_definition/src/test/java/com/rusefi/test/TestTSProjectConsumer.java
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/test/VariableRegistryTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/VariableRegistryTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/test/VariableRegistryTest.java
rename to java_tools/configuration_definition/src/test/java/com/rusefi/test/VariableRegistryTest.java