diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index be7f442123..51940eb0d6 100644
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -1506,9 +1506,9 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits)
         if (! (Options & EOptionSuppressInfolog) &&
             ! (Options & EOptionMemoryLeakMode)) {
             if (!beQuiet)
-                PutsIfNonEmpty(compUnit.fileName[0].c_str());
-            PutsIfNonEmpty(shader->getInfoLog());
-            PutsIfNonEmpty(shader->getInfoDebugLog());
+                StderrIfNonEmpty(compUnit.fileName[0].c_str());
+            StderrIfNonEmpty(shader->getInfoLog());
+            StderrIfNonEmpty(shader->getInfoDebugLog());
         }
     }
 
@@ -1529,8 +1529,8 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits)
 
         // Report
         if (!(Options & EOptionSuppressInfolog) && !(Options & EOptionMemoryLeakMode)) {
-            PutsIfNonEmpty(program.getInfoLog());
-            PutsIfNonEmpty(program.getInfoDebugLog());
+            StderrIfNonEmpty(program.getInfoLog());
+            StderrIfNonEmpty(program.getInfoDebugLog());
         }
 
         // Reflect
diff --git a/Test/runtests b/Test/runtests
index f797c9eb79..f711b5b3c2 100755
--- a/Test/runtests
+++ b/Test/runtests
@@ -16,7 +16,7 @@ if [ -d "${LIBPATH}" ]; then
 fi
 
 function run {
-    "$EXE" "$@"
+    "$EXE" "$@" 2>&1
     result=$?
     case "$result" in
     [0-6]) # Valid success and error codes