diff --git a/Testing/Fa/Failing/CMakeLists.txt b/Testing/Fa/Failing/CMakeLists.txt
index 5ca733305d3dbb6d9414fa8ddb9d1b1926a5840b..f5fdb10bf551e5ee2e54e872453ac2279ad80f6c 100644
--- a/Testing/Fa/Failing/CMakeLists.txt
+++ b/Testing/Fa/Failing/CMakeLists.txt
@@ -14,19 +14,6 @@ ADD_TEST(FA-000209-SVMValidationLinearlySeparableWithProbEstimate_KO
          500 500
          0.0025 0.0075 0.0075 0.0025 0. 0.0025 0. 0.0025 0 1)
 
-ADD_TEST(NAME FA-000478-UncaughtException
-         COMMAND  ${CXX_TEST_PATH}/0000478-UncaughtException
-                  $<TARGET_FILE_DIR:otbapp_StereoSensorModelToElevationMap>
-                  ${OTB_DATA_ROOT}/Examples/sensor_stereo_left.tif 
-                  ${OTB_DATA_ROOT}/Examples/sensor_stereo_right.tif 
-                  ${TEMP}/FA-0000478-output.tif)
-
-ADD_TEST(NAME FA-0000495-StreamingImageFileWriterProgressReporting
-         COMMAND  ${CXX_TEST_PATH}/0000495-StreamingImageFileWriterProgressReporting
-                  ${OTB_DATA_ROOT}/Examples/sensor_stereo_left.tif
-                  ${TEMP}/FA-0000495-output1.tif
-                  ${TEMP}/FA-0000495-output2.tif)
-
 # -------       Vectorization issue   -----------------------------------
 # http://bugs.orfeo-toolbox.org/view.php?id=94
  ADD_TEST(FA-0000094-fe-PolygonsVectorization ${CXX_TEST_PATH}/0000094-PolygonsVectorization
diff --git a/Testing/Fa/Resolved/CMakeLists.txt b/Testing/Fa/Resolved/CMakeLists.txt
index 12bd8c6be1e30d2a3dcb1d7d0d54f6b812967007..4f866fb3e98561bf16f8e915f7a2ba0c23469edb 100644
--- a/Testing/Fa/Resolved/CMakeLists.txt
+++ b/Testing/Fa/Resolved/CMakeLists.txt
@@ -268,7 +268,20 @@ ADD_TEST(FA-0000437-WriteImageCentOS ${CXX_TEST_PATH}/0000437-WriteImageCentOS
   ${OTB_DATA_ROOT}/Baseline/OTB/Fa/FA-0000437-WriteImageCentOSInput.tif
   ${TEMP}/FA-0000437-WriteImageCentOSOutput.tif)
   
-  
+
+ADD_TEST(NAME FA-000478-UncaughtException
+         COMMAND  ${CXX_TEST_PATH}/0000478-UncaughtException
+                  $<TARGET_FILE_DIR:otbapp_StereoSensorModelToElevationMap>
+                  ${OTB_DATA_ROOT}/Examples/sensor_stereo_left.tif 
+                  ${OTB_DATA_ROOT}/Examples/sensor_stereo_right.tif 
+                  ${TEMP}/FA-0000478-output.tif)
+
+ADD_TEST(NAME FA-0000495-StreamingImageFileWriterProgressReporting
+         COMMAND  ${CXX_TEST_PATH}/0000495-StreamingImageFileWriterProgressReporting
+                  ${OTB_DATA_ROOT}/Examples/sensor_stereo_left.tif
+                  ${TEMP}/FA-0000495-output1.tif
+                  ${TEMP}/FA-0000495-output2.tif)
+
 ADD_TEST(NAME otbVectorDataToLabelImageFilterWithoutReader
   COMMAND ${CXX_TEST_PATH}/otbVectorDataToLabelImageFilterWithoutReader
   ${TEMP}/rasterizedVectorData.tif)