diff --git a/Tools/autotest/apmrover2.py b/Tools/autotest/apmrover2.py
index de50939988..a95ae4bbfe 100644
--- a/Tools/autotest/apmrover2.py
+++ b/Tools/autotest/apmrover2.py
@@ -83,7 +83,7 @@ def drive_APMrover2(viewerip=None, map=False):
     if map:
         options += ' --map'
 
-    sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_rover.py') + ' --rate=200 --speedup=100 --home=%f,%f,%u,%u' % (
+    sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_wrapper.py') + ' --frame=rover --rate=200 --speedup=100 --home=%f,%f,%u,%u' % (
         HOME.lat, HOME.lng, HOME.alt, HOME.heading)
 
     sil = util.start_SIL('APMrover2', wipe=True)
@@ -111,7 +111,7 @@ def drive_APMrover2(viewerip=None, map=False):
     logfile = mavproxy.match.group(1)
     print("LOGFILE %s" % logfile)
 
-    sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_rover.py') + ' --rate=200 --speedup=100 --home=%f,%f,%u,%u' % (
+    sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_wrapper.py') + ' --frame=rover --rate=200 --speedup=100 --home=%f,%f,%u,%u' % (
         HOME.lat, HOME.lng, HOME.alt, HOME.heading)
 
     runsim = pexpect.spawn(sim_cmd, logfile=sys.stdout, timeout=10)
diff --git a/Tools/autotest/autotest.py b/Tools/autotest/autotest.py
index cac0c11c90..5b14135d98 100755
--- a/Tools/autotest/autotest.py
+++ b/Tools/autotest/autotest.py
@@ -19,7 +19,7 @@ def get_default_params(atype):
     # use rover simulator so SITL is not starved of input
     from pymavlink import mavutil
     HOME=mavutil.location(40.071374969556928,-105.22978898137808,1583.702759,246)
-    sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_rover.py') + ' --rate=200 --speedup=100 --home=%f,%f,%u,%u' % (
+    sim_cmd = util.reltopdir('Tools/autotest/pysim/sim_wrapper.py') + ' --frame=rover --rate=200 --speedup=100 --home=%f,%f,%u,%u' % (
         HOME.lat, HOME.lng, HOME.alt, HOME.heading)
 
     runsim = pexpect.spawn(sim_cmd, logfile=sys.stdout, timeout=10)
diff --git a/Tools/autotest/sim_vehicle.sh b/Tools/autotest/sim_vehicle.sh
index 5f871d934e..d8261d3a31 100755
--- a/Tools/autotest/sim_vehicle.sh
+++ b/Tools/autotest/sim_vehicle.sh
@@ -150,7 +150,6 @@ kill_tasks()
         killall -q JSBSim lt-JSBSim ArduPlane.elf ArduCopter.elf APMrover2.elf AntennaTracker.elf
         pkill -f runsim.py
         pkill -f sim_tracker.py
-        pkill -f sim_rover.py
         pkill -f sim_wrapper.py
     }
 }