diff --git a/collections/naming_test.go b/collections/naming_test.go
index 1dc271391433..39b275d920a9 100644
--- a/collections/naming_test.go
+++ b/collections/naming_test.go
@@ -33,6 +33,7 @@ func TestNaming(t *testing.T) {
 }
 
 func expectKeyCodecName[T any](t *testing.T, name string, cdc codec.KeyCodec[T]) {
+	t.Helper()
 	schema, err := codec.KeySchemaCodec(cdc)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(schema.Fields))
@@ -40,6 +41,7 @@ func expectKeyCodecName[T any](t *testing.T, name string, cdc codec.KeyCodec[T])
 }
 
 func expectValueCodecName[T any](t *testing.T, name string, cdc codec.ValueCodec[T]) {
+	t.Helper()
 	schema, err := codec.ValueSchemaCodec(cdc)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(schema.Fields))
@@ -47,6 +49,7 @@ func expectValueCodecName[T any](t *testing.T, name string, cdc codec.ValueCodec
 }
 
 func expectKeyCodecNames[T any](t *testing.T, cdc codec.KeyCodec[T], names ...string) {
+	t.Helper()
 	schema, err := codec.KeySchemaCodec(cdc)
 	require.NoError(t, err)
 	require.Equal(t, len(names), len(schema.Fields))
diff --git a/schema/indexer/start.go b/schema/indexer/start.go
index 48ab3f7fc7e0..909db71ed61a 100644
--- a/schema/indexer/start.go
+++ b/schema/indexer/start.go
@@ -196,7 +196,7 @@ func unmarshalIndexingConfig(cfg interface{}) (*IndexingConfig, error) {
 	return &res, err
 }
 
-func unmarshalIndexerCustomConfig(cfg interface{}, expectedType interface{}) (interface{}, error) {
+func unmarshalIndexerCustomConfig(cfg, expectedType interface{}) (interface{}, error) {
 	typ := reflect.TypeOf(expectedType)
 	if reflect.TypeOf(cfg).AssignableTo(typ) {
 		return cfg, nil
diff --git a/schema/indexer/start_test.go b/schema/indexer/start_test.go
index e7efc9f62322..f586af435420 100644
--- a/schema/indexer/start_test.go
+++ b/schema/indexer/start_test.go
@@ -80,6 +80,7 @@ func TestStart(t *testing.T) {
 }
 
 func callCommit(t *testing.T, listener appdata.Listener) {
+	t.Helper()
 	cb, err := listener.Commit(appdata.CommitData{})
 	if err != nil {
 		t.Fatal(err)
diff --git a/tests/integration/evidence/keeper/infraction_test.go b/tests/integration/evidence/keeper/infraction_test.go
index 745407688cb2..6be779630903 100644
--- a/tests/integration/evidence/keeper/infraction_test.go
+++ b/tests/integration/evidence/keeper/infraction_test.go
@@ -154,7 +154,7 @@ func initFixture(tb testing.TB) *fixture {
 
 	stakingKeeper.SetHooks(stakingtypes.NewMultiStakingHooks(slashingKeeper.Hooks()))
 
-	evidenceKeeper := keeper.NewKeeper(cdc, runtime.NewEnvironment(runtime.NewKVStoreService(keys[evidencetypes.StoreKey]), log.NewNopLogger(), runtime.EnvWithQueryRouterService(grpcQueryRouter), runtime.EnvWithMsgRouterService(msgRouter)), stakingKeeper, slashingKeeper, consensusParamsKeeper, addresscodec.NewBech32Codec(sdk.Bech32PrefixAccAddr))
+	evidenceKeeper := keeper.NewKeeper(cdc, runtime.NewEnvironment(runtime.NewKVStoreService(keys[evidencetypes.StoreKey]), log.NewNopLogger(), runtime.EnvWithQueryRouterService(grpcQueryRouter), runtime.EnvWithMsgRouterService(msgRouter)), stakingKeeper, slashingKeeper, consensusParamsKeeper, addresscodec.NewBech32Codec(sdk.Bech32PrefixAccAddr), stakingKeeper.ConsensusAddressCodec())
 	router := evidencetypes.NewRouter()
 	router = router.AddRoute(evidencetypes.RouteEquivocation, testEquivocationHandler(evidenceKeeper))
 	evidenceKeeper.SetRouter(router)
diff --git a/tools/hubl/internal/remote.go b/tools/hubl/internal/remote.go
index 0584c0800eb4..7f0fb24db8ab 100644
--- a/tools/hubl/internal/remote.go
+++ b/tools/hubl/internal/remote.go
@@ -45,7 +45,6 @@ func RemoteCommand(config *config.Config, configDir string) ([]*cobra.Command, e
 	commands := []*cobra.Command{}
 
 	for chain, chainConfig := range config.Chains {
-		chain, chainConfig := chain, chainConfig
 
 		// load chain info
 		chainInfo := NewChainInfo(configDir, chain, chainConfig)
diff --git a/x/evidence/keeper/keeper.go b/x/evidence/keeper/keeper.go
index 0d2bfe37935c..954fc18c5e18 100644
--- a/x/evidence/keeper/keeper.go
+++ b/x/evidence/keeper/keeper.go
@@ -39,7 +39,7 @@ type Keeper struct {
 // NewKeeper creates a new Keeper object.
 func NewKeeper(
 	cdc codec.BinaryCodec, env appmodule.Environment, stakingKeeper types.StakingKeeper,
-	slashingKeeper types.SlashingKeeper, ck types.ConsensusKeeper, ac address.Codec, consensusAddressCodec address.Codec,
+	slashingKeeper types.SlashingKeeper, ck types.ConsensusKeeper, ac, consensusAddressCodec address.Codec,
 ) *Keeper {
 	sb := collections.NewSchemaBuilder(env.KVStoreService)
 	k := &Keeper{