diff --git a/components/zcash_address/proptest-regressions/kind/unified/address.txt b/components/zcash_address/proptest-regressions/kind/unified/address.txt
new file mode 100644
index 000000000..cda1c138a
--- /dev/null
+++ b/components/zcash_address/proptest-regressions/kind/unified/address.txt
@@ -0,0 +1,7 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc fd6f22032b9add1319ad27b183de7d522bf9dfa0d6ef56354812bce5a803c11c # shrinks to network = Main, ua = Address([Orchard([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 101, 7, 48, 33, 241, 53, 105]), P2pkh([104, 47, 211, 146, 155, 136, 129, 215, 137, 152, 117, 157, 55, 4, 199, 123, 69, 12, 133, 89]), Sapling([164, 56, 210, 240, 243, 207, 59, 213, 35, 184, 250, 69, 206, 249, 184, 252, 184, 103, 227, 207, 249, 127, 133, 218, 97, 241, 242, 12, 155, 162, 137, 100, 200, 50, 96, 79, 33, 137, 242, 172, 43, 6, 255])])
diff --git a/components/zcash_address/src/kind/unified.rs b/components/zcash_address/src/kind/unified.rs
index 8e3a69190..c715bc1c7 100644
--- a/components/zcash_address/src/kind/unified.rs
+++ b/components/zcash_address/src/kind/unified.rs
@@ -186,7 +186,7 @@ pub(crate) mod private {
         }
 
         fn write_raw_encoding<W: Write>(&self, mut writer: W) {
-            for item in &self.items() {
+            for item in self.items_as_parsed() {
                 let data = item.data();
                 CompactSize::write(
                     &mut writer,
diff --git a/components/zcash_address/src/kind/unified/address.rs b/components/zcash_address/src/kind/unified/address.rs
index b3027e0df..80e9d131a 100644
--- a/components/zcash_address/src/kind/unified/address.rs
+++ b/components/zcash_address/src/kind/unified/address.rs
@@ -160,8 +160,10 @@ mod tests {
         fn arb_unified_address()(
             shielded in arb_shielded_receiver(),
             transparent in prop::option::of(arb_transparent_receiver()),
+        )(
+            shuffled in Just(shielded.into_iter().chain(transparent).collect()).prop_shuffle()
         ) -> Address {
-            Address(shielded.into_iter().chain(transparent).collect())
+            Address(shuffled)
         }
     }
 
@@ -173,7 +175,9 @@ mod tests {
         ) {
             let encoded = ua.encode(&network);
             let decoded = Address::decode(&encoded);
-            prop_assert_eq!(decoded, Ok((network, ua)));
+            prop_assert_eq!(&decoded, &Ok((network, ua)));
+            let reencoded = decoded.unwrap().1.encode(&network);
+            prop_assert_eq!(reencoded, encoded);
         }
     }