diff --git a/Makefile b/Makefile
index 67df8d6c1..cd9380768 100644
--- a/Makefile
+++ b/Makefile
@@ -256,14 +256,14 @@ mockery:
 ###############################################################################
 
 metrics: testdata-metrics
-	go generate -v -run="scripts/metricsgen" ./...
+	go generate -run="scripts/metricsgen" ./...
 .PHONY: metrics
 
 	# By convention, the go tool ignores subdirectories of directories named
 	# 'testdata'. This command invokes the generate command on the folder directly
 	# to avoid this.
 testdata-metrics:
-	ls ./scripts/metricsgen/testdata | xargs -I{} go generate -v -run="scripts/metricsgen" ./scripts/metricsgen/testdata/{}
+	ls ./scripts/metricsgen/testdata | xargs -I{} go generate -run="scripts/metricsgen" ./scripts/metricsgen/testdata/{}
 .PHONY: testdata-metrics
 
 ###############################################################################
diff --git a/scripts/metricsgen/testdata/tags/metrics.gen.go b/scripts/metricsgen/testdata/tags/metrics.gen.go
index 2ff7dd4af..7ac292d3c 100644
--- a/scripts/metricsgen/testdata/tags/metrics.gen.go
+++ b/scripts/metricsgen/testdata/tags/metrics.gen.go
@@ -19,23 +19,26 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics {
 			Subsystem: MetricsSubsystem,
 			Name:      "with_labels",
 			Help:      "",
-		}, labels).With(labelsAndValues...),
-		WithExpBuckets: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{
+		}, append(labels, "step,time")).With(labelsAndValues...), WithExpBuckets: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{
 			Namespace: namespace,
 			Subsystem: MetricsSubsystem,
 			Name:      "with_exp_buckets",
 			Help:      "",
+
+			Buckets: stdprometheus.ExponentialBuckets(.1, 100, 8),
 		}, labels).With(labelsAndValues...),
 		WithBuckets: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{
 			Namespace: namespace,
 			Subsystem: MetricsSubsystem,
 			Name:      "with_buckets",
 			Help:      "",
+
+			Buckets: []float64{1, 2, 3, 4, 5},
 		}, labels).With(labelsAndValues...),
 		Named: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
 			Namespace: namespace,
 			Subsystem: MetricsSubsystem,
-			Name:      "named",
+			Name:      "metric_with_name",
 			Help:      "",
 		}, labels).With(labelsAndValues...),
 	}
diff --git a/scripts/metricsgen/testdata/tags/metrics.go b/scripts/metricsgen/testdata/tags/metrics.go
index 7f03a54c6..8562dcf43 100644
--- a/scripts/metricsgen/testdata/tags/metrics.go
+++ b/scripts/metricsgen/testdata/tags/metrics.go
@@ -5,8 +5,8 @@ import "github.com/go-kit/kit/metrics"
 //go:generate go run ../../../../scripts/metricsgen -struct=Metrics
 
 type Metrics struct {
-	WithLabels     metrics.Counter   `metricsgen_labels:"step,time"`
-	WithExpBuckets metrics.Histogram `metricsgen_bucketsType:"exp" metricsgen_bucketSizes:".1,100,8"`
-	WithBuckets    metrics.Histogram `metricsgen_bucketSizes:"1, 2, 3, 4, 5"`
-	Named          metrics.Counter   `metricsgen_name:"metric_with_name"`
+	WithLabels     metrics.Counter   `metrics_labels:"step,time"`
+	WithExpBuckets metrics.Histogram `metrics_buckettype:"exp" metrics_bucketsizes:".1,100,8"`
+	WithBuckets    metrics.Histogram `metrics_bucketsizes:"1, 2, 3, 4, 5"`
+	Named          metrics.Counter   `metrics_name:"metric_with_name"`
 }