diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 689c18759..71dfb0d38 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -14,9 +14,9 @@ MACRO(ADD_TEST_MACRO NAME COMMAND)
 ENDMACRO(ADD_TEST_MACRO)
 
 # Make sure the 'testing' test gets a proper configuration.
-SET_DIRECTORY_PROPERTIES(PROPERTIES
-  TEST_INCLUDE_FILE "${CMake_SOURCE_DIR}/Tests/EnforceConfig.cmake"
-  )
+#SET_DIRECTORY_PROPERTIES(PROPERTIES
+#  TEST_INCLUDE_FILE "${CMake_SOURCE_DIR}/Tests/EnforceConfig.cmake"
+#  )
 
 # Testing
 IF(BUILD_TESTING)
@@ -542,14 +542,16 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
   ENDFOREACH(STP)
   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Tutorial")
 
-  ADD_TEST(testing ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE}
+  ADD_TEST(testing ${CMAKE_CTEST_COMMAND} # -C \${CTEST_CONFIGURATION_TYPE}
     --build-and-test
     "${CMake_SOURCE_DIR}/Tests/Testing"
     "${CMake_BINARY_DIR}/Tests/Testing"
     --build-generator ${CMAKE_TEST_GENERATOR}
     --build-project Testing
     --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
-    --test-command ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE}
+    #--test-command ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE}
+    --build-exe-dir "${CMake_BINARY_DIR}/Tests/Testing/bin"
+    --test-command testing
     )
   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Testing")