diff --git a/src/wallet/test/walletdb_tests.cpp b/src/wallet/test/walletdb_tests.cpp
index afe62a5d9..7721e41f5 100644
--- a/src/wallet/test/walletdb_tests.cpp
+++ b/src/wallet/test/walletdb_tests.cpp
@@ -1,120 +1,137 @@
 // Copyright (c) 2017 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "test/test_bitcoin.h"
 
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h"
 
 #include <boost/test/unit_test.hpp>
 
-static std::unique_ptr<CWalletDB>
-TmpDB(const boost::filesystem::path &pathTemp) {
+namespace {
+struct WalletDBTestingSetup : public TestingSetup {
+    WalletDBTestingSetup(
+        const std::string &chainName = CBaseChainParams::MAIN) {
+        bitdb.MakeMock();
+    }
+
+    ~WalletDBTestingSetup() {
+        bitdb.Flush(true);
+        bitdb.Reset();
+    }
+};
+
+static std::unique_ptr<CWalletDB> TmpDB(const boost::filesystem::path &pathTemp,
+                                        const std::string &testname) {
+    boost::filesystem::path dir = pathTemp / testname;
+    BOOST_CHECK_MESSAGE(boost::filesystem::create_directory(dir),
+                        "Unable to create a directory for test " + testname);
     boost::filesystem::path path =
-        pathTemp /
-        strprintf("testwallet%i", static_cast<int>(GetRand(1000000)));
+        dir / strprintf("testwallet%i", static_cast<int>(GetRand(1000000)));
     return std::unique_ptr<CWalletDB>(new CWalletDB(path.string(), "cr+"));
 }
 
 static std::unique_ptr<CWallet> LoadWallet(CWalletDB *db) {
     std::unique_ptr<CWallet> wallet(new CWallet);
     DBErrors res = db->LoadWallet(wallet.get());
     BOOST_CHECK(res == DB_LOAD_OK);
-    return std::move(wallet);
+    return wallet;
+}
 }
 
-BOOST_FIXTURE_TEST_SUITE(walletdb_tests, TestingSetup);
+BOOST_FIXTURE_TEST_SUITE(walletdb_tests, WalletDBTestingSetup);
 
 BOOST_AUTO_TEST_CASE(write_erase_name) {
+    auto walletdb = TmpDB(pathTemp, "write_erase_name");
 
-    auto walletdb = TmpDB(pathTemp);
     CTxDestination dst1 = CKeyID(uint160S("c0ffee"));
     CTxDestination dst2 = CKeyID(uint160S("f00d"));
 
     BOOST_CHECK(walletdb->WriteName(dst1, "name1"));
     BOOST_CHECK(walletdb->WriteName(dst2, "name2"));
     {
         auto w = LoadWallet(walletdb.get());
         BOOST_CHECK_EQUAL(1, w->mapAddressBook.count(dst1));
         BOOST_CHECK_EQUAL("name1", w->mapAddressBook[dst1].name);
         BOOST_CHECK_EQUAL("name2", w->mapAddressBook[dst2].name);
     }
 
     walletdb->EraseName(dst1);
 
     {
         auto w = LoadWallet(walletdb.get());
         BOOST_CHECK_EQUAL(0, w->mapAddressBook.count(dst1));
         BOOST_CHECK_EQUAL(1, w->mapAddressBook.count(dst2));
     }
 }
 
 BOOST_AUTO_TEST_CASE(write_erase_purpose) {
+    auto walletdb = TmpDB(pathTemp, "write_erase_purpose");
 
-    auto walletdb = TmpDB(pathTemp);
     CTxDestination dst1 = CKeyID(uint160S("c0ffee"));
     CTxDestination dst2 = CKeyID(uint160S("f00d"));
 
     BOOST_CHECK(walletdb->WritePurpose(dst1, "purpose1"));
     BOOST_CHECK(walletdb->WritePurpose(dst2, "purpose2"));
     {
         auto w = LoadWallet(walletdb.get());
         BOOST_CHECK_EQUAL(1, w->mapAddressBook.count(dst1));
         BOOST_CHECK_EQUAL("purpose1", w->mapAddressBook[dst1].purpose);
         BOOST_CHECK_EQUAL("purpose2", w->mapAddressBook[dst2].purpose);
     }
 
     walletdb->ErasePurpose(dst1);
 
     {
         auto w = LoadWallet(walletdb.get());
         BOOST_CHECK_EQUAL(0, w->mapAddressBook.count(dst1));
         BOOST_CHECK_EQUAL(1, w->mapAddressBook.count(dst2));
     }
 }
 
 BOOST_AUTO_TEST_CASE(write_erase_destdata) {
+    auto walletdb = TmpDB(pathTemp, "write_erase_destdata");
 
-    auto walletdb = TmpDB(pathTemp);
     CTxDestination dst1 = CKeyID(uint160S("c0ffee"));
     CTxDestination dst2 = CKeyID(uint160S("f00d"));
 
     BOOST_CHECK(walletdb->WriteDestData(dst1, "key1", "value1"));
     BOOST_CHECK(walletdb->WriteDestData(dst1, "key2", "value2"));
     BOOST_CHECK(walletdb->WriteDestData(dst2, "key1", "value3"));
     BOOST_CHECK(walletdb->WriteDestData(dst2, "key2", "value4"));
     {
         auto w = LoadWallet(walletdb.get());
         std::string val;
         BOOST_CHECK(w->GetDestData(dst1, "key1", &val));
         BOOST_CHECK_EQUAL("value1", val);
         BOOST_CHECK(w->GetDestData(dst1, "key2", &val));
         BOOST_CHECK_EQUAL("value2", val);
         BOOST_CHECK(w->GetDestData(dst2, "key1", &val));
         BOOST_CHECK_EQUAL("value3", val);
         BOOST_CHECK(w->GetDestData(dst2, "key2", &val));
         BOOST_CHECK_EQUAL("value4", val);
     }
 
     walletdb->EraseDestData(dst1, "key2");
 
     {
         auto w = LoadWallet(walletdb.get());
         std::string dummy;
         BOOST_CHECK(w->GetDestData(dst1, "key1", &dummy));
         BOOST_CHECK(!w->GetDestData(dst1, "key2", &dummy));
         BOOST_CHECK(w->GetDestData(dst2, "key1", &dummy));
         BOOST_CHECK(w->GetDestData(dst2, "key2", &dummy));
     }
 }
 
 BOOST_AUTO_TEST_CASE(no_dest_fails) {
-    auto walletdb = TmpDB(pathTemp);
+    auto walletdb = TmpDB(pathTemp, "no_dest_fails");
+
     CTxDestination dst = CNoDestination{};
     BOOST_CHECK(!walletdb->WriteName(dst, "name"));
     BOOST_CHECK(!walletdb->WritePurpose(dst, "purpose"));
     BOOST_CHECK(!walletdb->WriteDestData(dst, "key", "value"));
 }
 
 BOOST_AUTO_TEST_SUITE_END()