diff --git a/bin/tests/system/ede24/ns1/foo.fr.db b/bin/tests/system/ede24/ns1/foo.fr.db
index f3937c043c..262895e1a9 100644
--- a/bin/tests/system/ede24/ns1/foo.fr.db
+++ b/bin/tests/system/ede24/ns1/foo.fr.db
@@ -14,7 +14,7 @@ foo.fr. IN SOA	ns.foo.fr. op.foo.fr. (
 				3       ; serial
 				1       ; refresh
 				1       ; retry
-				1       ; expire
+				3       ; expire
 				60      ; minimum
 				)
 foo.fr.		NS	ns.foo.fr.
diff --git a/bin/tests/system/ede24/tests_ede24.py b/bin/tests/system/ede24/tests_ede24.py
index 7c5771715e..a492ff7457 100644
--- a/bin/tests/system/ede24/tests_ede24.py
+++ b/bin/tests/system/ede24/tests_ede24.py
@@ -34,7 +34,10 @@ def check_soa_servfail_ede24(edemsg):
 
 
 def test_ede24_noloaded(ns1, ns2):
-    # Sanity check that everything works first
+    # Sanity check that everything works first, once we're sure the foo.fr zone
+    # has transfered to ns2.
+    with ns2.watch_log_from_start() as watcher:
+        watcher.wait_for_line("Transfer status: success")
     check_soa_noerror()
 
     # Stop all servers, and we'll restart only ns2.
@@ -59,7 +62,11 @@ def test_ede24_expired(ns1, ns2):
     # Stop the primary and wait for expiration of the zone in the secondary.
     with ns2.watch_log_from_here() as watcher:
         ns1.stop()
-        watcher.wait_for_line(" zone foo.fr/IN: expired")
+        log_sequence = [
+            " zone foo.fr/IN: expired",
+            " zone foo.fr/IN: stop zone timer",
+        ]
+        watcher.wait_for_sequence(log_sequence)
 
     # ns2 can't answer anymore.
     check_soa_servfail_ede24("zone expired")