diff --git a/src/app/codegen-data-model-provider/tests/TestCodegenModelViaMocks.cpp b/src/app/codegen-data-model-provider/tests/TestCodegenModelViaMocks.cpp
index aa3cdcd331bf92..3840de9c8151dc 100644
--- a/src/app/codegen-data-model-provider/tests/TestCodegenModelViaMocks.cpp
+++ b/src/app/codegen-data-model-provider/tests/TestCodegenModelViaMocks.cpp
@@ -2606,12 +2606,15 @@ TEST(TestCodegenModelViaMocks, DeviceTypeIteration)
     std::optional<DeviceTypeEntry> entry = model.FirstDeviceType(kMockEndpoint1);
     ASSERT_EQ(entry,
               std::make_optional(DeviceTypeEntry{ .deviceTypeId = kDeviceTypeId1, .deviceTypeVersion = kDeviceTypeId1Version }));
+    // NOLINTNEXTLINE(bugprone-unchecked-optional-access): Assert above that this is not none
     entry = model.NextDeviceType(kMockEndpoint1, *entry);
     ASSERT_EQ(entry,
               std::make_optional(DeviceTypeEntry{ .deviceTypeId = kDeviceTypeId2, .deviceTypeVersion = kDeviceTypeId2Version }));
+    // NOLINTNEXTLINE(bugprone-unchecked-optional-access): Assert above that this is not none
     entry = model.NextDeviceType(kMockEndpoint1, *entry);
     ASSERT_EQ(entry,
               std::make_optional(DeviceTypeEntry{ .deviceTypeId = kDeviceTypeId3, .deviceTypeVersion = kDeviceTypeId3Version }));
+    // NOLINTNEXTLINE(bugprone-unchecked-optional-access): Assert above that this is not none
     entry = model.NextDeviceType(kMockEndpoint1, *entry);
     ASSERT_FALSE(entry.has_value());
 
@@ -2619,6 +2622,7 @@ TEST(TestCodegenModelViaMocks, DeviceTypeIteration)
     entry = model.FirstDeviceType(kMockEndpoint2);
     ASSERT_EQ(entry,
               std::make_optional(DeviceTypeEntry{ .deviceTypeId = kDeviceTypeId2, .deviceTypeVersion = kDeviceTypeId2Version }));
+    // NOLINTNEXTLINE(bugprone-unchecked-optional-access): Assert above that this is not none
     entry = model.NextDeviceType(kMockEndpoint2, *entry);
     ASSERT_FALSE(entry.has_value());