diff --git a/src/wallet/ismine.h b/src/wallet/ismine.h
--- a/src/wallet/ismine.h
+++ b/src/wallet/ismine.h
@@ -11,7 +11,7 @@
 #include <bitset>
 #include <cstdint>
 
-class CKeyStore;
+class CWallet;
 class CScript;
 
 /** IsMine() return codes */
@@ -26,8 +26,8 @@
 /** used for bitflags of isminetype */
 typedef uint8_t isminefilter;
 
-isminetype IsMine(const CKeyStore &keystore, const CScript &scriptPubKey);
-isminetype IsMine(const CKeyStore &keystore, const CTxDestination &dest);
+isminetype IsMine(const CWallet &wallet, const CScript &scriptPubKey);
+isminetype IsMine(const CWallet &wallet, const CTxDestination &dest);
 
 /**
  * Cachable amount subdivided into watchonly and spendable parts.
diff --git a/src/wallet/ismine.cpp b/src/wallet/ismine.cpp
--- a/src/wallet/ismine.cpp
+++ b/src/wallet/ismine.cpp
@@ -6,10 +6,9 @@
 #include <wallet/ismine.h>
 
 #include <key.h>
-#include <keystore.h>
 #include <script/script.h>
 #include <script/sign.h>
-#include <script/standard.h>
+#include <wallet/wallet.h>
 
 typedef std::vector<uint8_t> valtype;
 
@@ -38,7 +37,7 @@
     INVALID = 3,    //! Not spendable by anyone (P2SH inside P2SH)
 };
 
-bool HaveKeys(const std::vector<valtype> &pubkeys, const CKeyStore &keystore) {
+bool HaveKeys(const std::vector<valtype> &pubkeys, const CWallet &keystore) {
     for (const valtype &pubkey : pubkeys) {
         CKeyID keyID = CPubKey(pubkey).GetID();
         if (!keystore.HaveKey(keyID)) {
@@ -48,7 +47,7 @@
     return true;
 }
 
-IsMineResult IsMineInner(const CKeyStore &keystore, const CScript &scriptPubKey,
+IsMineResult IsMineInner(const CWallet &keystore, const CScript &scriptPubKey,
                          IsMineSigVersion sigversion) {
     IsMineResult ret = IsMineResult::NO;
 
@@ -115,7 +114,7 @@
 
 } // namespace
 
-isminetype IsMine(const CKeyStore &keystore, const CScript &scriptPubKey) {
+isminetype IsMine(const CWallet &keystore, const CScript &scriptPubKey) {
     switch (IsMineInner(keystore, scriptPubKey, IsMineSigVersion::TOP)) {
         case IsMineResult::INVALID:
         case IsMineResult::NO:
@@ -128,7 +127,7 @@
     assert(false);
 }
 
-isminetype IsMine(const CKeyStore &keystore, const CTxDestination &dest) {
+isminetype IsMine(const CWallet &keystore, const CTxDestination &dest) {
     CScript script = GetScriptForDestination(dest);
     return IsMine(keystore, script);
 }
diff --git a/src/wallet/test/ismine_tests.cpp b/src/wallet/test/ismine_tests.cpp
--- a/src/wallet/test/ismine_tests.cpp
+++ b/src/wallet/test/ismine_tests.cpp
@@ -2,12 +2,13 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <chainparams.h>
 #include <key.h>
-#include <keystore.h>
 #include <script/script.h>
 #include <script/script_error.h>
 #include <script/standard.h>
 #include <wallet/ismine.h>
+#include <wallet/wallet.h>
 
 #include <test/util/setup_common.h>
 
@@ -26,13 +27,16 @@
     CKey uncompressedKey;
     uncompressedKey.MakeNewKey(false);
     CPubKey uncompressedPubkey = uncompressedKey.GetPubKey();
+    std::unique_ptr<interfaces::Chain> chain = interfaces::MakeChain();
 
     CScript scriptPubKey;
     isminetype result;
 
     // P2PK compressed
     {
-        CBasicKeyStore keystore;
+        CWallet keystore(Params(), chain.get(), WalletLocation(),
+                         WalletDatabase::CreateDummy());
+        LOCK(keystore.cs_wallet);
         scriptPubKey = GetScriptForRawPubKey(pubkeys[0]);
 
         // Keystore does not have key
@@ -47,7 +51,9 @@
 
     // P2PK uncompressed
     {
-        CBasicKeyStore keystore;
+        CWallet keystore(Params(), chain.get(), WalletLocation(),
+                         WalletDatabase::CreateDummy());
+        LOCK(keystore.cs_wallet);
         scriptPubKey = GetScriptForRawPubKey(uncompressedPubkey);
 
         // Keystore does not have key
@@ -62,7 +68,9 @@
 
     // P2PKH compressed
     {
-        CBasicKeyStore keystore;
+        CWallet keystore(Params(), chain.get(), WalletLocation(),
+                         WalletDatabase::CreateDummy());
+        LOCK(keystore.cs_wallet);
         scriptPubKey = GetScriptForDestination(PKHash(pubkeys[0]));
 
         // Keystore does not have key
@@ -77,7 +85,9 @@
 
     // P2PKH uncompressed
     {
-        CBasicKeyStore keystore;
+        CWallet keystore(Params(), chain.get(), WalletLocation(),
+                         WalletDatabase::CreateDummy());
+        LOCK(keystore.cs_wallet);
         scriptPubKey = GetScriptForDestination(PKHash(uncompressedPubkey));
 
         // Keystore does not have key
@@ -92,7 +102,9 @@
 
     // P2SH
     {
-        CBasicKeyStore keystore;
+        CWallet keystore(Params(), chain.get(), WalletLocation(),
+                         WalletDatabase::CreateDummy());
+        LOCK(keystore.cs_wallet);
 
         CScript redeemScript = GetScriptForDestination(PKHash(pubkeys[0]));
         scriptPubKey = GetScriptForDestination(ScriptHash(redeemScript));
@@ -114,7 +126,9 @@
 
     // (P2PKH inside) P2SH inside P2SH (invalid)
     {
-        CBasicKeyStore keystore;
+        CWallet keystore(Params(), chain.get(), WalletLocation(),
+                         WalletDatabase::CreateDummy());
+        LOCK(keystore.cs_wallet);
 
         CScript redeemscript_inner =
             GetScriptForDestination(PKHash(pubkeys[0]));
@@ -122,17 +136,20 @@
             GetScriptForDestination(ScriptHash(redeemscript_inner));
         scriptPubKey = GetScriptForDestination(ScriptHash(redeemscript));
 
-        keystore.AddCScript(redeemscript);
-        keystore.AddCScript(redeemscript_inner);
-        keystore.AddCScript(scriptPubKey);
-        keystore.AddKey(keys[0]);
+        BOOST_CHECK(keystore.AddCScript(redeemscript));
+        BOOST_CHECK(keystore.AddCScript(redeemscript_inner));
+        BOOST_CHECK(keystore.AddCScript(scriptPubKey));
+        BOOST_CHECK(keystore.AddKey(keys[0]));
+
         result = IsMine(keystore, scriptPubKey);
         BOOST_CHECK_EQUAL(result, ISMINE_NO);
     }
 
     // scriptPubKey multisig
     {
-        CBasicKeyStore keystore;
+        CWallet keystore(Params(), chain.get(), WalletLocation(),
+                         WalletDatabase::CreateDummy());
+        LOCK(keystore.cs_wallet);
 
         scriptPubKey =
             GetScriptForMultisig(2, {uncompressedPubkey, pubkeys[1]});
@@ -162,9 +179,11 @@
 
     // P2SH multisig
     {
-        CBasicKeyStore keystore;
-        keystore.AddKey(uncompressedKey);
-        keystore.AddKey(keys[1]);
+        CWallet keystore(Params(), chain.get(), WalletLocation(),
+                         WalletDatabase::CreateDummy());
+        LOCK(keystore.cs_wallet);
+        BOOST_CHECK(keystore.AddKey(uncompressedKey));
+        BOOST_CHECK(keystore.AddKey(keys[1]));
 
         CScript redeemScript =
             GetScriptForMultisig(2, {uncompressedPubkey, pubkeys[1]});
@@ -175,15 +194,17 @@
         BOOST_CHECK_EQUAL(result, ISMINE_NO);
 
         // Keystore has redeemScript
-        keystore.AddCScript(redeemScript);
+        BOOST_CHECK(keystore.AddCScript(redeemScript));
         result = IsMine(keystore, scriptPubKey);
         BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
     }
 
     // OP_RETURN
     {
-        CBasicKeyStore keystore;
-        keystore.AddKey(keys[0]);
+        CWallet keystore(Params(), chain.get(), WalletLocation(),
+                         WalletDatabase::CreateDummy());
+        LOCK(keystore.cs_wallet);
+        BOOST_CHECK(keystore.AddKey(keys[0]));
 
         scriptPubKey.clear();
         scriptPubKey << OP_RETURN << ToByteVector(pubkeys[0]);
@@ -194,8 +215,10 @@
 
     // Nonstandard
     {
-        CBasicKeyStore keystore;
-        keystore.AddKey(keys[0]);
+        CWallet keystore(Params(), chain.get(), WalletLocation(),
+                         WalletDatabase::CreateDummy());
+        LOCK(keystore.cs_wallet);
+        BOOST_CHECK(keystore.AddKey(keys[0]));
 
         scriptPubKey.clear();
         scriptPubKey << OP_9 << OP_ADD << OP_11 << OP_EQUAL;
diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
--- a/test/lint/lint-circular-dependencies.sh
+++ b/test/lint/lint-circular-dependencies.sh
@@ -25,6 +25,7 @@
     "wallet/fees -> wallet/wallet -> wallet/fees"
     "wallet/rpcwallet -> wallet/wallet -> wallet/rpcwallet"
     "wallet/wallet -> wallet/walletdb -> wallet/wallet"
+    "wallet/ismine -> wallet/wallet -> wallet/ismine"
     "txmempool -> validation -> validationinterface -> txmempool"
     "avalanche -> validation -> avalanche"
     "chainparams -> protocol -> chainparams"