diff --git a/CI/configure_option.cmake b/CI/configure_option.cmake
index 29bc8ab709bb889858eb94968e556524b043d63a..26502b11bfa758e483b8b60cafb62e1ad6ff9067 100644
--- a/CI/configure_option.cmake
+++ b/CI/configure_option.cmake
@@ -51,7 +51,8 @@ OTB_USE_QWT:BOOL=ON
 OTB_USE_SHARK:BOOL=ON
 OTB_USE_SIFTFAST:BOOL=ON
 OTB_USE_SPTW:BOOL=ON
-OTB_USE_SSE_FLAGS:BOOL=ON")
+OTB_USE_SSE_FLAGS:BOOL=ON
+OTB_MPIEXEC_OPT:STRING=--allow-run-as-root")
 
 set (otb_wrap_option
 "OTB_WRAP_JAVA:BOOL=ON
diff --git a/CMake/OTBModuleTest.cmake b/CMake/OTBModuleTest.cmake
index 88ae223931b0ad6763d6f92538d9606d2737e03d..c1402718ece7ecb92c2aabc0b581f16e7c679aa3 100644
--- a/CMake/OTBModuleTest.cmake
+++ b/CMake/OTBModuleTest.cmake
@@ -235,6 +235,6 @@ function(otb_add_test_mpi)
    foreach(arg IN LISTS TEST_MPI_UNPARSED_ARGUMENTS)
      list(APPEND ARGS ${arg})
    endforeach()
-   set (test_parameters -np ${TEST_MPI_NBPROCS} ${TEST_MPI_EXTRA_OPT} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TEST_MPI_COMMAND} ${ARGS})
+   set (test_parameters -n ${TEST_MPI_NBPROCS} ${OTB_MPIEXEC_OPT} ${TEST_MPI_EXTRA_OPT} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TEST_MPI_COMMAND} ${ARGS})
    otb_add_test(NAME ${TEST_MPI_NAME} COMMAND ${MPIEXEC} ${test_parameters})
 endfunction()
diff --git a/CMake/OTBStandaloneModuleMacros.cmake b/CMake/OTBStandaloneModuleMacros.cmake
index b882c3d7ce0538b21a6987d3da4aa8e9982ed088..e877a15ceb405951e27bddf2e55f914b5ad2d980 100644
--- a/CMake/OTBStandaloneModuleMacros.cmake
+++ b/CMake/OTBStandaloneModuleMacros.cmake
@@ -112,7 +112,7 @@ function(otb_add_test_mpi)
    foreach(arg IN LISTS TEST_MPI_UNPARSED_ARGUMENTS)
      list(APPEND ARGS ${arg})
    endforeach()
-   set (test_parameters -np ${TEST_MPI_NBPROCS} ${TEST_MPI_EXTRA_OPT} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TEST_MPI_COMMAND} ${ARGS})
+   set (test_parameters -n ${TEST_MPI_NBPROCS} ${OTB_MPIEXEC_OPT} ${TEST_MPI_EXTRA_OPT} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TEST_MPI_COMMAND} ${ARGS})
    otb_add_test(NAME ${TEST_MPI_NAME} COMMAND ${MPIEXEC} ${test_parameters})
 endfunction()
 
diff --git a/Modules/MPI/MPIConfig/test/CMakeLists.txt b/Modules/MPI/MPIConfig/test/CMakeLists.txt
index 56b495fdf6d991570e38f646a2180af2c0caeec1..4051cd1a10eb27658302154f670e1682d4e77f7c 100644
--- a/Modules/MPI/MPIConfig/test/CMakeLists.txt
+++ b/Modules/MPI/MPIConfig/test/CMakeLists.txt
@@ -35,5 +35,4 @@ otb_module_target_label(otbMPIConfigTestDriver)
 # MPI Hello test
 otb_add_test_mpi(NAME otbMPIConfigTest
    NBPROCS 2
-   EXTRA_OPT --allow-run-as-root
    COMMAND otbMPIConfigTestDriver otbMPIConfigTest )
diff --git a/Modules/MPI/MPITiffWriter/test/CMakeLists.txt b/Modules/MPI/MPITiffWriter/test/CMakeLists.txt
index 53461c4b6a6fcc363aec9b2c1b96a172da9b1e26..d9a078b9e04b44da38aec9ce65ff42bf8edab75f 100644
--- a/Modules/MPI/MPITiffWriter/test/CMakeLists.txt
+++ b/Modules/MPI/MPITiffWriter/test/CMakeLists.txt
@@ -37,7 +37,6 @@ otb_module_target_label(otbMPITiffWriterTestDriver)
 
 otb_add_test_mpi(NAME otbMPISPTWReadWriteTest
   NBPROCS 2
-  EXTRA_OPT --allow-run-as-root
   COMMAND otbMPITiffWriterTestDriver
   --compare-image ${NOTOL}
   ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
diff --git a/Modules/MPI/MPIVrtWriter/test/CMakeLists.txt b/Modules/MPI/MPIVrtWriter/test/CMakeLists.txt
index 0fae82bdf66cd03a28195779951143d5e413d841..6e725b0d81432b913d61fac184e192c1aeef1792 100644
--- a/Modules/MPI/MPIVrtWriter/test/CMakeLists.txt
+++ b/Modules/MPI/MPIVrtWriter/test/CMakeLists.txt
@@ -35,7 +35,6 @@ otb_module_target_label(otbMPIVrtWriterTestDriver)
 # MPI Hello test
 otb_add_test_mpi(NAME otbMPIVrtWriterTest
    NBPROCS 2
-   EXTRA_OPT --allow-run-as-root
    COMMAND otbMPIVrtWriterTestDriver
    --compare-image ${NOTOL}
    ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
diff --git a/Modules/ThirdParty/MPI/otb-module-init.cmake b/Modules/ThirdParty/MPI/otb-module-init.cmake
index 6d4f3673db59cee99a7ac83d0e0ae6a0483276cd..39665d6ad48fe54fdc175fca64c45c0529dbe738 100644
--- a/Modules/ThirdParty/MPI/otb-module-init.cmake
+++ b/Modules/ThirdParty/MPI/otb-module-init.cmake
@@ -19,3 +19,5 @@
 #
 
 find_package ( MPI REQUIRED )
+
+set(OTB_MPIEXEC_OPT "" CACHE STRING "Additional options for mpiexec tests")