diff --git a/tools/src/main/java/com/google/bitcoin/tools/WalletTool.java b/tools/src/main/java/com/google/bitcoin/tools/WalletTool.java
index 130af465..ad10471d 100644
--- a/tools/src/main/java/com/google/bitcoin/tools/WalletTool.java
+++ b/tools/src/main/java/com/google/bitcoin/tools/WalletTool.java
@@ -539,7 +539,7 @@ public class WalletTool {
             reset();
         }
         if (mode == ValidationMode.SPV) {
-            store = new BoundedOverheadBlockStore(params, chainFileName);
+            store = new SPVBlockStore(params, chainFileName);
             chain = new BlockChain(params, wallet, store);
         } else if (mode == ValidationMode.FULL) {
             FullPrunedBlockStore s = new H2FullPrunedBlockStore(params, chainFileName.getAbsolutePath(), 5000);