diff --git a/webrtc/base/macutils.cc b/webrtc/base/macutils.cc
index 6e436d4a80..7b1ff47536 100644
--- a/webrtc/base/macutils.cc
+++ b/webrtc/base/macutils.cc
@@ -191,10 +191,10 @@ bool RunAppleScript(const std::string& script) {
     AECreateDesc(typeNull, NULL, 0, &result_data);
     OSAScriptError(component, kOSAErrorMessage, typeChar, &result_data);
     int len = AEGetDescDataSize(&result_data);
-    char* data = (char*) malloc(len);
+    char* data = (char*)malloc(len);
     if (data != NULL) {
       err = AEGetDescData(&result_data, data, len);
-      LOG(LS_ERROR) << "Script error: " << data;
+      LOG(LS_ERROR) << "Script error: " << std::string(data, len);
     }
     AEDisposeDesc(&script_desc);
     AEDisposeDesc(&result_data);
diff --git a/webrtc/base/unittest_main.cc b/webrtc/base/unittest_main.cc
index fb74e9e5e1..167570d449 100644
--- a/webrtc/base/unittest_main.cc
+++ b/webrtc/base/unittest_main.cc
@@ -93,6 +93,10 @@ int main(int argc, char** argv) {
   rtc::LogMessage::LogTimestamps();
   if (*FLAG_log != '\0') {
     rtc::LogMessage::ConfigureLogging(FLAG_log);
+  } else if (rtc::LogMessage::GetLogToDebug() > rtc::LS_INFO) {
+    // Default to LS_INFO, even for release builds to provide better test
+    // logging.
+    rtc::LogMessage::LogToDebug(rtc::LS_INFO);
   }
 
   // Initialize SSL which are used by several tests.
diff --git a/webrtc/test/test_main.cc b/webrtc/test/test_main.cc
index 733831f5be..a435575f88 100644
--- a/webrtc/test/test_main.cc
+++ b/webrtc/test/test_main.cc
@@ -10,6 +10,7 @@
 
 #include "gflags/gflags.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/base/logging.h"
 #include "webrtc/test/field_trial.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
@@ -21,6 +22,11 @@ DEFINE_string(force_fieldtrials, "",
 int main(int argc, char* argv[]) {
   ::testing::InitGoogleTest(&argc, argv);
 
+  // Default to LS_INFO, even for release builds to provide better test logging.
+  // TODO(pbos): Consider adding a command-line override.
+  if (rtc::LogMessage::GetLogToDebug() > rtc::LS_INFO)
+    rtc::LogMessage::LogToDebug(rtc::LS_INFO);
+
   // AllowCommandLineParsing allows us to ignore flags passed on to us by
   // Chromium build bots without having to explicitly disable them.
   google::AllowCommandLineReparsing();