diff --git a/bitswap/bitswap_test.go b/bitswap/bitswap_test.go
index 7d478ca73..fb049df23 100644
--- a/bitswap/bitswap_test.go
+++ b/bitswap/bitswap_test.go
@@ -14,7 +14,6 @@ import (
 	"github.com/ipfs/boxo/bitswap/server"
 	testinstance "github.com/ipfs/boxo/bitswap/testinstance"
 	tn "github.com/ipfs/boxo/bitswap/testnet"
-	"github.com/ipfs/boxo/internal/test"
 	mockrouting "github.com/ipfs/boxo/routing/mock"
 	blocks "github.com/ipfs/go-block-format"
 	cid "github.com/ipfs/go-cid"
@@ -49,8 +48,6 @@ func addBlock(t *testing.T, ctx context.Context, inst testinstance.Instance, blk
 const kNetworkDelay = 0 * time.Millisecond
 
 func TestClose(t *testing.T) {
-	test.Flaky(t)
-
 	vnet := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
 	ig := testinstance.NewTestInstanceGenerator(vnet, nil, nil)
 	defer ig.Close()
@@ -67,8 +64,6 @@ func TestClose(t *testing.T) {
 }
 
 func TestProviderForKeyButNetworkCannotFind(t *testing.T) { // TODO revisit this
-	test.Flaky(t)
-
 	rs := mockrouting.NewServer()
 	net := tn.VirtualNetwork(rs, delay.Fixed(kNetworkDelay))
 	ig := testinstance.NewTestInstanceGenerator(net, nil, nil)
@@ -94,8 +89,6 @@ func TestProviderForKeyButNetworkCannotFind(t *testing.T) { // TODO revisit this
 }
 
 func TestGetBlockFromPeerAfterPeerAnnounces(t *testing.T) {
-	test.Flaky(t)
-
 	net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
 	block := blocks.NewBlock([]byte("block"))
 	ig := testinstance.NewTestInstanceGenerator(net, nil, nil)
@@ -124,8 +117,6 @@ func TestGetBlockFromPeerAfterPeerAnnounces(t *testing.T) {
 }
 
 func TestDoesNotProvideWhenConfiguredNotTo(t *testing.T) {
-	test.Flaky(t)
-
 	net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
 	block := blocks.NewBlock([]byte("block"))
 	bsOpts := []bitswap.Option{bitswap.ProvideEnabled(false), bitswap.ProviderSearchDelay(50 * time.Millisecond)}
@@ -158,8 +149,6 @@ func TestDoesNotProvideWhenConfiguredNotTo(t *testing.T) {
 // Tests that a received block is not stored in the blockstore if the block was
 // not requested by the client
 func TestUnwantedBlockNotAdded(t *testing.T) {
-	test.Flaky(t)
-
 	net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
 	block := blocks.NewBlock([]byte("block"))
 	bsMessage := bsmsg.New(true)
@@ -195,8 +184,6 @@ func TestUnwantedBlockNotAdded(t *testing.T) {
 //
 //	(because the live request queue is full)
 func TestPendingBlockAdded(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
 	bg := blocksutil.NewBlockGenerator()
@@ -245,8 +232,6 @@ func TestPendingBlockAdded(t *testing.T) {
 }
 
 func TestLargeSwarm(t *testing.T) {
-	test.Flaky(t)
-
 	if testing.Short() {
 		t.SkipNow()
 	}
@@ -279,8 +264,6 @@ func TestLargeFile(t *testing.T) {
 }
 
 func TestLargeFileTwoPeers(t *testing.T) {
-	test.Flaky(t)
-
 	if testing.Short() {
 		t.SkipNow()
 	}
@@ -290,8 +273,6 @@ func TestLargeFileTwoPeers(t *testing.T) {
 }
 
 func PerformDistributionTest(t *testing.T, numInstances, numBlocks int) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	if testing.Short() {
 		t.SkipNow()
@@ -349,8 +330,6 @@ func PerformDistributionTest(t *testing.T, numInstances, numBlocks int) {
 
 // TODO simplify this test. get to the _essence_!
 func TestSendToWantingPeer(t *testing.T) {
-	test.Flaky(t)
-
 	if testing.Short() {
 		t.SkipNow()
 	}
@@ -394,8 +373,6 @@ func TestSendToWantingPeer(t *testing.T) {
 }
 
 func TestEmptyKey(t *testing.T) {
-	test.Flaky(t)
-
 	net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
 	ig := testinstance.NewTestInstanceGenerator(net, nil, nil)
 	defer ig.Close()
@@ -429,8 +406,6 @@ func assertStat(t *testing.T, st *bitswap.Stat, sblks, rblks, sdata, rdata uint6
 }
 
 func TestBasicBitswap(t *testing.T) {
-	test.Flaky(t)
-
 	net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
 	ig := testinstance.NewTestInstanceGenerator(net, nil, nil)
 	defer ig.Close()
@@ -503,8 +478,6 @@ func TestBasicBitswap(t *testing.T) {
 }
 
 func TestDoubleGet(t *testing.T) {
-	test.Flaky(t)
-
 	net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
 	ig := testinstance.NewTestInstanceGenerator(net, nil, nil)
 	defer ig.Close()
@@ -570,8 +543,6 @@ func TestDoubleGet(t *testing.T) {
 }
 
 func TestWantlistCleanup(t *testing.T) {
-	test.Flaky(t)
-
 	net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
 	ig := testinstance.NewTestInstanceGenerator(net, nil, nil)
 	defer ig.Close()
@@ -694,8 +665,6 @@ func newReceipt(sent, recv, exchanged uint64) *server.Receipt {
 }
 
 func TestBitswapLedgerOneWay(t *testing.T) {
-	test.Flaky(t)
-
 	net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
 	ig := testinstance.NewTestInstanceGenerator(net, nil, nil)
 	defer ig.Close()
@@ -745,8 +714,6 @@ func TestBitswapLedgerOneWay(t *testing.T) {
 }
 
 func TestBitswapLedgerTwoWay(t *testing.T) {
-	test.Flaky(t)
-
 	net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
 	ig := testinstance.NewTestInstanceGenerator(net, nil, nil)
 	defer ig.Close()
@@ -834,8 +801,6 @@ func (tsl *testingScoreLedger) Stop() {
 
 // Tests start and stop of a custom decision logic
 func TestWithScoreLedger(t *testing.T) {
-	test.Flaky(t)
-
 	tsl := newTestingScoreLedger()
 	net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
 	bsOpts := []bitswap.Option{bitswap.WithScoreLedger(tsl)}
diff --git a/bitswap/client/bitswap_with_sessions_test.go b/bitswap/client/bitswap_with_sessions_test.go
index 2191a5a90..54c320236 100644
--- a/bitswap/client/bitswap_with_sessions_test.go
+++ b/bitswap/client/bitswap_with_sessions_test.go
@@ -11,7 +11,6 @@ import (
 	"github.com/ipfs/boxo/bitswap/client/traceability"
 	testinstance "github.com/ipfs/boxo/bitswap/testinstance"
 	tn "github.com/ipfs/boxo/bitswap/testnet"
-	"github.com/ipfs/boxo/internal/test"
 	mockrouting "github.com/ipfs/boxo/routing/mock"
 	blocks "github.com/ipfs/go-block-format"
 	cid "github.com/ipfs/go-cid"
@@ -40,8 +39,6 @@ func addBlock(t *testing.T, ctx context.Context, inst testinstance.Instance, blk
 }
 
 func TestBasicSessions(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -109,8 +106,6 @@ func assertBlockListsFrom(from peer.ID, got, exp []blocks.Block) error {
 }
 
 func TestSessionBetweenPeers(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -171,8 +166,6 @@ func TestSessionBetweenPeers(t *testing.T) {
 }
 
 func TestSessionSplitFetch(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -217,8 +210,6 @@ func TestSessionSplitFetch(t *testing.T) {
 }
 
 func TestFetchNotConnected(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 	defer cancel()
 
@@ -262,8 +253,6 @@ func TestFetchNotConnected(t *testing.T) {
 }
 
 func TestFetchAfterDisconnect(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 	defer cancel()
 
@@ -342,8 +331,6 @@ func TestFetchAfterDisconnect(t *testing.T) {
 }
 
 func TestInterestCacheOverflow(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -394,8 +381,6 @@ func TestInterestCacheOverflow(t *testing.T) {
 }
 
 func TestPutAfterSessionCacheEvict(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -434,8 +419,6 @@ func TestPutAfterSessionCacheEvict(t *testing.T) {
 }
 
 func TestMultipleSessions(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -477,8 +460,6 @@ func TestMultipleSessions(t *testing.T) {
 }
 
 func TestWantlistClearsOnCancel(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
 	defer cancel()
 
diff --git a/bitswap/client/internal/blockpresencemanager/blockpresencemanager_test.go b/bitswap/client/internal/blockpresencemanager/blockpresencemanager_test.go
index 5e30073a3..b0616e4e3 100644
--- a/bitswap/client/internal/blockpresencemanager/blockpresencemanager_test.go
+++ b/bitswap/client/internal/blockpresencemanager/blockpresencemanager_test.go
@@ -4,7 +4,6 @@ import (
 	"testing"
 
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
-	"github.com/ipfs/boxo/internal/test"
 	cid "github.com/ipfs/go-cid"
 	peer "github.com/libp2p/go-libp2p/core/peer"
 )
@@ -17,8 +16,6 @@ const (
 )
 
 func TestBlockPresenceManager(t *testing.T) {
-	test.Flaky(t)
-
 	bpm := New()
 
 	p := testutil.GeneratePeers(1)[0]
@@ -99,8 +96,6 @@ func TestBlockPresenceManager(t *testing.T) {
 }
 
 func TestAddRemoveMulti(t *testing.T) {
-	test.Flaky(t)
-
 	bpm := New()
 
 	peers := testutil.GeneratePeers(2)
@@ -184,8 +179,6 @@ func TestAddRemoveMulti(t *testing.T) {
 }
 
 func TestAllPeersDoNotHaveBlock(t *testing.T) {
-	test.Flaky(t)
-
 	bpm := New()
 
 	peers := testutil.GeneratePeers(3)
diff --git a/bitswap/client/internal/messagequeue/donthavetimeoutmgr_test.go b/bitswap/client/internal/messagequeue/donthavetimeoutmgr_test.go
index a6a28aab1..ee90ddde9 100644
--- a/bitswap/client/internal/messagequeue/donthavetimeoutmgr_test.go
+++ b/bitswap/client/internal/messagequeue/donthavetimeoutmgr_test.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/benbjohnson/clock"
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
-	"github.com/ipfs/boxo/internal/test"
 	cid "github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/p2p/protocol/ping"
 )
@@ -74,8 +73,6 @@ func (tr *timeoutRecorder) clear() {
 }
 
 func TestDontHaveTimeoutMgrTimeout(t *testing.T) {
-	test.Flaky(t)
-
 	firstks := testutil.GenerateCids(2)
 	secondks := append(firstks, testutil.GenerateCids(3)...)
 	latency := time.Millisecond * 20
@@ -132,8 +129,6 @@ func TestDontHaveTimeoutMgrTimeout(t *testing.T) {
 }
 
 func TestDontHaveTimeoutMgrCancel(t *testing.T) {
-	test.Flaky(t)
-
 	ks := testutil.GenerateCids(3)
 	latency := time.Millisecond * 10
 	latMultiplier := 1
@@ -170,8 +165,6 @@ func TestDontHaveTimeoutMgrCancel(t *testing.T) {
 }
 
 func TestDontHaveTimeoutWantCancelWant(t *testing.T) {
-	test.Flaky(t)
-
 	ks := testutil.GenerateCids(3)
 	latency := time.Millisecond * 20
 	latMultiplier := 1
@@ -225,8 +218,6 @@ func TestDontHaveTimeoutWantCancelWant(t *testing.T) {
 }
 
 func TestDontHaveTimeoutRepeatedAddPending(t *testing.T) {
-	test.Flaky(t)
-
 	ks := testutil.GenerateCids(10)
 	latency := time.Millisecond * 5
 	latMultiplier := 1
@@ -260,8 +251,6 @@ func TestDontHaveTimeoutRepeatedAddPending(t *testing.T) {
 }
 
 func TestDontHaveTimeoutMgrMessageLatency(t *testing.T) {
-	test.Flaky(t)
-
 	ks := testutil.GenerateCids(2)
 	latency := time.Millisecond * 40
 	latMultiplier := 1
@@ -311,8 +300,6 @@ func TestDontHaveTimeoutMgrMessageLatency(t *testing.T) {
 }
 
 func TestDontHaveTimeoutMgrMessageLatencyMax(t *testing.T) {
-	test.Flaky(t)
-
 	ks := testutil.GenerateCids(2)
 	clock := clock.NewMock()
 	pinged := make(chan struct{})
@@ -346,8 +333,6 @@ func TestDontHaveTimeoutMgrMessageLatencyMax(t *testing.T) {
 }
 
 func TestDontHaveTimeoutMgrUsesDefaultTimeoutIfPingError(t *testing.T) {
-	test.Flaky(t)
-
 	ks := testutil.GenerateCids(2)
 	latency := time.Millisecond * 1
 	latMultiplier := 2
@@ -389,8 +374,6 @@ func TestDontHaveTimeoutMgrUsesDefaultTimeoutIfPingError(t *testing.T) {
 }
 
 func TestDontHaveTimeoutMgrUsesDefaultTimeoutIfLatencyLonger(t *testing.T) {
-	test.Flaky(t)
-
 	ks := testutil.GenerateCids(2)
 	latency := time.Millisecond * 200
 	latMultiplier := 1
@@ -431,8 +414,6 @@ func TestDontHaveTimeoutMgrUsesDefaultTimeoutIfLatencyLonger(t *testing.T) {
 }
 
 func TestDontHaveTimeoutNoTimeoutAfterShutdown(t *testing.T) {
-	test.Flaky(t)
-
 	ks := testutil.GenerateCids(2)
 	latency := time.Millisecond * 10
 	latMultiplier := 1
diff --git a/bitswap/client/internal/messagequeue/messagequeue_test.go b/bitswap/client/internal/messagequeue/messagequeue_test.go
index 59788f50b..bfae65768 100644
--- a/bitswap/client/internal/messagequeue/messagequeue_test.go
+++ b/bitswap/client/internal/messagequeue/messagequeue_test.go
@@ -14,7 +14,6 @@ import (
 	bsmsg "github.com/ipfs/boxo/bitswap/message"
 	pb "github.com/ipfs/boxo/bitswap/message/pb"
 	bsnet "github.com/ipfs/boxo/bitswap/network"
-	"github.com/ipfs/boxo/internal/test"
 	cid "github.com/ipfs/go-cid"
 	peer "github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/p2p/protocol/ping"
@@ -156,8 +155,6 @@ func expectEvent(t *testing.T, events <-chan messageEvent, expectedEvent message
 }
 
 func TestStartupAndShutdown(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	messagesSent := make(chan []bsmsg.Entry)
 	resetChan := make(chan struct{}, 1)
@@ -196,8 +193,6 @@ func TestStartupAndShutdown(t *testing.T) {
 }
 
 func TestSendingMessagesDeduped(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	messagesSent := make(chan []bsmsg.Entry)
 	resetChan := make(chan struct{}, 1)
@@ -219,8 +214,6 @@ func TestSendingMessagesDeduped(t *testing.T) {
 }
 
 func TestSendingMessagesPartialDupe(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	messagesSent := make(chan []bsmsg.Entry)
 	resetChan := make(chan struct{}, 1)
@@ -242,8 +235,6 @@ func TestSendingMessagesPartialDupe(t *testing.T) {
 }
 
 func TestSendingMessagesPriority(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	messagesSent := make(chan []bsmsg.Entry)
 	resetChan := make(chan struct{}, 1)
@@ -311,8 +302,6 @@ func TestSendingMessagesPriority(t *testing.T) {
 }
 
 func TestCancelOverridesPendingWants(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	messagesSent := make(chan []bsmsg.Entry)
 	resetChan := make(chan struct{}, 1)
@@ -363,8 +352,6 @@ func TestCancelOverridesPendingWants(t *testing.T) {
 }
 
 func TestWantOverridesPendingCancels(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	messagesSent := make(chan []bsmsg.Entry)
 	resetChan := make(chan struct{}, 1)
@@ -411,8 +398,6 @@ func TestWantOverridesPendingCancels(t *testing.T) {
 }
 
 func TestWantlistRebroadcast(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	messagesSent := make(chan []bsmsg.Entry)
 	resetChan := make(chan struct{}, 1)
@@ -521,8 +506,6 @@ func TestWantlistRebroadcast(t *testing.T) {
 }
 
 func TestSendingLargeMessages(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	messagesSent := make(chan []bsmsg.Entry)
 	resetChan := make(chan struct{}, 1)
@@ -552,8 +535,6 @@ func TestSendingLargeMessages(t *testing.T) {
 }
 
 func TestSendToPeerThatDoesntSupportHave(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	messagesSent := make(chan []bsmsg.Entry)
 	resetChan := make(chan struct{}, 1)
@@ -608,8 +589,6 @@ func TestSendToPeerThatDoesntSupportHave(t *testing.T) {
 }
 
 func TestSendToPeerThatDoesntSupportHaveMonitorsTimeouts(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	messagesSent := make(chan []bsmsg.Entry)
 	resetChan := make(chan struct{}, 1)
@@ -641,8 +620,6 @@ func TestSendToPeerThatDoesntSupportHaveMonitorsTimeouts(t *testing.T) {
 }
 
 func TestResponseReceived(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	messagesSent := make(chan []bsmsg.Entry)
 	resetChan := make(chan struct{}, 1)
@@ -692,8 +669,6 @@ func TestResponseReceived(t *testing.T) {
 }
 
 func TestResponseReceivedAppliesForFirstResponseOnly(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	messagesSent := make(chan []bsmsg.Entry)
 	resetChan := make(chan struct{}, 1)
@@ -738,8 +713,6 @@ func TestResponseReceivedAppliesForFirstResponseOnly(t *testing.T) {
 }
 
 func TestResponseReceivedDiscardsOutliers(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	messagesSent := make(chan []bsmsg.Entry)
 	resetChan := make(chan struct{}, 1)
diff --git a/bitswap/client/internal/notifications/notifications_test.go b/bitswap/client/internal/notifications/notifications_test.go
index 25b580f6a..a0dc90728 100644
--- a/bitswap/client/internal/notifications/notifications_test.go
+++ b/bitswap/client/internal/notifications/notifications_test.go
@@ -6,7 +6,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ipfs/boxo/internal/test"
 	blocks "github.com/ipfs/go-block-format"
 	cid "github.com/ipfs/go-cid"
 	blocksutil "github.com/ipfs/go-ipfs-blocksutil"
@@ -14,7 +13,6 @@ import (
 )
 
 func TestDuplicates(t *testing.T) {
-	test.Flaky(t)
 	var zero peer.ID // this test doesn't check the peer id
 
 	b1 := blocks.NewBlock([]byte("1"))
@@ -42,7 +40,6 @@ func TestDuplicates(t *testing.T) {
 }
 
 func TestPublishSubscribe(t *testing.T) {
-	test.Flaky(t)
 	var zero peer.ID // this test doesn't check the peer id
 
 	blockSent := blocks.NewBlock([]byte("Greetings from The Interval"))
@@ -62,7 +59,6 @@ func TestPublishSubscribe(t *testing.T) {
 }
 
 func TestSubscribeMany(t *testing.T) {
-	test.Flaky(t)
 	var zero peer.ID // this test doesn't check the peer id
 
 	e1 := blocks.NewBlock([]byte("1"))
@@ -90,7 +86,6 @@ func TestSubscribeMany(t *testing.T) {
 // TestDuplicateSubscribe tests a scenario where a given block
 // would be requested twice at the same time.
 func TestDuplicateSubscribe(t *testing.T) {
-	test.Flaky(t)
 	var zero peer.ID // this test doesn't check the peer id
 
 	e1 := blocks.NewBlock([]byte("1"))
@@ -115,8 +110,6 @@ func TestDuplicateSubscribe(t *testing.T) {
 }
 
 func TestShutdownBeforeUnsubscribe(t *testing.T) {
-	test.Flaky(t)
-
 	e1 := blocks.NewBlock([]byte("1"))
 
 	n := New()
@@ -136,8 +129,6 @@ func TestShutdownBeforeUnsubscribe(t *testing.T) {
 }
 
 func TestSubscribeIsANoopWhenCalledWithNoKeys(t *testing.T) {
-	test.Flaky(t)
-
 	n := New()
 	defer n.Shutdown()
 	ch := n.Subscribe(context.Background()) // no keys provided
@@ -147,8 +138,6 @@ func TestSubscribeIsANoopWhenCalledWithNoKeys(t *testing.T) {
 }
 
 func TestCarryOnWhenDeadlineExpires(t *testing.T) {
-	test.Flaky(t)
-
 	impossibleDeadline := time.Nanosecond
 	fastExpiringCtx, cancel := context.WithTimeout(context.Background(), impossibleDeadline)
 	defer cancel()
@@ -162,7 +151,6 @@ func TestCarryOnWhenDeadlineExpires(t *testing.T) {
 }
 
 func TestDoesNotDeadLockIfContextCancelledBeforePublish(t *testing.T) {
-	test.Flaky(t)
 	var zero peer.ID // this test doesn't check the peer id
 
 	g := blocksutil.NewBlockGenerator()
diff --git a/bitswap/client/internal/peermanager/peermanager_test.go b/bitswap/client/internal/peermanager/peermanager_test.go
index 40e1f072c..7c0e39f19 100644
--- a/bitswap/client/internal/peermanager/peermanager_test.go
+++ b/bitswap/client/internal/peermanager/peermanager_test.go
@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
-	"github.com/ipfs/boxo/internal/test"
 	cid "github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/core/peer"
 )
@@ -77,8 +76,6 @@ func makePeerQueueFactory(msgs chan msg) PeerQueueFactory {
 }
 
 func TestAddingAndRemovingPeers(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	msgs := make(chan msg, 16)
 	peerQueueFactory := makePeerQueueFactory(msgs)
@@ -122,8 +119,6 @@ func TestAddingAndRemovingPeers(t *testing.T) {
 }
 
 func TestBroadcastOnConnect(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 	msgs := make(chan msg, 16)
@@ -145,8 +140,6 @@ func TestBroadcastOnConnect(t *testing.T) {
 }
 
 func TestBroadcastWantHaves(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 	msgs := make(chan msg, 16)
@@ -188,8 +181,6 @@ func TestBroadcastWantHaves(t *testing.T) {
 }
 
 func TestSendWants(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 	msgs := make(chan msg, 16)
@@ -224,8 +215,6 @@ func TestSendWants(t *testing.T) {
 }
 
 func TestSendCancels(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 	msgs := make(chan msg, 16)
@@ -285,8 +274,6 @@ func newSess(id uint64) *sess {
 }
 
 func TestSessionRegistration(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 	msgs := make(chan msg, 16)
diff --git a/bitswap/client/internal/peermanager/peerwantmanager_test.go b/bitswap/client/internal/peermanager/peerwantmanager_test.go
index 618217d6b..733ac956e 100644
--- a/bitswap/client/internal/peermanager/peerwantmanager_test.go
+++ b/bitswap/client/internal/peermanager/peerwantmanager_test.go
@@ -4,7 +4,6 @@ import (
 	"testing"
 
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
-	"github.com/ipfs/boxo/internal/test"
 	cid "github.com/ipfs/go-cid"
 	peer "github.com/libp2p/go-libp2p/core/peer"
 )
@@ -57,8 +56,6 @@ func clearSent(pqs map[peer.ID]PeerQueue) {
 }
 
 func TestEmpty(t *testing.T) {
-	test.Flaky(t)
-
 	pwm := newPeerWantManager(&gauge{}, &gauge{})
 
 	if len(pwm.getWantBlocks()) > 0 {
@@ -70,8 +67,6 @@ func TestEmpty(t *testing.T) {
 }
 
 func TestPWMBroadcastWantHaves(t *testing.T) {
-	test.Flaky(t)
-
 	pwm := newPeerWantManager(&gauge{}, &gauge{})
 
 	peers := testutil.GeneratePeers(3)
@@ -184,8 +179,6 @@ func TestPWMBroadcastWantHaves(t *testing.T) {
 }
 
 func TestPWMSendWants(t *testing.T) {
-	test.Flaky(t)
-
 	pwm := newPeerWantManager(&gauge{}, &gauge{})
 
 	peers := testutil.GeneratePeers(2)
@@ -266,8 +259,6 @@ func TestPWMSendWants(t *testing.T) {
 }
 
 func TestPWMSendCancels(t *testing.T) {
-	test.Flaky(t)
-
 	pwm := newPeerWantManager(&gauge{}, &gauge{})
 
 	peers := testutil.GeneratePeers(2)
@@ -346,8 +337,6 @@ func TestPWMSendCancels(t *testing.T) {
 }
 
 func TestStats(t *testing.T) {
-	test.Flaky(t)
-
 	g := &gauge{}
 	wbg := &gauge{}
 	pwm := newPeerWantManager(g, wbg)
@@ -449,8 +438,6 @@ func TestStats(t *testing.T) {
 }
 
 func TestStatsOverlappingWantBlockWantHave(t *testing.T) {
-	test.Flaky(t)
-
 	g := &gauge{}
 	wbg := &gauge{}
 	pwm := newPeerWantManager(g, wbg)
@@ -490,8 +477,6 @@ func TestStatsOverlappingWantBlockWantHave(t *testing.T) {
 }
 
 func TestStatsRemovePeerOverlappingWantBlockWantHave(t *testing.T) {
-	test.Flaky(t)
-
 	g := &gauge{}
 	wbg := &gauge{}
 	pwm := newPeerWantManager(g, wbg)
diff --git a/bitswap/client/internal/providerquerymanager/providerquerymanager_test.go b/bitswap/client/internal/providerquerymanager/providerquerymanager_test.go
index 6cf5fa4a2..d533f2143 100644
--- a/bitswap/client/internal/providerquerymanager/providerquerymanager_test.go
+++ b/bitswap/client/internal/providerquerymanager/providerquerymanager_test.go
@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
-	"github.com/ipfs/boxo/internal/test"
 	cid "github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/core/peer"
 )
@@ -59,8 +58,6 @@ func (fpn *fakeProviderNetwork) FindProvidersAsync(ctx context.Context, k cid.Ci
 }
 
 func TestNormalSimultaneousFetch(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(10)
 	fpn := &fakeProviderNetwork{
 		peersFound: peers,
@@ -99,8 +96,6 @@ func TestNormalSimultaneousFetch(t *testing.T) {
 }
 
 func TestDedupingProviderRequests(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(10)
 	fpn := &fakeProviderNetwork{
 		peersFound: peers,
@@ -141,8 +136,6 @@ func TestDedupingProviderRequests(t *testing.T) {
 }
 
 func TestCancelOneRequestDoesNotTerminateAnother(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(10)
 	fpn := &fakeProviderNetwork{
 		peersFound: peers,
@@ -187,8 +180,6 @@ func TestCancelOneRequestDoesNotTerminateAnother(t *testing.T) {
 }
 
 func TestCancelManagerExitsGracefully(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(10)
 	fpn := &fakeProviderNetwork{
 		peersFound: peers,
@@ -224,8 +215,6 @@ func TestCancelManagerExitsGracefully(t *testing.T) {
 }
 
 func TestPeersWithConnectionErrorsNotAddedToPeerList(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(10)
 	fpn := &fakeProviderNetwork{
 		peersFound:   peers,
@@ -260,8 +249,6 @@ func TestPeersWithConnectionErrorsNotAddedToPeerList(t *testing.T) {
 }
 
 func TestRateLimitingRequests(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(10)
 	fpn := &fakeProviderNetwork{
 		peersFound: peers,
@@ -301,8 +288,6 @@ func TestRateLimitingRequests(t *testing.T) {
 }
 
 func TestFindProviderTimeout(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(10)
 	fpn := &fakeProviderNetwork{
 		peersFound: peers,
@@ -327,8 +312,6 @@ func TestFindProviderTimeout(t *testing.T) {
 }
 
 func TestFindProviderPreCanceled(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(10)
 	fpn := &fakeProviderNetwork{
 		peersFound: peers,
@@ -354,8 +337,6 @@ func TestFindProviderPreCanceled(t *testing.T) {
 }
 
 func TestCancelFindProvidersAfterCompletion(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(2)
 	fpn := &fakeProviderNetwork{
 		peersFound: peers,
diff --git a/bitswap/client/internal/session/session_test.go b/bitswap/client/internal/session/session_test.go
index b60c7d1af..faf86a56a 100644
--- a/bitswap/client/internal/session/session_test.go
+++ b/bitswap/client/internal/session/session_test.go
@@ -12,7 +12,6 @@ import (
 	bssim "github.com/ipfs/boxo/bitswap/client/internal/sessioninterestmanager"
 	bsspm "github.com/ipfs/boxo/bitswap/client/internal/sessionpeermanager"
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
-	"github.com/ipfs/boxo/internal/test"
 	cid "github.com/ipfs/go-cid"
 	blocksutil "github.com/ipfs/go-ipfs-blocksutil"
 	delay "github.com/ipfs/go-ipfs-delay"
@@ -149,8 +148,6 @@ func (pm *fakePeerManager) BroadcastWantHaves(ctx context.Context, cids []cid.Ci
 func (pm *fakePeerManager) SendCancels(ctx context.Context, cancels []cid.Cid) {}
 
 func TestSessionGetBlocks(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
 	fpm := newFakePeerManager()
 	fspm := newFakeSessionPeerManager()
@@ -246,8 +243,6 @@ func TestSessionGetBlocks(t *testing.T) {
 }
 
 func TestSessionFindMorePeers(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), 900*time.Millisecond)
 	defer cancel()
 	fpm := newFakePeerManager()
@@ -322,8 +317,6 @@ func TestSessionFindMorePeers(t *testing.T) {
 }
 
 func TestSessionOnPeersExhausted(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond)
 	defer cancel()
 	fpm := newFakePeerManager()
@@ -370,8 +363,6 @@ func TestSessionOnPeersExhausted(t *testing.T) {
 }
 
 func TestSessionFailingToGetFirstBlock(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 	defer cancel()
 	fpm := newFakePeerManager()
@@ -487,8 +478,6 @@ func TestSessionFailingToGetFirstBlock(t *testing.T) {
 }
 
 func TestSessionCtxCancelClosesGetBlocksChannel(t *testing.T) {
-	test.Flaky(t)
-
 	fpm := newFakePeerManager()
 	fspm := newFakeSessionPeerManager()
 	fpf := newFakeProviderFinder()
@@ -539,8 +528,6 @@ func TestSessionCtxCancelClosesGetBlocksChannel(t *testing.T) {
 }
 
 func TestSessionOnShutdownCalled(t *testing.T) {
-	test.Flaky(t)
-
 	fpm := newFakePeerManager()
 	fspm := newFakeSessionPeerManager()
 	fpf := newFakeProviderFinder()
@@ -568,8 +555,6 @@ func TestSessionOnShutdownCalled(t *testing.T) {
 }
 
 func TestSessionReceiveMessageAfterCtxCancel(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancelCtx := context.WithTimeout(context.Background(), 20*time.Millisecond)
 	fpm := newFakePeerManager()
 	fspm := newFakeSessionPeerManager()
diff --git a/bitswap/client/internal/session/sessionwants_test.go b/bitswap/client/internal/session/sessionwants_test.go
index bdb73ebd1..f940ac14f 100644
--- a/bitswap/client/internal/session/sessionwants_test.go
+++ b/bitswap/client/internal/session/sessionwants_test.go
@@ -4,13 +4,10 @@ import (
 	"testing"
 
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
-	"github.com/ipfs/boxo/internal/test"
 	cid "github.com/ipfs/go-cid"
 )
 
 func TestEmptySessionWants(t *testing.T) {
-	test.Flaky(t)
-
 	sw := newSessionWants(broadcastLiveWantsLimit)
 
 	// Expect these functions to return nothing on a new sessionWants
@@ -32,8 +29,6 @@ func TestEmptySessionWants(t *testing.T) {
 }
 
 func TestSessionWants(t *testing.T) {
-	test.Flaky(t)
-
 	sw := newSessionWants(5)
 	cids := testutil.GenerateCids(10)
 	others := testutil.GenerateCids(1)
@@ -115,8 +110,6 @@ func TestSessionWants(t *testing.T) {
 }
 
 func TestPrepareBroadcast(t *testing.T) {
-	test.Flaky(t)
-
 	sw := newSessionWants(3)
 	cids := testutil.GenerateCids(10)
 
@@ -177,8 +170,6 @@ func TestPrepareBroadcast(t *testing.T) {
 
 // Test that even after GC broadcast returns correct wants
 func TestPrepareBroadcastAfterGC(t *testing.T) {
-	test.Flaky(t)
-
 	sw := newSessionWants(5)
 	cids := testutil.GenerateCids(liveWantsOrderGCLimit * 2)
 
diff --git a/bitswap/client/internal/session/sessionwantsender_test.go b/bitswap/client/internal/session/sessionwantsender_test.go
index 97ff788a9..ec8dc93ec 100644
--- a/bitswap/client/internal/session/sessionwantsender_test.go
+++ b/bitswap/client/internal/session/sessionwantsender_test.go
@@ -10,7 +10,6 @@ import (
 	bspm "github.com/ipfs/boxo/bitswap/client/internal/peermanager"
 	bsspm "github.com/ipfs/boxo/bitswap/client/internal/sessionpeermanager"
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
-	"github.com/ipfs/boxo/internal/test"
 	cid "github.com/ipfs/go-cid"
 	peer "github.com/libp2p/go-libp2p/core/peer"
 )
@@ -141,8 +140,6 @@ func (ep *exhaustedPeers) exhausted() []cid.Cid {
 }
 
 func TestSendWants(t *testing.T) {
-	test.Flaky(t)
-
 	cids := testutil.GenerateCids(4)
 	peers := testutil.GeneratePeers(1)
 	peerA := peers[0]
@@ -182,8 +179,6 @@ func TestSendWants(t *testing.T) {
 }
 
 func TestSendsWantBlockToOnePeerOnly(t *testing.T) {
-	test.Flaky(t)
-
 	cids := testutil.GenerateCids(4)
 	peers := testutil.GeneratePeers(2)
 	peerA := peers[0]
@@ -244,8 +239,6 @@ func TestSendsWantBlockToOnePeerOnly(t *testing.T) {
 }
 
 func TestReceiveBlock(t *testing.T) {
-	test.Flaky(t)
-
 	cids := testutil.GenerateCids(2)
 	peers := testutil.GeneratePeers(2)
 	peerA := peers[0]
@@ -308,8 +301,6 @@ func TestReceiveBlock(t *testing.T) {
 }
 
 func TestCancelWants(t *testing.T) {
-	test.Flaky(t)
-
 	cids := testutil.GenerateCids(4)
 	sid := uint64(1)
 	pm := newMockPeerManager()
@@ -344,8 +335,6 @@ func TestCancelWants(t *testing.T) {
 }
 
 func TestRegisterSessionWithPeerManager(t *testing.T) {
-	test.Flaky(t)
-
 	cids := testutil.GenerateCids(2)
 	peers := testutil.GeneratePeers(2)
 	peerA := peers[0]
@@ -386,8 +375,6 @@ func TestRegisterSessionWithPeerManager(t *testing.T) {
 }
 
 func TestProtectConnFirstPeerToSendWantedBlock(t *testing.T) {
-	test.Flaky(t)
-
 	cids := testutil.GenerateCids(2)
 	peers := testutil.GeneratePeers(3)
 	peerA := peers[0]
@@ -444,8 +431,6 @@ func TestProtectConnFirstPeerToSendWantedBlock(t *testing.T) {
 }
 
 func TestPeerUnavailable(t *testing.T) {
-	test.Flaky(t)
-
 	cids := testutil.GenerateCids(2)
 	peers := testutil.GeneratePeers(2)
 	peerA := peers[0]
@@ -513,8 +498,6 @@ func TestPeerUnavailable(t *testing.T) {
 }
 
 func TestPeersExhausted(t *testing.T) {
-	test.Flaky(t)
-
 	cids := testutil.GenerateCids(3)
 	peers := testutil.GeneratePeers(2)
 	peerA := peers[0]
@@ -592,8 +575,6 @@ func TestPeersExhausted(t *testing.T) {
 // - the remaining peer becomes unavailable
 // onPeersExhausted should be sent for that CID
 func TestPeersExhaustedLastWaitingPeerUnavailable(t *testing.T) {
-	test.Flaky(t)
-
 	cids := testutil.GenerateCids(2)
 	peers := testutil.GeneratePeers(2)
 	peerA := peers[0]
@@ -643,8 +624,6 @@ func TestPeersExhaustedLastWaitingPeerUnavailable(t *testing.T) {
 // Tests that when all the peers are removed from the session
 // onPeersExhausted should be called with all outstanding CIDs
 func TestPeersExhaustedAllPeersUnavailable(t *testing.T) {
-	test.Flaky(t)
-
 	cids := testutil.GenerateCids(3)
 	peers := testutil.GeneratePeers(2)
 	peerA := peers[0]
@@ -687,8 +666,6 @@ func TestPeersExhaustedAllPeersUnavailable(t *testing.T) {
 }
 
 func TestConsecutiveDontHaveLimit(t *testing.T) {
-	test.Flaky(t)
-
 	cids := testutil.GenerateCids(peerDontHaveLimit + 10)
 	p := testutil.GeneratePeers(1)[0]
 	sid := uint64(1)
@@ -747,8 +724,6 @@ func TestConsecutiveDontHaveLimit(t *testing.T) {
 }
 
 func TestConsecutiveDontHaveLimitInterrupted(t *testing.T) {
-	test.Flaky(t)
-
 	cids := testutil.GenerateCids(peerDontHaveLimit + 10)
 	p := testutil.GeneratePeers(1)[0]
 	sid := uint64(1)
@@ -806,8 +781,6 @@ func TestConsecutiveDontHaveLimitInterrupted(t *testing.T) {
 }
 
 func TestConsecutiveDontHaveReinstateAfterRemoval(t *testing.T) {
-	test.Flaky(t)
-
 	cids := testutil.GenerateCids(peerDontHaveLimit + 10)
 	p := testutil.GeneratePeers(1)[0]
 	sid := uint64(1)
@@ -894,8 +867,6 @@ func TestConsecutiveDontHaveReinstateAfterRemoval(t *testing.T) {
 }
 
 func TestConsecutiveDontHaveDontRemoveIfHasWantedBlock(t *testing.T) {
-	test.Flaky(t)
-
 	cids := testutil.GenerateCids(peerDontHaveLimit + 10)
 	p := testutil.GeneratePeers(1)[0]
 	sid := uint64(1)
diff --git a/bitswap/client/internal/sessioninterestmanager/sessioninterestmanager_test.go b/bitswap/client/internal/sessioninterestmanager/sessioninterestmanager_test.go
index 85857b9ba..f2b4d8aa0 100644
--- a/bitswap/client/internal/sessioninterestmanager/sessioninterestmanager_test.go
+++ b/bitswap/client/internal/sessioninterestmanager/sessioninterestmanager_test.go
@@ -4,13 +4,10 @@ import (
 	"testing"
 
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
-	"github.com/ipfs/boxo/internal/test"
 	cid "github.com/ipfs/go-cid"
 )
 
 func TestEmpty(t *testing.T) {
-	test.Flaky(t)
-
 	sim := New()
 
 	ses := uint64(1)
@@ -25,8 +22,6 @@ func TestEmpty(t *testing.T) {
 }
 
 func TestBasic(t *testing.T) {
-	test.Flaky(t)
-
 	sim := New()
 
 	ses1 := uint64(1)
@@ -62,8 +57,6 @@ func TestBasic(t *testing.T) {
 }
 
 func TestInterestedSessions(t *testing.T) {
-	test.Flaky(t)
-
 	sim := New()
 
 	ses := uint64(1)
@@ -91,8 +84,6 @@ func TestInterestedSessions(t *testing.T) {
 }
 
 func TestRemoveSession(t *testing.T) {
-	test.Flaky(t)
-
 	sim := New()
 
 	ses1 := uint64(1)
@@ -121,8 +112,6 @@ func TestRemoveSession(t *testing.T) {
 }
 
 func TestRemoveSessionInterested(t *testing.T) {
-	test.Flaky(t)
-
 	sim := New()
 
 	ses1 := uint64(1)
@@ -159,8 +148,6 @@ func TestRemoveSessionInterested(t *testing.T) {
 }
 
 func TestSplitWantedUnwanted(t *testing.T) {
-	test.Flaky(t)
-
 	blks := testutil.GenerateBlocksOfSize(3, 1024)
 	sim := New()
 	ses1 := uint64(1)
diff --git a/bitswap/client/internal/sessionmanager/sessionmanager_test.go b/bitswap/client/internal/sessionmanager/sessionmanager_test.go
index 51dde7fda..19a57dac6 100644
--- a/bitswap/client/internal/sessionmanager/sessionmanager_test.go
+++ b/bitswap/client/internal/sessionmanager/sessionmanager_test.go
@@ -13,7 +13,6 @@ import (
 	bssession "github.com/ipfs/boxo/bitswap/client/internal/session"
 	bssim "github.com/ipfs/boxo/bitswap/client/internal/sessioninterestmanager"
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
-	"github.com/ipfs/boxo/internal/test"
 	blocks "github.com/ipfs/go-block-format"
 	cid "github.com/ipfs/go-cid"
 	delay "github.com/ipfs/go-ipfs-delay"
@@ -108,8 +107,6 @@ func peerManagerFactory(ctx context.Context, id uint64) bssession.SessionPeerMan
 }
 
 func TestReceiveFrom(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
@@ -157,8 +154,6 @@ func TestReceiveFrom(t *testing.T) {
 }
 
 func TestReceiveBlocksWhenManagerShutdown(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
@@ -194,8 +189,6 @@ func TestReceiveBlocksWhenManagerShutdown(t *testing.T) {
 }
 
 func TestReceiveBlocksWhenSessionContextCancelled(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	notif := notifications.New()
@@ -231,8 +224,6 @@ func TestReceiveBlocksWhenSessionContextCancelled(t *testing.T) {
 }
 
 func TestShutdown(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
diff --git a/bitswap/client/internal/sessionpeermanager/sessionpeermanager_test.go b/bitswap/client/internal/sessionpeermanager/sessionpeermanager_test.go
index fc1d7274d..0d9275579 100644
--- a/bitswap/client/internal/sessionpeermanager/sessionpeermanager_test.go
+++ b/bitswap/client/internal/sessionpeermanager/sessionpeermanager_test.go
@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
-	"github.com/ipfs/boxo/internal/test"
 	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
@@ -79,8 +78,6 @@ func (fpt *fakePeerTagger) isProtected(p peer.ID) bool {
 }
 
 func TestAddPeers(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(2)
 	spm := New(1, &fakePeerTagger{})
 
@@ -101,8 +98,6 @@ func TestAddPeers(t *testing.T) {
 }
 
 func TestRemovePeers(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(2)
 	spm := New(1, &fakePeerTagger{})
 
@@ -129,8 +124,6 @@ func TestRemovePeers(t *testing.T) {
 }
 
 func TestHasPeers(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(2)
 	spm := New(1, &fakePeerTagger{})
 
@@ -160,8 +153,6 @@ func TestHasPeers(t *testing.T) {
 }
 
 func TestHasPeer(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(2)
 	spm := New(1, &fakePeerTagger{})
 
@@ -190,8 +181,6 @@ func TestHasPeer(t *testing.T) {
 }
 
 func TestPeers(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(2)
 	spm := New(1, &fakePeerTagger{})
 
@@ -216,8 +205,6 @@ func TestPeers(t *testing.T) {
 }
 
 func TestPeersDiscovered(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(2)
 	spm := New(1, &fakePeerTagger{})
 
@@ -237,8 +224,6 @@ func TestPeersDiscovered(t *testing.T) {
 }
 
 func TestPeerTagging(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(2)
 	fpt := &fakePeerTagger{}
 	spm := New(1, fpt)
@@ -265,8 +250,6 @@ func TestPeerTagging(t *testing.T) {
 }
 
 func TestProtectConnection(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(1)
 	peerA := peers[0]
 	fpt := newFakePeerTagger()
@@ -293,8 +276,6 @@ func TestProtectConnection(t *testing.T) {
 }
 
 func TestShutdown(t *testing.T) {
-	test.Flaky(t)
-
 	peers := testutil.GeneratePeers(2)
 	fpt := newFakePeerTagger()
 	spm := New(1, fpt)
diff --git a/bitswap/client/wantlist/wantlist_test.go b/bitswap/client/wantlist/wantlist_test.go
index 829af50a6..309ae46bf 100644
--- a/bitswap/client/wantlist/wantlist_test.go
+++ b/bitswap/client/wantlist/wantlist_test.go
@@ -4,7 +4,6 @@ import (
 	"testing"
 
 	pb "github.com/ipfs/boxo/bitswap/message/pb"
-	"github.com/ipfs/boxo/internal/test"
 	cid "github.com/ipfs/go-cid"
 	"github.com/stretchr/testify/require"
 )
@@ -42,8 +41,6 @@ func assertHasCid(t *testing.T, w wli, c cid.Cid) {
 }
 
 func TestBasicWantlist(t *testing.T) {
-	test.Flaky(t)
-
 	wl := New()
 
 	if !wl.Add(testcids[0], 5, pb.Message_Wantlist_Block) {
@@ -81,8 +78,6 @@ func TestBasicWantlist(t *testing.T) {
 }
 
 func TestAddHaveThenBlock(t *testing.T) {
-	test.Flaky(t)
-
 	wl := New()
 
 	wl.Add(testcids[0], 5, pb.Message_Wantlist_Have)
@@ -98,8 +93,6 @@ func TestAddHaveThenBlock(t *testing.T) {
 }
 
 func TestAddBlockThenHave(t *testing.T) {
-	test.Flaky(t)
-
 	wl := New()
 
 	wl.Add(testcids[0], 5, pb.Message_Wantlist_Block)
@@ -115,8 +108,6 @@ func TestAddBlockThenHave(t *testing.T) {
 }
 
 func TestAddHaveThenRemoveBlock(t *testing.T) {
-	test.Flaky(t)
-
 	wl := New()
 
 	wl.Add(testcids[0], 5, pb.Message_Wantlist_Have)
@@ -129,8 +120,6 @@ func TestAddHaveThenRemoveBlock(t *testing.T) {
 }
 
 func TestAddBlockThenRemoveHave(t *testing.T) {
-	test.Flaky(t)
-
 	wl := New()
 
 	wl.Add(testcids[0], 5, pb.Message_Wantlist_Block)
@@ -146,8 +135,6 @@ func TestAddBlockThenRemoveHave(t *testing.T) {
 }
 
 func TestAddHaveThenRemoveAny(t *testing.T) {
-	test.Flaky(t)
-
 	wl := New()
 
 	wl.Add(testcids[0], 5, pb.Message_Wantlist_Have)
@@ -160,8 +147,6 @@ func TestAddHaveThenRemoveAny(t *testing.T) {
 }
 
 func TestAddBlockThenRemoveAny(t *testing.T) {
-	test.Flaky(t)
-
 	wl := New()
 
 	wl.Add(testcids[0], 5, pb.Message_Wantlist_Block)
@@ -174,8 +159,6 @@ func TestAddBlockThenRemoveAny(t *testing.T) {
 }
 
 func TestAbsort(t *testing.T) {
-	test.Flaky(t)
-
 	wl := New()
 	wl.Add(testcids[0], 5, pb.Message_Wantlist_Block)
 	wl.Add(testcids[1], 4, pb.Message_Wantlist_Have)
@@ -222,8 +205,6 @@ func TestAbsort(t *testing.T) {
 }
 
 func TestSortEntries(t *testing.T) {
-	test.Flaky(t)
-
 	wl := New()
 
 	wl.Add(testcids[0], 3, pb.Message_Wantlist_Block)
@@ -241,8 +222,6 @@ func TestSortEntries(t *testing.T) {
 
 // Test adding and removing interleaved with checking entries to make sure we clear the cache.
 func TestCache(t *testing.T) {
-	test.Flaky(t)
-
 	wl := New()
 
 	wl.Add(testcids[0], 3, pb.Message_Wantlist_Block)
diff --git a/bitswap/network/connecteventmanager_test.go b/bitswap/network/connecteventmanager_test.go
index e3904ee55..bb3c52266 100644
--- a/bitswap/network/connecteventmanager_test.go
+++ b/bitswap/network/connecteventmanager_test.go
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
-	"github.com/ipfs/boxo/internal/test"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/require"
 )
@@ -46,8 +45,6 @@ func wait(t *testing.T, c *connectEventManager) {
 }
 
 func TestConnectEventManagerConnectDisconnect(t *testing.T) {
-	test.Flaky(t)
-
 	connListener := newMockConnListener()
 	peers := testutil.GeneratePeers(2)
 	cem := newConnectEventManager(connListener)
@@ -87,8 +84,6 @@ func TestConnectEventManagerConnectDisconnect(t *testing.T) {
 }
 
 func TestConnectEventManagerMarkUnresponsive(t *testing.T) {
-	test.Flaky(t)
-
 	connListener := newMockConnListener()
 	p := testutil.GeneratePeers(1)[0]
 	cem := newConnectEventManager(connListener)
@@ -138,8 +133,6 @@ func TestConnectEventManagerMarkUnresponsive(t *testing.T) {
 }
 
 func TestConnectEventManagerDisconnectAfterMarkUnresponsive(t *testing.T) {
-	test.Flaky(t)
-
 	connListener := newMockConnListener()
 	p := testutil.GeneratePeers(1)[0]
 	cem := newConnectEventManager(connListener)
diff --git a/bitswap/network/ipfs_impl_test.go b/bitswap/network/ipfs_impl_test.go
index 61b00baa3..c1d13808e 100644
--- a/bitswap/network/ipfs_impl_test.go
+++ b/bitswap/network/ipfs_impl_test.go
@@ -12,7 +12,6 @@ import (
 	bsnet "github.com/ipfs/boxo/bitswap/network"
 	"github.com/ipfs/boxo/bitswap/network/internal"
 	tn "github.com/ipfs/boxo/bitswap/testnet"
-	"github.com/ipfs/boxo/internal/test"
 	mockrouting "github.com/ipfs/boxo/routing/mock"
 	ds "github.com/ipfs/go-datastore"
 	blocksutil "github.com/ipfs/go-ipfs-blocksutil"
@@ -163,8 +162,6 @@ func (eh *ErrHost) setTimeoutState(timingOut bool) {
 }
 
 func TestMessageSendAndReceive(t *testing.T) {
-	test.Flaky(t)
-
 	// create network
 	ctx := context.Background()
 	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
@@ -333,8 +330,6 @@ func prepareNetwork(t *testing.T, ctx context.Context, p1 tnet.Identity, r1 *rec
 }
 
 func TestMessageResendAfterError(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 
@@ -381,8 +376,6 @@ func TestMessageResendAfterError(t *testing.T) {
 }
 
 func TestMessageSendTimeout(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 
@@ -424,8 +417,6 @@ func TestMessageSendTimeout(t *testing.T) {
 }
 
 func TestMessageSendNotSupportedResponse(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 
@@ -458,8 +449,6 @@ func TestMessageSendNotSupportedResponse(t *testing.T) {
 }
 
 func TestSupportsHave(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	mn := mocknet.New()
 	defer mn.Close()
@@ -674,8 +663,6 @@ func testNetworkCounters(t *testing.T, n1 int, n2 int) {
 }
 
 func TestNetworkCounters(t *testing.T) {
-	test.Flaky(t)
-
 	for n := 0; n < 11; n++ {
 		testNetworkCounters(t, 10-n, n)
 	}
diff --git a/bitswap/network/ipfs_impl_timeout_test.go b/bitswap/network/ipfs_impl_timeout_test.go
index 178c2fb69..fdbe8e950 100644
--- a/bitswap/network/ipfs_impl_timeout_test.go
+++ b/bitswap/network/ipfs_impl_timeout_test.go
@@ -4,13 +4,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ipfs/boxo/internal/test"
 	"github.com/stretchr/testify/require"
 )
 
 func TestSendTimeout(t *testing.T) {
-	test.Flaky(t)
-
 	require.Equal(t, minSendTimeout, sendTimeout(0))
 	require.Equal(t, maxSendTimeout, sendTimeout(1<<30))
 
diff --git a/bitswap/server/internal/decision/blockstoremanager_test.go b/bitswap/server/internal/decision/blockstoremanager_test.go
index 3d4a8ea37..1192873f3 100644
--- a/bitswap/server/internal/decision/blockstoremanager_test.go
+++ b/bitswap/server/internal/decision/blockstoremanager_test.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
 	blockstore "github.com/ipfs/boxo/blockstore"
-	"github.com/ipfs/boxo/internal/test"
 	blocks "github.com/ipfs/go-block-format"
 	cid "github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
@@ -34,8 +33,6 @@ func newBlockstoreManagerForTesting(
 }
 
 func TestBlockstoreManagerNotFoundKey(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	bsdelay := delay.Fixed(3 * time.Millisecond)
 	dstore := ds_sync.MutexWrap(delayed.New(ds.NewMapDatastore(), bsdelay))
@@ -74,8 +71,6 @@ func TestBlockstoreManagerNotFoundKey(t *testing.T) {
 }
 
 func TestBlockstoreManager(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	bsdelay := delay.Fixed(3 * time.Millisecond)
 	dstore := ds_sync.MutexWrap(delayed.New(ds.NewMapDatastore(), bsdelay))
@@ -158,8 +153,6 @@ func TestBlockstoreManager(t *testing.T) {
 }
 
 func TestBlockstoreManagerConcurrency(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	bsdelay := delay.Fixed(3 * time.Millisecond)
 	dstore := ds_sync.MutexWrap(delayed.New(ds.NewMapDatastore(), bsdelay))
@@ -201,8 +194,6 @@ func TestBlockstoreManagerConcurrency(t *testing.T) {
 }
 
 func TestBlockstoreManagerClose(t *testing.T) {
-	test.Flaky(t)
-
 	ctx := context.Background()
 	delayTime := 20 * time.Millisecond
 	bsdelay := delay.Fixed(delayTime)
@@ -224,8 +215,6 @@ func TestBlockstoreManagerClose(t *testing.T) {
 
 	bsm.stop()
 
-	time.Sleep(5 * time.Millisecond)
-
 	before := time.Now()
 	_, err = bsm.getBlockSizes(ctx, ks)
 	if err == nil {
@@ -238,8 +227,6 @@ func TestBlockstoreManagerClose(t *testing.T) {
 }
 
 func TestBlockstoreManagerCtxDone(t *testing.T) {
-	test.Flaky(t)
-
 	delayTime := 20 * time.Millisecond
 	bsdelay := delay.Fixed(delayTime)
 
diff --git a/bitswap/server/internal/decision/engine_test.go b/bitswap/server/internal/decision/engine_test.go
index 9b4dbc2de..4491e8112 100644
--- a/bitswap/server/internal/decision/engine_test.go
+++ b/bitswap/server/internal/decision/engine_test.go
@@ -17,7 +17,6 @@ import (
 	message "github.com/ipfs/boxo/bitswap/message"
 	pb "github.com/ipfs/boxo/bitswap/message/pb"
 	blockstore "github.com/ipfs/boxo/blockstore"
-	"github.com/ipfs/boxo/internal/test"
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
@@ -113,8 +112,6 @@ func newTestEngineWithSampling(ctx context.Context, idStr string, peerSampleInte
 }
 
 func TestConsistentAccounting(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	sender := newTestEngine(ctx, "Ernie")
@@ -150,8 +147,6 @@ func TestConsistentAccounting(t *testing.T) {
 }
 
 func TestPeerIsAddedToPeersWhenMessageSent(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	sanfrancisco := newTestEngine(ctx, "sf")
@@ -206,8 +201,6 @@ func newEngineForTesting(
 }
 
 func TestOutboxClosedWhenEngineClosed(t *testing.T) {
-	test.Flaky(t)
-
 	t.SkipNow() // TODO implement *Engine.Close
 	ctx := context.Background()
 	e := newEngineForTesting(ctx, blockstore.NewBlockstore(dssync.MutexWrap(ds.NewMapDatastore())), &fakePeerTagger{}, "localhost", 0, WithScoreLedger(NewTestScoreLedger(shortTerm, nil, clock.New())), WithBlockstoreWorkerCount(4))
@@ -228,8 +221,6 @@ func TestOutboxClosedWhenEngineClosed(t *testing.T) {
 }
 
 func TestPartnerWantHaveWantBlockNonActive(t *testing.T) {
-	test.Flaky(t)
-
 	alphabet := "abcdefghijklmnopqrstuvwxyz"
 	vowels := "aeiou"
 
@@ -570,8 +561,6 @@ func TestPartnerWantHaveWantBlockNonActive(t *testing.T) {
 }
 
 func TestPartnerWantHaveWantBlockActive(t *testing.T) {
-	test.Flaky(t)
-
 	alphabet := "abcdefghijklmnopqrstuvwxyz"
 
 	bs := blockstore.NewBlockstore(dssync.MutexWrap(ds.NewMapDatastore()))
@@ -844,8 +833,6 @@ func formatPresencesDiff(presences []message.BlockPresence, expHaves []string, e
 }
 
 func TestPartnerWantsThenCancels(t *testing.T) {
-	test.Flaky(t)
-
 	numRounds := 10
 	if testing.Short() {
 		numRounds = 1
@@ -908,8 +895,6 @@ func TestPartnerWantsThenCancels(t *testing.T) {
 }
 
 func TestSendReceivedBlocksToPeersThatWantThem(t *testing.T) {
-	test.Flaky(t)
-
 	bs := blockstore.NewBlockstore(dssync.MutexWrap(ds.NewMapDatastore()))
 	partner := libp2ptest.RandPeerIDFatal(t)
 	otherPeer := libp2ptest.RandPeerIDFatal(t)
@@ -956,8 +941,6 @@ func TestSendReceivedBlocksToPeersThatWantThem(t *testing.T) {
 }
 
 func TestSendDontHave(t *testing.T) {
-	test.Flaky(t)
-
 	bs := blockstore.NewBlockstore(dssync.MutexWrap(ds.NewMapDatastore()))
 	partner := libp2ptest.RandPeerIDFatal(t)
 	otherPeer := libp2ptest.RandPeerIDFatal(t)
@@ -1024,8 +1007,6 @@ func TestSendDontHave(t *testing.T) {
 }
 
 func TestWantlistForPeer(t *testing.T) {
-	test.Flaky(t)
-
 	bs := blockstore.NewBlockstore(dssync.MutexWrap(ds.NewMapDatastore()))
 	partner := libp2ptest.RandPeerIDFatal(t)
 	otherPeer := libp2ptest.RandPeerIDFatal(t)
@@ -1063,8 +1044,6 @@ func TestWantlistForPeer(t *testing.T) {
 }
 
 func TestTaskComparator(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
 	defer cancel()
 
@@ -1119,8 +1098,6 @@ func TestTaskComparator(t *testing.T) {
 }
 
 func TestPeerBlockFilter(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
 	defer cancel()
 
@@ -1280,8 +1257,6 @@ func TestPeerBlockFilter(t *testing.T) {
 }
 
 func TestPeerBlockFilterMutability(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
 	defer cancel()
 
@@ -1451,8 +1426,6 @@ func TestPeerBlockFilterMutability(t *testing.T) {
 }
 
 func TestTaggingPeers(t *testing.T) {
-	test.Flaky(t)
-
 	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
 	defer cancel()
 	sanfrancisco := newTestEngine(ctx, "sf")
@@ -1481,8 +1454,6 @@ func TestTaggingPeers(t *testing.T) {
 }
 
 func TestTaggingUseful(t *testing.T) {
-	test.Flaky(t)
-
 	peerSampleIntervalHalf := 10 * time.Millisecond
 
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
diff --git a/bitswap/server/internal/decision/taskmerger_test.go b/bitswap/server/internal/decision/taskmerger_test.go
index e0ce46ed6..ae3b0384d 100644
--- a/bitswap/server/internal/decision/taskmerger_test.go
+++ b/bitswap/server/internal/decision/taskmerger_test.go
@@ -4,14 +4,11 @@ import (
 	"testing"
 
 	"github.com/ipfs/boxo/bitswap/internal/testutil"
-	"github.com/ipfs/boxo/internal/test"
 	"github.com/ipfs/go-peertaskqueue"
 	"github.com/ipfs/go-peertaskqueue/peertask"
 )
 
 func TestPushHaveVsBlock(t *testing.T) {
-	test.Flaky(t)
-
 	partner := testutil.GeneratePeers(1)[0]
 
 	wantHave := peertask.Task{
@@ -64,8 +61,6 @@ func TestPushHaveVsBlock(t *testing.T) {
 }
 
 func TestPushSizeInfo(t *testing.T) {
-	test.Flaky(t)
-
 	partner := testutil.GeneratePeers(1)[0]
 
 	wantBlockBlockSize := 10
@@ -178,8 +173,6 @@ func TestPushSizeInfo(t *testing.T) {
 }
 
 func TestPushHaveVsBlockActive(t *testing.T) {
-	test.Flaky(t)
-
 	partner := testutil.GeneratePeers(1)[0]
 
 	wantBlock := peertask.Task{
@@ -234,8 +227,6 @@ func TestPushHaveVsBlockActive(t *testing.T) {
 }
 
 func TestPushSizeInfoActive(t *testing.T) {
-	test.Flaky(t)
-
 	partner := testutil.GeneratePeers(1)[0]
 
 	wantBlock := peertask.Task{