diff --git a/src/backend/distributed/transaction/remote_transaction.c b/src/backend/distributed/transaction/remote_transaction.c
index b1960e4d7..330b16581 100644
--- a/src/backend/distributed/transaction/remote_transaction.c
+++ b/src/backend/distributed/transaction/remote_transaction.c
@@ -521,6 +521,7 @@ void
 RemoteTransactionsBeginIfNecessary(List *connectionList)
 {
 	ListCell *connectionCell = NULL;
+	bool raiseInterrupts = true;
 
 	/*
 	 * Don't do anything if not in a coordinated transaction. That allows the
@@ -554,7 +555,8 @@ RemoteTransactionsBeginIfNecessary(List *connectionList)
 		StartRemoteTransactionBegin(connection);
 	}
 
-	/* XXX: Should perform network IO for all connections in a non-blocking manner */
+	raiseInterrupts = true;
+	WaitForAllConnections(connectionList, raiseInterrupts);
 
 	/* get result of all the BEGINs */
 	foreach(connectionCell, connectionList)
@@ -661,6 +663,8 @@ void
 CoordinatedRemoteTransactionsPrepare(void)
 {
 	dlist_iter iter;
+	bool raiseInterrupts = false;
+	List *connectionList = NIL;
 
 	/* issue PREPARE TRANSACTION; to all relevant remote nodes */
 
@@ -680,9 +684,11 @@ CoordinatedRemoteTransactionsPrepare(void)
 		}
 
 		StartRemoteTransactionPrepare(connection);
+		connectionList = lappend(connectionList, connection);
 	}
 
-	/* XXX: Should perform network IO for all connections in a non-blocking manner */
+	raiseInterrupts = true;
+	WaitForAllConnections(connectionList, raiseInterrupts);
 
 	/* Wait for result */
 	dlist_foreach(iter, &InProgressTransactions)
@@ -715,6 +721,8 @@ void
 CoordinatedRemoteTransactionsCommit(void)
 {
 	dlist_iter iter;
+	List *connectionList = NIL;
+	bool raiseInterrupts = false;
 
 	/*
 	 * Before starting to commit on any of the nodes - after which we can't
@@ -744,9 +752,11 @@ CoordinatedRemoteTransactionsCommit(void)
 		}
 
 		StartRemoteTransactionCommit(connection);
+		connectionList = lappend(connectionList, connection);
 	}
 
-	/* XXX: Should perform network IO for all connections in a non-blocking manner */
+	raiseInterrupts = false;
+	WaitForAllConnections(connectionList, raiseInterrupts);
 
 	/* wait for the replies to the commands to come in */
 	dlist_foreach(iter, &InProgressTransactions)
@@ -780,6 +790,8 @@ void
 CoordinatedRemoteTransactionsAbort(void)
 {
 	dlist_iter iter;
+	List *connectionList = NIL;
+	bool raiseInterrupts = false;
 
 	/* asynchronously send ROLLBACK [PREPARED] */
 	dlist_foreach(iter, &InProgressTransactions)
@@ -797,9 +809,11 @@ CoordinatedRemoteTransactionsAbort(void)
 		}
 
 		StartRemoteTransactionAbort(connection);
+		connectionList = lappend(connectionList, connection);
 	}
 
-	/* XXX: Should perform network IO for all connections in a non-blocking manner */
+	raiseInterrupts = false;
+	WaitForAllConnections(connectionList, raiseInterrupts);
 
 	/* and wait for the results */
 	dlist_foreach(iter, &InProgressTransactions)