diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index 9401331a82..b69102918a 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -2797,6 +2797,13 @@ struct controller_impl {
             block_data.transition_fork_db_to_if(cb.bsp);
          }
 
+         auto vote = [&](auto& fork_db, auto& head) {
+            const auto& bsp = std::get<std::decay_t<decltype(head)>>(cb.bsp);
+            if constexpr (std::is_same_v<block_state_ptr, typename std::decay_t<decltype(bsp)>>)
+               create_and_send_vote_msg(bsp);
+         };
+         block_data.apply<void>(vote);
+
       } catch (...) {
          // dont bother resetting pending, instead abort the block
          reset_pending_on_exit.cancel();
@@ -3226,9 +3233,6 @@ struct controller_impl {
 
          block_data.apply<void>(do_push);
 
-         if constexpr (std::is_same_v<block_state_ptr, typename std::decay_t<decltype(bsp)>>)
-            create_and_send_vote_msg(bsp);
-
       } FC_LOG_AND_RETHROW( )
    }
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0067d78e4a..5178c83812 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -89,9 +89,9 @@ add_test(NAME nodeos_sanity_test COMMAND tests/nodeos_run_test.py -v --sanity-te
 set_property(TEST nodeos_sanity_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME nodeos_run_test COMMAND tests/nodeos_run_test.py -v ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_run_test PROPERTY LABELS nonparallelizable_tests)
-add_test(NAME nodeos_lib_test COMMAND tests/nodeos_lib_test.py -n 4 -p 3 -s mesh -v ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+add_test(NAME nodeos_lib_test COMMAND tests/nodeos_lib_test.py -n 4 -p 3 -s ring -v ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_lib_test PROPERTY LABELS nonparallelizable_tests)
-add_test(NAME nodeos_lib_if_test COMMAND tests/nodeos_lib_test.py -n 4 -p 3 -s mesh -v --activate-if ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+add_test(NAME nodeos_lib_if_test COMMAND tests/nodeos_lib_test.py -n 4 -p 3 -s ring -v --activate-if ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_lib_if_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME block_log_util_test COMMAND tests/block_log_util_test.py -v ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST block_log_util_test PROPERTY LABELS nonparallelizable_tests)