diff --git a/.github/kokoro/continuous-db-artix7.cfg b/.github/kokoro/continuous-db-artix7.cfg
index 279f953c..e58de2fb 100644
--- a/.github/kokoro/continuous-db-artix7.cfg
+++ b/.github/kokoro/continuous-db-artix7.cfg
@@ -16,7 +16,7 @@ action {
     # Whole directories
     # regex: "**/build/**" - Currently kokoro dies on number of artifacts.
     regex: "**/build/*.log"
-    regex: "**/logs/**"
+    regex: "**/logs_*/**"
     # The database
     regex: "**/database/artix7/**"
     strip_prefix: "github/symbiflow-prjxray-continuous-db-artix7/"
diff --git a/.github/kokoro/continuous-db-kintex7.cfg b/.github/kokoro/continuous-db-kintex7.cfg
index 04495846..54a20113 100644
--- a/.github/kokoro/continuous-db-kintex7.cfg
+++ b/.github/kokoro/continuous-db-kintex7.cfg
@@ -16,7 +16,7 @@ action {
     # Whole directories
     # regex: "**/build/**" - Currently kokoro dies on number of artifacts.
     regex: "**/build/*.log"
-    regex: "**/logs/**"
+    regex: "**/logs_*/**"
     # The database
     regex: "**/database/kintex7/**"
     strip_prefix: "github/symbiflow-prjxray-continuous-db-kintex7/"
diff --git a/.github/kokoro/continuous-db-zynq7.cfg b/.github/kokoro/continuous-db-zynq7.cfg
index 3931f3f2..272b49a2 100644
--- a/.github/kokoro/continuous-db-zynq7.cfg
+++ b/.github/kokoro/continuous-db-zynq7.cfg
@@ -16,7 +16,7 @@ action {
     # Whole directories
     # regex: "**/build/**" - Currently kokoro dies on number of artifacts.
     regex: "**/build/*.log"
-    regex: "**/logs/**"
+    regex: "**/logs_*/**"
     # The database
     regex: "**/database/zynq7/**"
     strip_prefix: "github/symbiflow-prjxray-continuous-db-zynq7/"
diff --git a/.github/kokoro/kokoro-cfg.py b/.github/kokoro/kokoro-cfg.py
index 62cfa988..3b53a1c0 100755
--- a/.github/kokoro/kokoro-cfg.py
+++ b/.github/kokoro/kokoro-cfg.py
@@ -28,7 +28,7 @@ action {
     # Whole directories
     # regex: "**/build/**" - Currently kokoro dies on number of artifacts.
     regex: "**/build/*.log"
-    regex: "**/logs/**"
+    regex: "**/logs_*/**"
     # The database
     regex: "**/database/%(part)s/**"
     strip_prefix: "github/symbiflow-prjxray-%(kokoro_type)s-db-%(part)s/"
diff --git a/.github/kokoro/presubmit-db-artix7.cfg b/.github/kokoro/presubmit-db-artix7.cfg
index e3fd664b..38b62d2e 100644
--- a/.github/kokoro/presubmit-db-artix7.cfg
+++ b/.github/kokoro/presubmit-db-artix7.cfg
@@ -16,7 +16,7 @@ action {
     # Whole directories
     # regex: "**/build/**" - Currently kokoro dies on number of artifacts.
     regex: "**/build/*.log"
-    regex: "**/logs/**"
+    regex: "**/logs_*/**"
     # The database
     regex: "**/database/artix7/**"
     strip_prefix: "github/symbiflow-prjxray-presubmit-db-artix7/"
diff --git a/.github/kokoro/presubmit-db-kintex7.cfg b/.github/kokoro/presubmit-db-kintex7.cfg
index bfe4f62b..80539dbc 100644
--- a/.github/kokoro/presubmit-db-kintex7.cfg
+++ b/.github/kokoro/presubmit-db-kintex7.cfg
@@ -16,7 +16,7 @@ action {
     # Whole directories
     # regex: "**/build/**" - Currently kokoro dies on number of artifacts.
     regex: "**/build/*.log"
-    regex: "**/logs/**"
+    regex: "**/logs_*/**"
     # The database
     regex: "**/database/kintex7/**"
     strip_prefix: "github/symbiflow-prjxray-presubmit-db-kintex7/"
diff --git a/.github/kokoro/presubmit-db-zynq7.cfg b/.github/kokoro/presubmit-db-zynq7.cfg
index 31210fec..f6e994bd 100644
--- a/.github/kokoro/presubmit-db-zynq7.cfg
+++ b/.github/kokoro/presubmit-db-zynq7.cfg
@@ -16,7 +16,7 @@ action {
     # Whole directories
     # regex: "**/build/**" - Currently kokoro dies on number of artifacts.
     regex: "**/build/*.log"
-    regex: "**/logs/**"
+    regex: "**/logs_*/**"
     # The database
     regex: "**/database/zynq7/**"
     strip_prefix: "github/symbiflow-prjxray-presubmit-db-zynq7/"
diff --git a/fuzzers/run_fuzzer.py b/fuzzers/run_fuzzer.py
index 959243b3..c136635a 100755
--- a/fuzzers/run_fuzzer.py
+++ b/fuzzers/run_fuzzer.py
@@ -645,11 +645,11 @@ def run_fuzzer(fuzzer_name, fuzzer_dir, fuzzer_logdir, logger, will_retry):
 --------------------------------------------------------------------------
 !Failed! @ {time_end} with exit code: {retcode}
 --------------------------------------------------------------------------
-- STDOUT:                                                                -
+- STDOUT (see {stdout_fname} for full log):
 --------------------------------------------------------------------------
 {stdout_log}
 --------------------------------------------------------------------------
-- STDERR:                                                                -
+- STDERR (see {stderr_fname} for full log):
 --------------------------------------------------------------------------
 {stderr_log}
 --------------------------------------------------------------------------
@@ -657,8 +657,10 @@ def run_fuzzer(fuzzer_name, fuzzer_dir, fuzzer_logdir, logger, will_retry):
 --------------------------------------------------------------------------
 """,
             retcode=retcode,
-            stdout_log=open(fuzzer_stdout).read(),
-            stderr_log=open(fuzzer_stderr).read(),
+            stdout_fname=fuzzer_stdout,
+            stdout_log='\n'.join(last_lines(open(fuzzer_stdout), 1000)),
+            stderr_fname=fuzzer_stderr,
+            stderr_log='\n'.join(last_lines(open(fuzzer_stderr), 1000)),
             time_end=time_end.isoformat())
     else:
         # Log the last 100 lines of a successful run