diff --git a/bitswap/client/internal/session/peerresponsetracker.go b/bitswap/client/internal/session/peerresponsetracker.go
index d81c3b027..25c10fe87 100644
--- a/bitswap/client/internal/session/peerresponsetracker.go
+++ b/bitswap/client/internal/session/peerresponsetracker.go
@@ -57,14 +57,9 @@ func (prt *peerResponseTracker) choose(peers []peer.ID) peer.ID {
 }
 
 // getPeerCount returns the number of times the peer was first to send us a
-// block
+// block plus one (in order to never get a zero chance).
 func (prt *peerResponseTracker) getPeerCount(p peer.ID) int {
-	count, ok := prt.firstResponder[p]
-	if ok {
-		return count
-	}
-
 	// Make sure there is always at least a small chance a new peer
 	// will be chosen
-	return 1
+	return prt.firstResponder[p] + 1
 }
diff --git a/bitswap/client/internal/session/peerresponsetracker_test.go b/bitswap/client/internal/session/peerresponsetracker_test.go
index 1aed9c4ef..bdcd80daa 100644
--- a/bitswap/client/internal/session/peerresponsetracker_test.go
+++ b/bitswap/client/internal/session/peerresponsetracker_test.go
@@ -5,13 +5,10 @@ import (
 	"testing"
 
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
-	"github.com/ipfs/boxo/internal/test"
 	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 func TestPeerResponseTrackerInit(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(2)
 	prt := newPeerResponseTracker()
 
@@ -28,8 +25,6 @@ func TestPeerResponseTrackerInit(t *testing.T) {
 }
 
 func TestPeerResponseTrackerProbabilityUnknownPeers(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(4)
 	prt := newPeerResponseTracker()
 
@@ -59,8 +54,6 @@ func TestPeerResponseTrackerProbabilityUnknownPeers(t *testing.T) {
 }
 
 func TestPeerResponseTrackerProbabilityOneKnownOneUnknownPeer(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(2)
 	prt := newPeerResponseTracker()
 
@@ -86,8 +79,6 @@ func TestPeerResponseTrackerProbabilityOneKnownOneUnknownPeer(t *testing.T) {
 }
 
 func TestPeerResponseTrackerProbabilityProportional(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(3)
 	prt := newPeerResponseTracker()
 
diff --git a/bitswap/client/internal/session/sentwantblockstracker_test.go b/bitswap/client/internal/session/sentwantblockstracker_test.go
index ccb920e31..c74e8c5f8 100644
--- a/bitswap/client/internal/session/sentwantblockstracker_test.go
+++ b/bitswap/client/internal/session/sentwantblockstracker_test.go
@@ -4,12 +4,9 @@ import (
 	"testing"
 
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
-	"github.com/ipfs/boxo/internal/test"
 )
 
 func TestSendWantBlocksTracker(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(2)
 	cids := testutil.GenerateCids(2)
 	swbt := newSentWantBlocksTracker()
diff --git a/bitswap/client/internal/session/wantinfo_test.go b/bitswap/client/internal/session/wantinfo_test.go
index c7348a4a1..ad42b174d 100644
--- a/bitswap/client/internal/session/wantinfo_test.go
+++ b/bitswap/client/internal/session/wantinfo_test.go
@@ -4,12 +4,9 @@ import (
 	"testing"
 
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
-	"github.com/ipfs/boxo/internal/test"
 )
 
 func TestEmptyWantInfo(t *testing.T) {
-	test.Flaky(t)
-
 	wp := newWantInfo(newPeerResponseTracker())
 
 	if wp.bestPeer != "" {
@@ -18,8 +15,6 @@ func TestEmptyWantInfo(t *testing.T) {
 }
 
 func TestSetPeerBlockPresence(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(2)
 	wp := newWantInfo(newPeerResponseTracker())
 
@@ -40,8 +35,6 @@ func TestSetPeerBlockPresence(t *testing.T) {
 }
 
 func TestSetPeerBlockPresenceBestLower(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(2)
 	wp := newWantInfo(newPeerResponseTracker())
 
@@ -62,8 +55,6 @@ func TestSetPeerBlockPresenceBestLower(t *testing.T) {
 }
 
 func TestRemoveThenSetDontHave(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(2)
 	wp := newWantInfo(newPeerResponseTracker())