diff --git a/model/textparse/nhcbparse_test.go b/model/textparse/nhcbparse_test.go
index 25f5732ce..a52e8637e 100644
--- a/model/textparse/nhcbparse_test.go
+++ b/model/textparse/nhcbparse_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/prometheus/prometheus/model/labels"
 )
 
-func TestNhcbParserOnOpenMetricsParser(t *testing.T) {
+func TestNHCBParserOnOMParser(t *testing.T) {
 	// The input is taken originally from TestOpenMetricsParse, with additional tests for the NHCBParser.
 
 	input := `# HELP go_gc_duration_seconds A summary of the GC invocation durations.
@@ -446,7 +446,7 @@ foobar{quantile="0.99"} 150.1`
 	requireEntries(t, exp, got)
 }
 
-func TestNhcbParserMultiHOnOpenMetricsParser(t *testing.T) {
+func TestNHCBParserOMParser_MultipleHistograms(t *testing.T) {
 	// The input is taken originally from TestOpenMetricsParse, with additional tests for the NHCBParser.
 
 	input := `# HELP something Histogram with _created between buckets and summary
diff --git a/scrape/manager.go b/scrape/manager.go
index d0a3591b5..9791db0e8 100644
--- a/scrape/manager.go
+++ b/scrape/manager.go
@@ -179,8 +179,8 @@ func (m *Manager) reload() {
 				continue
 			}
 			if scrapeConfig.ConvertClassicHistograms && m.opts.EnableCreatedTimestampZeroIngestion {
-				// TODO(krajorama): lift this limitation
-				m.logger.Error("error reloading target set", "err", "cannot convert classic histograms to native histograms with custom buckets and ingest created timestamp zero samples at the same time")
+				// TODO(krajorama): fix https://github.com/prometheus/prometheus/issues/15137
+				m.logger.Error("error reloading target set", "err", "cannot convert classic histograms to native histograms with custom buckets and ingest created timestamp zero samples at the same time due to https://github.com/prometheus/prometheus/issues/15137")
 				continue
 			}
 			m.metrics.targetScrapePools.Inc()