diff --git a/Tools/autotest/autotest.py b/Tools/autotest/autotest.py
index 45705124aa..7b9540308c 100755
--- a/Tools/autotest/autotest.py
+++ b/Tools/autotest/autotest.py
@@ -440,7 +440,7 @@ def run_step(step):
         vehicle_binary = 'sitl_periph_gps.bin/AP_Periph'
 
     if step == 'build.Replay':
-        return util.build_SITL('tools/Replay', clean=False, configure=False)
+        return util.build_replay(board='SITL')
 
     if vehicle_binary is not None:
         if len(vehicle_binary.split(".")) == 1:
diff --git a/Tools/autotest/pysim/util.py b/Tools/autotest/pysim/util.py
index ac7ee4cd83..0dab352665 100644
--- a/Tools/autotest/pysim/util.py
+++ b/Tools/autotest/pysim/util.py
@@ -150,6 +150,19 @@ def build_examples(board, j=None, debug=False, clean=False):
     run_cmd(cmd_make, directory=topdir(), checkfail=True, show=True)
     return True
 
+def build_replay(board, j=None, debug=False, clean=False):
+    # first configure
+    waf_configure(board, j=j, debug=debug)
+
+    # then clean
+    if clean:
+        waf_clean()
+
+    # then build
+    cmd_make = [relwaf(), "replay"]
+    run_cmd(cmd_make, directory=topdir(), checkfail=True, show=True)
+    return True
+
 def build_tests(board, j=None, debug=False, clean=False):
     # first configure
     waf_configure(board, j=j, debug=debug)