diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt
index 401d3b988b9b2bea435254708f01e87d7ff6dc36..d0aea336f9af08f7e55386fccf806f01a26e333e 100755
--- a/Testing/Code/IO/CMakeLists.txt
+++ b/Testing/Code/IO/CMakeLists.txt
@@ -58,7 +58,7 @@ IF(OTB_DATA_USE_LARGEINPUT)
 # ---  RADARSAT (GDAL)  ---
 ADD_TEST(ioTvMultiMonoChannelROI_RADARSAT2ENVI ${COMMON_TESTS3}
          otbMultiToMonoChannelExtractROI
-         -ushort ${LARGEDATA}/RADARSAT1/SCENE01/
+         -ushort ${LARGEDATA}/RADARSAT1/PRODUCT1/SCENE01/
          -ushort ${TEMP}/ioMultiMonoChannelROI_RADARSAT2ENVI_2559_3591_337_280.hdr
          -startX 2559 -startY 3591 -sizeX 337 -sizeY 280 )
 
@@ -101,7 +101,7 @@ ADD_TEST(ioTvImageFileReaderRADARSAT ${IO_TESTS1}
    --compare-image ${EPSILON_9} ${BASELINE}/ioImageFileReaderRADARSAT.tif
                            ${TEMP}/ioImageFileReaderRADARSAT.tif
          otbImageFileReaderERS
-         ${LARGEDATA}/RADARSAT1/SCENE01/
+         ${LARGEDATA}/RADARSAT1/PRODUCT1/SCENE01/
          ${TEMP}/ioImageFileReaderRADARSAT.tif)
 
 ADD_TEST(ioTvImageFileReaderPALSAR ${IO_TESTS1}
@@ -506,8 +506,8 @@ IF(OTB_DATA_USE_LARGEINPUT)
 
 ADD_TEST(ioTuGDALImageIOCanRead_RADARSAT ${IO_TESTS5} otbGDALImageIOTestCanRead
 # Filename identification is now set in the ImageFileReader class (Fiche 212)
-#        ${LARGEDATA}/RADARSAT1/SCENE01/ )
-        ${LARGEDATA}/RADARSAT1/SCENE01/DAT_01.001 )
+#        ${LARGEDATA}/RADARSAT1/PRODUCT1/SCENE01/ )
+        ${LARGEDATA}/RADARSAT1/PRODUCT1/SCENE01/DAT_01.001 )
 
 ADD_TEST(ioTuGDALImageIOCanRead_SAR_ERS2 ${IO_TESTS5} otbGDALImageIOTestCanRead
 # Filename identification is now set in the ImageFileReader class (Fiche 212)
@@ -999,7 +999,7 @@ ADD_TEST(ioTvOtbImageTestRadarsat ${IO_TESTS9}
    --compare-ascii ${EPS}  ${BASELINE_FILES}/ioOtbImageTestRadarsat.txt
                      ${TEMP}/ioOtbImageTestRadarsat.txt
         otbImageTest
-       	${LARGEDATA}/RADARSAT1/SCENE01/
+       	${LARGEDATA}/RADARSAT1/PRODUCT1/SCENE01/
         ${TEMP}/ioOtbImageTestRadarsat.txt)
 
 # ---  Otb::VectorImage Test  ---
@@ -1007,7 +1007,7 @@ ADD_TEST(ioTvOtbVectorImageTestRadarsat ${IO_TESTS9}
    --compare-ascii ${EPS}  ${TEMP}/ioOtbImageTestRadarsat.txt
                      ${TEMP}/ioOtbVectorImageTestRadarsat.txt
         otbVectorImageTest
-        ${LARGEDATA}/RADARSAT1/SCENE01/
+        ${LARGEDATA}/RADARSAT1/PRODUCT1/SCENE01/
         ${TEMP}/ioOtbVectorImageTestRadarsat.txt)
 
 
@@ -1618,7 +1618,7 @@ ADD_TEST(ioTvGDALDriverDoubleWritingTest ${IO_TESTS14}
 IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(ioTvReadingComplexDataIntoComplexImage ${IO_TESTS14}
 		otbReadingComplexDataIntoComplexImageTest
-		${LARGEDATA}/RADARSAT2/SCENE01/DAT_01.001
+		${LARGEDATA}/RADARSAT1/PRODUCT2/SCENE01/DAT_01.001
 		1000 1000
 )
 
@@ -1627,7 +1627,7 @@ ADD_TEST(ioTvWritingComplexDataWithComplexImage ${IO_TESTS14}
 		${BASELINE}/ioWritingComplexDataWithComplexImageOutput.tif
 		${TEMP}/ioWritingComplexDataWithComplexImageOutput.tif
 		otbWritingComplexDataWithComplexImageTest
-		${LARGEDATA}/RADARSAT2/SCENE01/DAT_01.001
+		${LARGEDATA}/RADARSAT1/PRODUCT2/SCENE01/DAT_01.001
 		${TEMP}/ioWritingComplexDataWithComplexImageOutput.tif
 		1000 1000
 		500  500
diff --git a/Testing/Code/Projections/CMakeLists.txt b/Testing/Code/Projections/CMakeLists.txt
index 6920b9dc89f7a9d47418463ce61effd48098997e..8365cb22e32cfeb3f929ce7ae97eca9a39045794 100644
--- a/Testing/Code/Projections/CMakeLists.txt
+++ b/Testing/Code/Projections/CMakeLists.txt
@@ -154,7 +154,7 @@ ADD_TEST(prTvSensorModelRadarSat1 ${PROJECTIONS_TESTS1}
          ${BASELINE_FILES}/prTvSensorModelRadarSat1.txt
          ${TEMP}/prTvSensorModelRadarSat1.txt
     otbSensorModel
-         ${LARGEINPUT}/RADARSAT1/SCENE01/DAT_01.001
+         ${LARGEINPUT}/RADARSAT1/PRODUCT1/SCENE01/DAT_01.001
          ${TEMP}/prTvSensorModelRadarSat1.txt
 )
 
@@ -163,7 +163,7 @@ ADD_TEST(prTvSensorModelRadarSat2 ${PROJECTIONS_TESTS1}
          ${BASELINE_FILES}/prTvSensorModelRadarSat2.txt
          ${TEMP}/prTvSensorModelRadarSat2.txt
     otbSensorModel
-         ${LARGEINPUT}/RSAT2/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/product.xml
+         ${LARGEINPUT}/RADARSAT2/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/product.xml
          ${TEMP}/prTvSensorModelRadarSat2.txt
 )
 
diff --git a/Testing/Code/Visu/CMakeLists.txt b/Testing/Code/Visu/CMakeLists.txt
index be2ca16aa20760381eddf257ca4bd98a3c207aa8..47cf748eb9b400dc48f04959d001b6eaad84c2d2 100644
--- a/Testing/Code/Visu/CMakeLists.txt
+++ b/Testing/Code/Visu/CMakeLists.txt
@@ -84,12 +84,12 @@ ADD_TEST(viTvImageViewerWithLargeOtbVectorImage ${VISU_TESTS1}
 
 ADD_TEST(viTvModulusImageViewerWithComplexImage ${VISU_TESTS1}
         otbImageViewer
-	${IMAGEDATA}/RADARSAT2/SCENE01/DAT_01.001 1
+	${IMAGEDATA}/RADARSAT1/PRODUCT2/SCENE01/DAT_01.001 1
         )
 
 ADD_TEST(viTvPhaseImageViewerWithComplexImage ${VISU_TESTS1}
         otbImageViewer
-	${IMAGEDATA}/RADARSAT2/SCENE01/DAT_01.001 2
+	${IMAGEDATA}/RADARSAT1/PRODUCT2/SCENE01/DAT_01.001 2
         )
 
 ADD_TEST(viTvImageViewerWithLargeOtbImage ${VISU_TESTS1}
diff --git a/Testing/Fa/CMakeLists.txt b/Testing/Fa/CMakeLists.txt
index ac637876ed45b34a21e4fc34e3128ef93caf803d..0901caca3e71b77e1bf13e7c5fbf4dc6274d14f6 100644
--- a/Testing/Fa/CMakeLists.txt
+++ b/Testing/Fa/CMakeLists.txt
@@ -98,19 +98,19 @@ ADD_TEST(FA-00006-io_Poupees_R8_Double2UCharBis ${COMMON_TESTS}
 IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(FA-00006-io_Radarsat_UI2_UShort2UShort ${COMMON_TESTS}
          otbMultiToMonoChannelExtractROI
-         -ushort ${IMAGEDATA}/RADARSAT1/SCENE01/
+         -ushort ${IMAGEDATA}/RADARSAT1/PRODUCT1/SCENE01/
          -ushort ${TEMP}/FA-00006-io_Radarsat_2559_3591_337_280_ui2.hdr
          -startX 2559 -startY 3591 -sizeX 337 -sizeY 280 )
 
 ADD_TEST(FA-00006-io_Radarsat_UI2_Int2Int ${COMMON_TESTS}
          otbMultiToMonoChannelExtractROI
-         -int ${IMAGEDATA}/RADARSAT1/SCENE01/
+         -int ${IMAGEDATA}/RADARSAT1/PRODUCT1/SCENE01/
          -int ${TEMP}/FA-00006-io_Radarsat_2559_3591_337_280_i4.hdr
          -startX 2559 -startY 3591 -sizeX 337 -sizeY 280 )
 
 ADD_TEST(FA-00006-io_Radarsat_UI2_Double2Double_ ${COMMON_TESTS}
          otbMultiToMonoChannelExtractROI
-         -double ${IMAGEDATA}/RADARSAT1/SCENE01/
+         -double ${IMAGEDATA}/RADARSAT1/PRODUCT1/SCENE01/
          -double ${TEMP}/FA-00006-io_Radarsat_2559_3591_337_280_r8.hdr
          -startX 2559 -startY 3591 -sizeX 337 -sizeY 280 )
 
diff --git a/Testing/Utilities/CMakeLists.txt b/Testing/Utilities/CMakeLists.txt
index c7d18c99e3bcaa6e5ebf602ffa80894deb10f66d..3af0243226e04ba36acab3ede880f0f6693d7ab9 100644
--- a/Testing/Utilities/CMakeLists.txt
+++ b/Testing/Utilities/CMakeLists.txt
@@ -140,7 +140,7 @@ ADD_TEST(utTvTinyXMLTest ${UTILITIES_TESTS}
 IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(utTvOssimRadarSatSupport ${UTILITIES_TESTS}
         ossimRadarSatSupport
-        ${IMAGEDATA}/RADARSAT2/SCENE01/DAT_01.001
+        ${IMAGEDATA}/RADARSAT1/PRODUCT2/SCENE01/DAT_01.001
         )
 ENDIF(OTB_DATA_USE_LARGEINPUT)