diff --git a/src/app/tests/integration/common.h b/src/app/tests/integration/common.h
index c8516d3e5ae3fb..9df1531ed73d71 100644
--- a/src/app/tests/integration/common.h
+++ b/src/app/tests/integration/common.h
@@ -25,10 +25,10 @@
 #pragma once
 
 #include <app/util/basic-types.h>
+#include <lib/support/TestPersistentStorageDelegate.h>
 #include <messaging/ExchangeMgr.h>
 #include <protocols/secure_channel/MessageCounterManager.h>
 #include <transport/SessionHolder.h>
-#include <lib/support/TestPersistentStorageDelegate.h>
 
 #define MAX_MESSAGE_SOURCE_STR_LENGTH (100)
 #define NETWORK_SLEEP_TIME_MSECS (100 * 1000)
diff --git a/src/messaging/tests/echo/common.cpp b/src/messaging/tests/echo/common.cpp
index 77d867df075c68..fdebf3e6bf1cdb 100644
--- a/src/messaging/tests/echo/common.cpp
+++ b/src/messaging/tests/echo/common.cpp
@@ -33,6 +33,7 @@
 chip::SessionManager gSessionManager;
 chip::Messaging::ExchangeManager gExchangeManager;
 chip::secure_channel::MessageCounterManager gMessageCounterManager;
+chip::TestPersistentStorageDelegate gStorage;
 
 void InitializeChip(void)
 {
diff --git a/src/messaging/tests/echo/common.h b/src/messaging/tests/echo/common.h
index 7538bc57247d83..cea330d0c93a3b 100644
--- a/src/messaging/tests/echo/common.h
+++ b/src/messaging/tests/echo/common.h
@@ -24,6 +24,7 @@
 
 #pragma once
 
+#include <lib/support/TestPersistentStorageDelegate.h>
 #include <messaging/ExchangeMgr.h>
 #include <protocols/secure_channel/MessageCounterManager.h>
 #include <transport/SessionManager.h>
@@ -35,6 +36,7 @@ constexpr size_t kNetworkSleepTimeMsecs       = (100 * 1000);
 extern chip::SessionManager gSessionManager;
 extern chip::Messaging::ExchangeManager gExchangeManager;
 extern chip::secure_channel::MessageCounterManager gMessageCounterManager;
+extern chip::TestPersistentStorageDelegate gStorage;
 
 void InitializeChip(void);
 void ShutdownChip(void);