diff --git a/Source/cmAddCustomCommandCommand.cxx b/Source/cmAddCustomCommandCommand.cxx
index 9d665c47ec..94de8511c9 100644
--- a/Source/cmAddCustomCommandCommand.cxx
+++ b/Source/cmAddCustomCommandCommand.cxx
@@ -320,8 +320,8 @@ bool cmAddCustomCommandCommand(std::vector<std::string> const& args,
 
     // No command for this output exists.
     status.SetError(
-      cmStrCat("given APPEND option with output\n\"", output[0],
-               "\"\nwhich is not already a custom command output."));
+      cmStrCat("given APPEND option with output\n  ", output[0],
+               "\nwhich is not already a custom command output."));
     return false;
   }
 
diff --git a/Source/cmCheckCustomOutputs.cxx b/Source/cmCheckCustomOutputs.cxx
index a4017389fa..7645c8808f 100644
--- a/Source/cmCheckCustomOutputs.cxx
+++ b/Source/cmCheckCustomOutputs.cxx
@@ -17,8 +17,8 @@ bool cmCheckCustomOutputs(const std::vector<std::string>& outputs,
     // directory during an out of source build.
     if (!mf.CanIWriteThisFile(o)) {
       status.SetError(
-        cmStrCat("attempted to have a file\n\"", o,
-                 "\"\nin a source directory as an output of custom command."));
+        cmStrCat("attempted to have a file\n  ", o,
+                 "\nin a source directory as an output of custom command."));
       cmSystemTools::SetFatalErrorOccured();
       return false;
     }
diff --git a/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt b/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt
index cd542d875b..b7ee23a55f 100644
--- a/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt
+++ b/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt
@@ -1,7 +1,7 @@
 CMake Error at AppendNotOutput.cmake:1 \(add_custom_command\):
   add_custom_command given APPEND option with output
 
-  .*RunCMake/add_custom_command/AppendNotOutput-build/out.*
+    .*RunCMake/add_custom_command/AppendNotOutput-build/out
 
   which is not already a custom command output.
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/add_custom_command/BadByproduct-stderr.txt b/Tests/RunCMake/add_custom_command/BadByproduct-stderr.txt
index 97b9ccacf0..086e39752f 100644
--- a/Tests/RunCMake/add_custom_command/BadByproduct-stderr.txt
+++ b/Tests/RunCMake/add_custom_command/BadByproduct-stderr.txt
@@ -29,7 +29,7 @@ Call Stack \(most recent call first\):
 CMake Error at BadByproduct.cmake:6 \(add_custom_command\):
   add_custom_command attempted to have a file
 
-  .*/f".*
+    .*RunCMake/add_custom_command/f
 
   in a source directory as an output of custom command.
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/add_custom_command/BadOutput-stderr.txt b/Tests/RunCMake/add_custom_command/BadOutput-stderr.txt
index 584aa88ce8..731e58d038 100644
--- a/Tests/RunCMake/add_custom_command/BadOutput-stderr.txt
+++ b/Tests/RunCMake/add_custom_command/BadOutput-stderr.txt
@@ -29,7 +29,7 @@ Call Stack \(most recent call first\):
 CMake Error at BadOutput.cmake:6 \(add_custom_command\):
   add_custom_command attempted to have a file
 
-  .*/e".*
+    .*RunCMake/add_custom_command/e
 
   in a source directory as an output of custom command.
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/add_custom_target/BadByproduct-stderr.txt b/Tests/RunCMake/add_custom_target/BadByproduct-stderr.txt
index 7390e6a4fb..0f58550a39 100644
--- a/Tests/RunCMake/add_custom_target/BadByproduct-stderr.txt
+++ b/Tests/RunCMake/add_custom_target/BadByproduct-stderr.txt
@@ -29,7 +29,7 @@ Call Stack \(most recent call first\):
 CMake Error at BadByproduct.cmake:6 \(add_custom_target\):
   add_custom_target attempted to have a file
 
-  .*/j".*
+    .*RunCMake/add_custom_target/j
 
   in a source directory as an output of custom command.
 Call Stack \(most recent call first\):