diff --git a/tests/sqllogictests/suites/mode/cluster/shuffle.test b/tests/sqllogictests/suites/mode/cluster/shuffle.test
index d17d7e380eb1..b928aea7da82 100644
--- a/tests/sqllogictests/suites/mode/cluster/shuffle.test
+++ b/tests/sqllogictests/suites/mode/cluster/shuffle.test
@@ -20,23 +20,23 @@ query T
 explain select * from (select t1.number, t2.number from t1 right outer join (SELECT number FROM t2 QUALIFY row_number() OVER ( PARTITION BY number ORDER BY number DESC ) = 1) AS t2 ON t1.number = t2.number) as tt(a, b) order by a;
 ----
 Sort
-├── output columns: [a (#3), t2.number (#1)]
-├── sort keys: [a ASC NULLS LAST]
-├── estimated rows: 0.03
+├── output columns: [t1.number (#0), t2.number (#1)]
+├── sort keys: [number ASC NULLS LAST]
+├── estimated rows: 0.01
 └── Exchange
-    ├── output columns: [a (#3), t2.number (#1), #_order_col]
+    ├── output columns: [t1.number (#0), t2.number (#1), #_order_col]
     ├── exchange type: Merge
     └── Sort
-        ├── output columns: [a (#3), t2.number (#1), #_order_col]
-        ├── sort keys: [a ASC NULLS LAST]
-        ├── estimated rows: 0.03
+        ├── output columns: [t1.number (#0), t2.number (#1), #_order_col]
+        ├── sort keys: [number ASC NULLS LAST]
+        ├── estimated rows: 0.01
         └── HashJoin
-            ├── output columns: [a (#3), t2.number (#1)]
+            ├── output columns: [t1.number (#0), t2.number (#1)]
             ├── join type: RIGHT OUTER
             ├── build keys: [t2.number (#1)]
-            ├── probe keys: [t1.number (#3)]
+            ├── probe keys: [t1.number (#0)]
             ├── filters: []
-            ├── estimated rows: 0.03
+            ├── estimated rows: 0.01
             ├── Filter(Build)
             │   ├── output columns: [t2.number (#1)]
             │   ├── filters: [row_number() OVER ( PARTITION BY number ORDER BY number DESC ) (#2) = 1]
@@ -65,22 +65,18 @@ Sort
             │                   ├── push downs: [filters: [], limit: NONE]
             │                   └── estimated rows: 14.00
             └── Exchange(Probe)
-                ├── output columns: [a (#3)]
-                ├── exchange type: Hash(t1.number (#3))
-                └── EvalScalar
-                    ├── output columns: [a (#3)]
-                    ├── expressions: [CAST(t1.number (#0) AS UInt64 NULL)]
-                    ├── estimated rows: 5.00
-                    └── TableScan
-                        ├── table: default.default.t1
-                        ├── output columns: [number (#0)]
-                        ├── read rows: 5
-                        ├── read size: < 1 KiB
-                        ├── partitions total: 3
-                        ├── partitions scanned: 3
-                        ├── pruning stats: [segments: <range pruning: 1 to 1>, blocks: <range pruning: 3 to 3>]
-                        ├── push downs: [filters: [], limit: NONE]
-                        └── estimated rows: 5.00
+                ├── output columns: [t1.number (#0)]
+                ├── exchange type: Hash(t1.number (#0))
+                └── TableScan
+                    ├── table: default.default.t1
+                    ├── output columns: [number (#0)]
+                    ├── read rows: 5
+                    ├── read size: < 1 KiB
+                    ├── partitions total: 3
+                    ├── partitions scanned: 3
+                    ├── pruning stats: [segments: <range pruning: 1 to 1>, blocks: <range pruning: 3 to 3>]
+                    ├── push downs: [filters: [], limit: NONE]
+                    └── estimated rows: 5.00
 
 statement ok
 drop table if exists t1;
diff --git a/tests/sqllogictests/suites/mode/standalone/explain/push_down_filter/push_down_filter_join/push_down_filter_self_join.test b/tests/sqllogictests/suites/mode/standalone/explain/push_down_filter/push_down_filter_join/push_down_filter_self_join.test
index 57e0c621946d..61a01456e561 100644
--- a/tests/sqllogictests/suites/mode/standalone/explain/push_down_filter/push_down_filter_join/push_down_filter_self_join.test
+++ b/tests/sqllogictests/suites/mode/standalone/explain/push_down_filter/push_down_filter_join/push_down_filter_self_join.test
@@ -12,25 +12,21 @@ D as (select * from C)
 select * from D;
 ----
 HashJoin
-├── output columns: [a.a (#0), a.b (#1), b (#5), a (#4)]
+├── output columns: [a.a (#0), a.b (#1), a.b (#3), a.a (#2)]
 ├── join type: INNER
-├── build keys: [b2.a (#4)]
-├── probe keys: [CAST(b1.a (#0) AS UInt64 NULL)]
-├── filters: [CAST(d.b (#1) AS UInt64 NULL) < d.b (#5)]
+├── build keys: [b2.a (#2)]
+├── probe keys: [b1.a (#0)]
+├── filters: [d.b (#1) < d.b (#3)]
 ├── estimated rows: 400.00
-├── EvalScalar(Build)
-│   ├── output columns: [a (#4), b (#5)]
-│   ├── expressions: [CAST(b2.a (#2) AS UInt64 NULL), CAST(b2.b (#3) AS UInt64 NULL)]
-│   ├── estimated rows: 20.00
-│   └── TableScan
-│       ├── table: default.default.a
-│       ├── output columns: [a (#2), b (#3)]
-│       ├── read rows: 20
-│       ├── read size: < 1 KiB
-│       ├── partitions total: 0
-│       ├── partitions scanned: 0
-│       ├── push downs: [filters: [], limit: NONE]
-│       └── estimated rows: 20.00
+├── TableScan(Build)
+│   ├── table: default.default.a
+│   ├── output columns: [a (#2), b (#3)]
+│   ├── read rows: 20
+│   ├── read size: < 1 KiB
+│   ├── partitions total: 0
+│   ├── partitions scanned: 0
+│   ├── push downs: [filters: [], limit: NONE]
+│   └── estimated rows: 20.00
 └── TableScan(Probe)
     ├── table: default.default.a
     ├── output columns: [a (#0), b (#1)]