diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8b8b9ef0..54f8f124 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -28,7 +28,7 @@ add_executable(net_load_tests_srv net_load_tests/srv.cpp)
 
 add_dependencies(coretests version)
 
-target_link_libraries(coretests currency_core common crypto wallet rpc zlibstatic ethash ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
+target_link_libraries(coretests rpc currency_core common crypto wallet zlibstatic ethash ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
 target_link_libraries(functional_tests rpc wallet currency_core crypto common zlibstatic ethash upnpc-static ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
 target_link_libraries(hash-tests crypto ethash)
 target_link_libraries(hash-target-tests crypto currency_core ethash ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
diff --git a/tests/core_tests/escrow_wallet_common.h b/tests/core_tests/escrow_wallet_common.h
index ff8fea0f..067e7f49 100644
--- a/tests/core_tests/escrow_wallet_common.h
+++ b/tests/core_tests/escrow_wallet_common.h
@@ -59,7 +59,7 @@ void remove_all_entries_from_variant_container_by_type(container_t& container)
 
 inline bool refresh_wallet_and_check_1_contract_state(const char* wallet_name, std::shared_ptr<tools::wallet2> wallet, uint32_t expected_contract_state, size_t block_to_be_fetched = SIZE_MAX)
 {
-  bool stub_bool = false, r = false;
+  bool stub_bool = false, r;
   size_t blocks_fetched = 0;
   LOG_PRINT_CYAN("Refreshing " << wallet_name << "'s wallet...", LOG_LEVEL_0);
   wallet->refresh(blocks_fetched);
@@ -78,7 +78,7 @@ inline bool refresh_wallet_and_check_1_contract_state(const char* wallet_name, s
 
 inline bool refresh_wallet_and_check_contract_state(const char* wallet_name, std::shared_ptr<tools::wallet2> wallet, uint32_t expected_contract_state, crypto::hash contract_id, size_t block_to_be_fetched = SIZE_MAX)
 {
-  bool stub_bool = false, r = false;
+  bool stub_bool = false, r;
   size_t blocks_fetched = 0;
   LOG_PRINT_CYAN("Refreshing " << wallet_name << "'s wallet...", LOG_LEVEL_0);
   wallet->refresh(blocks_fetched);
diff --git a/tests/performance_tests/multi_tx_test_base.h b/tests/performance_tests/multi_tx_test_base.h
index f3b2622b..b7c7e783 100644
--- a/tests/performance_tests/multi_tx_test_base.h
+++ b/tests/performance_tests/multi_tx_test_base.h
@@ -33,7 +33,7 @@ public:
         return false;
 
       txout_to_key tx_out = boost::get<txout_to_key>(m_miner_txs[i].vout[0].target);
-      output_entries.push_back(std::make_pair(i, tx_out.key));
+      output_entries.push_back(make_serializable_pair<txout_v, crypto::public_key>(i, tx_out.key));
       m_public_keys[i] = tx_out.key;
       m_public_key_ptrs[i] = &m_public_keys[i];
     }