diff --git a/x/fbridge/client/cli/query.go b/x/fbridge/client/cli/query.go
index 19708afb6e..8f74b42073 100644
--- a/x/fbridge/client/cli/query.go
+++ b/x/fbridge/client/cli/query.go
@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	flagSequences = "sequences"
+	FlagSequences = "sequences"
 )
 
 // NewQueryCmd returns the query commands for fbridge module
@@ -100,7 +100,7 @@ func NewQuerySeqToBlocknumsCmd() *cobra.Command {
 			}
 			qc := types.NewQueryClient(clientCtx)
 
-			seqSlice, err := cmd.Flags().GetInt64Slice(flagSequences)
+			seqSlice, err := cmd.Flags().GetInt64Slice(FlagSequences)
 			if err != nil {
 				return err
 			}
@@ -119,7 +119,7 @@ func NewQuerySeqToBlocknumsCmd() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().Int64Slice(flagSequences, []int64{}, "comma separated list of bridge sequnece numbers")
+	cmd.Flags().Int64Slice(FlagSequences, []int64{}, "comma separated list of bridge sequnece numbers")
 	flags.AddQueryFlagsToCmd(cmd)
 	return cmd
 }
diff --git a/x/fbridge/client/cli/query_test.go b/x/fbridge/client/cli/query_test.go
index 19374cf103..1527fa9d1b 100644
--- a/x/fbridge/client/cli/query_test.go
+++ b/x/fbridge/client/cli/query_test.go
@@ -133,7 +133,7 @@ func (s *CLITestSuite) TestQuerySeqToBlocknumsCmd() {
 				return s.baseCtx.WithClient(c)
 			},
 			[]string{
-				fmt.Sprintf("--sequences=1"),
+				fmt.Sprintf("--%s=1", cli.FlagSequences),
 				fmt.Sprintf("--%s=json", FlagOutput),
 			},
 			&types.QuerySeqToBlocknumsResponse{},
@@ -148,7 +148,7 @@ func (s *CLITestSuite) TestQuerySeqToBlocknumsCmd() {
 				})
 				return s.baseCtx.WithClient(c)
 			},
-			[]string{fmt.Sprintf("--sequences=1.3"), fmt.Sprintf("--%s=json", FlagOutput)},
+			[]string{fmt.Sprintf("--%s=1.3", cli.FlagSequences), fmt.Sprintf("--%s=json", FlagOutput)},
 			&types.QuerySeqToBlocknumsResponse{},
 			true,
 		},
diff --git a/x/fbridge/client/cli/tx_test.go b/x/fbridge/client/cli/tx_test.go
index 936ad62c8c..6da55324b1 100644
--- a/x/fbridge/client/cli/tx_test.go
+++ b/x/fbridge/client/cli/tx_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/suite"
-
 	abci "github.com/tendermint/tendermint/abci/types"
 	rpcclientmock "github.com/tendermint/tendermint/rpc/client/mock"
 
@@ -82,7 +81,7 @@ func (s *CLITestSuite) SetupSuite() {
 
 func cliArgs(args ...string) []string {
 	return append(args, []string{
-		fmt.Sprintf("--output=json"),
+		fmt.Sprintf("--%s=json", FlagOutput),
 		fmt.Sprintf("--%s=home", flags.FlagKeyringDir),
 		fmt.Sprintf("--%s=mynote", flags.FlagNote),
 		fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(10))).String()),
@@ -165,7 +164,6 @@ func (s *CLITestSuite) TestNewTransferTxCmd() {
 	}
 
 	for _, tc := range tcs {
-		tc := tc
 		s.Run(tc.name, func() {
 			out, err := clitestutil.ExecTestCLICmd(s.clientCtx, cmd, tc.args)
 			if tc.expectErr {
@@ -223,7 +221,6 @@ func (s *CLITestSuite) TestNewSuggestRoleTxCmd() {
 	}
 
 	for _, tc := range tcs {
-		tc := tc
 		s.Run(tc.name, func() {
 			out, err := clitestutil.ExecTestCLICmd(s.clientCtx, cmd, tc.args)
 			if tc.expectErr {
@@ -301,7 +298,6 @@ func (s *CLITestSuite) TestNewAddVoteForRoleTxCmd() {
 	}
 
 	for _, tc := range tcs {
-		tc := tc
 		s.Run(tc.name, func() {
 			out, err := clitestutil.ExecTestCLICmd(s.clientCtx, cmd, tc.args)
 			if tc.expectErr {
@@ -365,7 +361,6 @@ func (s *CLITestSuite) TestNewSetBridgeStatusTxCmd() {
 	}
 
 	for _, tc := range tcs {
-		tc := tc
 		s.Run(tc.name, func() {
 			out, err := clitestutil.ExecTestCLICmd(s.clientCtx, cmd, tc.args)
 			if tc.expectErr {
diff --git a/x/fbridge/keeper/auth_test.go b/x/fbridge/keeper/auth_test.go
index ea1595b2cd..72b21a8833 100644
--- a/x/fbridge/keeper/auth_test.go
+++ b/x/fbridge/keeper/auth_test.go
@@ -45,9 +45,9 @@ func TestAssignRole(t *testing.T) {
 	require.Error(t, err, "invalid vote option must be rejected")
 	err = k.addVote(ctx, p.Id, addrs[0], types.OptionYes)
 	require.NoError(t, err)
-	opt, err := k.GetVote(ctx, wrongProposalID, addrs[0])
+	_, err = k.GetVote(ctx, wrongProposalID, addrs[0])
 	require.Error(t, err, "this proposal must not be found")
-	opt, err = k.GetVote(ctx, p.Id, addrs[0])
+	opt, err := k.GetVote(ctx, p.Id, addrs[0])
 	require.NoError(t, err)
 	require.Equal(t, types.OptionYes, opt)
 
@@ -68,7 +68,7 @@ func TestAssignRole(t *testing.T) {
 	require.Equal(t, types.RoleMetadata{Guardian: 1, Operator: 1, Judge: 0}, k.GetRoleMetadata(ctx))
 
 	// 4. Guardian assigns an address to a same role
-	p, err = k.RegisterRoleProposal(ctx, addrs[0], addrs[1], types.RoleOperator)
+	_, err = k.RegisterRoleProposal(ctx, addrs[0], addrs[1], types.RoleOperator)
 	require.Error(t, err, "the role proposal cannot be submitted if target's role is equal to the role in proposal")
 	err = k.updateRole(ctx, types.RoleOperator, addrs[1])
 	require.NoError(t, err)
diff --git a/x/fbridge/keeper/msg_server_test.go b/x/fbridge/keeper/msg_server_test.go
index f099c8e0f1..64fbb80974 100644
--- a/x/fbridge/keeper/msg_server_test.go
+++ b/x/fbridge/keeper/msg_server_test.go
@@ -3,6 +3,7 @@ package keeper_test
 import (
 	"context"
 	"fmt"
+
 	sdk "github.com/Finschia/finschia-sdk/types"
 	"github.com/Finschia/finschia-sdk/x/fbridge/types"
 )
diff --git a/x/fbridge/types/fbridge_test.go b/x/fbridge/types/fbridge_test.go
index 759378f262..677820aa4c 100644
--- a/x/fbridge/types/fbridge_test.go
+++ b/x/fbridge/types/fbridge_test.go
@@ -1,9 +1,11 @@
 package types_test
 
 import (
-	"github.com/Finschia/finschia-sdk/x/fbridge/types"
-	"github.com/stretchr/testify/require"
 	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/Finschia/finschia-sdk/x/fbridge/types"
 )
 
 func TestIsValidRole(t *testing.T) {
diff --git a/x/fbridge/types/keys_test.go b/x/fbridge/types/keys_test.go
index e1c7561e23..303f78d36f 100644
--- a/x/fbridge/types/keys_test.go
+++ b/x/fbridge/types/keys_test.go
@@ -1,11 +1,11 @@
 package types_test
 
 import (
-	sdk "github.com/Finschia/finschia-sdk/types"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
+	sdk "github.com/Finschia/finschia-sdk/types"
 	"github.com/Finschia/finschia-sdk/x/fbridge/types"
 )
 
diff --git a/x/fbridge/types/params_test.go b/x/fbridge/types/params_test.go
index 85c58aae81..258be68682 100644
--- a/x/fbridge/types/params_test.go
+++ b/x/fbridge/types/params_test.go
@@ -69,7 +69,6 @@ func TestValidateParams(t *testing.T) {
 				require.NoError(t, p.ValidateParams())
 			}
 		})
-
 	}
 }