diff --git a/promql/bench_test.go b/promql/bench_test.go
index 4d5eb20ff..35342ca92 100644
--- a/promql/bench_test.go
+++ b/promql/bench_test.go
@@ -22,6 +22,7 @@ import (
 	"time"
 
 	"github.com/prometheus/prometheus/pkg/labels"
+	"github.com/prometheus/prometheus/promql/parser"
 	"github.com/prometheus/prometheus/util/teststorage"
 )
 
diff --git a/promql/engine_test.go b/promql/engine_test.go
index bfec09132..e75c27bca 100644
--- a/promql/engine_test.go
+++ b/promql/engine_test.go
@@ -605,7 +605,7 @@ load 10s
 		}
 
 		testutil.Ok(t, res.Err)
-		testutil.Equals(t, c.Result, res.parser.Value)
+		testutil.Equals(t, c.Result, res.Value)
 	}
 
 }
@@ -823,7 +823,7 @@ load 10s
 
 		res := qry.Exec(test.Context())
 		testutil.Equals(t, c.Result.Err, res.Err)
-		testutil.Equals(t, c.Result.parser.Value, res.parser.Value)
+		testutil.Equals(t, c.Result.Value, res.Value)
 	}
 }
 
@@ -1107,9 +1107,9 @@ func TestSubquerySelector(t *testing.T) {
 
 			res := qry.Exec(test.Context())
 			testutil.Equals(t, c.Result.Err, res.Err)
-			mat := res.parser.Value.(Matrix)
+			mat := res.Value.(Matrix)
 			sort.Sort(mat)
-			testutil.Equals(t, c.Result.parser.Value, mat)
+			testutil.Equals(t, c.Result.Value, mat)
 		}
 	}
 }
diff --git a/promql/test_test.go b/promql/test_test.go
index 6328dc76a..f03f6d203 100644
--- a/promql/test_test.go
+++ b/promql/test_test.go
@@ -127,7 +127,7 @@ func TestLazyLoader_WithSamplesTill(t *testing.T) {
 				for _, s := range tc.series {
 					var matchers []*labels.Matcher
 					for _, label := range s.Metric {
-						m, err := labels.NewMatcher(labels.MatchEqual, label.Name, label.parser.Value)
+						m, err := labels.NewMatcher(labels.MatchEqual, label.Name, label.Value)
 						testutil.Ok(t, err)
 						matchers = append(matchers, m)
 					}