diff --git a/tests/regress/check.sh b/tests/regress/check.sh
index 866dc7e59..575ea1536 100755
--- a/tests/regress/check.sh
+++ b/tests/regress/check.sh
@@ -153,9 +153,8 @@ echo "Fail: $fail"
 if [ "$fail" -eq 0 ] ; then
     code=0
 else
-    find "$logdir" -type f -name "*.error" -printf '%P\0' |
-    while read -rd $'\0' path; do
-      cat "$path"
+    for f in "$logdir"/*.error ; do
+      cat "$f"
       echo
     done
     code=1
diff --git a/tests/regress/run_test.sh b/tests/regress/run_test.sh
old mode 100644
new mode 100755
index a0376269e..2ef34be9d
--- a/tests/regress/run_test.sh
+++ b/tests/regress/run_test.sh
@@ -156,7 +156,8 @@ else
 fi
 
 if [ -d "$out_dir" ] ; then
-    log_file="$out_dir/$(echo "$test_file" | tr '/' '_')"
+    # replace _ with __ and / with _
+    log_file="$out_dir/_$(echo "${test_file//_/__}" | tr '/' '_')}"
 fi
 
 # Run the binary