diff --git a/Modules/BreakpadCrashReporting/CMakeLists.txt b/Modules/BreakpadCrashReporting/CMakeLists.txt
index 34a2af2751..e845324ad3 100644
--- a/Modules/BreakpadCrashReporting/CMakeLists.txt
+++ b/Modules/BreakpadCrashReporting/CMakeLists.txt
@@ -1,31 +1,32 @@
 # TODOs
 #  LATER nicer separation of Linux/Window/.. code
 #  OK test should check existence of dump file
 #  - find nice script to use linux symbol writer tool dump_.. on all relevant libraries
 #  - update documentation
 #  OK check buildtype (O2/-g/..) in cmake
 #  OK use the same library structure in "our" cmake script as google uses in their build
 #    OK otherwise we cannot switch between custom-built versions of breakpad and our superbuild version
 #  [optional] add install step to our Breakpad build
 
 if(MITK_USE_Breakpad) # from top-level CMakeLists.txt
 
   find_package(Breakpad)
   if (NOT Breakpad_FOUND)
     message(FATAL_ERROR "MITK_USE_Breakpad was set but Breakpad build cannot be found. Plaese check CMake cache variables regarding Breakpad")
   endif()
 
   MITK_CREATE_MODULE(BreakpadCrashReporting
     INTERNAL_INCLUDE_DIRS ${Breakpad_INCLUDE_DIR}
     ADDITIONAL_LIBS ${Breakpad_LIBRARIES}
     PACKAGE_DEPENDS QT
     )
 
   if(CMAKE_SYSTEM MATCHES "Windows")
-    add_executable(CrashReportingServer WIN32 mitkCrashReportingServer.cpp ${SERVER_MOC_CPP})
+    add_executable(CrashReportingServer WIN32 mitkCrashReportingServer.cpp)
+    # TODO MITK_INSTALL(CrashReportingServer ..)
     target_link_libraries(CrashReportingServer ${ALL_LIBRARIES} ${QT_QTMAIN_LIBRARY} BreakpadCrashReporting)
   endif()
 
 add_subdirectory(Testing)
 
 endif(MITK_USE_Breakpad)
diff --git a/Modules/BreakpadCrashReporting/Testing/CMakeLists.txt b/Modules/BreakpadCrashReporting/Testing/CMakeLists.txt
index de2fdbfb2d..073745ed2e 100644
--- a/Modules/BreakpadCrashReporting/Testing/CMakeLists.txt
+++ b/Modules/BreakpadCrashReporting/Testing/CMakeLists.txt
@@ -1,4 +1,7 @@
-MITK_CREATE_MODULE_TESTS()
+if(BUILD_TESTING)
+  MITK_CREATE_MODULE_TESTS()
 
-set_property(TEST mitkBreakpadCrashReportingDumpTest PROPERTY WILL_FAIL TRUE) # this one SHOULD crash
-set_property(TEST mitkBreakpadCrashReportingDumpCheckTest PROPERTY DEPENDS mitkBreakpadCrashReportingDumpTest) # this one checks if a dump was created
+  set_property(TEST mitkBreakpadCrashReportingDumpTest PROPERTY WILL_FAIL TRUE) # this one SHOULD crash
+  set_property(TEST mitkBreakpadCrashReportingDumpCheckTest PROPERTY DEPENDS mitkBreakpadCrashReportingDumpTest) # this one checks if a dump was created
+
+endif()