diff --git a/qa/rpc-tests/wallet_persistence.py b/qa/rpc-tests/wallet_persistence.py
index 364e7b450..540fd87e9 100755
--- a/qa/rpc-tests/wallet_persistence.py
+++ b/qa/rpc-tests/wallet_persistence.py
@@ -4,28 +4,93 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import assert_true, start_nodes, stop_nodes, \
-    wait_bitcoinds
+from test_framework.util import (
+    assert_equal, assert_true,
+    start_nodes, stop_nodes,
+    initialize_chain_clean, connect_nodes_bi, wait_bitcoinds,
+    wait_and_assert_operationid_status
+)
+from decimal import Decimal
 
 class WalletPersistenceTest (BitcoinTestFramework):
 
+    def setup_chain(self):
+        print("Initializing test directory " + self.options.tmpdir)
+        initialize_chain_clean(self.options.tmpdir, 2)
+
     def setup_network(self, split=False):
-        self.nodes = start_nodes(1, self.options.tmpdir)
-        self.is_network_split = False
+        self.nodes = start_nodes(2, self.options.tmpdir,
+            extra_args=[[
+                '-nuparams=5ba81b19:100', # Overwinter
+                '-nuparams=76b809bb:201', # Sapling
+            ]] * 2)
+        connect_nodes_bi(self.nodes,0,1)
+        self.is_network_split=False
         self.sync_all()
 
     def run_test(self):
+        # Sanity-check the test harness
+        self.nodes[0].generate(200)
+        assert_equal(self.nodes[0].getblockcount(), 200)
+        self.sync_all()
+
+        # Verify Sapling address is persisted in wallet (even when Sapling is not yet active)
         sapling_addr = self.nodes[0].z_getnewaddress('sapling')
+
+        # Make sure the node has the addresss
         addresses = self.nodes[0].z_listaddresses()
-        # make sure the node has the addresss
         assert_true(sapling_addr in addresses, "Should contain address before restart")
-        # restart the nodes
+
+        # Restart the nodes
         stop_nodes(self.nodes)
         wait_bitcoinds()
-        self.nodes = self.setup_nodes()
+        self.setup_network()
+
+        # Make sure we still have the address after restarting
         addresses = self.nodes[0].z_listaddresses()
-        # make sure we still have the address after restarting
         assert_true(sapling_addr in addresses, "Should contain address after restart")
 
+        # Activate Sapling
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        # Node 0 shields funds to Sapling address
+        taddr0 = self.nodes[0].getnewaddress()
+        recipients = []
+        recipients.append({"address": sapling_addr, "amount": Decimal('20')})
+        myopid = self.nodes[0].z_sendmany(taddr0, recipients, 1, 0)
+        wait_and_assert_operationid_status(self.nodes[0], myopid)
+
+        self.sync_all()
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        # Verify shielded balance
+        assert_equal(self.nodes[0].z_getbalance(sapling_addr), Decimal('20'))
+
+        # Node 0 sends some shielded funds to Node 1
+        dest_addr = self.nodes[1].z_getnewaddress('sapling')
+        recipients = []
+        recipients.append({"address": dest_addr, "amount": Decimal('15')})
+        myopid = self.nodes[0].z_sendmany(sapling_addr, recipients, 1, 0)
+        wait_and_assert_operationid_status(self.nodes[0], myopid)
+
+        self.sync_all()
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        # Verify balances
+        assert_equal(self.nodes[0].z_getbalance(sapling_addr), Decimal('5'))
+        assert_equal(self.nodes[1].z_getbalance(dest_addr), Decimal('15'))
+
+        # Restart the nodes
+        stop_nodes(self.nodes)
+        wait_bitcoinds()
+        self.setup_network()
+
+        # Verify balances
+        assert_equal(self.nodes[0].z_getbalance(sapling_addr), Decimal('5'))
+        assert_equal(self.nodes[1].z_getbalance(dest_addr), Decimal('15'))
+
 if __name__ == '__main__':
     WalletPersistenceTest().main()
\ No newline at end of file