diff --git a/Tools/autotest/sim_vehicle.sh b/Tools/autotest/sim_vehicle.sh
index f0a1de0d26..ca067e88d9 100755
--- a/Tools/autotest/sim_vehicle.sh
+++ b/Tools/autotest/sim_vehicle.sh
@@ -248,9 +248,9 @@ case $FRAME in
 	BUILD_TARGET="sitl-octa"
         MODEL="$FRAME"
 	;;
-    heli)
+    heli*)
 	BUILD_TARGET="sitl-heli"
-        MODEL="heli"
+        MODEL="$FRAME"
 	;;
     heli-dual)
   BUILD_TARGET="sitl-heli-dual"