diff --git a/src/test/cashaddr_tests.cpp b/src/test/cashaddr_tests.cpp
index 6a34c48e6..b8a927fcd 100644
--- a/src/test/cashaddr_tests.cpp
+++ b/src/test/cashaddr_tests.cpp
@@ -1,87 +1,89 @@
 // Copyright (c) 2017 Pieter Wuille
 // Copyright (c) 2017 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "cashaddr.h"
 #include "test/test_bitcoin.h"
 
 #include <boost/test/unit_test.hpp>
 
 BOOST_FIXTURE_TEST_SUITE(cashaddr_tests, BasicTestingSetup)
 
 bool CaseInsensitiveEqual(const std::string &s1, const std::string &s2) {
     if (s1.size() != s2.size()) {
         return false;
     }
 
     for (size_t i = 0; i < s1.size(); ++i) {
         char c1 = s1[i];
         if (c1 >= 'A' && c1 <= 'Z') {
             c1 -= ('A' - 'a');
         }
         char c2 = s2[i];
         if (c2 >= 'A' && c2 <= 'Z') {
             c2 -= ('A' - 'a');
         }
         if (c1 != c2) {
             return false;
         }
     }
 
     return true;
 }
 
 BOOST_AUTO_TEST_CASE(cashaddr_testvectors_valid) {
     static const std::string CASES[] = {
         "prefix:x64nx6hz",
         "PREFIX:X64NX6HZ",
         "p:gpf8m4h7",
         "bitcoincash:qpzry9x8gf2tvdw0s3jn54khce6mua7lcw20ayyn",
-        "bcctest:testnetaddressqm3zpk4w",
-        "bccreg:555555555555555555555555555555555555555555555lmxjk3an",
+        "xbctest:testnetaddressa4dxsgzr",
+        "xbcreg:555555555555555555555555555555555555555555555n5nuyrz8",
     };
+
     for (const std::string &str : CASES) {
         auto ret = cashaddr::Decode(str);
         BOOST_CHECK_MESSAGE(!ret.first.empty(), str);
         std::string recode = cashaddr::Encode(ret.first, ret.second);
         BOOST_CHECK_MESSAGE(!recode.empty(), str);
         BOOST_CHECK_MESSAGE(CaseInsensitiveEqual(str, recode), str);
     }
 }
 
 BOOST_AUTO_TEST_CASE(cashaddr_testvectors_invalid) {
     static const std::string CASES[] = {
         "prefix:x32nx6hz",
         "prEfix:x64nx6hz",
         "prefix:x64nx6Hz",
         "pref1x:6m8cxv73",
         "prefix:",
         ":u9wsx07j",
-        "bccreg:555555555555555555x55555555555555555555555555lmxjk3an",
-        "bccreg:555555555555555555555555555555551555555555555lmxjk3an",
+        "xbcreg:555555555555555555x55555555555555555555555555n5nuyrz8",
+        "xbcreg:555555555555555555555555555555551555555555555n5nuyrz8",
         "pre:fix:x32nx6hz",
         "prefixx64nx6hz",
     };
+
     for (const std::string &str : CASES) {
         auto ret = cashaddr::Decode(str);
         BOOST_CHECK_MESSAGE(ret.first.empty(), str);
     }
 }
 
 BOOST_AUTO_TEST_CASE(cashaddr_rawencode) {
     typedef std::pair<std::string, std::vector<uint8_t>> raw;
 
     raw toEncode;
     toEncode.first = "helloworld";
     toEncode.second = {0x1f, 0x0d};
 
     std::string encoded = cashaddr::Encode(toEncode.first, toEncode.second);
     raw decoded = cashaddr::Decode(encoded);
 
     BOOST_CHECK_EQUAL(toEncode.first, decoded.first);
     BOOST_CHECK_EQUAL_COLLECTIONS(begin(toEncode.second), end(toEncode.second),
                                   begin(decoded.second), end(decoded.second));
 }
 
 BOOST_AUTO_TEST_SUITE_END()