diff --git a/CMake/mitkTestProjectTemplate.cmake b/CMake/mitkTestProjectTemplate.cmake
index 83d390308a..f74fd8d026 100644
--- a/CMake/mitkTestProjectTemplate.cmake
+++ b/CMake/mitkTestProjectTemplate.cmake
@@ -1,94 +1,103 @@
 if(BUILD_TESTING)
 
   include(ExternalProject)
 
-  set(proj MITK-ProjectTemplate)
-  set(MITK-ProjectTemplate_BINARY_DIR "${MITK_BINARY_DIR}/${proj}-build")
-
-  ExternalProject_Add(${proj}
-    GIT_REPOSITORY http://git.mitk.org/MITK-ProjectTemplate.git
-    GIT_TAG origin/master
-    SOURCE_DIR "${MITK_BINARY_DIR}/${proj}"
-    BINARY_DIR "${MITK-ProjectTemplate_BINARY_DIR}"
-    PREFIX "${proj}-cmake"
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-    CMAKE_GENERATOR "${CMAKE_GENERATOR}"
-    CMAKE_ARGS
-      -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-      -DMITK_DIR:PATH=${MITK_BINARY_DIR}
-      -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-      -DAwesomeProject_BUILD_ALL_PLUGINS:BOOL=ON
-      -DAwesomeProject_BUILD_ALL_APPS:BOOL=ON
-  )
+  set(proj PT) # Means ProjectTemplate (use a short name due to Windows limitations)
+  set(MITK-ProjectTemplate_SOURCE_DIR "${MITK_BINARY_DIR}/${proj}")
+  set(MITK-ProjectTemplate_BINARY_DIR "${MITK_BINARY_DIR}/${proj}-bin")
   
-  add_test(NAME mitkProjectTemplateCleanTest
+  add_test(NAME mitkProjectTemplateRmSrcTest
+           COMMAND ${CMAKE_COMMAND} -E remove_directory "${MITK-ProjectTemplate_SOURCE_DIR}"
+          )
+  set_tests_properties(mitkProjectTemplateRmSrcTest PROPERTIES
+                       LABELS "MITK;BlueBerry")
+
+  add_test(NAME mitkProjectTemplateRmBinTest
            COMMAND ${CMAKE_COMMAND} -E remove_directory "${MITK-ProjectTemplate_BINARY_DIR}"
           )
-  set_tests_properties(mitkProjectTemplateCleanTest PROPERTIES
+  set_tests_properties(mitkProjectTemplateRmBinTest PROPERTIES
                        LABELS "MITK;BlueBerry")
 
-  add_test(NAME mitkProjectTemplateCleanTest2
+  add_test(NAME mitkProjectTemplateMakeBinTest
            COMMAND ${CMAKE_COMMAND} -E make_directory "${MITK-ProjectTemplate_BINARY_DIR}"
           )
-  set_tests_properties(mitkProjectTemplateCleanTest2 PROPERTIES
-                       DEPENDS mitkProjectTemplateCleanTest
+  set_tests_properties(mitkProjectTemplateMakeBinTest PROPERTIES
+                       DEPENDS mitkProjectTemplateRmBinTest
+                       LABELS "MITK;BlueBerry")
+
+  add_test(NAME mitkProjectTemplateCloneTest
+           COMMAND ${GIT_EXECUTABLE} clone http://git.mitk.org/MITK-ProjectTemplate.git ${MITK-ProjectTemplate_SOURCE_DIR}
+          )
+  set_tests_properties(mitkProjectTemplateCloneTest PROPERTIES
+                       DEPENDS mitkProjectTemplateRmSrcTest
                        LABELS "MITK;BlueBerry")
-                       
                          
   if(CMAKE_CONFIGURATION_TYPES)
     foreach(config ${CMAKE_CONFIGURATION_TYPES})
       add_test(NAME mitkProjectTemplateConfigureTest-${config} CONFIGURATIONS ${config}
-               COMMAND ${CMAKE_COMMAND} --build ${MITK_BINARY_DIR} --config ${config} --target ${proj})
+               WORKING_DIRECTORY "${MITK-ProjectTemplate_BINARY_DIR}"
+               COMMAND ${CMAKE_COMMAND} -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
+                                        -DMITK_DIR:PATH=${MITK_BINARY_DIR}
+                                        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                                        -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+                                        -DAwesomeProject_BUILD_ALL_PLUGINS:BOOL=ON
+                                        -DAwesomeProject_BUILD_ALL_APPS:BOOL=ON
+                                        "${MITK-ProjectTemplate_SOURCE_DIR}")
       set_tests_properties(mitkProjectTemplateConfigureTest-${config} PROPERTIES
-                           DEPENDS mitkProjectTemplateCleanTest2
+                           DEPENDS "mitkProjectTemplateCloneTest;mitkProjectTemplateMakeBinTest"
                            LABELS "MITK;BlueBerry")
                            
       add_test(NAME mitkProjectTemplateBuildTest-${config} CONFIGURATIONS ${config}
                COMMAND ${CMAKE_COMMAND} --build ${MITK-ProjectTemplate_BINARY_DIR} --config ${config})
       set_tests_properties(mitkProjectTemplateBuildTest-${config} PROPERTIES
                            DEPENDS mitkProjectTemplateConfigureTest-${config}
                            LABELS "MITK;BlueBerry")
     endforeach()
   else()
     add_test(NAME mitkProjectTemplateConfigureTest-${CMAKE_BUILD_TYPE}
-             COMMAND ${CMAKE_COMMAND} --build ${MITK_BINARY_DIR} --config ${CMAKE_BUILD_TYPE} --target ${proj})
+             WORKING_DIRECTORY "${MITK-ProjectTemplate_BINARY_DIR}"
+             COMMAND ${CMAKE_COMMAND} -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
+                                      -DMITK_DIR:PATH=${MITK_BINARY_DIR}
+                                      -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                                      -DAwesomeProject_BUILD_ALL_PLUGINS:BOOL=ON
+                                      -DAwesomeProject_BUILD_ALL_APPS:BOOL=ON
+                                      "${MITK-ProjectTemplate_SOURCE_DIR}")
     set_tests_properties(mitkProjectTemplateConfigureTest-${CMAKE_BUILD_TYPE} PROPERTIES
-                         DEPENDS mitkProjectTemplateCleanTest2
+                         DEPENDS "mitkProjectTemplateCloneTest;mitkProjectTemplateMakeBinTest"
                          LABELS "MITK;BlueBerry")
                          
     add_test(NAME mitkProjectTemplateBuildTest-${CMAKE_BUILD_TYPE}
              COMMAND ${CMAKE_COMMAND} --build ${MITK-ProjectTemplate_BINARY_DIR} --config ${CMAKE_BUILD_TYPE})
     set_tests_properties(mitkProjectTemplateBuildTest-${CMAKE_BUILD_TYPE} PROPERTIES
                          DEPENDS mitkProjectTemplateConfigureTest-${CMAKE_BUILD_TYPE}
                          LABELS "MITK;BlueBerry")
   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 mitkProjectTemplatePackageTest CONFIGURATIONS Release
                COMMAND ${CMAKE_COMMAND} --build ${MITK-ProjectTemplate_BINARY_DIR}/AwesomeProject-build --config Release --target package)
       set_tests_properties(mitkProjectTemplatePackageTest PROPERTIES
                            DEPENDS mitkProjectTemplateBuildTest-Release
                            TIMEOUT 3600 
                            LABELS "MITK;BlueBerry")
     elseif(CMAKE_BUILD_TYPE)
       add_test(NAME mitkProjectTemplatePackageTest
                COMMAND ${CMAKE_COMMAND} --build ${MITK-ProjectTemplate_BINARY_DIR}/AwesomeProject-build --config ${CMAKE_BUILD_TYPE} --target package)
       set_tests_properties(mitkProjectTemplatePackageTest PROPERTIES
                            DEPENDS mitkProjectTemplateBuildTest-${CMAKE_BUILD_TYPE}
                            TIMEOUT 3600
                            LABELS "MITK;BlueBerry")
     endif() 
     
   endif()
   
 endif()