diff --git a/Applications/Classification/CMakeLists.txt b/Applications/Classification/CMakeLists.txt
index c28f7318789297ce31dfde4a3de26c21f9347d52..01aa2169c9294253ee56c01f9ae1e0a126835dc6 100644
--- a/Applications/Classification/CMakeLists.txt
+++ b/Applications/Classification/CMakeLists.txt
@@ -17,3 +17,7 @@ OTB_CREATE_APPLICATION(NAME           TrainSVMImagesClassifier
 OTB_CREATE_APPLICATION(NAME           ValidateSVMImagesClassifier
                        SOURCES        otbValidateSVMImagesClassifier.cxx
                        LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters;OTBFeatureExtraction;OTBLearning)                                            
+
+OTB_CREATE_APPLICATION(NAME           SOMClassification
+                       SOURCES        otbSOMClassification.cxx
+                       LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters;OTBFeatureExtraction;OTBLearning)                                            
diff --git a/Testing/Applications/Classification/CMakeLists.txt b/Testing/Applications/Classification/CMakeLists.txt
index 646dcfcca7008d42c0bbe57e379093c8e38054e5..5b7505b27d3ff169673e09e8dc9f8635810d2240 100644
--- a/Testing/Applications/Classification/CMakeLists.txt
+++ b/Testing/Applications/Classification/CMakeLists.txt
@@ -312,3 +312,35 @@ OTB_TEST_APPLICATION(NAME apTvClKMeansImageClassification
                      VALID   --compare-image ${NOTOL}
                              ${OTBAPP_BASELINE}/apTvClKMeansImageClassificationFilterOuptut.tif
                              ${TEMP}/apTvClKMeansImageClassificationFilterOuptut.tif )
+
+# --- SOMClassification ---
+OTB_TEST_APPLICATION(NAME   apTvClSOMClassificationSmall
+                     APP    SOMClassification
+                     OPTIONS -in ${INPUTDATA}/poupees_sub.png
+                             -out ${TEMP}/apTvClSOMClassificationSmall.tif uint16
+                     VALID   --compare-image ${NOTOL}
+                             ${BASELINE}/apTvClSOMClassificationSmall.tif
+                             ${TEMP}/apTvClSOMClassificationSmall.tif)
+
+OTB_TEST_APPLICATION(NAME   apTvClSOMClassificationFull
+                     APP    SOMClassification
+                     OPTIONS -in  ${INPUTDATA}/poupees_sub.png
+                             -out ${TEMP}/apTvClSOMClassificationFull.tif uint16
+                             -vm  ${INPUTDATA}/poupees_sub_c1.png
+                             -tp  0.8
+                             -ts  13000
+                             -sl  32
+                             -som ${TEMP}/apTvClSOMClassificationMap.hdr
+                             -sx  30
+                             -sy  30
+                             -nx  9
+                             -ny  9
+                             -ni  5
+                             -bi  1.0
+                             -bf  0.1
+                             -iv  0
+                     VALID   --compare-n-images ${NOTOL} 2
+                             ${BASELINE}/apTvClSOMClassificationFull.tif
+                             ${TEMP}/apTvClSOMClassificationFull.tif
+                             ${BASELINE}/apTvClSOMClassificationMap.hdr
+                             ${TEMP}/apTvClSOMClassificationMap.hdr)