diff --git a/pkg/user/e2e_test.go b/pkg/user/e2e_test.go
index 6e9cffe7a8..3ff41aee76 100644
--- a/pkg/user/e2e_test.go
+++ b/pkg/user/e2e_test.go
@@ -103,5 +103,13 @@ func TestSignerTwins(t *testing.T) {
 
 func newSingleSignerFromContext(ctx testnode.Context) (*user.Signer, error) {
 	encCfg := encoding.MakeConfig(app.ModuleEncodingRegisters...)
-	return user.SetupSingleSigner(ctx.GoContext(), ctx.Keyring, ctx.GRPCClient, encCfg)
+	record, err := ctx.Keyring.Key("validator")
+	if err != nil {
+		return nil, err
+	}
+	address, err := record.GetAddress()
+	if err != nil {
+		return nil, err
+	}
+	return user.SetupSigner(ctx.GoContext(), ctx.Keyring, ctx.GRPCClient, address, encCfg)
 }
diff --git a/pkg/user/signer.go b/pkg/user/signer.go
index 5f2a9395ca..0628d65ac0 100644
--- a/pkg/user/signer.go
+++ b/pkg/user/signer.go
@@ -11,7 +11,6 @@ import (
 	"github.com/celestiaorg/celestia-app/app/encoding"
 	apperrors "github.com/celestiaorg/celestia-app/app/errors"
 	blob "github.com/celestiaorg/celestia-app/x/blob/types"
-	blobtypes "github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
@@ -202,7 +201,7 @@ func (s *Signer) CreatePayForBlob(blobs []*tmproto.Blob, opts ...TxOption) ([]by
 }
 
 func (s *Signer) createPayForBlobs(blobs []*tmproto.Blob, opts ...TxOption) ([]byte, uint64, error) {
-	msg, err := blobtypes.NewMsgPayForBlobs(s.address.String(), blobs...)
+	msg, err := blob.NewMsgPayForBlobs(s.address.String(), blobs...)
 	if err != nil {
 		return nil, 0, err
 	}