diff --git a/src/app/AttributePersistenceProvider.h b/src/app/AttributePersistenceProvider.h
index d1b05c13a5fb9c..ea9fdfed7b2203 100644
--- a/src/app/AttributePersistenceProvider.h
+++ b/src/app/AttributePersistenceProvider.h
@@ -19,10 +19,10 @@
 #include <app/data-model/Nullable.h>
 #include <app/util/attribute-metadata.h>
 #include <cstring>
+#include <inttypes.h>
 #include <lib/support/BufferReader.h>
 #include <lib/support/BufferWriter.h>
 #include <lib/support/Span.h>
-#include <inttypes.h>
 
 namespace chip {
 namespace app {
diff --git a/src/app/tests/TestAttributePersistenceProvider.cpp b/src/app/tests/TestAttributePersistenceProvider.cpp
index 27e7ad0c79ceb9..d531e744890fb3 100644
--- a/src/app/tests/TestAttributePersistenceProvider.cpp
+++ b/src/app/tests/TestAttributePersistenceProvider.cpp
@@ -96,7 +96,7 @@ void testHelperStorageAndRetrivalScalarValues(nlTestSuite * inSuite, DefaultAttr
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
     T valueReadBack = 0;
-    err = persistenceProvider.ReadScalarValue(TestConcretePath, valueReadBack);
+    err             = persistenceProvider.ReadScalarValue(TestConcretePath, valueReadBack);
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 
     NL_TEST_ASSERT(inSuite, valueReadBack == testValue);
@@ -372,7 +372,8 @@ const nlTest sTests[] = {
     NL_TEST_DEF("Storage and retrival of signed scalar values", TestStorageAndRetrivalSignedScalarValues),
     NL_TEST_DEF("Storage and retrival of unsigned nullable scalar values", TestStorageAndRetrivalNullableScalarValues),
     NL_TEST_DEF("Storage and retrival of signed nullable scalar values", TestStorageAndRetrivalSignedNullableScalarValues),
-    NL_TEST_DEF("Small buffer errors", TestBufferTooSmallErrors), NL_TEST_SENTINEL()
+    NL_TEST_DEF("Small buffer errors", TestBufferTooSmallErrors),
+    NL_TEST_SENTINEL()
 };
 }