diff --git a/ibis/backends/bigquery/tests/unit/snapshots/test_compiler/test_unnest/out_one_unnest.sql b/ibis/backends/bigquery/tests/unit/snapshots/test_compiler/test_unnest/out_one_unnest.sql
index eec986dfcac3..702add1dcd83 100644
--- a/ibis/backends/bigquery/tests/unit/snapshots/test_compiler/test_unnest/out_one_unnest.sql
+++ b/ibis/backends/bigquery/tests/unit/snapshots/test_compiler/test_unnest/out_one_unnest.sql
@@ -1,7 +1,8 @@
 SELECT
   t0.`rowindex`,
   IF(pos = pos_2, `repeated_struct_col`, NULL) AS `repeated_struct_col`
-FROM array_test AS t0, UNNEST(GENERATE_ARRAY(0, GREATEST(ARRAY_LENGTH(t0.`repeated_struct_col`)) - 1)) AS pos
+FROM array_test AS t0
+CROSS JOIN UNNEST(GENERATE_ARRAY(0, GREATEST(ARRAY_LENGTH(t0.`repeated_struct_col`)) - 1)) AS pos
 CROSS JOIN UNNEST(t0.`repeated_struct_col`) AS `repeated_struct_col` WITH OFFSET AS pos_2
 WHERE
   pos = pos_2
diff --git a/ibis/backends/bigquery/tests/unit/snapshots/test_compiler/test_unnest/out_two_unnests.sql b/ibis/backends/bigquery/tests/unit/snapshots/test_compiler/test_unnest/out_two_unnests.sql
index 80de341fc08a..57ec0a5f4378 100644
--- a/ibis/backends/bigquery/tests/unit/snapshots/test_compiler/test_unnest/out_two_unnests.sql
+++ b/ibis/backends/bigquery/tests/unit/snapshots/test_compiler/test_unnest/out_two_unnests.sql
@@ -4,7 +4,8 @@ FROM (
   SELECT
     t1.`rowindex`,
     IF(pos = pos_2, `level_one`, NULL).`nested_struct_col` AS `level_one`
-  FROM array_test AS t1, UNNEST(GENERATE_ARRAY(0, GREATEST(ARRAY_LENGTH(t1.`repeated_struct_col`)) - 1)) AS pos
+  FROM array_test AS t1
+  CROSS JOIN UNNEST(GENERATE_ARRAY(0, GREATEST(ARRAY_LENGTH(t1.`repeated_struct_col`)) - 1)) AS pos
   CROSS JOIN UNNEST(t1.`repeated_struct_col`) AS `level_one` WITH OFFSET AS pos_2
   WHERE
     pos = pos_2
@@ -16,7 +17,8 @@ FROM (
         ARRAY_LENGTH(t1.`repeated_struct_col`) - 1
       )
     )
-) AS t0, UNNEST(GENERATE_ARRAY(0, GREATEST(ARRAY_LENGTH(t0.`level_one`)) - 1)) AS pos
+) AS t0
+CROSS JOIN UNNEST(GENERATE_ARRAY(0, GREATEST(ARRAY_LENGTH(t0.`level_one`)) - 1)) AS pos
 CROSS JOIN UNNEST(t0.`level_one`) AS `level_two` WITH OFFSET AS pos_2
 WHERE
   pos = pos_2
diff --git a/ibis/backends/tests/snapshots/test_sql/test_union_aliasing/bigquery/out.sql b/ibis/backends/tests/snapshots/test_sql/test_union_aliasing/bigquery/out.sql
index ba1287d9df63..58b8e22977be 100644
--- a/ibis/backends/tests/snapshots/test_sql/test_union_aliasing/bigquery/out.sql
+++ b/ibis/backends/tests/snapshots/test_sql/test_union_aliasing/bigquery/out.sql
@@ -2,7 +2,8 @@ WITH t0 AS (
   SELECT
     t7.`field_of_study`,
     IF(pos = pos_2, `__pivoted__`, NULL) AS `__pivoted__`
-  FROM humanities AS t7, UNNEST(GENERATE_ARRAY(
+  FROM humanities AS t7
+  CROSS JOIN UNNEST(GENERATE_ARRAY(
     0,
     GREATEST(
       ARRAY_LENGTH(
@@ -64,7 +65,8 @@ FROM (
     SELECT
       t7.`field_of_study`,
       IF(pos = pos_2, `__pivoted__`, NULL) AS `__pivoted__`
-    FROM humanities AS t7, UNNEST(GENERATE_ARRAY(
+    FROM humanities AS t7
+    CROSS JOIN UNNEST(GENERATE_ARRAY(
       0,
       GREATEST(
         ARRAY_LENGTH(