diff --git a/tests/testlatency/testlatency.py b/tests/testlatency/testlatency.py
index ad3d58b..72113bf 100644
--- a/tests/testlatency/testlatency.py
+++ b/tests/testlatency/testlatency.py
@@ -47,6 +47,12 @@ def main():
         default=0,
         help="Segment duration in milliseconds. Default is leave to lldash-srd-packager.",
     )
+    parser.add_argument(
+        "--timeshift_buffer_ms",
+        type=int,
+        default=0,
+        help="Time shift buffer in milliseconds. Default is 0 (=infinite: segments won't be deleted).",
+    )
     parser.add_argument(
         "--server_host",
         type=str,
diff --git a/tests/testlatency/testlatency_sender.py b/tests/testlatency/testlatency_sender.py
index e7f1c69..1f4535d 100644
--- a/tests/testlatency/testlatency_sender.py
+++ b/tests/testlatency/testlatency_sender.py
@@ -30,7 +30,7 @@ def init(self):
         nodrop = True
         if self.args.debug:
             print(f"testlatency: sender: creating cwipc_sink_lldpkg({url}, ...)", file=sys.stderr)
-        self.sender = cwipc.net.sink_lldpkg.cwipc_sink_lldpkg(url, self.args.debug, nodrop, seg_dur_in_ms=self.args.seg_dur)
+        self.sender = cwipc.net.sink_lldpkg.cwipc_sink_lldpkg(url, self.args.debug, nodrop, seg_dur_in_ms=self.args.seg_dur, timeshift_buffer_depth_in_ms=self.args.timeshift_buffer_ms)
         if self.args.debug:
             print(f"testlatency: sender: created cwipc_sink_lldpkg({url}, ...)", file=sys.stderr)
         if self.args.uncompressed:
diff --git a/tests/testlatency/testlatency_sender_external.py b/tests/testlatency/testlatency_sender_external.py
index 86f7b51..86e7d4a 100644
--- a/tests/testlatency/testlatency_sender_external.py
+++ b/tests/testlatency/testlatency_sender_external.py
@@ -23,6 +23,8 @@ def run(self):
         ]
         if self.args.seg_dur > 0:
             cmd_line += ["--seg_dur", str(self.args.seg_dur)]
+        if self.args.timeshift_buffer_ms > 0:
+            cmd_line += ["--timeshift_buffer_ms", str(self.args.timeshift_buffer_ms)]
         result = subprocess.run(
             cmd_line,
             check=True