diff --git a/.circleci/config.yml b/.circleci/config.yml
index 821238dfae..6010afb28f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -165,6 +165,11 @@ jobs:
             du -sh /tmp/test_output/*
             for DIR in /tmp/test_output/*; do
               mv $DIR/repo/pageserver.log $DIR/ || true # ignore errors
+              for PGDIR in $DIR/repo/pgdatadirs/pg?; do
+                echo "PGDIR: $PGDIR"
+                NEW_LOG="${PGDIR##*/}_log"
+                mv $PGDIR/log "$DIR/$NEW_LOG" || true # ignore errors
+              done
               echo "rm $DIR/repo"
               rm -rf $DIR/repo
             done