diff --git a/Modules/Applications/AppClassification/test/CMakeLists.txt b/Modules/Applications/AppClassification/test/CMakeLists.txt
index f0d3460c00f114f16ab7d6bdf2b7fa3a0f599ab8..28f771c65a7241cc575b65277ce9fc11ad410e3c 100644
--- a/Modules/Applications/AppClassification/test/CMakeLists.txt
+++ b/Modules/Applications/AppClassification/test/CMakeLists.txt
@@ -1019,23 +1019,23 @@ otb_test_application(NAME apTvClSampleAugmentationSmote
 #----------- ZonalStatistics TESTS ----------------
 otb_test_application(NAME apTvClZonalStatisticsVec
   APP  ZonalStatistics
-  OPTIONS -mode vector -mode.vector.in ${INPUTDATA}/Classification/VectorData_QB1_ter.shp -mode.vector.out ${TEMP}/apTvClVectorData_QB1_ter_with_stats.shp -in ${INPUTDATA}/Classification/QB_1_ortho.tif -mode.vector.reproject 1
+  OPTIONS -inzone vector -inzone.vector.in ${INPUTDATA}/Classification/VectorData_QB1_ter.shp -out.vector.filename ${TEMP}/apTvClVectorData_QB1_ter_with_stats.shp -in ${INPUTDATA}/Classification/QB_1_ortho.tif -inzone.vector.reproject 1
   VALID   --compare-ascii ${NOTOL}
-  ${OTB_DATA_ROOT}/Baseline/apTvClVectorData_QB1_ter_with_stats.dbf
+  ${OTBAPP_BASELINE_FILES}/apTvClVectorData_QB1_ter_with_stats.dbf
   ${TEMP}/apTvClVectorData_QB1_ter_with_stats.dbf)
 
 otb_test_application(NAME apTvClZonalStatisticsImg
   APP  ZonalStatistics
-  OPTIONS -mode labelimage -mode.labelimage.in ${INPUTDATA}/Classification/VectorData_QB1_ter.tif -mode.labelimage.outxml ${TEMP}/apTvClVectorData_QB1_ter_stats.xml -in ${INPUTDATA}/Classification/QB_1_ortho.tif
+  OPTIONS -inzone labelimage -inzone.labelimage.in ${INPUTDATA}/Classification/VectorData_QB1_ter.tif -out.xml.filename ${TEMP}/apTvClVectorData_QB1_ter_stats.xml -in ${INPUTDATA}/Classification/QB_1_ortho.tif -out xml
   VALID   --compare-ascii ${NOTOL}
-  ${OTB_DATA_ROOT}/Baseline/apTvClVectorData_QB1_ter_stats.xml
+  ${OTBAPP_BASELINE_FILES}/apTvClVectorData_QB1_ter_stats.xml
   ${TEMP}/apTvClVectorData_QB1_ter_stats.xml)
 
 otb_test_application(NAME apTvClZonalStatisticsImgNoData
   APP  ZonalStatistics
-  OPTIONS -mode labelimage -mode.labelimage.in ${INPUTDATA}/Classification/VectorData_QB1_ter.tif -mode.labelimage.outxml ${TEMP}/apTvClVectorData_QB1_ter_stats_nodata.xml -in ${INPUTDATA}/Classification/QB_1_ortho.tif -mode.labelimage.nodata -1
+  OPTIONS -inzone labelimage -inzone.labelimage.in ${INPUTDATA}/Classification/VectorData_QB1_ter.tif -out.xml.filename ${TEMP}/apTvClVectorData_QB1_ter_stats_nodata.xml -in ${INPUTDATA}/Classification/QB_1_ortho.tif -inzone.labelimage.nodata -1  -out xml
   VALID   --compare-ascii ${NOTOL}
-  ${OTB_DATA_ROOT}/Baseline/apTvClVectorData_QB1_ter_stats_nodata.xml
+  ${OTBAPP_BASELINE_FILES}/apTvClVectorData_QB1_ter_stats_nodata.xml
   ${TEMP}/apTvClVectorData_QB1_ter_stats_nodata.xml)
 
   
\ No newline at end of file