diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q32.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q32.groovy
index 61752998ac1d65..7f20c11664e388 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q32.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q32.groovy
@@ -24,6 +24,7 @@ suite("q32_spill") {
   sql """
     use regression_test_tpcds_sf1_unique_p1;
   """
+  sql "set enable_local_shuffle=false"
   qt_q32 """
 SELECT sum(cs_ext_discount_amt) 'excess discount amount'
 FROM
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/spill/q92.groovy b/regression-test/suites/tpcds_sf1_unique_p1/spill/q92.groovy
index 53a95d973ff3d0..3194c15030ef27 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/spill/q92.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/spill/q92.groovy
@@ -21,9 +21,11 @@ suite("q92_spill") {
   sql """
     set min_revocable_mem=1;
   """
-  sql """
+  multi_sql """
     use regression_test_tpcds_sf1_unique_p1;
+    set enable_local_shuffle=false;
   """
+
   qt_q92 """
 SELECT sum(ws_ext_discount_amt) 'Excess Discount Amount'
 FROM
diff --git a/regression-test/suites/tpch_sf0.1_unique_p1/sql/q02.sql b/regression-test/suites/tpch_sf0.1_unique_p1/sql/q02.sql
index 8c60ec1929364d..49ae6a177fc412 100644
--- a/regression-test/suites/tpch_sf0.1_unique_p1/sql/q02.sql
+++ b/regression-test/suites/tpch_sf0.1_unique_p1/sql/q02.sql
@@ -1,5 +1,6 @@
 -- tables: part,supplier,partsupp,nation,region
 SELECT
+/*+ SET_VAR(enable_local_shuffle=false) */
   s_acctbal,
   s_name,
   n_name,