diff --git a/node/modules/services.go b/node/modules/services.go
index e8e5c648a..22d99fa54 100644
--- a/node/modules/services.go
+++ b/node/modules/services.go
@@ -31,9 +31,6 @@ import (
 	"github.com/filecoin-project/lotus/node/modules/helpers"
 )
 
-// for tests
-var PubsubSubscribeImmediately = false
-
 func RunHello(mctx helpers.MetricsCtx, lc fx.Lifecycle, h host.Host, svc *hello.Service) error {
 	h.SetStreamHandler(hello.ProtocolID, svc.HandleStream)
 
@@ -115,7 +112,7 @@ func waitForSync(stmgr *stmgr.StateManager, epochs int, subscribe func()) {
 	})
 }
 
-func HandleIncomingBlocks(mctx helpers.MetricsCtx, lc fx.Lifecycle, ps *pubsub.PubSub, s *chain.Syncer, bserv dtypes.ChainBlockService, chain *store.ChainStore, stmgr *stmgr.StateManager, h host.Host, nn dtypes.NetworkName) {
+func HandleIncomingBlocks(mctx helpers.MetricsCtx, lc fx.Lifecycle, ps *pubsub.PubSub, s *chain.Syncer, bserv dtypes.ChainBlockService, chain *store.ChainStore, stmgr *stmgr.StateManager, h host.Host, nn dtypes.NetworkName, bootstrapper dtypes.Bootstrapper) {
 	ctx := helpers.LifecycleCtx(mctx, lc)
 
 	v := sub.NewBlockValidator(
@@ -140,8 +137,7 @@ func HandleIncomingBlocks(mctx helpers.MetricsCtx, lc fx.Lifecycle, ps *pubsub.P
 		go sub.HandleIncomingBlocks(ctx, blocksub, s, bserv, h.ConnManager())
 	}
 
-	// for tests
-	if PubsubSubscribeImmediately {
+	if bootstrapper {
 		subscribe()
 		return
 	}
@@ -150,7 +146,7 @@ func HandleIncomingBlocks(mctx helpers.MetricsCtx, lc fx.Lifecycle, ps *pubsub.P
 	waitForSync(stmgr, 10, subscribe)
 }
 
-func HandleIncomingMessages(mctx helpers.MetricsCtx, lc fx.Lifecycle, ps *pubsub.PubSub, stmgr *stmgr.StateManager, mpool *messagepool.MessagePool, h host.Host, nn dtypes.NetworkName) {
+func HandleIncomingMessages(mctx helpers.MetricsCtx, lc fx.Lifecycle, ps *pubsub.PubSub, stmgr *stmgr.StateManager, mpool *messagepool.MessagePool, h host.Host, nn dtypes.NetworkName, bootstrapper dtypes.Bootstrapper) {
 	ctx := helpers.LifecycleCtx(mctx, lc)
 
 	v := sub.NewMessageValidator(h.ID(), mpool)
@@ -170,8 +166,7 @@ func HandleIncomingMessages(mctx helpers.MetricsCtx, lc fx.Lifecycle, ps *pubsub
 		go sub.HandleIncomingMessages(ctx, mpool, msgsub)
 	}
 
-	// for tests
-	if PubsubSubscribeImmediately {
+	if bootstrapper {
 		subscribe()
 		return
 	}