diff --git a/src/credentials/attestation_verifier/CHIPAttCert_test_paa_store.cpp b/src/credentials/attestation_verifier/CHIPAttCert_test_paa_store.cpp
index 54b0b8b805a3d0..76637c130b547d 100644
--- a/src/credentials/attestation_verifier/CHIPAttCert_test_paa_store.cpp
+++ b/src/credentials/attestation_verifier/CHIPAttCert_test_paa_store.cpp
@@ -84,9 +84,10 @@ const Span<const ByteSpan> kTestAttestationTrustStoreRoots((const ByteSpan[]){
     sTestCert_PAA_NoVID_Cert,
 });
 
-const Span<const ByteSpan> & GetTestPaaRootStore() {
+const Span<const ByteSpan> & GetTestPaaRootStore()
+{
     return kTestAttestationTrustStoreRoots;
 }
 
-}  // TestCerts
-}  // chip
+} // namespace TestCerts
+} // namespace chip
diff --git a/src/credentials/attestation_verifier/CHIPAttCert_test_paa_store.h b/src/credentials/attestation_verifier/CHIPAttCert_test_paa_store.h
index 78c7b307c0601c..6444c087427207 100644
--- a/src/credentials/attestation_verifier/CHIPAttCert_test_paa_store.h
+++ b/src/credentials/attestation_verifier/CHIPAttCert_test_paa_store.h
@@ -28,5 +28,5 @@ extern const ByteSpan sTestCert_PAA_NoVID_Cert;
 
 const Span<const ByteSpan> & GetTestPaaRootStore();
 
-}  // TestCerts
-}  // chip
+} // namespace TestCerts
+} // namespace chip
diff --git a/src/credentials/attestation_verifier/DefaultDeviceAttestationVerifier.cpp b/src/credentials/attestation_verifier/DefaultDeviceAttestationVerifier.cpp
index e3f70f56cb5418..1abcaa79e7d865 100644
--- a/src/credentials/attestation_verifier/DefaultDeviceAttestationVerifier.cpp
+++ b/src/credentials/attestation_verifier/DefaultDeviceAttestationVerifier.cpp
@@ -270,9 +270,7 @@ constexpr std::array<MatterCDSigningKey, 6> gCdSigningKeys = { {
 
 struct TestAttestationTrustStore final : public ArrayAttestationTrustStore
 {
-    TestAttestationTrustStore() :
-        ArrayAttestationTrustStore(GetTestPaaRootStore().data(), GetTestPaaRootStore().size())
-    {}
+    TestAttestationTrustStore() : ArrayAttestationTrustStore(GetTestPaaRootStore().data(), GetTestPaaRootStore().size()) {}
 };
 Global<TestAttestationTrustStore> gTestAttestationTrustStore;