diff --git a/.buildkite/scripts/lifecycle/post_command.sh b/.buildkite/scripts/lifecycle/post_command.sh
index b0c05fb8565d..9676d77a7ed1 100755
--- a/.buildkite/scripts/lifecycle/post_command.sh
+++ b/.buildkite/scripts/lifecycle/post_command.sh
@@ -54,6 +54,10 @@ if [[ "$IS_TEST_EXECUTION_STEP" == "true" ]]; then
     ts-node .buildkite/scripts/lifecycle/annotate_test_failures.ts
   fi
 
+  if [[ -d 'target/agent_diagnostics' ]]; then
+    buildkite-agent artifact upload 'target/agent_diagnostics/**/*'
+  fi
+
 fi
 
 if [[ $BUILDKITE_COMMAND_EXIT_STATUS -ne 0 ]]; then
diff --git a/x-pack/solutions/security/plugins/security_solution/public/management/cypress/support/data_loaders.ts b/x-pack/solutions/security/plugins/security_solution/public/management/cypress/support/data_loaders.ts
index a85feb74f1d9..c9a496eea909 100644
--- a/x-pack/solutions/security/plugins/security_solution/public/management/cypress/support/data_loaders.ts
+++ b/x-pack/solutions/security/plugins/security_solution/public/management/cypress/support/data_loaders.ts
@@ -577,7 +577,7 @@ ${s1Info.status}
         .toISOString()
         .replace(/:/g, '.')}.zip`;
       const vmDiagnosticsFile = `/tmp/${fileName}`;
-      const localDiagnosticsDir = `${REPO_ROOT}/target/test_failures`;
+      const localDiagnosticsDir = `${REPO_ROOT}/target/agent_diagnostics`;
       const localDiagnosticsFile = `${localDiagnosticsDir}/${
         fileNamePrefix
           ? // Insure the file name prefix does not have characters that can't be used in file names