diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics.go
index 256e0523993..11a80bf42a9 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics.go
@@ -125,7 +125,7 @@ func newWebhookConversionMetrics() *WebhookConversionMetrics {
 			Namespace: namespace,
 			Help:      "Webhook conversion request latency",
 			// Various buckets from 5 ms to 60 seconds
-			Buckets:        []float64{0.005, 0.01, 0.02, 0.05, 0.1, 0.2, 0.5, 1, 2, 5, 10, 15, 20, 25, 30, 45, 60},
+			Buckets:        []float64{0.005, 0.01, 0.02, 0.05, 0.1, 0.2, 0.5, 1, 2, 5, 10, 20, 30, 45, 60},
 			StabilityLevel: metrics.ALPHA,
 		},
 		[]string{"result", "failure_type"},
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics_test.go
index b387b8c20bb..2b99d5c8426 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics_test.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics_test.go
@@ -41,7 +41,6 @@ func TestWebhookConversionMetrics_ObserveWebhookConversionSuccess(t *testing.T)
 		wantLabels           map[string]string
 		expectedRequestValue int
 	}{
-		// TODO: Add test cases.
 		{
 			name: "test_conversion_success",
 			fields: fields{
@@ -102,7 +101,6 @@ func TestWebhookConversionMetrics_ObserveWebhookConversionFailure(t *testing.T)
 		expectedRequestValue int
 		expectedLatencyCount int
 	}{
-		// TODO: Add test cases.
 		{
 			name: "test_conversion_failure",
 			fields: fields{