diff --git a/qa/rpc-tests/README.md b/qa/rpc-tests/README.md
index 17aee1967..87d081706 100644
--- a/qa/rpc-tests/README.md
+++ b/qa/rpc-tests/README.md
@@ -18,9 +18,15 @@ Possible options:
 
 ```
 -h, --help       show this help message and exit
+<<<<<<< HEAD
   --nocleanup      Leave komodods and test.* datadir on exit or error
   --noshutdown     Don't stop komodods after the test execution
   --srcdir=SRCDIR  Source directory containing komodod/komodo-cli (default:
+=======
+  --nocleanup      Leave zcashds and test.* datadir on exit or error
+  --noshutdown     Don't stop bitcoinds after the test execution
+  --srcdir=SRCDIR  Source directory containing zcashd/zcash-cli (default:
+>>>>>>> 807fb7497ffc6898790a86f807d3a2a0669d5ff7
                    ../../src)
   --tmpdir=TMPDIR  Root directory for datadirs
   --tracerpc       Print out all RPC calls as they are made
diff --git a/qa/rpc-tests/wallet_import_export.py b/qa/rpc-tests/wallet_import_export.py
index ee9cc42ce..cdcc01d1f 100755
--- a/qa/rpc-tests/wallet_import_export.py
+++ b/qa/rpc-tests/wallet_import_export.py
@@ -61,6 +61,8 @@ def parse_wallet_file(dump_path):
     # We expect information about the HDSeed and fingerpring in the header
     assert_true("HDSeed" in file_lines[4], "Expected HDSeed")
     assert_true("fingerprint" in file_lines[4], "Expected fingerprint")
+    seed_comment_line = file_lines[4][2:].split()  # ["HDSeed=...", "fingerprint=..."]
+    assert_true(seed_comment_line[0].split("=")[1] != seed_comment_line[1].split("=")[1], "The seed should not equal the fingerprint")
     (t_keys, i) = parse_wallet_file_lines(file_lines, 0)
     (sprout_keys, i) = parse_wallet_file_lines(file_lines, i)
     (sapling_keys, i) = parse_wallet_file_lines(file_lines, i)
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 3f266c3db..7ec0c23c1 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -508,7 +508,8 @@ UniValue dumpwallet_impl(const UniValue& params, bool fHelp, bool fDumpZKeys)
     {
         HDSeed hdSeed;
         pwalletMain->GetHDSeed(hdSeed);
-        file << strprintf("# HDSeed=%s fingerprint=%s", pwalletMain->GetHDChain().seedFp.GetHex(), hdSeed.Fingerprint().GetHex());
+        auto rawSeed = hdSeed.RawSeed();
+        file << strprintf("# HDSeed=%s fingerprint=%s", HexStr(rawSeed.begin(), rawSeed.end()), hdSeed.Fingerprint().GetHex());
         file << "\n";
     }
     file << "\n";