diff --git a/core/src/test/java/org/bitcoinj/wallet/WalletTest.java b/core/src/test/java/org/bitcoinj/wallet/WalletTest.java
index 8ace07f7..7003fc77 100644
--- a/core/src/test/java/org/bitcoinj/wallet/WalletTest.java
+++ b/core/src/test/java/org/bitcoinj/wallet/WalletTest.java
@@ -2024,8 +2024,10 @@ public class WalletTest extends TestWithWallet {
         try {
             encryptedWallet.decrypt(wrongAesKey);
             fail("Incorrectly decoded wallet with wrong password");
-        } catch (KeyCrypterException ede) {
-            // Expected.
+        } catch (KeyCrypterException.InvalidCipherText e) {
+            // Expected, either this...
+        } catch (KeyCrypterException.PublicPrivateMismatch e) {
+            // ...or this.
         }
     }