diff --git a/src/test/regress/sql/multi_mx_repartition_join_w1.sql b/src/test/regress/sql/multi_mx_repartition_join_w1.sql
index a9e0b6e10..a12bcd087 100644
--- a/src/test/regress/sql/multi_mx_repartition_join_w1.sql
+++ b/src/test/regress/sql/multi_mx_repartition_join_w1.sql
@@ -4,7 +4,9 @@
 -- tests use the same sequence ids but the queries should not fail.
 \c - - - :worker_1_port
 
-SET citus.task_executor_type TO "task-tracker";
+SET citus.max_adaptive_executor_pool_size TO 2;
+SET citus.enable_repartition_joins to ON;
+SET citus.task_executor_type = 'adaptive';
 CREATE TEMP TABLE t1 AS
 SELECT
     l1.l_comment
diff --git a/src/test/regress/sql/multi_mx_repartition_join_w2.sql b/src/test/regress/sql/multi_mx_repartition_join_w2.sql
index d27fb57a2..c8e241ff6 100644
--- a/src/test/regress/sql/multi_mx_repartition_join_w2.sql
+++ b/src/test/regress/sql/multi_mx_repartition_join_w2.sql
@@ -4,7 +4,9 @@
 -- tests use the same sequence ids but the queries should not fail.
 \c - - - :worker_2_port
 
-SET citus.task_executor_type TO "task-tracker";
+SET citus.max_adaptive_executor_pool_size TO 2;
+SET citus.enable_repartition_joins to ON;
+SET citus.task_executor_type = 'adaptive';
 CREATE TEMP TABLE t1 AS
 SELECT
     l1.l_comment
diff --git a/src/test/regress/sql/multi_mx_repartition_udt_w1.sql b/src/test/regress/sql/multi_mx_repartition_udt_w1.sql
index 0710d98b4..96cb59b93 100644
--- a/src/test/regress/sql/multi_mx_repartition_udt_w1.sql
+++ b/src/test/regress/sql/multi_mx_repartition_udt_w1.sql
@@ -5,7 +5,9 @@
 \c - - - :worker_1_port
 SET client_min_messages = LOG;
 -- Query that should result in a repartition join on UDT column.
-SET citus.task_executor_type = 'task-tracker';
+SET citus.max_adaptive_executor_pool_size TO 2;
+SET citus.enable_repartition_joins to ON;
+SET citus.task_executor_type = 'adaptive';
 SET citus.log_multi_join_order = true;
 
 -- Query that should result in a repartition
diff --git a/src/test/regress/sql/multi_mx_repartition_udt_w2.sql b/src/test/regress/sql/multi_mx_repartition_udt_w2.sql
index fd39c8b86..604e54041 100644
--- a/src/test/regress/sql/multi_mx_repartition_udt_w2.sql
+++ b/src/test/regress/sql/multi_mx_repartition_udt_w2.sql
@@ -5,7 +5,9 @@
 \c - - - :worker_2_port
 SET client_min_messages = LOG;
 -- Query that should result in a repartition join on UDT column.
-SET citus.task_executor_type = 'task-tracker';
+SET citus.max_adaptive_executor_pool_size TO 2;
+SET citus.enable_repartition_joins to ON;
+SET citus.task_executor_type = 'adaptive';
 SET citus.log_multi_join_order = true;
 
 -- Query that should result in a repartition