diff --git a/src/test/regress/expected/local_table_join.out b/src/test/regress/expected/local_table_join.out
index d71aee3cf..f2abb1066 100644
--- a/src/test/regress/expected/local_table_join.out
+++ b/src/test/regress/expected/local_table_join.out
@@ -71,7 +71,14 @@ $$);
  (localhost,57638,t,"CREATE FOREIGN DATA WRAPPER")
 (2 rows)
 
+-- Since we are assuming fdw should be part of the extension, add it manually.
+ALTER EXTENSION citus ADD FOREIGN DATA WRAPPER fake_fdw_1;
+NOTICE:  Citus does not propagate adding/dropping member objects
+HINT:  You can add/drop the member objects on the workers as well.
 CREATE SERVER fake_fdw_server_1 FOREIGN DATA WRAPPER fake_fdw_1;
+ALTER EXTENSION citus DROP FOREIGN DATA WRAPPER fake_fdw_1;
+NOTICE:  Citus does not propagate adding/dropping member objects
+HINT:  You can add/drop the member objects on the workers as well.
 CREATE FOREIGN TABLE foreign_table (
   key int,
   value text
diff --git a/src/test/regress/expected/multi_create_fdw.out b/src/test/regress/expected/multi_create_fdw.out
index 453dda1b9..e15d17546 100644
--- a/src/test/regress/expected/multi_create_fdw.out
+++ b/src/test/regress/expected/multi_create_fdw.out
@@ -8,4 +8,11 @@ RETURNS fdw_handler
 AS 'citus'
 LANGUAGE C STRICT;
 CREATE FOREIGN DATA WRAPPER fake_fdw HANDLER fake_fdw_handler;
+-- Since we are assuming fdw should be part of the extension, add and drop it manually.
+ALTER EXTENSION citus ADD FOREIGN DATA WRAPPER fake_fdw;
+NOTICE:  Citus does not propagate adding/dropping member objects
+HINT:  You can add/drop the member objects on the workers as well.
 CREATE SERVER fake_fdw_server FOREIGN DATA WRAPPER fake_fdw;
+ALTER EXTENSION citus DROP FOREIGN DATA WRAPPER fake_fdw;
+NOTICE:  Citus does not propagate adding/dropping member objects
+HINT:  You can add/drop the member objects on the workers as well.
diff --git a/src/test/regress/expected/pg13.out b/src/test/regress/expected/pg13.out
index 44664fb83..bf0337a83 100644
--- a/src/test/regress/expected/pg13.out
+++ b/src/test/regress/expected/pg13.out
@@ -164,7 +164,7 @@ CREATE TABLE my_table (a int, b myvarchar);
 -- """Add ALTER TYPE options useful for extensions,
 -- like TOAST and I/O functions control (Tomas Vondra, Tom Lane)"""
 SELECT create_distributed_table('my_table', 'a');
-ERROR:  Relation "my_table" has dependency on unsupported object "type myvarchar"
+ERROR:  Object "table my_table" has dependency on unsupported object "type myvarchar"
 CREATE TABLE test_table(a int, b tsvector);
 SELECT create_distributed_table('test_table', 'a');
  create_distributed_table
diff --git a/src/test/regress/sql/local_table_join.sql b/src/test/regress/sql/local_table_join.sql
index f9c05789a..5eb9ece3f 100644
--- a/src/test/regress/sql/local_table_join.sql
+++ b/src/test/regress/sql/local_table_join.sql
@@ -43,7 +43,10 @@ CREATE FOREIGN DATA WRAPPER fake_fdw_1 HANDLER fake_fdw_handler;
 SELECT run_command_on_workers($$
     CREATE FOREIGN DATA WRAPPER fake_fdw_1 HANDLER fake_fdw_handler;
 $$);
+-- Since we are assuming fdw should be part of the extension, add it manually.
+ALTER EXTENSION citus ADD FOREIGN DATA WRAPPER fake_fdw_1;
 CREATE SERVER fake_fdw_server_1 FOREIGN DATA WRAPPER fake_fdw_1;
+ALTER EXTENSION citus DROP FOREIGN DATA WRAPPER fake_fdw_1;
 
 CREATE FOREIGN TABLE foreign_table (
   key int,
diff --git a/src/test/regress/sql/multi_create_fdw.sql b/src/test/regress/sql/multi_create_fdw.sql
index 3f83ae227..ea9333781 100644
--- a/src/test/regress/sql/multi_create_fdw.sql
+++ b/src/test/regress/sql/multi_create_fdw.sql
@@ -13,4 +13,8 @@ AS 'citus'
 LANGUAGE C STRICT;
 
 CREATE FOREIGN DATA WRAPPER fake_fdw HANDLER fake_fdw_handler;
+
+-- Since we are assuming fdw should be part of the extension, add and drop it manually.
+ALTER EXTENSION citus ADD FOREIGN DATA WRAPPER fake_fdw;
 CREATE SERVER fake_fdw_server FOREIGN DATA WRAPPER fake_fdw;
+ALTER EXTENSION citus DROP FOREIGN DATA WRAPPER fake_fdw;