diff --git a/src/kernel/chainparams.cpp b/src/kernel/chainparams.cpp
index 2094dbd7aa..410e27a318 100644
--- a/src/kernel/chainparams.cpp
+++ b/src/kernel/chainparams.cpp
@@ -300,7 +300,6 @@ public:
         vFixedSeeds = std::vector<uint8_t>(std::begin(chainparams_seed_main), std::end(chainparams_seed_main));
 
         fDefaultConsistencyChecks = false;
-        m_is_test_chain = false;
         m_is_mockable_chain = false;
 
         checkpointData = {
@@ -436,7 +435,6 @@ public:
         vFixedSeeds = std::vector<uint8_t>(std::begin(chainparams_seed_test), std::end(chainparams_seed_test));
 
         fDefaultConsistencyChecks = false;
-        m_is_test_chain = true;
         m_is_mockable_chain = false;
 
         checkpointData = {
@@ -586,7 +584,6 @@ public:
         blech32_hrp = bech32_hrp;
 
         fDefaultConsistencyChecks = false;
-        m_is_test_chain = true;
         m_is_mockable_chain = false;
     }
 };
@@ -708,7 +705,6 @@ public:
         vSeeds.emplace_back("dummySeed.invalid.");
 
         fDefaultConsistencyChecks = true;
-        m_is_test_chain = true;
         m_is_mockable_chain = true;
 
         checkpointData = {
@@ -863,7 +859,6 @@ protected:
 
         nPruneAfterHeight = (uint64_t)args.GetIntArg("-npruneafterheight", nPruneAfterHeight);
         fDefaultConsistencyChecks = args.GetBoolArg("-fdefaultconsistencychecks", fDefaultConsistencyChecks);
-        m_is_test_chain = args.GetBoolArg("-fmineblocksondemand", m_is_test_chain);
 
         bech32_hrp = args.GetArg("-bech32_hrp", bech32_hrp);
         blech32_hrp = args.GetArg("-blech32_hrp", blech32_hrp);
@@ -1128,7 +1123,6 @@ public:
 
         nPruneAfterHeight = 1000;
         fDefaultConsistencyChecks = false;
-        m_is_test_chain = false;
 
         m_assumed_blockchain_size = 3;
         m_assumed_chain_state_size = 1;
@@ -1357,7 +1351,6 @@ public:
 
         m_chain_type = ChainTypeMetaFrom(ChainType::LIQUID1TEST);
 
-        m_is_test_chain = true;
         m_is_mockable_chain = false;
 
         vSeeds.clear();  // No network seeds
@@ -1464,7 +1457,6 @@ public:
 
         nPruneAfterHeight = (uint64_t)args.GetIntArg("-npruneafterheight", nPruneAfterHeight);
         fDefaultConsistencyChecks = args.GetBoolArg("-fdefaultconsistencychecks", fDefaultConsistencyChecks);
-        m_is_test_chain = args.GetBoolArg("-fmineblocksondemand", m_is_test_chain);
 
         bech32_hrp = args.GetArg("-bech32_hrp", bech32_hrp);
         blech32_hrp = args.GetArg("-blech32_hrp", blech32_hrp);
diff --git a/src/kernel/chainparams.h b/src/kernel/chainparams.h
index 89da9e6d9f..223e09aef5 100644
--- a/src/kernel/chainparams.h
+++ b/src/kernel/chainparams.h
@@ -98,7 +98,7 @@ public:
     /** Default value for -checkmempool and -checkblockindex argument */
     bool DefaultConsistencyChecks() const { return fDefaultConsistencyChecks; }
     /** If this chain is exclusively used for testing */
-    bool IsTestChain() const { return m_is_test_chain; }
+    bool IsTestChain() const { return m_chain_type.chain_type != ChainType::MAIN && m_chain_type.chain_type != ChainType::LIQUID1; }
     /** If this chain allows time to be mocked */
     bool IsMockableChain() const { return m_is_mockable_chain; }
     uint64_t PruneAfterHeight() const { return nPruneAfterHeight; }
@@ -190,7 +190,6 @@ protected:
     CAmount initial_reissuance_tokens;
     std::vector<uint8_t> vFixedSeeds;
     bool fDefaultConsistencyChecks;
-    bool m_is_test_chain;
     bool m_is_mockable_chain;
     CCheckpointData checkpointData;
     MapAssumeutxo m_assumeutxo_data;
diff --git a/src/rpc/mempool.cpp b/src/rpc/mempool.cpp
index 7b1db3bdc4..591d86e937 100644
--- a/src/rpc/mempool.cpp
+++ b/src/rpc/mempool.cpp
@@ -873,7 +873,7 @@ static RPCHelpMan submitpackage()
         },
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
         {
-            if (!Params().IsMockableChain()) {
+            if (!IsRegTest(Params().GetChainTypeMeta())) {
                 throw std::runtime_error("submitpackage is for regression testing (-regtest mode) only");
             }
             const UniValue raw_transactions = request.params[0].get_array();
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index e1c843c36f..f6c3d7ddf8 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -353,7 +353,7 @@ static RPCHelpMan addconnection()
         },
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
-    if (Params().GetChainTypeMeta().chain_name.find("regtest") == std::string::npos) {
+    if (!IsRegTest(Params().GetChainTypeMeta())) {
         throw std::runtime_error("addconnection is for regression testing (chain should have \"regtest\" in the name) only.");
     }
 
diff --git a/src/util/chaintype.h b/src/util/chaintype.h
index 23ce354062..f97d6d26ab 100644
--- a/src/util/chaintype.h
+++ b/src/util/chaintype.h
@@ -33,4 +33,8 @@ struct ChainTypeMeta {
 ChainTypeMeta ChainTypeMetaFrom(std::string chain_name);
 ChainTypeMeta ChainTypeMetaFrom(ChainType chain_type);
 
+inline bool IsRegTest(ChainTypeMeta chain_type) {
+    return chain_type.chain_name.find("regtest") != std::string::npos;
+};
+
 #endif // BITCOIN_UTIL_CHAINTYPE_H