diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4176698a4357e0d100dfb70ea6f96cd9de98752..b307d4a2b2054095a1737f2b6ebd90e40af6b16c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,12 +180,6 @@ INCLUDE_DIRECTORIES( ${OTB_INCLUDE_DIRS} )
 INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityC.cmake)
 INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)
 
-
-
-#-----------------------------------------------------------------------------
-# Repertoire des images de télédetection.
-SET( OTB_DATA_DIR "$ENV{OTB_DATA_DIR}" CACHE STRING "Image directory")
-
 #-----------------------------------------------------------------------------
 # Configure Dart testing support.  This should be done before any
 # MESSAGE(FATAL_ERROR ...) commands are invoked.
@@ -449,7 +443,7 @@ ENDIF(OTB_SIZEOF_LONG_LONG)
 
 #-----------------------------------------------------------------------------
 # Configure the default OTB_DATA_ROOT for the location of OTB Data.
-FIND_PATH(OTB_DATA_ROOT OTBData.readme ${OTB_SOURCE_DIR}/Testing/Data $ENV{OTB_DATA_ROOT})
+FIND_PATH(OTB_DATA_ROOT OTBData.readme $ENV{OTB_DATA_ROOT})
 MARK_AS_ADVANCED(OTB_DATA_ROOT)
 
 
diff --git a/Testing/Code/BasicFilters/CMakeLists.txt b/Testing/Code/BasicFilters/CMakeLists.txt
index 7668c174fc4842a47fd31f7f05044e4e23fab593..80376d6de11390c0b103f37d2b1274974bb23e83 100755
--- a/Testing/Code/BasicFilters/CMakeLists.txt
+++ b/Testing/Code/BasicFilters/CMakeLists.txt
@@ -1,11 +1,11 @@
 
 IF( NOT OTB_DISABLE_CXX_TESTING )
 
-SET(BASELINE ${OTB_DATA_DIR}/Baseline/OTB/Images)
-SET(BASELINE_FILES ${OTB_DATA_DIR}/Baseline/OTB/Files)
-SET(INPUTDATA ${OTB_DATA_DIR}/Input)
+SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images)
+SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files)
+SET(INPUTDATA ${OTB_DATA_ROOT}/Input)
 #Images de teledetection (grosses images )
-SET(IMAGEDATA ${OTB_DATA_DIR}/LargeInput )
+SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput )
 SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary)
 
 
diff --git a/Testing/Code/ChangeDetection/CMakeLists.txt b/Testing/Code/ChangeDetection/CMakeLists.txt
index 748276f2872cc8b6836b91b62a3a2e3c5abd08a1..d8b695641361679a6091892c0556ecab1e0f83dd 100755
--- a/Testing/Code/ChangeDetection/CMakeLists.txt
+++ b/Testing/Code/ChangeDetection/CMakeLists.txt
@@ -1,11 +1,11 @@
 
 IF( NOT OTB_DISABLE_CXX_TESTING )
 
-SET(BASELINE ${OTB_DATA_DIR}/Baseline/OTB/Images)
-SET(BASELINE_FILES ${OTB_DATA_DIR}/Baseline/OTB/Files)
-SET(INPUTDATA ${OTB_DATA_DIR}/Input)
+SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images)
+SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files)
+SET(INPUTDATA ${OTB_DATA_ROOT}/Input)
 #Images de teledetection (grosses images )
-SET(IMAGEDATA ${OTB_DATA_DIR}/LargeInput )
+SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput )
 SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary)
 
 
diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt
index 5556b4820d3158990cd9d9db3c3603326868921f..78ffdffec72eb7b7061616f11b138a25e5d4ba56 100644
--- a/Testing/Code/Common/CMakeLists.txt
+++ b/Testing/Code/Common/CMakeLists.txt
@@ -1,11 +1,11 @@
  
 IF( NOT OTB_DISABLE_CXX_TESTING )
 
-SET(BASELINE ${OTB_DATA_DIR}/Baseline/OTB/Images)
-SET(BASELINE_FILES ${OTB_DATA_DIR}/Baseline/OTB/Files)
-SET(INPUTDATA ${OTB_DATA_DIR}/Input)
+SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images)
+SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files)
+SET(INPUTDATA ${OTB_DATA_ROOT}/Input)
 #Images de teledetection (grosses images )
-SET(IMAGEDATA ${OTB_DATA_DIR}/LargeInput )
+SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput )
 SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary)
 
 #Tolerance sur diff pixel image
diff --git a/Testing/Code/FeatureExtraction/CMakeLists.txt b/Testing/Code/FeatureExtraction/CMakeLists.txt
index c0bf7a400374cd3cfd362dad877c9317b259c0e0..685bf625cca229ed8e5f9fc63473de405692e481 100755
--- a/Testing/Code/FeatureExtraction/CMakeLists.txt
+++ b/Testing/Code/FeatureExtraction/CMakeLists.txt
@@ -1,11 +1,11 @@
 
 IF( NOT OTB_DISABLE_CXX_TESTING )
 
-SET(BASELINE ${OTB_DATA_DIR}/Baseline/OTB/Images)
-SET(BASELINE_FILES ${OTB_DATA_DIR}/Baseline/OTB/Files)
-SET(INPUTDATA ${OTB_DATA_DIR}/Input)
+SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images)
+SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files)
+SET(INPUTDATA ${OTB_DATA_ROOT}/Input)
 #Images de teledetection (grosses images )
-SET(IMAGEDATA ${OTB_DATA_DIR}/LargeInput )
+SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput )
 SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary)
 
 
diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt
index 0f6151814cc481ce998495950c0bfcc3547c8060..2a0f0959bc605ca9405b9ce1bbc21f668100a0f5 100755
--- a/Testing/Code/IO/CMakeLists.txt
+++ b/Testing/Code/IO/CMakeLists.txt
@@ -2,11 +2,11 @@
 
 IF( NOT OTB_DISABLE_CXX_TESTING )
 
-SET(BASELINE ${OTB_DATA_DIR}/Baseline/OTB/Images)
-SET(BASELINE_FILES ${OTB_DATA_DIR}/Baseline/OTB/Files)
-SET(INPUTDATA ${OTB_DATA_DIR}/Input)
+SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images)
+SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files)
+SET(INPUTDATA ${OTB_DATA_ROOT}/Input)
 #Images de teledetection (grosses images )
-SET(IMAGEDATA ${OTB_DATA_DIR}/LargeInput )
+SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput )
 SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary)
 
 #Tolerance sur diff pixel image
diff --git a/Testing/Code/Installation/CMakeLists.txt b/Testing/Code/Installation/CMakeLists.txt
index 764a8518698adcec94fe5de99d8b3da5830034d6..df4fbd64b1623ae3e6cbeb0fd9203d6c690399b7 100644
--- a/Testing/Code/Installation/CMakeLists.txt
+++ b/Testing/Code/Installation/CMakeLists.txt
@@ -1,10 +1,10 @@
 IF( NOT OTB_DISABLE_CXX_TESTING )
 
-SET(BASELINE ${OTB_DATA_DIR}/Baseline/OTB/Images)
-SET(BASELINE_FILES ${OTB_DATA_DIR}/Baseline/OTB/Files)
-SET(INPUTDATA ${OTB_DATA_DIR}/Input)
+SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images)
+SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files)
+SET(INPUTDATA ${OTB_DATA_ROOT}/Input)
 #Images de teledetection (grosses images )
-SET(IMAGEDATA ${OTB_DATA_DIR}/LargeInput )
+SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput )
 SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary)
 
 ADD_TEST(inTuInstallationTest ${CXX_TEST_PATH}/otbInstallationTest      
diff --git a/Testing/Code/Learning/CMakeLists.txt b/Testing/Code/Learning/CMakeLists.txt
index a08e0ae03f4da2bf903cd353fc4d07324730f210..98a48ff119ee3d9b70210dfc01281f97a0c1e6e7 100644
--- a/Testing/Code/Learning/CMakeLists.txt
+++ b/Testing/Code/Learning/CMakeLists.txt
@@ -1,11 +1,11 @@
 
 IF( NOT OTB_DISABLE_CXX_TESTING )
 
-SET(BASELINE ${OTB_DATA_DIR}/Baseline/OTB/Images)
-SET(BASELINE_FILES ${OTB_DATA_DIR}/Baseline/OTB/Files)
-SET(INPUTDATA ${OTB_DATA_DIR}/Input)
+SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images)
+SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files)
+SET(INPUTDATA ${OTB_DATA_ROOT}/Input)
 #Images de teledetection (grosses images )
-SET(IMAGEDATA ${OTB_DATA_DIR}/LargeInput )
+SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput )
 SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary)
 
 
diff --git a/Testing/Code/Visu/CMakeLists.txt b/Testing/Code/Visu/CMakeLists.txt
index 8a030e976f2069b379abf8f5a21ea1d86da02370..b548471e35f612189d14356744b5b15ae5110623 100755
--- a/Testing/Code/Visu/CMakeLists.txt
+++ b/Testing/Code/Visu/CMakeLists.txt
@@ -3,11 +3,11 @@ IF( NOT OTB_DISABLE_CXX_TESTING )
 
 # SUBDIRS( ImageViewer ImageColorViewer )
 
-SET(BASELINE ${OTB_DATA_DIR}/Baseline/OTB/Images)
-SET(BASELINE_FILES ${OTB_DATA_DIR}/Baseline/OTB/Files)
-SET(INPUTDATA ${OTB_DATA_DIR}/Input)
+SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images)
+SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files)
+SET(INPUTDATA ${OTB_DATA_ROOT}/Input)
 #Images de teledetection (grosses images )
-SET(IMAGEDATA ${OTB_DATA_DIR}/LargeInput )
+SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput )
 SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary)
 
 
diff --git a/Testing/Fa/CMakeLists.txt b/Testing/Fa/CMakeLists.txt
index 9dc5629cfb951e534f3cf88a3fcbf6abaaf31e5c..1194cada84e51532cbe628ada7bb33bc1bd3debd 100755
--- a/Testing/Fa/CMakeLists.txt
+++ b/Testing/Fa/CMakeLists.txt
@@ -2,11 +2,11 @@
 
 IF( NOT OTB_DISABLE_CXX_TESTING )
 
-SET(BASELINE ${OTB_DATA_DIR}/Baseline/OTB/Fa)
-SET(BASELINE_FILES ${OTB_DATA_DIR}/Baseline/OTB/Files)
-SET(INPUTDATA ${OTB_DATA_DIR}/Input)
+SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Fa)
+SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files)
+SET(INPUTDATA ${OTB_DATA_ROOT}/Input)
 #Images de teledetection (grosses images )
-SET(IMAGEDATA ${OTB_DATA_DIR}/LargeInput )
+SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput )
 SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary)
 
 #Tolerance sur diff pixel image