diff --git a/Modules/Classification/CLUtilities/test/files.cmake b/Modules/Classification/CLUtilities/test/files.cmake
index 579c0e0670..a2d8b7b28d 100644
--- a/Modules/Classification/CLUtilities/test/files.cmake
+++ b/Modules/Classification/CLUtilities/test/files.cmake
@@ -1,18 +1,18 @@
 set(MODULE_TESTS
-  mitkGIFCooc2Test
-  mitkGIFCurvatureStatisticTest
-  mitkGIFFirstOrderHistogramStatisticsTest
-  mitkGIFFirstOrderNumericStatisticsTest
-  mitkGIFFirstOrderStatisticsTest
-  mitkGIFGreyLevelDistanceZoneTest
-  mitkGIFGreyLevelSizeZoneTest
-  mitkGIFImageDescriptionFeaturesTest
-  mitkGIFIntensityVolumeHistogramTest
-  mitkGIFLocalIntensityTest
-  mitkGIFNeighbourhoodGreyToneDifferenceFeaturesTest
-  mitkGIFNeighbouringGreyLevelDependenceFeatureTest
-  mitkGIFVolumetricDensityStatisticsTest
-  mitkGIFVolumetricStatisticsTest
+  mitkGIFCooc2Test.cpp
+  mitkGIFCurvatureStatisticTest.cpp
+  mitkGIFFirstOrderHistogramStatisticsTest.cpp
+  mitkGIFFirstOrderNumericStatisticsTest.cpp
+  mitkGIFFirstOrderStatisticsTest.cpp
+  mitkGIFGreyLevelDistanceZoneTest.cpp
+  mitkGIFGreyLevelSizeZoneTest.cpp
+  mitkGIFImageDescriptionFeaturesTest.cpp
+  mitkGIFIntensityVolumeHistogramTest.cpp
+  mitkGIFLocalIntensityTest.cpp
+  mitkGIFNeighbourhoodGreyToneDifferenceFeaturesTest.cpp
+  mitkGIFNeighbouringGreyLevelDependenceFeatureTest.cpp
+  mitkGIFVolumetricDensityStatisticsTest.cpp
+  mitkGIFVolumetricStatisticsTest.cpp
   #mitkSmoothedClassProbabilitesTest.cpp
   #mitkGlobalFeaturesTest.cpp
 )
diff --git a/Modules/CppMicroServices/core/test/CMakeLists.txt b/Modules/CppMicroServices/core/test/CMakeLists.txt
index 6a763a0fa7..3e2ed685e5 100644
--- a/Modules/CppMicroServices/core/test/CMakeLists.txt
+++ b/Modules/CppMicroServices/core/test/CMakeLists.txt
@@ -1,98 +1,98 @@
 
 #-----------------------------------------------------------------------------
 # Configure files, include dirs, etc.
 #-----------------------------------------------------------------------------
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/usTestingConfig.h.in" "${PROJECT_BINARY_DIR}/include/usTestingConfig.h")
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 #-----------------------------------------------------------------------------
 # Create test modules
 #-----------------------------------------------------------------------------
 
 include(usFunctionCreateTestModule)
 
 set(_us_test_module_libs "" CACHE INTERNAL "" FORCE)
 add_subdirectory(modules)
 
 #-----------------------------------------------------------------------------
 # Add unit tests
 #-----------------------------------------------------------------------------
 
 set(_tests
-  usAnyTest
-  usLDAPFilterTest
-  usLogTest
-  usModuleHooksTest
-  usModuleManifestTest
-  usModuleTest
-  usModuleResourceTest
-  usServiceFactoryTest
-  usServiceHooksTest
-  usServiceRegistryPerformanceTest
-  usServiceRegistryTest
-  usServiceTemplateTest
-  usServiceTrackerTest
-  usStaticModuleResourceTest
-  usStaticModuleTest
+  usAnyTest.cpp
+  usLDAPFilterTest.cpp
+  usLogTest.cpp
+  usModuleHooksTest.cpp
+  usModuleManifestTest.cpp
+  usModuleTest.cpp
+  usModuleResourceTest.cpp
+  usServiceFactoryTest.cpp
+  usServiceHooksTest.cpp
+  usServiceRegistryPerformanceTest.cpp
+  usServiceRegistryTest.cpp
+  usServiceTemplateTest.cpp
+  usServiceTrackerTest.cpp
+  usStaticModuleResourceTest.cpp
+  usStaticModuleTest.cpp
 )
 
 if(US_BUILD_SHARED_LIBS)
   list(APPEND _tests
-       usServiceListenerTest
-       usSharedLibraryTest
+       usServiceListenerTest.cpp
+       usSharedLibraryTest.cpp
       )
   if(US_ENABLE_AUTOLOADING_SUPPORT)
-    list(APPEND _tests usModuleAutoLoadTest)
+    list(APPEND _tests usModuleAutoLoadTest.cpp)
   endif()
 endif()
 
 set(_additional_srcs
   usTestDriverActivator.cpp
   usTestManager.cpp
   usTestUtilModuleListener.cpp
 )
 
 set(_test_driver us${PROJECT_NAME}TestDriver)
 set(_test_sourcelist_extra_args )
 create_test_sourcelist(_srcs ${_test_driver}.cpp ${_tests} ${_test_sourcelist_extra_args})
 
 # Generate a custom "module init" file for the test driver executable
 usFunctionGenerateModuleInit(_srcs)
 
 usFunctionGetResourceSource(TARGET ${_test_driver} OUT _srcs)
 add_executable(${_test_driver} ${_srcs} ${_additional_srcs})
 set_property(TARGET ${_test_driver} APPEND PROPERTY COMPILE_DEFINITIONS US_MODULE_NAME=main)
 set_property(TARGET ${_test_driver} PROPERTY US_MODULE_NAME main)
 set_property(TARGET ${_test_driver} PROPERTY FOLDER "${MITK_ROOT_FOLDER}/CppMicroServices/Tests")
 if(NOT US_BUILD_SHARED_LIBS)
   set_property(TARGET ${_test_driver} APPEND PROPERTY COMPILE_DEFINITIONS US_STATIC_MODULE)
   target_link_libraries(${_test_driver} ${_us_test_module_libs})
 endif()
 
 target_link_libraries(${_test_driver} ${Core_TARGET})
 
 if(UNIX AND NOT APPLE)
   target_link_libraries(${_test_driver} rt)
 endif()
 
 # Add resources
 usFunctionEmbedResources(TARGET ${_test_driver}
                          FILES usTestResource.txt manifest.json
                          ZIP_ARCHIVES ${Core_TARGET} ${_us_test_module_libs})
 
 # Register tests
 foreach(_test ${_tests})
   add_test(NAME ${_test} COMMAND ${_test_driver} ${_test})
 endforeach()
 
 #-----------------------------------------------------------------------------
 # Add dependencies for shared libraries
 #-----------------------------------------------------------------------------
 
 if(US_BUILD_SHARED_LIBS)
   foreach(_test_module ${_us_test_module_libs})
     add_dependencies(${_test_driver} ${_test_module})
   endforeach()
 endif()
diff --git a/Modules/SurfaceInterpolation/Testing/files.cmake b/Modules/SurfaceInterpolation/Testing/files.cmake
index be4eb82fbf..f126978731 100644
--- a/Modules/SurfaceInterpolation/Testing/files.cmake
+++ b/Modules/SurfaceInterpolation/Testing/files.cmake
@@ -1,8 +1,8 @@
 set(MODULE_TESTS
   mitkComputeContourSetNormalsFilterTest.cpp
   mitkCreateDistanceImageFromSurfaceFilterTest.cpp
   mitkImageToPointCloudFilterTest.cpp
-  mitkPointCloudScoringFilterTest
+  mitkPointCloudScoringFilterTest.cpp
   mitkReduceContourSetFilterTest.cpp
   mitkSurfaceInterpolationControllerTest.cpp
 )