diff --git a/Source/CTest/cmCTestMemCheckCommand.cxx b/Source/CTest/cmCTestMemCheckCommand.cxx
index 0f055784a..f8ca9a063 100644
--- a/Source/CTest/cmCTestMemCheckCommand.cxx
+++ b/Source/CTest/cmCTestMemCheckCommand.cxx
@@ -71,6 +71,13 @@ bool cmCTestMemCheckCommand::InitialPass(
     m_CTest->SetCTestConfiguration("BuildDirectory", build_dir);
     }
 
+  m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+    "MemoryCheckCommand", "CTEST_MEMORYCHECK_COMMAND");
+  m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+    "MemoryCheckCommandOptions", "CTEST_MEMORYCHECK_COMMAND_OPTIONS");
+  m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+    "MemoryCheckSuppressionFile", "CTEST_MEMORYCHECK_SUPPRESSIONS_FILE");
+
   cmCTestGenericHandler* handler = m_CTest->GetHandler("memcheck");
   if ( !handler )
     {
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 5c9112991..a5646c073 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -324,7 +324,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
     m_MemoryTesterStyle = cmCTestMemCheckHandler::VALGRIND;
     if ( !m_MemoryTesterOptions.size() )
       {
-      m_MemoryTesterOptions = "-q --skin=memcheck --leak-check=yes --show-reachable=yes --workaround-gcc296-bugs=yes --num-callers=100";
+      m_MemoryTesterOptions = "-q --tool=memcheck --leak-check=yes --show-reachable=yes --workaround-gcc296-bugs=yes --num-callers=100";
       }
     if ( m_CTest->GetCTestConfiguration("MemoryCheckSuppressionFile").size() )
       {