diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -28,7 +28,7 @@
     CValidationState state;
     return AcceptToMemoryPool(GetConfig(), mempool, state,
                               MakeTransactionRef(tx), false, nullptr, nullptr,
-                              true, 0);
+                              true, Amount(0));
 }
 
 BOOST_FIXTURE_TEST_CASE(tx_mempool_block_doublespend, TestChain100Setup) {
@@ -47,7 +47,7 @@
         spends[i].vin[0].prevout.hash = coinbaseTxns[0].GetId();
         spends[i].vin[0].prevout.n = 0;
         spends[i].vout.resize(1);
-        spends[i].vout[0].nValue = 11 * CENT.GetSatoshis();
+        spends[i].vout[0].nValue = 11 * CENT;
         spends[i].vout[0].scriptPubKey = scriptPubKey;
 
         // Sign:
@@ -174,17 +174,17 @@
     spend_tx.vin[0].prevout.hash = coinbaseTxns[0].GetId();
     spend_tx.vin[0].prevout.n = 0;
     spend_tx.vout.resize(4);
-    spend_tx.vout[0].nValue = 11 * CENT.GetSatoshis();
+    spend_tx.vout[0].nValue = 11 * CENT;
     spend_tx.vout[0].scriptPubKey = p2sh_scriptPubKey;
-    spend_tx.vout[1].nValue = 11 * CENT.GetSatoshis();
+    spend_tx.vout[1].nValue = 11 * CENT;
     spend_tx.vout[1].scriptPubKey =
         CScript() << OP_CHECKLOCKTIMEVERIFY << OP_DROP
                   << ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG;
-    spend_tx.vout[2].nValue = 11 * CENT.GetSatoshis();
+    spend_tx.vout[2].nValue = 11 * CENT;
     spend_tx.vout[2].scriptPubKey =
         CScript() << OP_CHECKSEQUENCEVERIFY << OP_DROP
                   << ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG;
-    spend_tx.vout[3].nValue = 11 * CENT.GetSatoshis();
+    spend_tx.vout[3].nValue = 11 * CENT;
     spend_tx.vout[3].scriptPubKey = p2sh_scriptPubKey;
 
     // Sign, and push an extra element on the stack.
@@ -247,7 +247,7 @@
         invalid_under_p2sh_tx.vin[0].prevout.hash = spend_tx.GetId();
         invalid_under_p2sh_tx.vin[0].prevout.n = 0;
         invalid_under_p2sh_tx.vout.resize(1);
-        invalid_under_p2sh_tx.vout[0].nValue = 11 * CENT.GetSatoshis();
+        invalid_under_p2sh_tx.vout[0].nValue = 11 * CENT;
         invalid_under_p2sh_tx.vout[0].scriptPubKey = p2pk_scriptPubKey;
         std::vector<uint8_t> vchSig2(p2pk_scriptPubKey.begin(),
                                      p2pk_scriptPubKey.end());
@@ -267,7 +267,7 @@
         invalid_with_cltv_tx.vin[0].prevout.n = 1;
         invalid_with_cltv_tx.vin[0].nSequence = 0;
         invalid_with_cltv_tx.vout.resize(1);
-        invalid_with_cltv_tx.vout[0].nValue = 11 * CENT.GetSatoshis();
+        invalid_with_cltv_tx.vout[0].nValue = 11 * CENT;
         invalid_with_cltv_tx.vout[0].scriptPubKey = p2pk_scriptPubKey;
 
         // Sign
@@ -302,7 +302,7 @@
         invalid_with_csv_tx.vin[0].prevout.n = 2;
         invalid_with_csv_tx.vin[0].nSequence = 100;
         invalid_with_csv_tx.vout.resize(1);
-        invalid_with_csv_tx.vout[0].nValue = 11 * CENT.GetSatoshis();
+        invalid_with_csv_tx.vout[0].nValue = 11 * CENT;
         invalid_with_csv_tx.vout[0].scriptPubKey = p2pk_scriptPubKey;
 
         // Sign
@@ -340,20 +340,20 @@
         tx.vin[1].prevout.hash = spend_tx.GetId();
         tx.vin[1].prevout.n = 3;
         tx.vout.resize(1);
-        tx.vout[0].nValue = 22 * CENT.GetSatoshis();
+        tx.vout[0].nValue = 22 * CENT;
         tx.vout[0].scriptPubKey = p2pk_scriptPubKey;
 
         // Sign
         SignatureData sigdata;
-        ProduceSignature(MutableTransactionSignatureCreator(
-                             &keystore, &tx, 0, 11 * CENT.GetSatoshis(),
-                             SIGHASH_ALL | SIGHASH_FORKID),
-                         spend_tx.vout[0].scriptPubKey, sigdata);
+        ProduceSignature(
+            MutableTransactionSignatureCreator(&keystore, &tx, 0, 11 * CENT,
+                                               SIGHASH_ALL | SIGHASH_FORKID),
+            spend_tx.vout[0].scriptPubKey, sigdata);
         UpdateTransaction(tx, 0, sigdata);
-        ProduceSignature(MutableTransactionSignatureCreator(
-                             &keystore, &tx, 1, 11 * CENT.GetSatoshis(),
-                             SIGHASH_ALL | SIGHASH_FORKID),
-                         spend_tx.vout[3].scriptPubKey, sigdata);
+        ProduceSignature(
+            MutableTransactionSignatureCreator(&keystore, &tx, 1, 11 * CENT,
+                                               SIGHASH_ALL | SIGHASH_FORKID),
+            spend_tx.vout[3].scriptPubKey, sigdata);
         UpdateTransaction(tx, 1, sigdata);
 
         // This should be valid under all script flags
diff --git a/src/test/undo_tests.cpp b/src/test/undo_tests.cpp
--- a/src/test/undo_tests.cpp
+++ b/src/test/undo_tests.cpp
@@ -60,7 +60,7 @@
     tx.vin.resize(1);
     tx.vin[0].scriptSig.resize(10);
     tx.vout.resize(1);
-    tx.vout[0].nValue = 42;
+    tx.vout[0].nValue = Amount(42);
     auto coinbaseTx = CTransaction(tx);
 
     block.vtx.resize(2);
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -152,37 +152,33 @@
 }
 
 BOOST_AUTO_TEST_CASE(util_FormatMoney) {
-    BOOST_CHECK_EQUAL(FormatMoney(0), "0.00");
-    BOOST_CHECK_EQUAL(FormatMoney((COIN.GetSatoshis() / 10000) * 123456789),
-                      "12345.6789");
-    BOOST_CHECK_EQUAL(FormatMoney(-COIN.GetSatoshis()), "-1.00");
-
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis() * 100000000),
-                      "100000000.00");
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis() * 10000000),
-                      "10000000.00");
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis() * 1000000), "1000000.00");
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis() * 100000), "100000.00");
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis() * 10000), "10000.00");
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis() * 1000), "1000.00");
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis() * 100), "100.00");
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis() * 10), "10.00");
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis()), "1.00");
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis() / 10), "0.10");
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis() / 100), "0.01");
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis() / 1000), "0.001");
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis() / 10000), "0.0001");
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis() / 100000), "0.00001");
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis() / 1000000), "0.000001");
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis() / 10000000), "0.0000001");
-    BOOST_CHECK_EQUAL(FormatMoney(COIN.GetSatoshis() / 100000000),
-                      "0.00000001");
+    BOOST_CHECK_EQUAL(FormatMoney(Amount(0)), "0.00");
+    BOOST_CHECK_EQUAL(FormatMoney(123456789 * (COIN / 10000)), "12345.6789");
+    BOOST_CHECK_EQUAL(FormatMoney(-1 * COIN), "-1.00");
+
+    BOOST_CHECK_EQUAL(FormatMoney(100000000 * COIN), "100000000.00");
+    BOOST_CHECK_EQUAL(FormatMoney(10000000 * COIN), "10000000.00");
+    BOOST_CHECK_EQUAL(FormatMoney(1000000 * COIN), "1000000.00");
+    BOOST_CHECK_EQUAL(FormatMoney(100000 * COIN), "100000.00");
+    BOOST_CHECK_EQUAL(FormatMoney(10000 * COIN), "10000.00");
+    BOOST_CHECK_EQUAL(FormatMoney(1000 * COIN), "1000.00");
+    BOOST_CHECK_EQUAL(FormatMoney(100 * COIN), "100.00");
+    BOOST_CHECK_EQUAL(FormatMoney(10 * COIN), "10.00");
+    BOOST_CHECK_EQUAL(FormatMoney(COIN), "1.00");
+    BOOST_CHECK_EQUAL(FormatMoney(COIN / 10), "0.10");
+    BOOST_CHECK_EQUAL(FormatMoney(COIN / 100), "0.01");
+    BOOST_CHECK_EQUAL(FormatMoney(COIN / 1000), "0.001");
+    BOOST_CHECK_EQUAL(FormatMoney(COIN / 10000), "0.0001");
+    BOOST_CHECK_EQUAL(FormatMoney(COIN / 100000), "0.00001");
+    BOOST_CHECK_EQUAL(FormatMoney(COIN / 1000000), "0.000001");
+    BOOST_CHECK_EQUAL(FormatMoney(COIN / 10000000), "0.0000001");
+    BOOST_CHECK_EQUAL(FormatMoney(COIN / 100000000), "0.00000001");
 }
 
 BOOST_AUTO_TEST_CASE(util_ParseMoney) {
-    Amount ret = 0;
+    Amount ret(0);
     BOOST_CHECK(ParseMoney("0.0", ret));
-    BOOST_CHECK_EQUAL(ret, 0);
+    BOOST_CHECK_EQUAL(ret, Amount(0));
 
     BOOST_CHECK(ParseMoney("12345.6789", ret));
     BOOST_CHECK_EQUAL(ret, 123456789 * (COIN / 10000));
diff --git a/src/test/validation_tests.cpp b/src/test/validation_tests.cpp
--- a/src/test/validation_tests.cpp
+++ b/src/test/validation_tests.cpp
@@ -52,7 +52,7 @@
     size_t nwritten = fwrite(chainparams.DiskMagic(),
                              CMessageHeader::MESSAGE_START_SIZE, 1, fp);
 
-    BOOST_CHECK_EQUAL(nwritten, 1);
+    BOOST_CHECK_EQUAL(nwritten, 1UL);
 
     CTransaction empty_tx;
     size_t empty_tx_size = GetSerializeSize(empty_tx, SER_DISK, CLIENT_VERSION);