diff --git a/CMake/OTBWrapperMacros.cmake b/CMake/OTBWrapperMacros.cmake
index d34a27c0b4d0663214707ade4ab35c67f0fb2406..6e7d3b052ac01f5c91baabd65f6cbf93c164a459 100644
--- a/CMake/OTBWrapperMacros.cmake
+++ b/CMake/OTBWrapperMacros.cmake
@@ -69,17 +69,28 @@ endmacro(OTB_CREATE_APPLICATION)
 macro(OTB_TEST_APPLICATION)
   OTB_PARSE_ARGUMENTS(
       TESTAPPLICATION
-      "NAME;APP;OPTIONS;VALID"
+      "NAME;APP;OPTIONS;TESTENVOPTIONS;VALID"
       ""
       ${ARGN})
 
-   add_test(NAME ${TESTAPPLICATION_NAME}
-            COMMAND otbTestDriver
-                    ${TESTAPPLICATION_VALID}
-                    Execute $<TARGET_FILE:otbApplicationLauncherCommandLine>
-                    ${TESTAPPLICATION_APP}
-                    $<TARGET_FILE_DIR:otbapp_${TESTAPPLICATION_APP}>
-                    ${TESTAPPLICATION_OPTIONS}
-                    --testenv)
+   if (NOT TESTAPPLICATION_TESTENVOPTIONS)
+     add_test(NAME ${TESTAPPLICATION_NAME}
+              COMMAND otbTestDriver
+              ${TESTAPPLICATION_VALID}
+              Execute $<TARGET_FILE:otbApplicationLauncherCommandLine>
+              ${TESTAPPLICATION_APP}
+              $<TARGET_FILE_DIR:otbapp_${TESTAPPLICATION_APP}>
+              ${TESTAPPLICATION_OPTIONS}
+              --testenv)
+   else (NOT TESTAPPLICATION_TESTENVOPTIONS)
+     add_test(NAME ${TESTAPPLICATION_NAME}
+              COMMAND otbTestDriver
+              ${TESTAPPLICATION_VALID}
+              Execute $<TARGET_FILE:otbApplicationLauncherCommandLine>
+              ${TESTAPPLICATION_APP}
+              $<TARGET_FILE_DIR:otbapp_${TESTAPPLICATION_APP}>
+              ${TESTAPPLICATION_OPTIONS}
+              --testenv ${TESTAPPLICATION_TESTENVOPTIONS})
+   endif (NOT TESTAPPLICATION_TESTENVOPTIONS)
    
 endmacro(OTB_TEST_APPLICATION)
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
index a8efd75a33634e5d2480099f579fa862589c9bc0..e4c5de7a8334b5a69a5161d4fa8c669ed92a4f26 100644
--- a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
+++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
@@ -974,7 +974,8 @@ void CommandLineLauncher::DisplayOutputParameters()
       ofs.close();
       }
     }
-
+  
+  std::cout << "Output parameters value:" << std::endl;
   std::cout << oss.str() << std::endl;
 }