diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx
index d1a7736b96..83ccb19962 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.cxx
+++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx
@@ -457,8 +457,8 @@ int cmCTestBuildAndTestHandler::ProcessCommandLineArguments(
       {
       this->BuildOptions.push_back(allArgs[idx]);
       if(idx+1 < allArgs.size()
-        && (allArgs[idx+1] == "--build-target" ||
-          allArgs[idx+1] == "--test-command"))
+         && (allArgs[idx+1] == "--build-target" ||
+             allArgs[idx+1] == "--test-command"))
         {
         done = true;
         }
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 57eee3911c..db6c38cda2 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -1094,8 +1094,10 @@ int cmCTest::RunTest(std::vector<const char*> argv,
       {
       if(argv[i])
         {
-        // if this test has a test command make sure we pass the timeout in
-        if (strcmp(argv[i],"--test-command") == 0 && testTimeOut)
+        // make sure we pass the timeout in for any build and test 
+        // invocations. Since --build-generator is required this is a 
+        // good place to check for it, and to add the arguments in
+        if (strcmp(argv[i],"--build-generator") == 0 && testTimeOut)
           {
           args.push_back("--test-timeout");
           cmOStringStream msg;