diff --git a/contrib/testing/smtp-required-tls-check.py b/contrib/testing/smtp-required-tls-check.py
index 00e28b5..0e878be 100755
--- a/contrib/testing/smtp-required-tls-check.py
+++ b/contrib/testing/smtp-required-tls-check.py
@@ -464,11 +464,7 @@ def validate_per_message_requiretls() -> None:
         marker(tls_only, "message"),
         marker(plain, "message"),
     }
-    all_tokens = {
-        marker(route, "message")
-        for route in routes
-    }
-    queued = wait_for_queued_token_ids(all_tokens)
+    queued = wait_for_queued_token_ids(expected_queued)
     for queue_id in queued.values():
         SMTP07.queue("retry", queue_id)
     wait_until(