diff --git a/tests/core_tests/chaingen_main.cpp b/tests/core_tests/chaingen_main.cpp
index 3bce8726..dc4ec806 100644
--- a/tests/core_tests/chaingen_main.cpp
+++ b/tests/core_tests/chaingen_main.cpp
@@ -250,7 +250,7 @@ bool gen_and_play_intermitted_by_blockchain_saveload(const char* const genclass_
 
 
 #define GENERATE_AND_PLAY(genclass)                                                                        \
-  if(!postponed_tests.count(#genclass) && (run_single_test.empty() || run_single_test == #genclass))       \
+  if(!postponed_tests.count(#genclass) && (run_single_test.empty() || std::string::npos != std::string(#genclass).find(run_single_test)))       \
   {                                                                                                        \
     TIME_MEASURE_START_MS(t);                                                                              \
     ++tests_count;                                                                                         \
diff --git a/tests/core_tests/double_spend.h b/tests/core_tests/double_spend.h
index 3ca9ba9d..23096ce0 100644
--- a/tests/core_tests/double_spend.h
+++ b/tests/core_tests/double_spend.h
@@ -42,7 +42,7 @@ struct gen_double_spend_in_the_same_block : public gen_double_spend_base< gen_do
 {
   static const uint64_t send_amount = MK_TEST_COINS(17);
   static const bool has_invalid_tx = !txs_kept_by_block;
-  static const size_t expected_pool_txs_count = has_invalid_tx ? 1 : 2;
+  static const size_t expected_pool_txs_count = 1;
   static const uint64_t expected_bob_balance = send_amount;
   static const uint64_t expected_alice_balance = 0;