diff --git a/Tools/autotest/pysim/vehicleinfo.py b/Tools/autotest/pysim/vehicleinfo.py
index 21c786eb2f..925fa89512 100644
--- a/Tools/autotest/pysim/vehicleinfo.py
+++ b/Tools/autotest/pysim/vehicleinfo.py
@@ -123,6 +123,11 @@ class VehicleInfo(object):
                 "default_params_filename": ["default_params/copter-single.parm",
                                             "default_params/copter-coax.parm"],
             },
+            "scrimmage-copter" : {
+                "make_target": "sitl",
+                "waf_target": "bin/arducopter",
+                "default_params_filename": "default_params/copter.parm",
+            },
             "calibration": {
                 "extra_mavlink_cmds": "module load sitl_calibration;",
             },
@@ -203,6 +208,11 @@ class VehicleInfo(object):
                 "waf_target": "bin/arduplane",
                 "default_params_filename": "default_params/plane-jsbsim.parm",
             },
+            "scrimmage-plane" : {
+                "make_target": "sitl",
+                "waf_target": "bin/arduplane",
+                "default_params_filename": "default_params/plane.parm",
+            },
             "calibration": {
                 "extra_mavlink_cmds": "module load sitl_calibration;",
             },
diff --git a/Tools/autotest/sim_vehicle.py b/Tools/autotest/sim_vehicle.py
index cc4841b75f..df4baebfa3 100755
--- a/Tools/autotest/sim_vehicle.py
+++ b/Tools/autotest/sim_vehicle.py
@@ -231,6 +231,7 @@ def kill_tasks():
             'MAVProxy.exe',
             'runsim.py',
             'AntennaTracker.elf',
+            'scrimmage'
         }
         for vehicle in vinfo.options:
             for frame in vinfo.options[vehicle]["frames"]: