diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt
index 7ffa20205e9516113277982201f1d06d145e0f75..971c3115b47a72b3aaa134c6602ba072555e6bfb 100755
--- a/Testing/Code/IO/CMakeLists.txt
+++ b/Testing/Code/IO/CMakeLists.txt
@@ -1313,6 +1313,18 @@ ADD_TEST(ioTvOSSIMImageERS2MetaDataReader ${IO_TESTS12}
 	 ${TEMP}/ioOSSIMImageERS2MetaDataReader.txt
 	 ${TEMP}/ioOSSIMVectorImageERS2MetaDataReader.txt
          )
+
+# ---  SPOT4 Metadata ---
+ADD_TEST(ioTvOSSIMImageSPOT4MetaDataReader ${IO_TESTS12}
+#   --compare-n-ascii ${EPS} 2           ${BASELINE_FILES}/ioOSSIMImageSPOT4MetaDataReader.txt
+#                                        ${TEMP}/ioOSSIMImageSPOT4MetaDataReader.txt
+#                                        ${BASELINE_FILES}/ioOSSIMImageSPOT4MetaDataReader.txt
+#                                        ${TEMP}/ioOSSIMVectorImageSPOT4MetaDataReader.txt
+         otbOSSIMImageMetaDataReaderTest
+         ${LARGEDATA}/SPOT4_SCENE01/IMAG_01.DAT
+	 ${TEMP}/ioOSSIMImageSPOT4MetaDataReader.txt
+	 ${TEMP}/ioOSSIMVectorImageSPOT4MetaDataReader.txt
+         )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 # ---  otb::DEMHandler ---
@@ -1727,15 +1739,15 @@ ADD_TEST(ioTvDEMToOrthoImageGeneratorTest ${IO_TESTS17}
         otbDEMToOrthoImageGeneratorTest
          ${INPUTDATA}/DEM/srtm_directory
          ${TEMP}/ioTvDEMToOrthoImageGenerator.tif
-        1.463789 #6.5
-        43.565926 #44.5
-        500
-        500
-        0.002
-        0.002
-	31 # utm zone
-        N # hemisphere
-        )
+         6.5
+         44.5
+         500
+         500
+         0.002
+         0.002
+	 31 # utm zone
+         N # hemisphere
+)
 
 
 
diff --git a/Testing/Code/IO/otbOSSIMImageMetaDataReaderTest.cxx b/Testing/Code/IO/otbOSSIMImageMetaDataReaderTest.cxx
index e04b4a405184574e2246ea2347a93815a8d3f01f..5a465b908559681b5d37e8cdc7d9df85cf458f06 100644
--- a/Testing/Code/IO/otbOSSIMImageMetaDataReaderTest.cxx
+++ b/Testing/Code/IO/otbOSSIMImageMetaDataReaderTest.cxx
@@ -62,6 +62,11 @@ int otbOSSIMImageMetaDataReaderTest (int argc, char* argv[])
 
   otb_tmp_image = image_reader->GetOutput()->GetImageKeywordlist();
 
+  if(otb_tmp_image.GetSize()==0)
+    {
+      return EXIT_FAILURE;
+    }
+
   ossimKeywordlist ossim_kwl_image;
   otb_tmp_image.convertToOSSIMKeywordlist(ossim_kwl_image);