diff --git a/x-pack/plugin/sql/qa/src/main/resources/agg.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/agg.sql-spec
index 806e92b1d88d2..e24297f7fa9b3 100644
--- a/x-pack/plugin/sql/qa/src/main/resources/agg.sql-spec
+++ b/x-pack/plugin/sql/qa/src/main/resources/agg.sql-spec
@@ -51,18 +51,15 @@ groupByModScalar
 SELECT (emp_no % 3) + 1 AS e FROM test_emp GROUP BY e ORDER BY e;
 
 // group by nested functions with no alias
-//https://github.com/elastic/elasticsearch/issues/40239
-groupByTruncate-Ignore
+groupByTruncate
 SELECT CAST(TRUNCATE(EXTRACT(YEAR FROM "birth_date")) AS INTEGER) FROM test_emp GROUP BY CAST(TRUNCATE(EXTRACT(YEAR FROM "birth_date")) AS INTEGER) ORDER BY CAST(TRUNCATE(EXTRACT(YEAR FROM "birth_date")) AS INTEGER);
-//https://github.com/elastic/elasticsearch/issues/40239
-groupByRound-Ignore
+groupByRound
 SELECT CAST(ROUND(EXTRACT(YEAR FROM "birth_date")) AS INTEGER) FROM test_emp GROUP BY CAST(ROUND(EXTRACT(YEAR FROM "birth_date")) AS INTEGER) ORDER BY CAST(ROUND(EXTRACT(YEAR FROM "birth_date")) AS INTEGER);
 groupByAtan2
 SELECT ATAN2(YEAR("birth_date"), 5) FROM test_emp GROUP BY ATAN2(YEAR("birth_date"), 5) ORDER BY ATAN2(YEAR("birth_date"), 5);
 groupByPower
 SELECT POWER(YEAR("birth_date"), 2) FROM test_emp GROUP BY POWER(YEAR("birth_date"), 2) ORDER BY POWER(YEAR("birth_date"), 2);
-//https://github.com/elastic/elasticsearch/issues/40239
-groupByPowerWithCast-Ignore
+groupByPowerWithCast
 SELECT CAST(POWER(YEAR("birth_date"), 2) AS DOUBLE) FROM test_emp GROUP BY CAST(POWER(YEAR("birth_date"), 2) AS DOUBLE) ORDER BY CAST(POWER(YEAR("birth_date"), 2) AS DOUBLE);
 groupByConcat
 SELECT LEFT(CONCAT("first_name", "last_name"), 3) FROM test_emp GROUP BY LEFT(CONCAT("first_name", "last_name"), 3) ORDER BY LEFT(CONCAT("first_name", "last_name"), 3) LIMIT 15;
diff --git a/x-pack/plugin/sql/qa/src/main/resources/select.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/select.sql-spec
index 82bbbf12e961e..9f9731efcc5b9 100644
--- a/x-pack/plugin/sql/qa/src/main/resources/select.sql-spec
+++ b/x-pack/plugin/sql/qa/src/main/resources/select.sql-spec
@@ -108,9 +108,7 @@ selectMathPIFromIndexWithWhereEvaluatingToTrue
 SELECT PI() AS pi FROM test_emp WHERE ROUND(PI(),2)=3.14;
 selectMathPIFromIndexWithWhereEvaluatingToTrueAndWithLimit
 SELECT PI() AS pi FROM test_emp WHERE ROUND(PI(),2)=3.14 LIMIT 3;
-// AwaitsFix https://github.com/elastic/elasticsearch/issues/35980
-selectMathPIFromIndexWithWhereEvaluatingToFalse-Ignore
+selectMathPIFromIndexWithWhereEvaluatingToFalse
 SELECT PI() AS pi FROM test_emp WHERE PI()=5;
-// AwaitsFix https://github.com/elastic/elasticsearch/issues/35980
-selectMathPIFromIndexWithWhereEvaluatingToFalseAndWithLimit-Ignore
+selectMathPIFromIndexWithWhereEvaluatingToFalseAndWithLimit
 SELECT PI() AS pi FROM test_emp WHERE PI()=5 LIMIT 3;