diff --git a/eth/catalyst/api_test.go b/eth/catalyst/api_test.go
index 82e679bced..c750167cfc 100644
--- a/eth/catalyst/api_test.go
+++ b/eth/catalyst/api_test.go
@@ -682,6 +682,7 @@ func assembleBlock(api *ConsensusAPI, parentHash common.Hash, params *engine.Pay
 	if err != nil {
 		return nil, err
 	}
+	waitForPayloadToBuild()
 	return payload.ResolveFull().ExecutionPayload, nil
 }
 
@@ -920,6 +921,7 @@ func TestNewPayloadOnInvalidTerminalBlock(t *testing.T) {
 	if err != nil {
 		t.Fatalf("error preparing payload, err=%v", err)
 	}
+	waitForPayloadToBuild()
 	data := *payload.Resolve().ExecutionPayload
 	// We need to recompute the blockhash, since the miner computes a wrong (correct) blockhash
 	txs, _ := decodeTransactions(data.Transactions)