diff --git a/ArduCopter/motor_test.cpp b/ArduCopter/motor_test.cpp
index 19207c253e2..b16a8cdadab 100644
--- a/ArduCopter/motor_test.cpp
+++ b/ArduCopter/motor_test.cpp
@@ -124,18 +124,6 @@ bool Copter::mavlink_motor_control_check(const GCS_MAVLINK &gcs_chan, bool check
         return false;
     }
 
-    // check if safety switch has been pushed
-    if (hal.util->safety_switch_state() == AP_HAL::Util::SAFETY_DISARMED) {
-        gcs_chan.send_text(MAV_SEVERITY_CRITICAL,"%s: Safety switch", mode);
-        return false;
-    }
-
-    // check E-Stop is not active
-    if (SRV_Channels::get_emergency_stop()) {
-        gcs_chan.send_text(MAV_SEVERITY_CRITICAL,"%s: Motor Emergency Stopped", mode);
-        return false;
-    }
-
     // if we got this far the check was successful and the motor test can continue
     return true;
 }