diff --git a/src/test/regress/bin/normalize.sed b/src/test/regress/bin/normalize.sed
index 1cbd0b404fd..930bf90c322 100644
--- a/src/test/regress/bin/normalize.sed
+++ b/src/test/regress/bin/normalize.sed
@@ -319,3 +319,10 @@ s/COPY DEFAULT only available using COPY FROM/COPY DEFAULT cannot be used with C
 s/COPY delimiter must not appear in the DEFAULT specification/COPY delimiter character must not appear in the DEFAULT specification/
 
 #endif /* PG_VERSION_NUM < PG_VERSION_17 */
+
+# pg17 change: this is a rule that ignores additional DEBUG logging
+# for CREATE MATERIALIZED VIEW (commit b4da732fd64). This could be
+# changed to a normalization rule when 17 becomes the minimum
+# supported Postgres version.
+
+/DEBUG:  drop auto-cascades to type [a-zA-Z_]*.pg_temp_[0-9]*/d
diff --git a/src/test/regress/expected/multi_router_planner.out b/src/test/regress/expected/multi_router_planner.out
index fee821a7d24..ce68d133d4f 100644
--- a/src/test/regress/expected/multi_router_planner.out
+++ b/src/test/regress/expected/multi_router_planner.out
@@ -10,7 +10,7 @@ CREATE SCHEMA multi_router_planner;
 SET search_path TO multi_router_planner;
 CREATE TABLE articles_hash (
 	id bigint NOT NULL,
-	author_id bigint NOT NULL,
+	author_id bigint,
 	title varchar(20) NOT NULL,
 	word_count integer
 );
diff --git a/src/test/regress/expected/multi_router_planner_fast_path.out b/src/test/regress/expected/multi_router_planner_fast_path.out
index 25cc8a1a70e..e483660ee03 100644
--- a/src/test/regress/expected/multi_router_planner_fast_path.out
+++ b/src/test/regress/expected/multi_router_planner_fast_path.out
@@ -12,7 +12,7 @@ SET citus.enable_fast_path_router_planner TO true;
 -- ===================================================================
 CREATE TABLE articles_hash (
 	id bigint NOT NULL,
-	author_id bigint NOT NULL,
+	author_id bigint,
 	title varchar(20) NOT NULL,
 	word_count integer
 );
diff --git a/src/test/regress/expected/query_single_shard_table.out b/src/test/regress/expected/query_single_shard_table.out
index 5f551a9881d..0945bc1d745 100644
--- a/src/test/regress/expected/query_single_shard_table.out
+++ b/src/test/regress/expected/query_single_shard_table.out
@@ -1183,7 +1183,7 @@ DEBUG:  Local tables cannot be used in distributed queries.
 DEBUG:  skipping recursive planning for the subquery since it contains references to outer queries
 ERROR:  direct joins between distributed and local tables are not supported
 SELECT COUNT(*) FROM nullkey_c1_t1 t1
-WHERE t1.b IN (
+WHERE t1.b + random() IN (
     SELECT b+1 FROM citus_local_table t2 WHERE t2.b = t1.a
 );
 DEBUG:  router planner does not support queries that reference non-colocated distributed tables
@@ -1258,7 +1258,7 @@ DEBUG:  Local tables cannot be used in distributed queries.
 DEBUG:  skipping recursive planning for the subquery since it contains references to outer queries
 ERROR:  direct joins between distributed and local tables are not supported
 SELECT COUNT(*) FROM citus_local_table t1
-WHERE t1.b IN (
+WHERE t1.b + random() IN (
     SELECT b+1 FROM nullkey_c1_t1 t2 WHERE t2.b = t1.a
 );
 DEBUG:  router planner does not support queries that reference non-colocated distributed tables
@@ -1312,7 +1312,7 @@ DEBUG:  skipping recursive planning for the subquery since it contains reference
 ERROR:  direct joins between distributed and local tables are not supported
 HINT:  Use CTE's or subqueries to select from local tables and use them in joins
 SELECT COUNT(*) FROM nullkey_c1_t1 t1
-WHERE t1.b IN (
+WHERE t1.b + random() IN (
     SELECT b+1 FROM postgres_local_table t2 WHERE t2.b = t1.a
 );
 DEBUG:  found no worker with all shard placements
@@ -1344,7 +1344,7 @@ DEBUG:  skipping recursive planning for the subquery since it contains reference
 ERROR:  direct joins between distributed and local tables are not supported
 HINT:  Use CTE's or subqueries to select from local tables and use them in joins
 SELECT COUNT(*) FROM postgres_local_table t1
-WHERE t1.b IN (
+WHERE t1.b + random() IN (
     SELECT b+1 FROM nullkey_c1_t1 t2 WHERE t2.b = t1.a
 );
 DEBUG:  found no worker with all shard placements
diff --git a/src/test/regress/sql/multi_router_planner.sql b/src/test/regress/sql/multi_router_planner.sql
index 2ccd43ea3b5..20b8a59562e 100644
--- a/src/test/regress/sql/multi_router_planner.sql
+++ b/src/test/regress/sql/multi_router_planner.sql
@@ -15,7 +15,7 @@ SET search_path TO multi_router_planner;
 
 CREATE TABLE articles_hash (
 	id bigint NOT NULL,
-	author_id bigint NOT NULL,
+	author_id bigint,
 	title varchar(20) NOT NULL,
 	word_count integer
 );
diff --git a/src/test/regress/sql/multi_router_planner_fast_path.sql b/src/test/regress/sql/multi_router_planner_fast_path.sql
index 1fd1f6ce0d8..56684c07575 100644
--- a/src/test/regress/sql/multi_router_planner_fast_path.sql
+++ b/src/test/regress/sql/multi_router_planner_fast_path.sql
@@ -18,7 +18,7 @@ SET citus.enable_fast_path_router_planner TO true;
 
 CREATE TABLE articles_hash (
 	id bigint NOT NULL,
-	author_id bigint NOT NULL,
+	author_id bigint,
 	title varchar(20) NOT NULL,
 	word_count integer
 );
@@ -803,7 +803,6 @@ CREATE MATERIALIZED VIEW mv_articles_hash_empty AS
 	SELECT * FROM articles_hash WHERE author_id = 1;
 SELECT * FROM mv_articles_hash_empty;
 
-
 SELECT id
 	FROM articles_hash
 	WHERE author_id = 1;
diff --git a/src/test/regress/sql/query_single_shard_table.sql b/src/test/regress/sql/query_single_shard_table.sql
index 96de2705c6a..4abda0bea42 100644
--- a/src/test/regress/sql/query_single_shard_table.sql
+++ b/src/test/regress/sql/query_single_shard_table.sql
@@ -502,7 +502,7 @@ WHERE NOT EXISTS (
 );
 
 SELECT COUNT(*) FROM nullkey_c1_t1 t1
-WHERE t1.b IN (
+WHERE t1.b + random() IN (
     SELECT b+1 FROM citus_local_table t2 WHERE t2.b = t1.a
 );
 
@@ -543,7 +543,7 @@ WHERE EXISTS (
 );
 
 SELECT COUNT(*) FROM citus_local_table t1
-WHERE t1.b IN (
+WHERE t1.b + random() IN (
     SELECT b+1 FROM nullkey_c1_t1 t2 WHERE t2.b = t1.a
 );
 
@@ -573,7 +573,7 @@ WHERE NOT EXISTS (
 );
 
 SELECT COUNT(*) FROM nullkey_c1_t1 t1
-WHERE t1.b IN (
+WHERE t1.b + random() IN (
     SELECT b+1 FROM postgres_local_table t2 WHERE t2.b = t1.a
 );
 
@@ -593,7 +593,7 @@ WHERE EXISTS (
 );
 
 SELECT COUNT(*) FROM postgres_local_table t1
-WHERE t1.b IN (
+WHERE t1.b + random() IN (
     SELECT b+1 FROM nullkey_c1_t1 t2 WHERE t2.b = t1.a
 );