diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42f34ad59..e24dcfade 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,19 +30,19 @@ ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.4)
 #silence duplicate symbol warnings on AIX
 IF(CMAKE_SYSTEM MATCHES "AIX.*")
   IF(NOT CMAKE_COMPILER_IS_GNUCXX)
-     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -bhalt:5 ")
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -bhalt:5 ")
   ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
 ENDIF(CMAKE_SYSTEM MATCHES "AIX.*")
 
 IF(CMAKE_SYSTEM MATCHES "IRIX.*")
   IF(NOT CMAKE_COMPILER_IS_GNUCXX)
-     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -LD_MSG:off=15 ")
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -LD_MSG:off=15 ")
   ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
 ENDIF(CMAKE_SYSTEM MATCHES "IRIX.*")
 
 IF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
   IF(NOT CMAKE_COMPILER_IS_GNUCXX)
-     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -timplicit_local -no_implicit_include ")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -timplicit_local -no_implicit_include ")
   ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
 ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
 
@@ -94,17 +94,17 @@ MARK_AS_ADVANCED(CURL_TESTING)
 
 SET(EXECUTABLE_OUTPUT_PATH ${CMake_BINARY_DIR}/bin CACHE INTERNAL 
   "Where to put the executables for CMake"
-)
+  )
 SET(LIBRARY_OUTPUT_PATH "" CACHE INTERNAL 
   "Where to put the libraries for CMake"
-)
+  )
 
 INCLUDE_REGULAR_EXPRESSION("^(\\.\\./)?(cm|CMake|form|ctest).*")
 
 CONFIGURE_FILE(${CMake_SOURCE_DIR}/Tests/.NoDartCoverage
-               ${CMake_BINARY_DIR}/Tests/.NoDartCoverage)
+  ${CMake_BINARY_DIR}/Tests/.NoDartCoverage)
 CONFIGURE_FILE(${CMake_SOURCE_DIR}/Tests/.NoDartCoverage
-               ${CMake_BINARY_DIR}/Modules/.NoDartCoverage)
+  ${CMake_BINARY_DIR}/Modules/.NoDartCoverage)
 
 SET(CMAKE_BUILD_MFC_DIALOG 0)
 IF(WIN32)
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index f7d759577..0be97718b 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -562,6 +562,19 @@ IF(BUILD_TESTING)
       )
   ENDIF (APPLE)
 
+  IF (UNIX)
+    CONFIGURE_FILE(
+      "${CMake_SOURCE_DIR}/Tests/CTestTest/ctest.cmake.in"
+      "${CMake_BINARY_DIR}/Tests/CTestTest/ctest.cmake"
+      @ONLY
+      )
+    ADD_TEST(CTestTest ${CMAKE_CTEST_COMMAND}
+      -S "${CMake_BINARY_DIR}/Tests/CTestTest/ctest.cmake" -V
+      )
+
+  ENDIF (UNIX)
+
+
   IF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE OR WXWINDOWS_INCLUDE_DIR)
     # Will be set if the wxwindows gui is on
     ADD_TEST(UseWX ${CMAKE_CTEST_COMMAND}