diff --git a/sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/in-joins.sql b/sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/in-joins.sql
index b10c41929cdaf2799258bff6ff75d1d33617deee..880175fd7add01213f4b34c64e0e9e3ffc5bf619 100644
--- a/sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/in-joins.sql
+++ b/sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/in-joins.sql
@@ -79,7 +79,7 @@ GROUP BY t1a,
t3a,
t3b,
t3c
-ORDER BY t1a DESC;
+ORDER BY t1a DESC, t3b DESC;
-- TC 01.03
SELECT Count(DISTINCT(t1a))
diff --git a/sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/in-set-operations.sql b/sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/in-set-operations.sql
index 6b9e8bf2f362d5e1a05c1bf92c69463eaa4d9196..5c371d2305ac85449aaedddb54525d2c22584442 100644
--- a/sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/in-set-operations.sql
+++ b/sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/in-set-operations.sql
@@ -287,7 +287,7 @@ WHERE t1a IN (SELECT t3a
WHERE t1b > 6) AS t5)
GROUP BY t1a, t1b, t1c, t1d
HAVING t1c IS NOT NULL AND t1b IS NOT NULL
-ORDER BY t1c DESC;
+ORDER BY t1c DESC, t1a DESC;
-- TC 01.08
SELECT t1a,
@@ -351,7 +351,7 @@ WHERE t1b IN
FROM t1
WHERE t1b > 6) AS t4
WHERE t2b = t1b)
-ORDER BY t1c DESC NULLS last;
+ORDER BY t1c DESC NULLS last, t1a DESC;
-- TC 01.11
SELECT *
@@ -468,5 +468,5 @@ HAVING t1b NOT IN
EXCEPT
SELECT t3b
FROM t3)
-ORDER BY t1c DESC NULLS LAST;
+ORDER BY t1c DESC NULLS LAST, t1i;
diff --git a/sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/not-in-joins.sql b/sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/not-in-joins.sql
index 505366b7acd43fa120a94ecc39ddf433c680f073..e09b91f18de0ac12ae239501a7223befeaa19ea9 100644
--- a/sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/not-in-joins.sql
+++ b/sql/core/src/test/resources/sql-tests/inputs/subquery/in-subquery/not-in-joins.sql
@@ -85,7 +85,7 @@ AND t1b != t3b
AND t1d = t2d
GROUP BY t1a, t1b, t1c, t3a, t3b, t3c
HAVING count(distinct(t3a)) >= 1
-ORDER BY t1a;
+ORDER BY t1a, t3b;
-- TC 01.03
SELECT t1a,
diff --git a/sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/in-joins.sql.out b/sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/in-joins.sql.out
index 7258bcfc6ab722100b0472aff703419ea933fbeb..ab6a11a2b7efa9014ef34d25581615b43e163ab0 100644
--- a/sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/in-joins.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/in-joins.sql.out
@@ -102,7 +102,7 @@ GROUP BY t1a,
t3a,
t3b,
t3c
-ORDER BY t1a DESC
+ORDER BY t1a DESC, t3b DESC
-- !query 4 schema
struct<count(DISTINCT t1a):bigint,t1b:smallint,t3a:string,t3b:smallint,t3c:int>
-- !query 4 output
diff --git a/sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/in-set-operations.sql.out b/sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/in-set-operations.sql.out
index 878bc755ef5fc75eb9c61dc0b6d5ef5753149b17..e06f9206d3401fecc50a7ae26a25a632e2aa38a0 100644
--- a/sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/in-set-operations.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/in-set-operations.sql.out
@@ -353,7 +353,7 @@ WHERE t1a IN (SELECT t3a
WHERE t1b > 6) AS t5)
GROUP BY t1a, t1b, t1c, t1d
HAVING t1c IS NOT NULL AND t1b IS NOT NULL
-ORDER BY t1c DESC
+ORDER BY t1c DESC, t1a DESC
-- !query 9 schema
struct<t1a:string,t1b:smallint,t1c:int,t1d:bigint>
-- !query 9 output
@@ -445,7 +445,7 @@ WHERE t1b IN
FROM t1
WHERE t1b > 6) AS t4
WHERE t2b = t1b)
-ORDER BY t1c DESC NULLS last
+ORDER BY t1c DESC NULLS last, t1a DESC
-- !query 12 schema
struct<t1a:string,t1b:smallint,t1c:int>
-- !query 12 output
@@ -580,16 +580,16 @@ HAVING t1b NOT IN
EXCEPT
SELECT t3b
FROM t3)
-ORDER BY t1c DESC NULLS LAST
+ORDER BY t1c DESC NULLS LAST, t1i
-- !query 15 schema
struct<count(DISTINCT t1a):bigint,t1b:smallint,t1c:int,t1i:date>
-- !query 15 output
-1 8 16 2014-05-05
1 8 16 2014-05-04
+1 8 16 2014-05-05
1 16 12 2014-06-04
1 16 12 2014-07-04
1 6 8 2014-04-04
+1 10 NULL 2014-05-04
1 10 NULL 2014-08-04
1 10 NULL 2014-09-04
1 10 NULL 2015-05-04
-1 10 NULL 2014-05-04
diff --git a/sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/not-in-joins.sql.out b/sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/not-in-joins.sql.out
index db01fa455735c1442fa5ab59d3ff8bad20714507..bae5d00cc8632753c3771e0a3599854adde86da0 100644
--- a/sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/not-in-joins.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/subquery/in-subquery/not-in-joins.sql.out
@@ -112,12 +112,12 @@ AND t1b != t3b
AND t1d = t2d
GROUP BY t1a, t1b, t1c, t3a, t3b, t3c
HAVING count(distinct(t3a)) >= 1
-ORDER BY t1a
+ORDER BY t1a, t3b
-- !query 4 schema
struct<t1a:string,t1b:smallint,t1c:int,count(DISTINCT t3a):bigint,t3b:smallint,t3c:int>
-- !query 4 output
-val1c 8 16 1 10 12
val1c 8 16 1 6 12
+val1c 8 16 1 10 12
val1c 8 16 1 17 16