diff --git a/Modules/IO/ExtendedFilename/test/otbExtendedFilenameToWriterOptionsTest.cxx b/Modules/IO/ExtendedFilename/test/otbExtendedFilenameToWriterOptionsTest.cxx
index e7f61af5018b7e74c975a11dcf365bd0969dfbf9..6ad79a8f8966be3b0e35dbb40af70b62f4576bcc 100644
--- a/Modules/IO/ExtendedFilename/test/otbExtendedFilenameToWriterOptionsTest.cxx
+++ b/Modules/IO/ExtendedFilename/test/otbExtendedFilenameToWriterOptionsTest.cxx
@@ -46,17 +46,21 @@ int otbExtendedFilenameToWriterOptions(int itkNotUsed(argc), char* argv[])
 
   file << helper->gdalCreationOptionsIsSet() << std::endl;
   if (helper->gdalCreationOptionsIsSet())
+  {
     for (unsigned int i = 0; i < helper->GetgdalCreationOptions().size(); i++)
     {
       file << helper->GetgdalCreationOptions()[i] << std::endl;
     }
+  }
 
   file << helper->NoDataValueIsSet() << std::endl;
   if (helper->NoDataValueIsSet())
-    for (unsigned int i = 0; i < helper->GetNoDataList().size(); i++)
+  {
+    for (auto const& nodata_kv : helper->GetNoDataList())
     {
-      file << helper->GetNoDataList()[i].first << " ; " << helper->GetNoDataList()[i].second << std::endl;
+      file << nodata_kv.first << " ; " << nodata_kv.second << "\n";
     }
+  }
 
   file << helper->SrsValueIsSet() << std::endl;
   if (helper->SrsValueIsSet())