diff --git a/test/e2e-go/features/transactions/accountv2_test.go b/test/e2e-go/features/transactions/accountv2_test.go
index 500a39407b..2972229346 100644
--- a/test/e2e-go/features/transactions/accountv2_test.go
+++ b/test/e2e-go/features/transactions/accountv2_test.go
@@ -312,7 +312,7 @@ int 1
 		resp, err := client.GetParsedPendingTransactions(2)
 		a.NoError(err)
 		if resp.TotalTransactions == 1 {
-			a.Equal(resp.TopTransactions[0].Txn.ID(), txid)
+			a.Equal(resp.TopTransactions[0].Txn.ID().String(), txid)
 			continue
 		}
 		a.Equal(uint64(0), resp.TotalTransactions)
diff --git a/test/e2e-go/upgrades/application_support_test.go b/test/e2e-go/upgrades/application_support_test.go
index 4a01546b6f..00ee3024a9 100644
--- a/test/e2e-go/upgrades/application_support_test.go
+++ b/test/e2e-go/upgrades/application_support_test.go
@@ -448,18 +448,14 @@ int 1
 	a.NoError(err)
 	signedTxn, err = client.SignTransactionWithWallet(wh, nil, tx)
 	a.NoError(err)
-	_, err = client.BroadcastTransaction(signedTxn)
+	txid, err := client.BroadcastTransaction(signedTxn)
 	a.NoError(err)
 
-	curStatus, err = client.Status()
-	a.NoError(err)
-
-	round = curStatus.LastRound
-
-	client.WaitForRound(round + 2)
-	pendingTx, err = client.GetPendingTransactions(1)
+	// Try polling 10 rounds to ensure txn is committed.
+	round, err = client.CurrentRound()
 	a.NoError(err)
-	a.Equal(uint64(0), pendingTx.TotalTransactions)
+	isCommitted := fixture.WaitForTxnConfirmation(round+10, creator, txid)
+	a.True(isCommitted)
 
 	// check creator's balance record for the app entry and the state changes
 	ad, err = client.AccountData(creator)