diff --git a/app/vmselect/promql/exec_test.go b/app/vmselect/promql/exec_test.go
index 4dc668ef2..b838cc57d 100644
--- a/app/vmselect/promql/exec_test.go
+++ b/app/vmselect/promql/exec_test.go
@@ -3602,7 +3602,6 @@ func TestExecSuccess(t *testing.T) {
 			Values:     []float64{6.8, 8.8, 10.9, 12.9, 14.9, 16.9},
 			Timestamps: timestampsExpected,
 		}
-		r.MetricName.MetricGroup = []byte("foobar")
 		resultExpected := []netstorage.Result{r}
 		f(q, resultExpected)
 	})
diff --git a/app/vmselect/promql/rollup.go b/app/vmselect/promql/rollup.go
index fc61c9f7c..851b76de4 100644
--- a/app/vmselect/promql/rollup.go
+++ b/app/vmselect/promql/rollup.go
@@ -168,17 +168,11 @@ var rollupFuncsRemoveCounterResets = map[string]bool{
 
 var rollupFuncsKeepMetricGroup = map[string]bool{
 	"default_rollup":        true,
-	"avg_over_time":         true,
-	"min_over_time":         true,
-	"max_over_time":         true,
-	"quantile_over_time":    true,
 	"rollup":                true,
-	"geomean_over_time":     true,
 	"hoeffding_bound_lower": true,
 	"hoeffding_bound_upper": true,
 	"first_over_time":       true,
 	"last_over_time":        true,
-	"mode_over_time":        true,
 }
 
 func getRollupAggrFuncNames(expr metricsql.Expr) ([]string, error) {