diff --git a/psbt/tests/all.base64.psbt b/psbt/tests/all.base64.psbt
new file mode 100644
index 0000000..741db48
--- /dev/null
+++ b/psbt/tests/all.base64.psbt
@@ -0,0 +1 @@
+cHNidP8BAFICAAAAAZ38ZijCbFiZ/hvT3DOGZb/VXXraEPYiCXPfLTht7BJ2AQAAAAD/////AfA9zR0AAAAAFgAUezoAv9wU0neVwrdJAdCdpu8TNXkAAAAATwEENYfPAto/0AiAAAAAlwSLGtBEWx7IJ1UXcnyHtOTrwYogP/oPlMAVZr046QADUbdDiH7h1A3DKmBDck8tZFmztaTXPa7I+64EcvO8Q+IM2QxqT64AAIAAAACATwEENYfPAto/0AiAAAABuQRSQnE5zXjCz/JES+NTzVhgXj5RMoXlKLQH+uP2FzUD0wpel8itvFV9rCrZp+OcFyLrrGnmaLbyZnzB1nHIPKsM2QxqT64AAIABAACAAAEBKwBlzR0AAAAAIgAgLFSGEmxJeAeagU4TcV1l82RZ5NbMre0mbQUIZFuvpjIBBUdSIQKdoSzbWyNWkrkVNq/v5ckcOrlHPY5DtTODarRWKZyIcSEDNys0I07Xz5wf6l0F1EFVeSe+lUKxYusC4ass6AIkwAtSriIGAp2hLNtbI1aSuRU2r+/lyRw6uUc9jkO1M4NqtFYpnIhxENkMak+uAACAAAAAgAAAAAAiBgM3KzQjTtfPnB/qXQXUQVV5J76VQrFi6wLhqyzoAiTACxDZDGpPrgAAgAEAAIAAAAAAACICA57/H1R6HV+S36K6evaslxpL0DukpzSwMVaiVritOh75EO3kXMUAAACAAAAAgAEAAIAA
diff --git a/psbt/tests/bip174.rs b/psbt/tests/bip174.rs
index bf03fc5..ef87353 100644
--- a/psbt/tests/bip174.rs
+++ b/psbt/tests/bip174.rs
@@ -25,9 +25,22 @@ use std::str::FromStr;
 use psbt::Psbt;
 
 #[test]
-fn p2pkh_0() {
-    const PSBT: &str = include_str!("p2pkh_0.base64.psbt");
+fn pkh_0() {
+    const PSBT: &str = include_str!("pkh_0.base64.psbt");
     let psbt = Psbt::from_str(PSBT).unwrap();
-    let psbt2 = Psbt::from_str(&psbt.to_string()).unwrap();
-    assert_eq!(psbt, psbt2);
+    Psbt::from_str(&psbt.to_string()).unwrap();
+}
+
+#[test]
+fn pkh_shWpkh_0() {
+    const PSBT: &str = include_str!("pkh+shWpkh_0.base64.psbt");
+    let psbt = Psbt::from_str(PSBT).unwrap();
+    Psbt::from_str(&psbt.to_string()).unwrap();
+}
+
+#[test]
+fn all() {
+    const PSBT: &str = include_str!("all.base64.psbt");
+    let psbt = Psbt::from_str(PSBT).unwrap();
+    Psbt::from_str(&psbt.to_string()).unwrap();
 }
diff --git a/psbt/tests/pkh+shWpkh_0.base64.psbt b/psbt/tests/pkh+shWpkh_0.base64.psbt
new file mode 100644
index 0000000..04de9f9
--- /dev/null
+++ b/psbt/tests/pkh+shWpkh_0.base64.psbt
@@ -0,0 +1 @@
+cHNidP8BAKACAAAAAqsJSaCMWvfEm4IS9Bfi8Vqz9cM9zxU4IagTn4d6W3vkAAAAAAD+////qwlJoIxa98SbghL0F+LxWrP1wz3PFTghqBOfh3pbe+QBAAAAAP7///8CYDvqCwAAAAAZdqkUdopAu9dAy+gdmI5x3ipNXHE5ax2IrI4kAAAAAAAAGXapFG9GILVT+glechue4O/p+gOcykWXiKwAAAAAAAEHakcwRAIgR1lmF5fAGwNrJZKJSGhiGDR9iYZLcZ4ff89X0eURZYcCIFMJ6r9Wqk2Ikf/REf3xM286KdqGbX+EhtdVRs7tr5MZASEDXNxh/HupccC1AaZGoqg7ECy0OIEhfKaC3Ibi1z+ogpIAAQEgAOH1BQAAAAAXqRQ1RebjO4MsRwUPJNPuuTycA5SLx4cBBBYAFIXRNTfy4mVAWjTbr6nj3aAfuCMIAAAA
diff --git a/psbt/tests/p2pkh_0.base64.psbt b/psbt/tests/pkh_0.base64.psbt
similarity index 100%
rename from psbt/tests/p2pkh_0.base64.psbt
rename to psbt/tests/pkh_0.base64.psbt