diff --git a/CMake/mitkTestPluginGenerator.cmake b/CMake/mitkTestPluginGenerator.cmake
index b0739d9865..318a20f120 100644
--- a/CMake/mitkTestPluginGenerator.cmake
+++ b/CMake/mitkTestPluginGenerator.cmake
@@ -1,101 +1,109 @@
 if(BUILD_TESTING)
 
   set(proj GP) # Means GenerateProject (use a short name due to Windows limitations)
   set(test_project_out_dir "${MITK_BINARY_DIR}")
   set(test_project_source_dir "${MITK_BINARY_DIR}/${proj}")
   set(test_project_binary_dir "${MITK_BINARY_DIR}/${proj}-bin")
 
   add_test(NAME mitkPluginGeneratorCleanTest
            COMMAND ${CMAKE_COMMAND} -E remove_directory "${test_project_source_dir}"
           )
 
   add_test(NAME mitkPluginGeneratorCleanTest2
            COMMAND ${CMAKE_COMMAND} -E remove_directory "${test_project_binary_dir}"
           )
 
   add_test(NAME mitkPluginGeneratorCleanTest3
            COMMAND ${CMAKE_COMMAND} -E make_directory "${test_project_binary_dir}"
           )
   set_tests_properties(mitkPluginGeneratorCleanTest3 PROPERTIES
                        DEPENDS mitkPluginGeneratorCleanTest2)
 
   add_test(NAME mitkPluginGeneratorCreateTest
            COMMAND ${exec_target} --project-name "${proj}" --project-app-name "TestApp"
                                   -ps org.test.plugin -pn "Test Plugin" -vn "Test View"
                                   -o ${test_project_out_dir} -y
           )
   set_tests_properties(mitkPluginGeneratorCreateTest PROPERTIES
                        DEPENDS "${exec_target};mitkPluginGeneratorCleanTest;mitkPluginGeneratorCleanTest3")
 
+  mitkFunctionGetLibrarySearchPaths(MITK_RUNTIME_PATH_RELEASE release RELEASE)
+  mitkFunctionGetLibrarySearchPaths(MITK_RUNTIME_PATH_DEBUG debug DEBUG)
+  set(test_env_path ${MITK_RUNTIME_PATH_RELEASE} ${MITK_RUNTIME_PATH_DEBUG} $ENV{PATH})
+  list(REMOVE_DUPLICATES test_env_path)
+  string (REGEX REPLACE "\;" "\\\;" test_env_path "${test_env_path}")
+  set_property(TEST mitkPluginGeneratorCreateTest APPEND PROPERTY ENVIRONMENT "PATH=${test_env_path}")
+  set_property(TEST mitkPluginGeneratorCreateTest PROPERTY SKIP_RETURN_CODE 77)
+
   set(configure_options
     -DMITK_DIR:PATH=${MITK_BINARY_DIR}
     -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
     -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
     -DCMAKE_OSX_SYSROOT:PATH=${CMAKE_OSX_SYSROOT}
     -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
     -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
     -G${CMAKE_GENERATOR}
     -C "${MITK_BINARY_DIR}/mitkTestInitialCache.txt"
     )
 
   if(CMAKE_PREFIX_PATH)
     string (REPLACE ";" "$<SEMICOLON>" CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH}")
     list(APPEND configure_options -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH})
   endif()
 
   if(CMAKE_CONFIGURATION_TYPES)
     foreach(config ${CMAKE_CONFIGURATION_TYPES})
       add_test(NAME mitkPluginGeneratorConfigureTest-${config} CONFIGURATIONS ${config}
                WORKING_DIRECTORY "${test_project_binary_dir}"
                COMMAND ${CMAKE_COMMAND} ${configure_options}
                                         "${test_project_source_dir}")
       set_tests_properties(mitkPluginGeneratorConfigureTest-${config} PROPERTIES
                            DEPENDS mitkPluginGeneratorCreateTest)
 
       add_test(NAME mitkPluginGeneratorBuildTest-${config} CONFIGURATIONS ${config}
                COMMAND ${CMAKE_COMMAND} --build ${test_project_binary_dir} --config ${config})
       set_tests_properties(mitkPluginGeneratorBuildTest-${config} PROPERTIES
                            DEPENDS mitkPluginGeneratorConfigureTest-${config})
     endforeach()
   else()
     add_test(NAME mitkPluginGeneratorConfigureTest-${CMAKE_BUILD_TYPE}
              WORKING_DIRECTORY "${test_project_binary_dir}"
              COMMAND ${CMAKE_COMMAND} ${configure_options}
                                       -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
                                       "${test_project_source_dir}")
     set_tests_properties(mitkPluginGeneratorConfigureTest-${CMAKE_BUILD_TYPE} PROPERTIES
                          DEPENDS mitkPluginGeneratorCreateTest)
 
     add_test(NAME mitkPluginGeneratorBuildTest-${CMAKE_BUILD_TYPE}
              COMMAND ${CMAKE_COMMAND} --build ${test_project_binary_dir} --config ${CMAKE_BUILD_TYPE})
     set_tests_properties(mitkPluginGeneratorBuildTest-${CMAKE_BUILD_TYPE} PROPERTIES
                          DEPENDS mitkPluginGeneratorConfigureTest-${CMAKE_BUILD_TYPE})
   endif()
 
   set(package_test_configurations)
   if(WIN32)
     # Only test packaging if build type is "Release" on Windows
     set(package_test_configurations CONFIGURATIONS Release)
   endif()
 
   if(NOT MITK_FAST_TESTING)
 
     if(WIN32)
       # Only test packaging if build type is "Release" on Windows
       add_test(NAME mitkPluginGeneratorPackageTest CONFIGURATIONS Release
                COMMAND ${CMAKE_COMMAND} --build ${test_project_binary_dir}/${proj}-build --config Release --target package)
       set_tests_properties(mitkPluginGeneratorPackageTest PROPERTIES
                            DEPENDS mitkPluginGeneratorBuildTest-Release
                            TIMEOUT 6000)
     elseif(CMAKE_BUILD_TYPE)
       add_test(mitkPluginGeneratorPackageTest
                ${CMAKE_COMMAND} --build ${test_project_binary_dir}/${proj}-build --config ${CMAKE_BUILD_TYPE} --target package)
       set_tests_properties(mitkPluginGeneratorPackageTest PROPERTIES
                            DEPENDS mitkPluginGeneratorBuildTest-${CMAKE_BUILD_TYPE}
                            TIMEOUT 6000)
     endif()
 
   endif()
 
 endif()