diff --git a/itests/kit/blockminer.go b/itests/kit/blockminer.go
index 9dd83ee470..4cd0cc671c 100644
--- a/itests/kit/blockminer.go
+++ b/itests/kit/blockminer.go
@@ -192,12 +192,15 @@ func (bm *BlockMiner) MineBlocksMustPost(ctx context.Context, blocktime time.Dur
 			reportSuccessFn := func(success bool, epoch abi.ChainEpoch, err error) {
 				// if api shuts down before mining, we may get an error which we should probably just ignore
 				// (fixing it will require rewriting most of the mining loop)
-				if err != nil && !strings.Contains(err.Error(), "websocket connection closed") && !api.ErrorIsIn(err, []error{new(jsonrpc.RPCConnectionError)}) {
+				if err != nil && ctx.Err() == nil && !strings.Contains(err.Error(), "websocket connection closed") && !api.ErrorIsIn(err, []error{new(jsonrpc.RPCConnectionError)}) {
 					require.NoError(bm.t, err)
 				}
 
 				target = epoch
-				wait <- success
+				select {
+				case wait <- success:
+				case <-ctx.Done():
+				}
 			}
 
 			var success bool