diff --git a/cmd/qa/cmd_health_test.go b/cmd/qa/cmd_health_test.go
index 4ee3429..81f40a8 100644
--- a/cmd/qa/cmd_health_test.go
+++ b/cmd/qa/cmd_health_test.go
@@ -71,8 +71,12 @@ esac
 	assert.Equal(t, 1, payload.Summary.Passing)
 	assert.Equal(t, 1, payload.Summary.Errors)
 	assert.Equal(t, 2, payload.Summary.FilteredRepos)
+	assert.Len(t, payload.Summary.ByStatus, 6)
 	assert.Equal(t, 1, payload.Summary.ByStatus["passing"])
 	assert.Equal(t, 1, payload.Summary.ByStatus["error"])
+	assert.Equal(t, 0, payload.Summary.ByStatus["pending"])
+	assert.Equal(t, 0, payload.Summary.ByStatus["disabled"])
+	assert.Equal(t, 0, payload.Summary.ByStatus["no_ci"])
 	require.Len(t, payload.Repos, 2)
 	assert.Equal(t, "error", payload.Repos[0].Status)
 	assert.Equal(t, "beta", payload.Repos[0].Name)
@@ -146,8 +150,12 @@ esac
 	assert.Equal(t, 1, payload.Summary.Errors)
 	assert.Equal(t, 1, payload.Summary.FilteredRepos)
 	assert.True(t, payload.Summary.ProblemsOnly)
+	assert.Len(t, payload.Summary.ByStatus, 6)
 	assert.Equal(t, 1, payload.Summary.ByStatus["passing"])
 	assert.Equal(t, 1, payload.Summary.ByStatus["error"])
+	assert.Equal(t, 0, payload.Summary.ByStatus["pending"])
+	assert.Equal(t, 0, payload.Summary.ByStatus["disabled"])
+	assert.Equal(t, 0, payload.Summary.ByStatus["no_ci"])
 	require.Len(t, payload.Repos, 1)
 	assert.Equal(t, "error", payload.Repos[0].Status)
 	assert.Equal(t, "beta", payload.Repos[0].Name)
diff --git a/pkg/php/security_test.go b/pkg/php/security_test.go
index 94dbce9..e2b55be 100644
--- a/pkg/php/security_test.go
+++ b/pkg/php/security_test.go
@@ -297,5 +297,8 @@ func setupSecurityFixture(t *testing.T, dir string, envContent string) {
 	require.NoError(t, os.WriteFile(composerBin, []byte("#!/bin/sh\ncat <<'JSON'\n{\"advisories\":{}}\nJSON\n"), 0o755))
 
 	oldPath := os.Getenv("PATH")
-	t.Setenv("PATH", dir+string(os.PathListSeparator)+oldPath)
+	require.NoError(t, os.Setenv("PATH", dir+string(os.PathListSeparator)+oldPath))
+	t.Cleanup(func() {
+		require.NoError(t, os.Setenv("PATH", oldPath))
+	})
 }