diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
index 186b280..7f9b0a4 100644
--- a/.github/workflows/build-all.yml
+++ b/.github/workflows/build-all.yml
@@ -161,7 +161,9 @@ jobs:
             mingw-w64-x86_64-miniupnpc
             mingw-w64-x86_64-zlib
             mingw-w64-x86_64-rocksdb
-            mingw-w64-x86_64-autotools
+            mingw-w64-x86_64-autoconf
+            mingw-w64-x86_64-automake
+            mingw-w64-x86_64-autoconf2.13
             mingw-w64-x86_64-libtool
 
       - name: Set VERSION
@@ -319,6 +321,10 @@ jobs:
             mingw-w64-x86_64-miniupnpc
             mingw-w64-x86_64-zlib
             mingw-w64-x86_64-rocksdb
+            mingw-w64-x86_64-autoconf
+            mingw-w64-x86_64-automake
+            mingw-w64-x86_64-autoconf2.13
+            mingw-w64-x86_64-libtool
 
       - name: Configure
         run: |
@@ -600,7 +606,8 @@ jobs:
         # macOS Qt is built with @rpath embedded, so libtor needs to be
         # at the configured TOR_SOURCE_ROOT location.
         run: |
-          brew install libevent openssl@3
+          brew install libevent openssl@3 autoconf automake libtool
+          export PATH="/opt/homebrew/opt/automake/bin:/opt/homebrew/opt/libtool/bin:$PATH"
           LIBEVENT_DIR=/opt/homebrew/opt/libevent \
             OPENSSL_DIR=/opt/homebrew/opt/openssl@3 \
             ZLIB_DIR=/opt/homebrew/opt/zlib \
diff --git a/src/test/wallet_tests.cpp b/src/test/wallet_tests.cpp
index 4b41231..66ca078 100644
--- a/src/test/wallet_tests.cpp
+++ b/src/test/wallet_tests.cpp
@@ -316,7 +316,7 @@ BOOST_AUTO_TEST_CASE(abandon_unknown_txid_returns_false)
     // Pick a hash that we know is not in the test wallet
     uint256 hash;
     hash.SetHex("0000000000000000000000000000000000000000000000000000000000000001");
-    BOOST_CHECK(!wallet.AbandonTransaction(hash));
+    BOOST_CHECK(!wallet_tests::wallet.AbandonTransaction(hash));
 }
 
 BOOST_AUTO_TEST_CASE(abandon_not_from_me_returns_false)
@@ -325,10 +325,10 @@ BOOST_AUTO_TEST_CASE(abandon_not_from_me_returns_false)
     // wallet_tests). Grab the first mapWallet entry — it has fDebit=0
     // because add_coin() only sets fIsFromMe if we asked, so by default
     // the tx is not from us.
-    BOOST_CHECK(!wallet.mapWallet.empty());
-    if (!wallet.mapWallet.empty()) {
-        uint256 hash = wallet.mapWallet.begin()->first;
-        BOOST_CHECK(!wallet.AbandonTransaction(hash));
+    BOOST_CHECK(!wallet_tests::wallet.mapWallet.empty());
+    if (!wallet_tests::wallet.mapWallet.empty()) {
+        uint256 hash = wallet_tests::wallet.mapWallet.begin()->first;
+        BOOST_CHECK(!wallet_tests::wallet.AbandonTransaction(hash));
     }
 }