diff --git a/.github/gh_matrix_builder.py b/.github/gh_matrix_builder.py
index e0cafdb16bb..4dcc0469ae0 100755
--- a/.github/gh_matrix_builder.py
+++ b/.github/gh_matrix_builder.py
@@ -153,7 +153,7 @@ def macos_config(overrides):
             "snapshot": "snapshot",
             "tsdb_build_args": "-DASSERTIONS=ON -DREQUIRE_ALL_TESTS=ON -DEXPERIMENTAL=ON",
             # below tests are tracked as part of #4838
-            "installcheck_args": "SKIPS='003_connections_privs 001_simple_multinode 004_multinode_rdwr_1pc data_node_bootstrap dist_hypertable-15 bgw_custom cagg_dump dist_move_chunk' "
+            "installcheck_args": "SKIPS='003_connections_privs 001_simple_multinode 004_multinode_rdwr_1pc dist_hypertable-15 bgw_custom cagg_dump dist_move_chunk' "
             # below tests are tracked as part of #4835
             "IGNORES='telemetry_stats dist_query dist_partial_agg plan_hashagg partialize_finalize dist_fetcher_type dist_remote_error jit-15 "
             # below tests are tracked as part of #4837
diff --git a/tsl/src/data_node.c b/tsl/src/data_node.c
index 9edf1ee38da..08f622e4dd7 100644
--- a/tsl/src/data_node.c
+++ b/tsl/src/data_node.c
@@ -1776,9 +1776,21 @@ drop_data_node_database(const ForeignServer *server)
 		 * has to rerun the command without drop_database=>true set. We
 		 * don't force removal if there are other connections to the
 		 * database out of caution. If the user wants to forcefully remove
-		 * the database, they can do it manually. */
-		remote_connection_cmdf_ok(conn, "DROP DATABASE %s", quote_identifier(dbname));
+		 * the database, they can do it manually. From PG15, the backend
+		 * executing the DROP forces all other backends to close all smgr
+		 * fds using the ProcSignalBarrier mechanism. To allow this backend
+		 * to handle that interrupt, send the DROP request using the async
+		 * API. */
+		char *cmd;
+		AsyncRequest *req;
+
+		cmd = psprintf("DROP DATABASE %s", quote_identifier(dbname));
+		req = async_request_send(conn, cmd);
+		Assert(NULL != req);
+		async_request_wait_ok_result(req);
 		remote_connection_close(conn);
+		pfree(req);
+		pfree(cmd);
 	}
 	else
 		ereport(ERROR,