diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index fb93eac08d6..c19b13a8b85 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -223,15 +223,15 @@ steps:
       provider: "gcp"
       machineType: "n1-standard-8"
 
-  # - label: "Extended runtime leak tests"
-  #   key: "extended-integration-tests"
-  #   command: ".buildkite/scripts/steps/integration_tests.sh stateful integration:TestForResourceLeaks"
-  #   artifact_paths:
-  #     - "build/TEST-**"
-  #     - "build/diagnostics/*"
-  #   agents:
-  #     provider: "gcp"
-  #     machineType: "n1-standard-8"
+  - label: "Extended runtime leak tests"
+    key: "extended-integration-tests"
+    command: ".buildkite/scripts/steps/integration_tests.sh stateful integration:TestForResourceLeaks"
+    artifact_paths:
+      - "build/TEST-**"
+      - "build/diagnostics/*"
+    agents:
+      provider: "gcp"
+      machineType: "n1-standard-8"
 
   - label: "Integration tests"
     key: "integration-tests"
diff --git a/testing/integration/agent_long_running_leak_test.go b/testing/integration/agent_long_running_leak_test.go
index 7b2c5035e0b..b599d5e26ff 100644
--- a/testing/integration/agent_long_running_leak_test.go
+++ b/testing/integration/agent_long_running_leak_test.go
@@ -78,7 +78,7 @@ func TestLongRunningAgentForLeaks(t *testing.T) {
 	}
 
 	suite.Run(t, &ExtendedRunner{info: info,
-		healthCheckTime:        time.Minute * 3,
+		healthCheckTime:        time.Minute * 6,
 		healthCheckRefreshTime: time.Second * 20,
 		resourceWatchers: []StatusWatcher{ // select which tests to run
 			&handleMonitor{},
@@ -229,13 +229,14 @@ func (runner *ExtendedRunner) TestHandleLeak() {
 // CheckHealthAtStartup ensures all the beats and agent are healthy and working before we continue
 func (runner *ExtendedRunner) CheckHealthAtStartup(ctx context.Context) {
 	// because we need to separately fetch the PIDs, wait until everything is healthy before we look for running beats
+	compDebugName := ""
 	require.Eventually(runner.T(), func() bool {
 		allHealthy := true
 		status, err := runner.agentFixture.ExecStatus(ctx)
 
 		apacheMatch := "logfile-apache"
 		foundApache := false
-		systemMatch := "metrics-default"
+		systemMatch := "system/metrics"
 		foundSystem := false
 
 		require.NoError(runner.T(), err)
@@ -253,11 +254,12 @@ func (runner *ExtendedRunner) CheckHealthAtStartup(ctx context.Context) {
 			}
 			runner.T().Logf("component state: %s", comp.Message)
 			if comp.State != int(cproto.State_HEALTHY) {
+				compDebugName = comp.Name
 				allHealthy = false
 			}
 		}
 		return allHealthy && foundApache && foundSystem
-	}, runner.healthCheckTime, runner.healthCheckRefreshTime, "install never became healthy")
+	}, runner.healthCheckTime, runner.healthCheckRefreshTime, "install never became healthy: components did not return a healthy state: %s", compDebugName)
 }
 
 /*