diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp
index 9fe0e214d..37cbd6718 100644
--- a/src/ripple/app/misc/NetworkOPs.cpp
+++ b/src/ripple/app/misc/NetworkOPs.cpp
@@ -2391,7 +2391,7 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
             Json::Value& w = warnings.append(Json::objectValue);
             w[jss::id] = warnRPC_EXPIRED_VALIDATOR_LIST;
             w[jss::message] =
-                "This server has an expired validator list. validators.txt "
+                "This server has an expired validator list. validators-xahau.txt "
                 "may be incorrectly configured or some [validator_list_sites] "
                 "may be unreachable.";
         }
diff --git a/src/ripple/core/impl/Config.cpp b/src/ripple/core/impl/Config.cpp
index 59fec9935..ce348e6bf 100644
--- a/src/ripple/core/impl/Config.cpp
+++ b/src/ripple/core/impl/Config.cpp
@@ -823,7 +823,7 @@ Config::loadFromString(std::string const& fileContents)
         // not a file.
         // If the specified file is not an absolute path, then look
         // for it in the same directory as the config file.
-        // If no path was specified, then look for validators.txt
+        // If no path was specified, then look for validators-xahau.txt
         // in the same directory as the config file, but don't complain
         // if we can't find it.
         boost::filesystem::path validatorsFile;
diff --git a/src/test/app/ValidatorList_test.cpp b/src/test/app/ValidatorList_test.cpp
index 778be463a..379571ccd 100644
--- a/src/test/app/ValidatorList_test.cpp
+++ b/src/test/app/ValidatorList_test.cpp
@@ -1830,7 +1830,8 @@ private:
                     env.app().getOPs(),
                     env.app().overlay(),
                     env.app().getHashRouter());
-                if (trustedKeys->quorum() == std::ceil(cfgKeys.size() * 0.8f))
+                if (trustedKeys->quorum() == std::ceil(cfgKeys.size() * 0.8f) ||
+                    (minimumQuorum && trustedKeys->quorum() == *minimumQuorum))
                     return trustedKeys;
             }
             return nullptr;
@@ -1982,7 +1983,7 @@ private:
                     env.app().getOPs(),
                     env.app().overlay(),
                     env.app().getHashRouter());
-                BEAST_EXPECT(validators->quorum() == 48);
+                BEAST_EXPECT(validators->quorum() == 30);
                 hash_set<PublicKey> nUnl;
                 it = unl.begin();
                 for (std::uint32_t i = 0; i < 20; ++i)
diff --git a/src/test/app/ValidatorSite_test.cpp b/src/test/app/ValidatorSite_test.cpp
index 8ec86fead..4780c5369 100644
--- a/src/test/app/ValidatorSite_test.cpp
+++ b/src/test/app/ValidatorSite_test.cpp
@@ -85,8 +85,8 @@ private:
                 "http://207.261.33.37:8080/validators",
                 "https://ripple.com/validators",
                 "https://ripple.com:443/validators",
-                "file:///etc/opt/ripple/validators.txt",
-                "file:///C:/Lib/validators.txt"
+                "file:///etc/opt/ripple/validators-xahau.txt",
+                "file:///C:/Lib/validators-xahau.txt"
 #if !_MSC_VER
                 ,
                 "file:///"
diff --git a/src/test/core/Config_test.cpp b/src/test/core/Config_test.cpp
index efdc3db6c..97ad7f666 100644
--- a/src/test/core/Config_test.cpp
+++ b/src/test/core/Config_test.cpp
@@ -227,7 +227,7 @@ moreripplevalidators.net
 }
 
 /**
-   Write a validators.txt file and remove when done.
+   Write a validators-xahau.txt file and remove when done.
  */
 class ValidatorsTxtGuard : public test::detail::FileDirGuard
 {
@@ -606,7 +606,7 @@ trustthesevalidators.gov
         {
             // load from specified [validators_file] file name
             // in config directory
-            std::string const valFileName = "validators.txt";
+            std::string const valFileName = "validators-xahau.txt";
             detail::ValidatorsTxtGuard const vtg(
                 *this, "test_cfg", valFileName);
             detail::RippledCfgGuard const rcg(
@@ -625,8 +625,8 @@ trustthesevalidators.gov
             // load from specified [validators_file] relative path
             // to config directory
             detail::ValidatorsTxtGuard const vtg(
-                *this, "test_cfg", "validators.txt");
-            auto const valFilePath = ".." / vtg.subdir() / "validators.txt";
+                *this, "test_cfg", "validators-xahau.txt");
+            auto const valFilePath = ".." / vtg.subdir() / "validators-xahau.txt";
             detail::RippledCfgGuard const rcg(
                 *this, vtg.subdir(), "", valFilePath, false);
             BEAST_EXPECT(vtg.validatorsFileExists());
@@ -642,7 +642,7 @@ trustthesevalidators.gov
         {
             // load from validators file in default location
             detail::ValidatorsTxtGuard const vtg(
-                *this, "test_cfg", "validators.txt");
+                *this, "test_cfg", "validators-xahau.txt");
             detail::RippledCfgGuard const rcg(
                 *this, vtg.subdir(), "", "", false);
             BEAST_EXPECT(vtg.validatorsFileExists());
@@ -662,7 +662,7 @@ trustthesevalidators.gov
                 *this, "test_cfg", "validators.cfg");
             BEAST_EXPECT(vtg.validatorsFileExists());
             detail::ValidatorsTxtGuard const vtgDefault(
-                *this, vtg.subdir(), "validators.txt", false);
+                *this, vtg.subdir(), "validators-xahau.txt", false);
             BEAST_EXPECT(vtgDefault.validatorsFileExists());
             detail::RippledCfgGuard const rcg(
                 *this, vtg.subdir(), "", vtg.validatorsFile(), false);