diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
index dcba5cae0..6143c836a 100755
--- a/.buildkite/hooks/pre-command
+++ b/.buildkite/hooks/pre-command
@@ -55,6 +55,15 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "fleet-server" && "$BUILDKITE_STEP_KEY" == "
   export EC_API_KEY=${EC_API_KEY_SECRET}
 fi
 
+# BK analytics
+if [[ "$BUILDKITE_PIPELINE_SLUG" == "fleet-server" ]]; then
+  if [[ "$BUILDKITE_STEP_KEY" == "int-test" || "$BUILDKITE_STEP_KEY" == "e2e-test" ]]; then
+    echo "--- Prepare BK test analytics token :vault:"
+    BUILDKITE_ANALYTICS_TOKEN=$(vault kv get -field token kv/ci-shared/platform-ingest/buildkite_fleet_server_analytics_token)
+    export BUILDKITE_ANALYTICS_TOKEN
+  fi
+fi
+
 if [[ "$BUILDKITE_PIPELINE_SLUG" == "fleet-server" && "$BUILDKITE_STEP_KEY" == "release-test" ]]; then
   export PRIVATE_CI_GCS_CREDENTIALS_SECRET=$(retry 5 vault kv get -field plaintext -format=json ${PRIVATE_CI_GCS_CREDENTIALS_PATH})
   export JOB_GCS_BUCKET
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index c06d0d1bf..3ff711bd6 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -105,6 +105,12 @@ steps:
           provider: "gcp"
         artifact_paths:
           - build/*.xml
+        plugins:
+          - test-collector#v1.10.2:
+              files: "build/test-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
 
       - label: "E2E Test"
         key: "e2e-test"
@@ -114,6 +120,12 @@ steps:
         artifact_paths:
           - build/*.xml
           - build/e2e-coverage.out
+        plugins:
+          - test-collector#v1.10.2:
+              files: "build/test-*.xml"
+              format: "junit"
+              branches: "main"
+              debug: true
 
       - label: ":junit: Junit annotate"
         plugins: