diff --git a/Modules/MapperExt/test/CMakeLists.txt b/Modules/MapperExt/test/CMakeLists.txt
index 0590c01a04..b1871384ad 100644
--- a/Modules/MapperExt/test/CMakeLists.txt
+++ b/Modules/MapperExt/test/CMakeLists.txt
@@ -1,8 +1,5 @@
-MITK_CREATE_MODULE_TESTS()
-
-if(MITK_ENABLE_RENDERING_TESTING) ### since the rendering test's do not run in ubuntu, yet, we build them only for other systems or if the user explicitly sets the variable
-  SET_PROPERTY(TEST
-    mitkSplineVtkMapper3DTest
-  PROPERTY RUN_SERIAL TRUE)
+mitk_create_module_tests()
 
+if(BUILD_TESTING AND MITK_ENABLE_RENDERING_TESTING)
+  set_property(TEST mitkSplineVtkMapper3DTest PROPERTY RUN_SERIAL TRUE)
 endif()
diff --git a/Modules/MapperExt/test/files.cmake b/Modules/MapperExt/test/files.cmake
index 4cd28b8c46..6e0a4d2dcf 100644
--- a/Modules/MapperExt/test/files.cmake
+++ b/Modules/MapperExt/test/files.cmake
@@ -1,49 +1,8 @@
-# tests with no extra command line parameter
 set(MODULE_TESTS
-  # IMPORTANT: If you plan to deactivate / comment out a test please write a bug number to the commented out line of code.
-  #
-  #     Example: #mitkMyTest #this test is commented out because of bug 12345
-  #
-  # It is important that the bug is open and that the test will be activated again before the bug is closed. This assures that
-  # no test is forgotten after it was commented out. If there is no bug for your current problem, please add a new one and
-  # mark it as critical.
-
-  ################## DISABLED TESTS #################################################
-
-  ################# RUNNING TESTS ###################################################
 )
 
 if(MITK_ENABLE_RENDERING_TESTING)
-set(MODULE_TESTS
-  ${MODULE_TESTS}
-  mitkSplineVtkMapper3DTest.cpp #new rendering test in CppUnit style
-)
+  list(APPEND MODULE_TESTS
+    mitkSplineVtkMapper3DTest.cpp
+  )
 endif()
-
-# test with image filename as an extra command line parameter
-set(MODULE_IMAGE_TESTS
-)
-
-set(MODULE_SURFACE_TESTS
-)
-
-set(MODULE_POINTSET_TESTS
-)
-
-# image files
-set(MODULE_TESTIMAGE
-)
-
-# surface files
-set(MODULE_TESTSURFACE
-)
-
-# pointset files
-set(MODULE_TESTPOINTSET
-)
-
-
-set(MODULE_CUSTOM_TESTS
-)
-
-set(RESOURCE_FILES)