diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae4c9b7af..20a161f6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,7 +134,9 @@ ENDMACRO(CMAKE_TEST_FOR_MFC)
 # for testing. Simply to improve readability of the main script.
 #-----------------------------------------------------------------------
 MACRO(CMAKE_SETUP_TESTING)
-  SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM})
+  IF (NOT DART_ROOT)
+    SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM})
+  ENDIF (NOT DART_ROOT)
   
   IF(BUILD_TESTING)
     SET(CMAKE_TEST_GENERATOR "" CACHE STRING 
@@ -188,6 +190,11 @@ MACRO(CMAKE_SETUP_TESTING)
     ${CMake_BINARY_DIR}/CTestCustom.cmake @ONLY)
   CONFIGURE_FILE(${CMake_SOURCE_DIR}/CTestCustom.ctest.in
     ${CMake_BINARY_DIR}/CTestCustom.ctest @ONLY)
+  IF(BUILD_TESTING AND DART_ROOT)
+    CONFIGURE_FILE(${CMake_SOURCE_DIR}/CMakeLogo.gif 
+      ${CMake_BINARY_DIR}/Testing/HTML/TestingResults/Icons/Logo.gif COPYONLY)
+  ENDIF(BUILD_TESTING AND DART_ROOT)
+  MARK_AS_ADVANCED(DART_ROOT)
   MARK_AS_ADVANCED(CURL_TESTING)
 ENDMACRO(CMAKE_SETUP_TESTING)
 
@@ -358,7 +365,7 @@ SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}")
 
 # Include the standard Dart testing module
 ENABLE_TESTING()
-INCLUDE (${CMAKE_ROOT}/Modules/CTest.cmake)
+INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
 
 # where to write the resulting executables and libraries
 SET(BUILD_SHARED_LIBS OFF)