diff --git a/Testing/Applications/CMakeLists.txt b/Testing/Applications/CMakeLists.txt
index cda75a6b548c65150329dcf85ddc79b879fff105..9cb5a81abbf6ff4f85cfdc1bbcc9ec0c30abb009 100644
--- a/Testing/Applications/CMakeLists.txt
+++ b/Testing/Applications/CMakeLists.txt
@@ -6,8 +6,11 @@ endif(OTB_DATA_USE_LARGEINPUT)
 
 set(TEMP ${OTB_BINARY_DIR}/Testing/Temporary)
 
-SET(BASELINE       ${OTB_DATA_ROOT}/Baseline/OTB/Images)
-SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files)
+SET(BASELINE              ${OTB_DATA_ROOT}/Baseline/OTB/Images)
+SET(BASELINE_FILES        ${OTB_DATA_ROOT}/Baseline/OTB/Files)
+
+SET(OTBAPP_BASELINE       ${OTB_DATA_ROOT}/Baseline/OTB-Applications/Images)
+SET(OTBAPP_BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB-Applications/Files)
 
 
 SET(NOTOL 0.0)
diff --git a/Testing/Applications/Classification/CMakeLists.txt b/Testing/Applications/Classification/CMakeLists.txt
index cd0c744c228bc6d74c13eaf1b6ae49a48a956548..71767076a295bb55692e99102b9ce70c2e8b4d01 100644
--- a/Testing/Applications/Classification/CMakeLists.txt
+++ b/Testing/Applications/Classification/CMakeLists.txt
@@ -4,7 +4,7 @@
 add_test(NAME apTvClEstimateImagesStatisticsQB1
          COMMAND otbTestDriver
                 --compare-ascii ${NOTOL} 
-                  ${BASELINE_FILES}/clImageStatisticsQB1.xml
+                  ${OTBAPP_BASELINE_FILES}/clImageStatisticsQB1.xml
                   ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
                  Execute $<TARGET_FILE:otbApplicationLauncherCommandLine>
                  EstimateImagesStatistics
@@ -15,7 +15,7 @@ add_test(NAME apTvClEstimateImagesStatisticsQB1
 add_test(NAME apTvClEstimateImagesStatisticsQB123
          COMMAND otbTestDriver
                 --compare-ascii ${NOTOL} 
-                  ${BASELINE_FILES}/clImageStatisticsQB123.xml
+                  ${OTBAPP_BASELINE_FILES}/clImageStatisticsQB123.xml
                   ${TEMP}/apTvClEstimateImageStatisticsQB123.xml
                  Execute $<TARGET_FILE:otbApplicationLauncherCommandLine>
                  EstimateImagesStatistics
@@ -28,7 +28,7 @@ add_test(NAME apTvClEstimateImagesStatisticsQB123
 add_test(NAME apTvClEstimateImagesStatisticsQB456
          COMMAND otbTestDriver
                 --compare-ascii ${NOTOL} 
-                  ${BASELINE_FILES}/clImageStatisticsQB456.xml
+                  ${OTBAPP_BASELINE_FILES}/clImageStatisticsQB456.xml
                   ${TEMP}/apTvClEstimateImageStatisticsQB456.xml
                  Execute $<TARGET_FILE:otbApplicationLauncherCommandLine>
                  EstimateImagesStatistics