diff --git a/Core/Code/Testing/CMakeLists.txt b/Core/Code/Testing/CMakeLists.txt
index fd619d3bce..1033612d76 100644
--- a/Core/Code/Testing/CMakeLists.txt
+++ b/Core/Code/Testing/CMakeLists.txt
@@ -1,23 +1,17 @@
 MITK_CREATE_MODULE_TESTS(LABELS MITK-Core)
 # MITK_INSTALL_TARGETS(EXECUTABLES MitkTestDriver)
 
-ADD_TEST(mitkPicFileReaderTest_emptyFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkPicFileReaderTest ${CMAKE_CURRENT_SOURCE_DIR}/Data/emptyFile.pic)
-SET_PROPERTY(TEST mitkPicFileReaderTest_emptyFile PROPERTY LABELS MITK-Core)
+mitkAddCustomModuleTest(mitkPicFileReaderTest_emptyFile mitkPicFileReaderTest ${CMAKE_CURRENT_SOURCE_DIR}/Data/emptyFile.pic)
 
-ADD_TEST(mitkPicFileReaderTest_emptyGzipFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkPicFileReaderTest ${CMAKE_CURRENT_SOURCE_DIR}/Data/emptyFile.pic.gz)
-SET_PROPERTY(TEST mitkPicFileReaderTest_emptyGzipFile PROPERTY LABELS MITK-Core)
+mitkAddCustomModuleTest(mitkPicFileReaderTest_emptyGzipFile mitkPicFileReaderTest ${CMAKE_CURRENT_SOURCE_DIR}/Data/emptyFile.pic.gz)
 
-ADD_TEST(mitkDICOMLocaleTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkDICOMLocaleTest ${MITK_DATA_DIR}/spacing-ok.dcm)
-SET_PROPERTY(TEST mitkDICOMLocaleTest PROPERTY LABELS MITK-Core)
+mitkAddCustomModuleTest(mitkDICOMLocaleTest mitkDICOMLocaleTest ${MITK_DATA_DIR}/spacing-ok.dcm)
 
-ADD_TEST(mitkEventMapperTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkEventMapperTest ${MITK_DATA_DIR}/TestStateMachine1.xml ${MITK_DATA_DIR}/TestStateMachine2.xml)
-SET_PROPERTY(TEST mitkEventMapperTest PROPERTY LABELS MITK-Core)
+mitkAddCustomModuleTest(mitkEventMapperTest mitkEventMapperTest ${MITK_DATA_DIR}/TestStateMachine1.xml ${MITK_DATA_DIR}/TestStateMachine2.xml)
 
-ADD_TEST(mitkNodeDependentPointSetInteractorTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkNodeDependentPointSetInteractorTest ${MITK_DATA_DIR}/Pic3D.pic.gz ${MITK_DATA_DIR}/BallBinary30x30x30.pic.gz)
-SET_PROPERTY(TEST mitkNodeDependentPointSetInteractorTest PROPERTY LABELS MITK-Core)
+mitkAddCustomModuleTest(mitkNodeDependentPointSetInteractorTest mitkNodeDependentPointSetInteractorTest ${MITK_DATA_DIR}/Pic3D.pic.gz ${MITK_DATA_DIR}/BallBinary30x30x30.pic.gz)
 
-ADD_TEST(mitkDataStorageTest_US4DCyl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkDataStorageTest ${MITK_DATA_DIR}/US4DCyl.pic.gz)
-SET_PROPERTY(TEST mitkDataStorageTest_US4DCyl PROPERTY LABELS MITK-Core)
+mitkAddCustomModuleTest(mitkDataStorageTest_US4DCyl mitkDataStorageTest ${MITK_DATA_DIR}/US4DCyl.pic.gz)
+
+mitkAddCustomModuleTest(mitkStateMachineFactoryTest_TestStateMachine1_2 mitkStateMachineFactoryTest ${MITK_DATA_DIR}/TestStateMachine1.xml ${MITK_DATA_DIR}/TestStateMachine2.xml)
 
-ADD_TEST(mitkStateMachineFactoryTest_TestStateMachine1_2 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkStateMachineFactoryTest ${MITK_DATA_DIR}/TestStateMachine1.xml ${MITK_DATA_DIR}/TestStateMachine2.xml)
-SET_PROPERTY(TEST mitkStateMachineFactoryTest_TestStateMachine1_2 PROPERTY LABELS MITK-Core)
diff --git a/Modules/IGT/Testing/CMakeLists.txt b/Modules/IGT/Testing/CMakeLists.txt
index bd03bb6c47..457b10b802 100644
--- a/Modules/IGT/Testing/CMakeLists.txt
+++ b/Modules/IGT/Testing/CMakeLists.txt
@@ -1,20 +1,17 @@
 IF(BUILD_TESTING)
-  INCLUDE(MITKIGTTrackingDeviceHardwareTesting.cmake)
+ INCLUDE(MITKIGTTrackingDeviceHardwareTesting.cmake)
 ENDIF(BUILD_TESTING)
 
 MITK_CREATE_MODULE_TESTS()
 
 IF(MITK_NDI_AURORA_CONNECTED)
-   ADD_TEST(mitkNDIAuroraHardwareTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkNDIAuroraHardwareTest ${MITK_NDI_AURORA_COM_PORT})
-   SET_PROPERTY(TEST mitkNDIAuroraHardwareTest PROPERTY LABELS MITK-IGT MITK)
+  mitkAddCustomModuleTest(mitkNDIAuroraHardwareTest mitkNDIAuroraHardwareTest ${MITK_NDI_AURORA_COM_PORT})
 ENDIF(MITK_NDI_AURORA_CONNECTED)
 
 IF(MITK_NDI_POLARIS_CONNECTED)
-   ADD_TEST(mitkNDIPolarisHardwareTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkNDIPolarisHardwareTest ${MITK_NDI_POLARIS_COM_PORT})
-   SET_PROPERTY(TEST mitkNDIPolarisHardwareTest PROPERTY LABELS MITK-IGT MITK)
+  mitkAddCustomModuleTest(mitkNDIPolarisHardwareTest mitkNDIPolarisHardwareTest ${MITK_NDI_POLARIS_COM_PORT})
 ENDIF(MITK_NDI_POLARIS_CONNECTED)
 
 IF(MITK_CLARON_MICRONTRACKER_CONNECTED)
-   ADD_TEST(mitkClaronTrackingDeviceHardwareTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER}  mitkClaronTrackingDeviceHardwareTest ${MITK_DATA_DIR}/IGT-Data/MicronTrackerToolfiles/Tool_11 ${MITK_DATA_DIR}/IGT-Data/MicronTrackerToolfiles/Tool_12 ${MITK_DATA_DIR}/IGT-Data/MicronTrackerToolfiles/Tool_13)
-   SET_PROPERTY(TEST mitkClaronTrackingDeviceHardwareTest PROPERTY LABELS MITK-IGT MITK)
-ENDIF(MITK_CLARON_MICRONTRACKER_CONNECTED)
\ No newline at end of file
+  mitkAddCustomModuleTest(mitkClaronTrackingDeviceHardwareTest  mitkClaronTrackingDeviceHardwareTest ${MITK_DATA_DIR}/IGT-Data/MicronTrackerToolfiles/Tool_11 ${MITK_DATA_DIR}/IGT-Data/MicronTrackerToolfiles/Tool_12 ${MITK_DATA_DIR}/IGT-Data/MicronTrackerToolfiles/Tool_13)
+ENDIF(MITK_CLARON_MICRONTRACKER_CONNECTED)
diff --git a/Modules/MitkExt/Testing/CMakeLists.txt b/Modules/MitkExt/Testing/CMakeLists.txt
index 7b83c48560..f5d081b95d 100644
--- a/Modules/MitkExt/Testing/CMakeLists.txt
+++ b/Modules/MitkExt/Testing/CMakeLists.txt
@@ -1,7 +1,6 @@
-
 MITK_CREATE_MODULE_TESTS(EXTRA_DRIVER_INIT "RegisterCoreExtObjectFactory();;"
                          EXTRA_DRIVER_INCLUDE "mitkCoreExtObjectFactory.h")
 
-ADD_TEST(mitkLabeledImageToSurfaceFilterTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkLabeledImageToSurfaceFilterTest ${MITK_SOURCE_DIR}/Core/Code/Testing/Data/BallBinary30x30x30.pic.gz)
+mitkAddCustomModuleTest(mitkLabeledImageToSurfaceFilterTest  mitkLabeledImageToSurfaceFilterTest ${MITK_SOURCE_DIR}/Core/Code/Testing/Data/BallBinary30x30x30.pic.gz)