diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt
index e0ffb227788983e14821b93f47d92115a1b1d8dd..f8be7f582979d3fa66319e9108684f92510ca940 100755
--- a/Testing/Code/IO/CMakeLists.txt
+++ b/Testing/Code/IO/CMakeLists.txt
@@ -389,13 +389,17 @@ ADD_TEST(ioTuGDALImageIOCanRead_SPOT4 ${IO_TESTS} otbGDALImageIOTestCanRead
 ADD_TEST(ioTuGDALImageIOCanRead_SPOT5TIF ${IO_TESTS} otbGDALImageIOTestCanRead
         ${INPUTDATA}/poupeesTIF/ )
 
+ADD_TEST(ioTuGDALImageIOCanRead_HFA ${IO_TESTS} otbGDALImageIOTestCanRead
+	${INPUTDATA}/HFAGeoreferenced.img)
+
         
 # WRITER
 
 ADD_TEST(ioTuGDALImageIOCanWrite_TIFF ${IO_TESTS} otbGDALImageIOTestCanWrite
 	${INPUTDATA}/testGDALWriter.tif)
-    
-	
+ADD_TEST(ioTuGDALImageIOCanWrite_HFA ${IO_TESTS} otbGDALImageIOTestCanWrite
+	${INPUTDATA}/HFAGeoreferenced.img)
+
 # CanWrite()
 # ADD_TEST(ioTuCAIImageIOCanWriteBSQ ${IO_TESTS} otbCAIImageIOTestCanWrite 
 #        ${TEMP}/ioCAIImageIOCanWriteBSQ.hd )
@@ -882,6 +886,17 @@ ADD_TEST(ioTvStreamingIFWriterWithFilter ${IO_TESTS}
          )
 
 
+#---------- Metadata writing tests ------------------------
+
+#ADD_TEST(ioTvImageMetadataWriterTest_HFA ${IO_TESTS} 
+#   --compare-ascii ${TOL}   ${BASELINE}/ioTvImageMetadataWriterTest_HFA_out.txt
+#                            ${TEMP}/ioTvImageMetadataWriterTest_HFA_out.txt
+#         otbImageMetadataFileWriterTest
+#         ${INPUTDATA}/HFAGeoreferenced.img
+#	 ${TEMP}/temp.img
+#        ${TEMP}/ioTvImageMetadataWriterTest_HFA_out.txt
+#        )
+// TO BE FIXED
 
 #----------------------------------------------------------------------------------
 # Exemples de tests sur les grosses images
@@ -943,6 +958,7 @@ otbShortImageIOTest.cxx
 otbShortRGBImageIOTest.cxx
 otbIntImageIOTest.cxx
 otbDoubleImageIOTest.cxx
+otbImageMetadataFileWriterTest.cxx
 )
 
 INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
diff --git a/Testing/Code/IO/otbIOTests.cxx b/Testing/Code/IO/otbIOTests.cxx
index 5810561857d9a5444d17b2fbe21ce7861b1c1618..227bfc0e3a8f53007c3f2010102ede5d886a192e 100755
--- a/Testing/Code/IO/otbIOTests.cxx
+++ b/Testing/Code/IO/otbIOTests.cxx
@@ -35,6 +35,7 @@ REGISTER_TEST(otbMSTARImageIOTestCanRead);
 REGISTER_TEST(otbImageFileReaderMSTAR);
 REGISTER_TEST(otbImageFileReaderTest);
 REGISTER_TEST(otbImageFileWriterTest);
+REGISTER_TEST(otbImageMetadataFileWriterTest);
 REGISTER_TEST(otbVectorImageFileReaderWriterTest);
 REGISTER_TEST(otbImageFileReaderRGBTest);
 REGISTER_TEST(otbImageFileWriterRGBTest);