diff --git a/Examples/BasicFilters/test/CMakeLists.txt b/Examples/BasicFilters/test/CMakeLists.txt
index 2a55e1a194645585851966a725c70df922f02c72..839cdd7b9e599e16e1071dcedd6d6acc2f709f31 100644
--- a/Examples/BasicFilters/test/CMakeLists.txt
+++ b/Examples/BasicFilters/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/BasicFilters)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 otb_add_test(NAME bfTeLeeImageFilterTest COMMAND ${OTB_TEST_DRIVER}
   --compare-n-images ${NOTOL} 1
diff --git a/Examples/ChangeDetection/test/CMakeLists.txt b/Examples/ChangeDetection/test/CMakeLists.txt
index 5307aeec540419d6c79c478183e6e41fa075585d..e2306923885f4497235e3270453439b7932ffe21 100644
--- a/Examples/ChangeDetection/test/CMakeLists.txt
+++ b/Examples/ChangeDetection/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/ChangeDetection)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 # ------- CorrelChDetTest----------
 
diff --git a/Examples/Classification/test/CMakeLists.txt b/Examples/Classification/test/CMakeLists.txt
index 882d5c5a0ef8570e4a571c959864235c77ac4099..4a565fa4f36960230319443897205c95a9a91282 100644
--- a/Examples/Classification/test/CMakeLists.txt
+++ b/Examples/Classification/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/Classification)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 otb_add_test(NAME clTeNeighborhoodMajorityVotingImageFilterTest COMMAND ${OTB_TEST_DRIVER}
   --compare-image ${NOTOL}
diff --git a/Examples/DataRepresentation/Image/test/CMakeLists.txt b/Examples/DataRepresentation/Image/test/CMakeLists.txt
index 8469a98c1d9d61e6d761e9ccbffaa861f0b9e5e3..a3378d0327564e14e1bf911591ee0de28b46dfa5 100644
--- a/Examples/DataRepresentation/Image/test/CMakeLists.txt
+++ b/Examples/DataRepresentation/Image/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/DataRepresentation/Image)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 # ------- Image5Test----------
 
diff --git a/Examples/DisparityMap/test/CMakeLists.txt b/Examples/DisparityMap/test/CMakeLists.txt
index 5b7cb09acc698af78308f6038a62ec1699815f03..3966ebf2968eba7b32242b14f15f819ba0181d73 100644
--- a/Examples/DisparityMap/test/CMakeLists.txt
+++ b/Examples/DisparityMap/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/DisparityMap)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 if(OTBMathParser_LOADED)
 #otb_add_test(NAME dmTeStereoReconstructionExampleTest COMMAND ${OTB_TEST_DRIVER}
diff --git a/Examples/FeatureExtraction/test/CMakeLists.txt b/Examples/FeatureExtraction/test/CMakeLists.txt
index 426998efff7dbfc3163d18b69b2c831b8ace4135..0f1e957d04e949f5bcf3d51906014e7fc2e0061e 100644
--- a/Examples/FeatureExtraction/test/CMakeLists.txt
+++ b/Examples/FeatureExtraction/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/FeatureExtraction)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 # ------- CorrelationLineDetectorExampleTest----------
 
diff --git a/Examples/Filtering/test/CMakeLists.txt b/Examples/Filtering/test/CMakeLists.txt
index 7ebf5114cb43832b5774338eb028076bc3547991..7a49eaf6ad7d9eb92322c4ddf4dac69d7e58213f 100644
--- a/Examples/Filtering/test/CMakeLists.txt
+++ b/Examples/Filtering/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/Filtering)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 # ------- DanielssonDistanceMapImageFilterTest----------
 
diff --git a/Examples/Fusion/test/CMakeLists.txt b/Examples/Fusion/test/CMakeLists.txt
index 526c8ef719175e4fc4f99d1b6440143a4bd007ad..46372fd4821add0895b65fc25efba3ee579c609c 100644
--- a/Examples/Fusion/test/CMakeLists.txt
+++ b/Examples/Fusion/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/Fusion)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 otb_add_test(NAME fuTeBayesianFusionImageFilterTest COMMAND ${OTB_TEST_DRIVER}
   --compare-image ${EPSILON_8}
diff --git a/Examples/Hyperspectral/test/CMakeLists.txt b/Examples/Hyperspectral/test/CMakeLists.txt
index 1fd15e01f2fddc539f55d2f11337bc0783c064ed..84ab5be4d69af30c2cbefeb89f18a2694e0c6a9e 100644
--- a/Examples/Hyperspectral/test/CMakeLists.txt
+++ b/Examples/Hyperspectral/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/Hyperspectral)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 otb_add_test(NAME siTvHyperspectralExampleTest COMMAND ${OTB_TEST_DRIVER}
   --compare-n-images ${NOTOL} 3
diff --git a/Examples/IO/test/CMakeLists.txt b/Examples/IO/test/CMakeLists.txt
index acdbf3cfa086a800c73d605067a3c6a764f7cd33..1d6352ad61d66773ec6daaa00338ce87cef10a46 100644
--- a/Examples/IO/test/CMakeLists.txt
+++ b/Examples/IO/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/IO)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 # ------- ExtractROITest----------
 
diff --git a/Examples/Iterators/test/CMakeLists.txt b/Examples/Iterators/test/CMakeLists.txt
index 2fec495c64b28e862543c5bdd7bfefeb240c753b..316823ffa7bd4ec04cbebfcac192386285bce8e9 100644
--- a/Examples/Iterators/test/CMakeLists.txt
+++ b/Examples/Iterators/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/Iterators)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 # ------- ImageRegionIteratorWithIndexTest----------
 
diff --git a/Examples/Learning/test/CMakeLists.txt b/Examples/Learning/test/CMakeLists.txt
index 01f07648404726d22d7a67a57bc99e33d0abbe52..f0569ed7efc5da01144eab39229b359230eb67b1 100644
--- a/Examples/Learning/test/CMakeLists.txt
+++ b/Examples/Learning/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/Learning)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 if(OTBLibSVM_LOADED)
 # ------- SVMImageEstimatorClassificationMultiExampleTest----------
diff --git a/Examples/Markov/test/CMakeLists.txt b/Examples/Markov/test/CMakeLists.txt
index ff4bb7c5025643a9f5a6331ab77030cb02666534..9f54ff9cb1e4f2d191a363fb4058bc2b2a915fe6 100644
--- a/Examples/Markov/test/CMakeLists.txt
+++ b/Examples/Markov/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/Markov)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 otb_add_test(NAME maTeMarkovClassification1ExampleTest COMMAND ${OTB_TEST_DRIVER}
   --compare-image ${EPSILON_8}
diff --git a/Examples/OBIA/test/CMakeLists.txt b/Examples/OBIA/test/CMakeLists.txt
index 984cfe7ccb9649f0fb588936263a15d54363002b..49cb2f872e107f61111f8f8de573c974f6c1badb 100644
--- a/Examples/OBIA/test/CMakeLists.txt
+++ b/Examples/OBIA/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/OBIA)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 #if(OTBMathParser_LOADED)
 #otb_add_test(NAME trTeOBIARadiometricAttributesLabelMapFilterTest COMMAND ${OTB_TEST_DRIVER}
diff --git a/Examples/Patented/test/CMakeLists.txt b/Examples/Patented/test/CMakeLists.txt
index 42a0bc93a19e31ea35a8d22e41f90f057fd98edb..3a134c94a4aa07dfcb2604e21646cd6d9f3d16b0 100644
--- a/Examples/Patented/test/CMakeLists.txt
+++ b/Examples/Patented/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/Patented)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 # -----SIFTDisparityMapEstimationTest---------
 if(Module_OTBSiftFast)
diff --git a/Examples/Projections/test/CMakeLists.txt b/Examples/Projections/test/CMakeLists.txt
index de2ea2d5cabc564ef979c91ff943ed4579888e7e..e6c9249f6e3d43fc644b9db314c0a3bdac916672 100644
--- a/Examples/Projections/test/CMakeLists.txt
+++ b/Examples/Projections/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/Projections)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 otb_add_test(NAME prTeOrthoRectificationExampleTest COMMAND ${OTB_TEST_DRIVER}
   --compare-image ${NOTOL}
diff --git a/Examples/Radiometry/test/CMakeLists.txt b/Examples/Radiometry/test/CMakeLists.txt
index 8416960be304b45fb27d152607f819a65268ed9f..b30d3aa7ce82dc01e623f5bbd7efb4d843133498 100644
--- a/Examples/Radiometry/test/CMakeLists.txt
+++ b/Examples/Radiometry/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/Radiometry)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 # -------            ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter   ------------------------------
 
diff --git a/Examples/Simulation/test/CMakeLists.txt b/Examples/Simulation/test/CMakeLists.txt
index 238b10d541051058f6fc059feb1affba376c0e38..dc791b71cc7bc0f7161dc2286b23f03989a16ed6 100644
--- a/Examples/Simulation/test/CMakeLists.txt
+++ b/Examples/Simulation/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/Simulation)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 # ------- ProsailModelExampleTest ----------
 
diff --git a/Examples/Tutorials/test/CMakeLists.txt b/Examples/Tutorials/test/CMakeLists.txt
index bad22113c29aebcc61edbf6d43706c0da8166121..5a4196320db63c9d6e8b98584989f9cc2251275e 100644
--- a/Examples/Tutorials/test/CMakeLists.txt
+++ b/Examples/Tutorials/test/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/Tutorials)
-set(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+set(INPUTDATA ${OTB_DATA_ROOT}/Input)
 
 otb_add_test(NAME  trTeTutorialsHelloWorld COMMAND ${OTB_TEST_DRIVER}
   Execute $<TARGET_FILE:HelloWorldOTB>