diff --git a/java_console/autotest/src/com/rusefi/AutoTest.java b/java_console/autotest/src/com/rusefi/AutoTest.java
index ca12fbe083..2145f6cf7b 100644
--- a/java_console/autotest/src/com/rusefi/AutoTest.java
+++ b/java_console/autotest/src/com/rusefi/AutoTest.java
@@ -31,8 +31,6 @@ public class AutoTest {
 
     private static void testCitroenBerlingo() {
         setEngineType(15);
-        // time to change engine type
-        nextChart();
         String msg = "Citroen";
         // todo: add more content
     }
@@ -45,11 +43,9 @@ public class AutoTest {
 
     private static void testMazda626() {
         setEngineType(28);
-        WaveChart chart;
-        // time to change engine type
-        nextChart();
         String msg = "mazda 626 default cranking";
         IoUtil.changeRpm(200);
+        WaveChart chart;
         chart = nextChart();
 
         double x = 275;
@@ -59,11 +55,8 @@ public class AutoTest {
     private static void test2003DodgeNeon() {
         setEngineType(23);
         WaveChart chart;
-        // time to change engine type
-        nextChart();
         String msg = "2003 Neon cranking ";
         IoUtil.changeRpm(200);
-        nextChart();
 
         chart = nextChart();
         double x = 100;
@@ -99,7 +92,6 @@ public class AutoTest {
     private static void testMazdaProtege() {
         setEngineType(14);
         WaveChart chart;
-        nextChart(); // a bit of extra time to change engine type
         IoUtil.changeRpm(200);
         String msg = "ProtegeLX cranking";
         chart = nextChart();
diff --git a/java_console/autotest/src/com/rusefi/IoUtil.java b/java_console/autotest/src/com/rusefi/IoUtil.java
index 6337fc240d..2fe64a7337 100644
--- a/java_console/autotest/src/com/rusefi/IoUtil.java
+++ b/java_console/autotest/src/com/rusefi/IoUtil.java
@@ -64,7 +64,6 @@ public class IoUtil {
         // we need to skip TWO because spark could have been scheduled a while ago and happen now
         // todo: improve this logic, compare times
         getWaveChart();
-        getWaveChart();
         // we want to wait for the 2nd chart to see same same RPM across the whole chart
         String result = getWaveChart();
         FileLog.MAIN.logLine("current chart: " + result);
@@ -129,6 +128,7 @@ public class IoUtil {
 
         if (!isCloseEnough(rpm, actualRpm))
             throw new IllegalStateException("rpm change did not happen: " + rpm + ", actual " + actualRpm);
+        sendCommand("reset_wave_chart");
     }
 
     static void waitForFirstResponse() throws InterruptedException {