diff --git a/src/_zkapauthorizer/tests/test_storage_server.py b/src/_zkapauthorizer/tests/test_storage_server.py
index 163c1b8d66cbe998c5657ae15402b19c98845562..7f3c22864425727ef5e4ccced3ce3a51a3b0df4a 100644
--- a/src/_zkapauthorizer/tests/test_storage_server.py
+++ b/src/_zkapauthorizer/tests/test_storage_server.py
@@ -408,12 +408,11 @@ class PassValidationTests(TestCase):
             )
         except MorePassesRequired as e:
             self.assertThat(
-                e.valid_count,
-                Equals(len(passes)),
-            )
-            self.assertThat(
-                e.required_count,
-                Equals(required_count),
+                e,
+                MatchesStructure(
+                    valid_count=Equals(len(passes)),
+                    required_count=Equals(required_count),
+                ),
             )
         else:
             self.fail("Expected MorePassesRequired, got {}".format(result))