diff --git a/src/test/regress/expected/columnar_test_helpers.out b/src/test/regress/expected/columnar_test_helpers.out
index d85bbd54f..9a9e21057 100644
--- a/src/test/regress/expected/columnar_test_helpers.out
+++ b/src/test/regress/expected/columnar_test_helpers.out
@@ -1,3 +1,6 @@
+SET client_min_messages TO WARNING;
+DROP SCHEMA IF EXISTS columnar_test_helpers CASCADE;
+RESET client_min_messages;
 CREATE SCHEMA columnar_test_helpers;
 SET search_path TO columnar_test_helpers;
 CREATE OR REPLACE FUNCTION columnar_storage_info(
diff --git a/src/test/regress/expected/failure_test_helpers.out b/src/test/regress/expected/failure_test_helpers.out
index 8c2be9825..da63a985f 100644
--- a/src/test/regress/expected/failure_test_helpers.out
+++ b/src/test/regress/expected/failure_test_helpers.out
@@ -11,7 +11,7 @@ SELECT pg_reload_conf();
 (1 row)
 
 -- Add some helper functions for sending commands to mitmproxy
-CREATE FUNCTION citus.mitmproxy(text) RETURNS TABLE(result text) AS $$
+CREATE OR REPLACE FUNCTION citus.mitmproxy(text) RETURNS TABLE(result text) AS $$
 DECLARE
   command ALIAS FOR $1;
 BEGIN
@@ -26,52 +26,13 @@ BEGIN
   RETURN QUERY SELECT * FROM mitmproxy_result;
 END;
 $$ LANGUAGE plpgsql;
-CREATE FUNCTION citus.clear_network_traffic() RETURNS void AS $$
+CREATE OR REPLACE FUNCTION citus.clear_network_traffic() RETURNS void AS $$
 BEGIN
   PERFORM citus.mitmproxy('recorder.reset()');
   RETURN; -- return void
 END;
 $$ LANGUAGE plpgsql;
-CREATE FUNCTION citus.dump_network_traffic()
-RETURNS TABLE(conn int, source text, message text) AS $$
-BEGIN
-  CREATE TEMPORARY TABLE mitmproxy_command (command text) ON COMMIT DROP;
-  CREATE TEMPORARY TABLE mitmproxy_result (
-    conn int, source text, message text
-  ) ON COMMIT DROP;
-
-  INSERT INTO mitmproxy_command VALUES ('recorder.dump()');
-
-  EXECUTE format('COPY mitmproxy_command TO %L', current_setting('citus.mitmfifo'));
-  EXECUTE format('COPY mitmproxy_result FROM %L', current_setting('citus.mitmfifo'));
-
-  RETURN QUERY SELECT * FROM mitmproxy_result;
-END;
-$$ LANGUAGE plpgsql;
-\c - - - :worker_2_port
--- Add some helper functions for sending commands to mitmproxy
-CREATE FUNCTION citus.mitmproxy(text) RETURNS TABLE(result text) AS $$
-DECLARE
-  command ALIAS FOR $1;
-BEGIN
-  CREATE TEMPORARY TABLE mitmproxy_command (command text) ON COMMIT DROP;
-  CREATE TEMPORARY TABLE mitmproxy_result (res text) ON COMMIT DROP;
-
-  INSERT INTO mitmproxy_command VALUES (command);
-
-  EXECUTE format('COPY mitmproxy_command TO %L', current_setting('citus.mitmfifo'));
-  EXECUTE format('COPY mitmproxy_result FROM %L', current_setting('citus.mitmfifo'));
-
-  RETURN QUERY SELECT * FROM mitmproxy_result;
-END;
-$$ LANGUAGE plpgsql;
-CREATE FUNCTION citus.clear_network_traffic() RETURNS void AS $$
-BEGIN
-  PERFORM citus.mitmproxy('recorder.reset()');
-  RETURN; -- return void
-END;
-$$ LANGUAGE plpgsql;
-CREATE FUNCTION citus.dump_network_traffic()
+CREATE OR REPLACE FUNCTION citus.dump_network_traffic()
 RETURNS TABLE(conn int, source text, message text) AS $$
 BEGIN
   CREATE TEMPORARY TABLE mitmproxy_command (command text) ON COMMIT DROP;
diff --git a/src/test/regress/expected/multi_create_fdw.out b/src/test/regress/expected/multi_create_fdw.out
index e15d17546..3379a82fa 100644
--- a/src/test/regress/expected/multi_create_fdw.out
+++ b/src/test/regress/expected/multi_create_fdw.out
@@ -3,7 +3,11 @@ SET citus.next_shard_id TO 390000;
 -- get ready for the foreign data wrapper tests
 -- ===================================================================
 -- create fake fdw for use in tests
-CREATE FUNCTION fake_fdw_handler()
+SET client_min_messages TO WARNING;
+DROP SERVER IF EXISTS fake_fdw_server CASCADE;
+DROP FOREIGN DATA WRAPPER IF EXISTS fake_fdw CASCADE;
+RESET client_min_messages;
+CREATE OR REPLACE FUNCTION fake_fdw_handler()
 RETURNS fdw_handler
 AS 'citus'
 LANGUAGE C STRICT;
diff --git a/src/test/regress/sql/columnar_test_helpers.sql b/src/test/regress/sql/columnar_test_helpers.sql
index 2e85ebc88..d88f8b88f 100644
--- a/src/test/regress/sql/columnar_test_helpers.sql
+++ b/src/test/regress/sql/columnar_test_helpers.sql
@@ -1,3 +1,7 @@
+SET client_min_messages TO WARNING;
+DROP SCHEMA IF EXISTS columnar_test_helpers CASCADE;
+RESET client_min_messages;
+
 CREATE SCHEMA columnar_test_helpers;
 SET search_path TO columnar_test_helpers;
 
diff --git a/src/test/regress/sql/failure_test_helpers.sql b/src/test/regress/sql/failure_test_helpers.sql
index 7053905ac..b7f9eae3a 100644
--- a/src/test/regress/sql/failure_test_helpers.sql
+++ b/src/test/regress/sql/failure_test_helpers.sql
@@ -8,7 +8,7 @@ SELECT pg_reload_conf();
 
 -- Add some helper functions for sending commands to mitmproxy
 
-CREATE FUNCTION citus.mitmproxy(text) RETURNS TABLE(result text) AS $$
+CREATE OR REPLACE FUNCTION citus.mitmproxy(text) RETURNS TABLE(result text) AS $$
 DECLARE
   command ALIAS FOR $1;
 BEGIN
@@ -24,58 +24,14 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql;
 
-CREATE FUNCTION citus.clear_network_traffic() RETURNS void AS $$
+CREATE OR REPLACE FUNCTION citus.clear_network_traffic() RETURNS void AS $$
 BEGIN
   PERFORM citus.mitmproxy('recorder.reset()');
   RETURN; -- return void
 END;
 $$ LANGUAGE plpgsql;
 
-CREATE FUNCTION citus.dump_network_traffic()
-RETURNS TABLE(conn int, source text, message text) AS $$
-BEGIN
-  CREATE TEMPORARY TABLE mitmproxy_command (command text) ON COMMIT DROP;
-  CREATE TEMPORARY TABLE mitmproxy_result (
-    conn int, source text, message text
-  ) ON COMMIT DROP;
-
-  INSERT INTO mitmproxy_command VALUES ('recorder.dump()');
-
-  EXECUTE format('COPY mitmproxy_command TO %L', current_setting('citus.mitmfifo'));
-  EXECUTE format('COPY mitmproxy_result FROM %L', current_setting('citus.mitmfifo'));
-
-  RETURN QUERY SELECT * FROM mitmproxy_result;
-END;
-$$ LANGUAGE plpgsql;
-
-\c - - - :worker_2_port
-
--- Add some helper functions for sending commands to mitmproxy
-
-CREATE FUNCTION citus.mitmproxy(text) RETURNS TABLE(result text) AS $$
-DECLARE
-  command ALIAS FOR $1;
-BEGIN
-  CREATE TEMPORARY TABLE mitmproxy_command (command text) ON COMMIT DROP;
-  CREATE TEMPORARY TABLE mitmproxy_result (res text) ON COMMIT DROP;
-
-  INSERT INTO mitmproxy_command VALUES (command);
-
-  EXECUTE format('COPY mitmproxy_command TO %L', current_setting('citus.mitmfifo'));
-  EXECUTE format('COPY mitmproxy_result FROM %L', current_setting('citus.mitmfifo'));
-
-  RETURN QUERY SELECT * FROM mitmproxy_result;
-END;
-$$ LANGUAGE plpgsql;
-
-CREATE FUNCTION citus.clear_network_traffic() RETURNS void AS $$
-BEGIN
-  PERFORM citus.mitmproxy('recorder.reset()');
-  RETURN; -- return void
-END;
-$$ LANGUAGE plpgsql;
-
-CREATE FUNCTION citus.dump_network_traffic()
+CREATE OR REPLACE FUNCTION citus.dump_network_traffic()
 RETURNS TABLE(conn int, source text, message text) AS $$
 BEGIN
   CREATE TEMPORARY TABLE mitmproxy_command (command text) ON COMMIT DROP;
diff --git a/src/test/regress/sql/multi_create_fdw.sql b/src/test/regress/sql/multi_create_fdw.sql
index ea9333781..cb780a5c2 100644
--- a/src/test/regress/sql/multi_create_fdw.sql
+++ b/src/test/regress/sql/multi_create_fdw.sql
@@ -7,7 +7,12 @@ SET citus.next_shard_id TO 390000;
 -- ===================================================================
 
 -- create fake fdw for use in tests
-CREATE FUNCTION fake_fdw_handler()
+SET client_min_messages TO WARNING;
+DROP SERVER IF EXISTS fake_fdw_server CASCADE;
+DROP FOREIGN DATA WRAPPER IF EXISTS fake_fdw CASCADE;
+RESET client_min_messages;
+
+CREATE OR REPLACE FUNCTION fake_fdw_handler()
 RETURNS fdw_handler
 AS 'citus'
 LANGUAGE C STRICT;