diff --git a/Modules/CTestTargets.cmake b/Modules/CTestTargets.cmake
index d66874d8f..bc4d9646a 100644
--- a/Modules/CTestTargets.cmake
+++ b/Modules/CTestTargets.cmake
@@ -69,7 +69,7 @@ IF(NOT _CTEST_TARGETS_ADDED)
   ENDFOREACH(mode)
 
   # For Makefile generators add more granular targets.
-  IF("${CMAKE_GENERATOR}" MATCHES Make)
+  IF("${CMAKE_GENERATOR}" MATCHES "(Ninja|Make)")
     # Make targets for Experimental builds
     FOREACH(mode Nightly Experimental Continuous)
       FOREACH(testtype
@@ -83,7 +83,7 @@ IF(NOT _CTEST_TARGETS_ADDED)
         SET_PROPERTY(TARGET ${mode}${testtype} PROPERTY FOLDER "CTestDashboardTargets")
       ENDFOREACH(testtype)
     ENDFOREACH(mode)
-  ENDIF("${CMAKE_GENERATOR}" MATCHES Make)
+  ENDIF("${CMAKE_GENERATOR}" MATCHES "(Ninja|Make)")
 
   # If requested, add an alias that is the equivalent of the built-in "test"
   # or "RUN_TESTS" target: