diff --git a/src/credentials/tests/TestFabricTable.cpp b/src/credentials/tests/TestFabricTable.cpp
index 20a52f3892e0a2..b652dfbfd120a3 100644
--- a/src/credentials/tests/TestFabricTable.cpp
+++ b/src/credentials/tests/TestFabricTable.cpp
@@ -1831,11 +1831,13 @@ void TestCommitMarker(nlTestSuite * inSuite, void * inContext)
                 NL_TEST_ASSERT_SUCCESS(inSuite, fIdx1PublicKey.ECDSA_validate_msg_signature(&message[0], sizeof(message), sig));
             }
         }
+        numStorageKeysAfterFirstAdd = storage.GetNumKeys();
+
+        NL_TEST_ASSERT(inSuite, numStorageKeysAfterFirstAdd == 7); // Metadata, index, 3 certs, 1 opkey, last known good time
 
         // The following test requires test methods not available on all builds.
         // TODO: Debug why some CI jobs don't set it properly.
 #if CONFIG_BUILD_FOR_HOST_UNIT_TEST
-        numStorageKeysAfterFirstAdd = storage.GetNumKeys();
 
         // Add Fabric 2222 Node Id 66, no ICAC *** AND ABORT COMMIT ***
         {