diff --git a/node/builder.go b/node/builder.go
index ee0a66e53..07d8294c9 100644
--- a/node/builder.go
+++ b/node/builder.go
@@ -307,9 +307,9 @@ var ChainNode = Options(
 	Override(new(api.WalletAPI), From(new(wallet.MultiWallet))),
 
 	// Service: Payment channels
-	Override(new(*paychmgr.Store), paychmgr.NewStore),
-	Override(new(*paychmgr.Manager), paychmgr.NewManager),
-	Override(HandlePaymentChannelManagerKey, paychmgr.HandleManager),
+	Override(new(*paychmgr.Store), modules.NewPaychStore),
+	Override(new(*paychmgr.Manager), modules.NewManager),
+	Override(HandlePaymentChannelManagerKey, modules.HandlePaychManager),
 	Override(SettlePaymentChannelsKey, settler.SettlePaymentChannels),
 
 	// Markets (common)
diff --git a/node/modules/paych.go b/node/modules/paych.go
new file mode 100644
index 000000000..28b0f4898
--- /dev/null
+++ b/node/modules/paych.go
@@ -0,0 +1,37 @@
+package modules
+
+import (
+	"context"
+
+	"github.com/filecoin-project/lotus/chain/stmgr"
+	"github.com/filecoin-project/lotus/node/modules/dtypes"
+	"github.com/filecoin-project/lotus/node/modules/helpers"
+	"github.com/filecoin-project/lotus/paychmgr"
+	"github.com/ipfs/go-datastore"
+	"github.com/ipfs/go-datastore/namespace"
+	"go.uber.org/fx"
+)
+
+func NewManager(mctx helpers.MetricsCtx, lc fx.Lifecycle, sm stmgr.StateManagerAPI, pchstore *paychmgr.Store, api paychmgr.PaychAPI) *paychmgr.Manager {
+	ctx := helpers.LifecycleCtx(mctx, lc)
+	ctx, shutdown := context.WithCancel(ctx)
+
+	return paychmgr.NewManager(ctx, shutdown, sm, pchstore, api)
+}
+
+func NewPaychStore(ds dtypes.MetadataDS) *paychmgr.Store {
+	ds = namespace.Wrap(ds, datastore.NewKey("/paych/"))
+	return paychmgr.NewStore(ds)
+}
+
+// HandlePaychManager is called by dependency injection to set up hooks
+func HandlePaychManager(lc fx.Lifecycle, pm *paychmgr.Manager) {
+	lc.Append(fx.Hook{
+		OnStart: func(ctx context.Context) error {
+			return pm.Start()
+		},
+		OnStop: func(context.Context) error {
+			return pm.Stop()
+		},
+	})
+}
diff --git a/paychmgr/manager.go b/paychmgr/manager.go
index 5e0aa88ce..8484bc8b7 100644
--- a/paychmgr/manager.go
+++ b/paychmgr/manager.go
@@ -20,7 +20,6 @@ import (
 	"github.com/filecoin-project/lotus/chain/stmgr"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/node/impl/full"
-	"github.com/filecoin-project/lotus/node/modules/helpers"
 )
 
 var log = logging.Logger("paych")
@@ -77,10 +76,7 @@ type Manager struct {
 	channels map[string]*channelAccessor
 }
 
-func NewManager(mctx helpers.MetricsCtx, lc fx.Lifecycle, sm stmgr.StateManagerAPI, pchstore *Store, api PaychAPI) *Manager {
-	ctx := helpers.LifecycleCtx(mctx, lc)
-	ctx, shutdown := context.WithCancel(ctx)
-
+func NewManager(ctx context.Context, shutdown func(), sm stmgr.StateManagerAPI, pchstore *Store, api PaychAPI) *Manager {
 	impl := &managerAPIImpl{StateManagerAPI: sm, paychAPI: &api}
 	return &Manager{
 		ctx:      ctx,
@@ -103,18 +99,6 @@ func newManager(pchstore *Store, pchapi managerAPI) (*Manager, error) {
 	return pm, pm.Start()
 }
 
-// HandleManager is called by dependency injection to set up hooks
-func HandleManager(lc fx.Lifecycle, pm *Manager) {
-	lc.Append(fx.Hook{
-		OnStart: func(ctx context.Context) error {
-			return pm.Start()
-		},
-		OnStop: func(context.Context) error {
-			return pm.Stop()
-		},
-	})
-}
-
 // Start restarts tracking of any messages that were sent to chain.
 func (pm *Manager) Start() error {
 	return pm.restartPending()
diff --git a/paychmgr/store.go b/paychmgr/store.go
index a17ad1fcd..343149f93 100644
--- a/paychmgr/store.go
+++ b/paychmgr/store.go
@@ -14,14 +14,12 @@ import (
 	cborutil "github.com/filecoin-project/go-cbor-util"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-datastore"
-	"github.com/ipfs/go-datastore/namespace"
 	dsq "github.com/ipfs/go-datastore/query"
 
 	"github.com/filecoin-project/go-address"
 	cborrpc "github.com/filecoin-project/go-cbor-util"
 
 	"github.com/filecoin-project/lotus/chain/actors/builtin/paych"
-	"github.com/filecoin-project/lotus/node/modules/dtypes"
 )
 
 var ErrChannelNotTracked = errors.New("channel not tracked")
@@ -30,8 +28,7 @@ type Store struct {
 	ds datastore.Batching
 }
 
-func NewStore(ds dtypes.MetadataDS) *Store {
-	ds = namespace.Wrap(ds, datastore.NewKey("/paych/"))
+func NewStore(ds datastore.Batching) *Store {
 	return &Store{
 		ds: ds,
 	}