diff --git a/zebra-state/src/service/finalized_state/disk_format/tests/prop.rs b/zebra-state/src/service/finalized_state/disk_format/tests/prop.rs
index 658b174d..cd3c6cf2 100644
--- a/zebra-state/src/service/finalized_state/disk_format/tests/prop.rs
+++ b/zebra-state/src/service/finalized_state/disk_format/tests/prop.rs
@@ -376,7 +376,7 @@ fn roundtrip_sapling_subtree_data() {
     let _init_guard = zebra_test::init();
 
     proptest!(|(mut val in any::<NoteCommitmentSubtreeData<sapling::tree::Node>>())| {
-        val.end = val.end.clamp(Height(0), MAX_ON_DISK_HEIGHT);
+        val.end.0 %= MAX_ON_DISK_HEIGHT.0 + 1;
         assert_value_properties(val)
     });
 }
@@ -462,6 +462,7 @@ fn roundtrip_orchard_subtree_data() {
 
     proptest!(|(mut val in any::<NoteCommitmentSubtreeData<orchard::tree::Node>>())| {
         val.end = val.end.clamp(Height(0), MAX_ON_DISK_HEIGHT);
+        val.end.0 %= MAX_ON_DISK_HEIGHT.0 + 1;
         assert_value_properties(val)
     });
 }