diff --git a/src/test/app/ConfidentialTransfer_test.cpp b/src/test/app/ConfidentialTransfer_test.cpp
index 4211474467..0dff37e05b 100644
--- a/src/test/app/ConfidentialTransfer_test.cpp
+++ b/src/test/app/ConfidentialTransfer_test.cpp
@@ -57,7 +57,7 @@
 
 namespace xrpl {
 
-// NOLINTBEGIN(misc-const-correctness)
+// NOLINTBEGIN(misc-const-correctness, bugprone-unchecked-optional-access)
 class ConfidentialTransfer_test : public beast::unit_test::Suite
 {
     // Offset where the bulletproof begins in a send proof blob.
@@ -9820,7 +9820,7 @@ public:
         testWithFeats(all);
     }
 };
-// NOLINTEND(misc-const-correctness)
+// NOLINTEND(misc-const-correctness, bugprone-unchecked-optional-access)
 
 BEAST_DEFINE_TESTSUITE(ConfidentialTransfer, app, xrpl);
 }  // namespace xrpl
diff --git a/src/test/jtx/impl/mpt.cpp b/src/test/jtx/impl/mpt.cpp
index afc30df914..752a4f2842 100644
--- a/src/test/jtx/impl/mpt.cpp
+++ b/src/test/jtx/impl/mpt.cpp
@@ -52,6 +52,8 @@
 
 namespace xrpl::test::jtx {
 
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
+
 /**
  * @brief Helper function to convert a PedersenProofParams into the C library struct.
  *
@@ -2411,4 +2413,6 @@ MPTTester::convertBackJV(MPTConvertBack const& arg, std::uint32_t seq)
     return jv;
 }
 
+// NOLINTEND(bugprone-unchecked-optional-access)
+
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/mpt.h b/src/test/jtx/mpt.h
index d34134be3e..dd4f406aae 100644
--- a/src/test/jtx/mpt.h
+++ b/src/test/jtx/mpt.h
@@ -349,6 +349,7 @@ class MPTTester
     std::unordered_map<AccountID, Buffer> privKeys_;
 
 public:
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum EncryptedBalanceType {
         IssuerEncryptedBalance,
         HolderEncryptedInbox,