diff --git a/Modules/Filtering/ImageManipulation/include/otbFunctorImageFilter.h b/Modules/Core/Functor/include/otbFunctorImageFilter.h
similarity index 100%
rename from Modules/Filtering/ImageManipulation/include/otbFunctorImageFilter.h
rename to Modules/Core/Functor/include/otbFunctorImageFilter.h
diff --git a/Modules/Filtering/ImageManipulation/include/otbFunctorImageFilter.hxx b/Modules/Core/Functor/include/otbFunctorImageFilter.hxx
similarity index 100%
rename from Modules/Filtering/ImageManipulation/include/otbFunctorImageFilter.hxx
rename to Modules/Core/Functor/include/otbFunctorImageFilter.hxx
diff --git a/Modules/Filtering/ImageManipulation/include/otbVariadicInputsImageFilter.h b/Modules/Core/Functor/include/otbVariadicInputsImageFilter.h
similarity index 100%
rename from Modules/Filtering/ImageManipulation/include/otbVariadicInputsImageFilter.h
rename to Modules/Core/Functor/include/otbVariadicInputsImageFilter.h
diff --git a/Modules/Filtering/ImageManipulation/test/otbFunctorImageFilter.cxx b/Modules/Core/Functor/test/otbFunctorImageFilter.cxx
similarity index 100%
rename from Modules/Filtering/ImageManipulation/test/otbFunctorImageFilter.cxx
rename to Modules/Core/Functor/test/otbFunctorImageFilter.cxx
diff --git a/Modules/Filtering/ImageManipulation/test/CMakeLists.txt b/Modules/Filtering/ImageManipulation/test/CMakeLists.txt
index 267bde7d80dadb6e87678b66cc439e85e84b795b..adc522717529ad846c0ebfcc477d431321f2e43b 100644
--- a/Modules/Filtering/ImageManipulation/test/CMakeLists.txt
+++ b/Modules/Filtering/ImageManipulation/test/CMakeLists.txt
@@ -71,7 +71,6 @@ otbImageToNoDataMaskFilter.cxx
 otbChangeInformationImageFilter.cxx
 otbGridResampleImageFilter.cxx
 otbMaskedIteratorDecorator.cxx
-otbFunctorImageFilter.cxx
 )
 
 add_executable(otbImageManipulationTestDriver ${OTBImageManipulationTests})
@@ -622,7 +621,3 @@ otb_add_test(NAME bfTvMaskedIteratorDecoratorDegenerate COMMAND otbImageManipula
 otb_add_test(NAME bfTvMaskedIteratorDecoratorExtended COMMAND otbImageManipulationTestDriver
   otbMaskedIteratorDecoratorExtended
 )
-
-otb_add_test(NAME bfTvFunctorImageFilter COMMAND otbImageManipulationTestDriver
-  otbFunctorImageFilter
-  )
diff --git a/Modules/Filtering/ImageManipulation/test/otbImageManipulationTestDriver.cxx b/Modules/Filtering/ImageManipulation/test/otbImageManipulationTestDriver.cxx
index 739dd773048a50de7ce234d1a41dc9b597150f66..08aa5acb7d90cf47b890599f0fb7e802e2b37e86 100644
--- a/Modules/Filtering/ImageManipulation/test/otbImageManipulationTestDriver.cxx
+++ b/Modules/Filtering/ImageManipulation/test/otbImageManipulationTestDriver.cxx
@@ -74,5 +74,4 @@ void RegisterTests()
   REGISTER_TEST(otbMaskedIteratorDecoratorNominal);
   REGISTER_TEST(otbMaskedIteratorDecoratorDegenerate);
   REGISTER_TEST(otbMaskedIteratorDecoratorExtended);
-  REGISTER_TEST(otbFunctorImageFilter);
 }