diff --git a/libraries/AC_AutoTune/AC_AutoTune_Multi.cpp b/libraries/AC_AutoTune/AC_AutoTune_Multi.cpp
index f6984a541f7b44..e7ae039d2d0e2d 100644
--- a/libraries/AC_AutoTune/AC_AutoTune_Multi.cpp
+++ b/libraries/AC_AutoTune/AC_AutoTune_Multi.cpp
@@ -498,7 +498,7 @@ void AC_AutoTune_Multi::report_axis_gains(const char* axis_string, float rate_P,
 
 // twitching_test_rate - twitching tests
 // update min and max and test for end conditions
-void AC_AutoTune_Multi::twitching_test_rate(float rate, float rate_target_max, float &meas_rate_min, float &meas_rate_max)
+void AC_AutoTune_Multi::twitching_test_rate(float angle, float rate, float rate_target_max, float &meas_rate_min, float &meas_rate_max, float &meas_angle_min)
 {
     const uint32_t now = AP_HAL::millis();
 
@@ -507,12 +507,14 @@ void AC_AutoTune_Multi::twitching_test_rate(float rate, float rate_target_max, f
         // the measurement is continuing to increase without stopping
         meas_rate_max = rate;
         meas_rate_min = rate;
+        meas_angle_min = angle;
     }
 
     // capture minimum measurement after the measurement has peaked (aka "bounce back")
     if ((rate < meas_rate_min) && (meas_rate_max > rate_target_max * 0.25)) {
         // the measurement is bouncing back
         meas_rate_min = rate;
+        meas_angle_min = angle;
     }
 
     // calculate early stopping time based on the time it takes to get to 75%
@@ -540,14 +542,21 @@ void AC_AutoTune_Multi::twitching_test_rate(float rate, float rate_target_max, f
 
 // twitching_test_rate - twitching tests
 // update min and max and test for end conditions
-void AC_AutoTune_Multi::twitching_abort_rate(float angle, float rate, float angle_max, float meas_rate_min)
+void AC_AutoTune_Multi::twitching_abort_rate(float angle, float rate, float angle_max, float meas_rate_min, float angle_min)
 {
     const uint32_t now = AP_HAL::millis();
     if (angle >= angle_max) {
-        if (is_equal(rate, meas_rate_min) && step_scaler > 0.5f) {
+        if (is_equal(rate, meas_rate_min) || (angle_min > 0.95 * angle_max)) {
             // we have reached the angle limit before completing the measurement of maximum and minimum
             // reduce the maximum target rate
-            step_scaler *= 0.9f;
+            if (step_scaler > 0.25f) {
+                step_scaler *= 0.9f;
+            } else {
+                LOGGER_WRITE_EVENT(LogEvent::AUTOTUNE_REACHED_LIMIT);
+                gcs().send_text(MAV_SEVERITY_CRITICAL, "AutoTune: Reached minium step size limit");
+                mode = FAILED;
+                LOGGER_WRITE_EVENT(LogEvent::AUTOTUNE_FAILED);
+            }
             // ignore result and start test again
             step = WAITING_FOR_LEVEL;
             positive_direction = twitch_reverse_direction();
@@ -1235,14 +1244,14 @@ void AC_AutoTune_Multi::twitch_test_run(AxisType test_axis, const float dir_sign
     switch (tune_type) {
     case RD_UP:
     case RD_DOWN:
-        twitching_test_rate(rotation_rate, target_rate, test_rate_min, test_rate_max);
+        twitching_test_rate(lean_angle, rotation_rate, target_rate, test_rate_min, test_rate_max, test_angle_min);
         twitching_measure_acceleration(test_accel_max, rotation_rate, rate_max);
-        twitching_abort_rate(lean_angle, rotation_rate, abort_angle, test_rate_min);
+        twitching_abort_rate(lean_angle, rotation_rate, abort_angle, test_rate_min, test_angle_min);
         break;
     case RP_UP:
-        twitching_test_rate(rotation_rate, target_rate*(1+0.5f*aggressiveness), test_rate_min, test_rate_max);
+        twitching_test_rate(lean_angle, rotation_rate, target_rate*(1+0.5f*aggressiveness), test_rate_min, test_rate_max, test_angle_min);
         twitching_measure_acceleration(test_accel_max, rotation_rate, rate_max);
-        twitching_abort_rate(lean_angle, rotation_rate, abort_angle, test_rate_min);
+        twitching_abort_rate(lean_angle, rotation_rate, abort_angle, test_rate_min, test_angle_min);
         break;
     case SP_DOWN:
     case SP_UP:
diff --git a/libraries/AC_AutoTune/AC_AutoTune_Multi.h b/libraries/AC_AutoTune/AC_AutoTune_Multi.h
index ac2a0c6892a0e0..2d649397c63441 100644
--- a/libraries/AC_AutoTune/AC_AutoTune_Multi.h
+++ b/libraries/AC_AutoTune/AC_AutoTune_Multi.h
@@ -139,8 +139,8 @@ class AC_AutoTune_Multi : public AC_AutoTune
     void twitch_test_init();
     void twitch_test_run(AxisType test_axis, const float dir_sign);
 
-    void twitching_test_rate(float rate, float rate_target, float &meas_rate_min, float &meas_rate_max);
-    void twitching_abort_rate(float angle, float rate, float angle_max, float meas_rate_min);
+    void twitching_test_rate(float angle, float rate, float rate_target, float &meas_rate_min, float &meas_rate_max, float &meas_angle_min);
+    void twitching_abort_rate(float angle, float rate, float angle_max, float meas_rate_min, float angle_min);
     void twitching_test_angle(float angle, float rate, float angle_target, float &meas_angle_min, float &meas_angle_max, float &meas_rate_min, float &meas_rate_max);
 
     // measure acceleration during twitch test