diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab9627d4ab7..78083dbdb71 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,6 +102,7 @@ stages:
       - knapsack/
       - rspec_flaky/
       - tmp/capybara/
+      - log/gitaly-test.log
 
 .rspec-metadata-pg: &rspec-metadata-pg
   <<: *rspec-metadata
@@ -125,6 +126,7 @@ stages:
     - export KNAPSACK_GENERATE_REPORT=true
     - export CACHE_CLASSES=true
     - cp ${KNAPSACK_SPINACH_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH}
+    - scripts/gitaly-test-spawn
     - knapsack spinach "-r rerun" || retry '[[ -e tmp/spinach-rerun.txt ]] && bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)'
   artifacts:
     expire_in: 31d
@@ -133,6 +135,7 @@ stages:
       - coverage/
       - knapsack/
       - tmp/capybara/
+      - log/gitaly-test.log
 
 .spinach-metadata-pg: &spinach-metadata-pg
   <<: *spinach-metadata