diff --git a/tests/queries/0_stateless/01495_subqueries_in_with_statement.reference b/tests/queries/0_stateless/01495_subqueries_in_with_statement.reference
index 8e851cd3ba1..16ca3450a74 100644
--- a/tests/queries/0_stateless/01495_subqueries_in_with_statement.reference
+++ b/tests/queries/0_stateless/01495_subqueries_in_with_statement.reference
@@ -12,3 +12,21 @@
 4	5
 4	5
 4	5
+---------------------------
+42
+42
+0
+42
+42
+42
+\N
+42
+42
+42
+42
+42
+45
+\N
+\N
+42
+42
diff --git a/tests/queries/0_stateless/01495_subqueries_in_with_statement.sql b/tests/queries/0_stateless/01495_subqueries_in_with_statement.sql
index 9ec921a9d4c..f34f4aaa6e0 100644
--- a/tests/queries/0_stateless/01495_subqueries_in_with_statement.sql
+++ b/tests/queries/0_stateless/01495_subqueries_in_with_statement.sql
@@ -11,3 +11,64 @@ SELECT * FROM (WITH test1 AS (SELECT toInt32(*) i FROM numbers(5)) SELECT * FROM
 WITH test1 AS (SELECT i + 1, j + 1 FROM test1) SELECT toInt64(4) i, toInt64(5) j FROM numbers(3) WHERE (i, j) IN test1;
 
 DROP TABLE IF EXISTS test1;
+
+select '---------------------------';
+
+set empty_result_for_aggregation_by_empty_set = 0;
+
+WITH test1 AS (SELECT number-1 as n FROM numbers(42))
+SELECT max(n+1)+1 z FROM test1;
+
+WITH test1 AS (SELECT number-1 as n FROM numbers(42))
+SELECT max(n+1)+1 z FROM test1 join test1 x using n having z - 1 = (select min(n-1)+41 from test1) + 2;
+
+WITH test1 AS (SELECT number-1 as n FROM numbers(4442) limit 100)
+SELECT max(n) FROM test1 where n=422;
+
+WITH test1 AS (SELECT number-1 as n FROM numbers(4442) limit 100)
+SELECT max(n) FROM test1 where n=42;
+
+drop table if exists with_test ;
+create table with_test engine=Memory as select cast(number-1 as Nullable(Int64))  n from numbers(10000);
+
+WITH test1 AS (SELECT n FROM with_test where n <= 40)
+SELECT max(n+1)+1 z FROM test1 join test1 x using (n) having max(n+1)+1 - 1 = (select min(n-1)+41 from test1) + 2;
+
+WITH test1 AS (SELECT n FROM with_test where n <= 40)
+SELECT max(n+1)+1 z FROM test1 join test1 x using (n) having z - 1 = (select min(n-1)+41 from test1) + 2;
+
+WITH test1 AS (SELECT  n FROM with_test limit 100)
+SELECT max(n) FROM test1 where n=422;
+
+WITH test1 AS (SELECT n FROM with_test limit 100)
+SELECT max(n) FROM test1 where n=42;
+
+WITH test1 AS (SELECT n FROM with_test where n = 42 limit 100)
+SELECT max(n) FROM test1 where n=42;
+
+WITH test1 AS (SELECT n FROM with_test where n = 42 or 1=1 limit 100)
+SELECT max(n) FROM test1 where n=42;
+
+WITH test1 AS (SELECT n, null as b FROM with_test where n = 42 or b is null limit 100)
+SELECT max(n) FROM test1 where n=42;
+
+WITH test1 AS (SELECT n, null b FROM with_test where b is null)
+SELECT max(n) FROM test1 where n=42;
+
+WITH test1 AS (SELECT n, null b FROM with_test where b is null or 1=1)
+SELECT max(n) FROM test1 where n=45;
+
+WITH test1 AS (SELECT n, null b FROM with_test where b is null and n = 42)
+SELECT max(n) FROM test1 where n=45;
+
+WITH test1 AS (SELECT n, null b FROM with_test where 1=1 and n = 42)
+SELECT max(n) FROM test1 where n=45;
+
+WITH test1 AS (SELECT n, null b, n+1 m FROM with_test where 1=0 or n = 42 limit 4)
+SELECT max(n) m FROM test1 where test1.m=43 having max(n)=42;
+
+WITH test1 AS (SELECT n, null b, n+1 m FROM with_test where  n = 42 limit 4)
+SELECT max(n) m FROM test1 where b is null and test1.m=43 having m=42 limit 4;
+
+drop table  with_test ;
+