diff --git a/Testing/Code/BasicFilters/CMakeLists.txt b/Testing/Code/BasicFilters/CMakeLists.txt
index adc484f5288d50081a5d4428af0e63cbb5155568..b9032ab7f5b894f7f3c3dc7855c18f6c1573ce2a 100644
--- a/Testing/Code/BasicFilters/CMakeLists.txt
+++ b/Testing/Code/BasicFilters/CMakeLists.txt
@@ -1134,16 +1134,28 @@ ADD_TEST(bfTuMeanShiftImageFilterQBSuburb ${BASICFILTERS_TESTS9}
         4 50 10 1.0
         )
 
-ADD_TEST(bfTuMeanShiftImageFilter2QBSuburb ${BASICFILTERS_TESTS9}
+ADD_TEST(bfTuMeanShiftImageFilter2QBSuburbOptim ${BASICFILTERS_TESTS9}
         otbMeanShiftImageFilter2
         ${INPUTDATA}/QB_Suburb.png
-        ${TEMP}/bfMeanShift2ImageFilterSpatialOutput_QBSuburb.tif
-        ${TEMP}/bfMeanShift2ImageFilterSpectralOutput_QBSuburb.tif
-        ${TEMP}/bfMeanShift2ImageFilterMetricOutput_QBSuburb.tif
-        ${TEMP}/bfMeanShift2ImageFilterIterationOutput_QBSuburb.tif
-        ${TEMP}/bfMeanShift2ImageFilterLabelOutput_QBSuburb.tif
-        4 50 0.1 10
+        ${TEMP}/bfMeanShift2ImageFilterSpatialOutput_QBSuburbOptim.tif
+        ${TEMP}/bfMeanShift2ImageFilterSpectralOutput_QBSuburbOptim.tif
+        ${TEMP}/bfMeanShift2ImageFilterMetricOutput_QBSuburbOptim.tif
+        ${TEMP}/bfMeanShift2ImageFilterIterationOutput_QBSuburbOptim.tif
+        ${TEMP}/bfMeanShift2ImageFilterLabelOutput_QBSuburbOptim.tif
+        4 50 0.1 10 1
         )
+ 
+ ADD_TEST(bfTuMeanShiftImageFilter2QBSuburbNonOptim ${BASICFILTERS_TESTS9}
+        otbMeanShiftImageFilter2
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/bfMeanShift2ImageFilterSpatialOutput_QBSuburbNonOptim.tif
+        ${TEMP}/bfMeanShift2ImageFilterSpectralOutput_QBSuburbNonOptim.tif
+        ${TEMP}/bfMeanShift2ImageFilterMetricOutput_QBSuburbNonOptim.tif
+        ${TEMP}/bfMeanShift2ImageFilterIterationOutput_QBSuburbNonOptim.tif
+        ${TEMP}/bfMeanShift2ImageFilterLabelOutput_QBSuburbNonOptim.tif
+        4 50 0.1 10 0
+        )
+        
 
 ADD_TEST(bfTuMeanShiftVectorImageFilterROIQBMul4 ${BASICFILTERS_TESTS9}
         otbMeanShiftVectorImageFilter
@@ -1156,6 +1168,8 @@ ADD_TEST(bfTuMeanShiftVectorImageFilterROIQBMul4 ${BASICFILTERS_TESTS9}
         )
 
 
+
+
 ADD_TEST(bfTuMeanShiftImageFilterROIQBMul4 ${BASICFILTERS_TESTS9}
         otbMeanShiftImageFilter2
         ${INPUTDATA}/ROI_QB_MUL_4.tif