diff --git a/testing/endtoend/e2e_delegated_staking_test.go b/testing/endtoend/e2e_delegated_staking_test.go
index 540a862c0..723511ce1 100644
--- a/testing/endtoend/e2e_delegated_staking_test.go
+++ b/testing/endtoend/e2e_delegated_staking_test.go
@@ -217,11 +217,13 @@ func TestEndToEnd_DelegatedStaking(t *testing.T) {
 	require.NoError(t, err)
 	tx, err := rollupUserLogic.AddToDeposit(fundsCustodianOpts, honestTxOpts.From, fundsCustodianOpts.From, balCustodian)
 	require.NoError(t, err)
-	bind.WaitMined(honestCtx, bk.Client(), tx)
+	_, err = bind.WaitMined(honestCtx, bk.Client(), tx)
+	require.NoError(t, err)
 
 	tx, err = rollupUserLogic.AddToDeposit(evilFundsCustodianOpts, evilTxOpts.From, evilFundsCustodianOpts.From, balEvilCustodian)
 	require.NoError(t, err)
-	bind.WaitMined(honestCtx, bk.Client(), tx)
+	_, err = bind.WaitMined(evilCtx, bk.Client(), tx)
+	require.NoError(t, err)
 
 	t.Log("Delegated validators now have a deposit balance")
 
diff --git a/testing/setup/rollup_stack.go b/testing/setup/rollup_stack.go
index 7eb1f9aae..c7c358996 100644
--- a/testing/setup/rollup_stack.go
+++ b/testing/setup/rollup_stack.go
@@ -439,11 +439,7 @@ func ChainsWithEdgeChallengeManager(opts ...Opt) (*ChainSetup, error) {
 	if !ok {
 		return nil, errors.New("could not set big int")
 	}
-	numAccountsToFund := len(accs)
-	if setp.numFundedAccounts > 0 {
-		numAccountsToFund = int(setp.numFundedAccounts)
-	}
-	for i := 0; i < numAccountsToFund; i++ {
+	for i := 0; i < len(accs); i++ {
 		acc := accs[i]
 		transferTx, err := tokenBindings.TestWETH9Transactor.Transfer(accs[0].TxOpts, acc.TxOpts.From, seed)
 		if err != nil {