diff --git a/examples/suit_update/tests/01-run.py b/examples/suit_update/tests/01-run.py
index d10f300ac0..b16e1cb846 100755
--- a/examples/suit_update/tests/01-run.py
+++ b/examples/suit_update/tests/01-run.py
@@ -68,8 +68,7 @@ def publish(server_dir, server_url, app_ver, keys='default', latest_name=None):
 
 def wait_for_update(child):
     return child.expect([r"Fetching firmware \|[█ ]+\|\s+\d+\%",
-                         "riotboot_flashwrite: riotboot flashing "
-                         "completed successfully"],
+                         "Finalizing payload store"],
                         timeout=UPDATING_TIMEOUT)
 
 
diff --git a/sys/suit/storage/flashwrite.c b/sys/suit/storage/flashwrite.c
index 40fff1055e..3a332337ee 100644
--- a/sys/suit/storage/flashwrite.c
+++ b/sys/suit/storage/flashwrite.c
@@ -174,7 +174,7 @@ static bool _flashwrite_match_offset(const suit_storage_t *storage,
     (void)storage;
 
     int target_slot = riotboot_slot_other();
-    uintptr_t slot_start = (intptr_t)riotboot_slot_get_hdr(target_slot);
+    uintptr_t slot_start = (uintptr_t)riotboot_slot_offset(target_slot);
 
     return (slot_start == (uintptr_t)offset);
 }