diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -934,13 +934,6 @@
     return MakeTransactionRef(tx);
 }
 
-#define MK_OUTPUTS(amounts...)                                                 \
-    std::vector<Amount> { amounts }
-#define MK_INPUTS(txs...)                                                      \
-    std::vector<CTransactionRef> { txs }
-#define MK_INPUT_IDX(idxes...)                                                 \
-    std::vector<uint32_t> { idxes }
-
 BOOST_AUTO_TEST_CASE(MempoolAncestryTests) {
     size_t ancestors, descendants;
 
@@ -952,7 +945,7 @@
     //
     // [tx1]
     //
-    CTransactionRef tx1 = make_tx(MK_OUTPUTS(10 * COIN));
+    CTransactionRef tx1 = make_tx(/* output_values */ {10 * COIN});
     pool.addUnchecked(entry.Fee(10000 * SATOSHI).FromTx(tx1));
 
     // Ancestors / descendants should be 1 / 1 (itself / itself)
@@ -965,7 +958,7 @@
     // [tx1].0 <- [tx2]
     //
     CTransactionRef tx2 =
-        make_tx(MK_OUTPUTS(495 * CENT, 5 * COIN), MK_INPUTS(tx1));
+        make_tx(/* output_values */ {495 * CENT, 5 * COIN}, /* inputs */ {tx1});
     pool.addUnchecked(entry.Fee(10000 * SATOSHI).FromTx(tx2));
 
     // Ancestors / descendants should be:
@@ -984,8 +977,8 @@
     //
     // [tx1].0 <- [tx2].0 <- [tx3]
     //
-    CTransactionRef tx3 =
-        make_tx(MK_OUTPUTS(290 * CENT, 200 * CENT), MK_INPUTS(tx2));
+    CTransactionRef tx3 = make_tx(/* output_values */ {290 * CENT, 200 * CENT},
+                                  /* inputs */ {tx2});
     pool.addUnchecked(entry.Fee(10000 * SATOSHI).FromTx(tx3));
 
     // Ancestors / descendants should be:
@@ -1010,8 +1003,8 @@
     //              |
     //              \---1 <- [tx4]
     //
-    CTransactionRef tx4 = make_tx(MK_OUTPUTS(290 * CENT, 250 * CENT),
-                                  MK_INPUTS(tx2), MK_INPUT_IDX(1));
+    CTransactionRef tx4 = make_tx(/* output_values */ {290 * CENT, 250 * CENT},
+                                  /* inputs */ {tx2}, /* input_indices */ {1});
     pool.addUnchecked(entry.Fee(10000 * SATOSHI).FromTx(tx4));
 
     // Ancestors / descendants should be:
@@ -1047,15 +1040,18 @@
     Amount v = 5 * COIN;
     for (uint64_t i = 0; i < 5; i++) {
         CTransactionRef &tyi = *ty[i];
-        tyi = make_tx(MK_OUTPUTS(v), i > 0 ? MK_INPUTS(*ty[i - 1])
-                                           : std::vector<CTransactionRef>());
+        tyi = make_tx(/* output_values */ {v},
+                      /* inputs */ i > 0
+                          ? std::vector<CTransactionRef>{*ty[i - 1]}
+                          : std::vector<CTransactionRef>{});
         v -= 50 * CENT;
         pool.addUnchecked(entry.Fee(10000 * SATOSHI).FromTx(tyi));
         pool.GetTransactionAncestry(tyi->GetId(), ancestors, descendants);
         BOOST_CHECK_EQUAL(ancestors, i + 1);
         BOOST_CHECK_EQUAL(descendants, i + 1);
     }
-    CTransactionRef ty6 = make_tx(MK_OUTPUTS(5 * COIN), MK_INPUTS(tx3, ty5));
+    CTransactionRef ty6 =
+        make_tx(/* output_values */ {5 * COIN}, /* inputs */ {tx3, ty5});
     pool.addUnchecked(entry.Fee(10000 * SATOSHI).FromTx(ty6));
 
     // Ancestors / descendants should be: