diff --git a/hscontrol/db/node_test.go b/hscontrol/db/node_test.go
index 0aaadf3f3ff..c3b95f97202 100644
--- a/hscontrol/db/node_test.go
+++ b/hscontrol/db/node_test.go
@@ -202,6 +202,7 @@ func (s *Suite) TestListPeersWithoutNonAuthorized(c *check.C) {
 		}
 
 		node := types.Node{
+			// nolint:G115
 			ID:             types.NodeID(uint64(index)),
 			MachineKey:     machineKey.Public(),
 			NodeKey:        nodeKey.Public(),
diff --git a/integration/auth_approval_test.go b/integration/auth_approval_test.go
index d4b86505398..982d4eb3c50 100644
--- a/integration/auth_approval_test.go
+++ b/integration/auth_approval_test.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/juanfont/headscale/gen/go/headscale/v1"
+	v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
 	"github.com/juanfont/headscale/hscontrol/types"
 	"github.com/juanfont/headscale/integration/hsic"
 	"github.com/samber/lo"
diff --git a/integration/cli_test.go b/integration/cli_test.go
index 8bccc6a15e5..94b5f348b7c 100644
--- a/integration/cli_test.go
+++ b/integration/cli_test.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"sort"
+	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -1245,7 +1246,7 @@ func TestNodeApproveCommand(t *testing.T) {
 				"json",
 			},
 		)
-		assert.NoError(t, err)
+		assertNoErr(t, err)
 
 		var node v1.Node
 		err = executeAndUnmarshal(
@@ -1263,7 +1264,7 @@ func TestNodeApproveCommand(t *testing.T) {
 			},
 			&node,
 		)
-		assert.NoError(t, err)
+		assertNoErr(t, err)
 
 		nodes[index] = &node
 	}
@@ -1282,7 +1283,7 @@ func TestNodeApproveCommand(t *testing.T) {
 		},
 		&listAll,
 	)
-	assert.NoError(t, err)
+	assertNoErr(t, err)
 
 	assert.Len(t, listAll, 5)
 
@@ -1292,14 +1293,14 @@ func TestNodeApproveCommand(t *testing.T) {
 	assert.False(t, listAll[3].GetApproved())
 	assert.False(t, listAll[4].GetApproved())
 
-	for idx := 0; idx < 3; idx++ {
+	for idx := range [3]int{} {
 		_, err := headscale.Execute(
 			[]string{
 				"headscale",
 				"nodes",
 				"approve",
 				"--identifier",
-				fmt.Sprintf("%d", listAll[idx].GetId()),
+				strconv.FormatUint(listAll[idx].GetId(), 10),
 			},
 		)
 		assert.NoError(t, err)