diff --git a/chain/sync_test.go b/chain/sync_test.go
index d7cf7e555..0bd372fcc 100644
--- a/chain/sync_test.go
+++ b/chain/sync_test.go
@@ -32,6 +32,7 @@ import (
 	"github.com/filecoin-project/lotus/node"
 	"github.com/filecoin-project/lotus/node/impl"
 	"github.com/filecoin-project/lotus/node/modules"
+	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	"github.com/filecoin-project/lotus/node/repo"
 )
 
@@ -46,8 +47,6 @@ func init() {
 	}
 	power.ConsensusMinerMinPower = big.NewInt(2048)
 	verifreg.MinVerifiedDealSize = big.NewInt(256)
-
-	modules.PubsubSubscribeImmediately = true
 }
 
 const source = 0
@@ -233,6 +232,7 @@ func (tu *syncTestUtil) addSourceNode(gen int) {
 		node.Repo(sourceRepo),
 		node.MockHost(tu.mn),
 		node.Test(),
+		node.Override(new(dtypes.Bootstrapper), dtypes.Bootstrapper(true)),
 
 		node.Override(new(modules.Genesis), modules.LoadGenesis(genesis)),
 	)
@@ -265,6 +265,7 @@ func (tu *syncTestUtil) addClientNode() int {
 		node.Repo(repo.NewMemory(nil)),
 		node.MockHost(tu.mn),
 		node.Test(),
+		node.Override(new(dtypes.Bootstrapper), dtypes.Bootstrapper(true)),
 
 		node.Override(new(modules.Genesis), modules.LoadGenesis(tu.genesis)),
 	)
diff --git a/cli/paych_test.go b/cli/paych_test.go
index 279bfb996..9b21d8070 100644
--- a/cli/paych_test.go
+++ b/cli/paych_test.go
@@ -29,7 +29,6 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/node/modules"
 
 	"github.com/filecoin-project/lotus/api/test"
 	"github.com/filecoin-project/lotus/chain/wallet"
@@ -45,8 +44,6 @@ func init() {
 		abi.RegisteredSealProof_StackedDrg2KiBV1: {},
 	}
 	verifreg.MinVerifiedDealSize = big.NewInt(256)
-
-	modules.PubsubSubscribeImmediately = true
 }
 
 // TestPaymentChannels does a basic test to exercise the payment channel CLI
diff --git a/node/node_test.go b/node/node_test.go
index 219795f67..31a14bc20 100644
--- a/node/node_test.go
+++ b/node/node_test.go
@@ -16,7 +16,6 @@ import (
 	logging "github.com/ipfs/go-log/v2"
 
 	"github.com/filecoin-project/lotus/api/test"
-	"github.com/filecoin-project/lotus/node/modules"
 )
 
 func init() {
@@ -27,8 +26,6 @@ func init() {
 		abi.RegisteredSealProof_StackedDrg2KiBV1: {},
 	}
 	verifreg.MinVerifiedDealSize = big.NewInt(256)
-
-	modules.PubsubSubscribeImmediately = true
 }
 
 func TestAPI(t *testing.T) {
diff --git a/node/test/builder.go b/node/test/builder.go
index 64e20e4f2..2f98f65e0 100644
--- a/node/test/builder.go
+++ b/node/test/builder.go
@@ -31,6 +31,7 @@ import (
 	miner2 "github.com/filecoin-project/lotus/miner"
 	"github.com/filecoin-project/lotus/node"
 	"github.com/filecoin-project/lotus/node/modules"
+	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	testing2 "github.com/filecoin-project/lotus/node/modules/testing"
 	"github.com/filecoin-project/lotus/node/repo"
 	"github.com/filecoin-project/lotus/storage/mockstorage"
@@ -370,6 +371,8 @@ func MockSbBuilder(t *testing.T, nFull int, storage []test.StorageMiner) ([]test
 
 			node.Override(new(ffiwrapper.Verifier), mock.MockVerifier),
 
+			node.Override(new(dtypes.Bootstrapper), dtypes.Bootstrapper(true)),
+
 			genesis,
 		)
 		if err != nil {