diff --git a/consensus/polybft/block_builder.go b/consensus/polybft/block_builder.go
index c141c8c5e1..1021eb602e 100644
--- a/consensus/polybft/block_builder.go
+++ b/consensus/polybft/block_builder.go
@@ -184,8 +184,7 @@ func (b *BlockBuilder) writeTxPoolTransaction(tx *types.Transaction) (bool, erro
 		return true, nil
 	}
 
-	err := b.WriteTx(tx)
-	if err != nil {
+	if err := b.WriteTx(tx); err != nil {
 		if _, ok := err.(*state.GasLimitReachedTransitionApplicationError); ok { //nolint:errorlint
 			// stop processing
 			return true, err
diff --git a/e2e-polybft/e2e/bridge_test.go b/e2e-polybft/e2e/bridge_test.go
index 52d4e545a1..3ae3ab008b 100644
--- a/e2e-polybft/e2e/bridge_test.go
+++ b/e2e-polybft/e2e/bridge_test.go
@@ -35,7 +35,7 @@ func TestE2E_Bridge_Transfers(t *testing.T) {
 		numBlockConfirmations = 2
 		// make epoch size long enough, so that all exit events are processed within the same epoch
 		epochSize  = 30
-		sprintSize = 5
+		sprintSize = uint64(5)
 	)
 
 	receivers := make([]string, transfersCount)
@@ -78,8 +78,9 @@ func TestE2E_Bridge_Transfers(t *testing.T) {
 			),
 		)
 
+		finalBlockNum := 8 * sprintSize
 		// wait for a couple of sprints
-		require.NoError(t, cluster.WaitForBlock(8*sprintSize, 2*time.Minute))
+		require.NoError(t, cluster.WaitForBlock(finalBlockNum, 2*time.Minute))
 
 		// the transactions are processed and there should be a success events
 		var stateSyncedResult contractsapi.StateSyncResultEvent
@@ -92,7 +93,7 @@ func TestE2E_Bridge_Transfers(t *testing.T) {
 		}
 
 		filter.SetFromUint64(0)
-		filter.SetToUint64(100)
+		filter.SetToUint64(finalBlockNum)
 
 		logs, err := childEthEndpoint.GetLogs(filter)
 		require.NoError(t, err)
@@ -229,6 +230,7 @@ func TestE2E_Bridge_Transfers(t *testing.T) {
 			),
 		)
 
+		finalBlockNum := midBlockNumber + 5*sprintSize
 		// wait for a few more sprints
 		require.NoError(t, cluster.WaitForBlock(midBlockNumber+5*sprintSize, 3*time.Minute))
 
@@ -253,7 +255,7 @@ func TestE2E_Bridge_Transfers(t *testing.T) {
 		}
 
 		filter.SetFromUint64(initialBlockNum)
-		filter.SetToUint64(initialBlockNum + 2*epochSize)
+		filter.SetToUint64(finalBlockNum)
 
 		logs, err := childEthEndpoint.GetLogs(filter)
 		require.NoError(t, err)
diff --git a/syncer/client_test.go b/syncer/client_test.go
index 9da920116e..b95aae5197 100644
--- a/syncer/client_test.go
+++ b/syncer/client_test.go
@@ -354,7 +354,7 @@ func TestPeerConnectionUpdateEventCh(t *testing.T) {
 	wgForGossip.Wait()
 
 	// close to terminate goroutine
-	close(client.peerStatusUpdateCh)
+	client.Close()
 
 	// wait until collecting routine is done
 	wgForConnectingStatus.Wait()