diff --git a/testing/file_test/file_test_base.cpp b/testing/file_test/file_test_base.cpp
index 2ac8d5e06807..18f71a4481c9 100644
--- a/testing/file_test/file_test_base.cpp
+++ b/testing/file_test/file_test_base.cpp
@@ -434,7 +434,10 @@ static auto RunSingleTest(FileTestInfo& test, bool single_threaded,
 
   if (!test.test_result->ok()) {
     std::unique_lock<std::mutex> lock(output_mutex);
-    llvm::errs() << "\n" << test.test_result->error().message() << "\n";
+    if (!single_threaded) {
+      llvm::errs() << "\n" << test.test_name << ": ";
+    }
+    llvm::errs() << test.test_result->error().message() << "\n";
     return true;
   }
 
diff --git a/testing/file_test/test_file.cpp b/testing/file_test/test_file.cpp
index 89506ed7dc04..691605e7fc8e 100644
--- a/testing/file_test/test_file.cpp
+++ b/testing/file_test/test_file.cpp
@@ -833,8 +833,7 @@ auto ProcessTestFile(llvm::StringRef test_name, bool running_autoupdate)
       test_file.file_splits, include_files));
 
   if (!found_autoupdate) {
-    return ErrorBuilder() << "Missing AUTOUPDATE/NOAUTOUPDATE setting: "
-                          << test_name;
+    return ErrorBuilder() << "Missing AUTOUPDATE/NOAUTOUPDATE setting";
   }
 
   constexpr llvm::StringLiteral AutoupdateSplit = "AUTOUPDATE-SPLIT";